adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.modulefields.php

Indentation +38 added lines, -38 removed lines

@@ -45,20 +45,20 @@ 
     var $mbModule;
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $smarty = new Sugar_Smarty();
         global $mod_strings;
         $bak_mod_strings=$mod_strings;
@@ -92,13 +92,13 @@ 
                 if ($this->isValidStudioField($def))
                 {
                     $def['label'] = translate($def['vname'], $module_name);
-					//Custom relate fields will have a non-db source, but custom_module set
-                	if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
-                       $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
-                       $def['custom'] = true;
+                    //Custom relate fields will have a non-db source, but custom_module set
+                    if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
+                        $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
+                        $def['custom'] = true;
                     } else {
-                       $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
-                       $def['custom'] = false;
+                        $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
+                        $def['custom'] = false;
                     }
 
                     $def['type'] = isset($fieldTypes[$def['type']]) ? $fieldTypes[$def['type']] : ucfirst($def['type']);
@@ -183,15 +183,15 @@ 
                     {
                         if (isset($loadedFields[$field]))
                         {
-                           unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
+                            unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
                         } else {
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
-                           $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
-                           $loadedFields[$field] = true;
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
+                            $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
+                            $loadedFields[$field] = true;
 
-                           $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
-                           $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
+                            $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
+                            $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
                         }
                     }
                 }
@@ -249,29 +249,29 @@ 
     function isValidStudioField(
         $def
         )
-	{
-    	if (isset($def['studio'])) {
+    {
+        if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
+                if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
                     return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
+                if (isset($def['studio']['required']) && $def['studio']['required'])
                     return true;
                     
-    		} else
-    		{
-    			if ($def['studio'] == 'visible')
+            } else
+            {
+                if ($def['studio'] == 'visible')
                     return true;
                 if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
                     return false;
             }
         }
-    	if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
-		{
-    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
-		  return true;
-		}
+        if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
+        {
+            if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
+            return true;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 }
\ No newline at end of file

install/language/en_us.lang.php

Indentation +396 added lines, -396 removed lines

@@ -43,40 +43,40 @@ 
  * *******************************************************************************/
 
 $mod_strings = array(
-	'LBL_BASIC_SEARCH'					=> 'Basic Search',
-	'LBL_ADVANCED_SEARCH'				=> 'Advanced Search',
-	'LBL_BASIC_TYPE'					=> 'Basic Type',
-	'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
-	'LBL_SYSOPTS_1'						=> 'Select from the following system configuration options below.',
+    'LBL_BASIC_SEARCH'					=> 'Basic Search',
+    'LBL_ADVANCED_SEARCH'				=> 'Advanced Search',
+    'LBL_BASIC_TYPE'					=> 'Basic Type',
+    'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
+    'LBL_SYSOPTS_1'						=> 'Select from the following system configuration options below.',
     'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
-	'LBL_SYSOPTS_CONFIG'				=> 'System Configuration',
-	'LBL_SYSOPTS_DB_TYPE'				=> '',
-	'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
+    'LBL_SYSOPTS_CONFIG'				=> 'System Configuration',
+    'LBL_SYSOPTS_DB_TYPE'				=> '',
+    'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
     'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
-	'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
-	'LBL_MAKE_DIRECTORY_WRITABLE'      => 'Please make the following directory writable:',
+    'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
+    'LBL_MAKE_DIRECTORY_WRITABLE'      => 'Please make the following directory writable:',
     'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
-	'DEFAULT_CHARSET'					=> 'UTF-8',
+    'DEFAULT_CHARSET'					=> 'UTF-8',
     'ERR_ADMIN_USER_NAME_BLANK'         => 'Provide the user name for the SuiteCRM admin user. ',
-	'ERR_ADMIN_PASS_BLANK'				=> 'Provide the password for the SuiteCRM admin user. ',
+    'ERR_ADMIN_PASS_BLANK'				=> 'Provide the password for the SuiteCRM admin user. ',
 
     //'ERR_CHECKSYS_CALL_TIME'			=> 'Allow Call Time Pass Reference is Off (please enable in php.ini)',
     'ERR_CHECKSYS'                      => 'Errors have been detected during compatibility check.  In order for your SuiteCRM Installation to function properly, please take the proper steps to address the issues listed below and either press the recheck button, or try installing again.',
     'ERR_CHECKSYS_CALL_TIME'            => 'Allow Call Time Pass Reference is On (this should be set to Off in php.ini)',
-	'ERR_CHECKSYS_CURL'					=> 'Not found: SuiteCRM Scheduler will run with limited functionality.',
+    'ERR_CHECKSYS_CURL'					=> 'Not found: SuiteCRM Scheduler will run with limited functionality.',
     'ERR_CHECKSYS_IMAP'					=> 'Not found: InboundEmail and Campaigns (Email) require the IMAP libraries. Neither will be functional.',
-	'ERR_CHECKSYS_MSSQL_MQGPC'			=> 'Magic Quotes GPC cannot be turned "On" when using MS SQL Server.',
-	'ERR_CHECKSYS_MEM_LIMIT_0'			=> 'Warning: ',
-	'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
-	'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
-	'ERR_CHECKSYS_MYSQL_VERSION'		=> 'Minimum Version 4.1.2 - Found: ',
-	'ERR_CHECKSYS_NO_SESSIONS'			=> 'Failed to write and read session variables.  Unable to proceed with the installation.',
-	'ERR_CHECKSYS_NOT_VALID_DIR'		=> 'Not A Valid Directory',
-	'ERR_CHECKSYS_NOT_WRITABLE'			=> 'Warning: Not Writable',
-	'ERR_CHECKSYS_PHP_INVALID_VER'		=> 'Your version of PHP is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported PHP Versions. Your version is ',
-	'ERR_CHECKSYS_IIS_INVALID_VER'      => 'Your version of IIS is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported IIS Versions. Your version is ',
-	'ERR_CHECKSYS_FASTCGI'              => 'We detect that you are not using a FastCGI handler mapping for PHP. You will need to install/configure a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported Versions. Please see <a href="http://www.iis.net/php/" target="_blank">http://www.iis.net/php/</a> for details ',
-	'ERR_CHECKSYS_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
+    'ERR_CHECKSYS_MSSQL_MQGPC'			=> 'Magic Quotes GPC cannot be turned "On" when using MS SQL Server.',
+    'ERR_CHECKSYS_MEM_LIMIT_0'			=> 'Warning: ',
+    'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
+    'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
+    'ERR_CHECKSYS_MYSQL_VERSION'		=> 'Minimum Version 4.1.2 - Found: ',
+    'ERR_CHECKSYS_NO_SESSIONS'			=> 'Failed to write and read session variables.  Unable to proceed with the installation.',
+    'ERR_CHECKSYS_NOT_VALID_DIR'		=> 'Not A Valid Directory',
+    'ERR_CHECKSYS_NOT_WRITABLE'			=> 'Warning: Not Writable',
+    'ERR_CHECKSYS_PHP_INVALID_VER'		=> 'Your version of PHP is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported PHP Versions. Your version is ',
+    'ERR_CHECKSYS_IIS_INVALID_VER'      => 'Your version of IIS is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported IIS Versions. Your version is ',
+    'ERR_CHECKSYS_FASTCGI'              => 'We detect that you are not using a FastCGI handler mapping for PHP. You will need to install/configure a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported Versions. Please see <a href="http://www.iis.net/php/" target="_blank">http://www.iis.net/php/</a> for details ',
+    'ERR_CHECKSYS_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
     'ERR_CHECKSYS_PHP_UNSUPPORTED'		=> 'Unsupported PHP Version Installed: ( ver',
     'LBL_DB_UNAVAILABLE'                => 'Database unavailable',
     'LBL_CHECKSYS_DB_SUPPORT_NOT_AVAILABLE' => 'Database Support was not found.  Please make sure you have the necessary drivers for one of the following supported Database Types: MySQL or MS SQLServer.  You might need to uncomment the extension in the php.ini file, or recompile with the right binary file, depending on your version of PHP.  Please refer to your PHP Manual for more information on how to enable Database Support.',
@@ -89,184 +89,184 @@ 
     'ERR_CHECKSYS_CUSTOM_NOT_WRITABLE'  => 'The Custom Directory exists but is not writeable.  You may have to change permissions on it (chmod 766) or right click on it and uncheck the read only option, depending on your Operating System.  Please take the needed steps to make the file writeable.',
     'ERR_CHECKSYS_FILES_NOT_WRITABLE'   => "The files or directories listed below are not writeable or are missing and cannot be created.  Depending on your Operating System, correcting this may require you to change permissions on the files or parent directory (chmod 755), or to right click on the parent directory and uncheck the 'read only' option and apply it to all subfolders.",
     'LBL_CHECKSYS_OVERRIDE_CONFIG' => 'Config override',
-	//'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (please disable in php.ini)',
-	'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (you may wish to disable in php.ini)',
+    //'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (please disable in php.ini)',
+    'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (you may wish to disable in php.ini)',
     'ERR_CHECKSYS_ZLIB'					=> 'ZLib support not found: SuiteCRM reaps enormous performance benefits with zlib compression.',
     'ERR_CHECKSYS_ZIP'					=> 'ZIP support not found: SuiteCRM needs ZIP support in order to process compressed files.',
     'ERR_CHECKSYS_PCRE'					=> 'PCRE library not found: SuiteCRM needs PCRE library in order to process Perl style of regular expression pattern matching.',
     'ERR_CHECKSYS_PCRE_VER'				=> 'PCRE library version: SuiteCRM needs PCRE library 7.0 or above to process Perl style of regular expression pattern matching.',
-	'ERR_DB_ADMIN'						=> 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established.  Please enter a valid user name and password.  (Error: ',
+    'ERR_DB_ADMIN'						=> 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established.  Please enter a valid user name and password.  (Error: ',
     'ERR_DB_ADMIN_MSSQL'                => 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established.  Please enter a valid user name and password.',
-	'ERR_DB_EXISTS_NOT'					=> 'The specified database does not exist.',
-	'ERR_DB_EXISTS_WITH_CONFIG'			=> 'Database already exists with config data.  To run an install with the chosen database, please re-run the install and choose: "Drop and recreate existing SuiteCRM tables?"  To upgrade, use the Upgrade Wizard in the Admin Console.  Please read the upgrade documentation located <a href="http://www.suitecrm.com target="_new">here</a>.',
-	'ERR_DB_EXISTS'						=> 'The provided Database Name already exists -- cannot create another one with the same name.',
+    'ERR_DB_EXISTS_NOT'					=> 'The specified database does not exist.',
+    'ERR_DB_EXISTS_WITH_CONFIG'			=> 'Database already exists with config data.  To run an install with the chosen database, please re-run the install and choose: "Drop and recreate existing SuiteCRM tables?"  To upgrade, use the Upgrade Wizard in the Admin Console.  Please read the upgrade documentation located <a href="http://www.suitecrm.com target="_new">here</a>.',
+    'ERR_DB_EXISTS'						=> 'The provided Database Name already exists -- cannot create another one with the same name.',
     'ERR_DB_EXISTS_PROCEED'             => 'The provided Database Name already exists.  You can<br>1.  hit the back button and choose a new database name <br>2.  click next and continue but all existing tables on this database will be dropped.  <strong>This means your tables and data will be blown away.</strong>',
-	'ERR_DB_HOSTNAME'					=> 'Host name cannot be blank.',
-	'ERR_DB_INVALID'					=> 'Invalid database type selected.',
-	'ERR_DB_LOGIN_FAILURE'				=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
-	'ERR_DB_LOGIN_FAILURE_MYSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
-	'ERR_DB_LOGIN_FAILURE_MSSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
-	'ERR_DB_MYSQL_VERSION'				=> 'Your MySQL version (%s) is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported MySQL versions.',
-	'ERR_DB_NAME'						=> 'Database name cannot be blank.',
-	'ERR_DB_NAME2'						=> "Database name cannot contain a '\\', '/', or '.'",
+    'ERR_DB_HOSTNAME'					=> 'Host name cannot be blank.',
+    'ERR_DB_INVALID'					=> 'Invalid database type selected.',
+    'ERR_DB_LOGIN_FAILURE'				=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
+    'ERR_DB_LOGIN_FAILURE_MYSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
+    'ERR_DB_LOGIN_FAILURE_MSSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established.  Please enter a valid host, username and password',
+    'ERR_DB_MYSQL_VERSION'				=> 'Your MySQL version (%s) is not supported by SuiteCRM.  You will need to install a version that is compatible with the SuiteCRM application.  Please consult the Compatibility Matrix in the Release Notes for supported MySQL versions.',
+    'ERR_DB_NAME'						=> 'Database name cannot be blank.',
+    'ERR_DB_NAME2'						=> "Database name cannot contain a '\\', '/', or '.'",
     'ERR_DB_MYSQL_DB_NAME_INVALID'      => "Database name cannot contain a '\\', '/', or '.'",
     'ERR_DB_MSSQL_DB_NAME_INVALID'      => "Database name cannot begin with a number, '#', or '@' and cannot contain a space, '\"', \"'\", '*', '/', '\', '?', ':', '<', '>', '&', '!', or '-'",
     'ERR_DB_OCI8_DB_NAME_INVALID'       => "Database name can only consist of alphanumeric characters and the symbols '#', '_' or '$'",
-	'ERR_DB_PASSWORD'					=> 'The passwords provided for the SuiteCRM database administrator do not match.  Please re-enter the same passwords in the password fields.',
-	'ERR_DB_PRIV_USER'					=> 'Provide a database administrator user name.  The user is required for the initial connection to the database.',
-	'ERR_DB_USER_EXISTS'				=> 'User name for SuiteCRM database user already exists -- cannot create another one with the same name. Please enter a new user name.',
-	'ERR_DB_USER'						=> 'Enter a user name for the SuiteCRM database administrator.',
-	'ERR_DBCONF_VALIDATION'				=> 'Please fix the following errors before proceeding:',
+    'ERR_DB_PASSWORD'					=> 'The passwords provided for the SuiteCRM database administrator do not match.  Please re-enter the same passwords in the password fields.',
+    'ERR_DB_PRIV_USER'					=> 'Provide a database administrator user name.  The user is required for the initial connection to the database.',
+    'ERR_DB_USER_EXISTS'				=> 'User name for SuiteCRM database user already exists -- cannot create another one with the same name. Please enter a new user name.',
+    'ERR_DB_USER'						=> 'Enter a user name for the SuiteCRM database administrator.',
+    'ERR_DBCONF_VALIDATION'				=> 'Please fix the following errors before proceeding:',
     'ERR_DBCONF_PASSWORD_MISMATCH'      => 'The passwords provided for the SuiteCRM database user do not match. Please re-enter the same passwords in the password fields.',
-	'ERR_ERROR_GENERAL'					=> 'The following errors were encountered:',
-	'ERR_LANG_CANNOT_DELETE_FILE'		=> 'Cannot delete file: ',
-	'ERR_LANG_MISSING_FILE'				=> 'Cannot find file: ',
-	'ERR_LANG_NO_LANG_FILE'			 	=> 'No language pack file found at include/language inside: ',
-	'ERR_LANG_UPLOAD_1'					=> 'There was a problem with your upload.  Please try again.',
-	'ERR_LANG_UPLOAD_2'					=> 'Language Packs must be ZIP archives.',
-	'ERR_LANG_UPLOAD_3'					=> 'PHP could not move the temp file to the upgrade directory.',
-	'ERR_LICENSE_MISSING'				=> 'Missing Required Fields',
-	'ERR_LICENSE_NOT_FOUND'				=> 'License file not found!',
-	'ERR_LOG_DIRECTORY_NOT_EXISTS'		=> 'Log directory provided is not a valid directory.',
-	'ERR_LOG_DIRECTORY_NOT_WRITABLE'	=> 'Log directory provided is not a writable directory.',
-	'ERR_LOG_DIRECTORY_REQUIRED'		=> 'Log directory is required if you wish to specify your own.',
-	'ERR_NO_DIRECT_SCRIPT'				=> 'Unable to process script directly.',
-	'ERR_NO_SINGLE_QUOTE'				=> 'Cannot use the single quotation mark for ',
-	'ERR_PASSWORD_MISMATCH'				=> 'The passwords provided for the SuiteCRM admin user do not match.  Please re-enter the same passwords in the password fields.',
-	'ERR_PERFORM_CONFIG_PHP_1'			=> 'Cannot write to the <span class=stop>config.php</span> file.',
-	'ERR_PERFORM_CONFIG_PHP_2'			=> 'You can continue this installation by manually creating the config.php file and pasting the configuration information below into the config.php file.  However, you <strong>must </strong>create the config.php file before you continue to the next step.',
-	'ERR_PERFORM_CONFIG_PHP_3'			=> 'Did you remember to create the config.php file?',
-	'ERR_PERFORM_CONFIG_PHP_4'			=> 'Warning: Could not write to config.php file.  Please ensure it exists.',
-	'ERR_PERFORM_HTACCESS_1'			=> 'Cannot write to the ',
-	'ERR_PERFORM_HTACCESS_2'			=> ' file.',
-	'ERR_PERFORM_HTACCESS_3'			=> 'If you want to secure your log file from being accessible via browser, create an .htaccess file in your log directory with the line:',
-	'ERR_PERFORM_NO_TCPIP'				=> '<b>We could not detect an Internet connection.</b> When you do have a connection, please visit <a href="http://www.suitecrm.com/">http://www.suitecrm.com/</a> to register with SuiteCRM. By letting us know a little bit about how your company plans to use SuiteCRM, we can ensure we are always delivering the right application for your business needs.',
-	'ERR_SESSION_DIRECTORY_NOT_EXISTS'	=> 'Session directory provided is not a valid directory.',
-	'ERR_SESSION_DIRECTORY'				=> 'Session directory provided is not a writable directory.',
-	'ERR_SESSION_PATH'					=> 'Session path is required if you wish to specify your own.',
-	'ERR_SI_NO_CONFIG'					=> 'You did not include config_si.php in the document root, or you did not define $sugar_config_si in config.php',
-	'ERR_SITE_GUID'						=> 'Application ID is required if you wish to specify your own.',
+    'ERR_ERROR_GENERAL'					=> 'The following errors were encountered:',
+    'ERR_LANG_CANNOT_DELETE_FILE'		=> 'Cannot delete file: ',
+    'ERR_LANG_MISSING_FILE'				=> 'Cannot find file: ',
+    'ERR_LANG_NO_LANG_FILE'			 	=> 'No language pack file found at include/language inside: ',
+    'ERR_LANG_UPLOAD_1'					=> 'There was a problem with your upload.  Please try again.',
+    'ERR_LANG_UPLOAD_2'					=> 'Language Packs must be ZIP archives.',
+    'ERR_LANG_UPLOAD_3'					=> 'PHP could not move the temp file to the upgrade directory.',
+    'ERR_LICENSE_MISSING'				=> 'Missing Required Fields',
+    'ERR_LICENSE_NOT_FOUND'				=> 'License file not found!',
+    'ERR_LOG_DIRECTORY_NOT_EXISTS'		=> 'Log directory provided is not a valid directory.',
+    'ERR_LOG_DIRECTORY_NOT_WRITABLE'	=> 'Log directory provided is not a writable directory.',
+    'ERR_LOG_DIRECTORY_REQUIRED'		=> 'Log directory is required if you wish to specify your own.',
+    'ERR_NO_DIRECT_SCRIPT'				=> 'Unable to process script directly.',
+    'ERR_NO_SINGLE_QUOTE'				=> 'Cannot use the single quotation mark for ',
+    'ERR_PASSWORD_MISMATCH'				=> 'The passwords provided for the SuiteCRM admin user do not match.  Please re-enter the same passwords in the password fields.',
+    'ERR_PERFORM_CONFIG_PHP_1'			=> 'Cannot write to the <span class=stop>config.php</span> file.',
+    'ERR_PERFORM_CONFIG_PHP_2'			=> 'You can continue this installation by manually creating the config.php file and pasting the configuration information below into the config.php file.  However, you <strong>must </strong>create the config.php file before you continue to the next step.',
+    'ERR_PERFORM_CONFIG_PHP_3'			=> 'Did you remember to create the config.php file?',
+    'ERR_PERFORM_CONFIG_PHP_4'			=> 'Warning: Could not write to config.php file.  Please ensure it exists.',
+    'ERR_PERFORM_HTACCESS_1'			=> 'Cannot write to the ',
+    'ERR_PERFORM_HTACCESS_2'			=> ' file.',
+    'ERR_PERFORM_HTACCESS_3'			=> 'If you want to secure your log file from being accessible via browser, create an .htaccess file in your log directory with the line:',
+    'ERR_PERFORM_NO_TCPIP'				=> '<b>We could not detect an Internet connection.</b> When you do have a connection, please visit <a href="http://www.suitecrm.com/">http://www.suitecrm.com/</a> to register with SuiteCRM. By letting us know a little bit about how your company plans to use SuiteCRM, we can ensure we are always delivering the right application for your business needs.',
+    'ERR_SESSION_DIRECTORY_NOT_EXISTS'	=> 'Session directory provided is not a valid directory.',
+    'ERR_SESSION_DIRECTORY'				=> 'Session directory provided is not a writable directory.',
+    'ERR_SESSION_PATH'					=> 'Session path is required if you wish to specify your own.',
+    'ERR_SI_NO_CONFIG'					=> 'You did not include config_si.php in the document root, or you did not define $sugar_config_si in config.php',
+    'ERR_SITE_GUID'						=> 'Application ID is required if you wish to specify your own.',
     'ERROR_SPRITE_SUPPORT'              => "Currently we are not able to locate the GD library, as a result you will not be able to use the CSS Sprite functionality.",
-	'ERR_UPLOAD_MAX_FILESIZE'			=> 'Warning: Your PHP configuration should be changed to allow files of at least 6MB to be uploaded.',
+    'ERR_UPLOAD_MAX_FILESIZE'			=> 'Warning: Your PHP configuration should be changed to allow files of at least 6MB to be uploaded.',
     'LBL_UPLOAD_MAX_FILESIZE_TITLE'     => 'Upload File Size',
-	'ERR_URL_BLANK'						=> 'Provide the base URL for the SuiteCRM instance.',
-	'ERR_UW_NO_UPDATE_RECORD'			=> 'Could not locate installation record of',
-	'ERROR_FLAVOR_INCOMPATIBLE'			=> 'The uploaded file is not compatible with this flavor (Community Edition, Professional, or Enterprise) of SuiteCRM: ',
-	'ERROR_LICENSE_EXPIRED'				=> "Error: Your license expired ",
-	'ERROR_LICENSE_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a>  in the Admin screen to enter your new license key.  If you do not enter a new license key within 30 days of your license key expiration, you will no longer be able to log in to this application.",
-	'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
-	'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
-	'ERROR_VALIDATION_EXPIRED'			=> "Error: Your validation key expired ",
-	'ERROR_VALIDATION_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a> in the Admin screen to enter your new validation key.  If you do not enter a new validation key within 30 days of your validation key expiration, you will no longer be able to log in to this application.",
-	'ERROR_VERSION_INCOMPATIBLE'		=> 'The uploaded file is not compatible with this version of SuiteCRM: ',
-
-	'LBL_BACK'							=> 'Back',
+    'ERR_URL_BLANK'						=> 'Provide the base URL for the SuiteCRM instance.',
+    'ERR_UW_NO_UPDATE_RECORD'			=> 'Could not locate installation record of',
+    'ERROR_FLAVOR_INCOMPATIBLE'			=> 'The uploaded file is not compatible with this flavor (Community Edition, Professional, or Enterprise) of SuiteCRM: ',
+    'ERROR_LICENSE_EXPIRED'				=> "Error: Your license expired ",
+    'ERROR_LICENSE_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a>  in the Admin screen to enter your new license key.  If you do not enter a new license key within 30 days of your license key expiration, you will no longer be able to log in to this application.",
+    'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
+    'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
+    'ERROR_VALIDATION_EXPIRED'			=> "Error: Your validation key expired ",
+    'ERROR_VALIDATION_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a> in the Admin screen to enter your new validation key.  If you do not enter a new validation key within 30 days of your validation key expiration, you will no longer be able to log in to this application.",
+    'ERROR_VERSION_INCOMPATIBLE'		=> 'The uploaded file is not compatible with this version of SuiteCRM: ',
+
+    'LBL_BACK'							=> 'Back',
     'LBL_CANCEL'                        => 'Cancel',
     'LBL_ACCEPT'                        => 'I Accept',
-	'LBL_CHECKSYS_1'					=> 'In order for your SuiteCRM installation to function properly, please ensure all of the system check items listed below are green. If any are red, please take the necessary steps to fix them.<BR><BR> For help on these system checks, please visit the <a href="http://www.suitecrm.com" target="_blank">SuiteCRM</a>.',
-	'LBL_CHECKSYS_CACHE'				=> 'Writable Cache Sub-Directories',
+    'LBL_CHECKSYS_1'					=> 'In order for your SuiteCRM installation to function properly, please ensure all of the system check items listed below are green. If any are red, please take the necessary steps to fix them.<BR><BR> For help on these system checks, please visit the <a href="http://www.suitecrm.com" target="_blank">SuiteCRM</a>.',
+    'LBL_CHECKSYS_CACHE'				=> 'Writable Cache Sub-Directories',
     'LBL_DROP_DB_CONFIRM'               => 'The provided Database Name already exists.<br>You can either:<br>1.  Click on the Cancel button and choose a new database name, or <br>2.  Click the Accept button and continue.  All existing tables in the database will be dropped. <strong>This means that all of the tables and pre-existing data will be blown away.</strong>',
-	'LBL_CHECKSYS_CALL_TIME'			=> 'PHP Allow Call Time Pass Reference Turned Off',
+    'LBL_CHECKSYS_CALL_TIME'			=> 'PHP Allow Call Time Pass Reference Turned Off',
     'LBL_CHECKSYS_COMPONENT'			=> 'Component',
-	'LBL_CHECKSYS_COMPONENT_OPTIONAL'	=> 'Optional Components',
-	'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
-	'LBL_CHECKSYS_CONFIG_OVERRIDE'		=> 'Writable SuiteCRM Configuration File (config_override.php)',
-	'LBL_CHECKSYS_CURL'					=> 'cURL Module',
+    'LBL_CHECKSYS_COMPONENT_OPTIONAL'	=> 'Optional Components',
+    'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
+    'LBL_CHECKSYS_CONFIG_OVERRIDE'		=> 'Writable SuiteCRM Configuration File (config_override.php)',
+    'LBL_CHECKSYS_CURL'					=> 'cURL Module',
     'LBL_CHECKSYS_SESSION_SAVE_PATH'    => 'Session Save Path Setting',
-	'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
-	'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
-	'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
-	'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
-	'LBL_CHECKSYS_MQGPC'				=> 'Magic Quotes GPC',
-	'LBL_CHECKSYS_MBSTRING'				=> 'MB Strings Module',
-	'LBL_CHECKSYS_MEM_OK'				=> 'OK (No Limit)',
-	'LBL_CHECKSYS_MEM_UNLIMITED'		=> 'OK (Unlimited)',
-	'LBL_CHECKSYS_MEM'					=> 'PHP Memory Limit',
-	'LBL_CHECKSYS_MODULE'				=> 'Writable Modules Sub-Directories and Files',
-	'LBL_CHECKSYS_MYSQL_VERSION'		=> 'MySQL Version',
-	'LBL_CHECKSYS_NOT_AVAILABLE'		=> 'Not Available',
-	'LBL_CHECKSYS_OK'					=> 'OK',
-	'LBL_CHECKSYS_PHP_INI'				=> 'Location of your PHP configuration file (php.ini):',
-	'LBL_CHECKSYS_PHP_OK'				=> 'OK (ver ',
-	'LBL_CHECKSYS_PHPVER'				=> 'PHP Version',
+    'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
+    'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
+    'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
+    'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
+    'LBL_CHECKSYS_MQGPC'				=> 'Magic Quotes GPC',
+    'LBL_CHECKSYS_MBSTRING'				=> 'MB Strings Module',
+    'LBL_CHECKSYS_MEM_OK'				=> 'OK (No Limit)',
+    'LBL_CHECKSYS_MEM_UNLIMITED'		=> 'OK (Unlimited)',
+    'LBL_CHECKSYS_MEM'					=> 'PHP Memory Limit',
+    'LBL_CHECKSYS_MODULE'				=> 'Writable Modules Sub-Directories and Files',
+    'LBL_CHECKSYS_MYSQL_VERSION'		=> 'MySQL Version',
+    'LBL_CHECKSYS_NOT_AVAILABLE'		=> 'Not Available',
+    'LBL_CHECKSYS_OK'					=> 'OK',
+    'LBL_CHECKSYS_PHP_INI'				=> 'Location of your PHP configuration file (php.ini):',
+    'LBL_CHECKSYS_PHP_OK'				=> 'OK (ver ',
+    'LBL_CHECKSYS_PHPVER'				=> 'PHP Version',
     'LBL_CHECKSYS_IISVER'               => 'IIS Version',
-	'LBL_CHECKSYS_RECHECK'				=> 'Re-check',
-	'LBL_CHECKSYS_SAFE_MODE'			=> 'PHP Safe Mode Turned Off',
-	'LBL_CHECKSYS_SESSION'				=> 'Writable Session Save Path (',
-	'LBL_CHECKSYS_STATUS'				=> 'Status',
-	'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
-	'LBL_CHECKSYS_VER'					=> 'Found: ( ver ',
-	'LBL_CHECKSYS_XML'					=> 'XML Parsing',
-	'LBL_CHECKSYS_ZLIB'					=> 'ZLIB Compression Module',
-	'LBL_CHECKSYS_ZIP'					=> 'ZIP Handling Module',
-	'LBL_CHECKSYS_PCRE'					=> 'PCRE Library',
-	'LBL_CHECKSYS_FIX_FILES'            => 'Please fix the following files or directories before proceeding:',
+    'LBL_CHECKSYS_RECHECK'				=> 'Re-check',
+    'LBL_CHECKSYS_SAFE_MODE'			=> 'PHP Safe Mode Turned Off',
+    'LBL_CHECKSYS_SESSION'				=> 'Writable Session Save Path (',
+    'LBL_CHECKSYS_STATUS'				=> 'Status',
+    'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
+    'LBL_CHECKSYS_VER'					=> 'Found: ( ver ',
+    'LBL_CHECKSYS_XML'					=> 'XML Parsing',
+    'LBL_CHECKSYS_ZLIB'					=> 'ZLIB Compression Module',
+    'LBL_CHECKSYS_ZIP'					=> 'ZIP Handling Module',
+    'LBL_CHECKSYS_PCRE'					=> 'PCRE Library',
+    'LBL_CHECKSYS_FIX_FILES'            => 'Please fix the following files or directories before proceeding:',
     'LBL_CHECKSYS_FIX_MODULE_FILES'     => 'Please fix the following module directories and the files under them before proceeding:',
     'LBL_CHECKSYS_UPLOAD'               => 'Writable Upload Directory',
     'LBL_CLOSE'							=> 'Close',
     'LBL_THREE'                         => '3',
-	'LBL_CONFIRM_BE_CREATED'			=> 'be created',
-	'LBL_CONFIRM_DB_TYPE'				=> 'Database Type',
-	'LBL_CONFIRM_DIRECTIONS'			=> 'Please confirm the settings below.  If you would like to change any of the values, click "Back" to edit.  Otherwise, click "Next" to start the installation.',
-	'LBL_CONFIRM_LICENSE_TITLE'			=> 'License Information',
-	'LBL_CONFIRM_NOT'					=> 'not',
-	'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
-	'LBL_CONFIRM_WILL'					=> 'will',
-	'LBL_DBCONF_CREATE_DB'				=> 'Create Database',
-	'LBL_DBCONF_CREATE_USER'			=> 'Create User',
-	'LBL_DBCONF_DB_DROP_CREATE_WARN'	=> 'Caution: All SuiteCRM data will be erased<br>if this box is checked.',
-	'LBL_DBCONF_DB_DROP_CREATE'			=> 'Drop and Recreate Existing SuiteCRM tables?',
+    'LBL_CONFIRM_BE_CREATED'			=> 'be created',
+    'LBL_CONFIRM_DB_TYPE'				=> 'Database Type',
+    'LBL_CONFIRM_DIRECTIONS'			=> 'Please confirm the settings below.  If you would like to change any of the values, click "Back" to edit.  Otherwise, click "Next" to start the installation.',
+    'LBL_CONFIRM_LICENSE_TITLE'			=> 'License Information',
+    'LBL_CONFIRM_NOT'					=> 'not',
+    'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
+    'LBL_CONFIRM_WILL'					=> 'will',
+    'LBL_DBCONF_CREATE_DB'				=> 'Create Database',
+    'LBL_DBCONF_CREATE_USER'			=> 'Create User',
+    'LBL_DBCONF_DB_DROP_CREATE_WARN'	=> 'Caution: All SuiteCRM data will be erased<br>if this box is checked.',
+    'LBL_DBCONF_DB_DROP_CREATE'			=> 'Drop and Recreate Existing SuiteCRM tables?',
     'LBL_DBCONF_DB_DROP'                => 'Drop Tables',
     'LBL_DBCONF_DB_NAME'				=> 'Database Name',
-	'LBL_DBCONF_DB_PASSWORD'			=> 'SuiteCRM Database User Password',
-	'LBL_DBCONF_DB_PASSWORD2'			=> 'Re-enter SuiteCRM Database User Password',
-	'LBL_DBCONF_DB_USER'				=> 'SuiteCRM Database User',
+    'LBL_DBCONF_DB_PASSWORD'			=> 'SuiteCRM Database User Password',
+    'LBL_DBCONF_DB_PASSWORD2'			=> 'Re-enter SuiteCRM Database User Password',
+    'LBL_DBCONF_DB_USER'				=> 'SuiteCRM Database User',
     'LBL_DBCONF_SUGAR_DB_USER'          => 'SuiteCRM Database User',
     'LBL_DBCONF_DB_ADMIN_USER'          => 'Database Administrator Username',
     'LBL_DBCONF_DB_ADMIN_PASSWORD'      => 'Database Admin Password',
-	'LBL_DBCONF_DEMO_DATA'				=> 'Populate Database with Demo Data?',
+    'LBL_DBCONF_DEMO_DATA'				=> 'Populate Database with Demo Data?',
     'LBL_DBCONF_DEMO_DATA_TITLE'        => 'Choose Demo Data',
-	'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
-	'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
-	'LBL_DBCONF_HOST_PORT'				=> 'Port',
-	'LBL_DBCONF_INSTRUCTIONS'			=> 'Please enter your database configuration information below. If you are unsure of what to fill in, we suggest that you use the default values.',
-	'LBL_DBCONF_MB_DEMO_DATA'			=> 'Use multi-byte text in demo data?',
+    'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
+    'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
+    'LBL_DBCONF_HOST_PORT'				=> 'Port',
+    'LBL_DBCONF_INSTRUCTIONS'			=> 'Please enter your database configuration information below. If you are unsure of what to fill in, we suggest that you use the default values.',
+    'LBL_DBCONF_MB_DEMO_DATA'			=> 'Use multi-byte text in demo data?',
     'LBL_DBCONFIG_MSG2'                 => 'Name of web server or machine (host) on which the database is located ( such as localhost or www.mydomain.com ):',
-	'LBL_DBCONFIG_MSG2_LABEL' => 'Host Name',
+    'LBL_DBCONFIG_MSG2_LABEL' => 'Host Name',
     'LBL_DBCONFIG_MSG3'                 => 'Name of the database that will contain the data for the SuiteCRM instance you are about to install:',
-	'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',
+    'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',
     'LBL_DBCONFIG_B_MSG1'               => 'The username and password of a database administrator who can create database tables and users and who can write to the database is necessary in order to set up the SuiteCRM database.',
-	'LBL_DBCONFIG_B_MSG1_LABEL' => '',
+    'LBL_DBCONFIG_B_MSG1_LABEL' => '',
     'LBL_DBCONFIG_SECURITY'             => 'For security purposes, you can specify an exclusive database user to connect to the SuiteCRM database.  This user must be able to write, update and retrieve data on the SuiteCRM database that will be created for this instance.  This user can be the database administrator specified above, or you can provide new or existing database user information.',
     'LBL_DBCONFIG_AUTO_DD'              => 'Do it for me',
     'LBL_DBCONFIG_PROVIDE_DD'           => 'Provide existing user',
     'LBL_DBCONFIG_CREATE_DD'            => 'Define user to create',
     'LBL_DBCONFIG_SAME_DD'              => 'Same as Admin User',
-	//'LBL_DBCONF_I18NFIX'              => 'Apply database column expansion for varchar and char types (up to 255) for multi-byte data?',
+    //'LBL_DBCONF_I18NFIX'              => 'Apply database column expansion for varchar and char types (up to 255) for multi-byte data?',
     'LBL_FTS'                           => 'Full Text Search',
     'LBL_FTS_INSTALLED'                 => 'Installed',
     'LBL_FTS_INSTALLED_ERR1'            => 'Full Text Search capability is not installed.',
     'LBL_FTS_INSTALLED_ERR2'            => 'You can still install but will not be able to use Full Text Search functionality.  Please refer to your database server install guide on how to do this, or contact your Administrator.',
-	'LBL_DBCONF_PRIV_PASS'				=> 'Privileged Database User Password',
-	'LBL_DBCONF_PRIV_USER_2'			=> 'Database Account Above Is a Privileged User?',
-	'LBL_DBCONF_PRIV_USER_DIRECTIONS'	=> 'This privileged database user must have the proper permissions to create a database, drop/create tables, and create a user.  This privileged database user will only be used to perform these tasks as needed during the installation process.  You may also use the same database user as above if that user has sufficient privileges.',
-	'LBL_DBCONF_PRIV_USER'				=> 'Privileged Database User Name',
-	'LBL_DBCONF_TITLE'					=> 'Database Configuration',
+    'LBL_DBCONF_PRIV_PASS'				=> 'Privileged Database User Password',
+    'LBL_DBCONF_PRIV_USER_2'			=> 'Database Account Above Is a Privileged User?',
+    'LBL_DBCONF_PRIV_USER_DIRECTIONS'	=> 'This privileged database user must have the proper permissions to create a database, drop/create tables, and create a user.  This privileged database user will only be used to perform these tasks as needed during the installation process.  You may also use the same database user as above if that user has sufficient privileges.',
+    'LBL_DBCONF_PRIV_USER'				=> 'Privileged Database User Name',
+    'LBL_DBCONF_TITLE'					=> 'Database Configuration',
     'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
     'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
-	'LBL_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
-	'LBL_DBCONF_TITLE_PSWD_INFO_LABEL' => 'Password',
-	'LBL_DISABLED_DESCRIPTION_2'		=> 'After this change has been made, you may click the "Start" button below to begin your installation.  <i>After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.</i>',
-	'LBL_DISABLED_DESCRIPTION'			=> 'The installer has already been run once.  As a safety measure, it has been disabled from running a second time.  If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'.  The line should look like this:',
-	'LBL_DISABLED_HELP_1'				=> 'For installation help, please visit the SuiteCRM',
+    'LBL_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
+    'LBL_DBCONF_TITLE_PSWD_INFO_LABEL' => 'Password',
+    'LBL_DISABLED_DESCRIPTION_2'		=> 'After this change has been made, you may click the "Start" button below to begin your installation.  <i>After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.</i>',
+    'LBL_DISABLED_DESCRIPTION'			=> 'The installer has already been run once.  As a safety measure, it has been disabled from running a second time.  If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'.  The line should look like this:',
+    'LBL_DISABLED_HELP_1'				=> 'For installation help, please visit the SuiteCRM',
     'LBL_DISABLED_HELP_LNK'             => 'http://www.suitecrm.com/forum/index',
-	'LBL_DISABLED_HELP_2'				=> 'support forums',
-	'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
-	'LBL_DISABLED_TITLE'				=> 'SuiteCRM Installation Disabled',
-	'LBL_EMAIL_CHARSET_DESC'			=> 'Character Set most commonly used in your locale',
-	'LBL_EMAIL_CHARSET_TITLE'			=> 'Outbound Email Settings',
+    'LBL_DISABLED_HELP_2'				=> 'support forums',
+    'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
+    'LBL_DISABLED_TITLE'				=> 'SuiteCRM Installation Disabled',
+    'LBL_EMAIL_CHARSET_DESC'			=> 'Character Set most commonly used in your locale',
+    'LBL_EMAIL_CHARSET_TITLE'			=> 'Outbound Email Settings',
     'LBL_EMAIL_CHARSET_CONF'            => 'Character Set for Outbound Email ',
-	'LBL_HELP'							=> 'Help',
+    'LBL_HELP'							=> 'Help',
     'LBL_INSTALL'                       => 'Install',
     'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
     'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
@@ -275,158 +275,158 @@ 
     'LBL_INSTALL_TYPE_MSG1'             => 'The key is required for general application functionality, but it is not required for installation. You do not need to enter the key at this time, but you will need to provide the key after you have installed the application.',
     'LBL_INSTALL_TYPE_MSG2'             => 'Requires minimum information for the installation. Recommended for new users.',
     'LBL_INSTALL_TYPE_MSG3'             => 'Provides additional options to set during the installation. Most of these options are also available after installation in the admin screens. Recommended for advanced users.',
-	'LBL_LANG_1'						=> 'To use a language in SuiteCRM other than the default language (US-English), you can upload and install the language pack at this time. You will be able to upload and install language packs from within the SuiteCRM application as well.  If you would like to skip this step, click Next.',
-	'LBL_LANG_BUTTON_COMMIT'			=> 'Install',
-	'LBL_LANG_BUTTON_REMOVE'			=> 'Remove',
-	'LBL_LANG_BUTTON_UNINSTALL'			=> 'Uninstall',
-	'LBL_LANG_BUTTON_UPLOAD'			=> 'Upload',
-	'LBL_LANG_NO_PACKS'					=> 'none',
-	'LBL_LANG_PACK_INSTALLED'			=> 'The following language packs have been installed: ',
-	'LBL_LANG_PACK_READY'				=> 'The following language packs are ready to be installed: ',
-	'LBL_LANG_SUCCESS'					=> 'The language pack was successfully uploaded.',
-	'LBL_LANG_TITLE'			   		=> 'Language Pack',
+    'LBL_LANG_1'						=> 'To use a language in SuiteCRM other than the default language (US-English), you can upload and install the language pack at this time. You will be able to upload and install language packs from within the SuiteCRM application as well.  If you would like to skip this step, click Next.',
+    'LBL_LANG_BUTTON_COMMIT'			=> 'Install',
+    'LBL_LANG_BUTTON_REMOVE'			=> 'Remove',
+    'LBL_LANG_BUTTON_UNINSTALL'			=> 'Uninstall',
+    'LBL_LANG_BUTTON_UPLOAD'			=> 'Upload',
+    'LBL_LANG_NO_PACKS'					=> 'none',
+    'LBL_LANG_PACK_INSTALLED'			=> 'The following language packs have been installed: ',
+    'LBL_LANG_PACK_READY'				=> 'The following language packs are ready to be installed: ',
+    'LBL_LANG_SUCCESS'					=> 'The language pack was successfully uploaded.',
+    'LBL_LANG_TITLE'			   		=> 'Language Pack',
     'LBL_LAUNCHING_SILENT_INSTALL'     => 'Installing SuiteCRM now.  This may take up to a few minutes.',
-	'LBL_LANG_UPLOAD'					=> 'Upload a Language Pack',
-	'LBL_LICENSE_ACCEPTANCE'			=> 'License Acceptance',
+    'LBL_LANG_UPLOAD'					=> 'Upload a Language Pack',
+    'LBL_LICENSE_ACCEPTANCE'			=> 'License Acceptance',
     'LBL_LICENSE_CHECKING'              => 'Checking system for compatibility.',
     'LBL_LICENSE_CHKENV_HEADER'         => 'Checking Environment',
     'LBL_LICENSE_CHKDB_HEADER'          => 'Verifying DB Credentials.',
     'LBL_LICENSE_CHECK_PASSED'          => 'System passed check for compatibility.',
-	'LBL_CREATE_CACHE' => 'Preparing to Install...',
+    'LBL_CREATE_CACHE' => 'Preparing to Install...',
     'LBL_LICENSE_REDIRECT'              => 'Redirecting in ',
-	'LBL_LICENSE_DIRECTIONS'			=> 'If you have your license information, please enter it in the fields below.',
-	'LBL_LICENSE_DOWNLOAD_KEY'			=> 'Enter Download Key',
-	'LBL_LICENSE_EXPIRY'				=> 'Expiration Date',
-	'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
-	'LBL_LICENSE_NUM_USERS'				=> 'Number of Users',
-	'LBL_LICENSE_OC_DIRECTIONS'			=> 'Please enter the number of purchased offline clients.',
-	'LBL_LICENSE_OC_NUM'				=> 'Number of Offline Client Licenses',
-	'LBL_LICENSE_OC'					=> 'Offline Client Licenses',
-	'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
+    'LBL_LICENSE_DIRECTIONS'			=> 'If you have your license information, please enter it in the fields below.',
+    'LBL_LICENSE_DOWNLOAD_KEY'			=> 'Enter Download Key',
+    'LBL_LICENSE_EXPIRY'				=> 'Expiration Date',
+    'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
+    'LBL_LICENSE_NUM_USERS'				=> 'Number of Users',
+    'LBL_LICENSE_OC_DIRECTIONS'			=> 'Please enter the number of purchased offline clients.',
+    'LBL_LICENSE_OC_NUM'				=> 'Number of Offline Client Licenses',
+    'LBL_LICENSE_OC'					=> 'Offline Client Licenses',
+    'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
     'LBL_PRINT_SUMM'                    => 'Print Summary',
-	'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
-	'LBL_LICENSE_TITLE'					=> 'License Information',
-	'LBL_LICENSE_USERS'					=> 'Licensed Users',
-
-	'LBL_LOCALE_CURRENCY'				=> 'Currency Settings',
-	'LBL_LOCALE_CURR_DEFAULT'			=> 'Default Currency',
-	'LBL_LOCALE_CURR_SYMBOL'			=> 'Currency Symbol',
-	'LBL_LOCALE_CURR_ISO'				=> 'Currency Code (ISO 4217)',
-	'LBL_LOCALE_CURR_1000S'				=> '1000s Separator',
-	'LBL_LOCALE_CURR_DECIMAL'			=> 'Decimal Separator',
-	'LBL_LOCALE_CURR_EXAMPLE'			=> 'Example',
-	'LBL_LOCALE_CURR_SIG_DIGITS'		=> 'Significant Digits',
-	'LBL_LOCALE_DATEF'					=> 'Default Date Format',
-	'LBL_LOCALE_DESC'					=> 'The specified locale settings will be reflected globally within the SuiteCRM instance.',
-	'LBL_LOCALE_EXPORT'					=> 'Character Set for Import/Export<br> <i>(Email, .csv, vCard, PDF, data import)</i>',
-	'LBL_LOCALE_EXPORT_DELIMITER'		=> 'Export (.csv) Delimiter',
-	'LBL_LOCALE_EXPORT_TITLE'			=> 'Import/Export Settings',
-	'LBL_LOCALE_LANG'					=> 'Default Language',
-	'LBL_LOCALE_NAMEF'					=> 'Default Name Format',
-	'LBL_LOCALE_NAMEF_DESC'				=> 's = salutation<br />f = first name<br />l = last name',
-	'LBL_LOCALE_NAME_FIRST'				=> 'David',
-	'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
-	'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
-	'LBL_LOCALE_TIMEF'					=> 'Default Time Format',
-	'LBL_LOCALE_TITLE'					=> 'Locale Settings',
+    'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
+    'LBL_LICENSE_TITLE'					=> 'License Information',
+    'LBL_LICENSE_USERS'					=> 'Licensed Users',
+
+    'LBL_LOCALE_CURRENCY'				=> 'Currency Settings',
+    'LBL_LOCALE_CURR_DEFAULT'			=> 'Default Currency',
+    'LBL_LOCALE_CURR_SYMBOL'			=> 'Currency Symbol',
+    'LBL_LOCALE_CURR_ISO'				=> 'Currency Code (ISO 4217)',
+    'LBL_LOCALE_CURR_1000S'				=> '1000s Separator',
+    'LBL_LOCALE_CURR_DECIMAL'			=> 'Decimal Separator',
+    'LBL_LOCALE_CURR_EXAMPLE'			=> 'Example',
+    'LBL_LOCALE_CURR_SIG_DIGITS'		=> 'Significant Digits',
+    'LBL_LOCALE_DATEF'					=> 'Default Date Format',
+    'LBL_LOCALE_DESC'					=> 'The specified locale settings will be reflected globally within the SuiteCRM instance.',
+    'LBL_LOCALE_EXPORT'					=> 'Character Set for Import/Export<br> <i>(Email, .csv, vCard, PDF, data import)</i>',
+    'LBL_LOCALE_EXPORT_DELIMITER'		=> 'Export (.csv) Delimiter',
+    'LBL_LOCALE_EXPORT_TITLE'			=> 'Import/Export Settings',
+    'LBL_LOCALE_LANG'					=> 'Default Language',
+    'LBL_LOCALE_NAMEF'					=> 'Default Name Format',
+    'LBL_LOCALE_NAMEF_DESC'				=> 's = salutation<br />f = first name<br />l = last name',
+    'LBL_LOCALE_NAME_FIRST'				=> 'David',
+    'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
+    'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
+    'LBL_LOCALE_TIMEF'					=> 'Default Time Format',
+    'LBL_LOCALE_TITLE'					=> 'Locale Settings',
     'LBL_CUSTOMIZE_LOCALE'              => 'Customize Locale Settings',
-	'LBL_LOCALE_UI'						=> 'User Interface',
-
-	'LBL_ML_ACTION'						=> 'Action',
-	'LBL_ML_DESCRIPTION'				=> 'Description',
-	'LBL_ML_INSTALLED'					=> 'Date Installed',
-	'LBL_ML_NAME'						=> 'Name',
-	'LBL_ML_PUBLISHED'					=> 'Date Published',
-	'LBL_ML_TYPE'						=> 'Type',
-	'LBL_ML_UNINSTALLABLE'				=> 'Uninstallable',
-	'LBL_ML_VERSION'					=> 'Version',
-	'LBL_MSSQL'							=> 'SQL Server',
-	'LBL_MSSQL2'                        => 'SQL Server (FreeTDS)',
-	'LBL_MSSQL_SQLSRV'				    => 'SQL Server (Microsoft SQL Server Driver for PHP)',
-	'LBL_MYSQL'							=> 'MySQL',
+    'LBL_LOCALE_UI'						=> 'User Interface',
+
+    'LBL_ML_ACTION'						=> 'Action',
+    'LBL_ML_DESCRIPTION'				=> 'Description',
+    'LBL_ML_INSTALLED'					=> 'Date Installed',
+    'LBL_ML_NAME'						=> 'Name',
+    'LBL_ML_PUBLISHED'					=> 'Date Published',
+    'LBL_ML_TYPE'						=> 'Type',
+    'LBL_ML_UNINSTALLABLE'				=> 'Uninstallable',
+    'LBL_ML_VERSION'					=> 'Version',
+    'LBL_MSSQL'							=> 'SQL Server',
+    'LBL_MSSQL2'                        => 'SQL Server (FreeTDS)',
+    'LBL_MSSQL_SQLSRV'				    => 'SQL Server (Microsoft SQL Server Driver for PHP)',
+    'LBL_MYSQL'							=> 'MySQL',
     'LBL_MYSQLI'						=> 'MySQL (mysqli extension)',
-	'LBL_IBM_DB2'						=> 'IBM DB2',
-	'LBL_NEXT'							=> 'Next',
-	'LBL_NO'							=> 'No',
+    'LBL_IBM_DB2'						=> 'IBM DB2',
+    'LBL_NEXT'							=> 'Next',
+    'LBL_NO'							=> 'No',
     'LBL_ORACLE'						=> 'Oracle',
-	'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
-	'LBL_PERFORM_AUDIT_TABLE'			=> 'audit table / ',
-	'LBL_PERFORM_CONFIG_PHP'			=> 'Creating SuiteCRM configuration file',
-	'LBL_PERFORM_CREATE_DB_1'			=> '<b>Creating the database</b> ',
-	'LBL_PERFORM_CREATE_DB_2'			=> ' <b>on</b> ',
-	'LBL_PERFORM_CREATE_DB_USER'		=> 'Creating the Database username and password...',
-	'LBL_PERFORM_CREATE_DEFAULT'		=> 'Creating default SuiteCRM data',
-	'LBL_PERFORM_CREATE_LOCALHOST'		=> 'Creating the Database username and password for localhost...',
-	'LBL_PERFORM_CREATE_RELATIONSHIPS'	=> 'Creating SuiteCRM relationship tables',
-	'LBL_PERFORM_CREATING'				=> 'creating / ',
-	'LBL_PERFORM_DEFAULT_REPORTS'		=> 'Creating default reports',
-	'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
-	'LBL_PERFORM_DEFAULT_SETTINGS'		=> 'Inserting default settings',
-	'LBL_PERFORM_DEFAULT_USERS'			=> 'Creating default users',
-	'LBL_PERFORM_DEMO_DATA'				=> 'Populating the database tables with demo data (this may take a little while)',
-	'LBL_PERFORM_DONE'					=> 'done<br>',
-	'LBL_PERFORM_DROPPING'				=> 'dropping / ',
-	'LBL_PERFORM_FINISH'				=> 'Finish',
-	'LBL_PERFORM_LICENSE_SETTINGS'		=> 'Updating license information',
-	'LBL_PERFORM_OUTRO_1'				=> 'The setup of SuiteCRM ',
-	'LBL_PERFORM_OUTRO_2'				=> ' is now complete!',
-	'LBL_PERFORM_OUTRO_3'				=> 'Total time: ',
-	'LBL_PERFORM_OUTRO_4'				=> ' seconds.',
-	'LBL_PERFORM_OUTRO_5'				=> 'Approximate memory used: ',
-	'LBL_PERFORM_OUTRO_6'				=> ' bytes.',
-	'LBL_PERFORM_OUTRO_7'				=> 'Your system is now installed and configured for use.',
-	'LBL_PERFORM_REL_META'				=> 'relationship meta ... ',
-	'LBL_PERFORM_SUCCESS'				=> 'Success!',
-	'LBL_PERFORM_TABLES'				=> 'Creating SuiteCRM application tables, audit tables and relationship metadata',
-	'LBL_PERFORM_TITLE'					=> 'Perform Setup',
-	'LBL_PRINT'							=> 'Print',
-	'LBL_REG_CONF_1'					=> 'Please complete the short form below to receive product announcements, training news, special offers and special event invitations from SuiteCRM. We do not sell, rent, share or otherwise distribute the information collected here to third parties.',
-	'LBL_REG_CONF_2'					=> 'Your name and email address are the only required fields for registration. All other fields are optional, but very helpful. We do not sell, rent, share, or otherwise distribute the information collected here to third parties.',
-	'LBL_REG_CONF_3'					=> 'Thank you for registering. Click on the Finish button to login to SuiteCRM. You will need to log in for the first time using the username "admin" and the password you entered in step 2.',
-	'LBL_REG_TITLE'						=> 'Registration',
+    'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
+    'LBL_PERFORM_AUDIT_TABLE'			=> 'audit table / ',
+    'LBL_PERFORM_CONFIG_PHP'			=> 'Creating SuiteCRM configuration file',
+    'LBL_PERFORM_CREATE_DB_1'			=> '<b>Creating the database</b> ',
+    'LBL_PERFORM_CREATE_DB_2'			=> ' <b>on</b> ',
+    'LBL_PERFORM_CREATE_DB_USER'		=> 'Creating the Database username and password...',
+    'LBL_PERFORM_CREATE_DEFAULT'		=> 'Creating default SuiteCRM data',
+    'LBL_PERFORM_CREATE_LOCALHOST'		=> 'Creating the Database username and password for localhost...',
+    'LBL_PERFORM_CREATE_RELATIONSHIPS'	=> 'Creating SuiteCRM relationship tables',
+    'LBL_PERFORM_CREATING'				=> 'creating / ',
+    'LBL_PERFORM_DEFAULT_REPORTS'		=> 'Creating default reports',
+    'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
+    'LBL_PERFORM_DEFAULT_SETTINGS'		=> 'Inserting default settings',
+    'LBL_PERFORM_DEFAULT_USERS'			=> 'Creating default users',
+    'LBL_PERFORM_DEMO_DATA'				=> 'Populating the database tables with demo data (this may take a little while)',
+    'LBL_PERFORM_DONE'					=> 'done<br>',
+    'LBL_PERFORM_DROPPING'				=> 'dropping / ',
+    'LBL_PERFORM_FINISH'				=> 'Finish',
+    'LBL_PERFORM_LICENSE_SETTINGS'		=> 'Updating license information',
+    'LBL_PERFORM_OUTRO_1'				=> 'The setup of SuiteCRM ',
+    'LBL_PERFORM_OUTRO_2'				=> ' is now complete!',
+    'LBL_PERFORM_OUTRO_3'				=> 'Total time: ',
+    'LBL_PERFORM_OUTRO_4'				=> ' seconds.',
+    'LBL_PERFORM_OUTRO_5'				=> 'Approximate memory used: ',
+    'LBL_PERFORM_OUTRO_6'				=> ' bytes.',
+    'LBL_PERFORM_OUTRO_7'				=> 'Your system is now installed and configured for use.',
+    'LBL_PERFORM_REL_META'				=> 'relationship meta ... ',
+    'LBL_PERFORM_SUCCESS'				=> 'Success!',
+    'LBL_PERFORM_TABLES'				=> 'Creating SuiteCRM application tables, audit tables and relationship metadata',
+    'LBL_PERFORM_TITLE'					=> 'Perform Setup',
+    'LBL_PRINT'							=> 'Print',
+    'LBL_REG_CONF_1'					=> 'Please complete the short form below to receive product announcements, training news, special offers and special event invitations from SuiteCRM. We do not sell, rent, share or otherwise distribute the information collected here to third parties.',
+    'LBL_REG_CONF_2'					=> 'Your name and email address are the only required fields for registration. All other fields are optional, but very helpful. We do not sell, rent, share, or otherwise distribute the information collected here to third parties.',
+    'LBL_REG_CONF_3'					=> 'Thank you for registering. Click on the Finish button to login to SuiteCRM. You will need to log in for the first time using the username "admin" and the password you entered in step 2.',
+    'LBL_REG_TITLE'						=> 'Registration',
     'LBL_REG_NO_THANKS'                 => 'No Thanks',
     'LBL_REG_SKIP_THIS_STEP'            => 'Skip this Step',
-	'LBL_REQUIRED'						=> '* Required field',
+    'LBL_REQUIRED'						=> '* Required field',
 
     'LBL_SITECFG_ADMIN_Name'            => 'SuiteCRM Application Admin Name',
-	'LBL_SITECFG_ADMIN_PASS_2'			=> 'Re-enter SuiteCRM Admin User Password',
-	'LBL_SITECFG_ADMIN_PASS_WARN'		=> 'Caution: This will override the admin password of any previous installation.',
-	'LBL_SITECFG_ADMIN_PASS'			=> 'SuiteCRM Admin User Password',
-	'LBL_SITECFG_APP_ID'				=> 'Application ID',
-	'LBL_SITECFG_CUSTOM_ID_DIRECTIONS'	=> 'If selected, you must provide an application ID to override the auto-generated ID. The ID ensures that sessions of one SuiteCRM instance are not used by other instances.  If you have a cluster of SuiteCRM installations, they all must share the same application ID.',
-	'LBL_SITECFG_CUSTOM_ID'				=> 'Provide Your Own Application ID',
-	'LBL_SITECFG_CUSTOM_LOG_DIRECTIONS'	=> 'If selected, you must specify a log directory to override the default directory for the SuiteCRM log. Regardless of where the log file is located, access to it through a web browser will be restricted via an .htaccess redirect.',
-	'LBL_SITECFG_CUSTOM_LOG'			=> 'Use a Custom Log Directory',
-	'LBL_SITECFG_CUSTOM_SESSION_DIRECTIONS'	=> 'If selected, you must provide a secure folder for storing SuiteCRM session information. This can be done to prevent session data from being vulnerable on shared servers.',
-	'LBL_SITECFG_CUSTOM_SESSION'		=> 'Use a Custom Session Directory for SuiteCRM',
-	'LBL_SITECFG_DIRECTIONS'			=> 'Please enter your site configuration information below. If you are unsure of the fields, we suggest that you use the default values.',
-	'LBL_SITECFG_FIX_ERRORS'			=> '<b>Please fix the following errors before proceeding:</b>',
-	'LBL_SITECFG_LOG_DIR'				=> 'Log Directory',
-	'LBL_SITECFG_SESSION_PATH'			=> 'Path to Session Directory<br>(must be writable)',
-	'LBL_SITECFG_SITE_SECURITY'			=> 'Select Security Options',
-	'LBL_SITECFG_SUGAR_UP_DIRECTIONS'	=> 'If selected, the system will periodically check for updated versions of the application.',
-	'LBL_SITECFG_SUGAR_UP'				=> 'Automatically Check For Updates?',
-	'LBL_SITECFG_SUGAR_UPDATES'			=> 'SuiteCRM Updates Config',
-	'LBL_SITECFG_TITLE'					=> 'Site Configuration',
+    'LBL_SITECFG_ADMIN_PASS_2'			=> 'Re-enter SuiteCRM Admin User Password',
+    'LBL_SITECFG_ADMIN_PASS_WARN'		=> 'Caution: This will override the admin password of any previous installation.',
+    'LBL_SITECFG_ADMIN_PASS'			=> 'SuiteCRM Admin User Password',
+    'LBL_SITECFG_APP_ID'				=> 'Application ID',
+    'LBL_SITECFG_CUSTOM_ID_DIRECTIONS'	=> 'If selected, you must provide an application ID to override the auto-generated ID. The ID ensures that sessions of one SuiteCRM instance are not used by other instances.  If you have a cluster of SuiteCRM installations, they all must share the same application ID.',
+    'LBL_SITECFG_CUSTOM_ID'				=> 'Provide Your Own Application ID',
+    'LBL_SITECFG_CUSTOM_LOG_DIRECTIONS'	=> 'If selected, you must specify a log directory to override the default directory for the SuiteCRM log. Regardless of where the log file is located, access to it through a web browser will be restricted via an .htaccess redirect.',
+    'LBL_SITECFG_CUSTOM_LOG'			=> 'Use a Custom Log Directory',
+    'LBL_SITECFG_CUSTOM_SESSION_DIRECTIONS'	=> 'If selected, you must provide a secure folder for storing SuiteCRM session information. This can be done to prevent session data from being vulnerable on shared servers.',
+    'LBL_SITECFG_CUSTOM_SESSION'		=> 'Use a Custom Session Directory for SuiteCRM',
+    'LBL_SITECFG_DIRECTIONS'			=> 'Please enter your site configuration information below. If you are unsure of the fields, we suggest that you use the default values.',
+    'LBL_SITECFG_FIX_ERRORS'			=> '<b>Please fix the following errors before proceeding:</b>',
+    'LBL_SITECFG_LOG_DIR'				=> 'Log Directory',
+    'LBL_SITECFG_SESSION_PATH'			=> 'Path to Session Directory<br>(must be writable)',
+    'LBL_SITECFG_SITE_SECURITY'			=> 'Select Security Options',
+    'LBL_SITECFG_SUGAR_UP_DIRECTIONS'	=> 'If selected, the system will periodically check for updated versions of the application.',
+    'LBL_SITECFG_SUGAR_UP'				=> 'Automatically Check For Updates?',
+    'LBL_SITECFG_SUGAR_UPDATES'			=> 'SuiteCRM Updates Config',
+    'LBL_SITECFG_TITLE'					=> 'Site Configuration',
     'LBL_SITECFG_TITLE2'                => 'Identify Administration User',
     'LBL_SITECFG_SECURITY_TITLE'        => 'Site Security',
-	'LBL_SITECFG_URL'					=> 'URL of SuiteCRM Instance',
-	'LBL_SITECFG_USE_DEFAULTS'			=> 'Use Defaults?',
-	'LBL_SITECFG_ANONSTATS'             => 'Send Anonymous Usage Statistics?',
-	'LBL_SITECFG_ANONSTATS_DIRECTIONS'  => 'If selected, SuiteCRM will send <b>anonymous</b> statistics about your installation to SuiteCRM Inc. every time your system checks for new versions. This information will help us better understand how the application is used and guide improvements to the product.',
+    'LBL_SITECFG_URL'					=> 'URL of SuiteCRM Instance',
+    'LBL_SITECFG_USE_DEFAULTS'			=> 'Use Defaults?',
+    'LBL_SITECFG_ANONSTATS'             => 'Send Anonymous Usage Statistics?',
+    'LBL_SITECFG_ANONSTATS_DIRECTIONS'  => 'If selected, SuiteCRM will send <b>anonymous</b> statistics about your installation to SuiteCRM Inc. every time your system checks for new versions. This information will help us better understand how the application is used and guide improvements to the product.',
     'LBL_SITECFG_URL_MSG'               => 'Enter the URL that will be used to access the SuiteCRM instance after installation. The URL will also be used as a base for the URLs in the SuiteCRM application pages. The URL should include the web server or machine name or IP address.',
     'LBL_SITECFG_SYS_NAME_MSG'          => 'Enter a name for your system.  This name will be displayed in the browser title bar when users visit the SuiteCRM application.',
     'LBL_SITECFG_PASSWORD_MSG'          => 'After installation, you will need to use the SuiteCRM admin user (default username = admin) to log in to the SuiteCRM instance.  Enter a password for this administrator user. This password can be changed after the initial login.  You may also enter another admin username to use besides the default value provided.',
     'LBL_SITECFG_COLLATION_MSG'         => 'Select collation (sorting) settings for your system. This settings will create the tables with the specific language you use. In case your language doesn\'t require special settings please use default value.',
     'LBL_SPRITE_SUPPORT'                => 'Sprite Support',
-	'LBL_SYSTEM_CREDS'                  => 'System Credentials',
+    'LBL_SYSTEM_CREDS'                  => 'System Credentials',
     'LBL_SYSTEM_ENV'                    => 'System Environment',
-	'LBL_START'							=> 'Start',
+    'LBL_START'							=> 'Start',
     'LBL_SHOW_PASS'                     => 'Show Passwords',
     'LBL_HIDE_PASS'                     => 'Hide Passwords',
     'LBL_HIDDEN'                        => '<i>(hidden)</i>',
-	'LBL_STEP1' => 'Step 1 of 2 - Pre-Installation requirements',
-	'LBL_STEP2' => 'Step 2 of 2 - Configuration',
+    'LBL_STEP1' => 'Step 1 of 2 - Pre-Installation requirements',
+    'LBL_STEP2' => 'Step 2 of 2 - Configuration',
 //    'LBL_STEP1'                         => 'Step 1 of 8 - Pre-Installation requirements',
 //    'LBL_STEP2'                         => 'Step 2 of 8 - License Agreement',
 //    'LBL_STEP3'                         => 'Step 3 of 8 - Installation Type',
@@ -436,11 +436,11 @@ 
 //    'LBL_STEP7'                         => 'Step 7 of 8 - Confirm Settings',
 //    'LBL_STEP8'                         => 'Step 8 of 8 - Installation Successful',
 //	'LBL_NO_THANKS'						=> 'Continue to installer',
-	'LBL_CHOOSE_LANG'					=> '<b>Choose your language</b>',
-	'LBL_STEP'							=> 'Step',
-	'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
-	'LBL_WELCOME_1'						=> 'This installer creates the SuiteCRM database tables and sets the configuration variables that you need to start. The entire process should take about ten minutes.',
-	'LBL_WELCOME_2'						=> 'For installation documentation, please visit the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM</a>.  <BR><BR> You can also find help from the SuiteCRM Community in the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM Forums</a>.',
+    'LBL_CHOOSE_LANG'					=> '<b>Choose your language</b>',
+    'LBL_STEP'							=> 'Step',
+    'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
+    'LBL_WELCOME_1'						=> 'This installer creates the SuiteCRM database tables and sets the configuration variables that you need to start. The entire process should take about ten minutes.',
+    'LBL_WELCOME_2'						=> 'For installation documentation, please visit the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM</a>.  <BR><BR> You can also find help from the SuiteCRM Community in the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM Forums</a>.',
     //welcome page variables
     'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
     'REQUIRED_SYS_COMP' => 'Required System Components',
@@ -523,20 +523,20 @@ 
                                 ',
     'LBL_WELCOME_PLEASE_READ_BELOW' => 'Please read the following important information before proceeding with the installation.  The information will help you determine whether or not you are ready to install the application at this time.',
 
-	'LBL_WELCOME_CHOOSE_LANGUAGE'		=> '<b>Choose your language</b>',
-	'LBL_WELCOME_SETUP_WIZARD'			=> 'Setup Wizard',
-	'LBL_WELCOME_TITLE_WELCOME'			=> 'Welcome to the SuiteCRM ',
-	'LBL_WELCOME_TITLE'					=> 'SuiteCRM Setup Wizard',
-	'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
-	'LBL_YES'							=> 'Yes',
+    'LBL_WELCOME_CHOOSE_LANGUAGE'		=> '<b>Choose your language</b>',
+    'LBL_WELCOME_SETUP_WIZARD'			=> 'Setup Wizard',
+    'LBL_WELCOME_TITLE_WELCOME'			=> 'Welcome to the SuiteCRM ',
+    'LBL_WELCOME_TITLE'					=> 'SuiteCRM Setup Wizard',
+    'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
+    'LBL_YES'							=> 'Yes',
     'LBL_YES_MULTI'                     => 'Yes - Multibyte',
-	// OOTB Scheduler Job Names:
-	'LBL_OOTB_WORKFLOW'		=> 'Process Workflow Tasks',
-	'LBL_OOTB_REPORTS'		=> 'Run Report Generation Scheduled Tasks',
-	'LBL_OOTB_IE'			=> 'Check Inbound Mailboxes',
-	'LBL_OOTB_BOUNCE'		=> 'Run Nightly Process Bounced Campaign Emails',
+    // OOTB Scheduler Job Names:
+    'LBL_OOTB_WORKFLOW'		=> 'Process Workflow Tasks',
+    'LBL_OOTB_REPORTS'		=> 'Run Report Generation Scheduled Tasks',
+    'LBL_OOTB_IE'			=> 'Check Inbound Mailboxes',
+    'LBL_OOTB_BOUNCE'		=> 'Run Nightly Process Bounced Campaign Emails',
     'LBL_OOTB_CAMPAIGN'		=> 'Run Nightly Mass Email Campaigns',
-	'LBL_OOTB_PRUNE'		=> 'Prune Database on 1st of Month',
+    'LBL_OOTB_PRUNE'		=> 'Prune Database on 1st of Month',
     'LBL_OOTB_TRACKER'		=> 'Prune tracker tables',
     'LBL_OOTB_SUGARFEEDS'   => 'Prune SuiteCRM Feed Tables',
     'LBL_OOTB_SEND_EMAIL_REMINDERS'	=> 'Run Email Reminder Notifications',
@@ -550,19 +550,19 @@ 
     'LBL_PATCH_1'           => 'If you would like to skip this step, click Next.',
     'LBL_PATCH_TITLE'       => 'System Patch',
     'LBL_PATCH_READY'       => 'The following patch(es) are ready to be installed:',
-	'LBL_SESSION_ERR_DESCRIPTION'		=> "SuiteCRM relies upon PHP sessions to store important information while connected to this web server.  Your PHP installation does not have the Session information correctly configured.
+    'LBL_SESSION_ERR_DESCRIPTION'		=> "SuiteCRM relies upon PHP sessions to store important information while connected to this web server.  Your PHP installation does not have the Session information correctly configured.
 											<br><br>A common misconfiguration is that the <b>'session.save_path'</b> directive is not pointing to a valid directory.  <br>
 											<br> Please correct your <a target=_new href='http://us2.php.net/manual/en/ref.session.php'>PHP configuration</a> in the php.ini file located here below.",
-	'LBL_SESSION_ERR_TITLE'				=> 'PHP Sessions Configuration Error',
-	'LBL_SYSTEM_NAME'=>'System Name',
+    'LBL_SESSION_ERR_TITLE'				=> 'PHP Sessions Configuration Error',
+    'LBL_SYSTEM_NAME'=>'System Name',
     'LBL_COLLATION' => 'Collation Settings',
-	'LBL_REQUIRED_SYSTEM_NAME'=>'Provide a System Name for the SuiteCRM instance.',
-	'LBL_PATCH_UPLOAD' => 'Select a patch file from your local computer',
-	'LBL_INCOMPATIBLE_PHP_VERSION' => 'Php version 5 or above is required.',
-	'LBL_MINIMUM_PHP_VERSION' => 'Minimum Php version required is 5.1.0. Recommended Php version is 5.2.x.',
-	'LBL_YOUR_PHP_VERSION' => '(Your current php version is ',
-	'LBL_RECOMMENDED_PHP_VERSION' =>' Recommended php version is 5.2.x)',
-	'LBL_BACKWARD_COMPATIBILITY_ON' => 'Php Backward Compatibility mode is turned on. Set zend.ze1_compatibility_mode to Off for proceeding further',
+    'LBL_REQUIRED_SYSTEM_NAME'=>'Provide a System Name for the SuiteCRM instance.',
+    'LBL_PATCH_UPLOAD' => 'Select a patch file from your local computer',
+    'LBL_INCOMPATIBLE_PHP_VERSION' => 'Php version 5 or above is required.',
+    'LBL_MINIMUM_PHP_VERSION' => 'Minimum Php version required is 5.1.0. Recommended Php version is 5.2.x.',
+    'LBL_YOUR_PHP_VERSION' => '(Your current php version is ',
+    'LBL_RECOMMENDED_PHP_VERSION' =>' Recommended php version is 5.2.x)',
+    'LBL_BACKWARD_COMPATIBILITY_ON' => 'Php Backward Compatibility mode is turned on. Set zend.ze1_compatibility_mode to Off for proceeding further',
     'LBL_STREAM' => 'PHP allows to use stream',
 
     'advanced_password_new_account_email' => array(
@@ -594,91 +594,91 @@ 
         'name' => 'Forgot Password email',
         ),
 
-	// SMTP settings
-
-	'LBL_WIZARD_SMTP_DESC' => 'Provide the email account that will be used to send emails, such as the assignment notifications and new user passwords. Users will receive emails from SuiteCRM, as sent from the specified email account.',
-	'LBL_CHOOSE_EMAIL_PROVIDER'        => 'Choose your Email provider:',
-
-	'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
-	'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
-	'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
-	'LBL_SMTPTYPE_OTHER'                  => 'Other',
-	'LBL_MAIL_SMTP_SETTINGS'           => 'SMTP Server Specification',
-	'LBL_MAIL_SMTPSERVER'				=> 'SMTP Server:',
-	'LBL_MAIL_SMTPPORT'					=> 'SMTP Port:',
-	'LBL_MAIL_SMTPAUTH_REQ'				=> 'Use SMTP Authentication?',
-	'LBL_EMAIL_SMTP_SSL_OR_TLS'         => 'Enable SMTP over SSL or TLS?',
-	'LBL_GMAIL_SMTPUSER'					=> 'Gmail Email Address:',
-	'LBL_GMAIL_SMTPPASS'					=> 'Gmail Password:',
-	'LBL_ALLOW_DEFAULT_SELECTION'           => 'Allow users to use this account for outgoing email:',
-	'LBL_ALLOW_DEFAULT_SELECTION_HELP'          => 'When this option is selected, all users will be able to send emails using the same outgoing mail account used to send system notifications and alerts.  If the option is not selected, users can still use the outgoing mail server after providing their own account information.',
-
-	'LBL_YAHOOMAIL_SMTPPASS'					=> 'Yahoo! Mail Password:',
-	'LBL_YAHOOMAIL_SMTPUSER'					=> 'Yahoo! Mail ID:',
-
-	'LBL_EXCHANGE_SMTPPASS'					=> 'Exchange Password:',
-	'LBL_EXCHANGE_SMTPUSER'					=> 'Exchange Username:',
-	'LBL_EXCHANGE_SMTPPORT'					=> 'Exchange Server Port:',
-	'LBL_EXCHANGE_SMTPSERVER'				=> 'Exchange Server:',
-
-
-	'LBL_MAIL_SMTPUSER'					=> 'SMTP Username:',
-	'LBL_MAIL_SMTPPASS'					=> 'SMTP Password:',
-
-	// Branding
-
-	'LBL_WIZARD_SYSTEM_TITLE' => 'Branding',
-	'LBL_WIZARD_SYSTEM_DESC' => 'Provide your organization\'s name and logo in order to brand your SuiteCRM.',
-	'SYSTEM_NAME_WIZARD'=>'Name:',
-	'SYSTEM_NAME_HELP'=>'This is the name that displays in the title bar of your browser.',
-	'NEW_LOGO'=>'Select Logo:',
-	'NEW_LOGO_HELP'=>'The image file format can be either .png or .jpg. The maximum height is 170px, and the maximum width is 450px. Any image uploaded that is larger in any direction will be scaled to these max dimensions.',
-	'COMPANY_LOGO_UPLOAD_BTN' => 'Upload',
-	'CURRENT_LOGO'=>'Current Logo:',
+    // SMTP settings
+
+    'LBL_WIZARD_SMTP_DESC' => 'Provide the email account that will be used to send emails, such as the assignment notifications and new user passwords. Users will receive emails from SuiteCRM, as sent from the specified email account.',
+    'LBL_CHOOSE_EMAIL_PROVIDER'        => 'Choose your Email provider:',
+
+    'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
+    'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
+    'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
+    'LBL_SMTPTYPE_OTHER'                  => 'Other',
+    'LBL_MAIL_SMTP_SETTINGS'           => 'SMTP Server Specification',
+    'LBL_MAIL_SMTPSERVER'				=> 'SMTP Server:',
+    'LBL_MAIL_SMTPPORT'					=> 'SMTP Port:',
+    'LBL_MAIL_SMTPAUTH_REQ'				=> 'Use SMTP Authentication?',
+    'LBL_EMAIL_SMTP_SSL_OR_TLS'         => 'Enable SMTP over SSL or TLS?',
+    'LBL_GMAIL_SMTPUSER'					=> 'Gmail Email Address:',
+    'LBL_GMAIL_SMTPPASS'					=> 'Gmail Password:',
+    'LBL_ALLOW_DEFAULT_SELECTION'           => 'Allow users to use this account for outgoing email:',
+    'LBL_ALLOW_DEFAULT_SELECTION_HELP'          => 'When this option is selected, all users will be able to send emails using the same outgoing mail account used to send system notifications and alerts.  If the option is not selected, users can still use the outgoing mail server after providing their own account information.',
+
+    'LBL_YAHOOMAIL_SMTPPASS'					=> 'Yahoo! Mail Password:',
+    'LBL_YAHOOMAIL_SMTPUSER'					=> 'Yahoo! Mail ID:',
+
+    'LBL_EXCHANGE_SMTPPASS'					=> 'Exchange Password:',
+    'LBL_EXCHANGE_SMTPUSER'					=> 'Exchange Username:',
+    'LBL_EXCHANGE_SMTPPORT'					=> 'Exchange Server Port:',
+    'LBL_EXCHANGE_SMTPSERVER'				=> 'Exchange Server:',
+
+
+    'LBL_MAIL_SMTPUSER'					=> 'SMTP Username:',
+    'LBL_MAIL_SMTPPASS'					=> 'SMTP Password:',
+
+    // Branding
+
+    'LBL_WIZARD_SYSTEM_TITLE' => 'Branding',
+    'LBL_WIZARD_SYSTEM_DESC' => 'Provide your organization\'s name and logo in order to brand your SuiteCRM.',
+    'SYSTEM_NAME_WIZARD'=>'Name:',
+    'SYSTEM_NAME_HELP'=>'This is the name that displays in the title bar of your browser.',
+    'NEW_LOGO'=>'Select Logo:',
+    'NEW_LOGO_HELP'=>'The image file format can be either .png or .jpg. The maximum height is 170px, and the maximum width is 450px. Any image uploaded that is larger in any direction will be scaled to these max dimensions.',
+    'COMPANY_LOGO_UPLOAD_BTN' => 'Upload',
+    'CURRENT_LOGO'=>'Current Logo:',
     'CURRENT_LOGO_HELP'=>'This logo is displayed in the left-hand corner of the footer of the SuiteCRM application.',
 
-	// System Local Settings
-
-
-	'LBL_LOCALE_TITLE' => 'System Locale Settings',
-	'LBL_WIZARD_LOCALE_DESC' => 'Specify how you would like data in SuiteCRM to be displayed, based on your geographical location. The settings you provide here will be the default settings. Users will be able set their own preferences.',
-	'LBL_DATE_FORMAT' => 'Date Format:',
-	'LBL_TIME_FORMAT' => 'Time Format:',
-		'LBL_TIMEZONE' => 'Time Zone:',
-	'LBL_LANGUAGE'=>'Language:',
-	'LBL_CURRENCY'=>'Currency:',
-	'LBL_CURRENCY_SYMBOL'=>'Currency Symbol:',
-	'LBL_CURRENCY_ISO4217' => 'ISO 4217 Currency Code:',
-	'LBL_NUMBER_GROUPING_SEP' => '1000s separator:',
-	'LBL_DECIMAL_SEP' => 'Decimal symbol:',
-	'LBL_NAME_FORMAT' => 'Name Format:',
-	'UPLOAD_LOGO' => 'Please wait, logo uploading..',
-	'ERR_UPLOAD_FILETYPE' => 'File type do not allowed, please upload a jpeg or png.',
-	'ERR_LANG_UPLOAD_UNKNOWN' => 'Unknown file upload error occured.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_INI_SIZE' => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_FORM_SIZE' => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_PARTIAL' => 'The uploaded file was only partially uploaded.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_FILE' => 'No file was uploaded.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_TMP_DIR' => 'Missing a temporary folder.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_CANT_WRITE' => 'Failed to write file to disk.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_EXTENSION' => 'A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop.',
-
-	'LBL_INSTALL_PROCESS' => 'Install...',
-
-	'LBL_EMAIL_ADDRESS' => 'Email Address:',
-	'ERR_ADMIN_EMAIL' => 'Administrator Email Address is incorrect.',
-	'ERR_SITE_URL' => 'Site URL is required.',
-
-	'STAT_CONFIGURATION' => 'Configuration relationships...',
-	'STAT_CREATE_DB' => 'Create database...',
-	//'STAT_CREATE_DB_TABLE' => 'Create database... (table: %s)',
-	'STAT_CREATE_DEFAULT_SETTINGS' => 'Create default settings...',
-	'STAT_INSTALL_FINISH' => 'Install finish...',
-	'STAT_INSTALL_FINISH_LOGIN' => 'Installation process finished, <a href="%s">please log in...</a>',
-	'LBL_LICENCE_TOOLTIP' => 'Please accept license first',
-
-	'LBL_MORE_OPTIONS_TITLE' => 'More options',
-	'LBL_START' => '',
+    // System Local Settings
+
+
+    'LBL_LOCALE_TITLE' => 'System Locale Settings',
+    'LBL_WIZARD_LOCALE_DESC' => 'Specify how you would like data in SuiteCRM to be displayed, based on your geographical location. The settings you provide here will be the default settings. Users will be able set their own preferences.',
+    'LBL_DATE_FORMAT' => 'Date Format:',
+    'LBL_TIME_FORMAT' => 'Time Format:',
+        'LBL_TIMEZONE' => 'Time Zone:',
+    'LBL_LANGUAGE'=>'Language:',
+    'LBL_CURRENCY'=>'Currency:',
+    'LBL_CURRENCY_SYMBOL'=>'Currency Symbol:',
+    'LBL_CURRENCY_ISO4217' => 'ISO 4217 Currency Code:',
+    'LBL_NUMBER_GROUPING_SEP' => '1000s separator:',
+    'LBL_DECIMAL_SEP' => 'Decimal symbol:',
+    'LBL_NAME_FORMAT' => 'Name Format:',
+    'UPLOAD_LOGO' => 'Please wait, logo uploading..',
+    'ERR_UPLOAD_FILETYPE' => 'File type do not allowed, please upload a jpeg or png.',
+    'ERR_LANG_UPLOAD_UNKNOWN' => 'Unknown file upload error occured.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_INI_SIZE' => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_FORM_SIZE' => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_PARTIAL' => 'The uploaded file was only partially uploaded.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_FILE' => 'No file was uploaded.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_TMP_DIR' => 'Missing a temporary folder.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_CANT_WRITE' => 'Failed to write file to disk.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_EXTENSION' => 'A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop.',
+
+    'LBL_INSTALL_PROCESS' => 'Install...',
+
+    'LBL_EMAIL_ADDRESS' => 'Email Address:',
+    'ERR_ADMIN_EMAIL' => 'Administrator Email Address is incorrect.',
+    'ERR_SITE_URL' => 'Site URL is required.',
+
+    'STAT_CONFIGURATION' => 'Configuration relationships...',
+    'STAT_CREATE_DB' => 'Create database...',
+    //'STAT_CREATE_DB_TABLE' => 'Create database... (table: %s)',
+    'STAT_CREATE_DEFAULT_SETTINGS' => 'Create default settings...',
+    'STAT_INSTALL_FINISH' => 'Install finish...',
+    'STAT_INSTALL_FINISH_LOGIN' => 'Installation process finished, <a href="%s">please log in...</a>',
+    'LBL_LICENCE_TOOLTIP' => 'Please accept license first',
+
+    'LBL_MORE_OPTIONS_TITLE' => 'More options',
+    'LBL_START' => '',
 
 
 );

include/generic/SugarWidgets/SugarWidgetField.php

Indentation +136 added lines, -136 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,162 +46,162 @@ 
 
 class SugarWidgetField extends SugarWidget {
 
-	function SugarWidgetField(&$layout_manager) {
+    function SugarWidgetField(&$layout_manager) {
         parent::SugarWidget($layout_manager);
     }
 
-	function display($layout_def) {
-		//print $layout_def['start_link_wrapper']."===";
-		$context = $this->layout_manager->getAttribute('context'); //_ppd($context);
-		$func_name = 'display'.$context;
+    function display($layout_def) {
+        //print $layout_def['start_link_wrapper']."===";
+        $context = $this->layout_manager->getAttribute('context'); //_ppd($context);
+        $func_name = 'display'.$context;
 
-		if (!empty ($context) && method_exists($this, $func_name)) {
-			return $this-> $func_name ($layout_def);
-		} else {
-			return 'display not found:'.$func_name;
-		}
-	}
+        if (!empty ($context) && method_exists($this, $func_name)) {
+            return $this-> $func_name ($layout_def);
+        } else {
+            return 'display not found:'.$func_name;
+        }
+    }
 
-	function _get_column_alias($layout_def) {
-		$alias_arr = array ();
+    function _get_column_alias($layout_def) {
+        $alias_arr = array ();
 
-		if (!empty ($layout_def['name']) && $layout_def['name'] == 'count') {
-			return 'count';
-		}
+        if (!empty ($layout_def['name']) && $layout_def['name'] == 'count') {
+            return 'count';
+        }
 
-		if (!empty ($layout_def['table_alias'])) {
-			array_push($alias_arr, $layout_def['table_alias']);
-		}
+        if (!empty ($layout_def['table_alias'])) {
+            array_push($alias_arr, $layout_def['table_alias']);
+        }
 
-		if (!empty ($layout_def['name'])) {
-			array_push($alias_arr, $layout_def['name']);
-		}
+        if (!empty ($layout_def['name'])) {
+            array_push($alias_arr, $layout_def['name']);
+        }
 
-		return $this->getTruncatedColumnAlias(implode("_", $alias_arr));
-	}
+        return $this->getTruncatedColumnAlias(implode("_", $alias_arr));
+    }
 
-	function & displayDetailLabel(& $layout_def) {
+    function & displayDetailLabel(& $layout_def) {
 
-		return '';
-	}
+        return '';
+    }
 
-	function & displayDetail($layout_def) {
+    function & displayDetail($layout_def) {
 
         $layout_def = '';
-		return $layout_def;
-	}
+        return $layout_def;
+    }
 	
-	function displayHeaderCellPlain($layout_def) 
-	{
-		if (!empty ($layout_def['label'])) {
-			return $layout_def['label'];
-		}
-		if (!empty ($layout_def['vname'])) {
-			return translate($layout_def['vname'], $this->layout_manager->getAttribute('module_name'));
-		}
-		return '';
-	}
-
-	function displayHeaderCell($layout_def) {
-		$module_name = $this->layout_manager->getAttribute('module_name');
-
-		$this->local_current_module = $_REQUEST['module'];
-		$this->is_dynamic = true;
-		// don't show sort links if name isn't defined
-		if (empty ($layout_def['name']) || (isset ($layout_def['sortable']) && !$layout_def['sortable'])) {
-			return $this->displayHeaderCellPlain($layout_def);
-		}
-
-		$header_cell_text = $this->displayHeaderCellPlain($layout_def);
-
-		$subpanel_module = $layout_def['subpanel_module'];
-		$html_var = $subpanel_module . "_CELL";
-		if (empty ($this->base_URL)) {
-			$objListView = new ListView();
-			$this->base_URL = $objListView -> getBaseURL($html_var);
-			$split_url = explode('&to_pdf=true&action=SubPanelViewer&subpanel=', $this->base_URL);
-			$this->base_URL = $split_url[0];
-			$this->base_URL .= '&inline=true&to_pdf=true&action=SubPanelViewer&subpanel=';
-		}
-		$sort_by_name = $layout_def['name'];
-		if (isset ($layout_def['sort_by'])) {
-			$sort_by_name = $layout_def['sort_by'];
-		}
-
-		$objListView = new ListView();
-		$sort_by = $objListView->getSessionVariableName($html_var, "ORDER_BY").'='.$sort_by_name;
-
-		$start = (empty ($layout_def['start_link_wrapper'])) ? '' : $layout_def['start_link_wrapper'];
-		$end = (empty ($layout_def['end_link_wrapper'])) ? '' : $layout_def['end_link_wrapper'];
-
-		$header_cell = "<a class=\"listViewThLinkS1\" href=\"".$start.$this->base_URL.$subpanel_module.'&'.$sort_by.$end."\">";
-		$header_cell .= $header_cell_text;
-
-		$imgArrow = '';
-
-		if (isset ($layout_def['sort'])) {
-			$imgArrow = $layout_def['sort'];
-		}
-		$arrow_start = $objListView->getArrowUpDownStart($imgArrow);
-		$arrow_end = $objListView->getArrowUpDownEnd($imgArrow);
-		$header_cell .= " ".$arrow_start.$arrow_end."</a>";
-
-		return $header_cell;
-
-	}
-
-	function displayList($layout_def) {
-		return $this->displayListPlain($layout_def);
-	}
-
-	function displayListPlain($layout_def) {
-		$value= $this->_get_list_value($layout_def);
-		if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
-			if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))
-			{
-				return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
-			}
-			return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true'>";
-		}
-		return $value;
-	}
-
-	function _get_list_value(& $layout_def) 
-	{
-		$key = '';
-		if ( isset($layout_def['varname']) ) {
-		    $key = strtoupper($layout_def['varname']);
-		} 
-		else {
-			$key = strtoupper($this->_get_column_alias($layout_def));
-		}
-
-		if ( isset($layout_def['fields'][$key]) ) {
-			return $layout_def['fields'][$key];
-		}
+    function displayHeaderCellPlain($layout_def) 
+    {
+        if (!empty ($layout_def['label'])) {
+            return $layout_def['label'];
+        }
+        if (!empty ($layout_def['vname'])) {
+            return translate($layout_def['vname'], $this->layout_manager->getAttribute('module_name'));
+        }
+        return '';
+    }
+
+    function displayHeaderCell($layout_def) {
+        $module_name = $this->layout_manager->getAttribute('module_name');
+
+        $this->local_current_module = $_REQUEST['module'];
+        $this->is_dynamic = true;
+        // don't show sort links if name isn't defined
+        if (empty ($layout_def['name']) || (isset ($layout_def['sortable']) && !$layout_def['sortable'])) {
+            return $this->displayHeaderCellPlain($layout_def);
+        }
+
+        $header_cell_text = $this->displayHeaderCellPlain($layout_def);
+
+        $subpanel_module = $layout_def['subpanel_module'];
+        $html_var = $subpanel_module . "_CELL";
+        if (empty ($this->base_URL)) {
+            $objListView = new ListView();
+            $this->base_URL = $objListView -> getBaseURL($html_var);
+            $split_url = explode('&to_pdf=true&action=SubPanelViewer&subpanel=', $this->base_URL);
+            $this->base_URL = $split_url[0];
+            $this->base_URL .= '&inline=true&to_pdf=true&action=SubPanelViewer&subpanel=';
+        }
+        $sort_by_name = $layout_def['name'];
+        if (isset ($layout_def['sort_by'])) {
+            $sort_by_name = $layout_def['sort_by'];
+        }
+
+        $objListView = new ListView();
+        $sort_by = $objListView->getSessionVariableName($html_var, "ORDER_BY").'='.$sort_by_name;
+
+        $start = (empty ($layout_def['start_link_wrapper'])) ? '' : $layout_def['start_link_wrapper'];
+        $end = (empty ($layout_def['end_link_wrapper'])) ? '' : $layout_def['end_link_wrapper'];
+
+        $header_cell = "<a class=\"listViewThLinkS1\" href=\"".$start.$this->base_URL.$subpanel_module.'&'.$sort_by.$end."\">";
+        $header_cell .= $header_cell_text;
+
+        $imgArrow = '';
+
+        if (isset ($layout_def['sort'])) {
+            $imgArrow = $layout_def['sort'];
+        }
+        $arrow_start = $objListView->getArrowUpDownStart($imgArrow);
+        $arrow_end = $objListView->getArrowUpDownEnd($imgArrow);
+        $header_cell .= " ".$arrow_start.$arrow_end."</a>";
+
+        return $header_cell;
+
+    }
+
+    function displayList($layout_def) {
+        return $this->displayListPlain($layout_def);
+    }
+
+    function displayListPlain($layout_def) {
+        $value= $this->_get_list_value($layout_def);
+        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
+            if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))
+            {
+                return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
+            }
+            return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true'>";
+        }
+        return $value;
+    }
+
+    function _get_list_value(& $layout_def) 
+    {
+        $key = '';
+        if ( isset($layout_def['varname']) ) {
+            $key = strtoupper($layout_def['varname']);
+        } 
+        else {
+            $key = strtoupper($this->_get_column_alias($layout_def));
+        }
+
+        if ( isset($layout_def['fields'][$key]) ) {
+            return $layout_def['fields'][$key];
+        }
 		
-		return '';
-	}
+        return '';
+    }
 
-	function & displayEditLabel($layout_def) {
-		return '';
-	}
+    function & displayEditLabel($layout_def) {
+        return '';
+    }
 
-	function & displayEdit($layout_def) {
-		return '';
-	}
+    function & displayEdit($layout_def) {
+        return '';
+    }
 
-	function & displaySearchLabel($layout_def) {
-		return '';
-	}
+    function & displaySearchLabel($layout_def) {
+        return '';
+    }
 
-	function & displaySearch($layout_def) {
-		return '';
-	}
+    function & displaySearch($layout_def) {
+        return '';
+    }
 
-	function displayInput($layout_def) {
-		return ' -- Not Implemented --';
-	}
+    function displayInput($layout_def) {
+        return ' -- Not Implemented --';
+    }
 
     function getVardef($layout_def) {
         $myName = $layout_def['column_key'];

include/language/en_us.lang.php

Indentation +759 added lines, -759 removed lines

@@ -50,9 +50,9 @@ 
 //to translate, only modify the right value in each key/value pair
 $app_list_strings = array (
 //e.g. auf Deutsch 'Contacts'=>'Contakten',
-  'language_pack_name' => 'US English',
-  'moduleList' =>
-  array (
+    'language_pack_name' => 'US English',
+    'moduleList' =>
+    array (
     'Home' => 'Home',
     'Contacts' => 'Contacts',
     'Accounts' => 'Accounts',
@@ -106,14 +106,14 @@ 
     'Newsletters' => 'Newsletters',
     'SugarFeed'=>'SuiteCRM Feed',
     'KBDocuments' => 'Knowledge Base',
-  'SugarFavorites'=>'SuiteCRM Favorites',
+    'SugarFavorites'=>'SuiteCRM Favorites',
 
     'OAuthKeys' => 'OAuth Consumer Keys',
     'OAuthTokens' => 'OAuth Tokens',
-  ),
+    ),
 
-  'moduleListSingular' =>
-  array (
+    'moduleListSingular' =>
+    array (
     'Home' => 'Home',
     'Dashboard' => 'Dashboard',
     'Contacts' => 'Contact',
@@ -141,19 +141,19 @@ 
     'SugarFollowing'=>'SuiteCRM Following',
     'Sync'=>'Sync',
     'Users' => 'User',
-  'SugarFavorites'=>'SuiteCRM Favorites'
+    'SugarFavorites'=>'SuiteCRM Favorites'
 
         ),
 
-  'checkbox_dom'=> array(
+    'checkbox_dom'=> array(
     ''=>'',
     '1'=>'Yes',
     '2'=>'No',
-  ),
+    ),
 
-  //e.g. en fran�ais 'Analyst'=>'Analyste',
-  'account_type_dom' =>
-  array (
+    //e.g. en fran�ais 'Analyst'=>'Analyste',
+    'account_type_dom' =>
+    array (
     '' => '',
     'Analyst' => 'Analyst',
     'Competitor' => 'Competitor',
@@ -165,10 +165,10 @@ 
     'Prospect' => 'Prospect',
     'Reseller' => 'Reseller',
     'Other' => 'Other',
-  ),
-  //e.g. en espa�ol 'Apparel'=>'Ropa',
-  'industry_dom' =>
-  array (
+    ),
+    //e.g. en espa�ol 'Apparel'=>'Ropa',
+    'industry_dom' =>
+    array (
     '' => '',
     'Apparel' => 'Apparel',
     'Banking' => 'Banking',
@@ -200,10 +200,10 @@ 
     'Transportation' => 'Transportation',
     'Utilities' => 'Utilities',
     'Other' => 'Other',
-  ),
-  'lead_source_default_key' => 'Self Generated',
-  'lead_source_dom' =>
-  array (
+    ),
+    'lead_source_default_key' => 'Self Generated',
+    'lead_source_dom' =>
+    array (
     '' => '',
     'Cold Call' => 'Cold Call',
     'Existing Customer' => 'Existing Customer',
@@ -219,26 +219,26 @@ 
     'Email' => 'Email',
     'Campaign'=>'Campaign',
     'Other' => 'Other',
-  ),
-  'opportunity_type_dom' =>
-  array (
+    ),
+    'opportunity_type_dom' =>
+    array (
     '' => '',
     'Existing Business' => 'Existing Business',
     'New Business' => 'New Business',
-  ),
-  'roi_type_dom' =>
+    ),
+    'roi_type_dom' =>
     array (
     'Revenue' => 'Revenue',
     'Investment'=>'Investment',
     'Expected_Revenue'=>'Expected Revenue',
     'Budget'=>'Budget',
 
-  ),
-  //Note:  do not translate opportunity_relationship_type_default_key
+    ),
+    //Note:  do not translate opportunity_relationship_type_default_key
 //       it is the key for the default opportunity_relationship_type_dom value
-  'opportunity_relationship_type_default_key' => 'Primary Decision Maker',
-  'opportunity_relationship_type_dom' =>
-  array (
+    'opportunity_relationship_type_default_key' => 'Primary Decision Maker',
+    'opportunity_relationship_type_dom' =>
+    array (
     '' => '',
     'Primary Decision Maker' => 'Primary Decision Maker',
     'Business Decision Maker' => 'Business Decision Maker',
@@ -248,29 +248,29 @@ 
     'Executive Sponsor' => 'Executive Sponsor',
     'Influencer' => 'Influencer',
     'Other' => 'Other',
-  ),
-  //Note:  do not translate case_relationship_type_default_key
+    ),
+    //Note:  do not translate case_relationship_type_default_key
 //       it is the key for the default case_relationship_type_dom value
-  'case_relationship_type_default_key' => 'Primary Contact',
-  'case_relationship_type_dom' =>
-  array (
+    'case_relationship_type_default_key' => 'Primary Contact',
+    'case_relationship_type_dom' =>
+    array (
     '' => '',
     'Primary Contact' => 'Primary Contact',
     'Alternate Contact' => 'Alternate Contact',
-  ),
-  'payment_terms' =>
-  array (
+    ),
+    'payment_terms' =>
+    array (
     '' => '',
     'Net 15' => 'Net 15',
     'Net 30' => 'Net 30',
-  ),
-  'sales_stage_default_key' => 'Prospecting',
-  'fts_type' => array (
-      '' => '',
-      'Elastic' => 'elasticsearch'
-  ),
-  'sales_stage_dom' =>
-  array (
+    ),
+    'sales_stage_default_key' => 'Prospecting',
+    'fts_type' => array (
+        '' => '',
+        'Elastic' => 'elasticsearch'
+    ),
+    'sales_stage_dom' =>
+    array (
     'Prospecting' => 'Prospecting',
     'Qualification' => 'Qualification',
     'Needs Analysis' => 'Needs Analysis',
@@ -281,8 +281,8 @@ 
     'Negotiation/Review' => 'Negotiation/Review',
     'Closed Won' => 'Closed Won',
     'Closed Lost' => 'Closed Lost',
-  ),
-  'in_total_group_stages' => array (
+    ),
+    'in_total_group_stages' => array (
     'Draft' => 'Draft',
     'Negotiation' => 'Negotiation',
     'Delivered' => 'Delivered',
@@ -291,9 +291,9 @@ 
     'Closed Accepted' => 'Closed Accepted',
     'Closed Lost' => 'Closed Lost',
     'Closed Dead' => 'Closed Dead',
-  ),
-  'sales_probability_dom' => // keys must be the same as sales_stage_dom
-  array (
+    ),
+    'sales_probability_dom' => // keys must be the same as sales_stage_dom
+    array (
     'Prospecting' => '10',
     'Qualification' => '20',
     'Needs Analysis' => '25',
@@ -304,85 +304,85 @@ 
     'Negotiation/Review' => '80',
     'Closed Won' => '100',
     'Closed Lost' => '0',
-  ),
-  'activity_dom' =>
-  array (
+    ),
+    'activity_dom' =>
+    array (
     'Call' => 'Call',
     'Meeting' => 'Meeting',
     'Task' => 'Task',
     'Email' => 'Email',
     'Note' => 'Note',
-  ),
-  'salutation_dom' =>
-      array (
+    ),
+    'salutation_dom' =>
+        array (
         '' => '',
         'Mr.' => 'Mr.',
         'Ms.' => 'Ms.',
         'Mrs.' => 'Mrs.',
         'Dr.' => 'Dr.',
         'Prof.' => 'Prof.',
-      ),
-  //time is in seconds; the greater the time the longer it takes;
-  'reminder_max_time' => 90000,
-  'reminder_time_options' => array( 60=> '1 minute prior',
-                                  300=> '5 minutes prior',
-                                  600=> '10 minutes prior',
-                                  900=> '15 minutes prior',
-                                  1800=> '30 minutes prior',
-                                  3600=> '1 hour prior',
-                                  7200 => '2 hours prior',
-                                  10800 => '3 hours prior',
-                                  18000 => '5 hours prior',
-                                  86400 => '1 day prior',
-                                 ),
-
-  'task_priority_default' => 'Medium',
-  'task_priority_dom' =>
-  array (
+        ),
+    //time is in seconds; the greater the time the longer it takes;
+    'reminder_max_time' => 90000,
+    'reminder_time_options' => array( 60=> '1 minute prior',
+                                    300=> '5 minutes prior',
+                                    600=> '10 minutes prior',
+                                    900=> '15 minutes prior',
+                                    1800=> '30 minutes prior',
+                                    3600=> '1 hour prior',
+                                    7200 => '2 hours prior',
+                                    10800 => '3 hours prior',
+                                    18000 => '5 hours prior',
+                                    86400 => '1 day prior',
+                                    ),
+
+    'task_priority_default' => 'Medium',
+    'task_priority_dom' =>
+    array (
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-  'task_status_default' => 'Not Started',
-  'task_status_dom' =>
-  array (
+    ),
+    'task_status_default' => 'Not Started',
+    'task_status_dom' =>
+    array (
     'Not Started' => 'Not Started',
     'In Progress' => 'In Progress',
     'Completed' => 'Completed',
     'Pending Input' => 'Pending Input',
     'Deferred' => 'Deferred',
-  ),
-  'meeting_status_default' => 'Planned',
-  'meeting_status_dom' =>
-  array (
+    ),
+    'meeting_status_default' => 'Planned',
+    'meeting_status_dom' =>
+    array (
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
-  ),
-  'extapi_meeting_password' =>
-  array (
-      'WebEx' => 'WebEx',
-  ),
-  'meeting_type_dom' =>
-   array (
-      'Other' => 'Other',
-      'Sugar' => 'SuiteCRM',
-   ),
-  'call_status_default' => 'Planned',
-  'call_status_dom' =>
-  array (
+    ),
+    'extapi_meeting_password' =>
+    array (
+        'WebEx' => 'WebEx',
+    ),
+    'meeting_type_dom' =>
+    array (
+        'Other' => 'Other',
+        'Sugar' => 'SuiteCRM',
+    ),
+    'call_status_default' => 'Planned',
+    'call_status_dom' =>
+    array (
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
-  ),
-  'call_direction_default' => 'Outbound',
-  'call_direction_dom' =>
-  array (
+    ),
+    'call_direction_default' => 'Outbound',
+    'call_direction_dom' =>
+    array (
     'Inbound' => 'Inbound',
     'Outbound' => 'Outbound',
-  ),
-  'lead_status_dom' =>
-  array (
+    ),
+    'lead_status_dom' =>
+    array (
     '' => '',
     'New' => 'New',
     'Assigned' => 'Assigned',
@@ -390,54 +390,54 @@ 
     'Converted' => 'Converted',
     'Recycled' => 'Recycled',
     'Dead' => 'Dead',
-  ),
-   'gender_list' =>
-  array (
+    ),
+    'gender_list' =>
+    array (
     'male' => 'Male',
     'female' => 'Female',
-  ),
-  //Note:  do not translate case_status_default_key
+    ),
+    //Note:  do not translate case_status_default_key
 //       it is the key for the default case_status_dom value
-  'case_status_default_key' => 'New',
-  'case_status_dom' =>
-  array (
+    'case_status_default_key' => 'New',
+    'case_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending Input' => 'Pending Input',
     'Rejected' => 'Rejected',
     'Duplicate' => 'Duplicate',
-  ),
-  'case_priority_default_key' => 'P2',
-  'case_priority_dom' =>
-  array (
+    ),
+    'case_priority_default_key' => 'P2',
+    'case_priority_dom' =>
+    array (
     'P1' => 'High',
     'P2' => 'Medium',
     'P3' => 'Low',
-  ),
-  'user_type_dom' =>
-  array (
+    ),
+    'user_type_dom' =>
+    array (
     'RegularUser' => 'Regular User',
     'Administrator' => 'Administrator',
-  ),
-  'user_status_dom' =>
-  array (
+    ),
+    'user_status_dom' =>
+    array (
     'Active' => 'Active',
     'Inactive' => 'Inactive',
-  ),
-  'employee_status_dom' =>
-  array (
+    ),
+    'employee_status_dom' =>
+    array (
     'Active' => 'Active',
     'Terminated' => 'Terminated',
     'Leave of Absence' => 'Leave of Absence',
-  ),
-  'messenger_type_dom' =>
-  array (
+    ),
+    'messenger_type_dom' =>
+    array (
     '' => '',
     'MSN' => 'MSN',
     'Yahoo!' => 'Yahoo!',
     'AOL' => 'AOL',
-  ),
+    ),
     'project_task_priority_options' => array (
         'High' => 'High',
         'Medium' => 'Medium',
@@ -480,11 +480,11 @@ 
         'Low' => 'Low',
     ),
     'project_priority_default' => 'Medium',
-  //Note:  do not translate record_type_default_key
+    //Note:  do not translate record_type_default_key
 //       it is the key for the default record_type_module value
-  'record_type_default_key' => 'Accounts',
-  'record_type_display' =>
-  array (
+    'record_type_default_key' => 'Accounts',
+    'record_type_display' =>
+    array (
     '' => '',
     'Accounts' => 'Account',
     'Opportunities' => 'Opportunity',
@@ -502,10 +502,10 @@ 
 
     'Tasks' => 'Task',
 
-  ),
+    ),
 
-  'record_type_display_notes' =>
-  array (
+    'record_type_display_notes' =>
+    array (
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Opportunities' => 'Opportunity',
@@ -521,10 +521,10 @@ 
 
     'Meetings' => 'Meeting',
     'Calls' => 'Call',
-  ),
+    ),
 
-  'parent_type_display' =>
-  array (
+    'parent_type_display' =>
+    array (
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Tasks' => 'Task',
@@ -541,48 +541,48 @@ 
 
     'Prospects' => 'Target',
 
-  ),
+    ),
 
-  'issue_priority_default_key' => 'Medium',
-  'issue_priority_dom' =>
-  array (
+    'issue_priority_default_key' => 'Medium',
+    'issue_priority_dom' =>
+    array (
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-  'issue_resolution_default_key' => '',
-  'issue_resolution_dom' =>
-  array (
+    ),
+    'issue_resolution_default_key' => '',
+    'issue_resolution_dom' =>
+    array (
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
     'Closed' => 'Closed',
     'Out of Date' => 'Out of Date',
     'Invalid' => 'Invalid',
-  ),
+    ),
 
-  'issue_status_default_key' => 'New',
-  'issue_status_dom' =>
-  array (
+    'issue_status_default_key' => 'New',
+    'issue_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending' => 'Pending',
     'Rejected' => 'Rejected',
-  ),
+    ),
 
-  'bug_priority_default_key' => 'Medium',
-  'bug_priority_dom' =>
-  array (
+    'bug_priority_default_key' => 'Medium',
+    'bug_priority_dom' =>
+    array (
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-   'bug_resolution_default_key' => '',
-  'bug_resolution_dom' =>
-  array (
+    ),
+    'bug_resolution_default_key' => '',
+    'bug_resolution_dom' =>
+    array (
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
@@ -590,42 +590,42 @@ 
     'Out of Date' => 'Out of Date',
     'Invalid' => 'Invalid',
     'Later' => 'Later',
-  ),
-  'bug_status_default_key' => 'New',
-  'bug_status_dom' =>
-  array (
+    ),
+    'bug_status_default_key' => 'New',
+    'bug_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending' => 'Pending',
     'Rejected' => 'Rejected',
-  ),
-   'bug_type_default_key' => 'Bug',
-  'bug_type_dom' =>
-  array (
+    ),
+    'bug_type_default_key' => 'Bug',
+    'bug_type_dom' =>
+    array (
     'Defect' => 'Defect',
     'Feature' => 'Feature',
-  ),
- 'case_type_dom' =>
-  array (
+    ),
+    'case_type_dom' =>
+    array (
     'Administration' => 'Administration',
     'Product' => 'Product',
     'User' => 'User',
-  ),
+    ),
 
-  'source_default_key' => '',
-  'source_dom' =>
-  array (
+    'source_default_key' => '',
+    'source_dom' =>
+    array (
     '' => '',
     'Internal' => 'Internal',
     'Forum' => 'Forum',
     'Web' => 'Web',
     'InboundEmail' => 'Email'
-  ),
+    ),
 
-  'product_category_default_key' => '',
-  'product_category_dom' =>
-  array (
+    'product_category_default_key' => '',
+    'product_category_dom' =>
+    array (
     '' => '',
     'Accounts' => 'Accounts',
     'Activities' => 'Activities',
@@ -636,15 +636,15 @@ 
     'Cases' => 'Cases',
     'Contacts' => 'Contacts',
     'Currencies' => 'Currencies',
-  'Dashboard' => 'Dashboard',
-  'Documents' => 'Documents',
+    'Dashboard' => 'Dashboard',
+    'Documents' => 'Documents',
     'Emails' => 'Emails',
     'Feeds' => 'Feeds',
     'Forecasts' => 'Forecasts',
     'Help' => 'Help',
     'Home' => 'Home',
-  'Leads' => 'Leads',
-  'Meetings' => 'Meetings',
+    'Leads' => 'Leads',
+    'Meetings' => 'Meetings',
     'Notes' => 'Notes',
     'Opportunities' => 'Opportunities',
     'Outlook Plugin' => 'Outlook Plugin',
@@ -655,10 +655,10 @@ 
     'Studio' => 'Studio',
     'Upgrade' => 'Upgrade',
     'Users' => 'Users',
-  ),
-  /*Added entries 'Queued' and 'Sending' for 4.0 release..*/
-  'campaign_status_dom' =>
-  array (
+    ),
+    /*Added entries 'Queued' and 'Sending' for 4.0 release..*/
+    'campaign_status_dom' =>
+    array (
         '' => '',
         'Planning' => 'Planning',
         'Active' => 'Active',
@@ -666,9 +666,9 @@ 
         'Complete' => 'Complete',
         'In Queue' => 'In Queue',
         'Sending'=> 'Sending',
-  ),
-  'campaign_type_dom' =>
-  array (
+    ),
+    'campaign_type_dom' =>
+    array (
         '' => '',
         'Telesales' => 'Telesales',
         'Mail' => 'Mail',
@@ -680,8 +680,8 @@ 
         'NewsLetter' => 'Newsletter',
         ),
 
-  'newsletter_frequency_dom' =>
-  array (
+    'newsletter_frequency_dom' =>
+    array (
         '' => '',
         'Weekly' => 'Weekly',
         'Monthly' => 'Monthly',
@@ -689,11 +689,11 @@ 
         'Annually' => 'Annually',
         ),
 
-  'notifymail_sendtype' =>
-  array (
+    'notifymail_sendtype' =>
+    array (
     'SMTP' => 'SMTP',
-  ),
-      'dom_cal_month_long'=>array(
+    ),
+        'dom_cal_month_long'=>array(
                 '0'=>"",
                 '1'=>"January",
                 '2'=>"February",
@@ -748,8 +748,8 @@ 
                 'pm'=>"pm"
         ),
     'dom_meridiem_uppercase'=>array(
-                 'AM'=>'AM',
-                 'PM'=>'PM'
+                    'AM'=>'AM',
+                    'PM'=>'PM'
         ),
 
     'dom_report_types'=>array(
@@ -785,26 +785,26 @@ 
                                         'imap'      => 'IMAP',
     ),
     'dom_mailbox_type'      => array(/*''           => '--None Specified--',*/
-                                     'pick'     => '--None--',
-                                     'createcase'  => 'Create Case',
-                                     'bounce'   => 'Bounce Handling',
+                                        'pick'     => '--None--',
+                                        'createcase'  => 'Create Case',
+                                        'bounce'   => 'Bounce Handling',
     ),
     'dom_email_distribution'=> array(''             => '--None--',
-                                     'direct'       => 'Direct Assign',
-                                     'roundRobin'   => 'Round-Robin',
-                                     'leastBusy'    => 'Least-Busy',
+                                        'direct'       => 'Direct Assign',
+                                        'roundRobin'   => 'Round-Robin',
+                                        'leastBusy'    => 'Least-Busy',
     ),
     'dom_email_distribution_for_auto_create'=> array('roundRobin'   => 'Round-Robin',
-                                                     'leastBusy'    => 'Least-Busy',
+                                                        'leastBusy'    => 'Least-Busy',
     ),
     'dom_email_errors'      => array(1 => 'Only select one user when Direct Assigning items.',
-                                     2 => 'You must assign Only Checked Items when Direct Assigning items.',
+                                        2 => 'You must assign Only Checked Items when Direct Assigning items.',
     ),
     'dom_email_bool'        => array('bool_true' => 'Yes',
-                                     'bool_false' => 'No',
+                                        'bool_false' => 'No',
     ),
     'dom_int_bool'          => array(1 => 'Yes',
-                                     0 => 'No',
+                                        0 => 'No',
     ),
     'dom_switch_bool'       => array ('on' => 'Yes',
                                         'off' => 'No',
@@ -841,19 +841,19 @@ 
     array (
     'Active' => 'Active',
     'Inactive' => 'Inactive',
-  ),
+    ),
     'forecast_type_dom' =>
     array (
     'Direct' => 'Direct',
     'Rollup' => 'Rollup',
-  ),
+    ),
     'document_category_dom' =>
     array (
     '' => '',
     'Marketing' => 'Marketing',
     'Knowledege Base' => 'Knowledge Base',
     'Sales' => 'Sales',
-  ),
+    ),
 
     'document_subcategory_dom' =>
     array (
@@ -861,7 +861,7 @@ 
     'Marketing Collateral' => 'Marketing Collateral',
     'Product Brochures' => 'Product Brochures',
     'FAQ' => 'FAQ',
-  ),
+    ),
 
     'document_status_dom' =>
     array (
@@ -871,39 +871,39 @@ 
     'Expired' => 'Expired',
     'Under Review' => 'Under Review',
     'Pending' => 'Pending',
-  ),
-  'document_template_type_dom' =>
-  array(
+    ),
+    'document_template_type_dom' =>
+    array(
     ''=>'',
     'mailmerge'=>'Mail Merge',
     'eula'=>'EULA',
     'nda'=>'NDA',
     'license'=>'License Agreement',
-  ),
+    ),
     'dom_meeting_accept_options' =>
     array (
     'accept' => 'Accept',
     'decline' => 'Decline',
     'tentative' => 'Tentative',
-  ),
+    ),
     'dom_meeting_accept_status' =>
     array (
     'accept' => 'Accepted',
     'decline' => 'Declined',
     'tentative' => 'Tentative',
     'none'      => 'None',
-  ),
+    ),
     'duration_intervals' => array('0'=>'00',
                                     '15'=>'15',
                                     '30'=>'30',
                                     '45'=>'45',
-  ),
+    ),
     'repeat_type_dom' => array(
-    	'' => 'None',
-    	'Daily'	=> 'Daily',
-	'Weekly' => 'Weekly',
-	'Monthly' => 'Monthly',
-	'Yearly' => 'Yearly',
+        '' => 'None',
+        'Daily'	=> 'Daily',
+    'Weekly' => 'Weekly',
+    'Monthly' => 'Monthly',
+    'Yearly' => 'Yearly',
     ),
 
     'repeat_intervals' => array(
@@ -915,19 +915,19 @@ 
     ),
 
     'duration_dom' => array(
-    	'' => 'None',
-    	'900' => '15 minutes',
-	'1800' => '30 minutes',
-	'2700' => '45 minutes',
-	'3600' => '1 hour',
-	'5400' => '1.5 hours',
-	'7200' => '2 hours',
-	'10800' => '3 hours',
-	'21600' => '6 hours',
-	'86400' => '1 day',
-	'172800' => '2 days',
-	'259200' => '3 days',
-	'604800' => '1 week',
+        '' => 'None',
+        '900' => '15 minutes',
+    '1800' => '30 minutes',
+    '2700' => '45 minutes',
+    '3600' => '1 hour',
+    '5400' => '1.5 hours',
+    '7200' => '2 hours',
+    '10800' => '3 hours',
+    '21600' => '6 hours',
+    '86400' => '1 day',
+    '172800' => '2 days',
+    '259200' => '3 days',
+    '604800' => '1 week',
     ),
 
 // deferred
@@ -938,31 +938,31 @@ 
 ),
 */
 //prospect list type dom
-  'prospect_list_type_dom' =>
-  array (
+    'prospect_list_type_dom' =>
+    array (
     'default' => 'Default',
     'seed' => 'Seed',
     'exempt_domain' => 'Suppression List - By Domain',
     'exempt_address' => 'Suppression List - By Email Address',
     'exempt' => 'Suppression List - By Id',
     'test' => 'Test',
-  ),
+    ),
 
-  'email_settings_num_dom' =>
-  array(
+    'email_settings_num_dom' =>
+    array(
         '10'    => '10',
         '20'    => '20',
         '50'    => '50'
     ),
-  'email_marketing_status_dom' =>
-  array (
+    'email_marketing_status_dom' =>
+    array (
     '' => '',
     'active'=>'Active',
     'inactive'=>'Inactive'
-  ),
+    ),
 
-  'campainglog_activity_type_dom' =>
-  array (
+    'campainglog_activity_type_dom' =>
+    array (
     ''=>'',
     'targeted' => 'Message Sent/Attempted',
     'send error'=>'Bounced Messages,Other',
@@ -973,27 +973,27 @@ 
     'lead'=>'Leads Created',
     'contact'=>'Contacts Created',
     'blocked'=>'Suppressed by address or domain',
-  ),
+    ),
 
-  'campainglog_target_type_dom' =>
-  array (
+    'campainglog_target_type_dom' =>
+    array (
     'Contacts' => 'Contacts',
     'Users'=>'Users',
     'Prospects'=>'Targets',
     'Leads'=>'Leads',
     'Accounts'=>'Accounts',
-  ),
-  'merge_operators_dom' => array (
+    ),
+    'merge_operators_dom' => array (
     'like'=>'Contains',
     'exact'=>'Exactly',
     'start'=>'Starts With',
-  ),
+    ),
 
-  'custom_fields_importable_dom' => array (
+    'custom_fields_importable_dom' => array (
     'true'=>'Yes',
     'false'=>'No',
     'required'=>'Required',
-  ),
+    ),
 
     'Elastic_boost_options' => array (
         '0' =>'Disabled',
@@ -1002,15 +1002,15 @@ 
         '3'=>'High Boost',
     ),
 
-  'custom_fields_merge_dup_dom'=> array (
+    'custom_fields_merge_dup_dom'=> array (
         0=>'Disabled',
         1=>'Enabled',
-  ),
+    ),
 
-  'navigation_paradigms' => array(
+    'navigation_paradigms' => array(
         'm'=>'Modules',
         'gm'=>'Grouped Modules',
-  ),
+    ),
 
 
     'projects_priority_options' => array (
@@ -1083,7 +1083,7 @@ 
         '300'   => 'Every 5 minutes',
         '600'   => 'Every 10 minutes',
     ),
-  'dashlet_auto_refresh_options_admin' =>
+    'dashlet_auto_refresh_options_admin' =>
     array (
         '-1'  => 'Never',
         '30'  => 'Every 30 seconds',
@@ -1092,8 +1092,8 @@ 
         '300'   => 'Every 5 minutes',
         '600'   => 'Every 10 minutes',
     ),
-  'date_range_search_dom' =>
-  array(
+    'date_range_search_dom' =>
+    array(
     '=' => 'Equals',
     'not_equal' => 'Not On',
     'greater_than' => 'After',
@@ -1109,9 +1109,9 @@ 
     'this_year' => 'This Year',
     'next_year' => 'Next Year',
     'between' => 'Is Between',
-  ),
-  'numeric_range_search_dom' =>
-  array(
+    ),
+    'numeric_range_search_dom' =>
+    array(
     '=' => 'Equals',
     'not_equal' => 'Does Not Equal',
     'greater_than' => 'Greater Than',
@@ -1119,46 +1119,46 @@ 
     'less_than' => 'Less Than',
     'less_than_equals' => 'Less Than Or Equal To',
     'between' => 'Is Between',
-  ),
-  'lead_conv_activity_opt' =>
-  array(
+    ),
+    'lead_conv_activity_opt' =>
+    array(
         'copy' => 'Copy',
         'move' => 'Move',
         'donothing' => 'Do Nothing',
-  ),
+    ),
 );
 
 $app_strings = array (
-  'LBL_TOUR_NEXT' => 'Next',
-  'LBL_TOUR_SKIP' => 'Skip',
-  'LBL_TOUR_BACK' => 'Back',
-  'LBL_TOUR_CLOSE' => 'Close',
-  'LBL_TOUR_TAKE_TOUR' => 'Take the tour',
-  'LBL_MY_AREA_LINKS' => 'My area links: ' /*for 508 compliance fix*/,
-  'LBL_GETTINGAIR' => 'Getting Air' /*for 508 compliance fix*/,
-  'LBL_WELCOMEBAR' => 'Welcome' /*for 508 compliance fix*/,
-  'LBL_ADVANCEDSEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
-  'LBL_MOREDETAIL' => 'More Detail' /*for 508 compliance fix*/,
-  'LBL_EDIT_INLINE' => 'Edit Inline' /*for 508 compliance fix*/,
-  'LBL_VIEW_INLINE' => 'View' /*for 508 compliance fix*/,
-  'LBL_BASIC_SEARCH' => 'Search' /*for 508 compliance fix*/,
-  'LBL_PROJECT_MINUS' => 'Remove' /*for 508 compliance fix*/,
-  'LBL_PROJECT_PLUS' => 'Add' /*for 508 compliance fix*/,
-  'LBL_Blank' => ' ' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_1' => 'Column' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_2' => '2 Columns' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_3' => '3 Columns' /*for 508 compliance fix*/,
-  'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
-  'LBL_ID_FF_ADD' => 'Add' /*for 508 compliance fix*/,
-  'LBL_HIDE_SHOW' => 'Hide/Show' /*for 508 compliance fix*/,
-  'LBL_DELETE_INLINE' => 'Delete' /*for 508 compliance fix*/,
-  'LBL_PLUS_INLINE' => 'Add' /*for 508 compliance fix*/,
-  'LBL_ID_FF_CLEAR' => 'Clear' /*for 508 compliance fix*/,
-  'LBL_ID_FF_VCARD' => 'vCard' /*for 508 compliance fix*/,
-  'LBL_ID_FF_REMOVE' => 'Remove' /*for 508 compliance fix*/,
-  'LBL_ADD' => 'Add' /*for 508 compliance fix*/,
-  'LBL_COMPANY_LOGO' => 'Company logo' /*for 508 compliance fix*/,
-  'LBL_JS_CALENDAR' => 'Calendar' /*for 508 compliance fix*/,
+    'LBL_TOUR_NEXT' => 'Next',
+    'LBL_TOUR_SKIP' => 'Skip',
+    'LBL_TOUR_BACK' => 'Back',
+    'LBL_TOUR_CLOSE' => 'Close',
+    'LBL_TOUR_TAKE_TOUR' => 'Take the tour',
+    'LBL_MY_AREA_LINKS' => 'My area links: ' /*for 508 compliance fix*/,
+    'LBL_GETTINGAIR' => 'Getting Air' /*for 508 compliance fix*/,
+    'LBL_WELCOMEBAR' => 'Welcome' /*for 508 compliance fix*/,
+    'LBL_ADVANCEDSEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_MOREDETAIL' => 'More Detail' /*for 508 compliance fix*/,
+    'LBL_EDIT_INLINE' => 'Edit Inline' /*for 508 compliance fix*/,
+    'LBL_VIEW_INLINE' => 'View' /*for 508 compliance fix*/,
+    'LBL_BASIC_SEARCH' => 'Search' /*for 508 compliance fix*/,
+    'LBL_PROJECT_MINUS' => 'Remove' /*for 508 compliance fix*/,
+    'LBL_PROJECT_PLUS' => 'Add' /*for 508 compliance fix*/,
+    'LBL_Blank' => ' ' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_1' => 'Column' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_2' => '2 Columns' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_3' => '3 Columns' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_ID_FF_ADD' => 'Add' /*for 508 compliance fix*/,
+    'LBL_HIDE_SHOW' => 'Hide/Show' /*for 508 compliance fix*/,
+    'LBL_DELETE_INLINE' => 'Delete' /*for 508 compliance fix*/,
+    'LBL_PLUS_INLINE' => 'Add' /*for 508 compliance fix*/,
+    'LBL_ID_FF_CLEAR' => 'Clear' /*for 508 compliance fix*/,
+    'LBL_ID_FF_VCARD' => 'vCard' /*for 508 compliance fix*/,
+    'LBL_ID_FF_REMOVE' => 'Remove' /*for 508 compliance fix*/,
+    'LBL_ADD' => 'Add' /*for 508 compliance fix*/,
+    'LBL_COMPANY_LOGO' => 'Company logo' /*for 508 compliance fix*/,
+    'LBL_JS_CALENDAR' => 'Calendar' /*for 508 compliance fix*/,
     'LBL_ADVANCED' => 'Advanced',
     'LBL_BASIC' => 'Basic',
     'LBL_MODULE_FILTER' => 'Filter By',
@@ -1228,8 +1228,8 @@ 
     'LBL_ROUTING_TO'                        => 'to',
     'LBL_ROUTING_TO_ADDRESS'                => 'to address',
     'LBL_ROUTING_WITH_TEMPLATE'             => 'with template',
-  'NTC_OVERWRITE_ADDRESS_PHONE_CONFIRM' => 'This record currently contains values in the Office Phone and Address fields. To overwrite these values with the following Office Phone and Address of the Account that you selected, click "OK". To keep the current values, click "Cancel".',
-  'LBL_DROP_HERE' => '[Drop Here]',
+    'NTC_OVERWRITE_ADDRESS_PHONE_CONFIRM' => 'This record currently contains values in the Office Phone and Address fields. To overwrite these values with the following Office Phone and Address of the Account that you selected, click "OK". To keep the current values, click "Cancel".',
+    'LBL_DROP_HERE' => '[Drop Here]',
     'LBL_EMAIL_ACCOUNTS_EDIT'               => 'Edit',
     'LBL_EMAIL_ACCOUNTS_GMAIL_DEFAULTS'     => 'Prefill Gmail™ Defaults',
     'LBL_EMAIL_ACCOUNTS_NAME'               => 'Name',
@@ -1247,8 +1247,8 @@ 
     'LBL_EMAIL_ACCOUNTS_SMTPPASS_REQD'      => 'SMTP Password is required',
     'LBL_EMAIL_ACCOUNTS_TITLE'              => 'Mail Account Management',
     'LBL_EMAIL_POP3_REMOVE_MESSAGE'     => 'Mail Server Protocol of type POP3 will not be supported in the next release. Only IMAP will be supported.',
-  'LBL_EMAIL_ACCOUNTS_SUBTITLE'           => 'Set up Mail Accounts to view incoming emails from your email accounts.',
-  'LBL_EMAIL_ACCOUNTS_OUTBOUND_SUBTITLE'  => 'Provide SMTP mail server information to use for outgoing email in Mail Accounts.',
+    'LBL_EMAIL_ACCOUNTS_SUBTITLE'           => 'Set up Mail Accounts to view incoming emails from your email accounts.',
+    'LBL_EMAIL_ACCOUNTS_OUTBOUND_SUBTITLE'  => 'Provide SMTP mail server information to use for outgoing email in Mail Accounts.',
     'LBL_EMAIL_ADD'                         => 'Add Address',
 
     'LBL_EMAIL_ADDRESS_BOOK_ADD'            => 'Done',
@@ -1318,7 +1318,7 @@ 
     'LBL_EMAIL_MULT_GROUP_FOLDER_ACCOUNTS'  => 'Multiple',
     'LBL_EMAIL_MULT_GROUP_FOLDER_ACCOUNTS_EMPTY' => 'Empty',
     'LBL_EMAIL_DATE_SENT_BY_SENDER'         => 'Date Sent by Sender',
-  'LBL_EMAIL_DATE_RECEIVED'               => 'Date Received',
+    'LBL_EMAIL_DATE_RECEIVED'               => 'Date Received',
     'LBL_EMAIL_ASSIGNED_TO_USER'            => 'Assigned to User',
     'LBL_EMAIL_DATE_TODAY'                  => 'Today',
     'LBL_EMAIL_DATE_YESTERDAY'              => 'Yesterday',
@@ -1563,17 +1563,17 @@ 
     'LBL_EMAIL_SETTINGS_TOGGLE_ADV'         => 'Show Advanced',
     'LBL_EMAIL_SETTINGS_USER_FOLDERS'       => 'Available User Folders',
     'LBL_EMAIL_ERROR_PREPEND'               => 'Error:',
-  'LBL_EMAIL_INVALID_PERSONAL_OUTBOUND' => 'The outbound mail server selected for the mail account you are using is invalid.  Check the settings or select a different mail server for the mail account.',
-  'LBL_EMAIL_INVALID_SYSTEM_OUTBOUND' => 'An outgoing mail server is not configured to send emails. Please configure an outgoing mail server or select an outgoing mail server for the mail account that you are using in Settings >> Mail Account.',
+    'LBL_EMAIL_INVALID_PERSONAL_OUTBOUND' => 'The outbound mail server selected for the mail account you are using is invalid.  Check the settings or select a different mail server for the mail account.',
+    'LBL_EMAIL_INVALID_SYSTEM_OUTBOUND' => 'An outgoing mail server is not configured to send emails. Please configure an outgoing mail server or select an outgoing mail server for the mail account that you are using in Settings >> Mail Account.',
     'LBL_EMAIL_SHOW_READ'                   => 'Show All',
     'LBL_EMAIL_SHOW_UNREAD_ONLY'            => 'Show Unread Only',
     'LBL_EMAIL_SIGNATURES'                  => 'Signatures',
     'LBL_EMAIL_SIGNATURE_CREATE'            => 'Create Signature',
     'LBL_EMAIL_SIGNATURE_NAME'              => 'Signature Name',
     'LBL_EMAIL_SIGNATURE_TEXT'              => 'Signature Body',
-  'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
-  'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
-  'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
+    'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
+    'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
+    'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
     'LBL_SMTPTYPE_OTHER'                  => 'Other',
     'LBL_EMAIL_SPACER_MAIL_SERVER'          => '[ Remote Folders ]',
     'LBL_EMAIL_SPACER_LOCAL_FOLDER'         => '[ SuiteCRM Folders ]',
@@ -1880,8 +1880,8 @@ 
     'LBL_PRIMARY_ADDRESS_STREET' => 'Primary Address Street:',
     'LBL_PRIMARY_ADDRESS' => 'Primary Address:',
 
-	'LBL_BILLING_STREET'=> 'Street:',
-	'LBL_SHIPPING_STREET'=> 'Street:',
+    'LBL_BILLING_STREET'=> 'Street:',
+    'LBL_SHIPPING_STREET'=> 'Street:',
 
     'LBL_PROSPECTS'=>'Prospects',
     'LBL_PRODUCT_BUNDLES'=>'Product Bundles',
@@ -2151,16 +2151,16 @@ 
     'MSG_JS_ALERT_MTG_REMINDER_STATUS' => 'Status: ',
     'MSG_JS_ALERT_MTG_REMINDER_RELATED_TO' => 'Related To: ',
     'MSG_JS_ALERT_MTG_REMINDER_CALL_MSG' => "\nClick OK to view this call or click Cancel to dismiss this message.",
-  	'MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG' => "\nClick OK to view this meeting or click Cancel to dismiss this message.",
-	'MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME' => 'Event',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION' => 'Event isn\'t set.',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION' => 'Location isn\'t set.',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE' => 'Start date isn\'t defined.',
- 	'MSG_LIST_VIEW_NO_RESULTS_BASIC' => "No results found.",
-	'MSG_LIST_VIEW_NO_RESULTS' => "No results found for <item1>",
- 	'MSG_LIST_VIEW_NO_RESULTS_SUBMSG' => "Create <item1> as a new <item2>",
-	'MSG_EMPTY_LIST_VIEW_NO_RESULTS' => "You currently have no records saved. <item2> or <item3> one now.",
-	'MSG_EMPTY_LIST_VIEW_NO_RESULTS_SUBMSG' =>	"<item4> to learn more about the <item1> module. In order to access more information, use the user menu drop down located on the main navigation bar to access Help.",
+        'MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG' => "\nClick OK to view this meeting or click Cancel to dismiss this message.",
+    'MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME' => 'Event',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION' => 'Event isn\'t set.',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION' => 'Location isn\'t set.',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE' => 'Start date isn\'t defined.',
+        'MSG_LIST_VIEW_NO_RESULTS_BASIC' => "No results found.",
+    'MSG_LIST_VIEW_NO_RESULTS' => "No results found for <item1>",
+        'MSG_LIST_VIEW_NO_RESULTS_SUBMSG' => "Create <item1> as a new <item2>",
+    'MSG_EMPTY_LIST_VIEW_NO_RESULTS' => "You currently have no records saved. <item2> or <item3> one now.",
+    'MSG_EMPTY_LIST_VIEW_NO_RESULTS_SUBMSG' =>	"<item4> to learn more about the <item1> module. In order to access more information, use the user menu drop down located on the main navigation bar to access Help.",
 
     'LBL_CLICK_HERE' => "Click here",
     // contextMenu strings
@@ -2187,13 +2187,13 @@ 
     'LBL_TRAINING' => 'Support',
     'ERR_DATABASE_CONN_DROPPED'=>'Error executing a query. Possibly, your database dropped the connection. Please refresh this page, you may need to restart you web server.',
     'ERR_MSSQL_DB_CONTEXT' =>'Changed database context to',
-  'ERR_MSSQL_WARNING' =>'Warning:',
+    'ERR_MSSQL_WARNING' =>'Warning:',
 
     //Meta-Data framework
     'ERR_MISSING_VARDEF_NAME' => 'Warning: field [[field]] does not have a mapped entry in [moduleDir] vardefs.php file',
     'ERR_CANNOT_CREATE_METADATA_FILE' => 'Error: File [[file]] is missing.  Unable to create because no corresponding HTML file was found.',
-  'ERR_CANNOT_FIND_MODULE' => 'Error: Module [module] does not exist.',
-  'LBL_ALT_ADDRESS' => 'Other Address:',
+    'ERR_CANNOT_FIND_MODULE' => 'Error: Module [module] does not exist.',
+    'LBL_ALT_ADDRESS' => 'Other Address:',
     'ERR_SMARTY_UNEQUAL_RELATED_FIELD_PARAMETERS' => 'Error: There are an unequal number of arguments for the \'key\' and \'copy\' elements in the displayParams array.',
     'ERR_SMARTY_MISSING_DISPLAY_PARAMS' => 'Missing index in displayParams Array for: ',
 
@@ -2284,10 +2284,10 @@ 
 
     //jc:#12287 - For javascript validation messages
     'MSG_IS_NOT_BEFORE' => 'is not before',
-  'MSG_IS_MORE_THAN' => 'is more than',
-  'MSG_IS_LESS_THAN' => 'is less than',
-  'MSG_SHOULD_BE' => 'should be',
-  'MSG_OR_GREATER' => 'or greater',
+    'MSG_IS_MORE_THAN' => 'is more than',
+    'MSG_IS_LESS_THAN' => 'is less than',
+    'MSG_SHOULD_BE' => 'should be',
+    'MSG_OR_GREATER' => 'or greater',
 
     'LBL_PORTAL_WELCOME_TITLE' => 'Welcome to SuiteCRM Portal',
     'LBL_PORTAL_WELCOME_INFO' => 'SuiteCRM Portal is a framework which provides real-time view of cases, bugs & newsletters etc to customers. This is an external facing interface to SuiteCRM that can be deployed within any website.',
@@ -2319,13 +2319,13 @@ 
     'LBL_OPERATOR_NOT_IN_TEXT' => 'is not one of the following:',
 
 
-  //Connector
+    //Connector
     'ERR_CONNECTOR_FILL_BEANS_SIZE_MISMATCH' => 'Error: The Array count of the bean parameter does not match the Array count of the results.',
-  'ERR_MISSING_MAPPING_ENTRY_FORM_MODULE' => 'Error: Missing mapping entry for module.',
-  'ERROR_UNABLE_TO_RETRIEVE_DATA' => 'Error: Unable to retrieve data for {0} Connector.  The service may currently be inaccessible or the configuration settings may be invalid.  Connector error message: ({1}).',
-  'LBL_MERGE_CONNECTORS' => 'Get Data',
-  'LBL_MERGE_CONNECTORS_BUTTON_KEY' => '[D]',
-  'LBL_REMOVE_MODULE_ENTRY' => 'Are you sure you want to disable connector integration for this module?',
+    'ERR_MISSING_MAPPING_ENTRY_FORM_MODULE' => 'Error: Missing mapping entry for module.',
+    'ERROR_UNABLE_TO_RETRIEVE_DATA' => 'Error: Unable to retrieve data for {0} Connector.  The service may currently be inaccessible or the configuration settings may be invalid.  Connector error message: ({1}).',
+    'LBL_MERGE_CONNECTORS' => 'Get Data',
+    'LBL_MERGE_CONNECTORS_BUTTON_KEY' => '[D]',
+    'LBL_REMOVE_MODULE_ENTRY' => 'Are you sure you want to disable connector integration for this module?',
 
     // fastcgi checks
     'LBL_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
@@ -2336,28 +2336,28 @@ 
 
     //martin #25548
     'LBL_NO_FLASH_PLAYER' => 'You either have Abobe Flash turned off or are using an older version of the Adobe Flash Player. To get the latest version of the Flash Player, <a href="http://www.adobe.com/go/getflashplayer/">click here</a>.',
-  //Collection Field
-  'LBL_COLLECTION_NAME' => 'Name',
-  'LBL_COLLECTION_PRIMARY' => 'Primary',
-  'ERROR_MISSING_COLLECTION_SELECTION' => 'Empty required field',
+    //Collection Field
+    'LBL_COLLECTION_NAME' => 'Name',
+    'LBL_COLLECTION_PRIMARY' => 'Primary',
+    'ERROR_MISSING_COLLECTION_SELECTION' => 'Empty required field',
     'LBL_COLLECTION_EXACT' => 'Exact',
 
     //MB -Fixed Bug #32812 -Max
     'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
     'LBL_DESCRIPTION' => 'Description',
 
-  'LBL_YESTERDAY'=> 'yesterday',
-  'LBL_TODAY'=>'today',
-  'LBL_TOMORROW'=>'tomorrow',
-  'LBL_NEXT_WEEK'=> 'next week',
-  'LBL_NEXT_MONDAY'=>'next monday',
-  'LBL_NEXT_FRIDAY'=>'next friday',
-  'LBL_TWO_WEEKS'=> 'two weeks',
-  'LBL_NEXT_MONTH'=> 'next month',
-  'LBL_FIRST_DAY_OF_NEXT_MONTH'=> 'first day of next month',
-  'LBL_THREE_MONTHS'=> 'three months',
-  'LBL_SIXMONTHS'=> 'six months',
-  'LBL_NEXT_YEAR'=> 'next year',
+    'LBL_YESTERDAY'=> 'yesterday',
+    'LBL_TODAY'=>'today',
+    'LBL_TOMORROW'=>'tomorrow',
+    'LBL_NEXT_WEEK'=> 'next week',
+    'LBL_NEXT_MONDAY'=>'next monday',
+    'LBL_NEXT_FRIDAY'=>'next friday',
+    'LBL_TWO_WEEKS'=> 'two weeks',
+    'LBL_NEXT_MONTH'=> 'next month',
+    'LBL_FIRST_DAY_OF_NEXT_MONTH'=> 'first day of next month',
+    'LBL_THREE_MONTHS'=> 'three months',
+    'LBL_SIXMONTHS'=> 'six months',
+    'LBL_NEXT_YEAR'=> 'next year',
     'LBL_FILTERED' => 'Filtered',
 
     //Datetimecombo fields
@@ -2384,7 +2384,7 @@ 
 
     //File write error label
     'ERR_FILE_WRITE' => 'Error: Could not write file {0}.  Please check system and web server permissions.',
-  'ERR_FILE_NOT_FOUND' => 'Error: Could not load file {0}.  Please check system and web server permissions.',
+    'ERR_FILE_NOT_FOUND' => 'Error: Could not load file {0}.  Please check system and web server permissions.',
 
     'LBL_AND' => 'And',
     'LBL_BEFORE' => 'Before',
@@ -2456,7 +2456,7 @@ 
     'LBL_ALT_MOVE_COLUMN_UP' =>'Move selected entry up in the displayed list order',
     'LBL_ALT_MOVE_COLUMN_DOWN' => 'Move selected entry down in the displayed list order',
     'LBL_ALT_INFO' => 'Information',
-	'MSG_DUPLICATE' => 'The {0} record you are about to create might be a duplicate of an {0} record that already exists. {1} records containing similar names are listed below.<br>Click Create {1} to continue creating this new {0}, or select an existing {0} listed below.',
+    'MSG_DUPLICATE' => 'The {0} record you are about to create might be a duplicate of an {0} record that already exists. {1} records containing similar names are listed below.<br>Click Create {1} to continue creating this new {0}, or select an existing {0} listed below.',
     'MSG_SHOW_DUPLICATES' => 'The {0} record you are about to create might be a duplicate of a {0} record that already exists. {1} records containing similar names are listed below.  Click Save to continue creating this new {0}, or click Cancel to return to the module without creating the {0}.',
     'LBL_EMAIL_TITLE' => 'email address',
     'LBL_EMAIL_OPT_TITLE' => 'opted out email address',
@@ -2532,9 +2532,9 @@ 
     'Expired' => 'Expired',
     'In Review' => 'In Review',
     'Published' => 'Published',
-  );
+    );
 
-   $app_list_strings['kbadmin_actions_dom'] =
+    $app_list_strings['kbadmin_actions_dom'] =
     array (
     ''          => '--Admin Actions--',
     'Create New Tag' => 'Create New Tag',
@@ -2543,10 +2543,10 @@ 
     'Move Selected Articles'=>'Move Selected Articles',
     'Apply Tags On Articles'=>'Apply Tags To Articles',
     'Delete Selected Articles'=>'Delete Selected Articles',
-  );
+    );
 
 
-  $app_list_strings['kbdocument_attachment_option_dom'] =
+    $app_list_strings['kbdocument_attachment_option_dom'] =
     array(
         ''=>'',
         'some' => 'Has Attachments',
@@ -2555,10 +2555,10 @@ 
         'name' => 'Specify Name',
     );
 
-  $app_list_strings['moduleList']['KBDocuments'] = 'Knowledge Base';
-  $app_strings['LBL_CREATE_KB_DOCUMENT'] = 'Create Article';
-  $app_list_strings['kbdocument_viewing_frequency_dom'] =
-  array(
+    $app_list_strings['moduleList']['KBDocuments'] = 'Knowledge Base';
+    $app_strings['LBL_CREATE_KB_DOCUMENT'] = 'Create Article';
+    $app_list_strings['kbdocument_viewing_frequency_dom'] =
+    array(
     ''=>'',
     'Top_5'  => 'Top 5',
     'Top_10' => 'Top 10',
@@ -2566,9 +2566,9 @@ 
     'Bot_5'  => 'Bottom 5',
     'Bot_10' => 'Bottom 10',
     'Bot_20' => 'Bottom 20',
-  );
+    );
 
-   $app_list_strings['kbdocument_canned_search'] =
+    $app_list_strings['kbdocument_canned_search'] =
     array(
         'all'=>'All',
         'added' => 'Added Last 30 days',
@@ -2835,7 +2835,7 @@ 
         'ZIMBABWE' => 'ZIMBABWE',
     );
 
-  $app_list_strings['charset_dom'] = array(
+    $app_list_strings['charset_dom'] = array(
     'BIG-5'     => 'BIG-5 (Taiwan and Hong Kong)',
     /*'CP866'     => 'CP866', // ms-dos Cyrillic */
     /*'CP949'     => 'CP949 (Microsoft Korean)', */
@@ -2864,389 +2864,389 @@ 
     'KOI8-U'    => 'KOI8-U (Cyrillic Ukranian)',
     'SJIS'      => 'SJIS (MS Japanese)',
     'UTF-8'     => 'UTF-8',
-  );
-
-  $app_list_strings['timezone_dom'] = array(
-
-  'Africa/Algiers' => 'Africa/Algiers',
-  'Africa/Luanda' => 'Africa/Luanda',
-  'Africa/Porto-Novo' => 'Africa/Porto-Novo',
-  'Africa/Gaborone' => 'Africa/Gaborone',
-  'Africa/Ouagadougou' => 'Africa/Ouagadougou',
-  'Africa/Bujumbura' => 'Africa/Bujumbura',
-  'Africa/Douala' => 'Africa/Douala',
-  'Atlantic/Cape_Verde' => 'Atlantic/Cape Verde',
-  'Africa/Bangui' => 'Africa/Bangui',
-  'Africa/Ndjamena' => 'Africa/Ndjamena',
-  'Indian/Comoro' => 'Indian/Comoro',
-  'Africa/Kinshasa' => 'Africa/Kinshasa',
-  'Africa/Lubumbashi' => 'Africa/Lubumbashi',
-  'Africa/Brazzaville' => 'Africa/Brazzaville',
-  'Africa/Abidjan' => 'Africa/Abidjan',
-  'Africa/Djibouti' => 'Africa/Djibouti',
-  'Africa/Cairo' => 'Africa/Cairo',
-  'Africa/Malabo' => 'Africa/Malabo',
-  'Africa/Asmera' => 'Africa/Asmera',
-  'Africa/Addis_Ababa' => 'Africa/Addis Ababa',
-  'Africa/Libreville' => 'Africa/Libreville',
-  'Africa/Banjul' => 'Africa/Banjul',
-  'Africa/Accra' => 'Africa/Accra',
-  'Africa/Conakry' => 'Africa/Conakry',
-  'Africa/Bissau' => 'Africa/Bissau',
-  'Africa/Nairobi' => 'Africa/Nairobi',
-  'Africa/Maseru' => 'Africa/Maseru',
-  'Africa/Monrovia' => 'Africa/Monrovia',
-  'Africa/Tripoli' => 'Africa/Tripoli',
-  'Indian/Antananarivo' => 'Indian/Antananarivo',
-  'Africa/Blantyre' => 'Africa/Blantyre',
-  'Africa/Bamako' => 'Africa/Bamako',
-  'Africa/Nouakchott' => 'Africa/Nouakchott',
-  'Indian/Mauritius' => 'Indian/Mauritius',
-  'Indian/Mayotte' => 'Indian/Mayotte',
-  'Africa/Casablanca' => 'Africa/Casablanca',
-  'Africa/El_Aaiun' => 'Africa/El Aaiun',
-  'Africa/Maputo' => 'Africa/Maputo',
-  'Africa/Windhoek' => 'Africa/Windhoek',
-  'Africa/Niamey' => 'Africa/Niamey',
-  'Africa/Lagos' => 'Africa/Lagos',
-  'Indian/Reunion' => 'Indian/Reunion',
-  'Africa/Kigali' => 'Africa/Kigali',
-  'Atlantic/St_Helena' => 'Atlantic/St. Helena',
-  'Africa/Sao_Tome' => 'Africa/Sao Tome',
-  'Africa/Dakar' => 'Africa/Dakar',
-  'Indian/Mahe' => 'Indian/Mahe',
-  'Africa/Freetown' => 'Africa/Freetown',
-  'Africa/Mogadishu' => 'Africa/Mogadishu',
-  'Africa/Johannesburg' => 'Africa/Johannesburg',
-  'Africa/Khartoum' => 'Africa/Khartoum',
-  'Africa/Mbabane' => 'Africa/Mbabane',
-  'Africa/Dar_es_Salaam' => 'Africa/Dar es Salaam',
-  'Africa/Lome' => 'Africa/Lome',
-  'Africa/Tunis' => 'Africa/Tunis',
-  'Africa/Kampala' => 'Africa/Kampala',
-  'Africa/Lusaka' => 'Africa/Lusaka',
-  'Africa/Harare' => 'Africa/Harare',
-  'Antarctica/Casey' => 'Antarctica/Casey',
-  'Antarctica/Davis' => 'Antarctica/Davis',
-  'Antarctica/Mawson' => 'Antarctica/Mawson',
-  'Indian/Kerguelen' => 'Indian/Kerguelen',
-  'Antarctica/DumontDUrville' => 'Antarctica/DumontDUrville',
-  'Antarctica/Syowa' => 'Antarctica/Syowa',
-  'Antarctica/Vostok' => 'Antarctica/Vostok',
-  'Antarctica/Rothera' => 'Antarctica/Rothera',
-  'Antarctica/Palmer' => 'Antarctica/Palmer',
-  'Antarctica/McMurdo' => 'Antarctica/McMurdo',
-  'Asia/Kabul' => 'Asia/Kabul',
-  'Asia/Yerevan' => 'Asia/Yerevan',
-  'Asia/Baku' => 'Asia/Baku',
-  'Asia/Bahrain' => 'Asia/Bahrain',
-  'Asia/Dhaka' => 'Asia/Dhaka',
-  'Asia/Thimphu' => 'Asia/Thimphu',
-  'Indian/Chagos' => 'Indian/Chagos',
-  'Asia/Brunei' => 'Asia/Brunei',
-  'Asia/Rangoon' => 'Asia/Rangoon',
-  'Asia/Phnom_Penh' => 'Asia/Phnom Penh',
-  'Asia/Beijing' => 'Asia/Beijing',
-  'Asia/Harbin' => 'Asia/Harbin',
-  'Asia/Shanghai' => 'Asia/Shanghai',
-  'Asia/Chongqing' => 'Asia/Chongqing',
-  'Asia/Urumqi' => 'Asia/Urumqi',
-  'Asia/Kashgar' => 'Asia/Kashgar',
-  'Asia/Hong_Kong' => 'Asia/Hong Kong',
-  'Asia/Taipei' => 'Asia/Taipei',
-  'Asia/Macau' => 'Asia/Macau',
-  'Asia/Nicosia' => 'Asia/Nicosia',
-  'Asia/Tbilisi' => 'Asia/Tbilisi',
-  'Asia/Dili' => 'Asia/Dili',
-  'Asia/Calcutta' => 'Asia/Calcutta',
-  'Asia/Jakarta' => 'Asia/Jakarta',
-  'Asia/Pontianak' => 'Asia/Pontianak',
-  'Asia/Makassar' => 'Asia/Makassar',
-  'Asia/Jayapura' => 'Asia/Jayapura',
-  'Asia/Tehran' => 'Asia/Tehran',
-  'Asia/Baghdad' => 'Asia/Baghdad',
-  'Asia/Jerusalem' => 'Asia/Jerusalem',
-  'Asia/Tokyo' => 'Asia/Tokyo',
-  'Asia/Amman' => 'Asia/Amman',
-  'Asia/Almaty' => 'Asia/Almaty',
-  'Asia/Qyzylorda' => 'Asia/Qyzylorda',
-  'Asia/Aqtobe' => 'Asia/Aqtobe',
-  'Asia/Aqtau' => 'Asia/Aqtau',
-  'Asia/Oral' => 'Asia/Oral',
-  'Asia/Bishkek' => 'Asia/Bishkek',
-  'Asia/Seoul' => 'Asia/Seoul',
-  'Asia/Pyongyang' => 'Asia/Pyongyang',
-  'Asia/Kuwait' => 'Asia/Kuwait',
-  'Asia/Vientiane' => 'Asia/Vientiane',
-  'Asia/Beirut' => 'Asia/Beirut',
-  'Asia/Kuala_Lumpur' => 'Asia/Kuala Lumpur',
-  'Asia/Kuching' => 'Asia/Kuching',
-  'Indian/Maldives' => 'Indian/Maldives',
-  'Asia/Hovd' => 'Asia/Hovd',
-  'Asia/Ulaanbaatar' => 'Asia/Ulaanbaatar',
-  'Asia/Choibalsan' => 'Asia/Choibalsan',
-  'Asia/Katmandu' => 'Asia/Katmandu',
-  'Asia/Muscat' => 'Asia/Muscat',
-  'Asia/Karachi' => 'Asia/Karachi',
-  'Asia/Gaza' => 'Asia/Gaza',
-  'Asia/Manila' => 'Asia/Manila',
-  'Asia/Qatar' => 'Asia/Qatar',
-  'Asia/Riyadh' => 'Asia/Riyadh',
-  'Asia/Singapore' => 'Asia/Singapore',
-  'Asia/Colombo' => 'Asia/Colombo',
-  'Asia/Damascus' => 'Asia/Damascus',
-  'Asia/Dushanbe' => 'Asia/Dushanbe',
-  'Asia/Bangkok' => 'Asia/Bangkok',
-  'Asia/Ashgabat' => 'Asia/Ashgabat',
-  'Asia/Dubai' => 'Asia/Dubai',
-  'Asia/Samarkand' => 'Asia/Samarkand',
-  'Asia/Tashkent' => 'Asia/Tashkent',
-  'Asia/Saigon' => 'Asia/Saigon',
-  'Asia/Aden' => 'Asia/Aden',
-  'Australia/Darwin' => 'Australia/Darwin',
-  'Australia/Perth' => 'Australia/Perth',
-  'Australia/Brisbane' => 'Australia/Brisbane',
-  'Australia/Lindeman' => 'Australia/Lindeman',
-  'Australia/Adelaide' => 'Australia/Adelaide',
-  'Australia/Hobart' => 'Australia/Hobart',
-  'Australia/Currie' => 'Australia/Currie',
-  'Australia/Melbourne' => 'Australia/Melbourne',
-  'Australia/Sydney' => 'Australia/Sydney',
-  'Australia/Broken_Hill' => 'Australia/Broken Hill',
-  'Indian/Christmas' => 'Indian/Christmas',
-  'Pacific/Rarotonga' => 'Pacific/Rarotonga',
-  'Indian/Cocos' => 'Indian/Cocos',
-  'Pacific/Fiji' => 'Pacific/Fiji',
-  'Pacific/Gambier' => 'Pacific/Gambier',
-  'Pacific/Marquesas' => 'Pacific/Marquesas',
-  'Pacific/Tahiti' => 'Pacific/Tahiti',
-  'Pacific/Guam' => 'Pacific/Guam',
-  'Pacific/Tarawa' => 'Pacific/Tarawa',
-  'Pacific/Enderbury' => 'Pacific/Enderbury',
-  'Pacific/Kiritimati' => 'Pacific/Kiritimati',
-  'Pacific/Saipan' => 'Pacific/Saipan',
-  'Pacific/Majuro' => 'Pacific/Majuro',
-  'Pacific/Kwajalein' => 'Pacific/Kwajalein',
-  'Pacific/Truk' => 'Pacific/Truk',
-  'Pacific/Pohnpei' => 'Pacific/Pohnpei',
-  'Pacific/Kosrae' => 'Pacific/Kosrae',
-  'Pacific/Nauru' => 'Pacific/Nauru',
-  'Pacific/Noumea' => 'Pacific/Noumea',
-  'Pacific/Auckland' => 'Pacific/Auckland',
-  'Pacific/Chatham' => 'Pacific/Chatham',
-  'Pacific/Niue' => 'Pacific/Niue',
-  'Pacific/Norfolk' => 'Pacific/Norfolk',
-  'Pacific/Palau' => 'Pacific/Palau',
-  'Pacific/Port_Moresby' => 'Pacific/Port Moresby',
-  'Pacific/Pitcairn' => 'Pacific/Pitcairn',
-  'Pacific/Pago_Pago' => 'Pacific/Pago Pago',
-  'Pacific/Apia' => 'Pacific/Apia',
-  'Pacific/Guadalcanal' => 'Pacific/Guadalcanal',
-  'Pacific/Fakaofo' => 'Pacific/Fakaofo',
-  'Pacific/Tongatapu' => 'Pacific/Tongatapu',
-  'Pacific/Funafuti' => 'Pacific/Funafuti',
-  'Pacific/Johnston' => 'Pacific/Johnston',
-  'Pacific/Midway' => 'Pacific/Midway',
-  'Pacific/Wake' => 'Pacific/Wake',
-  'Pacific/Efate' => 'Pacific/Efate',
-  'Pacific/Wallis' => 'Pacific/Wallis',
-  'Europe/London' => 'Europe/London',
-  'Europe/Dublin' => 'Europe/Dublin',
-  'WET' => 'WET',
-  'CET' => 'CET',
-  'MET' => 'MET',
-  'EET' => 'EET',
-  'Europe/Tirane' => 'Europe/Tirane',
-  'Europe/Andorra' => 'Europe/Andorra',
-  'Europe/Vienna' => 'Europe/Vienna',
-  'Europe/Minsk' => 'Europe/Minsk',
-  'Europe/Brussels' => 'Europe/Brussels',
-  'Europe/Sofia' => 'Europe/Sofia',
-  'Europe/Prague' => 'Europe/Prague',
-  'Europe/Copenhagen' => 'Europe/Copenhagen',
-  'Atlantic/Faeroe' => 'Atlantic/Faeroe',
-  'America/Danmarkshavn' => 'America/Danmarkshavn',
-  'America/Scoresbysund' => 'America/Scoresbysund',
-  'America/Godthab' => 'America/Godthab',
-  'America/Thule' => 'America/Thule',
-  'Europe/Tallinn' => 'Europe/Tallinn',
-  'Europe/Helsinki' => 'Europe/Helsinki',
-  'Europe/Paris' => 'Europe/Paris',
-  'Europe/Berlin' => 'Europe/Berlin',
-  'Europe/Gibraltar' => 'Europe/Gibraltar',
-  'Europe/Athens' => 'Europe/Athens',
-  'Europe/Budapest' => 'Europe/Budapest',
-  'Atlantic/Reykjavik' => 'Atlantic/Reykjavik',
-  'Europe/Rome' => 'Europe/Rome',
-  'Europe/Riga' => 'Europe/Riga',
-  'Europe/Vaduz' => 'Europe/Vaduz',
-  'Europe/Vilnius' => 'Europe/Vilnius',
-  'Europe/Luxembourg' => 'Europe/Luxembourg',
-  'Europe/Malta' => 'Europe/Malta',
-  'Europe/Chisinau' => 'Europe/Chisinau',
-  'Europe/Monaco' => 'Europe/Monaco',
-  'Europe/Amsterdam' => 'Europe/Amsterdam',
-  'Europe/Oslo' => 'Europe/Oslo',
-  'Europe/Warsaw' => 'Europe/Warsaw',
-  'Europe/Lisbon' => 'Europe/Lisbon',
-  'Atlantic/Azores' => 'Atlantic/Azores',
-  'Atlantic/Madeira' => 'Atlantic/Madeira',
-  'Europe/Bucharest' => 'Europe/Bucharest',
-  'Europe/Kaliningrad' => 'Europe/Kaliningrad',
-  'Europe/Moscow' => 'Europe/Moscow',
-  'Europe/Samara' => 'Europe/Samara',
-  'Asia/Yekaterinburg' => 'Asia/Yekaterinburg',
-  'Asia/Omsk' => 'Asia/Omsk',
-  'Asia/Novosibirsk' => 'Asia/Novosibirsk',
-  'Asia/Krasnoyarsk' => 'Asia/Krasnoyarsk',
-  'Asia/Irkutsk' => 'Asia/Irkutsk',
-  'Asia/Yakutsk' => 'Asia/Yakutsk',
-  'Asia/Vladivostok' => 'Asia/Vladivostok',
-  'Asia/Sakhalin' => 'Asia/Sakhalin',
-  'Asia/Magadan' => 'Asia/Magadan',
-  'Asia/Kamchatka' => 'Asia/Kamchatka',
-  'Asia/Anadyr' => 'Asia/Anadyr',
-  'Europe/Belgrade' => 'Europe/Belgrade' ,
-  'Europe/Madrid' =>'Europe/Madrid' ,
-  'Africa/Ceuta' => 'Africa/Ceuta',
-  'Atlantic/Canary' => 'Atlantic/Canary',
-  'Europe/Stockholm' => 'Europe/Stockholm',
-  'Europe/Zurich' => 'Europe/Zurich' ,
-  'Europe/Istanbul' => 'Europe/Istanbul',
-  'Europe/Kiev' => 'Europe/Kiev',
-  'Europe/Uzhgorod' => 'Europe/Uzhgorod',
-  'Europe/Zaporozhye' => 'Europe/Zaporozhye',
-  'Europe/Simferopol' => 'Europe/Simferopol',
-  'America/New_York' => 'America/New York',
-  'America/Chicago' =>'America/Chicago' ,
-  'America/North_Dakota/Center' => 'America/North Dakota/Center',
-  'America/Denver' => 'America/Denver',
-  'America/Los_Angeles' => 'America/Los Angeles',
-  'America/Juneau' => 'America/Juneau',
-  'America/Yakutat' => 'America/Yakutat',
-  'America/Anchorage' => 'America/Anchorage',
-  'America/Nome' =>'America/Nome' ,
-  'America/Adak' => 'America/Adak',
-  'Pacific/Honolulu' => 'Pacific/Honolulu',
-  'America/Phoenix' => 'America/Phoenix',
-  'America/Boise' => 'America/Boise',
-  'America/Indiana/Indianapolis' => 'America/Indiana/Indianapolis',
-  'America/Indiana/Marengo' => 'America/Indiana/Marengo',
-  'America/Indiana/Knox' =>  'America/Indiana/Knox',
-  'America/Indiana/Vevay' => 'America/Indiana/Vevay',
-  'America/Kentucky/Louisville' =>'America/Kentucky/Louisville'  ,
-  'America/Kentucky/Monticello' =>  'America/Kentucky/Monticello' ,
-  'America/Detroit' => 'America/Detroit',
-  'America/Menominee' => 'America/Menominee',
-  'America/St_Johns' => 'America/St. Johns',
-  'America/Goose_Bay' => 'America/Goose_Bay' ,
-  'America/Halifax' => 'America/Halifax',
-  'America/Glace_Bay' =>'America/Glace Bay' ,
-  'America/Montreal' => 'America/Montreal',
-  'America/Toronto' => 'America/Toronto',
-  'America/Thunder_Bay' => 'America/Thunder Bay' ,
-  'America/Nipigon' => 'America/Nipigon',
-  'America/Rainy_River' => 'America/Rainy River',
-  'America/Winnipeg' => 'America/Winnipeg',
-  'America/Regina' => 'America/Regina',
-  'America/Swift_Current' => 'America/Swift Current',
-  'America/Edmonton' =>  'America/Edmonton',
-  'America/Vancouver' => 'America/Vancouver',
-  'America/Dawson_Creek' => 'America/Dawson Creek',
-  'America/Pangnirtung' => 'America/Pangnirtung'  ,
-  'America/Iqaluit' => 'America/Iqaluit' ,
-  'America/Coral_Harbour' => 'America/Coral Harbour' ,
-  'America/Rankin_Inlet' => 'America/Rankin Inlet',
-  'America/Cambridge_Bay' => 'America/Cambridge Bay',
-  'America/Yellowknife' => 'America/Yellowknife',
-  'America/Inuvik' =>'America/Inuvik' ,
-  'America/Whitehorse' => 'America/Whitehorse' ,
-  'America/Dawson' => 'America/Dawson',
-  'America/Cancun' => 'America/Cancun',
-  'America/Merida' => 'America/Merida',
-  'America/Monterrey' => 'America/Monterrey',
-  'America/Mexico_City' => 'America/Mexico City',
-  'America/Chihuahua' => 'America/Chihuahua',
-  'America/Hermosillo' => 'America/Hermosillo',
-  'America/Mazatlan' => 'America/Mazatlan',
-  'America/Tijuana' => 'America/Tijuana',
-  'America/Anguilla' => 'America/Anguilla',
-  'America/Antigua' => 'America/Antigua',
-  'America/Nassau' =>'America/Nassau' ,
-  'America/Barbados' => 'America/Barbados',
-  'America/Belize' => 'America/Belize',
-  'Atlantic/Bermuda' => 'Atlantic/Bermuda',
-  'America/Cayman' => 'America/Cayman',
-  'America/Costa_Rica' => 'America/Costa Rica',
-  'America/Havana' => 'America/Havana',
-  'America/Dominica' => 'America/Dominica',
-  'America/Santo_Domingo' => 'America/Santo Domingo',
-  'America/El_Salvador' => 'America/El Salvador',
-  'America/Grenada' => 'America/Grenada',
-  'America/Guadeloupe' => 'America/Guadeloupe',
-  'America/Guatemala' => 'America/Guatemala',
-  'America/Port-au-Prince' => 'America/Port-au-Prince',
-  'America/Tegucigalpa' => 'America/Tegucigalpa',
-  'America/Jamaica' => 'America/Jamaica',
-  'America/Martinique' => 'America/Martinique',
-  'America/Montserrat' => 'America/Montserrat',
-  'America/Managua' => 'America/Managua',
-  'America/Panama' => 'America/Panama',
-  'America/Puerto_Rico' =>'America/Puerto_Rico' ,
-  'America/St_Kitts' => 'America/St_Kitts',
-  'America/St_Lucia' => 'America/St_Lucia',
-  'America/Miquelon' => 'America/Miquelon',
-  'America/St_Vincent' => 'America/St. Vincent',
-  'America/Grand_Turk' => 'America/Grand Turk',
-  'America/Tortola' => 'America/Tortola',
-  'America/St_Thomas' => 'America/St. Thomas',
-  'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos Aires',
-  'America/Argentina/Cordoba' => 'America/Argentina/Cordoba',
-  'America/Argentina/Tucuman' => 'America/Argentina/Tucuman',
-  'America/Argentina/La_Rioja' => 'America/Argentina/La_Rioja',
-  'America/Argentina/San_Juan' => 'America/Argentina/San_Juan',
-  'America/Argentina/Jujuy' => 'America/Argentina/Jujuy',
-  'America/Argentina/Catamarca' => 'America/Argentina/Catamarca',
-  'America/Argentina/Mendoza' => 'America/Argentina/Mendoza',
-  'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio Gallegos',
-  'America/Argentina/Ushuaia' =>  'America/Argentina/Ushuaia',
-  'America/Aruba' => 'America/Aruba',
-  'America/La_Paz' => 'America/La Paz',
-  'America/Noronha' => 'America/Noronha',
-  'America/Belem' => 'America/Belem',
-  'America/Fortaleza' => 'America/Fortaleza',
-  'America/Recife' => 'America/Recife',
-  'America/Araguaina' => 'America/Araguaina',
-  'America/Maceio' => 'America/Maceio',
-  'America/Bahia' => 'America/Bahia',
-  'America/Sao_Paulo' => 'America/Sao Paulo',
-  'America/Campo_Grande' => 'America/Campo Grande',
-  'America/Cuiaba' => 'America/Cuiaba',
-  'America/Porto_Velho' => 'America/Porto_Velho',
-  'America/Boa_Vista' => 'America/Boa Vista',
-  'America/Manaus' => 'America/Manaus',
-  'America/Eirunepe' => 'America/Eirunepe',
-  'America/Rio_Branco' => 'America/Rio Branco',
-  'America/Santiago' => 'America/Santiago',
-  'Pacific/Easter' => 'Pacific/Easter' ,
-  'America/Bogota' => 'America/Bogota',
-  'America/Curacao' => 'America/Curacao',
-  'America/Guayaquil' => 'America/Guayaquil',
-  'Pacific/Galapagos' => 'Pacific/Galapagos' ,
-  'Atlantic/Stanley' => 'Atlantic/Stanley',
-  'America/Cayenne' => 'America/Cayenne',
-  'America/Guyana' => 'America/Guyana',
-  'America/Asuncion' => 'America/Asuncion',
-  'America/Lima' => 'America/Lima',
-  'Atlantic/South_Georgia' => 'Atlantic/South Georgia',
-  'America/Paramaribo' => 'America/Paramaribo',
-  'America/Port_of_Spain' => 'America/Port-of-Spain',
-  'America/Montevideo' => 'America/Montevideo',
-  'America/Caracas' => 'America/Caracas',
-  );
-
-  $app_list_strings['moduleList']['Sugar_Favorites'] = 'Favorites';
-  $app_list_strings['eapm_list']= array(
+    );
+
+    $app_list_strings['timezone_dom'] = array(
+
+    'Africa/Algiers' => 'Africa/Algiers',
+    'Africa/Luanda' => 'Africa/Luanda',
+    'Africa/Porto-Novo' => 'Africa/Porto-Novo',
+    'Africa/Gaborone' => 'Africa/Gaborone',
+    'Africa/Ouagadougou' => 'Africa/Ouagadougou',
+    'Africa/Bujumbura' => 'Africa/Bujumbura',
+    'Africa/Douala' => 'Africa/Douala',
+    'Atlantic/Cape_Verde' => 'Atlantic/Cape Verde',
+    'Africa/Bangui' => 'Africa/Bangui',
+    'Africa/Ndjamena' => 'Africa/Ndjamena',
+    'Indian/Comoro' => 'Indian/Comoro',
+    'Africa/Kinshasa' => 'Africa/Kinshasa',
+    'Africa/Lubumbashi' => 'Africa/Lubumbashi',
+    'Africa/Brazzaville' => 'Africa/Brazzaville',
+    'Africa/Abidjan' => 'Africa/Abidjan',
+    'Africa/Djibouti' => 'Africa/Djibouti',
+    'Africa/Cairo' => 'Africa/Cairo',
+    'Africa/Malabo' => 'Africa/Malabo',
+    'Africa/Asmera' => 'Africa/Asmera',
+    'Africa/Addis_Ababa' => 'Africa/Addis Ababa',
+    'Africa/Libreville' => 'Africa/Libreville',
+    'Africa/Banjul' => 'Africa/Banjul',
+    'Africa/Accra' => 'Africa/Accra',
+    'Africa/Conakry' => 'Africa/Conakry',
+    'Africa/Bissau' => 'Africa/Bissau',
+    'Africa/Nairobi' => 'Africa/Nairobi',
+    'Africa/Maseru' => 'Africa/Maseru',
+    'Africa/Monrovia' => 'Africa/Monrovia',
+    'Africa/Tripoli' => 'Africa/Tripoli',
+    'Indian/Antananarivo' => 'Indian/Antananarivo',
+    'Africa/Blantyre' => 'Africa/Blantyre',
+    'Africa/Bamako' => 'Africa/Bamako',
+    'Africa/Nouakchott' => 'Africa/Nouakchott',
+    'Indian/Mauritius' => 'Indian/Mauritius',
+    'Indian/Mayotte' => 'Indian/Mayotte',
+    'Africa/Casablanca' => 'Africa/Casablanca',
+    'Africa/El_Aaiun' => 'Africa/El Aaiun',
+    'Africa/Maputo' => 'Africa/Maputo',
+    'Africa/Windhoek' => 'Africa/Windhoek',
+    'Africa/Niamey' => 'Africa/Niamey',
+    'Africa/Lagos' => 'Africa/Lagos',
+    'Indian/Reunion' => 'Indian/Reunion',
+    'Africa/Kigali' => 'Africa/Kigali',
+    'Atlantic/St_Helena' => 'Atlantic/St. Helena',
+    'Africa/Sao_Tome' => 'Africa/Sao Tome',
+    'Africa/Dakar' => 'Africa/Dakar',
+    'Indian/Mahe' => 'Indian/Mahe',
+    'Africa/Freetown' => 'Africa/Freetown',
+    'Africa/Mogadishu' => 'Africa/Mogadishu',
+    'Africa/Johannesburg' => 'Africa/Johannesburg',
+    'Africa/Khartoum' => 'Africa/Khartoum',
+    'Africa/Mbabane' => 'Africa/Mbabane',
+    'Africa/Dar_es_Salaam' => 'Africa/Dar es Salaam',
+    'Africa/Lome' => 'Africa/Lome',
+    'Africa/Tunis' => 'Africa/Tunis',
+    'Africa/Kampala' => 'Africa/Kampala',
+    'Africa/Lusaka' => 'Africa/Lusaka',
+    'Africa/Harare' => 'Africa/Harare',
+    'Antarctica/Casey' => 'Antarctica/Casey',
+    'Antarctica/Davis' => 'Antarctica/Davis',
+    'Antarctica/Mawson' => 'Antarctica/Mawson',
+    'Indian/Kerguelen' => 'Indian/Kerguelen',
+    'Antarctica/DumontDUrville' => 'Antarctica/DumontDUrville',
+    'Antarctica/Syowa' => 'Antarctica/Syowa',
+    'Antarctica/Vostok' => 'Antarctica/Vostok',
+    'Antarctica/Rothera' => 'Antarctica/Rothera',
+    'Antarctica/Palmer' => 'Antarctica/Palmer',
+    'Antarctica/McMurdo' => 'Antarctica/McMurdo',
+    'Asia/Kabul' => 'Asia/Kabul',
+    'Asia/Yerevan' => 'Asia/Yerevan',
+    'Asia/Baku' => 'Asia/Baku',
+    'Asia/Bahrain' => 'Asia/Bahrain',
+    'Asia/Dhaka' => 'Asia/Dhaka',
+    'Asia/Thimphu' => 'Asia/Thimphu',
+    'Indian/Chagos' => 'Indian/Chagos',
+    'Asia/Brunei' => 'Asia/Brunei',
+    'Asia/Rangoon' => 'Asia/Rangoon',
+    'Asia/Phnom_Penh' => 'Asia/Phnom Penh',
+    'Asia/Beijing' => 'Asia/Beijing',
+    'Asia/Harbin' => 'Asia/Harbin',
+    'Asia/Shanghai' => 'Asia/Shanghai',
+    'Asia/Chongqing' => 'Asia/Chongqing',
+    'Asia/Urumqi' => 'Asia/Urumqi',
+    'Asia/Kashgar' => 'Asia/Kashgar',
+    'Asia/Hong_Kong' => 'Asia/Hong Kong',
+    'Asia/Taipei' => 'Asia/Taipei',
+    'Asia/Macau' => 'Asia/Macau',
+    'Asia/Nicosia' => 'Asia/Nicosia',
+    'Asia/Tbilisi' => 'Asia/Tbilisi',
+    'Asia/Dili' => 'Asia/Dili',
+    'Asia/Calcutta' => 'Asia/Calcutta',
+    'Asia/Jakarta' => 'Asia/Jakarta',
+    'Asia/Pontianak' => 'Asia/Pontianak',
+    'Asia/Makassar' => 'Asia/Makassar',
+    'Asia/Jayapura' => 'Asia/Jayapura',
+    'Asia/Tehran' => 'Asia/Tehran',
+    'Asia/Baghdad' => 'Asia/Baghdad',
+    'Asia/Jerusalem' => 'Asia/Jerusalem',
+    'Asia/Tokyo' => 'Asia/Tokyo',
+    'Asia/Amman' => 'Asia/Amman',
+    'Asia/Almaty' => 'Asia/Almaty',
+    'Asia/Qyzylorda' => 'Asia/Qyzylorda',
+    'Asia/Aqtobe' => 'Asia/Aqtobe',
+    'Asia/Aqtau' => 'Asia/Aqtau',
+    'Asia/Oral' => 'Asia/Oral',
+    'Asia/Bishkek' => 'Asia/Bishkek',
+    'Asia/Seoul' => 'Asia/Seoul',
+    'Asia/Pyongyang' => 'Asia/Pyongyang',
+    'Asia/Kuwait' => 'Asia/Kuwait',
+    'Asia/Vientiane' => 'Asia/Vientiane',
+    'Asia/Beirut' => 'Asia/Beirut',
+    'Asia/Kuala_Lumpur' => 'Asia/Kuala Lumpur',
+    'Asia/Kuching' => 'Asia/Kuching',
+    'Indian/Maldives' => 'Indian/Maldives',
+    'Asia/Hovd' => 'Asia/Hovd',
+    'Asia/Ulaanbaatar' => 'Asia/Ulaanbaatar',
+    'Asia/Choibalsan' => 'Asia/Choibalsan',
+    'Asia/Katmandu' => 'Asia/Katmandu',
+    'Asia/Muscat' => 'Asia/Muscat',
+    'Asia/Karachi' => 'Asia/Karachi',
+    'Asia/Gaza' => 'Asia/Gaza',
+    'Asia/Manila' => 'Asia/Manila',
+    'Asia/Qatar' => 'Asia/Qatar',
+    'Asia/Riyadh' => 'Asia/Riyadh',
+    'Asia/Singapore' => 'Asia/Singapore',
+    'Asia/Colombo' => 'Asia/Colombo',
+    'Asia/Damascus' => 'Asia/Damascus',
+    'Asia/Dushanbe' => 'Asia/Dushanbe',
+    'Asia/Bangkok' => 'Asia/Bangkok',
+    'Asia/Ashgabat' => 'Asia/Ashgabat',
+    'Asia/Dubai' => 'Asia/Dubai',
+    'Asia/Samarkand' => 'Asia/Samarkand',
+    'Asia/Tashkent' => 'Asia/Tashkent',
+    'Asia/Saigon' => 'Asia/Saigon',
+    'Asia/Aden' => 'Asia/Aden',
+    'Australia/Darwin' => 'Australia/Darwin',
+    'Australia/Perth' => 'Australia/Perth',
+    'Australia/Brisbane' => 'Australia/Brisbane',
+    'Australia/Lindeman' => 'Australia/Lindeman',
+    'Australia/Adelaide' => 'Australia/Adelaide',
+    'Australia/Hobart' => 'Australia/Hobart',
+    'Australia/Currie' => 'Australia/Currie',
+    'Australia/Melbourne' => 'Australia/Melbourne',
+    'Australia/Sydney' => 'Australia/Sydney',
+    'Australia/Broken_Hill' => 'Australia/Broken Hill',
+    'Indian/Christmas' => 'Indian/Christmas',
+    'Pacific/Rarotonga' => 'Pacific/Rarotonga',
+    'Indian/Cocos' => 'Indian/Cocos',
+    'Pacific/Fiji' => 'Pacific/Fiji',
+    'Pacific/Gambier' => 'Pacific/Gambier',
+    'Pacific/Marquesas' => 'Pacific/Marquesas',
+    'Pacific/Tahiti' => 'Pacific/Tahiti',
+    'Pacific/Guam' => 'Pacific/Guam',
+    'Pacific/Tarawa' => 'Pacific/Tarawa',
+    'Pacific/Enderbury' => 'Pacific/Enderbury',
+    'Pacific/Kiritimati' => 'Pacific/Kiritimati',
+    'Pacific/Saipan' => 'Pacific/Saipan',
+    'Pacific/Majuro' => 'Pacific/Majuro',
+    'Pacific/Kwajalein' => 'Pacific/Kwajalein',
+    'Pacific/Truk' => 'Pacific/Truk',
+    'Pacific/Pohnpei' => 'Pacific/Pohnpei',
+    'Pacific/Kosrae' => 'Pacific/Kosrae',
+    'Pacific/Nauru' => 'Pacific/Nauru',
+    'Pacific/Noumea' => 'Pacific/Noumea',
+    'Pacific/Auckland' => 'Pacific/Auckland',
+    'Pacific/Chatham' => 'Pacific/Chatham',
+    'Pacific/Niue' => 'Pacific/Niue',
+    'Pacific/Norfolk' => 'Pacific/Norfolk',
+    'Pacific/Palau' => 'Pacific/Palau',
+    'Pacific/Port_Moresby' => 'Pacific/Port Moresby',
+    'Pacific/Pitcairn' => 'Pacific/Pitcairn',
+    'Pacific/Pago_Pago' => 'Pacific/Pago Pago',
+    'Pacific/Apia' => 'Pacific/Apia',
+    'Pacific/Guadalcanal' => 'Pacific/Guadalcanal',
+    'Pacific/Fakaofo' => 'Pacific/Fakaofo',
+    'Pacific/Tongatapu' => 'Pacific/Tongatapu',
+    'Pacific/Funafuti' => 'Pacific/Funafuti',
+    'Pacific/Johnston' => 'Pacific/Johnston',
+    'Pacific/Midway' => 'Pacific/Midway',
+    'Pacific/Wake' => 'Pacific/Wake',
+    'Pacific/Efate' => 'Pacific/Efate',
+    'Pacific/Wallis' => 'Pacific/Wallis',
+    'Europe/London' => 'Europe/London',
+    'Europe/Dublin' => 'Europe/Dublin',
+    'WET' => 'WET',
+    'CET' => 'CET',
+    'MET' => 'MET',
+    'EET' => 'EET',
+    'Europe/Tirane' => 'Europe/Tirane',
+    'Europe/Andorra' => 'Europe/Andorra',
+    'Europe/Vienna' => 'Europe/Vienna',
+    'Europe/Minsk' => 'Europe/Minsk',
+    'Europe/Brussels' => 'Europe/Brussels',
+    'Europe/Sofia' => 'Europe/Sofia',
+    'Europe/Prague' => 'Europe/Prague',
+    'Europe/Copenhagen' => 'Europe/Copenhagen',
+    'Atlantic/Faeroe' => 'Atlantic/Faeroe',
+    'America/Danmarkshavn' => 'America/Danmarkshavn',
+    'America/Scoresbysund' => 'America/Scoresbysund',
+    'America/Godthab' => 'America/Godthab',
+    'America/Thule' => 'America/Thule',
+    'Europe/Tallinn' => 'Europe/Tallinn',
+    'Europe/Helsinki' => 'Europe/Helsinki',
+    'Europe/Paris' => 'Europe/Paris',
+    'Europe/Berlin' => 'Europe/Berlin',
+    'Europe/Gibraltar' => 'Europe/Gibraltar',
+    'Europe/Athens' => 'Europe/Athens',
+    'Europe/Budapest' => 'Europe/Budapest',
+    'Atlantic/Reykjavik' => 'Atlantic/Reykjavik',
+    'Europe/Rome' => 'Europe/Rome',
+    'Europe/Riga' => 'Europe/Riga',
+    'Europe/Vaduz' => 'Europe/Vaduz',
+    'Europe/Vilnius' => 'Europe/Vilnius',
+    'Europe/Luxembourg' => 'Europe/Luxembourg',
+    'Europe/Malta' => 'Europe/Malta',
+    'Europe/Chisinau' => 'Europe/Chisinau',
+    'Europe/Monaco' => 'Europe/Monaco',
+    'Europe/Amsterdam' => 'Europe/Amsterdam',
+    'Europe/Oslo' => 'Europe/Oslo',
+    'Europe/Warsaw' => 'Europe/Warsaw',
+    'Europe/Lisbon' => 'Europe/Lisbon',
+    'Atlantic/Azores' => 'Atlantic/Azores',
+    'Atlantic/Madeira' => 'Atlantic/Madeira',
+    'Europe/Bucharest' => 'Europe/Bucharest',
+    'Europe/Kaliningrad' => 'Europe/Kaliningrad',
+    'Europe/Moscow' => 'Europe/Moscow',
+    'Europe/Samara' => 'Europe/Samara',
+    'Asia/Yekaterinburg' => 'Asia/Yekaterinburg',
+    'Asia/Omsk' => 'Asia/Omsk',
+    'Asia/Novosibirsk' => 'Asia/Novosibirsk',
+    'Asia/Krasnoyarsk' => 'Asia/Krasnoyarsk',
+    'Asia/Irkutsk' => 'Asia/Irkutsk',
+    'Asia/Yakutsk' => 'Asia/Yakutsk',
+    'Asia/Vladivostok' => 'Asia/Vladivostok',
+    'Asia/Sakhalin' => 'Asia/Sakhalin',
+    'Asia/Magadan' => 'Asia/Magadan',
+    'Asia/Kamchatka' => 'Asia/Kamchatka',
+    'Asia/Anadyr' => 'Asia/Anadyr',
+    'Europe/Belgrade' => 'Europe/Belgrade' ,
+    'Europe/Madrid' =>'Europe/Madrid' ,
+    'Africa/Ceuta' => 'Africa/Ceuta',
+    'Atlantic/Canary' => 'Atlantic/Canary',
+    'Europe/Stockholm' => 'Europe/Stockholm',
+    'Europe/Zurich' => 'Europe/Zurich' ,
+    'Europe/Istanbul' => 'Europe/Istanbul',
+    'Europe/Kiev' => 'Europe/Kiev',
+    'Europe/Uzhgorod' => 'Europe/Uzhgorod',
+    'Europe/Zaporozhye' => 'Europe/Zaporozhye',
+    'Europe/Simferopol' => 'Europe/Simferopol',
+    'America/New_York' => 'America/New York',
+    'America/Chicago' =>'America/Chicago' ,
+    'America/North_Dakota/Center' => 'America/North Dakota/Center',
+    'America/Denver' => 'America/Denver',
+    'America/Los_Angeles' => 'America/Los Angeles',
+    'America/Juneau' => 'America/Juneau',
+    'America/Yakutat' => 'America/Yakutat',
+    'America/Anchorage' => 'America/Anchorage',
+    'America/Nome' =>'America/Nome' ,
+    'America/Adak' => 'America/Adak',
+    'Pacific/Honolulu' => 'Pacific/Honolulu',
+    'America/Phoenix' => 'America/Phoenix',
+    'America/Boise' => 'America/Boise',
+    'America/Indiana/Indianapolis' => 'America/Indiana/Indianapolis',
+    'America/Indiana/Marengo' => 'America/Indiana/Marengo',
+    'America/Indiana/Knox' =>  'America/Indiana/Knox',
+    'America/Indiana/Vevay' => 'America/Indiana/Vevay',
+    'America/Kentucky/Louisville' =>'America/Kentucky/Louisville'  ,
+    'America/Kentucky/Monticello' =>  'America/Kentucky/Monticello' ,
+    'America/Detroit' => 'America/Detroit',
+    'America/Menominee' => 'America/Menominee',
+    'America/St_Johns' => 'America/St. Johns',
+    'America/Goose_Bay' => 'America/Goose_Bay' ,
+    'America/Halifax' => 'America/Halifax',
+    'America/Glace_Bay' =>'America/Glace Bay' ,
+    'America/Montreal' => 'America/Montreal',
+    'America/Toronto' => 'America/Toronto',
+    'America/Thunder_Bay' => 'America/Thunder Bay' ,
+    'America/Nipigon' => 'America/Nipigon',
+    'America/Rainy_River' => 'America/Rainy River',
+    'America/Winnipeg' => 'America/Winnipeg',
+    'America/Regina' => 'America/Regina',
+    'America/Swift_Current' => 'America/Swift Current',
+    'America/Edmonton' =>  'America/Edmonton',
+    'America/Vancouver' => 'America/Vancouver',
+    'America/Dawson_Creek' => 'America/Dawson Creek',
+    'America/Pangnirtung' => 'America/Pangnirtung'  ,
+    'America/Iqaluit' => 'America/Iqaluit' ,
+    'America/Coral_Harbour' => 'America/Coral Harbour' ,
+    'America/Rankin_Inlet' => 'America/Rankin Inlet',
+    'America/Cambridge_Bay' => 'America/Cambridge Bay',
+    'America/Yellowknife' => 'America/Yellowknife',
+    'America/Inuvik' =>'America/Inuvik' ,
+    'America/Whitehorse' => 'America/Whitehorse' ,
+    'America/Dawson' => 'America/Dawson',
+    'America/Cancun' => 'America/Cancun',
+    'America/Merida' => 'America/Merida',
+    'America/Monterrey' => 'America/Monterrey',
+    'America/Mexico_City' => 'America/Mexico City',
+    'America/Chihuahua' => 'America/Chihuahua',
+    'America/Hermosillo' => 'America/Hermosillo',
+    'America/Mazatlan' => 'America/Mazatlan',
+    'America/Tijuana' => 'America/Tijuana',
+    'America/Anguilla' => 'America/Anguilla',
+    'America/Antigua' => 'America/Antigua',
+    'America/Nassau' =>'America/Nassau' ,
+    'America/Barbados' => 'America/Barbados',
+    'America/Belize' => 'America/Belize',
+    'Atlantic/Bermuda' => 'Atlantic/Bermuda',
+    'America/Cayman' => 'America/Cayman',
+    'America/Costa_Rica' => 'America/Costa Rica',
+    'America/Havana' => 'America/Havana',
+    'America/Dominica' => 'America/Dominica',
+    'America/Santo_Domingo' => 'America/Santo Domingo',
+    'America/El_Salvador' => 'America/El Salvador',
+    'America/Grenada' => 'America/Grenada',
+    'America/Guadeloupe' => 'America/Guadeloupe',
+    'America/Guatemala' => 'America/Guatemala',
+    'America/Port-au-Prince' => 'America/Port-au-Prince',
+    'America/Tegucigalpa' => 'America/Tegucigalpa',
+    'America/Jamaica' => 'America/Jamaica',
+    'America/Martinique' => 'America/Martinique',
+    'America/Montserrat' => 'America/Montserrat',
+    'America/Managua' => 'America/Managua',
+    'America/Panama' => 'America/Panama',
+    'America/Puerto_Rico' =>'America/Puerto_Rico' ,
+    'America/St_Kitts' => 'America/St_Kitts',
+    'America/St_Lucia' => 'America/St_Lucia',
+    'America/Miquelon' => 'America/Miquelon',
+    'America/St_Vincent' => 'America/St. Vincent',
+    'America/Grand_Turk' => 'America/Grand Turk',
+    'America/Tortola' => 'America/Tortola',
+    'America/St_Thomas' => 'America/St. Thomas',
+    'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos Aires',
+    'America/Argentina/Cordoba' => 'America/Argentina/Cordoba',
+    'America/Argentina/Tucuman' => 'America/Argentina/Tucuman',
+    'America/Argentina/La_Rioja' => 'America/Argentina/La_Rioja',
+    'America/Argentina/San_Juan' => 'America/Argentina/San_Juan',
+    'America/Argentina/Jujuy' => 'America/Argentina/Jujuy',
+    'America/Argentina/Catamarca' => 'America/Argentina/Catamarca',
+    'America/Argentina/Mendoza' => 'America/Argentina/Mendoza',
+    'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio Gallegos',
+    'America/Argentina/Ushuaia' =>  'America/Argentina/Ushuaia',
+    'America/Aruba' => 'America/Aruba',
+    'America/La_Paz' => 'America/La Paz',
+    'America/Noronha' => 'America/Noronha',
+    'America/Belem' => 'America/Belem',
+    'America/Fortaleza' => 'America/Fortaleza',
+    'America/Recife' => 'America/Recife',
+    'America/Araguaina' => 'America/Araguaina',
+    'America/Maceio' => 'America/Maceio',
+    'America/Bahia' => 'America/Bahia',
+    'America/Sao_Paulo' => 'America/Sao Paulo',
+    'America/Campo_Grande' => 'America/Campo Grande',
+    'America/Cuiaba' => 'America/Cuiaba',
+    'America/Porto_Velho' => 'America/Porto_Velho',
+    'America/Boa_Vista' => 'America/Boa Vista',
+    'America/Manaus' => 'America/Manaus',
+    'America/Eirunepe' => 'America/Eirunepe',
+    'America/Rio_Branco' => 'America/Rio Branco',
+    'America/Santiago' => 'America/Santiago',
+    'Pacific/Easter' => 'Pacific/Easter' ,
+    'America/Bogota' => 'America/Bogota',
+    'America/Curacao' => 'America/Curacao',
+    'America/Guayaquil' => 'America/Guayaquil',
+    'Pacific/Galapagos' => 'Pacific/Galapagos' ,
+    'Atlantic/Stanley' => 'Atlantic/Stanley',
+    'America/Cayenne' => 'America/Cayenne',
+    'America/Guyana' => 'America/Guyana',
+    'America/Asuncion' => 'America/Asuncion',
+    'America/Lima' => 'America/Lima',
+    'Atlantic/South_Georgia' => 'Atlantic/South Georgia',
+    'America/Paramaribo' => 'America/Paramaribo',
+    'America/Port_of_Spain' => 'America/Port-of-Spain',
+    'America/Montevideo' => 'America/Montevideo',
+    'America/Caracas' => 'America/Caracas',
+    );
+
+    $app_list_strings['moduleList']['Sugar_Favorites'] = 'Favorites';
+    $app_list_strings['eapm_list']= array(
     'Sugar'=>'SuiteCRM',
     'WebEx'=>'WebEx',
     'GoToMeeting'=>'GoToMeeting',
@@ -3255,14 +3255,14 @@ 
     'Box' => 'Box.net',
     'Facebook'=>'Facebook',
     'Twitter'=>'Twitter',
-  );
-  $app_list_strings['eapm_list_import']= array(
-  	'Google' => 'Google Contacts',
-  );
+    );
+    $app_list_strings['eapm_list_import']= array(
+        'Google' => 'Google Contacts',
+    );
 $app_list_strings['eapm_list_documents']= array(
-  	'Google' => 'Google Docs',
-  );
-	$app_list_strings['token_status'] = array(
+        'Google' => 'Google Docs',
+    );
+    $app_list_strings['token_status'] = array(
         1 => 'Request',
         2 => 'Access',
         3 => 'Invalid',
@@ -3272,25 +3272,25 @@ 
     '' => '' ,
     'campaign' => 'Campaign' ,
     'email' => 'Email',
-  );
+    );
 
 $app_list_strings ['emailTemplates_type_list_campaigns'] = array (
     '' => '' ,
     'campaign' => 'Campaign' ,
-  );
+    );
 
 $app_list_strings ['emailTemplates_type_list_no_workflow'] = array (
     '' => '' ,
     'campaign' => 'Campaign' ,
     'email' => 'Email',
-  );
+    );
 $app_strings ['documentation'] = array (
     'LBL_DOCS' => 'Documentation',
     'ULT' => '02_Sugar_Ultimate',
-	'ENT' => '02_Sugar_Enterprise',
-	'CORP' => '03_Sugar_Corporate',
-	'PRO' => '04_Sugar_Professional',
-	'COM' => '05_Sugar_Community_Edition'
+    'ENT' => '02_Sugar_Enterprise',
+    'CORP' => '03_Sugar_Corporate',
+    'PRO' => '04_Sugar_Professional',
+    'COM' => '05_Sugar_Community_Edition'
 );
 
 

include/database/DBManager.php

Indentation +3266 added lines, -3266 removed lines

@@ -97,389 +97,389 @@ 
  */
 abstract class DBManager
 {
-	/**
-	 * Name of database
-	 * @var resource
-	 */
-	public $database = null;
-
-	/**
-	 * Indicates whether we should die when we get an error from the DB
-	 */
-	protected $dieOnError = false;
-
-	/**
-	 * Indicates whether we should html encode the results from a query by default
-	 */
-	protected $encode = true;
-
-	/**
-	 * Records the execution time of the last query
-	 */
-	protected $query_time = 0;
-
-	/**
-	 * Last error message from the DB backend
-	 */
-	protected $last_error = false;
-
-	/**
-	 * Registry of available result sets
-	 */
-	protected $lastResult;
-
-	/**
-	 * Current query count
-	 */
-	private static $queryCount = 0;
-
-	/**
-	 * Query threshold limit
-	 */
-	private static $queryLimit = 0;
-
-	/**
-	 * Array of prepared statements and their correspoding parsed tokens
-	 */
-	protected $preparedTokens = array();
-
-	/**
-	 * TimeDate instance
-	 * @var TimeDate
-	 */
-	protected $timedate;
-
-	/**
-	 * PHP Logger
-	 * @var Logger
-	 */
-	protected $log;
-
-	/**
-	 * Table descriptions
-	 * @var array
-	 */
-	protected static $table_descriptions = array();
-
-	/**
-	 * Index descriptions
-	 * @var array
-	 */
-	protected static $index_descriptions = array();
-
-	/**
-	 * Maximum length of identifiers
-	 * @abstract
-	 * @var array
-	 */
-	protected $maxNameLengths = array(
-		'table' => 64,
-		'column' => 64,
-		'index' => 64,
-		'alias' => 64
-	);
-
-	/**
-	 * DB driver priority
-	 * Higher priority drivers override lower priority ones
-	 * @var int
-	 */
-	public $priority = 0;
-
-	/**
-	 * Driver name label, for install
-	 * @absrtact
-	 * @var string
-	 */
-	public $label = '';
-
-	/**
-	 * Type names map
-	 * @abstract
-	 * @var array
-	 */
-	protected $type_map = array();
-
-	/**
-	 * Type classification into:
-	 * - int
-	 * - bool
-	 * - float
-	 * - date
-	 * @abstract
-	 * @var array
-	 */
-	protected $type_class = array(
-			'int'      => 'int',
-			'double'   => 'float',
-			'float'    => 'float',
-			'uint'     => 'int',
-			'ulong'    => 'bigint',
-			'long'     => 'bigint',
-			'short'    => 'int',
-			'date'     => 'date',
-			'datetime' => 'date',
-			'datetimecombo' => 'date',
-			'time'     => 'time',
-			'bool'     => 'bool',
-			'tinyint'  => 'int',
-			'currency' => 'float',
-			'decimal'  => 'float',
-			'decimal2' => 'float',
-	);
-
-	/**
-	 * Capabilities this DB supports. Supported list:
-	 * affected_rows	Can report query affected rows for UPDATE/DELETE
-	 * 					implement getAffectedRowCount()
-	 * select_rows		Can report row count for SELECT
-	 * 					implement getRowCount()
-	 * case_sensitive	Supports case-sensitive text columns
-	 * fulltext			Supports fulltext search indexes
-	 * inline_keys		Supports defining keys together with the table
-	 * auto_increment_sequence Autoincrement support implemented as sequence
-	 * limit_subquery   Supports LIMIT clauses in subqueries
-	 * create_user		Can create users for Sugar
-	 * create_db		Can create databases
-	 * collation		Supports setting collations
-	 * disable_keys     Supports temporarily disabling keys (for upgrades, etc.)
-	 *
-	 * @abstract
-	 * Special cases:
-	 * fix:expandDatabase - needs expandDatabase fix, see expandDatabase.php
-	 * TODO: verify if we need these cases
-	 */
-	protected $capabilities = array();
-
-	/**
-	 * Database options
-	 * @var array
-	 */
-	protected $options = array();
+    /**
+     * Name of database
+     * @var resource
+     */
+    public $database = null;
+
+    /**
+     * Indicates whether we should die when we get an error from the DB
+     */
+    protected $dieOnError = false;
+
+    /**
+     * Indicates whether we should html encode the results from a query by default
+     */
+    protected $encode = true;
+
+    /**
+     * Records the execution time of the last query
+     */
+    protected $query_time = 0;
+
+    /**
+     * Last error message from the DB backend
+     */
+    protected $last_error = false;
+
+    /**
+     * Registry of available result sets
+     */
+    protected $lastResult;
+
+    /**
+     * Current query count
+     */
+    private static $queryCount = 0;
+
+    /**
+     * Query threshold limit
+     */
+    private static $queryLimit = 0;
+
+    /**
+     * Array of prepared statements and their correspoding parsed tokens
+     */
+    protected $preparedTokens = array();
+
+    /**
+     * TimeDate instance
+     * @var TimeDate
+     */
+    protected $timedate;
+
+    /**
+     * PHP Logger
+     * @var Logger
+     */
+    protected $log;
+
+    /**
+     * Table descriptions
+     * @var array
+     */
+    protected static $table_descriptions = array();
+
+    /**
+     * Index descriptions
+     * @var array
+     */
+    protected static $index_descriptions = array();
+
+    /**
+     * Maximum length of identifiers
+     * @abstract
+     * @var array
+     */
+    protected $maxNameLengths = array(
+        'table' => 64,
+        'column' => 64,
+        'index' => 64,
+        'alias' => 64
+    );
+
+    /**
+     * DB driver priority
+     * Higher priority drivers override lower priority ones
+     * @var int
+     */
+    public $priority = 0;
+
+    /**
+     * Driver name label, for install
+     * @absrtact
+     * @var string
+     */
+    public $label = '';
+
+    /**
+     * Type names map
+     * @abstract
+     * @var array
+     */
+    protected $type_map = array();
+
+    /**
+     * Type classification into:
+     * - int
+     * - bool
+     * - float
+     * - date
+     * @abstract
+     * @var array
+     */
+    protected $type_class = array(
+            'int'      => 'int',
+            'double'   => 'float',
+            'float'    => 'float',
+            'uint'     => 'int',
+            'ulong'    => 'bigint',
+            'long'     => 'bigint',
+            'short'    => 'int',
+            'date'     => 'date',
+            'datetime' => 'date',
+            'datetimecombo' => 'date',
+            'time'     => 'time',
+            'bool'     => 'bool',
+            'tinyint'  => 'int',
+            'currency' => 'float',
+            'decimal'  => 'float',
+            'decimal2' => 'float',
+    );
+
+    /**
+     * Capabilities this DB supports. Supported list:
+     * affected_rows	Can report query affected rows for UPDATE/DELETE
+     * 					implement getAffectedRowCount()
+     * select_rows		Can report row count for SELECT
+     * 					implement getRowCount()
+     * case_sensitive	Supports case-sensitive text columns
+     * fulltext			Supports fulltext search indexes
+     * inline_keys		Supports defining keys together with the table
+     * auto_increment_sequence Autoincrement support implemented as sequence
+     * limit_subquery   Supports LIMIT clauses in subqueries
+     * create_user		Can create users for Sugar
+     * create_db		Can create databases
+     * collation		Supports setting collations
+     * disable_keys     Supports temporarily disabling keys (for upgrades, etc.)
+     *
+     * @abstract
+     * Special cases:
+     * fix:expandDatabase - needs expandDatabase fix, see expandDatabase.php
+     * TODO: verify if we need these cases
+     */
+    protected $capabilities = array();
+
+    /**
+     * Database options
+     * @var array
+     */
+    protected $options = array();
 
     /**
      * Create DB Driver
      */
-	public function __construct()
-	{
-		$this->timedate = TimeDate::getInstance();
-		$this->log = isset($GLOBALS['log']) ? $GLOBALS['log'] : null;
-		$this->helper = $this; // compatibility
-	}
+    public function __construct()
+    {
+        $this->timedate = TimeDate::getInstance();
+        $this->log = isset($GLOBALS['log']) ? $GLOBALS['log'] : null;
+        $this->helper = $this; // compatibility
+    }
 
     /**
      * Wrapper for those trying to access the private and protected class members directly
      * @param string $p var name
      * @return mixed
      */
-	public function __get($p)
-	{
-		$this->log->info('Call to DBManager::$'.$p.' is deprecated');
-		return $this->$p;
-	}
-
-	/**
-	 * Returns the current database handle
-	 * @return resource
-	 */
-	public function getDatabase()
-	{
-		$this->checkConnection();
-		return $this->database;
-	}
-
-	/**
-	 * Returns this instance's DBHelper
-	 * Actually now returns $this
-	 * @deprecated
-	 * @return DBManager
-	 */
-	public function getHelper()
-	{
-		return $this;
-	}
-
-	/**
-	 * Checks for error happening in the database
-	 *
-	 * @param  string $msg        message to prepend to the error message
-	 * @param  bool   $dieOnError true if we want to die immediately on error
-	 * @return bool True if there was an error
-	 */
-	public function checkError($msg = '', $dieOnError = false)
-	{
-		if (empty($this->database)) {
-			$this->registerError($msg, "Database Is Not Connected", $dieOnError);
-			return true;
-		}
-
-		$dberror = $this->lastDbError();
-		if($dberror === false) {
-    		$this->last_error = false;
-	    	return false;
-		}
-		$this->registerError($msg, $dberror, $dieOnError);
+    public function __get($p)
+    {
+        $this->log->info('Call to DBManager::$'.$p.' is deprecated');
+        return $this->$p;
+    }
+
+    /**
+     * Returns the current database handle
+     * @return resource
+     */
+    public function getDatabase()
+    {
+        $this->checkConnection();
+        return $this->database;
+    }
+
+    /**
+     * Returns this instance's DBHelper
+     * Actually now returns $this
+     * @deprecated
+     * @return DBManager
+     */
+    public function getHelper()
+    {
+        return $this;
+    }
+
+    /**
+     * Checks for error happening in the database
+     *
+     * @param  string $msg        message to prepend to the error message
+     * @param  bool   $dieOnError true if we want to die immediately on error
+     * @return bool True if there was an error
+     */
+    public function checkError($msg = '', $dieOnError = false)
+    {
+        if (empty($this->database)) {
+            $this->registerError($msg, "Database Is Not Connected", $dieOnError);
+            return true;
+        }
+
+        $dberror = $this->lastDbError();
+        if($dberror === false) {
+            $this->last_error = false;
+            return false;
+        }
+        $this->registerError($msg, $dberror, $dieOnError);
         return true;
-	}
-
-	/**
-	 * Register database error
-	 * If die-on-error flag is set, logs the message and dies,
-	 * otherwise sets last_error to the message
-	 * @param string $userMessage Message from function user
-	 * @param string $message Message from SQL driver
-	 * @param bool $dieOnError
-	 */
-	protected function registerError($userMessage, $message, $dieOnError = false)
-	{
-		if(!empty($message)) {
-			if(!empty($userMessage)) {
-				$message = "$userMessage: $message";
-			}
-			if(empty($message)) {
-			    $message = "Database error";
-			}
-			$this->log->fatal($message);
-			if ($dieOnError || $this->dieOnError) {
-				if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
-					sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
-				} else {
-					sugar_die("Database error. Please check suitecrm.log for details.");
-				}
-			} else {
-				$this->last_error = $message;
-			}
-		}
-	}
-
-	/**
-	 * Return DB error message for the last query executed
-	 * @return string Last error message
-	 */
-	public function lastError()
-	{
-		return $this->last_error;
-	}
-
-	/**
-	 * This method is called by every method that runs a query.
-	 * If slow query dumping is turned on and the query time is beyond
-	 * the time limit, we will log the query. This function may do
-	 * additional reporting or log in a different area in the future.
-	 *
-	 * @param  string  $query query to log
-	 * @return boolean true if the query was logged, false otherwise
-	 */
-	protected function dump_slow_queries($query)
-	{
-		global $sugar_config;
-
-		$do_the_dump = isset($sugar_config['dump_slow_queries'])
-			? $sugar_config['dump_slow_queries'] : false;
-		$slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
-			? $sugar_config['slow_query_time_msec'] : 5000;
-
-		if($do_the_dump) {
-			if($slow_query_time_msec < ($this->query_time * 1000)) {
-				// Then log both the query and the query time
-				$this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
-				return true;
-			}
-		}
-		return false;
-	}
+    }
+
+    /**
+     * Register database error
+     * If die-on-error flag is set, logs the message and dies,
+     * otherwise sets last_error to the message
+     * @param string $userMessage Message from function user
+     * @param string $message Message from SQL driver
+     * @param bool $dieOnError
+     */
+    protected function registerError($userMessage, $message, $dieOnError = false)
+    {
+        if(!empty($message)) {
+            if(!empty($userMessage)) {
+                $message = "$userMessage: $message";
+            }
+            if(empty($message)) {
+                $message = "Database error";
+            }
+            $this->log->fatal($message);
+            if ($dieOnError || $this->dieOnError) {
+                if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
+                    sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
+                } else {
+                    sugar_die("Database error. Please check suitecrm.log for details.");
+                }
+            } else {
+                $this->last_error = $message;
+            }
+        }
+    }
+
+    /**
+     * Return DB error message for the last query executed
+     * @return string Last error message
+     */
+    public function lastError()
+    {
+        return $this->last_error;
+    }
+
+    /**
+     * This method is called by every method that runs a query.
+     * If slow query dumping is turned on and the query time is beyond
+     * the time limit, we will log the query. This function may do
+     * additional reporting or log in a different area in the future.
+     *
+     * @param  string  $query query to log
+     * @return boolean true if the query was logged, false otherwise
+     */
+    protected function dump_slow_queries($query)
+    {
+        global $sugar_config;
+
+        $do_the_dump = isset($sugar_config['dump_slow_queries'])
+            ? $sugar_config['dump_slow_queries'] : false;
+        $slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
+            ? $sugar_config['slow_query_time_msec'] : 5000;
+
+        if($do_the_dump) {
+            if($slow_query_time_msec < ($this->query_time * 1000)) {
+                // Then log both the query and the query time
+                $this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
+                return true;
+            }
+        }
+        return false;
+    }
 
 /**
-	* Scans order by to ensure that any field being ordered by is.
-	*
-	* It will throw a warning error to the log file - fatal if slow query logging is enabled
-	*
-	* @param  string $sql         query to be run
-	* @param  bool   $object_name optional, object to look up indices in
-	* @return bool   true if an index is found false otherwise
-	*/
+ * Scans order by to ensure that any field being ordered by is.
+ *
+ * It will throw a warning error to the log file - fatal if slow query logging is enabled
+ *
+ * @param  string $sql         query to be run
+ * @param  bool   $object_name optional, object to look up indices in
+ * @return bool   true if an index is found false otherwise
+ */
 protected function checkQuery($sql, $object_name = false)
 {
-	$match = array();
-	preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
-	$indices = false;
-	if (!empty($match[1][0]))
-		$table = $match[1][0];
-	else
-		return false;
-
-	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
-		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
-
-	if (empty($indices)) {
-		foreach ( $GLOBALS['dictionary'] as $current ) {
-			if ($current['table'] == $table){
-				$indices = $current['indices'];
-				break;
-			}
-		}
-	}
-	if (empty($indices)) {
-		$this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
-		return false;
-	}
-	if (!empty($match[2][0])) {
-		$orderBys = explode(' ', $match[2][0]);
-		foreach ($orderBys as $orderBy){
-			$orderBy = trim($orderBy);
-			if (empty($orderBy))
-				continue;
-			$orderBy = strtolower($orderBy);
-			if ($orderBy == 'asc' || $orderBy == 'desc')
-				continue;
-
-			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
-
-			foreach ($indices as $index)
-				if (empty($index['db']) || $index['db'] == $this->dbType)
-					foreach ($index['fields'] as $field)
-						if ($field == $orderBy)
-							return true;
-
-			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
-			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
-			else
-				$this->log->warn('CHECK QUERY:' .$warning);
-		}
-	}
-	return false;
-	}
-
-	/**
-	 * Returns the time the last query took to execute
-	 *
-	 * @return int
-	 */
-	public function getQueryTime()
-	{
-		return $this->query_time;
-	}
-
-	/**
-	 * Checks the current connection; if it is not connected then reconnect
-	 */
-	public function checkConnection()
-	{
-		$this->last_error = '';
-		if (!isset($this->database))
-			$this->connect();
-	}
-
-	/**
-	 * Sets the dieOnError value
-	 *
-	 * @param bool $value
-	 */
-	public function setDieOnError($value)
-	{
-		$this->dieOnError = $value;
-	}
+    $match = array();
+    preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
+    $indices = false;
+    if (!empty($match[1][0]))
+        $table = $match[1][0];
+    else
+        return false;
+
+    if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
+        $indices = $GLOBALS['dictionary'][$object_name]['indices'];
+
+    if (empty($indices)) {
+        foreach ( $GLOBALS['dictionary'] as $current ) {
+            if ($current['table'] == $table){
+                $indices = $current['indices'];
+                break;
+            }
+        }
+    }
+    if (empty($indices)) {
+        $this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
+        return false;
+    }
+    if (!empty($match[2][0])) {
+        $orderBys = explode(' ', $match[2][0]);
+        foreach ($orderBys as $orderBy){
+            $orderBy = trim($orderBy);
+            if (empty($orderBy))
+                continue;
+            $orderBy = strtolower($orderBy);
+            if ($orderBy == 'asc' || $orderBy == 'desc')
+                continue;
+
+            $orderBy = str_replace(array($table . '.', ','), '', $orderBy);
+
+            foreach ($indices as $index)
+                if (empty($index['db']) || $index['db'] == $this->dbType)
+                    foreach ($index['fields'] as $field)
+                        if ($field == $orderBy)
+                            return true;
+
+            $warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
+            if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
+                $this->log->fatal('CHECK QUERY:' .$warning);
+            else
+                $this->log->warn('CHECK QUERY:' .$warning);
+        }
+    }
+    return false;
+    }
+
+    /**
+     * Returns the time the last query took to execute
+     *
+     * @return int
+     */
+    public function getQueryTime()
+    {
+        return $this->query_time;
+    }
+
+    /**
+     * Checks the current connection; if it is not connected then reconnect
+     */
+    public function checkConnection()
+    {
+        $this->last_error = '';
+        if (!isset($this->database))
+            $this->connect();
+    }
+
+    /**
+     * Sets the dieOnError value
+     *
+     * @param bool $value
+     */
+    public function setDieOnError($value)
+    {
+        $this->dieOnError = $value;
+    }
 
     /**
      * Implements a generic insert for any bean.
@@ -488,67 +488,67 @@ 
      * @return bool query result
      *
      */
-	public function insert(SugarBean $bean)
-	{
-		$sql = $this->insertSQL($bean);
-		$tablename =  $bean->getTableName();
-		$msg = "Error inserting into table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Insert data into table by parameter definition
-	 * @param string $table Table name
-	 * @param array $field_defs Definitions in vardef-like format
-	 * @param array $data Key/value to insert
-	 * @param array $field_map Fields map from SugarBean
-	 * @param bool $execute Execute or return query?
+    public function insert(SugarBean $bean)
+    {
+        $sql = $this->insertSQL($bean);
+        $tablename =  $bean->getTableName();
+        $msg = "Error inserting into table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Insert data into table by parameter definition
+     * @param string $table Table name
+     * @param array $field_defs Definitions in vardef-like format
+     * @param array $data Key/value to insert
+     * @param array $field_map Fields map from SugarBean
+     * @param bool $execute Execute or return query?
      * @return bool query result
      */
-	public function insertParams($table, $field_defs, $data, $field_map = null, $execute = true)
-	{
-		$values = array();
-		foreach ($field_defs as $field => $fieldDef)
-		{
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
-			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
-
-			if(isset($data[$field])) {
-				// clean the incoming value..
-				$val = from_html($data[$field]);
-			} else {
-				if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
-					$val = $fieldDef['default'];
-				} else {
-					$val = null;
-				}
-			}
-
-			//handle auto increment values here - we may have to do something like nextval for oracle
-			if (!empty($fieldDef['auto_increment'])) {
-				$auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
-				if(!empty($auto)) {
-					$values[$field] = $auto;
-				}
-			} elseif ($fieldDef['name'] == 'deleted') {
-				$values['deleted'] = (int)$val;
-			} else {
-				// need to do some thing about types of values
-				if(!is_null($val) || !empty($fieldDef['required'])) {
-					$values[$field] = $this->massageValue($val, $fieldDef);
-				}
-			}
-		}
-
-		if (empty($values))
-			return $execute?true:''; // no columns set
-
-		// get the entire sql
-		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
+    public function insertParams($table, $field_defs, $data, $field_map = null, $execute = true)
+    {
+        $values = array();
+        foreach ($field_defs as $field => $fieldDef)
+        {
+            if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+            //custom fields handle there save seperatley
+            if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+
+            if(isset($data[$field])) {
+                // clean the incoming value..
+                $val = from_html($data[$field]);
+            } else {
+                if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+                    $val = $fieldDef['default'];
+                } else {
+                    $val = null;
+                }
+            }
+
+            //handle auto increment values here - we may have to do something like nextval for oracle
+            if (!empty($fieldDef['auto_increment'])) {
+                $auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
+                if(!empty($auto)) {
+                    $values[$field] = $auto;
+                }
+            } elseif ($fieldDef['name'] == 'deleted') {
+                $values['deleted'] = (int)$val;
+            } else {
+                // need to do some thing about types of values
+                if(!is_null($val) || !empty($fieldDef['required'])) {
+                    $values[$field] = $this->massageValue($val, $fieldDef);
+                }
+            }
+        }
+
+        if (empty($values))
+            return $execute?true:''; // no columns set
+
+        // get the entire sql
+        $query = "INSERT INTO $table (".implode(",", array_keys($values)).")
 					VALUES (".implode(",", $values).")";
-		return $execute?$this->query($query):$query;
-	}
+        return $execute?$this->query($query):$query;
+    }
 
     /**
      * Implements a generic update for any bean
@@ -560,13 +560,13 @@ 
      * @return bool query result
      *
      */
-	public function update(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->updateSQL($bean, $where);
-		$tablename = $bean->getTableName();
-		$msg = "Error updating table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
+    public function update(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->updateSQL($bean, $where);
+        $tablename = $bean->getTableName();
+        $msg = "Error updating table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
 
     /**
      * Implements a generic delete for any bean identified by id
@@ -577,215 +577,215 @@ 
      * If where is not passed, it defaults to id of table
      * @return bool query result
      */
-	public function delete(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->deleteSQL($bean, $where);
-		$tableName = $bean->getTableName();
-		$msg = "Error deleting from table: ".$tableName. ":";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Implements a generic retrieve for any bean identified by id
-	 *
-	 * If we want to pass multiple values for a name, pass it as an array
-	 * If where is not passed, it defaults to id of table
-	 *
-	 * @param  SugarBean   $bean  Sugarbean instance
-	 * @param  array    $where values with the keys as names of fields.
-	 * @return resource result from the query
-	 */
-	public function retrieve(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->retrieveSQL($bean, $where);
-		$tableName = $bean->getTableName();
-		$msg = "Error retriving values from table:".$tableName. ":";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Implements a generic retrieve for a collection of beans.
-	 *
-	 * These beans will be joined in the sql by the key attribute of field defs.
-	 * Currently, this function does support outer joins.
-	 *
-	 * @param  array $beans Sugarbean instance(s)
-	 * @param  array $cols  columns to be returned with the keys as names of bean as identified by
-	 * get_class of bean. Values of this array is the array of fieldDefs to be returned for a bean.
-	 * If an empty array is passed, all columns are selected.
-	 * @param  array $where  values with the keys as names of bean as identified by get_class of bean
-	 * Each value at the first level is an array of values for that bean identified by name of fields.
-	 * If we want to pass multiple values for a name, pass it as an array
-	 * If where is not passed, all the rows will be returned.
-	 * @return resource
-	 */
-	public function retrieveView(array $beans, array $cols = array(), array $where = array())
-	{
-		$sql = $this->retrieveViewSQL($beans, $cols, $where);
-		$msg = "Error retriving values from View Collection:";
-		return $this->query($sql,true,$msg);
-	}
-
-
-	/**
-	 * Implements creation of a db table for a bean.
-	 *
-	 * NOTE: does not handle out-of-table constraints, use createConstraintSQL for that
-	 * @param SugarBean $bean  Sugarbean instance
-	 */
-	public function createTable(SugarBean $bean)
-	{
-		$sql = $this->createTableSQL($bean);
-		$tablename = $bean->getTableName();
-		$msg = "Error creating table: $tablename:";
-		$this->query($sql,true,$msg);
-		if(!$this->supports("inline_keys")) {
-		// handle constraints and indices
-			$indicesArr = $this->createConstraintSql($bean);
-			if (count($indicesArr) > 0)
-				foreach ($indicesArr as $indexSql)
-					$this->query($indexSql, true, $msg);
-		}
-	}
-
-	/**
-	 * returns SQL to create constraints or indices
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @return array list of SQL statements
-	 */
-	protected function createConstraintSql(SugarBean $bean)
-	{
-		return $this->getConstraintSql($bean->getIndices(), $bean->getTableName());
-	}
-
-	/**
-	 * Implements creation of a db table
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs  Field definitions, in vardef format
-	 * @param array  $indices    Index definitions, in vardef format
-	 * @param string $engine    Engine parameter, used for MySQL engine so far
+    public function delete(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->deleteSQL($bean, $where);
+        $tableName = $bean->getTableName();
+        $msg = "Error deleting from table: ".$tableName. ":";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Implements a generic retrieve for any bean identified by id
+     *
+     * If we want to pass multiple values for a name, pass it as an array
+     * If where is not passed, it defaults to id of table
+     *
+     * @param  SugarBean   $bean  Sugarbean instance
+     * @param  array    $where values with the keys as names of fields.
+     * @return resource result from the query
+     */
+    public function retrieve(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->retrieveSQL($bean, $where);
+        $tableName = $bean->getTableName();
+        $msg = "Error retriving values from table:".$tableName. ":";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Implements a generic retrieve for a collection of beans.
+     *
+     * These beans will be joined in the sql by the key attribute of field defs.
+     * Currently, this function does support outer joins.
+     *
+     * @param  array $beans Sugarbean instance(s)
+     * @param  array $cols  columns to be returned with the keys as names of bean as identified by
+     * get_class of bean. Values of this array is the array of fieldDefs to be returned for a bean.
+     * If an empty array is passed, all columns are selected.
+     * @param  array $where  values with the keys as names of bean as identified by get_class of bean
+     * Each value at the first level is an array of values for that bean identified by name of fields.
+     * If we want to pass multiple values for a name, pass it as an array
+     * If where is not passed, all the rows will be returned.
+     * @return resource
+     */
+    public function retrieveView(array $beans, array $cols = array(), array $where = array())
+    {
+        $sql = $this->retrieveViewSQL($beans, $cols, $where);
+        $msg = "Error retriving values from View Collection:";
+        return $this->query($sql,true,$msg);
+    }
+
+
+    /**
+     * Implements creation of a db table for a bean.
+     *
+     * NOTE: does not handle out-of-table constraints, use createConstraintSQL for that
+     * @param SugarBean $bean  Sugarbean instance
+     */
+    public function createTable(SugarBean $bean)
+    {
+        $sql = $this->createTableSQL($bean);
+        $tablename = $bean->getTableName();
+        $msg = "Error creating table: $tablename:";
+        $this->query($sql,true,$msg);
+        if(!$this->supports("inline_keys")) {
+        // handle constraints and indices
+            $indicesArr = $this->createConstraintSql($bean);
+            if (count($indicesArr) > 0)
+                foreach ($indicesArr as $indexSql)
+                    $this->query($indexSql, true, $msg);
+        }
+    }
+
+    /**
+     * returns SQL to create constraints or indices
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @return array list of SQL statements
+     */
+    protected function createConstraintSql(SugarBean $bean)
+    {
+        return $this->getConstraintSql($bean->getIndices(), $bean->getTableName());
+    }
+
+    /**
+     * Implements creation of a db table
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs  Field definitions, in vardef format
+     * @param array  $indices    Index definitions, in vardef format
+     * @param string $engine    Engine parameter, used for MySQL engine so far
      * @todo: refactor engine param to be more generic
      * @return bool success value
      */
-	public function createTableParams($tablename, $fieldDefs, $indices, $engine = null)
-	{
-		if (!empty($fieldDefs)) {
-			$sql = $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
-			$res = true;
-			if ($sql) {
-				$msg = "Error creating table: $tablename";
-				$res = ($res and $this->query($sql,true,$msg));
-			}
-			if(!$this->supports("inline_keys")) {
-				// handle constraints and indices
-				$indicesArr = $this->getConstraintSql($indices, $tablename);
-				if (count($indicesArr) > 0)
-					foreach ($indicesArr as $indexSql)
-						$res = ($res and $this->query($indexSql, true, "Error creating indexes"));
-			}
-			return $res;
-		}
-		return false;
-	}
-
-	/**
-	 * Implements repair of a db table for a bean.
-	 *
-	 * @param  SugarBean $bean    SugarBean instance
-	 * @param  bool   $execute true if we want the action to take place, false if we just want the sql returned
-	 * @return string SQL statement or empty string, depending upon $execute
-	 */
-	public function repairTable(SugarBean $bean, $execute = true)
-	{
-		$indices   = $bean->getIndices();
-		$fielddefs = $bean->getFieldDefinitions();
-		$tablename = $bean->getTableName();
-
-		//Clean the indexes to prevent duplicate definitions
-		$new_index = array();
-		foreach($indices as $ind_def){
-			$new_index[$ind_def['name']] = $ind_def;
-		}
-		//jc: added this for beans that do not actually have a table, namely
-		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
-			return '';
-
-		global $dictionary;
-		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
-
-		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
-	}
-
-	/**
-	 * Can this field be null?
-	 * Auto-increment and ID fields can not be null
-	 * @param array $vardef
+    public function createTableParams($tablename, $fieldDefs, $indices, $engine = null)
+    {
+        if (!empty($fieldDefs)) {
+            $sql = $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
+            $res = true;
+            if ($sql) {
+                $msg = "Error creating table: $tablename";
+                $res = ($res and $this->query($sql,true,$msg));
+            }
+            if(!$this->supports("inline_keys")) {
+                // handle constraints and indices
+                $indicesArr = $this->getConstraintSql($indices, $tablename);
+                if (count($indicesArr) > 0)
+                    foreach ($indicesArr as $indexSql)
+                        $res = ($res and $this->query($indexSql, true, "Error creating indexes"));
+            }
+            return $res;
+        }
+        return false;
+    }
+
+    /**
+     * Implements repair of a db table for a bean.
+     *
+     * @param  SugarBean $bean    SugarBean instance
+     * @param  bool   $execute true if we want the action to take place, false if we just want the sql returned
+     * @return string SQL statement or empty string, depending upon $execute
+     */
+    public function repairTable(SugarBean $bean, $execute = true)
+    {
+        $indices   = $bean->getIndices();
+        $fielddefs = $bean->getFieldDefinitions();
+        $tablename = $bean->getTableName();
+
+        //Clean the indexes to prevent duplicate definitions
+        $new_index = array();
+        foreach($indices as $ind_def){
+            $new_index[$ind_def['name']] = $ind_def;
+        }
+        //jc: added this for beans that do not actually have a table, namely
+        //ForecastOpportunities
+        if($tablename == 'does_not_exist' || $tablename == '')
+            return '';
+
+        global $dictionary;
+        $engine=null;
+        if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
+            $engine = $dictionary[$bean->getObjectName()]['engine'];
+
+        return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
+    }
+
+    /**
+     * Can this field be null?
+     * Auto-increment and ID fields can not be null
+     * @param array $vardef
      * @return bool
      */
-	protected function isNullable($vardef)
-	{
-
-		if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
-			&& !empty($vardef['required'])) {
-				/* required + is_null=false => not null */
-			return false;
-		}
-		if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
-					&& (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
-					&& (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
-		) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * Builds the SQL commands that repair a table structure
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fielddefs Field definitions, in vardef format
-	 * @param  array  $indices   Index definitions, in vardef format
-	 * @param  bool   $execute   optional, true if we want the queries executed instead of returned
-	 * @param  string $engine    optional, MySQL engine
+    protected function isNullable($vardef)
+    {
+
+        if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
+            && !empty($vardef['required'])) {
+                /* required + is_null=false => not null */
+            return false;
+        }
+        if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
+                    && (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
+                    && (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Builds the SQL commands that repair a table structure
+     *
+     * @param  string $tablename
+     * @param  array  $fielddefs Field definitions, in vardef format
+     * @param  array  $indices   Index definitions, in vardef format
+     * @param  bool   $execute   optional, true if we want the queries executed instead of returned
+     * @param  string $engine    optional, MySQL engine
      * @todo: refactor engine param to be more generic
      * @return string
      */
-	public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
-	{
-		//jc: had a bug when running the repair if the tablename is blank the repair will
-		//fail when it tries to create a repair table
-		if ($tablename == '' || empty($fielddefs))
-			return '';
-
-		//if the table does not exist create it and we are done
-		$sql = "/* Table : $tablename */\n";
-		if (!$this->tableExists($tablename)) {
-			$createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
-			if($execute && $createtablesql){
-				$this->createTableParams($tablename,$fielddefs,$indices,$engine);
-			}
-
-			$sql .= "/* MISSING TABLE: {$tablename} */\n";
-			$sql .= $createtablesql . "\n";
-			return $sql;
-		}
-
-		$compareFieldDefs = $this->get_columns($tablename);
-		$compareIndices = $this->get_indices($tablename);
-
-		$take_action = false;
-
-		// do column comparisons
-		$sql .=	"/*COLUMNS*/\n";
-		foreach ($fielddefs as $name => $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+    public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
+    {
+        //jc: had a bug when running the repair if the tablename is blank the repair will
+        //fail when it tries to create a repair table
+        if ($tablename == '' || empty($fielddefs))
+            return '';
+
+        //if the table does not exist create it and we are done
+        $sql = "/* Table : $tablename */\n";
+        if (!$this->tableExists($tablename)) {
+            $createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
+            if($execute && $createtablesql){
+                $this->createTableParams($tablename,$fielddefs,$indices,$engine);
+            }
+
+            $sql .= "/* MISSING TABLE: {$tablename} */\n";
+            $sql .= $createtablesql . "\n";
+            return $sql;
+        }
+
+        $compareFieldDefs = $this->get_columns($tablename);
+        $compareIndices = $this->get_indices($tablename);
+
+        $take_action = false;
+
+        // do column comparisons
+        $sql .=	"/*COLUMNS*/\n";
+        foreach ($fielddefs as $name => $value) {
+            if (isset($value['source']) && $value['source'] != 'db')
+                continue;
 
             // Bug #42406. Skipping breaked vardef without type or name
             if (isset($value['name']) == false || $value['name'] == false)
@@ -799,183 +799,183 @@ 
                 continue;
             }
 
-			$name = strtolower($value['name']);
-			// add or fix the field defs per what the DB is expected to give us back
-			$this->massageFieldDef($value,$tablename);
-
-			$ignorerequired=false;
-
-			//Do not track requiredness in the DB, auto_increment, ID,
-			// and deleted fields are always required in the DB, so don't force those
-			if ($this->isNullable($value)) {
-				$value['required'] = false;
-			}
-			//Should match the conditions in DBManager::oneColumnSQLRep for DB required fields, type='id' fields will sometimes
-
-			//come into this function as 'type' = 'char', 'dbType' = 'id' without required set in $value. Assume they are correct and leave them alone.
-			else if (($name == 'id' || $value['type'] == 'id' || (isset($value['dbType']) && $value['dbType'] == 'id'))
-				&& (!isset($value['required']) && isset($compareFieldDefs[$name]['required'])))
-			{
-				$value['required'] = $compareFieldDefs[$name]['required'];
-			}
-
-			if ( !isset($compareFieldDefs[$name]) ) {
-				// ok we need this field lets create it
-				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
-				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
-				if ($execute)
-					$this->addColumn($tablename, $value);
-				$take_action = true;
-			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
-				//fields are different lets alter it
-				$sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach($compareFieldDefs[$name] as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
-				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach($value as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
-				}
-				$sql .=	"*/\n";
-
-				//jc: oracle will complain if you try to execute a statement that sets a column to (not) null
-				//when it is already (not) null
-				if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
-					$value['isnull'] === $compareFieldDefs[$name]['isnull']) {
-					unset($value['required']);
-					$ignorerequired=true;
-				}
-
-				//dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
-				if ((isset($value['required']) && ($value['required'] === true || $value['required'] == 'true' || $value['required'] === 1))
-					&& (empty($compareFieldDefs[$name]['required']) || $compareFieldDefs[$name]['required'] != 'true'))
-				{
-					$ignorerequired = true;
-				}
-				$altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
-				if(is_array($altersql)) {
-					$altersql = join("\n", $altersql);
-				}
-				$sql .= $altersql .  "\n";
-				if($execute){
-					$this->alterColumn($tablename, $value, $ignorerequired);
-				}
-				$take_action = true;
-			}
-		}
-
-		// do index comparisons
-		$sql .=	"/* INDEXES */\n";
-		$correctedIndexs = array();
+            $name = strtolower($value['name']);
+            // add or fix the field defs per what the DB is expected to give us back
+            $this->massageFieldDef($value,$tablename);
 
-        $compareIndices_case_insensitive = array();
+            $ignorerequired=false;
 
-		// do indices comparisons case-insensitive
-		foreach($compareIndices as $k => $value){
-			$value['name'] = strtolower($value['name']);
-			$compareIndices_case_insensitive[strtolower($k)] = $value;
-		}
-		$compareIndices = $compareIndices_case_insensitive;
-		unset($compareIndices_case_insensitive);
-
-		foreach ($indices as $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
-
-
-			$validDBName = $this->getValidDBName($value['name'], true, 'index', true);
-			if (isset($compareIndices[$validDBName])) {
-				$value['name'] = $validDBName;
-			}
-		    $name = strtolower($value['name']);
-
-			//Don't attempt to fix the same index twice in one pass;
-			if (isset($correctedIndexs[$name]))
-				continue;
-
-			//don't bother checking primary nothing we can do about them
-			if (isset($value['type']) && $value['type'] == 'primary')
-				continue;
-
-			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
-				continue;
-
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
-				$value['type'] = 'index';
-
-			if ( !isset($compareIndices[$name]) ) {
-				//First check if an index exists that doesn't match our name, if so, try to rename it
-				$found = false;
-				foreach ($compareIndices as $ex_name => $ex_value) {
-					if($this->compareVarDefs($ex_value, $value, true)) {
-						$found = $ex_name;
-						break;
-					}
-				}
-				if ($found) {
-					$sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
-					$rename = $this->renameIndexDefs($ex_value, $value, $tablename);
-					if($execute) {
-						$this->query($rename, true, "Cannot rename index");
-					}
-					$sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
-
-				} else {
-					// ok we need this field lets create it
-					$sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
-					$sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
-				}
-				$take_action = true;
-				$correctedIndexs[$name] = true;
-			} elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
-				// fields are different lets alter it
-				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach ($compareIndices[$name] as $n1 => $t1) {
-					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
-							$sql .= "[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
-				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach ($value as $n1 => $t1) {
-					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
-						foreach ($t1 as $rKey => $rValue)
-							$sql .=	"[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
-				}
-				$sql .=	"*/\n";
-				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
-				$take_action = true;
-				$correctedIndexs[$name] = true;
-			}
-		}
-
-		return ($take_action === true) ? $sql : '';
-	}
+            //Do not track requiredness in the DB, auto_increment, ID,
+            // and deleted fields are always required in the DB, so don't force those
+            if ($this->isNullable($value)) {
+                $value['required'] = false;
+            }
+            //Should match the conditions in DBManager::oneColumnSQLRep for DB required fields, type='id' fields will sometimes
 
-    /**
-     * Compares two vardefs
-     *
-     * @param  array  $fielddef1 This is from the database
-     * @param  array  $fielddef2 This is from the vardef
-     * @param bool $ignoreName Ignore name-only differences?
-     * @return bool   true if they match, false if they don't
-     */
-	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
-	{
-		foreach ( $fielddef1 as $key => $value ) {
-			if ($key == 'name' && $ignoreName)
-				continue;
-            if (isset($fielddef2[$key]))
+            //come into this function as 'type' = 'char', 'dbType' = 'id' without required set in $value. Assume they are correct and leave them alone.
+            else if (($name == 'id' || $value['type'] == 'id' || (isset($value['dbType']) && $value['dbType'] == 'id'))
+                && (!isset($value['required']) && isset($compareFieldDefs[$name]['required'])))
             {
-                if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
+                $value['required'] = $compareFieldDefs[$name]['required'];
+            }
+
+            if ( !isset($compareFieldDefs[$name]) ) {
+                // ok we need this field lets create it
+                $sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
+                $sql .= $this->addColumnSQL($tablename, $value) .  "\n";
+                if ($execute)
+                    $this->addColumn($tablename, $value);
+                $take_action = true;
+            } elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
+                //fields are different lets alter it
+                $sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
+                foreach($compareFieldDefs[$name] as $rKey => $rValue) {
+                    $sql .=	"[$rKey] => '$rValue'  ";
+                }
+                $sql .=	"*/\n";
+                $sql .=	"/* VARDEF - $name -  ROW";
+                foreach($value as $rKey => $rValue) {
+                    $sql .=	"[$rKey] => '$rValue'  ";
+                }
+                $sql .=	"*/\n";
+
+                //jc: oracle will complain if you try to execute a statement that sets a column to (not) null
+                //when it is already (not) null
+                if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
+                    $value['isnull'] === $compareFieldDefs[$name]['isnull']) {
+                    unset($value['required']);
+                    $ignorerequired=true;
+                }
+
+                //dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
+                if ((isset($value['required']) && ($value['required'] === true || $value['required'] == 'true' || $value['required'] === 1))
+                    && (empty($compareFieldDefs[$name]['required']) || $compareFieldDefs[$name]['required'] != 'true'))
+                {
+                    $ignorerequired = true;
+                }
+                $altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
+                if(is_array($altersql)) {
+                    $altersql = join("\n", $altersql);
+                }
+                $sql .= $altersql .  "\n";
+                if($execute){
+                    $this->alterColumn($tablename, $value, $ignorerequired);
+                }
+                $take_action = true;
+            }
+        }
+
+        // do index comparisons
+        $sql .=	"/* INDEXES */\n";
+        $correctedIndexs = array();
+
+        $compareIndices_case_insensitive = array();
+
+        // do indices comparisons case-insensitive
+        foreach($compareIndices as $k => $value){
+            $value['name'] = strtolower($value['name']);
+            $compareIndices_case_insensitive[strtolower($k)] = $value;
+        }
+        $compareIndices = $compareIndices_case_insensitive;
+        unset($compareIndices_case_insensitive);
+
+        foreach ($indices as $value) {
+            if (isset($value['source']) && $value['source'] != 'db')
+                continue;
+
+
+            $validDBName = $this->getValidDBName($value['name'], true, 'index', true);
+            if (isset($compareIndices[$validDBName])) {
+                $value['name'] = $validDBName;
+            }
+            $name = strtolower($value['name']);
+
+            //Don't attempt to fix the same index twice in one pass;
+            if (isset($correctedIndexs[$name]))
+                continue;
+
+            //don't bother checking primary nothing we can do about them
+            if (isset($value['type']) && $value['type'] == 'primary')
+                continue;
+
+            //database helpers do not know how to handle full text indices
+            if ($value['type']=='fulltext')
+                continue;
+
+            if ( in_array($value['type'],array('alternate_key','foreign')) )
+                $value['type'] = 'index';
+
+            if ( !isset($compareIndices[$name]) ) {
+                //First check if an index exists that doesn't match our name, if so, try to rename it
+                $found = false;
+                foreach ($compareIndices as $ex_name => $ex_value) {
+                    if($this->compareVarDefs($ex_value, $value, true)) {
+                        $found = $ex_name;
+                        break;
+                    }
+                }
+                if ($found) {
+                    $sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
+                    $rename = $this->renameIndexDefs($ex_value, $value, $tablename);
+                    if($execute) {
+                        $this->query($rename, true, "Cannot rename index");
+                    }
+                    $sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
+
+                } else {
+                    // ok we need this field lets create it
+                    $sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
+                    $sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
+                }
+                $take_action = true;
+                $correctedIndexs[$name] = true;
+            } elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
+                // fields are different lets alter it
+                $sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
+                foreach ($compareIndices[$name] as $n1 => $t1) {
+                    $sql .=	 "<$n1>";
+                    if ( $n1 == 'fields' )
+                        foreach($t1 as $rKey => $rValue)
+                            $sql .= "[$rKey] => '$rValue'  ";
+                    else
+                        $sql .= " $t1 ";
+                }
+                $sql .=	"*/\n";
+                $sql .=	"/* VARDEF - $name -  ROW";
+                foreach ($value as $n1 => $t1) {
+                    $sql .=	"<$n1>";
+                    if ( $n1 == 'fields' )
+                        foreach ($t1 as $rKey => $rValue)
+                            $sql .=	"[$rKey] => '$rValue'  ";
+                    else
+                        $sql .= " $t1 ";
+                }
+                $sql .=	"*/\n";
+                $sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
+                $take_action = true;
+                $correctedIndexs[$name] = true;
+            }
+        }
+
+        return ($take_action === true) ? $sql : '';
+    }
+
+    /**
+     * Compares two vardefs
+     *
+     * @param  array  $fielddef1 This is from the database
+     * @param  array  $fielddef2 This is from the vardef
+     * @param bool $ignoreName Ignore name-only differences?
+     * @return bool   true if they match, false if they don't
+     */
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
+    {
+        foreach ( $fielddef1 as $key => $value ) {
+            if ($key == 'name' && $ignoreName)
+                continue;
+            if (isset($fielddef2[$key]))
+            {
+                if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
                 {
                     if (strtolower($fielddef1[$key]) == strtolower($fielddef2[$key]))
                     {
@@ -990,64 +990,64 @@ 
                     }
                 }
             }
-			//Ignore len if its not set in the vardef
-			if ($key == 'len' && empty($fielddef2[$key]))
-				continue;
+            //Ignore len if its not set in the vardef
+            if ($key == 'len' && empty($fielddef2[$key]))
+                continue;
             // if the length in db is greather than the vardef, ignore it
             if ($key == 'len' && ($fielddef1[$key] >= $fielddef2[$key])) {
                 continue;
             }
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Compare a field in two tables
-	 * @deprecated
-	 * @param  string $name   field name
-	 * @param  string $table1
-	 * @param  string $table2
-	 * @return array  array with keys 'msg','table1','table2'
-	 */
-	public function compareFieldInTables($name, $table1, $table2)
-	{
-		$row1 = $this->describeField($name, $table1);
-		$row2 = $this->describeField($name, $table2);
-		$returnArray = array(
-			'table1' => $row1,
-			'table2' => $row2,
-			'msg'    => 'error',
-			);
-
-		$ignore_filter = array('Key'=>1);
-		if ($row1) {
-			if (!$row2) {
-				// Exists on table1 but not table2
-				$returnArray['msg'] = 'not_exists_table2';
-			}
-			else {
-				if (sizeof($row1) != sizeof($row2)) {
-					$returnArray['msg'] = 'no_match';
-				}
-				else {
-					$returnArray['msg'] = 'match';
-					foreach($row1 as $key => $value){
-						//ignore keys when checking we will check them when we do the index check
-						if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
-							$returnArray['msg'] = 'no_match';
-						}
-					}
-				}
-			}
-		}
-		else {
-			$returnArray['msg'] = 'not_exists_table1';
-		}
-
-		return $returnArray;
-	}
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Compare a field in two tables
+     * @deprecated
+     * @param  string $name   field name
+     * @param  string $table1
+     * @param  string $table2
+     * @return array  array with keys 'msg','table1','table2'
+     */
+    public function compareFieldInTables($name, $table1, $table2)
+    {
+        $row1 = $this->describeField($name, $table1);
+        $row2 = $this->describeField($name, $table2);
+        $returnArray = array(
+            'table1' => $row1,
+            'table2' => $row2,
+            'msg'    => 'error',
+            );
+
+        $ignore_filter = array('Key'=>1);
+        if ($row1) {
+            if (!$row2) {
+                // Exists on table1 but not table2
+                $returnArray['msg'] = 'not_exists_table2';
+            }
+            else {
+                if (sizeof($row1) != sizeof($row2)) {
+                    $returnArray['msg'] = 'no_match';
+                }
+                else {
+                    $returnArray['msg'] = 'match';
+                    foreach($row1 as $key => $value){
+                        //ignore keys when checking we will check them when we do the index check
+                        if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
+                            $returnArray['msg'] = 'no_match';
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            $returnArray['msg'] = 'not_exists_table1';
+        }
+
+        return $returnArray;
+    }
 //
 //    /**
 //     * Compare an index in two different tables
@@ -1097,193 +1097,193 @@ 
 //    }
 
 
-	/**
-	 * Creates an index identified by name on the given fields.
-	 *
-	 * @param SugarBean $bean      SugarBean instance
-	 * @param array  $fieldDefs Field definitions, in vardef format
-	 * @param string $name      index name
-	 * @param bool   $unique    optional, true if we want to create an unique index
+    /**
+     * Creates an index identified by name on the given fields.
+     *
+     * @param SugarBean $bean      SugarBean instance
+     * @param array  $fieldDefs Field definitions, in vardef format
+     * @param string $name      index name
+     * @param bool   $unique    optional, true if we want to create an unique index
      * @return bool query result
      */
-	public function createIndex(SugarBean $bean, $fieldDefs, $name, $unique = true)
-	{
-		$sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
-		$tablename = $bean->getTableName();
-		$msg = "Error creating index $name on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * returns a SQL query that creates the indices as defined in metadata
-	 * @param  array  $indices Assoc array with index definitions from vardefs
-	 * @param  string $table Focus table
-	 * @return array  Array of SQL queries to generate indices
-	 */
-	public function getConstraintSql($indices, $table)
-	{
-		if (!$this->isFieldArray($indices))
-			$indices = array($indices);
-
-		$columns = array();
-
-		foreach ($indices as $index) {
-			if(!empty($index['db']) && $index['db'] != $this->dbType)
-				continue;
-			if (isset($index['source']) && $index['source'] != 'db')
-			continue;
-
-			$sql = $this->add_drop_constraint($table, $index);
-
-			if(!empty($sql)) {
-				$columns[] = $sql;
-			}
-		}
-
-		return $columns;
-	}
-
-	/**
-	 * Adds a new indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to add
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function addIndexes($tablename, $indexes, $execute = true)
-	{
-		$alters = $this->getConstraintSql($indexes, $tablename);
-		if ($execute) {
-			foreach($alters as $sql) {
-				$this->query($sql, true, "Error adding index: ");
-			}
-		}
-		if(!empty($alters)) {
-			$sql = join(";\n", $alters).";\n";
-		} else {
-			$sql = '';
-		}
-		return $sql;
-	}
-
-	/**
-	 * Drops indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to drop
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function dropIndexes($tablename, $indexes, $execute = true)
-	{
-		$sqls = array();
-		foreach ($indexes as $index) {
-			$name =$index['name'];
-			$sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
-		}
-		if (!empty($sqls) && $execute) {
-			foreach($sqls as $name => $sql) {
-				unset(self::$index_descriptions[$tablename][$name]);
-				$this->query($sql);
-			}
-		}
-		if(!empty($sqls)) {
-			return join(";\n",$sqls).";";
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Modifies indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to modify
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function modifyIndexes($tablename, $indexes, $execute = true)
-	{
-		return $this->dropIndexes($tablename, $indexes, $execute)."\n".
-			$this->addIndexes($tablename, $indexes, $execute);
-	}
-
-	/**
-	 * Adds a column to table identified by field def.
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs
+    public function createIndex(SugarBean $bean, $fieldDefs, $name, $unique = true)
+    {
+        $sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
+        $tablename = $bean->getTableName();
+        $msg = "Error creating index $name on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * returns a SQL query that creates the indices as defined in metadata
+     * @param  array  $indices Assoc array with index definitions from vardefs
+     * @param  string $table Focus table
+     * @return array  Array of SQL queries to generate indices
+     */
+    public function getConstraintSql($indices, $table)
+    {
+        if (!$this->isFieldArray($indices))
+            $indices = array($indices);
+
+        $columns = array();
+
+        foreach ($indices as $index) {
+            if(!empty($index['db']) && $index['db'] != $this->dbType)
+                continue;
+            if (isset($index['source']) && $index['source'] != 'db')
+            continue;
+
+            $sql = $this->add_drop_constraint($table, $index);
+
+            if(!empty($sql)) {
+                $columns[] = $sql;
+            }
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Adds a new indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to add
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function addIndexes($tablename, $indexes, $execute = true)
+    {
+        $alters = $this->getConstraintSql($indexes, $tablename);
+        if ($execute) {
+            foreach($alters as $sql) {
+                $this->query($sql, true, "Error adding index: ");
+            }
+        }
+        if(!empty($alters)) {
+            $sql = join(";\n", $alters).";\n";
+        } else {
+            $sql = '';
+        }
+        return $sql;
+    }
+
+    /**
+     * Drops indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to drop
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function dropIndexes($tablename, $indexes, $execute = true)
+    {
+        $sqls = array();
+        foreach ($indexes as $index) {
+            $name =$index['name'];
+            $sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
+        }
+        if (!empty($sqls) && $execute) {
+            foreach($sqls as $name => $sql) {
+                unset(self::$index_descriptions[$tablename][$name]);
+                $this->query($sql);
+            }
+        }
+        if(!empty($sqls)) {
+            return join(";\n",$sqls).";";
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Modifies indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to modify
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function modifyIndexes($tablename, $indexes, $execute = true)
+    {
+        return $this->dropIndexes($tablename, $indexes, $execute)."\n".
+            $this->addIndexes($tablename, $indexes, $execute);
+    }
+
+    /**
+     * Adds a column to table identified by field def.
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs
      * @return bool query result
      */
-	public function addColumn($tablename, $fieldDefs)
-	{
-		$sql = $this->addColumnSQL($tablename, $fieldDefs);
-		if ($this->isFieldArray($fieldDefs)){
-			$columns = array();
-			foreach ($fieldDefs as $fieldDef)
-				$columns[] = $fieldDef['name'];
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $fieldDefs['name'];
-		}
-		$msg = "Error adding column(s) $columns on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Alters old column identified by oldFieldDef to new fieldDef.
-	 *
-	 * @param string $tablename
-	 * @param array  $newFieldDef
-	 * @param bool   $ignoreRequired optional, true if we are ignoring this being a required field
+    public function addColumn($tablename, $fieldDefs)
+    {
+        $sql = $this->addColumnSQL($tablename, $fieldDefs);
+        if ($this->isFieldArray($fieldDefs)){
+            $columns = array();
+            foreach ($fieldDefs as $fieldDef)
+                $columns[] = $fieldDef['name'];
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $fieldDefs['name'];
+        }
+        $msg = "Error adding column(s) $columns on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Alters old column identified by oldFieldDef to new fieldDef.
+     *
+     * @param string $tablename
+     * @param array  $newFieldDef
+     * @param bool   $ignoreRequired optional, true if we are ignoring this being a required field
      * @return bool query result
      */
-	public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
-	{
-		$sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
-		if ($this->isFieldArray($newFieldDef)){
-			$columns = array();
-			foreach ($newFieldDef as $fieldDef) {
-				$columns[] = $fieldDef['name'];
-			}
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $newFieldDef['name'];
-		}
-
-		$msg = "Error altering column(s) $columns on table: $tablename:";
-		$res = $this->query($sql,true,$msg);
-		if($res) {
-			$this->getTableDescription($tablename, true); // reload table description after altering
-		}
-		return $res;
-	}
-
-	/**
-	 * Drops the table associated with a bean
-	 *
-	 * @param SugarBean $bean SugarBean instance
+    public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
+    {
+        $sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
+        if ($this->isFieldArray($newFieldDef)){
+            $columns = array();
+            foreach ($newFieldDef as $fieldDef) {
+                $columns[] = $fieldDef['name'];
+            }
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $newFieldDef['name'];
+        }
+
+        $msg = "Error altering column(s) $columns on table: $tablename:";
+        $res = $this->query($sql,true,$msg);
+        if($res) {
+            $this->getTableDescription($tablename, true); // reload table description after altering
+        }
+        return $res;
+    }
+
+    /**
+     * Drops the table associated with a bean
+     *
+     * @param SugarBean $bean SugarBean instance
      * @return bool query result
-	 */
-	public function dropTable(SugarBean $bean)
-	{
-		return $this->dropTableName($bean->getTableName());
-	}
-
-	/**
-	 * Drops the table by name
-	 *
-	 * @param string $name Table name
+     */
+    public function dropTable(SugarBean $bean)
+    {
+        return $this->dropTableName($bean->getTableName());
+    }
+
+    /**
+     * Drops the table by name
+     *
+     * @param string $name Table name
      * @return bool query result
-	 */
-	public function dropTableName($name)
-	{
-		$sql = $this->dropTableNameSQL($name);
-		return $this->query($sql,true,"Error dropping table $name:");
-	}
+     */
+    public function dropTableName($name)
+    {
+        $sql = $this->dropTableNameSQL($name);
+        return $this->query($sql,true,"Error dropping table $name:");
+    }
 
     /**
      * Deletes a column identified by fieldDef.
@@ -1292,13 +1292,13 @@ 
      * @param array  $fieldDefs Vardef definition of the field
      * @return bool query result
      */
-	public function deleteColumn(SugarBean $bean, $fieldDefs)
-	{
-		$tablename = $bean->getTableName();
-		$sql = $this->dropColumnSQL($tablename, $fieldDefs);
-		$msg = "Error deleting column(s) on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
+    public function deleteColumn(SugarBean $bean, $fieldDefs)
+    {
+        $tablename = $bean->getTableName();
+        $sql = $this->dropColumnSQL($tablename, $fieldDefs);
+        $msg = "Error deleting column(s) on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
 
     /**
      * Generate a set of Insert statements based on the bean given
@@ -1313,228 +1313,228 @@ 
      * @param bool $is_related_query
      * @return string SQL insert statement
      */
-	public function generateInsertSQL(SugarBean $bean, $select_query, $start, $count = -1, $table, $is_related_query = false)
-	{
-		$this->log->info('call to DBManager::generateInsertSQL() is deprecated');
-		global $sugar_config;
-
-		$rows_found = 0;
-		$count_query = $bean->create_list_count_query($select_query);
-		if(!empty($count_query))
-		{
-			// We have a count query.  Run it and get the results.
-			$result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
-			$assoc = $this->fetchByAssoc($result);
-			if(!empty($assoc['c']))
-			{
-				$rows_found = $assoc['c'];
-			}
-		}
-		if($count == -1){
-			$count 	= $sugar_config['list_max_entries_per_page'];
-		}
-		$next_offset = $start + $count;
-
-		$result = $this->limitQuery($select_query, $start, $count);
-		// get basic insert
-		$sql = "INSERT INTO ".$table;
-		$custom_sql = "INSERT INTO ".$table."_cstm";
-
-		// get field definitions
-		$fields = $bean->getFieldDefinitions();
-		$custom_fields = array();
-
-		if($bean->hasCustomFields()){
-			foreach ($fields as $fieldDef){
-				if($fieldDef['source'] == 'custom_fields'){
-					$custom_fields[$fieldDef['name']] = $fieldDef['name'];
-				}
-			}
-			if(!empty($custom_fields)){
-				$custom_fields['id_c'] = 'id_c';
-				$id_field = array('name' => 'id_c', 'custom_type' => 'id',);
-				$fields[] = $id_field;
-			}
-		}
-
-		// get column names and values
-		$row_array = array();
-		$columns = array();
-		$cstm_row_array = array();
-		$cstm_columns = array();
-		$built_columns = false;
-		while(($row = $this->fetchByAssoc($result)) != null)
-		{
-			$values = array();
-			$cstm_values = array();
-			if(!$is_related_query){
-				foreach ($fields as $fieldDef)
-				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
-					$val = $row[$fieldDef['name']];
-
-					//handle auto increment values here only need to do this on insert not create
-					if ($fieldDef['name'] == 'deleted'){
-							$values['deleted'] = $val;
-							if(!$built_columns){
-							$columns[] = 'deleted';
-						}
-					}
-					else
-					{
-						$type = $fieldDef['type'];
-						if(!empty($fieldDef['custom_type'])){
-							$type = $fieldDef['custom_type'];
-						}
-						// need to do some thing about types of values
-						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_values[$fieldDef['name']] = 'null';
-							else
-								$values[$fieldDef['name']] = 'null';
-						}else{
-							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-								else
-									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-								else
-									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-							}
-						}
-						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_columns[] = $fieldDef['name'];
-							else
-								$columns[] = $fieldDef['name'];
-						}
-					}
-
-				}
-			} else {
-			foreach ($row as $key=>$val)
-			{
-					if($key != 'orc_row'){
-						$values[$key] = "'$val'";
-						if(!$built_columns){
-							$columns[] = $key;
-						}
-					}
-			}
-			}
-			$built_columns = true;
-			if(!empty($values)){
-				$row_array[] = $values;
-			}
-			if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
-				$cstm_row_array[] = $cstm_values;
-			}
-		}
-
-		//if (sizeof ($values) == 0) return ""; // no columns set
-
-		// get the entire sql
-		$sql .= "(".implode(",", $columns).") ";
-		$sql .= "VALUES";
-		for($i = 0; $i < count($row_array); $i++){
-			$sql .= " (".implode(",", $row_array[$i]).")";
-			if($i < (count($row_array) - 1)){
-				$sql .= ", ";
-			}
-		}
-		//custom
-		// get the entire sql
-		$custom_sql .= "(".implode(",", $cstm_columns).") ";
-		$custom_sql .= "VALUES";
-
-		for($i = 0; $i < count($cstm_row_array); $i++){
-			$custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
-			if($i < (count($cstm_row_array) - 1)){
-				$custom_sql .= ", ";
-			}
-		}
-		return array('data' => $sql, 'cstm_sql' => $custom_sql, /*'result_count' => $row_count, */ 'total_count' => $rows_found, 'next_offset' => $next_offset);
-	}
-
-	/**
-	 * @deprecated
-	 * Disconnects all instances
-	 */
-	public function disconnectAll()
-	{
-		DBManagerFactory::disconnectAll();
-	}
-
-	/**
-	 * This function sets the query threshold limit
-	 *
-	 * @param int $limit value of query threshold limit
-	 */
-	public static function setQueryLimit($limit)
-	{
-		//reset the queryCount
-		self::$queryCount = 0;
-		self::$queryLimit = $limit;
-	}
-
-	/**
-	 * Returns the static queryCount value
-	 *
-	 * @return int value of the queryCount static variable
-	 */
-	public static function getQueryCount()
-	{
-		return self::$queryCount;
-	}
-
-
-	/**
-	 * Resets the queryCount value to 0
-	 *
-	 */
-	public static function resetQueryCount()
-	{
-		self::$queryCount = 0;
-	}
-
-	/**
-	 * This function increments the global $sql_queries variable
-	 */
-	public function countQuery()
-	{
-		if (self::$queryLimit != 0 && ++self::$queryCount > self::$queryLimit
-			&&(empty($GLOBALS['current_user']) || !is_admin($GLOBALS['current_user']))) {
+    public function generateInsertSQL(SugarBean $bean, $select_query, $start, $count = -1, $table, $is_related_query = false)
+    {
+        $this->log->info('call to DBManager::generateInsertSQL() is deprecated');
+        global $sugar_config;
+
+        $rows_found = 0;
+        $count_query = $bean->create_list_count_query($select_query);
+        if(!empty($count_query))
+        {
+            // We have a count query.  Run it and get the results.
+            $result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
+            $assoc = $this->fetchByAssoc($result);
+            if(!empty($assoc['c']))
+            {
+                $rows_found = $assoc['c'];
+            }
+        }
+        if($count == -1){
+            $count 	= $sugar_config['list_max_entries_per_page'];
+        }
+        $next_offset = $start + $count;
+
+        $result = $this->limitQuery($select_query, $start, $count);
+        // get basic insert
+        $sql = "INSERT INTO ".$table;
+        $custom_sql = "INSERT INTO ".$table."_cstm";
+
+        // get field definitions
+        $fields = $bean->getFieldDefinitions();
+        $custom_fields = array();
+
+        if($bean->hasCustomFields()){
+            foreach ($fields as $fieldDef){
+                if($fieldDef['source'] == 'custom_fields'){
+                    $custom_fields[$fieldDef['name']] = $fieldDef['name'];
+                }
+            }
+            if(!empty($custom_fields)){
+                $custom_fields['id_c'] = 'id_c';
+                $id_field = array('name' => 'id_c', 'custom_type' => 'id',);
+                $fields[] = $id_field;
+            }
+        }
+
+        // get column names and values
+        $row_array = array();
+        $columns = array();
+        $cstm_row_array = array();
+        $cstm_columns = array();
+        $built_columns = false;
+        while(($row = $this->fetchByAssoc($result)) != null)
+        {
+            $values = array();
+            $cstm_values = array();
+            if(!$is_related_query){
+                foreach ($fields as $fieldDef)
+                {
+                    if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+                    $val = $row[$fieldDef['name']];
+
+                    //handle auto increment values here only need to do this on insert not create
+                    if ($fieldDef['name'] == 'deleted'){
+                            $values['deleted'] = $val;
+                            if(!$built_columns){
+                            $columns[] = 'deleted';
+                        }
+                    }
+                    else
+                    {
+                        $type = $fieldDef['type'];
+                        if(!empty($fieldDef['custom_type'])){
+                            $type = $fieldDef['custom_type'];
+                        }
+                        // need to do some thing about types of values
+                        if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
+                            if(!empty($custom_fields[$fieldDef['name']]))
+                                $cstm_values[$fieldDef['name']] = 'null';
+                            else
+                                $values[$fieldDef['name']] = 'null';
+                        }else{
+                            if(isset($type) && $type=='int') {
+                                if(!empty($custom_fields[$fieldDef['name']]))
+                                    $cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+                                else
+                                    $values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+                            } else {
+                                if(!empty($custom_fields[$fieldDef['name']]))
+                                    $cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+                                else
+                                    $values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+                            }
+                        }
+                        if(!$built_columns){
+                            if(!empty($custom_fields[$fieldDef['name']]))
+                                $cstm_columns[] = $fieldDef['name'];
+                            else
+                                $columns[] = $fieldDef['name'];
+                        }
+                    }
+
+                }
+            } else {
+            foreach ($row as $key=>$val)
+            {
+                    if($key != 'orc_row'){
+                        $values[$key] = "'$val'";
+                        if(!$built_columns){
+                            $columns[] = $key;
+                        }
+                    }
+            }
+            }
+            $built_columns = true;
+            if(!empty($values)){
+                $row_array[] = $values;
+            }
+            if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
+                $cstm_row_array[] = $cstm_values;
+            }
+        }
+
+        //if (sizeof ($values) == 0) return ""; // no columns set
+
+        // get the entire sql
+        $sql .= "(".implode(",", $columns).") ";
+        $sql .= "VALUES";
+        for($i = 0; $i < count($row_array); $i++){
+            $sql .= " (".implode(",", $row_array[$i]).")";
+            if($i < (count($row_array) - 1)){
+                $sql .= ", ";
+            }
+        }
+        //custom
+        // get the entire sql
+        $custom_sql .= "(".implode(",", $cstm_columns).") ";
+        $custom_sql .= "VALUES";
+
+        for($i = 0; $i < count($cstm_row_array); $i++){
+            $custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
+            if($i < (count($cstm_row_array) - 1)){
+                $custom_sql .= ", ";
+            }
+        }
+        return array('data' => $sql, 'cstm_sql' => $custom_sql, /*'result_count' => $row_count, */ 'total_count' => $rows_found, 'next_offset' => $next_offset);
+    }
+
+    /**
+     * @deprecated
+     * Disconnects all instances
+     */
+    public function disconnectAll()
+    {
+        DBManagerFactory::disconnectAll();
+    }
+
+    /**
+     * This function sets the query threshold limit
+     *
+     * @param int $limit value of query threshold limit
+     */
+    public static function setQueryLimit($limit)
+    {
+        //reset the queryCount
+        self::$queryCount = 0;
+        self::$queryLimit = $limit;
+    }
+
+    /**
+     * Returns the static queryCount value
+     *
+     * @return int value of the queryCount static variable
+     */
+    public static function getQueryCount()
+    {
+        return self::$queryCount;
+    }
+
+
+    /**
+     * Resets the queryCount value to 0
+     *
+     */
+    public static function resetQueryCount()
+    {
+        self::$queryCount = 0;
+    }
+
+    /**
+     * This function increments the global $sql_queries variable
+     */
+    public function countQuery()
+    {
+        if (self::$queryLimit != 0 && ++self::$queryCount > self::$queryLimit
+            &&(empty($GLOBALS['current_user']) || !is_admin($GLOBALS['current_user']))) {
             require_once('include/resource/ResourceManager.php');
             $resourceManager = ResourceManager::getInstance();
             $resourceManager->notifyObservers('ERR_QUERY_LIMIT');
-		}
-	}
+        }
+    }
+
+    /**
+     * Pre-process string for quoting
+     * @internal
+     * @param string $string
+     * @return string
+     */
+    protected function quoteInternal($string)
+    {
+        return from_html($string);
+    }
 
-	/**
-	 * Pre-process string for quoting
-	 * @internal
-	 * @param string $string
+    /**
+     * Return string properly quoted with ''
+     * @param string $string
      * @return string
      */
-	protected function quoteInternal($string)
-	{
-		return from_html($string);
-	}
-
-	/**
-	 * Return string properly quoted with ''
-	 * @param string $string
-	 * @return string
-	 */
-	public function quoted($string)
-	{
-		return "'".$this->quote($string)."'";
-	}
-
-	/**
+    public function quoted($string)
+    {
+        return "'".$this->quote($string)."'";
+    }
+
+    /**
      * Quote value according to type
      * Numerics aren't quoted
      * Dates are converted and quoted
@@ -1544,13 +1544,13 @@ 
      * @return string Quoted value
      */
     public function quoteType($type, $value)
-	{
-	    if($type == 'date') {
-	        return $this->convert($this->quoted($value), "date");
-	    }
-	    if($type == 'time') {
-	        return $this->convert($this->quoted($value), "time");
-	    }
+    {
+        if($type == 'date') {
+            return $this->convert($this->quoted($value), "date");
+        }
+        if($type == 'time') {
+            return $this->convert($this->quoted($value), "time");
+        }
         if(isset($this->type_class[$type]) &&  $this->type_class[$type] == "date") {
             return $this->convert($this->quoted($value), "datetime");
         }
@@ -1559,7 +1559,7 @@ 
         }
 
         return $this->quoted($value);
-	}
+    }
 
     /**
      * Quote the strings of the passed in array
@@ -1569,177 +1569,177 @@ 
      * @param array $array
      * @return array Quoted strings
      */
-	public function arrayQuote(array &$array)
-	{
-		foreach($array as &$val) {
-			$val = $this->quote($val);
-		}
-		return $array;
-	}
+    public function arrayQuote(array &$array)
+    {
+        foreach($array as &$val) {
+            $val = $this->quote($val);
+        }
+        return $array;
+    }
 
     /**
      * Frees out previous results
      *
      * @param resource|bool $result optional, pass if you want to free a single result instead of all results
      */
-	protected function freeResult($result = false)
-	{
-		if($result) {
-			$this->freeDbResult($result);
-		}
-		if($this->lastResult) {
-			$this->freeDbResult($this->lastResult);
-			$this->lastResult = null;
-		}
-	}
-
-	/**
-	 * @abstract
-	 * Check if query has LIMIT clause
-	 * Relevant for now only for Mysql
-	 * @param string $sql
-	 * @return bool
-	 */
-	protected function hasLimit($sql)
-	{
-	    return false;
-	}
-
-	/**
-	 * Runs a query and returns a single row containing single value
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @return array    single value from the query
-	 */
-	public function getOne($sql, $dieOnError = false, $msg = '')
-	{
-		$this->log->info("Get One: |$sql|");
-		if(!$this->hasLimit($sql)) {
-		    $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
-		} else {
-		    // support old code that passes LIMIT to sql
-		    // works only for mysql, so do not rely on this
-		    $queryresult = $this->query($sql, $dieOnError, $msg);
-		}
-		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
-		if (!$queryresult) return false;
-		$row = $this->fetchByAssoc($queryresult);
-		if(!empty($row)) {
-			return array_shift($row);
-		}
-		return false;
-	}
-
-	/**
-	 * Runs a query and returns a single row
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Message to log if error occurs
-	 * @return array    single row from the query
-	 */
-	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		$this->log->info("Fetch One: |$sql|");
-		$this->checkConnection();
-		$queryresult = $this->query($sql, $dieOnError, $msg);
-		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
-
-		if (!$queryresult) return false;
-
-		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
-
-		$this->freeResult($queryresult);
-		return $row;
-	}
+    protected function freeResult($result = false)
+    {
+        if($result) {
+            $this->freeDbResult($result);
+        }
+        if($this->lastResult) {
+            $this->freeDbResult($this->lastResult);
+            $this->lastResult = null;
+        }
+    }
 
     /**
-     * Returns the number of rows affected by the last query
      * @abstract
-	 * See also affected_rows capability, will return 0 unless the DB supports it
-     * @param resource $result query result resource
-     * @return int
+     * Check if query has LIMIT clause
+     * Relevant for now only for Mysql
+     * @param string $sql
+     * @return bool
      */
-	public function getAffectedRowCount($result)
-	{
-		return 0;
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return 0;
-	}
-
-	/**
-     * Get table description
-     * @param string $tablename
+    protected function hasLimit($sql)
+    {
+        return false;
+    }
+
+    /**
+     * Runs a query and returns a single row containing single value
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @return array    single value from the query
+     */
+    public function getOne($sql, $dieOnError = false, $msg = '')
+    {
+        $this->log->info("Get One: |$sql|");
+        if(!$this->hasLimit($sql)) {
+            $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
+        } else {
+            // support old code that passes LIMIT to sql
+            // works only for mysql, so do not rely on this
+            $queryresult = $this->query($sql, $dieOnError, $msg);
+        }
+        $this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
+        if (!$queryresult) return false;
+        $row = $this->fetchByAssoc($queryresult);
+        if(!empty($row)) {
+            return array_shift($row);
+        }
+        return false;
+    }
+
+    /**
+     * Runs a query and returns a single row
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Message to log if error occurs
+     * @return array    single row from the query
+     */
+    public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        $this->log->info("Fetch One: |$sql|");
+        $this->checkConnection();
+        $queryresult = $this->query($sql, $dieOnError, $msg);
+        $this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
+
+        if (!$queryresult) return false;
+
+        $row = $this->fetchByAssoc($queryresult);
+        if ( !$row ) return false;
+
+        $this->freeResult($queryresult);
+        return $row;
+    }
+
+    /**
+     * Returns the number of rows affected by the last query
+     * @abstract
+     * See also affected_rows capability, will return 0 unless the DB supports it
+     * @param resource $result query result resource
+     * @return int
+     */
+    public function getAffectedRowCount($result)
+    {
+        return 0;
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return 0;
+    }
+
+    /**
+     * Get table description
+     * @param string $tablename
      * @param bool $reload true means load from DB, false allows using cache
      * @return array Vardef-format table description
      *
      */
-	public function getTableDescription($tablename, $reload = false)
-	{
-		if($reload || empty(self::$table_descriptions[$tablename])) {
-			self::$table_descriptions[$tablename] = $this->get_columns($tablename);
-		}
-		return self::$table_descriptions[$tablename];
-	}
-
-	/**
-	 * Returns the field description for a given field in table
-	 *
-	 * @param  string $name
-	 * @param  string $tablename
-	 * @return array
-	 */
-	protected function describeField($name, $tablename)
-	{
-		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
-			return 	$table[$name];
-
-		$table = $this->getTableDescription($tablename, true);
-
-		if(isset($table[$name]))
-		return $table[$name];
-
-		return array();
-	}
-
-	/**
-	 * Returns the index description for a given index in table
-	 *
-	 * @param  string $name
-	 * @param  string $tablename
-	 * @return array
-	 */
-	protected function describeIndex($name, $tablename)
-	{
-		if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
-			return 	self::$index_descriptions[$tablename][$name];
-		}
-
-		self::$index_descriptions[$tablename] = $this->get_indices($tablename);
-
-		if(isset(self::$index_descriptions[$tablename][$name])){
-			return 	self::$index_descriptions[$tablename][$name];
-		}
-
-		return array();
-	}
+    public function getTableDescription($tablename, $reload = false)
+    {
+        if($reload || empty(self::$table_descriptions[$tablename])) {
+            self::$table_descriptions[$tablename] = $this->get_columns($tablename);
+        }
+        return self::$table_descriptions[$tablename];
+    }
+
+    /**
+     * Returns the field description for a given field in table
+     *
+     * @param  string $name
+     * @param  string $tablename
+     * @return array
+     */
+    protected function describeField($name, $tablename)
+    {
+        $table = $this->getTableDescription($tablename);
+        if(!empty($table) && isset($table[$name]))
+            return 	$table[$name];
+
+        $table = $this->getTableDescription($tablename, true);
+
+        if(isset($table[$name]))
+        return $table[$name];
+
+        return array();
+    }
+
+    /**
+     * Returns the index description for a given index in table
+     *
+     * @param  string $name
+     * @param  string $tablename
+     * @return array
+     */
+    protected function describeIndex($name, $tablename)
+    {
+        if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
+            return 	self::$index_descriptions[$tablename][$name];
+        }
+
+        self::$index_descriptions[$tablename] = $this->get_indices($tablename);
+
+        if(isset(self::$index_descriptions[$tablename][$name])){
+            return 	self::$index_descriptions[$tablename][$name];
+        }
+
+        return array();
+    }
 
     /**
      * Truncates a string to a given length
@@ -1749,14 +1749,14 @@ 
      * @return string
      *
      */
-	public function truncate($string, $len)
-	{
-		if ( is_numeric($len) && $len > 0)
-		{
-			$string = mb_substr($string,0,(int) $len, "UTF-8");
-		}
-		return $string;
-	}
+    public function truncate($string, $len)
+    {
+        if ( is_numeric($len) && $len > 0)
+        {
+            $string = mb_substr($string,0,(int) $len, "UTF-8");
+        }
+        return $string;
+    }
 
     /**
      * Returns the database string needed for concatinating multiple database strings together
@@ -1766,121 +1766,121 @@ 
      * @param string $space Separator between strings, default is single space
      * @return string
      */
-	public function concat($table, array $fields, $space = ' ')
-	{
-		if(empty($fields)) return '';
-		$elems = array();
-		$space = $this->quoted($space);
-		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
-			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
-		}
-		$first = array_shift($elems);
-		return "LTRIM(RTRIM(".$this->convert($first, 'CONCAT', $elems)."))";
-	}
-
-	/**
-	 * Given a sql stmt attempt to parse it into the sql and the tokens. Then return the index of this prepared statement
-	 * Tokens can come in the following forms:
-	 * ? - a scalar which will be quoted
-	 * ! - a literal which will not be quoted
-	 * & - binary data to read from a file
-	 *
-	 * @param  string	$sql        The sql to parse
-	 * @return int index of the prepared statement to be used with execute
-	 */
-	public function prepareQuery($sql)
-	{
-		//parse out the tokens
-		$tokens = preg_split('/((?<!\\\)[&?!])/', $sql, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-		//maintain a count of the actual tokens for quick reference in execute
-		$count = 0;
-
-		$sqlStr = '';
-		foreach ($tokens as $key => $val) {
-			switch ($val) {
-				case '?' :
-				case '!' :
-				case '&' :
-					$count++;
-					$sqlStr .= '?';
-					break;
-
-				default :
-					//escape any special characters
-					$tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
-					$sqlStr .= $tokens[$key];
-					break;
-			} // switch
-		} // foreach
-
-		$this->preparedTokens[] = array('tokens' => $tokens, 'tokenCount' => $count, 'sqlString' => $sqlStr);
-		end($this->preparedTokens);
-		return key($this->preparedTokens);
-	}
-
-	/**
-	 * Takes a prepared stmt index and the data to replace and creates the query and runs it.
-	 *
-	 * @param  int		$stmt       The index of the prepared statement from preparedTokens
-	 * @param  array    $data 		The array of data to replace the tokens with.
-	 * @return resource result set or false on error
-	 */
-	public function executePreparedQuery($stmt, $data = array())
-	{
-		if(!empty($this->preparedTokens[$stmt])){
-			if(!is_array($data)){
-				$data = array($data);
-			}
-
-			$pTokens = $this->preparedTokens[$stmt];
-
-			//ensure that the number of data elements matches the number of replacement tokens
-			//we found in prepare().
-			if(count($data) != $pTokens['tokenCount']){
-				//error the data count did not match the token count
-				return false;
-			}
-
-			$query = '';
-			$dataIndex = 0;
-			$tokens = $pTokens['tokens'];
-			foreach ($tokens as $val) {
-				switch ($val) {
-					case '?':
-						$query .= $this->quote($data[$dataIndex++]);
-						break;
-					case '&':
-						$filename = $data[$dataIndex++];
-						$query .= file_get_contents($filename);
-						break;
-					case '!':
-						$query .= $data[$dataIndex++];
-						break;
-					default:
-						$query .= $val;
-						break;
-				}//switch
-			}//foreach
-			return $this->query($query);
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Run both prepare and execute without the client having to run both individually.
-	 *
-	 * @param  string	$sql        The sql to parse
-	 * @param  array    $data 		The array of data to replace the tokens with.
-	 * @return resource result set or false on error
-	 */
-	public function pQuery($sql, $data = array())
-	{
-		$stmt = $this->prepareQuery($sql);
-		return $this->executePreparedQuery($stmt, $data);
-	}
+    public function concat($table, array $fields, $space = ' ')
+    {
+        if(empty($fields)) return '';
+        $elems = array();
+        $space = $this->quoted($space);
+        foreach ( $fields as $field ) {
+            if(!empty($elems)) $elems[] = $space;
+            $elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
+        }
+        $first = array_shift($elems);
+        return "LTRIM(RTRIM(".$this->convert($first, 'CONCAT', $elems)."))";
+    }
+
+    /**
+     * Given a sql stmt attempt to parse it into the sql and the tokens. Then return the index of this prepared statement
+     * Tokens can come in the following forms:
+     * ? - a scalar which will be quoted
+     * ! - a literal which will not be quoted
+     * & - binary data to read from a file
+     *
+     * @param  string	$sql        The sql to parse
+     * @return int index of the prepared statement to be used with execute
+     */
+    public function prepareQuery($sql)
+    {
+        //parse out the tokens
+        $tokens = preg_split('/((?<!\\\)[&?!])/', $sql, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        //maintain a count of the actual tokens for quick reference in execute
+        $count = 0;
+
+        $sqlStr = '';
+        foreach ($tokens as $key => $val) {
+            switch ($val) {
+                case '?' :
+                case '!' :
+                case '&' :
+                    $count++;
+                    $sqlStr .= '?';
+                    break;
+
+                default :
+                    //escape any special characters
+                    $tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
+                    $sqlStr .= $tokens[$key];
+                    break;
+            } // switch
+        } // foreach
+
+        $this->preparedTokens[] = array('tokens' => $tokens, 'tokenCount' => $count, 'sqlString' => $sqlStr);
+        end($this->preparedTokens);
+        return key($this->preparedTokens);
+    }
+
+    /**
+     * Takes a prepared stmt index and the data to replace and creates the query and runs it.
+     *
+     * @param  int		$stmt       The index of the prepared statement from preparedTokens
+     * @param  array    $data 		The array of data to replace the tokens with.
+     * @return resource result set or false on error
+     */
+    public function executePreparedQuery($stmt, $data = array())
+    {
+        if(!empty($this->preparedTokens[$stmt])){
+            if(!is_array($data)){
+                $data = array($data);
+            }
+
+            $pTokens = $this->preparedTokens[$stmt];
+
+            //ensure that the number of data elements matches the number of replacement tokens
+            //we found in prepare().
+            if(count($data) != $pTokens['tokenCount']){
+                //error the data count did not match the token count
+                return false;
+            }
+
+            $query = '';
+            $dataIndex = 0;
+            $tokens = $pTokens['tokens'];
+            foreach ($tokens as $val) {
+                switch ($val) {
+                    case '?':
+                        $query .= $this->quote($data[$dataIndex++]);
+                        break;
+                    case '&':
+                        $filename = $data[$dataIndex++];
+                        $query .= file_get_contents($filename);
+                        break;
+                    case '!':
+                        $query .= $data[$dataIndex++];
+                        break;
+                    default:
+                        $query .= $val;
+                        break;
+                }//switch
+            }//foreach
+            return $this->query($query);
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Run both prepare and execute without the client having to run both individually.
+     *
+     * @param  string	$sql        The sql to parse
+     * @param  array    $data 		The array of data to replace the tokens with.
+     * @return resource result set or false on error
+     */
+    public function pQuery($sql, $data = array())
+    {
+        $stmt = $this->prepareQuery($sql);
+        return $this->executePreparedQuery($stmt, $data);
+    }
 
 /********************** SQL FUNCTIONS ****************************/
     /**
@@ -1890,933 +1890,933 @@ 
      * @param SugarBean $bean SugarBean instance
      * @return string SQL Create Table statement
      */
-	public function createTableSQL(SugarBean $bean)
-	{
-		$tablename = $bean->getTableName();
-		$fieldDefs = $bean->getFieldDefinitions();
-		$indices = $bean->getIndices();
-		return $this->createTableSQLParams($tablename, $fieldDefs, $indices);
-	}
-
-	/**
-	 * Generates SQL for insert statement.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @return string SQL Create Table statement
-	 */
-	public function insertSQL(SugarBean $bean)
-	{
-		// get column names and values
-		$sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
-		        isset($bean->field_name_map)?$bean->field_name_map:null, false);
-		return $sql;
-	}
-
-	/**
-	 * Generates SQL for update statement.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where Optional, where conditions in an array
-	 * @return string SQL Create Table statement
-	 */
-	public function updateSQL(SugarBean $bean, array $where = array())
-	{
-		$primaryField = $bean->getPrimaryFieldDefinition();
-		$columns = array();
+    public function createTableSQL(SugarBean $bean)
+    {
+        $tablename = $bean->getTableName();
+        $fieldDefs = $bean->getFieldDefinitions();
+        $indices = $bean->getIndices();
+        return $this->createTableSQLParams($tablename, $fieldDefs, $indices);
+    }
+
+    /**
+     * Generates SQL for insert statement.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @return string SQL Create Table statement
+     */
+    public function insertSQL(SugarBean $bean)
+    {
+        // get column names and values
+        $sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
+                isset($bean->field_name_map)?$bean->field_name_map:null, false);
+        return $sql;
+    }
+
+    /**
+     * Generates SQL for update statement.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where Optional, where conditions in an array
+     * @return string SQL Create Table statement
+     */
+    public function updateSQL(SugarBean $bean, array $where = array())
+    {
+        $primaryField = $bean->getPrimaryFieldDefinition();
+        $columns = array();
         $fields = $bean->getFieldDefinitions();
-		// get column names and values
-		foreach ($fields as $field => $fieldDef) {
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
-			// Do not write out the id field on the update statement.
-    		// We are not allowed to change ids.
-    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
-
-    		// If the field is an auto_increment field, then we shouldn't be setting it.  This was added
-    		// specially for Bugs and Cases which have a number associated with them.
-    		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
-
-    		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
-
-    		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
-
-    		if(isset($bean->$field)) {
-    			$val = from_html($bean->$field);
-    		} else {
-    			continue;
-    		}
-
-    		if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
-    			$val = $bean->getFieldValue($field);
-    		}
-
-    		if(strlen($val) == 0) {
-    			if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
-    				$val = $fieldDef['default'];
-    			} else {
-    				$val = null;
-    			}
-    		}
-
-    		if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
-			    $val = $this->truncate($val, $fieldDef['len']);
-			}
-		$columnName = $this->quoteIdentifier($fieldDef['name']);
-    		if(!is_null($val) || !empty($fieldDef['required'])) {
-    			$columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
-    		} elseif($this->isNullable($fieldDef)) {
-    			$columns[] = "{$columnName}=NULL";
-    		} else {
-    		    $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
-    		}
-		}
-
-		if ( sizeof($columns) == 0 )
-			return ""; // no columns set
-
-		// build where clause
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		if(isset($fields['deleted'])) {
-		    $where .= " AND deleted=0";
-		}
-
-		return "UPDATE ".$bean->getTableName()."
+        // get column names and values
+        foreach ($fields as $field => $fieldDef) {
+            if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+            // Do not write out the id field on the update statement.
+            // We are not allowed to change ids.
+            if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
+
+            // If the field is an auto_increment field, then we shouldn't be setting it.  This was added
+            // specially for Bugs and Cases which have a number associated with them.
+            if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
+
+            //custom fields handle their save separately
+            if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+
+            // no need to clear deleted since we only update not deleted records anyway
+            if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+
+            if(isset($bean->$field)) {
+                $val = from_html($bean->$field);
+            } else {
+                continue;
+            }
+
+            if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
+                $val = $bean->getFieldValue($field);
+            }
+
+            if(strlen($val) == 0) {
+                if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+                    $val = $fieldDef['default'];
+                } else {
+                    $val = null;
+                }
+            }
+
+            if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+                $val = $this->truncate($val, $fieldDef['len']);
+            }
+        $columnName = $this->quoteIdentifier($fieldDef['name']);
+            if(!is_null($val) || !empty($fieldDef['required'])) {
+                $columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
+            } elseif($this->isNullable($fieldDef)) {
+                $columns[] = "{$columnName}=NULL";
+            } else {
+                $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
+            }
+        }
+
+        if ( sizeof($columns) == 0 )
+            return ""; // no columns set
+
+        // build where clause
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        if(isset($fields['deleted'])) {
+            $where .= " AND deleted=0";
+        }
+
+        return "UPDATE ".$bean->getTableName()."
 					SET ".implode(",", $columns)."
 					$where";
-	}
-
-	/**
-	 * This method returns a where array so that it has id entry if
-	 * where is not an array or is empty
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where Optional, where conditions in an array
-	 * @return array
-	 */
-	protected function updateWhereArray(SugarBean $bean, array $where = array())
-	{
-		if (count($where) == 0) {
-			$fieldDef = $bean->getPrimaryFieldDefinition();
-			$primaryColumn = $fieldDef['name'];
-
-			$val = $bean->getFieldValue($fieldDef['name']);
-			if ($val != FALSE){
-				$where[$primaryColumn] = $val;
-			}
-		}
-
-		return $where;
-	}
-
-	/**
-	 * Returns a where clause without the 'where' key word
-	 *
-	 * The clause returned does not have an 'and' at the beginning and the columns
-	 * are joined by 'and'.
-	 *
-	 * @param  string $table table name
-	 * @param  array  $whereArray Optional, where conditions in an array
-	 * @return string
-	 */
-	protected function getColumnWhereClause($table, array $whereArray = array())
-	{
-		$where = array();
-		foreach ($whereArray as $name => $val) {
-			$op = "=";
-			if (is_array($val)) {
-				$op = "IN";
-				$temp = array();
-				foreach ($val as $tval){
-					$temp[] = $this->quoted($tval);
-				}
-				$val = implode(",", $temp);
-				$val = "($val)";
-			} else {
-				$val = $this->quoted($val);
-			}
-
-			$where[] = " $table.$name $op $val";
-		}
-
-		if (!empty($where))
-			return implode(" AND ", $where);
-
-		return '';
-	}
-
-	/**
-	 * This method returns a complete where clause built from the
-	 * where values specified.
-	 *
-	 * @param  SugarBean $bean SugarBean that describes the table
-	 * @param  array  $whereArray Optional, where conditions in an array
-	 * @return string
-	 */
-	protected function getWhereClause(SugarBean $bean, array $whereArray=array())
-	{
-	    return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
-	}
-
-	/**
-	 * Outputs a correct string for the sql statement according to value
-	 *
-	 * @param  mixed $val
-	 * @param  array $fieldDef field definition
-	 * @return mixed
-	 */
-	public function massageValue($val, $fieldDef)
-	{
-		$type = $this->getFieldType($fieldDef);
-
-		if(isset($this->type_class[$type])) {
-			// handle some known types
-			switch($this->type_class[$type]) {
-				case 'bool':
-				case 'int':
-					if (!empty($fieldDef['required']) && $val == ''){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
-					return intval($val);
+    }
+
+    /**
+     * This method returns a where array so that it has id entry if
+     * where is not an array or is empty
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where Optional, where conditions in an array
+     * @return array
+     */
+    protected function updateWhereArray(SugarBean $bean, array $where = array())
+    {
+        if (count($where) == 0) {
+            $fieldDef = $bean->getPrimaryFieldDefinition();
+            $primaryColumn = $fieldDef['name'];
+
+            $val = $bean->getFieldValue($fieldDef['name']);
+            if ($val != FALSE){
+                $where[$primaryColumn] = $val;
+            }
+        }
+
+        return $where;
+    }
+
+    /**
+     * Returns a where clause without the 'where' key word
+     *
+     * The clause returned does not have an 'and' at the beginning and the columns
+     * are joined by 'and'.
+     *
+     * @param  string $table table name
+     * @param  array  $whereArray Optional, where conditions in an array
+     * @return string
+     */
+    protected function getColumnWhereClause($table, array $whereArray = array())
+    {
+        $where = array();
+        foreach ($whereArray as $name => $val) {
+            $op = "=";
+            if (is_array($val)) {
+                $op = "IN";
+                $temp = array();
+                foreach ($val as $tval){
+                    $temp[] = $this->quoted($tval);
+                }
+                $val = implode(",", $temp);
+                $val = "($val)";
+            } else {
+                $val = $this->quoted($val);
+            }
+
+            $where[] = " $table.$name $op $val";
+        }
+
+        if (!empty($where))
+            return implode(" AND ", $where);
+
+        return '';
+    }
+
+    /**
+     * This method returns a complete where clause built from the
+     * where values specified.
+     *
+     * @param  SugarBean $bean SugarBean that describes the table
+     * @param  array  $whereArray Optional, where conditions in an array
+     * @return string
+     */
+    protected function getWhereClause(SugarBean $bean, array $whereArray=array())
+    {
+        return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
+    }
+
+    /**
+     * Outputs a correct string for the sql statement according to value
+     *
+     * @param  mixed $val
+     * @param  array $fieldDef field definition
+     * @return mixed
+     */
+    public function massageValue($val, $fieldDef)
+    {
+        $type = $this->getFieldType($fieldDef);
+
+        if(isset($this->type_class[$type])) {
+            // handle some known types
+            switch($this->type_class[$type]) {
+                case 'bool':
+                case 'int':
+                    if (!empty($fieldDef['required']) && $val == ''){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
+                    return intval($val);
                 case 'bigint' :
                     $val = (float)$val;
-					if (!empty($fieldDef['required']) && $val == false){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
+                    if (!empty($fieldDef['required']) && $val == false){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
                     return $val;
-				case 'float':
-					if (!empty($fieldDef['required'])  && $val == ''){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
-					return floatval($val);
-				case 'time':
-				case 'date':
-					// empty date can't be '', so convert it to either NULL or empty date value
-					if($val == '') {
-						if (!empty($fieldDef['required'])) {
-							if (isset($fieldDef['default'])) {
-								return $fieldDef['default'];
-							}
-							return $this->emptyValue($type);
-						}
-						return "NULL";
-					}
-					break;
-			}
-		} else {
-		    if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
-			    $val = $this->truncate($val, $fieldDef['len']);
-			}
-		}
-
-		if ( is_null($val) ) {
-			if(!empty($fieldDef['required'])) {
-				if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
-					return $fieldDef['default'];
-				}
-				return $this->emptyValue($type);
-			} else {
-				return "NULL";
-			}
-		}
+                case 'float':
+                    if (!empty($fieldDef['required'])  && $val == ''){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
+                    return floatval($val);
+                case 'time':
+                case 'date':
+                    // empty date can't be '', so convert it to either NULL or empty date value
+                    if($val == '') {
+                        if (!empty($fieldDef['required'])) {
+                            if (isset($fieldDef['default'])) {
+                                return $fieldDef['default'];
+                            }
+                            return $this->emptyValue($type);
+                        }
+                        return "NULL";
+                    }
+                    break;
+            }
+        } else {
+            if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+                $val = $this->truncate($val, $fieldDef['len']);
+            }
+        }
+
+        if ( is_null($val) ) {
+            if(!empty($fieldDef['required'])) {
+                if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
+                    return $fieldDef['default'];
+                }
+                return $this->emptyValue($type);
+            } else {
+                return "NULL";
+            }
+        }
         if($type == "datetimecombo") {
             $type = "datetime";
         }
-		return $this->convert($this->quoted($val), $type);
-	}
-
-	/**
-	 * Massages the field defintions to fill in anything else the DB backend may add
-	 *
-	 * @param  array  $fieldDef
-	 * @param  string $tablename
-	 * @return array
-	 */
-	public function massageFieldDef(&$fieldDef, $tablename)
-	{
-		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
-				$fieldDef['dbType'] = $fieldDef['dbtype'];
-			else
-				$fieldDef['dbType'] = $fieldDef['type'];
-		}
-		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
-		$matches = array();
+        return $this->convert($this->quoted($val), $type);
+    }
+
+    /**
+     * Massages the field defintions to fill in anything else the DB backend may add
+     *
+     * @param  array  $fieldDef
+     * @param  string $tablename
+     * @return array
+     */
+    public function massageFieldDef(&$fieldDef, $tablename)
+    {
+        if ( !isset($fieldDef['dbType']) ) {
+            if ( isset($fieldDef['dbtype']) )
+                $fieldDef['dbType'] = $fieldDef['dbtype'];
+            else
+                $fieldDef['dbType'] = $fieldDef['type'];
+        }
+        $type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
+        $matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
-			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
-			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
-			$fieldDef['len'] .= ",{$fieldDef['precision']}";
-		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
-			$fieldDef['required'] = 'true';
-		}
-	}
-
-	/**
-	 * Take an SQL statement and produce a list of fields used in that select
-	 * @param string $selectStatement
-	 * @return array
-	 */
-	public function getSelectFieldsFromQuery($selectStatement)
-	{
-		$selectStatement = trim($selectStatement);
-		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
-			$selectStatement = trim(substr($selectStatement, 6));
-
-		//Due to sql functions existing in many selects, we can't use php explode
-		$fields = array();
-		$level = 0;
-		$selectField = "";
-		$strLen = strlen($selectStatement);
-		for($i = 0; $i < $strLen; $i++)
-		{
-			$char = $selectStatement[$i];
-
-			if ($char == "," && $level == 0)
-			{
-				$field = $this->getFieldNameFromSelect(trim($selectField));
-				$fields[$field] = $selectField;
-				$selectField = "";
-			}
-			else if ($char == "("){
-				$level++;
-				$selectField .= $char;
-			}
-			else if($char == ")"){
-				$level--;
-				$selectField .= $char;
-
-
-			}else{
-				$selectField .= $char;
-			}
-
-		}
-		$fields[$this->getFieldNameFromSelect($selectField)] = $selectField;
-		return $fields;
-	}
-
-	/**
-	 * returns the field name used in a select
-	 * @param string $string SELECT query
+        if ( isset($matches[1][0]) )
+            $fieldDef['type'] = $matches[1][0];
+        if ( isset($matches[2][0]) && empty($fieldDef['len']) )
+            $fieldDef['len'] = $matches[2][0];
+        if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
+            $fieldDef['len'] .= ",{$fieldDef['precision']}";
+        if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
+            $fieldDef['required'] = 'true';
+        }
+    }
+
+    /**
+     * Take an SQL statement and produce a list of fields used in that select
+     * @param string $selectStatement
+     * @return array
+     */
+    public function getSelectFieldsFromQuery($selectStatement)
+    {
+        $selectStatement = trim($selectStatement);
+        if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
+            $selectStatement = trim(substr($selectStatement, 6));
+
+        //Due to sql functions existing in many selects, we can't use php explode
+        $fields = array();
+        $level = 0;
+        $selectField = "";
+        $strLen = strlen($selectStatement);
+        for($i = 0; $i < $strLen; $i++)
+        {
+            $char = $selectStatement[$i];
+
+            if ($char == "," && $level == 0)
+            {
+                $field = $this->getFieldNameFromSelect(trim($selectField));
+                $fields[$field] = $selectField;
+                $selectField = "";
+            }
+            else if ($char == "("){
+                $level++;
+                $selectField .= $char;
+            }
+            else if($char == ")"){
+                $level--;
+                $selectField .= $char;
+
+
+            }else{
+                $selectField .= $char;
+            }
+
+        }
+        $fields[$this->getFieldNameFromSelect($selectField)] = $selectField;
+        return $fields;
+    }
+
+    /**
+     * returns the field name used in a select
+     * @param string $string SELECT query
      * @return string
      */
-	protected function getFieldNameFromSelect($string)
-	{
-		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
-			$string = substr($string, 9);
-		}
-		if (stripos($string, " as ") !== false)
-			//"as" used for an alias
-			return trim(substr($string, strripos($string, " as ") + 4));
-		else if (strrpos($string, " ") != 0)
-			//Space used as a delimiter for an alias
-			return trim(substr($string, strrpos($string, " ")));
-		else if (strpos($string, ".") !== false)
-			//No alias, but a table.field format was used
-			return substr($string, strpos($string, ".") + 1);
-		else
-			//Give up and assume the whole thing is the field name
-			return $string;
-	}
-
-	/**
-	 * Generates SQL for delete statement identified by id.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where where conditions in an array
-	 * @return string SQL Update Statement
-	 */
-	public function deleteSQL(SugarBean $bean, array $where)
-	{
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		return "UPDATE ".$bean->getTableName()." SET deleted=1 $where";
-	}
+    protected function getFieldNameFromSelect($string)
+    {
+        if(strncasecmp($string, "DISTINCT ", 9) == 0) {
+            $string = substr($string, 9);
+        }
+        if (stripos($string, " as ") !== false)
+            //"as" used for an alias
+            return trim(substr($string, strripos($string, " as ") + 4));
+        else if (strrpos($string, " ") != 0)
+            //Space used as a delimiter for an alias
+            return trim(substr($string, strrpos($string, " ")));
+        else if (strpos($string, ".") !== false)
+            //No alias, but a table.field format was used
+            return substr($string, strpos($string, ".") + 1);
+        else
+            //Give up and assume the whole thing is the field name
+            return $string;
+    }
+
+    /**
+     * Generates SQL for delete statement identified by id.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where where conditions in an array
+     * @return string SQL Update Statement
+     */
+    public function deleteSQL(SugarBean $bean, array $where)
+    {
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        return "UPDATE ".$bean->getTableName()." SET deleted=1 $where";
+    }
+
+    /**
+     * Generates SQL for select statement for any bean identified by id.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where where conditions in an array
+     * @return string SQL Select Statement
+     */
+    public function retrieveSQL(SugarBean $bean, array $where)
+    {
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        return "SELECT * FROM ".$bean->getTableName()." $where AND deleted=0";
+    }
+
+    /**
+     * This method implements a generic sql for a collection of beans.
+     *
+     * Currently, this function does not support outer joins.
+     *
+     * @param array $beans Array of values returned by get_class method as the keys and a bean as
+     *      the value for that key. These beans will be joined in the sql by the key
+     *      attribute of field defs.
+     * @param  array $cols Optional, columns to be returned with the keys as names of bean
+     *      as identified by get_class of bean. Values of this array is the array of fieldDefs
+     *      to be returned for a bean. If an empty array is passed, all columns are selected.
+     * @param  array $whereClause Optional, values with the keys as names of bean as identified
+     *      by get_class of bean. Each value at the first level is an array of values for that
+     *      bean identified by name of fields. If we want to pass multiple values for a name,
+     *      pass it as an array. If where is not passed, all the rows will be returned.
+     *
+     * @return string SQL Select Statement
+     */
+    public function retrieveViewSQL(array $beans, array $cols = array(), array $whereClause = array())
+    {
+        $relations = array(); // stores relations between tables as they are discovered
+        $where = $select = array();
+        foreach ($beans as $beanID => $bean) {
+            $tableName = $bean->getTableName();
+            $beanTables[$beanID] = $tableName;
+
+            $table = $beanID;
+            $tables[$table] = $tableName;
+            $aliases[$tableName][] = $table;
+
+            // build part of select for this table
+            if (is_array($cols[$beanID]))
+                foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+
+            // build part of where clause
+            if (is_array($whereClause[$beanID])){
+                $where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
+            }
+            // initialize so that it can be used properly in form clause generation
+            $table_used_in_from[$table] = false;
+
+            $indices = $bean->getIndices();
+            foreach ($indices as $index){
+                if ($index['type'] == 'foreign') {
+                    $relationship[$table][] = array('foreignTable'=> $index['foreignTable']
+                                                ,'foreignColumn'=>$index['foreignField']
+                                                ,'localColumn'=> $index['fields']
+                                                );
+                }
+            }
+            $where[] = " $table.deleted = 0";
+        }
+
+        // join these clauses
+        $select = !empty($select) ? implode(",", $select) : "*";
+        $where = implode(" AND ", $where);
+
+        // generate the from clause. Use relations array to generate outer joins
+        // all the rest of the tables will be used as a simple from
+        // relations table define relations between table1 and table2 through column on table 1
+        // table2 is assumed to joining through primary key called id
+        $separator = "";
+        $from = ''; $table_used_in_from = array();
+        foreach ($relations as $table1 => $rightsidearray){
+            if ($table_used_in_from[$table1]) continue; // table has been joined
+
+            $from .= $separator." ".$table1;
+            $table_used_in_from[$table1] = true;
+            foreach ($rightsidearray as $tablearray){
+                $table2 = $tablearray['foreignTable']; // get foreign table
+                $tableAlias = $aliases[$table2]; // get a list of aliases for this table
+                foreach ($tableAlias as $table2) {
+                    //choose first alias that does not match
+                    // we are doing this because of self joins.
+                    // in case of self joins, the same table will have many aliases.
+                    if ($table2 != $table1) break;
+                }
+
+                $col = $tablearray['foreingColumn'];
+                $name = $tablearray['localColumn'];
+                $from .= " LEFT JOIN $table on ($table1.$name = $table2.$col)";
+                $table_used_in_from[$table2] = true;
+            }
+            $separator = ",";
+        }
+
+        return "SELECT $select FROM $from WHERE $where";
+    }
+
+    /**
+     * Generates SQL for create index statement for a bean.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $fields fields used in the index
+     * @param  string $name index name
+     * @param  bool   $unique Optional, set to true if this is an unique index
+     * @return string SQL Select Statement
+     */
+    public function createIndexSQL(SugarBean $bean, array $fields, $name, $unique = true)
+    {
+        $unique = ($unique) ? "unique" : "";
+        $tablename = $bean->getTableName();
+        $columns = array();
+        // get column names
+        foreach ($fields as $fieldDef)
+            $columns[] = $fieldDef['name'];
+
+        if (empty($columns))
+            return "";
+
+        $columns = implode(",", $columns);
+
+        return "CREATE $unique INDEX $name ON $tablename ($columns)";
+    }
+
+    /**
+     * Returns the type of the variable in the field
+     *
+     * @param  array $fieldDef Vardef-format field def
+     * @return string
+     */
+    public function getFieldType($fieldDef)
+    {
+        // get the type for db type. if that is not set,
+        // get it from type. This is done so that
+        // we do not have change a lot of existing code
+        // and add dbtype where type is being used for some special
+        // purposes like referring to foreign table etc.
+        if(!empty($fieldDef['dbType']))
+            return  $fieldDef['dbType'];
+        if(!empty($fieldDef['dbtype']))
+            return  $fieldDef['dbtype'];
+        if (!empty($fieldDef['type']))
+            return  $fieldDef['type'];
+        if (!empty($fieldDef['Type']))
+            return  $fieldDef['Type'];
+        if (!empty($fieldDef['data_type']))
+            return  $fieldDef['data_type'];
+
+        return null;
+    }
+
+    /**
+     * retrieves the different components from the passed column type as it is used in the type mapping and vardefs
+     * type format: <baseType>[(<len>[,<scale>])]
+     * @param string $type Column type
+     * @return array|bool array containing the different components of the passed in type or false in case the type contains illegal characters
+     */
+    public function getTypeParts($type)
+    {
+        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
+        {
+            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
+            $return['baseType'] = $matches['type'];
+            if( isset($matches['arg'])) {
+                $return['arg'] = $matches['arg'];
+            }
+            if( isset($matches['len'])) {
+                $return['len'] = $matches['len'];
+            }
+            if( isset($matches['scale'])) {
+                $return['scale'] = $matches['scale'];
+            }
+            return $return;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the defintion for a single column
+     *
+     * @param  array  $fieldDef Vardef-format field def
+     * @param  bool   $ignoreRequired  Optional, true if we should ignore this being a required field
+     * @param  string $table           Optional, table name
+     * @param  bool   $return_as_array Optional, true if we should return the result as an array instead of sql
+     * @return string or array if $return_as_array is true
+     */
+    protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
+    {
+        $name = $fieldDef['name'];
+        $type = $this->getFieldType($fieldDef);
+        $colType = $this->getColumnType($type);
+
+        if($parts = $this->getTypeParts($colType))
+        {
+            $colBaseType = $parts['baseType'];
+            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+        }
+
+        if(!empty($fieldDef['len'])) {
+            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
+                                            'clob', 'blob', 'text'))) {
+                    $colType = "$colBaseType(${fieldDef['len']})";
+            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
+                    if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
+                        if(strpos($fieldDef['len'],',') === false){
+                            $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
+                        }else{
+                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                        }
+                    else
+                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                }
+        } else {
+            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
+                $colType = "$colBaseType($defLen)";
+            }
+        }
+
+        $default = '';
+
+        // Bug #52610 We should have ability don't add DEFAULT part to query for boolean fields
+        if (!empty($fieldDef['no_default']))
+        {
+            // nothing to do
+        }
+        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
+        {
+            $default = " DEFAULT ".$this->quoted($fieldDef['default']);
+        }
+        elseif (!isset($default) && $type == 'bool')
+        {
+            $default = " DEFAULT 0 ";
+        }
+
+        $auto_increment = '';
+        if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
+            $auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+
+        $required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
+        //Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
+        if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
+            (!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
+            $required =  "NOT NULL";
+        }
+        // If the field is marked both required & isnull=>false - alwqys make it not null
+        // Use this to ensure primary key fields never defined as null
+        if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
+            && !empty($fieldDef['required'])) {
+            $required =  "NOT NULL";
+        }
+        if ($ignoreRequired)
+            $required = "";
+
+        if ( $return_as_array ) {
+            return array(
+                'name' => $name,
+                'colType' => $colType,
+                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
+                'default' => $default,
+                'required' => $required,
+                'auto_increment' => $auto_increment,
+                'full' => "$name $colType $default $required $auto_increment",
+                );
+        } else {
+            return "$name $colType $default $required $auto_increment";
+        }
+    }
+
+    /**
+     * Returns SQL defintions for all columns in a table
+     *
+     * @param  array  $fieldDefs  Vardef-format field def
+     * @param  bool   $ignoreRequired Optional, true if we should ignor this being a required field
+     * @param  string $tablename      Optional, table name
+     * @return string SQL column definitions
+     */
+    protected function columnSQLRep($fieldDefs, $ignoreRequired = false, $tablename)
+    {
+        $columns = array();
+
+        if ($this->isFieldArray($fieldDefs)) {
+            foreach ($fieldDefs as $fieldDef) {
+                if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
+                    $columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
+                }
+            }
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Returns the next value for an auto increment
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @return string
+     */
+    public function getAutoIncrement($table, $field_name)
+    {
+        return "";
+    }
+
+    /**
+     * Returns the sql for the next value in a sequence
+     * @abstract
+     * @param  string $table  Table name
+     * @param  string $field_name  Field name
+     * @return string
+     */
+    public function getAutoIncrementSQL($table, $field_name)
+    {
+        return "";
+    }
+
+    /**
+     * Either creates an auto increment through queries or returns sql for auto increment
+     * that can be appended to the end of column defination (mysql)
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @return string
+     */
+    protected function setAutoIncrement($table, $field_name)
+    {
+        $this->deleteAutoIncrement($table, $field_name);
+        return "";
+    }
+
+    /**
+     * Sets the next auto-increment value of a column to a specific value.
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @param  int $start_value  Starting autoincrement value
+     * @return string
+     *
+     */
+    public function setAutoIncrementStart($table, $field_name, $start_value)
+    {
+        return "";
+    }
+
+    /**
+     * Deletes an auto increment
+     * @abstract
+     * @param string $table tablename
+     * @param string $field_name
+     */
+    public function deleteAutoIncrement($table, $field_name)
+    {
+        return;
+    }
+
+    /**
+     * This method generates sql for adding a column to table identified by field def.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @return string SQL statement
+     */
+    public function addColumnSQL($tablename, $fieldDefs)
+    {
+        return $this->changeColumnSQL($tablename, $fieldDefs, 'add');
+    }
+
+    /**
+     * This method genrates sql for altering old column identified by oldFieldDef to new fieldDef.
+     *
+     * @param  string $tablename
+     * @param  array  $newFieldDefs
+     * @param  bool  $ignorerequired Optional, true if we should ignor this being a required field
+     * @return string|array SQL statement(s)
+     */
+    public function alterColumnSQL($tablename, $newFieldDefs, $ignorerequired = false)
+    {
+        return $this->changeColumnSQL($tablename, $newFieldDefs, 'modify', $ignorerequired);
+    }
 
     /**
-     * Generates SQL for select statement for any bean identified by id.
+     * Generates SQL for dropping a table.
      *
-     * @param  SugarBean $bean SugarBean instance
-     * @param  array  $where where conditions in an array
-     * @return string SQL Select Statement
+     * @param  SugarBean $bean Sugarbean instance
+     * @return string SQL statement
      */
-	public function retrieveSQL(SugarBean $bean, array $where)
-	{
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		return "SELECT * FROM ".$bean->getTableName()." $where AND deleted=0";
-	}
+    public function dropTableSQL(SugarBean $bean)
+    {
+        return $this->dropTableNameSQL($bean->getTableName());
+    }
 
     /**
-     * This method implements a generic sql for a collection of beans.
+     * Generates SQL for dropping a table.
      *
-     * Currently, this function does not support outer joins.
+     * @param  string $name table name
+     * @return string SQL statement
+     */
+    public function dropTableNameSQL($name)
+    {
+        return "DROP TABLE ".$name;
+    }
+
+    /**
+     * Generates SQL for truncating a table.
+     * @param  string $name  table name
+     * @return string
+     */
+    public function truncateTableSQL($name)
+    {
+        return "TRUNCATE $name";
+    }
+
+    /**
+     * This method generates sql that deletes a column identified by fieldDef.
      *
-     * @param array $beans Array of values returned by get_class method as the keys and a bean as
-     *      the value for that key. These beans will be joined in the sql by the key
-     *      attribute of field defs.
-     * @param  array $cols Optional, columns to be returned with the keys as names of bean
-     *      as identified by get_class of bean. Values of this array is the array of fieldDefs
-     *      to be returned for a bean. If an empty array is passed, all columns are selected.
-     * @param  array $whereClause Optional, values with the keys as names of bean as identified
-     *      by get_class of bean. Each value at the first level is an array of values for that
-     *      bean identified by name of fields. If we want to pass multiple values for a name,
-     *      pass it as an array. If where is not passed, all the rows will be returned.
+     * @param  SugarBean $bean      Sugarbean instance
+     * @param  array  $fieldDefs
+     * @return string SQL statement
+     */
+    public function deleteColumnSQL(SugarBean $bean, $fieldDefs)
+    {
+        return $this->dropColumnSQL($bean->getTableName(), $fieldDefs);
+    }
+
+    /**
+     * This method generates sql that drops a column identified by fieldDef.
+     * Designed to work like the other addColumnSQL() and alterColumnSQL() functions
      *
-     * @return string SQL Select Statement
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @return string SQL statement
      */
-	public function retrieveViewSQL(array $beans, array $cols = array(), array $whereClause = array())
-	{
-		$relations = array(); // stores relations between tables as they are discovered
-		$where = $select = array();
-		foreach ($beans as $beanID => $bean) {
-			$tableName = $bean->getTableName();
-			$beanTables[$beanID] = $tableName;
-
-			$table = $beanID;
-			$tables[$table] = $tableName;
-			$aliases[$tableName][] = $table;
-
-			// build part of select for this table
-			if (is_array($cols[$beanID]))
-				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
-
-			// build part of where clause
-			if (is_array($whereClause[$beanID])){
-				$where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
-			}
-			// initialize so that it can be used properly in form clause generation
-			$table_used_in_from[$table] = false;
-
-			$indices = $bean->getIndices();
-			foreach ($indices as $index){
-				if ($index['type'] == 'foreign') {
-					$relationship[$table][] = array('foreignTable'=> $index['foreignTable']
-												,'foreignColumn'=>$index['foreignField']
-												,'localColumn'=> $index['fields']
-												);
-				}
-			}
-			$where[] = " $table.deleted = 0";
-		}
-
-		// join these clauses
-		$select = !empty($select) ? implode(",", $select) : "*";
-		$where = implode(" AND ", $where);
-
-		// generate the from clause. Use relations array to generate outer joins
-		// all the rest of the tables will be used as a simple from
-		// relations table define relations between table1 and table2 through column on table 1
-		// table2 is assumed to joining through primary key called id
-		$separator = "";
-		$from = ''; $table_used_in_from = array();
-		foreach ($relations as $table1 => $rightsidearray){
-			if ($table_used_in_from[$table1]) continue; // table has been joined
-
-			$from .= $separator." ".$table1;
-			$table_used_in_from[$table1] = true;
-			foreach ($rightsidearray as $tablearray){
-				$table2 = $tablearray['foreignTable']; // get foreign table
-				$tableAlias = $aliases[$table2]; // get a list of aliases for this table
-				foreach ($tableAlias as $table2) {
-					//choose first alias that does not match
-					// we are doing this because of self joins.
-					// in case of self joins, the same table will have many aliases.
-					if ($table2 != $table1) break;
-				}
-
-				$col = $tablearray['foreingColumn'];
-				$name = $tablearray['localColumn'];
-				$from .= " LEFT JOIN $table on ($table1.$name = $table2.$col)";
-				$table_used_in_from[$table2] = true;
-			}
-			$separator = ",";
-		}
-
-		return "SELECT $select FROM $from WHERE $where";
-	}
-
-	/**
-	 * Generates SQL for create index statement for a bean.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $fields fields used in the index
-	 * @param  string $name index name
-	 * @param  bool   $unique Optional, set to true if this is an unique index
-	 * @return string SQL Select Statement
-	 */
-	public function createIndexSQL(SugarBean $bean, array $fields, $name, $unique = true)
-	{
-		$unique = ($unique) ? "unique" : "";
-		$tablename = $bean->getTableName();
-		$columns = array();
-		// get column names
-		foreach ($fields as $fieldDef)
-			$columns[] = $fieldDef['name'];
-
-		if (empty($columns))
-			return "";
-
-		$columns = implode(",", $columns);
-
-		return "CREATE $unique INDEX $name ON $tablename ($columns)";
-	}
-
-	/**
-	 * Returns the type of the variable in the field
-	 *
-	 * @param  array $fieldDef Vardef-format field def
-	 * @return string
-	 */
-	public function getFieldType($fieldDef)
-	{
-		// get the type for db type. if that is not set,
-		// get it from type. This is done so that
-		// we do not have change a lot of existing code
-		// and add dbtype where type is being used for some special
-		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
-			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
-			return  $fieldDef['dbtype'];
-		if (!empty($fieldDef['type']))
-			return  $fieldDef['type'];
-		if (!empty($fieldDef['Type']))
-			return  $fieldDef['Type'];
-		if (!empty($fieldDef['data_type']))
-			return  $fieldDef['data_type'];
-
-		return null;
-	}
+    public function dropColumnSQL($tablename, $fieldDefs)
+    {
+        return $this->changeColumnSQL($tablename, $fieldDefs, 'drop');
+    }
 
     /**
-     * retrieves the different components from the passed column type as it is used in the type mapping and vardefs
-     * type format: <baseType>[(<len>[,<scale>])]
-     * @param string $type Column type
-     * @return array|bool array containing the different components of the passed in type or false in case the type contains illegal characters
+     * Return a version of $proposed that can be used as a column name in any of our supported databases
+     * Practically this means no longer than 25 characters as the smallest identifier length for our supported DBs is 30 chars for Oracle plus we add on at least four characters in some places (for indicies for example)
+     * @param string|array $name Proposed name for the column
+     * @param bool|string $ensureUnique Ensure the name is unique
+     * @param string $type Name type (table, column)
+     * @param bool $force Force new name
+     * @return string|array Valid column name trimmed to right length and with invalid characters removed
      */
-    public function getTypeParts($type)
+    public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
     {
-        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
-        {
-            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
-            $return['baseType'] = $matches['type'];
-            if( isset($matches['arg'])) {
-                $return['arg'] = $matches['arg'];
+        if(is_array($name)) {
+            $result = array();
+            foreach($name as $field) {
+                $result[] = $this->getValidDBName($field, $ensureUnique, $type);
             }
-            if( isset($matches['len'])) {
-                $return['len'] = $matches['len'];
+            return $result;
+        } else {
+            if(strchr($name, ".")) {
+                // this is a compound name with dots, handle separately
+                $parts = explode(".", $name);
+                if(count($parts) > 2) {
+                    // some weird name, cut to table.name
+                    array_splice($parts, 0, count($parts)-2);
+                }
+                $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
+                return join(".", $parts);
             }
-            if( isset($matches['scale'])) {
-                $return['scale'] = $matches['scale'];
+            // first strip any invalid characters - all but word chars (which is alphanumeric and _)
+            $name = preg_replace( '/[^\w]+/i', '', $name ) ;
+            $len = strlen( $name ) ;
+            $maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
+            if ($len <= $maxLen && !$force) {
+                return strtolower($name);
+            }
+            if ($ensureUnique) {
+                $md5str = md5($name);
+                $tail = substr ( $name, -11) ;
+                $temp = substr($md5str , strlen($md5str)-4 );
+                $result = substr( $name, 0, 10) . $temp . $tail ;
+            } else {
+                $result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
             }
-            return $return;
-        } else {
-            return false;
-        }
-    }
-
-	/**
-	 * Returns the defintion for a single column
-	 *
-	 * @param  array  $fieldDef Vardef-format field def
-	 * @param  bool   $ignoreRequired  Optional, true if we should ignore this being a required field
-	 * @param  string $table           Optional, table name
-	 * @param  bool   $return_as_array Optional, true if we should return the result as an array instead of sql
-	 * @return string or array if $return_as_array is true
-	 */
-	protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
-	{
-		$name = $fieldDef['name'];
-		$type = $this->getFieldType($fieldDef);
-        $colType = $this->getColumnType($type);
 
-        if($parts = $this->getTypeParts($colType))
-        {
-            $colBaseType = $parts['baseType'];
-            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+            return strtolower( $result ) ;
         }
+    }
 
-        if(!empty($fieldDef['len'])) {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
-                                          'clob', 'blob', 'text'))) {
-          	    $colType = "$colBaseType(${fieldDef['len']})";
-            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
-                          $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-                      }
-                  else
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-              }
-        } else {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
-                $colType = "$colBaseType($defLen)";
-            }
-        }
+    /**
+     * Returns the valid type for a column given the type in fieldDef
+     *
+     * @param  string $type field type
+     * @return string valid type for the given field
+     */
+    public function getColumnType($type)
+    {
+        return isset($this->type_map[$type])?$this->type_map[$type]:$type;
+    }
 
-        $default = '';
+    /**
+     * Checks to see if passed array is truely an array of defitions
+     *
+     * Such an array may have type as a key but it will point to an array
+     * for a true array of definitions an to a col type for a definition only
+     *
+     * @param  mixed $defArray
+     * @return bool
+     */
+    public function isFieldArray($defArray)
+    {
+        if ( !is_array($defArray) )
+            return false;
 
-        // Bug #52610 We should have ability don't add DEFAULT part to query for boolean fields
-        if (!empty($fieldDef['no_default']))
-        {
-            // nothing to do
-        }
-        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
-        {
-            $default = " DEFAULT ".$this->quoted($fieldDef['default']);
-        }
-        elseif (!isset($default) && $type == 'bool')
-        {
-            $default = " DEFAULT 0 ";
+        if ( isset($defArray['type']) ){
+            // type key exists. May be an array of defs or a simple definition
+            return is_array($defArray['type']); // type is not an array => definition else array
         }
 
-		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
-
-		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
-		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
-		if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
-			(!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
-			$required =  "NOT NULL";
-		}
-		// If the field is marked both required & isnull=>false - alwqys make it not null
-		// Use this to ensure primary key fields never defined as null
-		if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
-			&& !empty($fieldDef['required'])) {
-			$required =  "NOT NULL";
-		}
-		if ($ignoreRequired)
-			$required = "";
-
-		if ( $return_as_array ) {
-			return array(
-				'name' => $name,
-				'colType' => $colType,
-                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
-				'default' => $default,
-				'required' => $required,
-				'auto_increment' => $auto_increment,
-				'full' => "$name $colType $default $required $auto_increment",
-				);
-		} else {
-			return "$name $colType $default $required $auto_increment";
-		}
-	}
-
-	/**
-	 * Returns SQL defintions for all columns in a table
-	 *
-	 * @param  array  $fieldDefs  Vardef-format field def
-	 * @param  bool   $ignoreRequired Optional, true if we should ignor this being a required field
-	 * @param  string $tablename      Optional, table name
-	 * @return string SQL column definitions
-	 */
-	protected function columnSQLRep($fieldDefs, $ignoreRequired = false, $tablename)
-	{
-		$columns = array();
-
-		if ($this->isFieldArray($fieldDefs)) {
-			foreach ($fieldDefs as $fieldDef) {
-				if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
-					$columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
-				}
-			}
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
-		}
-
-		return $columns;
-	}
-
-	/**
-	 * Returns the next value for an auto increment
-	 * @abstract
-	 * @param  string $table Table name
-	 * @param  string $field_name Field name
-	 * @return string
-	 */
-	public function getAutoIncrement($table, $field_name)
-	{
-		return "";
-	}
-
-	/**
-	 * Returns the sql for the next value in a sequence
-	 * @abstract
-	 * @param  string $table  Table name
-	 * @param  string $field_name  Field name
-	 * @return string
-	 */
-	public function getAutoIncrementSQL($table, $field_name)
-	{
-		return "";
-	}
-
-	/**
-	 * Either creates an auto increment through queries or returns sql for auto increment
-	 * that can be appended to the end of column defination (mysql)
-	 * @abstract
-	 * @param  string $table Table name
-	 * @param  string $field_name Field name
-	 * @return string
-	 */
-	protected function setAutoIncrement($table, $field_name)
-	{
-		$this->deleteAutoIncrement($table, $field_name);
-		return "";
-	}
+        // type does not exist. Must be array of definitions
+        return true;
+    }
 
     /**
-     * Sets the next auto-increment value of a column to a specific value.
-     * @abstract
-     * @param  string $table Table name
-     * @param  string $field_name Field name
-     * @param  int $start_value  Starting autoincrement value
-     * @return string
+     * returns true if the type can be mapped to a valid column type
      *
+     * @param  string $type
+     * @return bool
      */
-	public function setAutoIncrementStart($table, $field_name, $start_value)
-	{
-		return "";
-	}
-
-	/**
-	 * Deletes an auto increment
-	 * @abstract
-	 * @param string $table tablename
-	 * @param string $field_name
-	 */
-	public function deleteAutoIncrement($table, $field_name)
-	{
-		return;
-	}
-
-	/**
-	 * This method generates sql for adding a column to table identified by field def.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function addColumnSQL($tablename, $fieldDefs)
-	{
-	    return $this->changeColumnSQL($tablename, $fieldDefs, 'add');
-	}
-
-	/**
-	 * This method genrates sql for altering old column identified by oldFieldDef to new fieldDef.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $newFieldDefs
-	 * @param  bool  $ignorerequired Optional, true if we should ignor this being a required field
-	 * @return string|array SQL statement(s)
-	 */
-	public function alterColumnSQL($tablename, $newFieldDefs, $ignorerequired = false)
-	{
-		return $this->changeColumnSQL($tablename, $newFieldDefs, 'modify', $ignorerequired);
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  SugarBean $bean Sugarbean instance
-	 * @return string SQL statement
-	 */
-	public function dropTableSQL(SugarBean $bean)
-	{
-		return $this->dropTableNameSQL($bean->getTableName());
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  string $name table name
-	 * @return string SQL statement
-	 */
-	public function dropTableNameSQL($name)
-	{
-		return "DROP TABLE ".$name;
-	}
-
-	/**
-	 * Generates SQL for truncating a table.
-	 * @param  string $name  table name
-	 * @return string
-	 */
-	public function truncateTableSQL($name)
-	{
-		return "TRUNCATE $name";
-	}
-
-	/**
-	 * This method generates sql that deletes a column identified by fieldDef.
-	 *
-	 * @param  SugarBean $bean      Sugarbean instance
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function deleteColumnSQL(SugarBean $bean, $fieldDefs)
-	{
-		return $this->dropColumnSQL($bean->getTableName(), $fieldDefs);
-	}
-
-	/**
-	 * This method generates sql that drops a column identified by fieldDef.
-	 * Designed to work like the other addColumnSQL() and alterColumnSQL() functions
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function dropColumnSQL($tablename, $fieldDefs)
-	{
-		return $this->changeColumnSQL($tablename, $fieldDefs, 'drop');
-	}
+    protected function validColumnType($type)
+    {
+        $type = $this->getColumnType($type);
+        return !empty($type);
+    }
 
     /**
-     * Return a version of $proposed that can be used as a column name in any of our supported databases
-     * Practically this means no longer than 25 characters as the smallest identifier length for our supported DBs is 30 chars for Oracle plus we add on at least four characters in some places (for indicies for example)
-     * @param string|array $name Proposed name for the column
-     * @param bool|string $ensureUnique Ensure the name is unique
-     * @param string $type Name type (table, column)
-     * @param bool $force Force new name
-     * @return string|array Valid column name trimmed to right length and with invalid characters removed
-     */
-	public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
-	{
-		if(is_array($name)) {
-			$result = array();
-			foreach($name as $field) {
-				$result[] = $this->getValidDBName($field, $ensureUnique, $type);
-			}
-			return $result;
-		} else {
-		    if(strchr($name, ".")) {
-		        // this is a compound name with dots, handle separately
-		        $parts = explode(".", $name);
-		        if(count($parts) > 2) {
-		            // some weird name, cut to table.name
-		            array_splice($parts, 0, count($parts)-2);
-		        }
-		        $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
-                return join(".", $parts);
-		    }
-			// first strip any invalid characters - all but word chars (which is alphanumeric and _)
-			$name = preg_replace( '/[^\w]+/i', '', $name ) ;
-			$len = strlen( $name ) ;
-			$maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
-			if ($len <= $maxLen && !$force) {
-				return strtolower($name);
-			}
-			if ($ensureUnique) {
-				$md5str = md5($name);
-				$tail = substr ( $name, -11) ;
-				$temp = substr($md5str , strlen($md5str)-4 );
-				$result = substr( $name, 0, 10) . $temp . $tail ;
-			} else {
-				$result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
-			}
-
-			return strtolower( $result ) ;
-		}
-	}
-
-	/**
-	 * Returns the valid type for a column given the type in fieldDef
-	 *
-	 * @param  string $type field type
-	 * @return string valid type for the given field
-	 */
-	public function getColumnType($type)
-	{
-		return isset($this->type_map[$type])?$this->type_map[$type]:$type;
-	}
-
-	/**
-	 * Checks to see if passed array is truely an array of defitions
-	 *
-	 * Such an array may have type as a key but it will point to an array
-	 * for a true array of definitions an to a col type for a definition only
-	 *
-	 * @param  mixed $defArray
-	 * @return bool
-	 */
-	public function isFieldArray($defArray)
-	{
-		if ( !is_array($defArray) )
-			return false;
-
-		if ( isset($defArray['type']) ){
-			// type key exists. May be an array of defs or a simple definition
-			return is_array($defArray['type']); // type is not an array => definition else array
-		}
-
-		// type does not exist. Must be array of definitions
-		return true;
-	}
-
-	/**
-	 * returns true if the type can be mapped to a valid column type
-	 *
-	 * @param  string $type
-	 * @return bool
-	 */
-	protected function validColumnType($type)
-	{
-		$type = $this->getColumnType($type);
-		return !empty($type);
-	}
-
-	/**
-	 * Generate query for audit table
-	 * @param SugarBean $bean SugarBean that was changed
-	 * @param array $changes List of changes, contains 'before' and 'after'
+     * Generate query for audit table
+     * @param SugarBean $bean SugarBean that was changed
+     * @param array $changes List of changes, contains 'before' and 'after'
      * @return string  Audit table INSERT query
      */
-	protected function auditSQL(SugarBean $bean, $changes)
-	{
-		global $current_user;
-		$sql = "INSERT INTO ".$bean->get_audit_table_name();
-		//get field defs for the audit table.
-		require('metadata/audit_templateMetaData.php');
-		$fieldDefs = $dictionary['audit']['fields'];
-
-		$values=array();
-		$values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
-		$values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
-		$values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
-		$values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
-		if ($changes['data_type']=='text') {
-			$values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
-			$values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
-		} else {
-			$values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
-			$values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
-		}
-		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
-		$values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
-
-		$sql .= "(".implode(",", array_keys($values)).") ";
-		$sql .= "VALUES(".implode(",", $values).")";
-		return $sql;
-	}
+    protected function auditSQL(SugarBean $bean, $changes)
+    {
+        global $current_user;
+        $sql = "INSERT INTO ".$bean->get_audit_table_name();
+        //get field defs for the audit table.
+        require('metadata/audit_templateMetaData.php');
+        $fieldDefs = $dictionary['audit']['fields'];
+
+        $values=array();
+        $values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
+        $values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
+        $values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
+        $values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
+        if ($changes['data_type']=='text') {
+            $values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
+            $values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
+        } else {
+            $values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
+            $values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
+        }
+        $values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
+        $values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
+
+        $sql .= "(".implode(",", array_keys($values)).") ";
+        $sql .= "VALUES(".implode(",", $values).")";
+        return $sql;
+    }
 
     /**
      * Saves changes to module's audit table
@@ -2826,10 +2826,10 @@ 
      * @return bool query result
      *
      */
-	public function save_audit_records(SugarBean $bean, $changes)
-	{
-		return $this->query($this->auditSQL($bean, $changes));
-	}
+    public function save_audit_records(SugarBean $bean, $changes)
+    {
+        return $this->query($this->auditSQL($bean, $changes));
+    }
 
     /**
      * Finds fields whose value has changed.
@@ -2841,7 +2841,7 @@ 
      * @return array
      */
     public function getDataChanges(SugarBean &$bean, array $field_filter = null)
-	{
+    {
         $changed_values=array();
 
         $fetched_row = array();
@@ -2918,10 +2918,10 @@ 
                         }
                     }
                 }
-			}
-		}
-		return $changed_values;
-	}
+            }
+        }
+        return $changed_values;
+    }
 
     /**
      * Uses the audit enabled fields array to find fields whose value has changed.
@@ -2937,40 +2937,40 @@ 
         return $this->getDataChanges($bean, array_keys($audit_fields));
     }
 
-	/**
-	 * Setup FT indexing
-	 * @abstract
-	 */
-	public function full_text_indexing_setup()
-	{
-		// Most DBs have nothing to setup, so provide default empty function
-	}
-
-	/**
-	 * Quotes a string for storing in the database
-	 * @deprecated
-	 * Return value will be not surrounded by quotes
-	 *
-	 * @param  string $string
-	 * @return string
-	 */
-	public function escape_quote($string)
-	{
-		return $this->quote($string);
-	}
-
-	/**
-	 * Quotes a string for storing in the database
-	 * @deprecated
-	 * Return value will be not surrounded by quotes
-	 *
-	 * @param  string $string
-	 * @return string
-	 */
-	public function quoteFormEmail($string)
-	{
-		return $this->quote($string);
-	}
+    /**
+     * Setup FT indexing
+     * @abstract
+     */
+    public function full_text_indexing_setup()
+    {
+        // Most DBs have nothing to setup, so provide default empty function
+    }
+
+    /**
+     * Quotes a string for storing in the database
+     * @deprecated
+     * Return value will be not surrounded by quotes
+     *
+     * @param  string $string
+     * @return string
+     */
+    public function escape_quote($string)
+    {
+        return $this->quote($string);
+    }
+
+    /**
+     * Quotes a string for storing in the database
+     * @deprecated
+     * Return value will be not surrounded by quotes
+     *
+     * @param  string $string
+     * @return string
+     */
+    public function quoteFormEmail($string)
+    {
+        return $this->quote($string);
+    }
 
     /**
      * Renames an index using fields definition
@@ -2980,49 +2980,49 @@ 
      * @param  string $table_name
      * @return string SQL statement
      */
-	public function renameIndexDefs($old_definition, $new_definition, $table_name)
-	{
-		return array($this->add_drop_constraint($table_name,$old_definition,true),
-				$this->add_drop_constraint($table_name,$new_definition), false);
-	}
+    public function renameIndexDefs($old_definition, $new_definition, $table_name)
+    {
+        return array($this->add_drop_constraint($table_name,$old_definition,true),
+                $this->add_drop_constraint($table_name,$new_definition), false);
+    }
 
-	/**
-	 * Check if type is boolean
-	 * @param string $type
+    /**
+     * Check if type is boolean
+     * @param string $type
      * @return bool
      */
-	public function isBooleanType($type)
-	{
-		return 'bool' == $type;
-	}
+    public function isBooleanType($type)
+    {
+        return 'bool' == $type;
+    }
 
-	/**
-	 * Get truth value for boolean type
-	 * Allows 'off' to mean false, along with all 'empty' values
-	 * @param mixed $val
+    /**
+     * Get truth value for boolean type
+     * Allows 'off' to mean false, along with all 'empty' values
+     * @param mixed $val
      * @return bool
-	 */
-	protected function _getBooleanValue($val)
-	{
-		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
-			return false;
-
-		return true;
-	}
-
-	/**
-	 * Check if type is a number
-	 * @param string $type
+     */
+    protected function _getBooleanValue($val)
+    {
+        //need to put the === sign here otherwise true == 'non empty string'
+        if (empty($val) or $val==='off')
+            return false;
+
+        return true;
+    }
+
+    /**
+     * Check if type is a number
+     * @param string $type
      * @return bool
-	 */
-	public function isNumericType($type)
-	{
-	    if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
-	        return true;
-	    }
-		return false;
-	}
+     */
+    public function isNumericType($type)
+    {
+        if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+            return true;
+        }
+        return false;
+    }
 
     /**
      * Check if the value is empty value for this type
@@ -3030,272 +3030,272 @@ 
      * @param string $type Type (one of vardef types)
      * @return bool true if the value if empty
      */
-	protected function _emptyValue($val, $type)
-	{
-		if (empty($val))
-			return true;
-
-		if($this->emptyValue($type) == $val) {
-			return true;
-		}
-		switch ($type) {
-			case 'decimal':
-			case 'decimal2':
-			case 'int':
-			case 'double':
-			case 'float':
-			case 'uint':
-			case 'ulong':
-			case 'long':
-			case 'short':
-				return ($val == 0);
-			case 'date':
-				if ($val == '0000-00-00')
-					return true;
-				if ($val == 'NULL')
-					return true;
-				return false;
-		}
-
-		return false;
-	}
-
-	/**
+    protected function _emptyValue($val, $type)
+    {
+        if (empty($val))
+            return true;
+
+        if($this->emptyValue($type) == $val) {
+            return true;
+        }
+        switch ($type) {
+            case 'decimal':
+            case 'decimal2':
+            case 'int':
+            case 'double':
+            case 'float':
+            case 'uint':
+            case 'ulong':
+            case 'long':
+            case 'short':
+                return ($val == 0);
+            case 'date':
+                if ($val == '0000-00-00')
+                    return true;
+                if ($val == 'NULL')
+                    return true;
+                return false;
+        }
+
+        return false;
+    }
+
+    /**
      * @abstract
-	 * Does this type represent text (i.e., non-varchar) value?
-	 * @param string $type
+     * Does this type represent text (i.e., non-varchar) value?
+     * @param string $type
      * @return bool
-	 */
-	public function isTextType($type)
-	{
-		return false;
-	}
-
-	/**
-	 * Check if this DB supports certain capability
-	 * See $this->capabilities for the list
-	 * @param string $cap
+     */
+    public function isTextType($type)
+    {
+        return false;
+    }
+
+    /**
+     * Check if this DB supports certain capability
+     * See $this->capabilities for the list
+     * @param string $cap
      * @return bool
-	 */
-	public function supports($cap)
-	{
-		return !empty($this->capabilities[$cap]);
-	}
-
-	/**
-	 * Create ORDER BY clause for ENUM type field
-	 * @param string $order_by Field name
-	 * @param array $values Possible enum value
-	 * @param string $order_dir Order direction, ASC or DESC
+     */
+    public function supports($cap)
+    {
+        return !empty($this->capabilities[$cap]);
+    }
+
+    /**
+     * Create ORDER BY clause for ENUM type field
+     * @param string $order_by Field name
+     * @param array $values Possible enum value
+     * @param string $order_dir Order direction, ASC or DESC
      * @return string
      */
-	public function orderByEnum($order_by, $values, $order_dir)
-	{
-		$i = 0;
-		$order_by_arr = array();
-		foreach ($values as $key => $value) {
-			if($key == '') {
-				$order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
-			} else {
-				$order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
-			}
-			$i++;
-		}
-		return "CASE ".implode("\n", $order_by_arr)." ELSE $i END $order_dir\n";
-	}
-
-	/**
-	 * Return representation of an empty value depending on type
-	 * The value is fully quoted, converted, etc.
-	 * @param string $type
+    public function orderByEnum($order_by, $values, $order_dir)
+    {
+        $i = 0;
+        $order_by_arr = array();
+        foreach ($values as $key => $value) {
+            if($key == '') {
+                $order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
+            } else {
+                $order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
+            }
+            $i++;
+        }
+        return "CASE ".implode("\n", $order_by_arr)." ELSE $i END $order_dir\n";
+    }
+
+    /**
+     * Return representation of an empty value depending on type
+     * The value is fully quoted, converted, etc.
+     * @param string $type
      * @return mixed Empty value
      */
-	public function emptyValue($type)
-	{
-		if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
-			return 0;
-		}
+    public function emptyValue($type)
+    {
+        if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+            return 0;
+        }
 
-		return "''";
-	}
+        return "''";
+    }
 
-	/**
-	 * List of available collation settings
+    /**
+     * List of available collation settings
      * @abstract
-	 * @return string
-	 */
-	public function getDefaultCollation()
-	{
-		return null;
-	}
-
-	/**
-	 * List of available collation settings
+     * @return string
+     */
+    public function getDefaultCollation()
+    {
+        return null;
+    }
+
+    /**
+     * List of available collation settings
      * @abstract
-	 * @return array
-	 */
-	public function getCollationList()
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the number of columns in a table
-	 *
-	 * @param  string $table_name
-	 * @return int
-	 */
-	public function number_of_columns($table_name)
-	{
-		$table = $this->getTableDescription($table_name);
-		return count($table);
-	}
-
-	/**
-	 * Return limit query based on given query
-	 * @param string $sql
-	 * @param int $start
-	 * @param int $count
-	 * @param bool $dieOnError
-	 * @param string $msg
+     * @return array
+     */
+    public function getCollationList()
+    {
+        return null;
+    }
+
+    /**
+     * Returns the number of columns in a table
+     *
+     * @param  string $table_name
+     * @return int
+     */
+    public function number_of_columns($table_name)
+    {
+        $table = $this->getTableDescription($table_name);
+        return count($table);
+    }
+
+    /**
+     * Return limit query based on given query
+     * @param string $sql
+     * @param int $start
+     * @param int $count
+     * @param bool $dieOnError
+     * @param string $msg
      * @return resource|bool query result
      * @see DBManager::limitQuery()
-	 */
-	public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
-	{
-		return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
-	}
-
-	/**
-	 * Return current time in format fit for insertion into DB (with quotes)
-	 * @return string
-	 */
-	public function now()
-	{
-		return $this->convert($this->quoted(TimeDate::getInstance()->nowDb()), "datetime");
-	}
-
-	/**
-	 * Check if connecting user has certain privilege
-	 * @param string $privilege
+     */
+    public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
+    {
+        return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
+    }
+
+    /**
+     * Return current time in format fit for insertion into DB (with quotes)
+     * @return string
+     */
+    public function now()
+    {
+        return $this->convert($this->quoted(TimeDate::getInstance()->nowDb()), "datetime");
+    }
+
+    /**
+     * Check if connecting user has certain privilege
+     * @param string $privilege
      * @return bool Privilege allowed?
      */
-	public function checkPrivilege($privilege)
-	{
-		switch($privilege) {
-			case "CREATE TABLE":
-				$this->query("CREATE TABLE temp (id varchar(36))");
-				break;
-			case "DROP TABLE":
-				$sql = $this->dropTableNameSQL("temp");
-				$this->query($sql);
-				break;
-			case "INSERT":
-				$this->query("INSERT INTO temp (id) VALUES ('abcdef0123456789abcdef0123456789abcd')");
-				break;
-			case "UPDATE":
-				$this->query("UPDATE temp SET id = '100000000000000000000000000000000000' WHERE id = 'abcdef0123456789abcdef0123456789abcd'");
-				break;
-			case 'SELECT':
-				return $this->getOne('SELECT id FROM temp WHERE id=\'100000000000000000000000000000000000\'', false);
-			case 'DELETE':
-				$this->query("DELETE FROM temp WHERE id = '100000000000000000000000000000000000'");
-				break;
-			case "ADD COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
-				$sql = 	$this->changeColumnSQL("temp", $test, "add");
-				$this->query($sql);
-				break;
-			case "CHANGE COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "modify");
-				$this->query($sql);
-				break;
-			case "DROP COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "drop");
-				$this->query($sql);
-				break;
-			default:
-				return false;
-		}
-		if($this->checkError("Checking privileges")) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if the query is a select query
-	 * @param string $query
+    public function checkPrivilege($privilege)
+    {
+        switch($privilege) {
+            case "CREATE TABLE":
+                $this->query("CREATE TABLE temp (id varchar(36))");
+                break;
+            case "DROP TABLE":
+                $sql = $this->dropTableNameSQL("temp");
+                $this->query($sql);
+                break;
+            case "INSERT":
+                $this->query("INSERT INTO temp (id) VALUES ('abcdef0123456789abcdef0123456789abcd')");
+                break;
+            case "UPDATE":
+                $this->query("UPDATE temp SET id = '100000000000000000000000000000000000' WHERE id = 'abcdef0123456789abcdef0123456789abcd'");
+                break;
+            case 'SELECT':
+                return $this->getOne('SELECT id FROM temp WHERE id=\'100000000000000000000000000000000000\'', false);
+            case 'DELETE':
+                $this->query("DELETE FROM temp WHERE id = '100000000000000000000000000000000000'");
+                break;
+            case "ADD COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
+                $sql = 	$this->changeColumnSQL("temp", $test, "add");
+                $this->query($sql);
+                break;
+            case "CHANGE COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
+                $sql = 	$this->changeColumnSQL("temp", $test, "modify");
+                $this->query($sql);
+                break;
+            case "DROP COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
+                $sql = 	$this->changeColumnSQL("temp", $test, "drop");
+                $this->query($sql);
+                break;
+            default:
+                return false;
+        }
+        if($this->checkError("Checking privileges")) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Check if the query is a select query
+     * @param string $query
      * @return bool  Is query SELECT?
      */
-	protected function isSelect($query)
-	{
-		$query = trim($query);
-		$select_check = strpos(strtolower($query), strtolower("SELECT"));
-		//Checks to see if there is union select which is valid
-		$select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
-		if($select_check==0 || $select_check2==0){
-			//Returning false means query is ok!
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Parse fulltext search query with mysql syntax:
-	 *  terms quoted by ""
-	 *  + means the term must be included
-	 *  - means the term must be excluded
-	 *  * or % at the end means wildcard
-	 * @param string $query
-	 * @return array of 3 elements - query terms, mandatory terms and excluded terms
-	 */
-	public function parseFulltextQuery($query)
-	{
-		/* split on space or comma, double quotes with \ for escape */
-		if(strpbrk($query, " ,")) {
-			// ("([^"]*?)"|[^" ,]+)((, )+)?
-			// '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
-			if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
-				return false;
-			}
-			$qterms = $m[1];
-		} else {
-			$qterms = array($query);
-		}
-		$terms = $must_terms = $not_terms = array();
-		foreach($qterms as $item) {
-			if($item[0] == '"') {
-				$item = trim($item, '"');
-			}
-			if($item[0] == '+') {
+    protected function isSelect($query)
+    {
+        $query = trim($query);
+        $select_check = strpos(strtolower($query), strtolower("SELECT"));
+        //Checks to see if there is union select which is valid
+        $select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
+        if($select_check==0 || $select_check2==0){
+            //Returning false means query is ok!
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Parse fulltext search query with mysql syntax:
+     *  terms quoted by ""
+     *  + means the term must be included
+     *  - means the term must be excluded
+     *  * or % at the end means wildcard
+     * @param string $query
+     * @return array of 3 elements - query terms, mandatory terms and excluded terms
+     */
+    public function parseFulltextQuery($query)
+    {
+        /* split on space or comma, double quotes with \ for escape */
+        if(strpbrk($query, " ,")) {
+            // ("([^"]*?)"|[^" ,]+)((, )+)?
+            // '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
+            if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
+                return false;
+            }
+            $qterms = $m[1];
+        } else {
+            $qterms = array($query);
+        }
+        $terms = $must_terms = $not_terms = array();
+        foreach($qterms as $item) {
+            if($item[0] == '"') {
+                $item = trim($item, '"');
+            }
+            if($item[0] == '+') {
                 if (strlen($item) > 1) {
                     $must_terms[] = substr($item, 1);
                 }
                 continue;
-			}
-			if($item[0] == '-') {
+            }
+            if($item[0] == '-') {
                 if (strlen($item) > 1) {
-				    $not_terms[] = substr($item, 1);
+                    $not_terms[] = substr($item, 1);
                 }
                 continue;
-			}
-			$terms[] = $item;
-		}
-		return array($terms, $must_terms, $not_terms);
-	}
+            }
+            $terms[] = $item;
+        }
+        return array($terms, $must_terms, $not_terms);
+    }
 
     // Methods to check respective queries
-	protected $standardQueries = array(
-		'ALTER TABLE' => 'verifyAlterTable',
-		'DROP TABLE' => 'verifyDropTable',
-		'CREATE TABLE' => 'verifyCreateTable',
-		'INSERT INTO' => 'verifyInsertInto',
-		'UPDATE' => 'verifyUpdate',
-		'DELETE FROM' => 'verifyDeleteFrom',
-	);
+    protected $standardQueries = array(
+        'ALTER TABLE' => 'verifyAlterTable',
+        'DROP TABLE' => 'verifyDropTable',
+        'CREATE TABLE' => 'verifyCreateTable',
+        'INSERT INTO' => 'verifyInsertInto',
+        'UPDATE' => 'verifyUpdate',
+        'DELETE FROM' => 'verifyDeleteFrom',
+    );
 
 
     /**
@@ -3303,8 +3303,8 @@ 
      * @param string $query SQL query
      * @return string
      */
-	protected function extractTableName($query)
-	{
+    protected function extractTableName($query)
+    {
         $query = preg_replace('/[^A-Za-z0-9_\s]/', "", $query);
         $query = trim(str_replace(array_keys($this->standardQueries), '', $query));
 
@@ -3313,7 +3313,7 @@ 
         $table = substr($query, 0, $end);
 
         return $table;
-	}
+    }
 
     /**
      * Verify SQl statement using per-DB verification function
@@ -3322,284 +3322,284 @@ 
      * @param array $skipTables List of blacklisted tables that aren't checked
      * @return string
      */
-	public function verifySQLStatement($query, $skipTables)
-	{
-		$query = trim($query);
-		foreach($this->standardQueries as $qstart => $check) {
-			if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
-				if(is_callable(array($this, $check))) {
-					$table = $this->extractTableName($query);
-					if(!in_array($table, $skipTables)) {
-						return call_user_func(array($this, $check), $table, $query);
-					} else {
-						$this->log->debug("Skipping table $table as blacklisted");
-					}
-				} else {
-					$this->log->debug("No verification for $qstart on {$this->dbType}");
-				}
-				break;
-			}
-		}
-		return "";
-	}
-
-	/**
-	 * Tests an CREATE TABLE query
-	 * @param string $table The table name to get DDL
-	 * @param string $query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	protected function verifyCreateTable($table, $query)
-	{
-		$this->log->debug('verifying CREATE statement...');
-
-		// rewrite DDL with _temp name
-		$this->log->debug('testing query: ['.$query.']');
-		$tempname = $table."__uw_temp";
-		$tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
-
-		if(strpos($tempTableQuery, '__uw_temp') === false) {
-			return 'Could not use a temp table to test query!';
-		}
-
-		$this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
-
-		$error = $this->lastError(); // empty on no-errors
-		if(!empty($error)) {
-			return $error;
-		}
-
-		// check if table exists
-		$this->log->debug('testing for table: '.$table);
-		if(!$this->tableExists($tempname)) {
-			return "Failed to create temp table!";
-		}
-
-		$this->dropTableName($tempname);
-		return '';
-	}
-
-	/**
-	 * Execute multiple queries one after another
-	 * @param array $sqls Queries
-	 * @param bool $dieOnError Die on error, passed to query()
-	 * @param string $msg Error message, passed to query()
-	 * @param bool $suppress Supress errors, passed to query()
-	 * @return resource|bool result set or success/failure bool
-	 */
-	public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		$last = true;
-		foreach($sqls as $sql) {
-			if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
-				break;
-			}
-		}
-		return $last;
-	}
-
-	/**
-	 * Fetches the next row in the query result into an associative array
-	 *
-	 * @param  resource $result
-	 * @param  bool $encode Need to HTML-encode the result?
-	 * @return array    returns false if there are no more rows available to fetch
-	 */
-	public function fetchByAssoc($result, $encode = true)
-	{
-	    if (empty($result))	return false;
-
-	    if(is_int($encode) && func_num_args() == 3) {
-	        // old API: $result, $rowNum, $encode
-	        $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
-	        $encode = func_get_arg(2);
-	    }
-	    $row = $this->fetchRow($result);
-	    if (!empty($row) && $encode && $this->encode) {
-	    	return array_map('to_html', $row);
-	    } else {
-	       return $row;
-	    }
-	}
-
-	/**
-	 * Get DB driver name used for install/upgrade scripts
-	 * @return string
-	 */
-	public function getScriptName()
-	{
-		// Usually the same name as dbType
-		return $this->dbType;
-	}
-
-	/**
-	 * Set database options
-	 * Options are usually db-dependant and derive from $config['dbconfigoption']
-	 * @param array $options
-	 * @return DBManager
-	 */
-	public function setOptions($options)
-	{
-	    $this->options = $options;
-	    return $this;
-	}
-
-	/**
-	 * Get DB options
-	 * @return array
-	 */
-	public function getOptions()
-	{
-	    return $this->options;
-	}
-
-	/**
-	 * Get DB option by name
-	 * @param string $option Option name
-	 * @return mixed Option value or null if doesn't exist
-	 */
-	public function getOption($option)
-	{
-	    if(isset($this->options[$option])) {
-	        return $this->options[$option];
-	    }
-	    return null;
-	}
-
-	/**
-	 * Commits pending changes to the database when the driver is setup to support transactions.
-	 * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
-	 * @abstract
-	 * @return bool true if commit succeeded, false if it failed
-	 */
-	public function commit()
-	{
-		$this->log->info("DBManager.commit() stub");
-		return true;
-	}
-
-	/**
-	 * Rollsback pending changes to the database when the driver is setup to support transactions.
-	 * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
-	 * Since rollbacks cannot be done, this implementation always returns false.
-	 * @abstract
-	 * @return bool true if rollback succeeded, false if it failed
-	 */
-	public function rollback()
-	{
-		$this->log->info("DBManager.rollback() stub");
-		return false;
-	}
-
-	/**
-	 * Check if this DB name is valid
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function isDatabaseNameValid($name)
-	{
-		// Generic case - no slashes, no dots
-		return preg_match('#[/.\\\\]#', $name)==0;
-	}
-
-	/**
-	 * Check special requirements for DB installation.
-	 * @abstract
-	 * If everything is OK, return true.
-	 * If something's wrong, return array of error code and parameters
-	 * @return mixed
-	 */
-	public function canInstall()
-	{
-		return true;
-	}
-
-	/**
-	 * @abstract
+    public function verifySQLStatement($query, $skipTables)
+    {
+        $query = trim($query);
+        foreach($this->standardQueries as $qstart => $check) {
+            if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
+                if(is_callable(array($this, $check))) {
+                    $table = $this->extractTableName($query);
+                    if(!in_array($table, $skipTables)) {
+                        return call_user_func(array($this, $check), $table, $query);
+                    } else {
+                        $this->log->debug("Skipping table $table as blacklisted");
+                    }
+                } else {
+                    $this->log->debug("No verification for $qstart on {$this->dbType}");
+                }
+                break;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Tests an CREATE TABLE query
+     * @param string $table The table name to get DDL
+     * @param string $query The query to test.
+     * @return string Non-empty if error found
+     */
+    protected function verifyCreateTable($table, $query)
+    {
+        $this->log->debug('verifying CREATE statement...');
+
+        // rewrite DDL with _temp name
+        $this->log->debug('testing query: ['.$query.']');
+        $tempname = $table."__uw_temp";
+        $tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
+
+        if(strpos($tempTableQuery, '__uw_temp') === false) {
+            return 'Could not use a temp table to test query!';
+        }
+
+        $this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
+
+        $error = $this->lastError(); // empty on no-errors
+        if(!empty($error)) {
+            return $error;
+        }
+
+        // check if table exists
+        $this->log->debug('testing for table: '.$table);
+        if(!$this->tableExists($tempname)) {
+            return "Failed to create temp table!";
+        }
+
+        $this->dropTableName($tempname);
+        return '';
+    }
+
+    /**
+     * Execute multiple queries one after another
+     * @param array $sqls Queries
+     * @param bool $dieOnError Die on error, passed to query()
+     * @param string $msg Error message, passed to query()
+     * @param bool $suppress Supress errors, passed to query()
+     * @return resource|bool result set or success/failure bool
+     */
+    public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        $last = true;
+        foreach($sqls as $sql) {
+            if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
+                break;
+            }
+        }
+        return $last;
+    }
+
+    /**
+     * Fetches the next row in the query result into an associative array
+     *
+     * @param  resource $result
+     * @param  bool $encode Need to HTML-encode the result?
+     * @return array    returns false if there are no more rows available to fetch
+     */
+    public function fetchByAssoc($result, $encode = true)
+    {
+        if (empty($result))	return false;
+
+        if(is_int($encode) && func_num_args() == 3) {
+            // old API: $result, $rowNum, $encode
+            $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
+            $encode = func_get_arg(2);
+        }
+        $row = $this->fetchRow($result);
+        if (!empty($row) && $encode && $this->encode) {
+            return array_map('to_html', $row);
+        } else {
+            return $row;
+        }
+    }
+
+    /**
+     * Get DB driver name used for install/upgrade scripts
+     * @return string
+     */
+    public function getScriptName()
+    {
+        // Usually the same name as dbType
+        return $this->dbType;
+    }
+
+    /**
+     * Set database options
+     * Options are usually db-dependant and derive from $config['dbconfigoption']
+     * @param array $options
+     * @return DBManager
+     */
+    public function setOptions($options)
+    {
+        $this->options = $options;
+        return $this;
+    }
+
+    /**
+     * Get DB options
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Get DB option by name
+     * @param string $option Option name
+     * @return mixed Option value or null if doesn't exist
+     */
+    public function getOption($option)
+    {
+        if(isset($this->options[$option])) {
+            return $this->options[$option];
+        }
+        return null;
+    }
+
+    /**
+     * Commits pending changes to the database when the driver is setup to support transactions.
+     * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
+     * @abstract
+     * @return bool true if commit succeeded, false if it failed
+     */
+    public function commit()
+    {
+        $this->log->info("DBManager.commit() stub");
+        return true;
+    }
+
+    /**
+     * Rollsback pending changes to the database when the driver is setup to support transactions.
+     * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
+     * Since rollbacks cannot be done, this implementation always returns false.
+     * @abstract
+     * @return bool true if rollback succeeded, false if it failed
+     */
+    public function rollback()
+    {
+        $this->log->info("DBManager.rollback() stub");
+        return false;
+    }
+
+    /**
+     * Check if this DB name is valid
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function isDatabaseNameValid($name)
+    {
+        // Generic case - no slashes, no dots
+        return preg_match('#[/.\\\\]#', $name)==0;
+    }
+
+    /**
+     * Check special requirements for DB installation.
+     * @abstract
+     * If everything is OK, return true.
+     * If something's wrong, return array of error code and parameters
+     * @return mixed
+     */
+    public function canInstall()
+    {
+        return true;
+    }
+
+    /**
+     * @abstract
      * Code run on new database before installing
-	 */
-	public function preInstall()
-	{
-	}
+     */
+    public function preInstall()
+    {
+    }
+
+    /**
+     * @abstract
+     * Code run on new database after installing
+     */
+    public function postInstall()
+    {
+    }
+
+    /**
+     * Disable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function disableKeys($tableName)
+    {
+    }
 
-	/**
+    /**
+     * Re-enable keys on the table
      * @abstract
-	 * Code run on new database after installing
-	 */
-	public function postInstall()
-	{
-	}
-
-	/**
-	 * Disable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function disableKeys($tableName)
-	{
-	}
-
-	/**
-	 * Re-enable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function enableKeys($tableName)
-	{
-	}
-
-	/**
-	 * Quote string in DB-specific manner
-	 * @param string $string
-	 * @return string
-	 */
-	abstract public function quote($string);
+     * @param string $tableName
+     */
+    public function enableKeys($tableName)
+    {
+    }
+
+    /**
+     * Quote string in DB-specific manner
+     * @param string $string
+     * @return string
+     */
+    abstract public function quote($string);
 
     abstract public function quoteIdentifier($string);
 
-	/**
-	 * Use when you need to convert a database string to a different value; this function does it in a
-	 * database-backend aware way
-	 * Supported conversions:
-	 *      today		return current date
-	 *      left		Take substring from the left
-	 *      date_format	Format date as string, supports %Y-%m-%d, %Y-%m, %Y
+    /**
+     * Use when you need to convert a database string to a different value; this function does it in a
+     * database-backend aware way
+     * Supported conversions:
+     *      today		return current date
+     *      left		Take substring from the left
+     *      date_format	Format date as string, supports %Y-%m-%d, %Y-%m, %Y
      *      time_format Format time as string
      *      date        Convert date string to datetime value
      *      time        Convert time string to datetime value
-	 *      datetime	Convert datetime string to datetime value
-	 *      ifnull		If var is null, use default value
-	 *      concat		Concatenate strings
-	 *      quarter		Quarter number of the date
-	 *      length		Length of string
-	 *      month		Month number of the date
-	 *      add_date	Add specified interval to a date
+     *      datetime	Convert datetime string to datetime value
+     *      ifnull		If var is null, use default value
+     *      concat		Concatenate strings
+     *      quarter		Quarter number of the date
+     *      length		Length of string
+     *      month		Month number of the date
+     *      add_date	Add specified interval to a date
      *      add_time    Add time interval to a date
      *      text2char   Convert text field to varchar
-	 *
-	 * @param string $string database string to convert
-	 * @param string $type type of conversion to do
-	 * @param array  $additional_parameters optional, additional parameters to pass to the db function
-	 * @return string
-	 */
-	abstract public function convert($string, $type, array $additional_parameters = array());
-
-	/**
-	 * Converts from Database data to app data
-	 *
-	 * Supported types
-	 * - date
-	 * - time
-	 * - datetime
+     *
+     * @param string $string database string to convert
+     * @param string $type type of conversion to do
+     * @param array  $additional_parameters optional, additional parameters to pass to the db function
+     * @return string
+     */
+    abstract public function convert($string, $type, array $additional_parameters = array());
+
+    /**
+     * Converts from Database data to app data
+     *
+     * Supported types
+     * - date
+     * - time
+     * - datetime
      * - datetimecombo
      * - timestamp
-	 *
-	 * @param string $string database string to convert
-	 * @param string $type type of conversion to do
-	 * @return string
-	 */
-	abstract public function fromConvert($string, $type);
+     *
+     * @param string $string database string to convert
+     * @param string $type type of conversion to do
+     * @return string
+     */
+    abstract public function fromConvert($string, $type);
 
     /**
      * Parses and runs queries
@@ -3611,7 +3611,7 @@ 
      * @param  bool     $keepResult Keep query result in the object?
      * @return resource|bool result set or success/failure bool
      */
-	abstract public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false);
+    abstract public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false);
 
     /**
      * Runs a limit query: one where we specify where to start getting records and how many to get
@@ -3624,173 +3624,173 @@ 
      * @param  bool     $execute Execute or return SQL?
      * @return resource query result
      */
-	abstract function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true);
-
-
-	/**
-	 * Free Database result
-	 * @param resource $dbResult
-	 */
-	abstract protected function freeDbResult($dbResult);
-
-	/**
-	 * Rename column in the DB
-	 * @param string $tablename
-	 * @param string $column
-	 * @param string $newname
-	 */
-	abstract function renameColumnSQL($tablename, $column, $newname);
-
-	/**
-	 * Returns definitions of all indies for passed table.
-	 *
-	 * return will is a multi-dimensional array that
-	 * categorizes the index definition by types, unique, primary and index.
-	 * <code>
-	 * <?php
-	 * array(                                                              O
-	 *       'index1'=> array (
-	 *           'name'   => 'index1',
-	 *           'type'   => 'primary',
-	 *           'fields' => array('field1','field2')
-	 *           )
-	 *       )
-	 * ?>
-	 * </code>
-	 * This format is similar to how indicies are defined in vardef file.
-	 *
-	 * @param  string $tablename
-	 * @return array
-	 */
-	abstract public function get_indices($tablename);
-
-	/**
-	 * Returns definitions of all indies for passed table.
-	 *
-	 * return will is a multi-dimensional array that
-	 * categorizes the index definition by types, unique, primary and index.
-	 * <code>
-	 * <?php
-	 * array(
-	 *       'field1'=> array (
-	 *           'name'   => 'field1',
-	 *           'type'   => 'varchar',
-	 *           'len' => '200'
-	 *           )
-	 *       )
-	 * ?>
-	 * </code>
-	 * This format is similar to how indicies are defined in vardef file.
-	 *
-	 * @param  string $tablename
-	 * @return array
-	 */
-	abstract public function get_columns($tablename);
-
-	/**
-	 * Generates alter constraint statement given a table name and vardef definition.
-	 *
-	 * Supports both adding and droping a constraint.
-	 *
-	 * @param  string $table      tablename
-	 * @param  array  $definition field definition
-	 * @param  bool   $drop       true if we are dropping the constraint, false if we are adding it
-	 * @return string SQL statement
-	 */
-	abstract public function add_drop_constraint($table, $definition, $drop = false);
-
-	/**
-	 * Returns the description of fields based on the result
-	 *
-	 * @param  resource $result
-	 * @param  boolean  $make_lower_case
-	 * @return array field array
-	 */
-	abstract public function getFieldsArray($result, $make_lower_case = false);
-
-	/**
-	 * Returns an array of tables for this database
-	 *
-	 * @return	array|false 	an array of with table names, false if no tables found
-	 */
-	abstract public function getTablesArray();
-
-	/**
-	 * Return's the version of the database
-	 *
-	 * @return string
-	 */
-	abstract public function version();
-
-	/**
-	 * Checks if a table with the name $tableName exists
-	 * and returns true if it does or false otherwise
-	 *
-	 * @param  string $tableName
-	 * @return bool
-	 */
-	abstract public function tableExists($tableName);
-
-	/**
-	 * Fetches the next row in the query result into an associative array
-	 *
-	 * @param  resource $result
-	 * @return array    returns false if there are no more rows available to fetch
-	 */
-	abstract public function fetchRow($result);
-
-	/**
-	 * Connects to the database backend
-	 *
-	 * Takes in the database settings and opens a database connection based on those
-	 * will open either a persistent or non-persistent connection.
-	 * If a persistent connection is desired but not available it will defualt to non-persistent
-	 *
-	 * configOptions must include
-	 * db_host_name - server ip
-	 * db_user_name - database user name
-	 * db_password - database password
-	 *
-	 * @param array   $configOptions
-	 * @param boolean $dieOnError
-	 */
-	abstract public function connect(array $configOptions = null, $dieOnError = false);
-
-	/**
-	 * Generates sql for create table statement for a bean.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @param  array  $indices
-	 * @return string SQL Create Table statement
-	 */
-	abstract public function createTableSQLParams($tablename, $fieldDefs, $indices);
-
-	/**
-	 * Generates the SQL for changing columns
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs
-	 * @param string $action
-	 * @param bool   $ignoreRequired Optional, true if we should ignor this being a required field
-	 * @return string|array
-	 */
-	abstract protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false);
-
-	/**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	abstract public function disconnect();
-
-	/**
-	 * Get last database error
-	 * This function should return last error as reported by DB driver
-	 * and should return false if no error condition happened
-	 * @return string|false Error message or false if no error happened
-	 */
-	abstract public function lastDbError();
+    abstract function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true);
+
+
+    /**
+     * Free Database result
+     * @param resource $dbResult
+     */
+    abstract protected function freeDbResult($dbResult);
+
+    /**
+     * Rename column in the DB
+     * @param string $tablename
+     * @param string $column
+     * @param string $newname
+     */
+    abstract function renameColumnSQL($tablename, $column, $newname);
+
+    /**
+     * Returns definitions of all indies for passed table.
+     *
+     * return will is a multi-dimensional array that
+     * categorizes the index definition by types, unique, primary and index.
+     * <code>
+     * <?php
+     * array(                                                              O
+     *       'index1'=> array (
+     *           'name'   => 'index1',
+     *           'type'   => 'primary',
+     *           'fields' => array('field1','field2')
+     *           )
+     *       )
+     * ?>
+     * </code>
+     * This format is similar to how indicies are defined in vardef file.
+     *
+     * @param  string $tablename
+     * @return array
+     */
+    abstract public function get_indices($tablename);
+
+    /**
+     * Returns definitions of all indies for passed table.
+     *
+     * return will is a multi-dimensional array that
+     * categorizes the index definition by types, unique, primary and index.
+     * <code>
+     * <?php
+     * array(
+     *       'field1'=> array (
+     *           'name'   => 'field1',
+     *           'type'   => 'varchar',
+     *           'len' => '200'
+     *           )
+     *       )
+     * ?>
+     * </code>
+     * This format is similar to how indicies are defined in vardef file.
+     *
+     * @param  string $tablename
+     * @return array
+     */
+    abstract public function get_columns($tablename);
+
+    /**
+     * Generates alter constraint statement given a table name and vardef definition.
+     *
+     * Supports both adding and droping a constraint.
+     *
+     * @param  string $table      tablename
+     * @param  array  $definition field definition
+     * @param  bool   $drop       true if we are dropping the constraint, false if we are adding it
+     * @return string SQL statement
+     */
+    abstract public function add_drop_constraint($table, $definition, $drop = false);
+
+    /**
+     * Returns the description of fields based on the result
+     *
+     * @param  resource $result
+     * @param  boolean  $make_lower_case
+     * @return array field array
+     */
+    abstract public function getFieldsArray($result, $make_lower_case = false);
+
+    /**
+     * Returns an array of tables for this database
+     *
+     * @return	array|false 	an array of with table names, false if no tables found
+     */
+    abstract public function getTablesArray();
+
+    /**
+     * Return's the version of the database
+     *
+     * @return string
+     */
+    abstract public function version();
+
+    /**
+     * Checks if a table with the name $tableName exists
+     * and returns true if it does or false otherwise
+     *
+     * @param  string $tableName
+     * @return bool
+     */
+    abstract public function tableExists($tableName);
+
+    /**
+     * Fetches the next row in the query result into an associative array
+     *
+     * @param  resource $result
+     * @return array    returns false if there are no more rows available to fetch
+     */
+    abstract public function fetchRow($result);
+
+    /**
+     * Connects to the database backend
+     *
+     * Takes in the database settings and opens a database connection based on those
+     * will open either a persistent or non-persistent connection.
+     * If a persistent connection is desired but not available it will defualt to non-persistent
+     *
+     * configOptions must include
+     * db_host_name - server ip
+     * db_user_name - database user name
+     * db_password - database password
+     *
+     * @param array   $configOptions
+     * @param boolean $dieOnError
+     */
+    abstract public function connect(array $configOptions = null, $dieOnError = false);
+
+    /**
+     * Generates sql for create table statement for a bean.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @param  array  $indices
+     * @return string SQL Create Table statement
+     */
+    abstract public function createTableSQLParams($tablename, $fieldDefs, $indices);
+
+    /**
+     * Generates the SQL for changing columns
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs
+     * @param string $action
+     * @param bool   $ignoreRequired Optional, true if we should ignor this being a required field
+     * @return string|array
+     */
+    abstract protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false);
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    abstract public function disconnect();
+
+    /**
+     * Get last database error
+     * This function should return last error as reported by DB driver
+     * and should return false if no error condition happened
+     * @return string|false Error message or false if no error happened
+     */
+    abstract public function lastDbError();
 
     /**
      * Check if this query is valid
@@ -3798,82 +3798,82 @@ 
      * @param string $query
      * @return bool
      */
-	abstract public function validateQuery($query);
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	abstract public function valid();
-
-	/**
-	 * Check if certain database exists
-	 * @param string $dbname
-	 */
-	abstract public function dbExists($dbname);
-
-	/**
-	 * Get tables like expression
-	 * @param string $like Expression describing tables
-	 * @return array
-	 */
-	abstract public function tablesLike($like);
-
-	/**
-	 * Create a database
-	 * @param string $dbname
-	 */
-	abstract public function createDatabase($dbname);
-
-	/**
-	 * Drop a database
-	 * @param string $dbname
-	 */
-	abstract public function dropDatabase($dbname);
-
-	/**
-	 * Get database configuration information (DB-dependent)
-	 * @return array|null
-	 */
-	abstract public function getDbInfo();
-
-	/**
-	 * Check if certain DB user exists
-	 * @param string $username
-	 */
-	abstract public function userExists($username);
-
-	/**
-	 * Create DB user
-	 * @param string $database_name
-	 * @param string $host_name
-	 * @param string $user
-	 * @param string $password
-	 */
-	abstract public function createDbUser($database_name, $host_name, $user, $password);
-
-	/**
-	 * Check if the database supports fulltext indexing
-	 * Note that database driver can be capable of supporting FT (see supports('fulltext))
-	 * but particular instance can still have it disabled
-	 * @return bool
-	 */
-	abstract public function full_text_indexing_installed();
-
-	/**
-	 * Generate fulltext query from set of terms
-	 * @param string $field Field to search against
-	 * @param array $terms Search terms that may be or not be in the result
-	 * @param array $must_terms Search terms that have to be in the result
-	 * @param array $exclude_terms Search terms that have to be not in the result
-	 */
-	abstract public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array());
-
-	/**
-	 * Get install configuration for this DB
-	 * @return array
-	 */
-	abstract public function installConfig();
+    abstract public function validateQuery($query);
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    abstract public function valid();
+
+    /**
+     * Check if certain database exists
+     * @param string $dbname
+     */
+    abstract public function dbExists($dbname);
+
+    /**
+     * Get tables like expression
+     * @param string $like Expression describing tables
+     * @return array
+     */
+    abstract public function tablesLike($like);
+
+    /**
+     * Create a database
+     * @param string $dbname
+     */
+    abstract public function createDatabase($dbname);
+
+    /**
+     * Drop a database
+     * @param string $dbname
+     */
+    abstract public function dropDatabase($dbname);
+
+    /**
+     * Get database configuration information (DB-dependent)
+     * @return array|null
+     */
+    abstract public function getDbInfo();
+
+    /**
+     * Check if certain DB user exists
+     * @param string $username
+     */
+    abstract public function userExists($username);
+
+    /**
+     * Create DB user
+     * @param string $database_name
+     * @param string $host_name
+     * @param string $user
+     * @param string $password
+     */
+    abstract public function createDbUser($database_name, $host_name, $user, $password);
+
+    /**
+     * Check if the database supports fulltext indexing
+     * Note that database driver can be capable of supporting FT (see supports('fulltext))
+     * but particular instance can still have it disabled
+     * @return bool
+     */
+    abstract public function full_text_indexing_installed();
+
+    /**
+     * Generate fulltext query from set of terms
+     * @param string $field Field to search against
+     * @param array $terms Search terms that may be or not be in the result
+     * @param array $must_terms Search terms that have to be in the result
+     * @param array $exclude_terms Search terms that have to be not in the result
+     */
+    abstract public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array());
+
+    /**
+     * Get install configuration for this DB
+     * @return array
+     */
+    abstract public function installConfig();
 
     /**
      * Returns a DB specific FROM clause which can be used to select against functions.
@@ -3890,5 +3890,5 @@ 
      * @abstract
      * @return string
      */
-	abstract public function getGuidSQL();
+    abstract public function getGuidSQL();
 }

include/database/MysqliManager.php

Indentation +252 added lines, -252 removed lines

@@ -98,51 +98,51 @@ 
  */
 class MysqliManager extends MysqlManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysqli';
-	public $priority = 10;
-	public $label = 'LBL_MYSQLI';
-
-	/**
-	 * @see DBManager::$backendFunctions
-	 */
-	protected $backendFunctions = array(
-		'free_result'        => 'mysqli_free_result',
-		'close'              => 'mysqli_close',
-		'row_count'          => 'mysqli_num_rows',
-		'affected_row_count' => 'mysqli_affected_rows',
-		);
-
-	/**
-	 * @see MysqlManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysqli';
+    public $priority = 10;
+    public $label = 'LBL_MYSQLI';
+
+    /**
+     * @see DBManager::$backendFunctions
+     */
+    protected $backendFunctions = array(
+        'free_result'        => 'mysqli_free_result',
+        'close'              => 'mysqli_close',
+        'row_count'          => 'mysqli_num_rows',
+        'affected_row_count' => 'mysqli_affected_rows',
+        );
+
+    /**
+     * @see MysqlManager::query()
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
 
-		static $queryMD5 = array();
+        static $queryMD5 = array();
 
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
-		$md5 = md5($sql);
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+        $md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+        if (empty($queryMD5[$md5]))
+            $queryMD5[$md5] = true;
 
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
-		// This is some heavy duty debugging, leave commented out unless you need this:
-		/*
+        // This is some heavy duty debugging, leave commented out unless you need this:
+        /*
 		$bt = debug_backtrace();
 		for ( $i = count($bt) ; $i-- ; $i > 0 ) {
 			if ( strpos('MysqliManager.php',$bt[$i]['file']) === false ) {
@@ -154,228 +154,228 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
-
-		return $result;
-	}
-
-	/**
-	 * Returns the number of rows affected by the last query
-	 *
-	 * @return int
-	 */
-	public function getAffectedRowCount($result)
-	{
-		return mysqli_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysqli_num_rows($result);
-	}
+        if($keepResult)
+            $this->lastResult = $result;
+        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
+        return $result;
+    }
 
     /**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
-			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
-		}
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysqli_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
-		$field_array = array();
-
-		if (!isset($result) || empty($result))
-			return 0;
-
-		$i = 0;
-		while ($i < mysqli_num_fields($result)) {
-			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-
-			$i++;
-		}
+     * Returns the number of rows affected by the last query
+     *
+     * @return int
+     */
+    public function getAffectedRowCount($result)
+    {
+        return mysqli_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysqli_num_rows($result);
+    }
+
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+            $GLOBALS['log']->debug('Calling MySQLi::disconnect()');
+        }
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysqli_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysqli_free_result($dbResult);
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
+        $field_array = array();
+
+        if (!isset($result) || empty($result))
+            return 0;
+
+        $i = 0;
+        while ($i < mysqli_num_fields($result)) {
+            $meta = mysqli_fetch_field_direct($result, $i);
+            if (!$meta)
+                return 0;
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+
+            $i++;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        $row = mysqli_fetch_assoc($result);
+        if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+        return $row;
+    }
 
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
-		return $row;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
-	}
-
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if(!isset($this->database)) {
-
-			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+    }
+
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if (is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if(!isset($this->database)) {
+
+            //mysqli connector has a separate parameter for port.. We need to separate it out from the host name
+            $dbhost=$configOptions['db_host_name'];
             $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
-			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
-			}
-
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
-						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-					} else {
-						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
-					}
-				} else {
-					return false;
-				}
-			}
-		}
+            $pos=strpos($configOptions['db_host_name'],':');
+            if ($pos !== false) {
+                $dbhost=substr($configOptions['db_host_name'],0,$pos);
+                $dbport=substr($configOptions['db_host_name'],$pos+1);
+            }
+
+            $this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
+                if($dieOnError) {
+                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+                        sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+                    } else {
+                        sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+        }
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
-						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-					} else {
-						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
-					}
-			} else {
-				return false;
-			}
-	    }
+        if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
+            if($dieOnError) {
+                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+                        sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+                    } else {
+                        sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
+                    }
+            } else {
+                return false;
+            }
+        }
 
-		// cn: using direct calls to prevent this from spamming the Logs
+        // cn: using direct calls to prevent this from spamming the Logs
 	    
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	    	$names = "SET NAMES 'utf8' COLLATE '$collation'";
-	    	mysqli_query($this->database,$names);
-		}
-	    mysqli_set_charset ($this->database , "utf8" );
-
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-
-		$this->connectOptions = $configOptions;
-		return true;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see MysqlManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
-			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
-		    }
-		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
-			    return $err;
-			}
-		}
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names = "SET NAMES 'utf8' COLLATE '$collation'";
+            mysqli_query($this->database,$names);
+        }
+        mysqli_set_charset ($this->database , "utf8" );
 
-		return false;
-	}
+        if($this->checkError('Could Not Connect', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
 
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQLi Version" => @mysqli_get_client_info(),
-			"MySQLi Host Info" => @mysqli_get_host_info($this->database),
-			"MySQLi Server Info" => @mysqli_get_server_info($this->database),
-			"MySQLi Client Encoding" =>  @mysqli_client_encoding($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysqli_select_db($this->getDatabase(), $dbname);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
-	}
+        $this->connectOptions = $configOptions;
+        return true;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see MysqlManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysqli_errno($this->database)) {
+                return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
+            }
+        } else {
+            $err =  mysqli_connect_error();
+            if($err) {
+                return $err;
+            }
+        }
+
+        return false;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQLi Version" => @mysqli_get_client_info(),
+            "MySQLi Host Info" => @mysqli_get_host_info($this->database),
+            "MySQLi Server Info" => @mysqli_get_server_info($this->database),
+            "MySQLi Client Encoding" =>  @mysqli_client_encoding($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysqli_select_db($this->getDatabase(), $dbname);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
+    }
 }