Tighter data validation on name

snipe · Nov 26, 2013 · 3f4ce40 · 3f4ce40
1 parent 680b377
commit 3f4ce40
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -5,7 +5,7 @@ class Asset extends Elegant {
 	protected $table = 'assets';
 	protected $softDelete = true;
 	protected $rules = array(
-		'name'   => 'required|min:3',
+		'name'   => 'required|alpha_dash|min:3',
 		'asset_tag'   => 'required|min:3|unique:assets',
 		'model_id'   => 'required',
 		'serial'   => 'required|min:3',

diff --git a/app/models/Category.php b/app/models/Category.php
@@ -8,7 +8,7 @@ class Category extends Elegant {
 	* Category validation rules
 	*/
 	protected $rules = array(
-		'name'   => 'required|min:2',
+		'name'   => 'required|alpha_dash|min:2',
     );
 
 

diff --git a/app/models/Depreciation.php b/app/models/Depreciation.php
@@ -4,7 +4,7 @@ class Depreciation extends Elegant {
 
 		// Declare the rules for the form validation
 		protected $rules = array(
-			'name'   => 'required|min:3',
+			'name'   => 'required|alpha_dash|min:3',
 			'months'   => 'required|min:1|integer',
 		);
 

diff --git a/app/models/License.php b/app/models/License.php
@@ -12,7 +12,7 @@ class License extends Elegant {
 	protected $table = 'licenses';
 	protected $softDelete = true;
 	protected $rules = array(
-			'name'   => 'required|min:3',
+			'name'   => 'required|alpha_dash|min:3',
 			'serial'   => 'required|min:5',
 			'seats'   => 'required|min:1|integer',
 			'license_email'   => 'email',

diff --git a/app/models/Location.php b/app/models/Location.php
@@ -6,8 +6,8 @@ class Location extends Elegant {
 	protected $softDelete = true;
 	protected $table = 'locations';
 	protected $rules = array(
-			'name'  		=> 'required|min:3',
-			'city'   		=> 'required|min:3',
+			'name'  		=> 'required|alpha_dash|min:3',
+			'city'   		=> 'required|alpha_dash|min:3',
 			'state'   		=> 'required|alpha|min:2|max:2',
 			'country'   	=> 'required|alpha|min:2|max:2',
 		);

diff --git a/app/models/Manufacturer.php b/app/models/Manufacturer.php
@@ -4,7 +4,7 @@ class Manufacturer extends Elegant {
 	protected $softDelete = true;
 	// Declare the rules for the form validation
 	protected $rules = array(
-		'name'   => 'required|min:2',
+		'name'   => 'required|alpha_dash|min:2',
 	);
 
 	public function has_models()

diff --git a/app/models/Model.php b/app/models/Model.php
@@ -4,8 +4,8 @@ class Model extends Elegant {
 
 	// Declare the rules for the form validation
 	protected $rules = array(
-		'name'   => 'required|min:3',
-		'category_id'   => 'required',
+		'name'   => 'required|alpha_dash|min:3',
+		'category_id'   => 'required|integer',
 	);
 
 	public function assets()

diff --git a/app/models/Statuslabel.php b/app/models/Statuslabel.php
@@ -5,7 +5,7 @@ class Statuslabel extends Elegant {
 	protected $softDelete = true;
 
 	protected $rules = array(
-		'name'  		=> 'required|min:2',
+		'name'  		=> 'required|alpha_dash|min:2',
 	);
 
 	public function has_assets()