adamjakab / SuiteCRM

modules/AOR_Reports/aor_utils.php

Indentation +22 added lines, -22 removed lines

@@ -1,27 +1,27 @@
 <?php
 /**
- *
- *
- * @package
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <support@salesagility.com>
- */
+     *
+     *
+     * @package
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author Salesagility Ltd <support@salesagility.com>
+     */
 
 /**
  * Returns the display labels for a module path and field.

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
     $fieldDisplay = $currentBean->field_name_map[$field]['vname'];
     $fieldDisplay = translate($fieldDisplay, $currentBean->module_dir);
     $fieldDisplay = trim($fieldDisplay, ':');
-    foreach($modulePathDisplay as &$module) {
+    foreach ($modulePathDisplay as &$module) {
         $module = isset($app_list_strings['aor_moduleList'][$module]) ? $app_list_strings['aor_moduleList'][$module] : (
             isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module
         );
@@ -73,7 +73,7 @@ 
 function requestToUserParameters()
 {
     $params = array();
-    if(isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
+    if (isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
         foreach ($_REQUEST['parameter_id'] as $key => $parameterId) {
             if ($_REQUEST['parameter_type'][$key] === 'Multi') {
                 $_REQUEST['parameter_value'][$key] = encodeMultienumValue(explode(',', $_REQUEST['parameter_value'][$key]));
@@ -163,7 +163,7 @@ 
     } else if ($date_time_period_list_selected == 'this_month') {
         $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m'), 1);
     } else if ($date_time_period_list_selected == 'last_month') {
-        $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m')-1, 1);
+        $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m') - 1, 1);
     } else if ($date_time_period_list_selected == 'this_quarter') {
         $thisMonth = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m'), 1);
         if ($thisMonth >= $q[1]['start'] && $thisMonth <= $q[1]['end']) {
@@ -228,7 +228,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));

install/language/en_us.lang.php

Indentation +395 added lines, -395 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,157 +275,157 @@ 
     '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_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_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',
@@ -435,11 +435,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',
@@ -522,20 +522,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',
@@ -549,19 +549,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(
@@ -593,91 +593,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/language/en_us.lang.php

Spacing +3 added lines, -3 removed lines

@@ -760,14 +760,14 @@
     ),
     'dom_switch_bool' => array('on' => 'Yes',
         'off' => 'No',
-        '' => 'No', ),
+        '' => 'No',),
 
     'dom_email_link_type' => array('sugar' => 'SuiteCRM Email Client',
-        'mailto' => 'External Email Client', ),
+        'mailto' => 'External Email Client',),
 
     'dom_email_editor_option' => array('' => 'Default Email Format',
         'html' => 'HTML Email',
-        'plain' => 'Plain Text Email', ),
+        'plain' => 'Plain Text Email',),
 
     'schedulers_times_dom' => array('not run' => 'Past Run Time, Not Executed',
         'ready' => 'Ready',

modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) 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.
@@ -114,24 +114,24 @@ 
         */
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
             $currency_symbol = $currency->symbol;
         }
-        $subtitle = translate('LBL_OPP_SIZE', 'Charts') . " " . $currency_symbol . "1" . translate('LBL_OPP_THOUSANDS', 'Charts');
+        $subtitle = translate('LBL_OPP_SIZE', 'Charts')." ".$currency_symbol."1".translate('LBL_OPP_THOUSANDS', 'Charts');
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $module = 'Opportunities';
-        $action =  'index';
-        $query =  'true';
+        $action = 'index';
+        $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'lead_source', 'sales_stage' );
+        $groupBy = array('lead_source', 'sales_stage');
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
+        if (count($this->lsbo_ids) > 0)
             $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
 
 
@@ -157,7 +157,7 @@ 
 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -253,43 +253,43 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        if (count($this->lsbo_ids) > 0)
+            $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->lsbo_ids)."') ";
+        if (count($this->lsbo_lead_sources) > 0)
+            $query .= "AND opportunities.lead_source IN ('".implode("','", $this->lsbo_lead_sources)."') ";
         else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+            $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             $key = $i["lead_source"];
             $keyDom = $i["lead_source_dom_option"];
             $stage = $i["sales_stage"];
             $stageDom = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) 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.
@@ -66,13 +66,13 @@ 
     {
         global $timedate;
 
-        if(empty($options['obm_date_start']))
+        if (empty($options['obm_date_start']))
             $options['obm_date_start'] = $timedate->nowDbDate();
 
-        if(empty($options['obm_date_end']))
+        if (empty($options['obm_date_end']))
             $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -92,7 +92,7 @@ 
     public function display()
     {
         $currency_symbol = $GLOBALS['sugar_config']['default_currency_symbol'];
-        if ($GLOBALS['current_user']->getPreference('currency')){
+        if ($GLOBALS['current_user']->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($GLOBALS['current_user']->getPreference('currency'));
@@ -103,13 +103,13 @@ 
         $action = 'index';
         $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'm', 'sales_stage', );
+        $groupBy = array('m', 'sales_stage',);
 
 
         $data = $this->getChartData($this->constructQuery());
 
         //I have taken out the sort as this will throw off the labels we have calculated
-        $data = $this->sortData($data,'m', false, 'sales_stage', true, true);
+        $data = $this->sortData($data, 'm', false, 'sales_stage', true, true);
 
         $chartReadyData = $this->prepareChartData($data, $currency_symbol, $thousands_symbol);
         $canvasId = 'rGraphOutcomeByMonth'.uniqid();
@@ -129,7 +129,7 @@ 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -242,45 +242,45 @@ 
     protected function constructQuery()
     {
         $query = "SELECT sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'"))." as m, ".
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, ".
             "sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
-        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'",'date') .
-            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'",'date') .
+        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'", 'date').
             " AND opportunities.deleted=0";
         if (count($this->obm_ids) > 0)
-            $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+            $query .= " AND opportunities.assigned_user_id IN ('".implode("','", $this->obm_ids)."')";
         $query .= " GROUP BY sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'")) .
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'")).
             " ORDER BY m";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be)
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             $key = $i["m"];
             $stage = $i["sales_stage"];
             $stage_dom_option = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) 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.
@@ -67,16 +67,16 @@ 
     {
         global $timedate;
 
-        if(empty($options['pbss_date_start']))
+        if (empty($options['pbss_date_start']))
             $options['pbss_date_start'] = $timedate->nowDbDate();
 
-        if(empty($options['pbss_date_end']))
+        if (empty($options['pbss_date_end']))
             $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
 
-        if(empty($options['title']))
+        if (empty($options['title']))
             $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -109,7 +109,7 @@ 
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
@@ -135,20 +135,20 @@ 
         //These are taken in the same fashion as the hard-coded array above
         $module = 'Opportunities';
         $action = 'index';
-        $query  ='true';
-        $searchFormTab ='advanced_search';
+        $query  = 'true';
+        $searchFormTab = 'advanced_search';
 
         $chartWidth     = 900;
         $chartHeight    = 500;
 
-        $autoRefresh = $this->processAutoRefresh();//$autoRefresh
+        $autoRefresh = $this->processAutoRefresh(); //$autoRefresh
 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
         //<canvas id='$canvasId' width='$chartWidth' height='$chartHeight'>[No canvas support]</canvas>
         //<canvas id='test123'  width='$chartWidth' height='$chartHeight'>[No canvas support]</canvas>
 
         //There is always an ending anchor value, hence this check is that the data array is less than 2
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 2)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 2)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -272,13 +272,13 @@ 
         }
 
         $result = $db->query($query);
-        while($row = $db->fetchByAssoc($result, false))
+        while ($row = $db->fetchByAssoc($result, false))
             $temp_data[] = $row;
 
         // reorder and set the array based on the order of selected_datax
-        foreach($selected_datax as $sales_stage){
-            foreach($temp_data as $key => $value){
-                if ($value['sales_stage'] == $sales_stage){
+        foreach ($selected_datax as $sales_stage) {
+            foreach ($temp_data as $key => $value) {
+                if ($value['sales_stage'] == $sales_stage) {
                     $value['sales_stage'] = $app_list_strings['sales_stage_dom'][$value['sales_stage']];
                     $value['key'] = $sales_stage;
                     $value['value'] = $value['sales_stage'];
@@ -318,40 +318,40 @@ 
                         count(*) AS opp_count,
                         sum(amount_usdollar/1000) AS total
                     FROM users,opportunities  ";
-        $query .= " WHERE opportunities.date_closed >= ". db_convert("'".$this->pbss_date_start."'",'date').
-            " AND opportunities.date_closed <= ".db_convert("'".$this->pbss_date_end."'",'date') .
+        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->pbss_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->pbss_date_end."'", 'date').
             " AND opportunities.assigned_user_id = users.id  AND opportunities.deleted=0 ";
         $query .= " GROUP BY opportunities.sales_stage";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //return $data;
-        $chart['labels']=array();
-        $chart['data']=array();
+        $chart['labels'] = array();
+        $chart['data'] = array();
         $total = 0;
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             //$chart['labelsAndValues'][]=$i['key'].' ('.$currency.(int)$i['total'].')';
-            $chart['labelsAndValues'][]=$this->resizeLabel($i['value']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
-            $chart['labels'][]=$i['value'];
-            $chart['data'][]=(int)$i['total'];
-            $total+=(int)$i['total'];
+            $chart['labelsAndValues'][] = $this->resizeLabel($i['value']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
+            $chart['labels'][] = $i['value'];
+            $chart['data'][] = (int)$i['total'];
+            $total += (int)$i['total'];
         }
         //The funnel needs n+1 elements (to bind the shape to as per http://www.rgraph.net/demos/funnel-interactive-key.html)
         //$chart['data'][]=1;
-        $chart['total']=$total;
+        $chart['total'] = $total;
         return $chart;
     }
 
     protected function resizeLabel($label)
     {
-        if(strlen($label) < $this->maxLabelSizeBeforeTotal)
+        if (strlen($label) < $this->maxLabelSizeBeforeTotal)
             return $label;
         else
-            return substr($label,0,$this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
+            return substr($label, 0, $this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
 
     }