Changing maximum length for usernames to 100. Closes ticket number 2363 on Redmine for Ushahidi_Web.

Author: brianherbert

application/config/version.php

@@ -9,4 +9,4 @@
  * The Ushahidi Engine DB revision number
  * Increments when changes are made to the Ushahidi DB schema.
  */
-$config['ushahidi_db_version'] = "68";
+$config['ushahidi_db_version'] = "69";

application/i18n/en_US/auth.php

@@ -39,7 +39,7 @@
 		'admin' => 'The admin user role cannot be modified.',
 		'alpha' => 'The username field must only contain letters.',
 		'exists' => 'Sorry, this username is already in use.',
-		'length' => 'The username field must be at least 2 and no more 16 characters long.',
+		'length' => 'The username field must be at least 2 and no more 100 characters long.',
 		'login error' => 'Please check that you entered the correct username.',
 		'required' => 'The username field is required.',
 		'superadmin' => 'The super admin role cannot be modified.',

application/models/user.php

@@ -66,7 +66,7 @@ public static function custom_validate(array & $post, Auth $auth = null)
 			$auth = new Auth;
 		}
 
-		$post->add_rules('username','required','length[3,16]', 'alpha_numeric');
+		$post->add_rules('username','required','length[3,100]', 'alpha_numeric');
 		$post->add_rules('name','required','length[3,100]');
         $post->add_rules('email','required','email','length[4,64]');
 

sql/upgrade68-69.sql

@@ -0,0 +1,5 @@
+-- Remove incident_source and incident_information columns from the incident table
+ALTER TABLE `users` CHANGE `username` `username` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
+
+-- Update the database version
+UPDATE `settings` SET `db_version` = '69' WHERE `id` = 1 LIMIT 1;

sql/ushahidi.sql

@@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
     `site_tagline` varchar(255) default NULL,
     `site_banner_id` int(11) default NULL,
     `site_email` varchar(120) default NULL,
-    `site_key` varchar(100) default NULL,                                           
+    `site_key` varchar(100) default NULL,
     `site_language` varchar(10) NOT NULL default 'en_US',                           
     `site_style` varchar(50) NOT NULL default 'default',                            
     `site_timezone` varchar(80) default NULL,                                       
@@ -729,7 +729,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
     `cache_pages_lifetime` int(4) NOT NULL DEFAULT '1800',
     `private_deployment` tinyint(4) NOT NULL DEFAULT '0',
     `default_map` varchar(100) NOT NULL DEFAULT 'google_normal',
-    `default_map_all` varchar(20) NOT NULL default 'CC0000',                        
+    `default_map_all` varchar(20) NOT NULL default 'CC0000',
     `api_google` varchar(200) default NULL,                                         
     `api_yahoo` varchar(200) default NULL,                                          
     `api_live` varchar(200) default NULL,                                           
@@ -741,7 +741,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
     `default_lon` varchar(100) default NULL,                                        
     `default_zoom` tinyint(4) NOT NULL default '10',                                
     `items_per_page` smallint(6) NOT NULL default '20',                             
-    `items_per_page_admin` smallint(6) NOT NULL default '20',                       
+    `items_per_page_admin` smallint(6) NOT NULL default '20',
     `sms_provider` varchar(100) NULL DEFAULT NULL,
     `sms_no1` varchar(100) default NULL,                                            
     `sms_no2` varchar(100) default NULL,                                            
@@ -753,8 +753,8 @@ CREATE TABLE IF NOT EXISTS `settings` (
     `date_modify` datetime default NULL,                                            
     `stat_id` BIGINT default NULL COMMENT 'comes from centralized stats',           
     `stat_key` VARCHAR(30) NOT NULL ,                                               
-    `email_username` VARCHAR(100) NOT NULL ,                                        
-    `email_password` VARCHAR(100) NOT NULL ,                                        
+    `email_username` VARCHAR(100) NOT NULL ,
+    `email_password` VARCHAR(100) NOT NULL ,
     `email_port` INT(11) NOT NULL ,                                                 
     `email_host` VARCHAR(100) NOT NULL ,                                            
     `email_servertype` VARCHAR(100) NOT NULL ,                                      
@@ -783,11 +783,11 @@ INSERT INTO `settings` (`id`, `site_name`, `api_google`, `api_yahoo`, `api_live`
 */
 
 CREATE TABLE IF NOT EXISTS `users` (                                                
-    `id` int(11) unsigned NOT NULL auto_increment,                                  
-    `name` varchar(200) default NULL,                                               
-    `email` varchar(127) NOT NULL,                                                  
-    `username` varchar(31) NOT NULL default '',                                     
-    `password` char(50) NOT NULL,                                                   
+    `id` int(11) unsigned NOT NULL auto_increment,
+    `name` varchar(200) default NULL,
+    `email` varchar(127) NOT NULL,
+    `username` varchar(100) NOT NULL default '',
+    `password` char(50) NOT NULL,
     `logins` int(10) unsigned NOT NULL default '0',                                 
     `last_login` int(10) unsigned default NULL,                                     
     `notify` tinyint(1) NOT NULL default '0' COMMENT 'Flag incase admin opts in for email notifications',    
@@ -1459,4 +1459,4 @@ ALTER TABLE `settings` ADD `allow_alerts` tinyint(4) NOT NULL DEFAULT '0';
 * 
 */
 UPDATE `settings` SET `ushahidi_version` = '2.1' WHERE `id`=1 LIMIT 1;
-UPDATE `settings` SET `db_version` = '68' WHERE `id`=1 LIMIT 1;
+UPDATE `settings` SET `db_version` = '69' WHERE `id`=1 LIMIT 1;