adamjakab / SuiteCRM

install/language/en_us.lang.php

Indentation +427 added lines, -427 removed lines

@@ -43,296 +43,296 @@ 
 }
 
 $mod_strings = array(
-	'LBL_BASIC_SEARCH'					=> 'Quick Filter',
-	'LBL_ADVANCED_SEARCH'				=> 'Advanced Filter',
-	'LBL_BASIC_TYPE'					=> 'Basic Type',
-	'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
-	'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
-	'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
-	'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
-	'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
-	'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
-	'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_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_IMAP'					=> 'Not found: InboundEmail and Campaigns (Email) require the IMAP libraries. Neither will be functional.',
-	'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
-	'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
-	'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.',
-	'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.',
-	'LBL_CHECKSYS_XML_NOT_AVAILABLE'        => 'Functions associated with XML Parser Libraries that are needed by the SuiteCRM application were not found. 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.',
-	'ERR_CHECKSYS_MBSTRING'             => 'Functions associated with the Multibyte Strings PHP extension (mbstring) that are needed by the SuiteCRM application were not found. <br/><br/>Generally, the mbstring module is not enabled by default in PHP and must be activated with --enable-mbstring when the PHP binary is built. Please refer to your PHP Manual for more information on how to enable mbstring support.',
-	'ERR_CHECKSYS_CONFIG_NOT_WRITABLE'  => 'The config file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
-	'ERR_CHECKSYS_CONFIG_OVERRIDE_NOT_WRITABLE'  => 'The config override file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
-	'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 (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_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_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_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_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_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_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.',
-	'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 of SuiteCRM: ',
-	'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
-	'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
-	'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_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_COMPONENT'			=> 'Component',
-	'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
-	'LBL_CHECKSYS_CURL'					=> 'cURL Module',
-	'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
-	'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
-	'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
-	'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
-	'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_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_STATUS'				=> 'Status',
-	'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
-	'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_NOT'					=> 'not',
-	'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
-	'LBL_CONFIRM_WILL'					=> 'will',
-	'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_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_TITLE'        => 'Choose Demo Data',
-	'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
-	'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
-	'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_PROVIDE_DD'           => 'Provide existing user',
-	'LBL_DBCONFIG_CREATE_DD'            => 'Define user to create',
-	'LBL_DBCONFIG_SAME_DD'              => 'Same as Admin User',
-	'LBL_DBCONF_TITLE'					=> 'Database Configuration',
-	'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
-	'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
-	'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_HELP'							=> 'Help',
-	'LBL_INSTALL'                       => 'Install',
-	'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
-	'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
-	'LBL_INSTALL_TYPE_TYPICAL'          => ' <b>Typical Install</b>',
-	'LBL_INSTALL_TYPE_CUSTOM'           => ' <b>Custom Install</b>',
-	'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_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_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_LICENSE_REDIRECT'              => 'Redirecting in ',
-	'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
-	'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
-	'LBL_PRINT_SUMM'                    => 'Print Summary',
-	'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
-
-	'LBL_LOCALE_NAME_FIRST'				=> 'David',
-	'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
-	'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
-
-	'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_NEXT'							=> 'Next',
-	'LBL_NO'							=> 'No',
-	'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
-	'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_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
-	'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_FINISH'				=> 'Finish',
-	'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_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_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_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'			=> '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_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_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_ENV'                    => 'System Environment',
-	'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_STEP'							=> 'Step',
-	'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
-	//welcome page variables
-	'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
-	'REQUIRED_SYS_COMP' => 'Required System Components',
-	'REQUIRED_SYS_COMP_MSG' =>
-		'Before you begin, please be sure that you have the supported versions of the following system components:<br>
+    'LBL_BASIC_SEARCH'					=> 'Quick Filter',
+    'LBL_ADVANCED_SEARCH'				=> 'Advanced Filter',
+    'LBL_BASIC_TYPE'					=> 'Basic Type',
+    'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
+    'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
+    'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
+    'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
+    'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
+    'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
+    '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_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_IMAP'					=> 'Not found: InboundEmail and Campaigns (Email) require the IMAP libraries. Neither will be functional.',
+    'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
+    'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
+    '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.',
+    '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.',
+    'LBL_CHECKSYS_XML_NOT_AVAILABLE'        => 'Functions associated with XML Parser Libraries that are needed by the SuiteCRM application were not found. 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.',
+    'ERR_CHECKSYS_MBSTRING'             => 'Functions associated with the Multibyte Strings PHP extension (mbstring) that are needed by the SuiteCRM application were not found. <br/><br/>Generally, the mbstring module is not enabled by default in PHP and must be activated with --enable-mbstring when the PHP binary is built. Please refer to your PHP Manual for more information on how to enable mbstring support.',
+    'ERR_CHECKSYS_CONFIG_NOT_WRITABLE'  => 'The config file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
+    'ERR_CHECKSYS_CONFIG_OVERRIDE_NOT_WRITABLE'  => 'The config override file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
+    '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 (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_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_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_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_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_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_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.',
+    '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 of SuiteCRM: ',
+    'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
+    'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
+    '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_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_COMPONENT'			=> 'Component',
+    'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
+    'LBL_CHECKSYS_CURL'					=> 'cURL Module',
+    'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
+    'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
+    'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
+    'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
+    '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_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_STATUS'				=> 'Status',
+    'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
+    '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_NOT'					=> 'not',
+    'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
+    'LBL_CONFIRM_WILL'					=> 'will',
+    '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_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_TITLE'        => 'Choose Demo Data',
+    'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
+    'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
+    '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_PROVIDE_DD'           => 'Provide existing user',
+    'LBL_DBCONFIG_CREATE_DD'            => 'Define user to create',
+    'LBL_DBCONFIG_SAME_DD'              => 'Same as Admin User',
+    'LBL_DBCONF_TITLE'					=> 'Database Configuration',
+    'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
+    'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
+    '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_HELP'							=> 'Help',
+    'LBL_INSTALL'                       => 'Install',
+    'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
+    'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
+    'LBL_INSTALL_TYPE_TYPICAL'          => ' <b>Typical Install</b>',
+    'LBL_INSTALL_TYPE_CUSTOM'           => ' <b>Custom Install</b>',
+    '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_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_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_LICENSE_REDIRECT'              => 'Redirecting in ',
+    'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
+    'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
+    'LBL_PRINT_SUMM'                    => 'Print Summary',
+    'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
+
+    'LBL_LOCALE_NAME_FIRST'				=> 'David',
+    'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
+    'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
+
+    '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_NEXT'							=> 'Next',
+    'LBL_NO'							=> 'No',
+    'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
+    '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_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
+    '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_FINISH'				=> 'Finish',
+    '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_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_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_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'			=> '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_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_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_ENV'                    => 'System Environment',
+    '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_STEP'							=> 'Step',
+    'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
+    //welcome page variables
+    'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
+    'REQUIRED_SYS_COMP' => 'Required System Components',
+    'REQUIRED_SYS_COMP_MSG' =>
+        'Before you begin, please be sure that you have the supported versions of the following system components:<br>
                       <ul>
                       <li> Database/Database Management System (Examples: MariaDB, MySQL or SQL Server)</li>
                       <li> Web Server (Apache, IIS)</li>
                       </ul>
                       Consult the Compatibility Matrix in the Release Notes for
                       compatible system components for the SuiteCRM version that you are installing.<br>',
-	'REQUIRED_SYS_CHK' => 'Initial System Check',
-	'REQUIRED_SYS_CHK_MSG' =>
-		'When you begin the installation process, a system check will be performed on the web server on which the SuiteCRM files are located in order to
+    'REQUIRED_SYS_CHK' => 'Initial System Check',
+    'REQUIRED_SYS_CHK_MSG' =>
+        'When you begin the installation process, a system check will be performed on the web server on which the SuiteCRM files are located in order to
                       make sure the system is configured properly and has all of the necessary components
                       to successfully complete the installation. <br><br>
                       The system checks all of the following:<br>
@@ -354,9 +354,9 @@ 
 
 
 
-	'REQUIRED_INSTALLTYPE' => 'Typical or Custom install',
-	'REQUIRED_INSTALLTYPE_MSG' =>
-		'After the system check is performed, you can choose either
+    'REQUIRED_INSTALLTYPE' => 'Typical or Custom install',
+    'REQUIRED_INSTALLTYPE_MSG' =>
+        'After the system check is performed, you can choose either
                       the Typical or the Custom installation.<br><br>
                       For both <b>Typical</b> and <b>Custom</b> installations, you will need to know the following:<br>
                       <ul>
@@ -398,40 +398,40 @@ 
                                   <li><b>Character Set</b> most commonly used in your locale.<br><br></li></ul>
                                   For more detailed information, please consult the Installation Guide.
                                 ',
-	'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_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
-	'LBL_YES'							=> 'Yes',
-
-	'LBL_PATCHES_TITLE'     => 'Install Latest Patches',
-	'LBL_MODULE_TITLE'      => 'Install Language Packs',
-	'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_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_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
+    'LBL_YES'							=> 'Yes',
+
+    'LBL_PATCHES_TITLE'     => 'Install Latest Patches',
+    'LBL_MODULE_TITLE'      => 'Install Language Packs',
+    '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.
 											<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_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_STREAM' => 'PHP allows to use stream',
-
-	'advanced_password_new_account_email' => array(
-		'subject' => 'New account information',
-		'type' => 'system',
-		'description' => 'This template is used when the System Administrator sends a new password to a user.',
-		'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>Here is your account username and temporary password:</p><p>Username : $contact_user_user_name </p><p>Password : $contact_user_user_hash </p><br><p>$config_site_url</p><br><p>After you log in using the above password, you may be required to reset the password to one of your own choice.</p>   </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
-		'txt_body' =>
-			'
+    '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_STREAM' => 'PHP allows to use stream',
+
+    'advanced_password_new_account_email' => array(
+        'subject' => 'New account information',
+        'type' => 'system',
+        'description' => 'This template is used when the System Administrator sends a new password to a user.',
+        'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>Here is your account username and temporary password:</p><p>Username : $contact_user_user_name </p><p>Password : $contact_user_user_hash </p><br><p>$config_site_url</p><br><p>After you log in using the above password, you may be required to reset the password to one of your own choice.</p>   </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
+        'txt_body' =>
+            '
 Here is your account username and temporary password:
 Username : $contact_user_user_name
 Password : $contact_user_user_hash
@@ -439,120 +439,120 @@ 
 $config_site_url
 
 After you log in using the above password, you may be required to reset the password to one of your own choice.',
-		'name' => 'System-generated password email',
-	),
-	'advanced_password_forgot_password_email' => array(
-		'subject' => 'Reset your account password',
-		'type' => 'system',
+        'name' => 'System-generated password email',
+    ),
+    'advanced_password_forgot_password_email' => array(
+        'subject' => 'Reset your account password',
+        'type' => 'system',
         'description' => "This template is used to send a user a link to click to reset the user's account password.",
-		'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>You recently requested on $contact_user_pwd_last_changed to be able to reset your account password. </p><p>Click on the link below to reset your password:</p><p> $contact_user_link_guid </p>  </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
-		'txt_body' =>
-			'
+        'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>You recently requested on $contact_user_pwd_last_changed to be able to reset your account password. </p><p>Click on the link below to reset your password:</p><p> $contact_user_link_guid </p>  </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
+        'txt_body' =>
+            '
 You recently requested on $contact_user_pwd_last_changed to be able to reset your account password.
 
 Click on the link below to reset your password:
 
 $contact_user_link_guid',
-		'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:',
-	'CURRENT_LOGO_HELP'=>'This logo is displayed in the left-hand corner of the footer of the SuiteCRM application.',
-
-
-	//Scenario selection of modules
-	'LBL_WIZARD_SCENARIO_TITLE' => 'Scenario Selection',
-	'LBL_WIZARD_SCENARIO_DESC' => 'This is to allow tailoring of the displayed modules based on your requirements. Each of the modules can be enabled after install using the administration page.',
-	'LBL_WIZARD_SCENARIO_EMPTY'=> 'There are no scenarios currently set in the configuration file (config.php)',
-
-
-
-	// 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' => '',
-	'LBL_DB_CONN_ERR' => 'Database error',
-	'LBL_OLD_PHP' => 'Old PHP Version Detected!',
-	'LBL_OLD_PHP_MSG' => 'The recommended PHP version to install SuiteCRM is %s <br />Although the minimum PHP version required is %s, is not recommended due to the large number of fixed bugs, including security fixes, released in the more modern versions.<br />You are using PHP version %s, which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ',
-	'LBL_OLD_PHP_OK' => 'I\'m aware of the risks and wish to continue.',
+        '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:',
+    'CURRENT_LOGO_HELP'=>'This logo is displayed in the left-hand corner of the footer of the SuiteCRM application.',
+
+
+    //Scenario selection of modules
+    'LBL_WIZARD_SCENARIO_TITLE' => 'Scenario Selection',
+    'LBL_WIZARD_SCENARIO_DESC' => 'This is to allow tailoring of the displayed modules based on your requirements. Each of the modules can be enabled after install using the administration page.',
+    'LBL_WIZARD_SCENARIO_EMPTY'=> 'There are no scenarios currently set in the configuration file (config.php)',
+
+
+
+    // 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' => '',
+    'LBL_DB_CONN_ERR' => 'Database error',
+    'LBL_OLD_PHP' => 'Old PHP Version Detected!',
+    'LBL_OLD_PHP_MSG' => 'The recommended PHP version to install SuiteCRM is %s <br />Although the minimum PHP version required is %s, is not recommended due to the large number of fixed bugs, including security fixes, released in the more modern versions.<br />You are using PHP version %s, which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ',
+    'LBL_OLD_PHP_OK' => 'I\'m aware of the risks and wish to continue.',
 
     'LBL_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
     'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',

install.php

Indentation +58 added lines, -58 removed lines

@@ -1,43 +1,43 @@ 
 <?php
- /**
+    /**
 *
- * SugarCRM Community Edition is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
+     * SugarCRM Community Edition is a customer relationship management program developed by
+     * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 *
- * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- *
- * 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 Affero 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.
- *
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo and "Supercharged by SuiteCRM" logo. If the display of the logos is not
- * reasonably feasible for  technical reasons, the Appropriate Legal Notices must
- * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
- */
- if(!defined('sugarEntry')) {
+     * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
+     * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+     *
+     * This program is free software; you can redistribute it and/or modify it under
+     * the terms of the GNU Affero General Public License version 3 as published by the
+     * Free Software Foundation with the addition of the following permission added
+     * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+     * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+     * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+     *
+     * 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 Affero 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.
+     *
+     * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+     * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+     *
+     * The interactive user interfaces in modified source and object code versions
+     * of this program must display Appropriate Legal Notices, as required under
+     * Section 5 of the GNU Affero General Public License version 3.
+     *
+     * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+     * these Appropriate Legal Notices must retain the display of the "Powered by
+     * SugarCRM" logo and "Supercharged by SuiteCRM" logo. If the display of the logos is not
+     * reasonably feasible for  technical reasons, the Appropriate Legal Notices must
+     * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
+     */
+    if(!defined('sugarEntry')) {
     define('sugarEntry', true);
 }
 
@@ -61,14 +61,14 @@ 
  * If less than minimum we refuse to install.
  */
 if (check_php_version() === -1) {
-	$msg = 'The recommended PHP version to install SuiteCRM is ';
-	$msg .= constant('SUITECRM_PHP_REC_VERSION').'<br />';
-	$msg .= 'Although the minimum PHP version required is ';
-	$msg .= constant('SUITECRM_PHP_MIN_VERSION').', ';
-	$msg .= 'is not recommended due to the large number of fixed bugs, including security fixes, ';
-	$msg .= 'released in the more modern versions.<br />';
- 	$msg .= 'You are using PHP version  '. constant('PHP_VERSION').', which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />';
-	$msg .= 'Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ';
+    $msg = 'The recommended PHP version to install SuiteCRM is ';
+    $msg .= constant('SUITECRM_PHP_REC_VERSION').'<br />';
+    $msg .= 'Although the minimum PHP version required is ';
+    $msg .= constant('SUITECRM_PHP_MIN_VERSION').', ';
+    $msg .= 'is not recommended due to the large number of fixed bugs, including security fixes, ';
+    $msg .= 'released in the more modern versions.<br />';
+        $msg .= 'You are using PHP version  '. constant('PHP_VERSION').', which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />';
+    $msg .= 'Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ';
     die($msg);
 }
 
@@ -350,7 +350,7 @@ 
 $workflow = array() ;
 // If less then recommended PHP version, insert old_php.pho into workflow.
 if (check_php_version() === 0) {
-	$workflow[] = 'old_php.php';
+    $workflow[] = 'old_php.php';
 }
 // use a simple array to map out the steps of the installer page flow
 $workflow[] = 'welcome.php';
@@ -518,16 +518,16 @@ 
     $validation_errors = array();
 // process the data posted
 if($next_clicked) {
-	// store the submitted data because the 'Next' button was clicked
+    // store the submitted data because the 'Next' button was clicked
     switch($workflow[trim($_REQUEST['current_step'])]) {
         case 'old_php.php':
-		$_SESSION['language'] = $_REQUEST['language'];
-		$_SESSION['setup_old_php'] = get_boolean_from_request('setup_old_php');
-		break;
+        $_SESSION['language'] = $_REQUEST['language'];
+        $_SESSION['setup_old_php'] = get_boolean_from_request('setup_old_php');
+        break;
 
-	case 'welcome.php':
-        	$_SESSION['language'] = $_REQUEST['language'];
-   			$_SESSION['setup_site_admin_user_name'] = 'admin';
+    case 'welcome.php':
+            $_SESSION['language'] = $_REQUEST['language'];
+                $_SESSION['setup_site_admin_user_name'] = 'admin';
 //        break;
 //      case 'license.php':
                 $_SESSION['setup_license_accept']   = get_boolean_from_request('setup_license_accept');
@@ -655,12 +655,12 @@ 
     case 'old_php.php':
     case 'welcome.php':
     case 'license.php':
-			//
-			// Check to see if session variables are working properly
-			//
-			$_SESSION['test_session'] = 'sessions are available';
+            //
+            // Check to see if session variables are working properly
+            //
+            $_SESSION['test_session'] = 'sessions are available';
         @session_write_close();
-			unset($_SESSION['test_session']);
+            unset($_SESSION['test_session']);
         @session_start();
 
             if(!isset($_SESSION['test_session']))

Switch Indentation +38 added lines, -38 removed lines

@@ -652,53 +652,53 @@
     }
 
 switch($the_file) {
-    case 'old_php.php':
-    case 'welcome.php':
-    case 'license.php':
-			//
-			// Check to see if session variables are working properly
-			//
-			$_SESSION['test_session'] = 'sessions are available';
-        @session_write_close();
-			unset($_SESSION['test_session']);
-        @session_start();
-
-            if(!isset($_SESSION['test_session']))
-            {
-                $the_file = 'installDisabled.php';
-                // PHP.ini location -
-                $phpIniLocation = get_cfg_var("cfg_file_path");
-                $disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
-                $disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
-                $disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
-                break;
-            }
-            // check to see if installer has been disabled
-            if(is_readable('config.php') && (filesize('config.php') > 0)) {
-                include_once('config.php');
-
-                if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
+        case 'old_php.php':
+        case 'welcome.php':
+        case 'license.php':
+			    //
+			    // Check to see if session variables are working properly
+			    //
+			    $_SESSION['test_session'] = 'sessions are available';
+            @session_write_close();
+			    unset($_SESSION['test_session']);
+            @session_start();
+
+                if(!isset($_SESSION['test_session']))
+                {
                     $the_file = 'installDisabled.php';
-                    $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
-                    $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-                    $disabled_text =<<<EOQ
-					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
+                    // PHP.ini location -
+                    $phpIniLocation = get_cfg_var("cfg_file_path");
+                    $disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
+                    $disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
+                    $disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
+                    break;
+                }
+                // check to see if installer has been disabled
+                if(is_readable('config.php') && (filesize('config.php') > 0)) {
+                    include_once('config.php');
+
+                    if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
+                        $the_file = 'installDisabled.php';
+                        $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
+                        $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
+                        $disabled_text =<<<EOQ
+    					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 					<pre>
 						'installer_locked' => false,
 					</pre>
 					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION_2']}</p>
 
 					<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
-EOQ;
-                    //if this is an offline client installation but the conversion did not succeed,
-                    //then try to convert again
-                    if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
-                        header('Location: index.php?entryPoint=oc_convert&first_time=true');
-                        exit ();
+    EOQ;
+                        //if this is an offline client installation but the conversion did not succeed,
+                        //then try to convert again
+                        if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
+                            header('Location: index.php?entryPoint=oc_convert&first_time=true');
+                            exit ();
+                        }
                     }
                 }
-            }
-            break;
+                break;
         case 'register.php':
         case 'complete_install.php':
             session_unset();

Spacing +111 added lines, -111 removed lines

@@ -37,13 +37,13 @@ 
  * reasonably feasible for  technical reasons, the Appropriate Legal Notices must
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  */
- if(!defined('sugarEntry')) {
+ if (!defined('sugarEntry')) {
     define('sugarEntry', true);
 }
 
 require_once 'include/utils.php';
 @session_start();
-if(isset($_REQUEST['clear_session']) || !empty($_SESSION['loginAttempts'])) {
+if (isset($_REQUEST['clear_session']) || !empty($_SESSION['loginAttempts'])) {
     session_destroy();
     header('Location: install.php');
     echo 'session clean, page refresh...';
@@ -51,7 +51,7 @@ 
 }
 
 //  recover smtp settings
-if(isset($_POST['smtp_tab_selected'])) {
+if (isset($_POST['smtp_tab_selected'])) {
     $_POST = array_merge($_POST, $_POST[$_POST['smtp_tab_selected']]);
 }
 
@@ -67,13 +67,13 @@ 
 	$msg .= constant('SUITECRM_PHP_MIN_VERSION').', ';
 	$msg .= 'is not recommended due to the large number of fixed bugs, including security fixes, ';
 	$msg .= 'released in the more modern versions.<br />';
- 	$msg .= 'You are using PHP version  '. constant('PHP_VERSION').', which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />';
+ 	$msg .= 'You are using PHP version  '.constant('PHP_VERSION').', which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />';
 	$msg .= 'Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ';
     die($msg);
 }
 
 $session_id = session_id();
-if(empty($session_id)){
+if (empty($session_id)) {
     @session_start();
 }
 $GLOBALS['installing'] = true;
@@ -98,7 +98,7 @@ 
 $silentInstall = true;
 
 //Todo, check if there is an instance where goto is not set, but a silent install is in place
-if(isset($_REQUEST['goto']) && $_REQUEST['goto'] != 'SilentInstall') {
+if (isset($_REQUEST['goto']) && $_REQUEST['goto'] != 'SilentInstall') {
     require_once('jssource/minify.php');
     $silentInstall = false;
 }
@@ -109,7 +109,7 @@ 
 setPhpIniSettings();
 $locale = new Localization();
 
-if(get_magic_quotes_gpc() == 1) {
+if (get_magic_quotes_gpc() == 1) {
     $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST);
     $_POST = array_map("stripslashes_checkstrings", $_POST);
     $_GET = array_map("stripslashes_checkstrings", $_GET);
@@ -130,16 +130,16 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	INSTALLER LANGUAGE
-function getSupportedInstallLanguages(){
+function getSupportedInstallLanguages() {
     $supportedLanguages = array(
         'en_us'	=> 'English (US)',
     );
-    if(file_exists('install/lang.config.php')){
+    if (file_exists('install/lang.config.php')) {
         include('install/lang.config.php');
-        if(!empty($config['languages'])){
+        if (!empty($config['languages'])) {
 
-            foreach($config['languages'] as $k=>$v){
-                if(file_exists('install/language/' . $k . '.lang.php')){
+            foreach ($config['languages'] as $k=>$v) {
+                if (file_exists('install/language/'.$k.'.lang.php')) {
                     $supportedLanguages[$k] = $v;
                 }
             }
@@ -151,10 +151,10 @@ 
 
 // after install language is selected, use that pack
 $default_lang = 'en_us';
-if(!isset($_POST['language']) && (!isset($_SESSION['language']) && empty($_SESSION['language']))) {
-    if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_POST['language']) && (!isset($_SESSION['language']) && empty($_SESSION['language']))) {
+    if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         $lang = parseAcceptLanguage();
-        if(isset($supportedLanguages[$lang])) {
+        if (isset($supportedLanguages[$lang])) {
             $_POST['language'] = $lang;
         } else {
             $_POST['language'] = $default_lang;
@@ -162,19 +162,19 @@ 
     }
 }
 
-if(isset($_POST['language'])) {
-    $_SESSION['language'] = str_replace('-','_',$_POST['language']);
+if (isset($_POST['language'])) {
+    $_SESSION['language'] = str_replace('-', '_', $_POST['language']);
 }
 
 $current_language = isset($_SESSION['language']) ? $_SESSION['language'] : $default_lang;
 
-if(file_exists("install/language/{$current_language}.lang.php")) {
+if (file_exists("install/language/{$current_language}.lang.php")) {
     require_once("install/language/{$current_language}.lang.php");
 } else {
     require_once("install/language/{$default_lang}.lang.php");
 }
 
-if($current_language != 'en_us') {
+if ($current_language != 'en_us') {
     $my_mod_strings = $mod_strings;
     include('install/language/en_us.lang.php');
     $mod_strings = sugarLangArrayMerge($mod_strings, $my_mod_strings);
@@ -188,40 +188,40 @@ 
 $help_url = get_help_button_url();
 
 //if this license print, then redirect and exit,
-if(isset($_REQUEST['page']) && $_REQUEST['page'] == 'licensePrint')
+if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'licensePrint')
 {
     include('install/licensePrint.php');
     exit ();
 }
 
-if(isset($_REQUEST['sugar_body_only']) && $_REQUEST['sugar_body_only'] == "1") {
+if (isset($_REQUEST['sugar_body_only']) && $_REQUEST['sugar_body_only'] == "1") {
     //if this is a system check, then just run the check and return,
     //this is an ajax call and there is no need for further processing
 
-    if(isset($_REQUEST['uploadLogoFrame']) && ($_REQUEST['uploadLogoFrame'])){
+    if (isset($_REQUEST['uploadLogoFrame']) && ($_REQUEST['uploadLogoFrame'])) {
         echo 'I\'m an uploader iframe!';
         return;
     }
 
     // upload company logo
-    if(isset($_REQUEST['uploadLogo']) && ($_REQUEST['uploadLogo'])){
+    if (isset($_REQUEST['uploadLogo']) && ($_REQUEST['uploadLogo'])) {
         $filepath = '';
         $errors = array();
 
-        switch($_FILES['company_logo']['error']) {
+        switch ($_FILES['company_logo']['error']) {
 
             case UPLOAD_ERR_OK:
                 $allowedTypes = array(IMAGETYPE_PNG, IMAGETYPE_JPEG/*, IMAGETYPE_GIF */);
                 $detectedType = exif_imagetype($_FILES['company_logo']['tmp_name']);
-                if(!in_array($detectedType, $allowedTypes)) {
+                if (!in_array($detectedType, $allowedTypes)) {
                     $errors[] = $mod_strings['ERR_UPLOAD_FILETYPE'];
                 }
                 else {
                     // uploaded image stored in the /custom path instead of put into the original theme directory..
 
-                    mkdir_recursive('custom/' . SugarThemeRegistry::current()->getDefaultImagePath(), true);
+                    mkdir_recursive('custom/'.SugarThemeRegistry::current()->getDefaultImagePath(), true);
                     $tmpvar = explode('?', SugarThemeRegistry::current()->getImageURL('company_logo.png'));
-                    $destFile = 'custom/' . $tmpvar[0];
+                    $destFile = 'custom/'.$tmpvar[0];
                     if (!move_uploaded_file($_FILES['company_logo']['tmp_name'], $destFile)) {
                         $errors[] = $mod_strings['ERR_LANG_UPLOAD_1'];
                     }
@@ -269,13 +269,13 @@ 
 
         // TODO--low: validate file size & image width/height and save, show status result to client js
 
-        echo "<script>window.top.window.{$_REQUEST['callback']}(" . json_encode($result) . ");</script>";
+        echo "<script>window.top.window.{$_REQUEST['callback']}(".json_encode($result).");</script>";
         return;
     }
 
-    if(isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])){
+    if (isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])) {
         // store configuration by form to session
-        if(!isset($_SESSION)) session_start();
+        if (!isset($_SESSION)) session_start();
         $_SESSION = array_merge($_SESSION, $_POST);
 
         // TODO--low: don't forget the custom type install settings! validate here..
@@ -289,22 +289,22 @@ 
 //            $si_errors = true;
 //        }
 
-        if(!empty($sugar_config['dbconfig'])) {
+        if (!empty($sugar_config['dbconfig'])) {
             try {
                 $db = DBManagerFactory::getInstance();
                 $db->disconnect();
-            } catch (\Exception $e) {
-                $validation_errors[] = $mod_strings['LBL_DB_CONN_ERR'] . ': ' . $e->getMessage();
+            }catch (\Exception $e) {
+                $validation_errors[] = $mod_strings['LBL_DB_CONN_ERR'].': '.$e->getMessage();
             }
         }
 
         $errors = '';
-        if( isset($validation_errors) && is_array($validation_errors)){
-            if( count($validation_errors) > 0 ){
+        if (isset($validation_errors) && is_array($validation_errors)) {
+            if (count($validation_errors) > 0) {
                 // $errors  = '<div id="errorMsgs">';
                 $errors .= '<p>'.$mod_strings['LBL_SITECFG_FIX_ERRORS'].'</p><ul>';
-                foreach( $validation_errors as $error ){
-                    $errors .= '<li class="error">' . $error . '</li>';
+                foreach ($validation_errors as $error) {
+                    $errors .= '<li class="error">'.$error.'</li>';
                 }
                 $errors .= '</ul>'; //</div>';
             }
@@ -314,7 +314,7 @@ 
         return;
     }
 
-    if(isset($_REQUEST['checkInstallSystem']) && ($_REQUEST['checkInstallSystem'])){
+    if (isset($_REQUEST['checkInstallSystem']) && ($_REQUEST['checkInstallSystem'])) {
         require_once('install/installSystemCheck.php');
         echo runCheck($install_script, $mod_strings);
         return;
@@ -322,7 +322,7 @@ 
 
     //if this is a DB Settings check, then just run the check and return,
     //this is an ajax call and there is no need for further processing
-    if(isset($_REQUEST['checkDBSettings']) && ($_REQUEST['checkDBSettings'])){
+    if (isset($_REQUEST['checkDBSettings']) && ($_REQUEST['checkDBSettings'])) {
         require_once('install/checkDBSettings.php');
         echo checkDBSettings();
         return;
@@ -330,13 +330,13 @@ 
 }
 
 //maintaining the install_type if earlier set to custom
-if(isset($_REQUEST['install_type']) && $_REQUEST['install_type'] == 'custom'){
+if (isset($_REQUEST['install_type']) && $_REQUEST['install_type'] == 'custom') {
     $_SESSION['install_type'] = $_REQUEST['install_type'];
 }
 
 //set the default settings into session
-foreach($installer_defaults as $key =>$val){
-    if(!isset($_SESSION[$key])){
+foreach ($installer_defaults as $key =>$val) {
+    if (!isset($_SESSION[$key])) {
         $_SESSION[$key] = $val;
     }
 }
@@ -347,7 +347,7 @@ 
 $next_clicked = false;
 $next_step = 0;
 
-$workflow = array() ;
+$workflow = array();
 // If less then recommended PHP version, insert old_php.pho into workflow.
 if (check_php_version() === 0) {
 	$workflow[] = 'old_php.php';
@@ -366,9 +366,9 @@ 
 //$workflow[] = 'dbConfig_b.php';
 
 //define web root, which will be used as default for site_url
-if($_SERVER['SERVER_PORT']=='80'){
+if ($_SERVER['SERVER_PORT'] == '80') {
     $web_root = $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
-}else{
+} else {
     $web_root = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
 }
 $web_root = str_replace("/install.php", "", $web_root);
@@ -386,16 +386,16 @@ 
     }
 }
 
-if(empty($sugar_config['cache_dir']) && !empty($_SESSION['cache_dir'])) {
+if (empty($sugar_config['cache_dir']) && !empty($_SESSION['cache_dir'])) {
     $sugar_config['cache_dir'] = $_SESSION['cache_dir'];
 }
 
 // set the form's php var to the loaded config's var else default to sane settings
-if(!isset($_SESSION['setup_site_url'])  || empty($_SESSION['setup_site_url'])) {
-    if(isset($sugar_config['site_url']) && !empty($sugar_config['site_url'])) {
-        $_SESSION['setup_site_url']= $sugar_config['site_url'];
+if (!isset($_SESSION['setup_site_url']) || empty($_SESSION['setup_site_url'])) {
+    if (isset($sugar_config['site_url']) && !empty($sugar_config['site_url'])) {
+        $_SESSION['setup_site_url'] = $sugar_config['site_url'];
     } else {
-        $_SESSION['setup_site_url']= $web_root;
+        $_SESSION['setup_site_url'] = $web_root;
     }
 }
 
@@ -418,8 +418,8 @@ 
 //$workflow[] = 'confirmSettings.php';
 $workflow[] = 'performSetup.php';
 
-if(!isset($_SESSION['oc_install']) ||  $_SESSION['oc_install'] == false){
-    if(isset($_SESSION['install_type'])  && !empty($_SESSION['install_type'])  && $_SESSION['install_type']=='custom'){
+if (!isset($_SESSION['oc_install']) || $_SESSION['oc_install'] == false) {
+    if (isset($_SESSION['install_type']) && !empty($_SESSION['install_type']) && $_SESSION['install_type'] == 'custom') {
         //$workflow[] = 'download_patches.php';
         $workflow[] = 'download_modules.php';
     }
@@ -430,8 +430,8 @@ 
 
 
 // increment/decrement the workflow pointer
-if(!empty($_REQUEST['goto'])) {
-    switch($_REQUEST['goto']) {
+if (!empty($_REQUEST['goto'])) {
+    switch ($_REQUEST['goto']) {
         case $mod_strings['LBL_CHECKSYS_RECHECK']:
             $next_step = $_REQUEST['current_step'];
             break;
@@ -453,7 +453,7 @@ 
     }
 }
 // Add check here to see if a silent install config file exists; if so then launch silent installer
-elseif ( is_file('config_si.php') && empty($sugar_config['installer_locked'])) {
+elseif (is_file('config_si.php') && empty($sugar_config['installer_locked'])) {
 
     $langHeader = get_language_header();
 
@@ -498,13 +498,13 @@ 
 
 
 
-$exclude_files = array('complete_install.php','register.php','download_modules.php');
+$exclude_files = array('complete_install.php', 'register.php', 'download_modules.php');
 
-if(isset($next_step) && isset($workflow[$next_step]) && !in_array($workflow[$next_step],$exclude_files) && isset($sugar_config['installer_locked']) && $sugar_config['installer_locked'] == true) {
+if (isset($next_step) && isset($workflow[$next_step]) && !in_array($workflow[$next_step], $exclude_files) && isset($sugar_config['installer_locked']) && $sugar_config['installer_locked'] == true) {
     $the_file = 'installDisabled.php';
     $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
     $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-    $disabled_text =<<<EOQ
+    $disabled_text = <<<EOQ
 		<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 		<pre>
 			'installer_locked' => false,
@@ -514,12 +514,12 @@ 
 		<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
 EOQ;
 }
-else{
+else {
     $validation_errors = array();
 // process the data posted
-if($next_clicked) {
+if ($next_clicked) {
 	// store the submitted data because the 'Next' button was clicked
-    switch($workflow[trim($_REQUEST['current_step'])]) {
+    switch ($workflow[trim($_REQUEST['current_step'])]) {
         case 'old_php.php':
 		$_SESSION['language'] = $_REQUEST['language'];
 		$_SESSION['setup_old_php'] = get_boolean_from_request('setup_old_php');
@@ -535,25 +535,25 @@ 
 
 
                 // eventually default all vars here, with overrides from config.php
-                if(is_readable('config.php')) {
+                if (is_readable('config.php')) {
                     global $sugar_config;
                     include_once('config.php');
                 }
 
                 $default_db_type = 'mysql';
 
-                if(!isset($_SESSION['setup_db_type'])) {
+                if (!isset($_SESSION['setup_db_type'])) {
                     $_SESSION['setup_db_type'] = empty($sugar_config['dbconfig']['db_type']) ? $default_db_type : $sugar_config['dbconfig']['db_type'];
                 }
 
                 break;
             //TODO--low: add this functionality to installConfig.php
             case 'installType.php':
-                $_SESSION['install_type']   = $_REQUEST['install_type'];
-                if(isset($_REQUEST['setup_license_key']) && !empty($_REQUEST['setup_license_key'])){
-                    $_SESSION['setup_license_key']  = $_REQUEST['setup_license_key'];
+                $_SESSION['install_type'] = $_REQUEST['install_type'];
+                if (isset($_REQUEST['setup_license_key']) && !empty($_REQUEST['setup_license_key'])) {
+                    $_SESSION['setup_license_key'] = $_REQUEST['setup_license_key'];
                 }
-                $_SESSION['licenseKey_submitted']      = true;
+                $_SESSION['licenseKey_submitted'] = true;
 
 
 
@@ -562,39 +562,39 @@ 
             case 'installConfig.php':
 
                 //case 'systemOptions.php':
-                if(isset($_REQUEST['setup_db_type'])) {
+                if (isset($_REQUEST['setup_db_type'])) {
                     $_SESSION['setup_db_type'] = $_REQUEST['setup_db_type'];
                 }
                 $validation_errors = validate_systemOptions();
-                if(count($validation_errors) > 0) {
+                if (count($validation_errors) > 0) {
                     $next_step--;
                 }
                 //break;
 
                 //case 'dbConfig_a.php':
                 //validation is now done through ajax call to checkDBSettings.php
-                if(isset($_REQUEST['setup_db_drop_tables'])){
+                if (isset($_REQUEST['setup_db_drop_tables'])) {
                     $_SESSION['setup_db_drop_tables'] = $_REQUEST['setup_db_drop_tables'];
-                    if($_SESSION['setup_db_drop_tables']=== true || $_SESSION['setup_db_drop_tables'] == 'true'){
+                    if ($_SESSION['setup_db_drop_tables'] === true || $_SESSION['setup_db_drop_tables'] == 'true') {
                         $_SESSION['setup_db_create_database'] = false;
                     }
                 }
                 //break;
 
                 //case 'siteConfig_a.php':
-                if(isset($_REQUEST['setup_site_url'])){$_SESSION['setup_site_url']          = $_REQUEST['setup_site_url'];}
-                if(isset($_REQUEST['setup_system_name'])){$_SESSION['setup_system_name']    = $_REQUEST['setup_system_name'];}
-                if(isset($_REQUEST['setup_db_collation'])) {
+                if (isset($_REQUEST['setup_site_url'])) {$_SESSION['setup_site_url']          = $_REQUEST['setup_site_url']; }
+                if (isset($_REQUEST['setup_system_name'])) {$_SESSION['setup_system_name']    = $_REQUEST['setup_system_name']; }
+                if (isset($_REQUEST['setup_db_collation'])) {
                     $_SESSION['setup_db_options']['collation'] = $_REQUEST['setup_db_collation'];
                 }
                 $_SESSION['setup_site_admin_user_name']             = $_REQUEST['setup_site_admin_user_name'];
                 $_SESSION['setup_site_admin_password']              = $_REQUEST['setup_site_admin_password'];
                 $_SESSION['setup_site_admin_password_retype']       = $_REQUEST['setup_site_admin_password_retype'];
-                $_SESSION['siteConfig_submitted']               = true;
+                $_SESSION['siteConfig_submitted'] = true;
 
                 $validation_errors = array();
                 $validation_errors = validate_siteConfig('a');
-                if(count($validation_errors) > 0 || $_REQUEST['goto'] == 'resend') {
+                if (count($validation_errors) > 0 || $_REQUEST['goto'] == 'resend') {
                     $next_step--;
                 }
                 //break;
@@ -602,56 +602,56 @@ 
                 //case 'siteConfig_b.php':
                 $_SESSION['setup_site_sugarbeet_automatic_checks'] = get_boolean_from_request('setup_site_sugarbeet_automatic_checks');
 
-                $_SESSION['setup_site_custom_session_path']     = get_boolean_from_request('setup_site_custom_session_path');
-                if($_SESSION['setup_site_custom_session_path']){
-                    $_SESSION['setup_site_session_path']            = $_REQUEST['setup_site_session_path'];
-                }else{
+                $_SESSION['setup_site_custom_session_path'] = get_boolean_from_request('setup_site_custom_session_path');
+                if ($_SESSION['setup_site_custom_session_path']) {
+                    $_SESSION['setup_site_session_path'] = $_REQUEST['setup_site_session_path'];
+                } else {
                     $_SESSION['setup_site_session_path'] = '';
                 }
 
-                $_SESSION['setup_site_custom_log_dir']          = get_boolean_from_request('setup_site_custom_log_dir');
-                if($_SESSION['setup_site_custom_log_dir']){
-                    $_SESSION['setup_site_log_dir']                 = $_REQUEST['setup_site_log_dir'];
-                }else{
+                $_SESSION['setup_site_custom_log_dir'] = get_boolean_from_request('setup_site_custom_log_dir');
+                if ($_SESSION['setup_site_custom_log_dir']) {
+                    $_SESSION['setup_site_log_dir'] = $_REQUEST['setup_site_log_dir'];
+                } else {
                     $_SESSION['setup_site_log_dir'] = '.';
                 }
 
-                $_SESSION['setup_site_specify_guid']            = get_boolean_from_request('setup_site_specify_guid');
-                if($_SESSION['setup_site_specify_guid']){
-                    $_SESSION['setup_site_guid']                    = $_REQUEST['setup_site_guid'];
-                }else{
+                $_SESSION['setup_site_specify_guid'] = get_boolean_from_request('setup_site_specify_guid');
+                if ($_SESSION['setup_site_specify_guid']) {
+                    $_SESSION['setup_site_guid'] = $_REQUEST['setup_site_guid'];
+                } else {
                     $_SESSION['setup_site_guid'] = '';
                 }
-                $_SESSION['siteConfig_submitted']               = true;
-                if(isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])){
+                $_SESSION['siteConfig_submitted'] = true;
+                if (isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])) {
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = get_boolean_from_request('setup_site_sugarbeet_anonymous_stats');
-                }else{
+                } else {
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = 0;
                 }
 
                 $validation_errors = array();
                 $validation_errors = validate_siteConfig('b');
-                if(count($validation_errors) > 0) {
+                if (count($validation_errors) > 0) {
                     $next_step--;
                 }
                 break;
         }
     }
 
-    if($next_step == 9999) {
+    if ($next_step == 9999) {
         $the_file = 'SilentInstall';
-    }else if($next_step == 9191) {
-        $_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
+    } else if ($next_step == 9191) {
+        $_SESSION['oc_server_url'] = $_REQUEST['oc_server_url'];
         $_SESSION['oc_username']    = $_REQUEST['oc_username'];
         $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
         $the_file = 'oc_convert.php';
     }
-    else{
+    else {
         $the_file = $workflow[$next_step];
 
     }
 
-switch($the_file) {
+switch ($the_file) {
     case 'old_php.php':
     case 'welcome.php':
     case 'license.php':
@@ -663,7 +663,7 @@ 
 			unset($_SESSION['test_session']);
         @session_start();
 
-            if(!isset($_SESSION['test_session']))
+            if (!isset($_SESSION['test_session']))
             {
                 $the_file = 'installDisabled.php';
                 // PHP.ini location -
@@ -674,14 +674,14 @@ 
                 break;
             }
             // check to see if installer has been disabled
-            if(is_readable('config.php') && (filesize('config.php') > 0)) {
+            if (is_readable('config.php') && (filesize('config.php') > 0)) {
                 include_once('config.php');
 
-                if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
+                if (!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
                     $the_file = 'installDisabled.php';
                     $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
                     $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-                    $disabled_text =<<<EOQ
+                    $disabled_text = <<<EOQ
 					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 					<pre>
 						'installer_locked' => false,
@@ -692,7 +692,7 @@ 
 EOQ;
                     //if this is an offline client installation but the conversion did not succeed,
                     //then try to convert again
-                    if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
+                    if (isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
                         header('Location: index.php?entryPoint=oc_convert&first_time=true');
                         exit ();
                     }
@@ -722,22 +722,22 @@ 
             }
 
             $validation_errors = validate_dbConfig('a');
-            if(count($validation_errors) > 0) {
+            if (count($validation_errors) > 0) {
                 $the_file = 'dbConfig_a.php';
                 $si_errors = true;
             }
             $validation_errors = validate_siteConfig('a');
-            if(count($validation_errors) > 0) {
+            if (count($validation_errors) > 0) {
                 $the_file = 'siteConfig_a.php';
                 $si_errors = true;
             }
             $validation_errors = validate_siteConfig('b');
-            if(count($validation_errors) > 0) {
+            if (count($validation_errors) > 0) {
                 $the_file = 'siteConfig_b.php';
                 $si_errors = true;
             }
 
-            if(!$si_errors){
+            if (!$si_errors) {
                 $the_file = 'performSetup.php';
             }
             require_once('jssource/minify.php');
@@ -770,13 +770,13 @@ 
             // check whether we're getting this request from a command line tool
             // we want to output brief messages if we're outputting to a command line tool
             $cli_mode = false;
-            if(isset($_REQUEST['cli']) && ($_REQUEST['cli'] == 'true')) {
+            if (isset($_REQUEST['cli']) && ($_REQUEST['cli'] == 'true')) {
                 $_SESSION['cli'] = true;
                 // if we have errors, just shoot them back now
-                if(count($validation_errors) > 0) {
-                    foreach($validation_errors as $error) {
+                if (count($validation_errors) > 0) {
+                    foreach ($validation_errors as $error) {
                         print($mod_strings['ERR_ERROR_GENERAL']."\n");
-                        print("    " . $error . "\n");
+                        print("    ".$error."\n");
                         print("Exit 1\n");
                         exit(1);
                     }
@@ -793,7 +793,7 @@ 
 
 // change to require to get a good file load error message if the file is not available.
 
-require('install/' . $the_file);
+require('install/'.$the_file);
 
 installerHook('post_installFileRequire', array('the_file' => $the_file));
 

Braces +13 added lines, -15 removed lines

@@ -215,8 +215,7 @@ 
                 $detectedType = exif_imagetype($_FILES['company_logo']['tmp_name']);
                 if(!in_array($detectedType, $allowedTypes)) {
                     $errors[] = $mod_strings['ERR_UPLOAD_FILETYPE'];
-                }
-                else {
+                } else {
                     // uploaded image stored in the /custom path instead of put into the original theme directory..
 
                     mkdir_recursive('custom/' . SugarThemeRegistry::current()->getDefaultImagePath(), true);
@@ -224,8 +223,7 @@ 
                     $destFile = 'custom/' . $tmpvar[0];
                     if (!move_uploaded_file($_FILES['company_logo']['tmp_name'], $destFile)) {
                         $errors[] = $mod_strings['ERR_LANG_UPLOAD_1'];
-                    }
-                    else {
+                    } else {
                         $filepath = $destFile;
                     }
                 }
@@ -275,7 +273,9 @@ 
 
     if(isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])){
         // store configuration by form to session
-        if(!isset($_SESSION)) session_start();
+        if(!isset($_SESSION)) {
+            session_start();
+        }
         $_SESSION = array_merge($_SESSION, $_POST);
 
         // TODO--low: don't forget the custom type install settings! validate here..
@@ -368,7 +368,7 @@ 
 //define web root, which will be used as default for site_url
 if($_SERVER['SERVER_PORT']=='80'){
     $web_root = $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
-}else{
+} else{
     $web_root = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
 }
 $web_root = str_replace("/install.php", "", $web_root);
@@ -513,8 +513,7 @@ 
 
 		<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
 EOQ;
-}
-else{
+} else{
     $validation_errors = array();
 // process the data posted
 if($next_clicked) {
@@ -605,27 +604,27 @@ 
                 $_SESSION['setup_site_custom_session_path']     = get_boolean_from_request('setup_site_custom_session_path');
                 if($_SESSION['setup_site_custom_session_path']){
                     $_SESSION['setup_site_session_path']            = $_REQUEST['setup_site_session_path'];
-                }else{
+                } else{
                     $_SESSION['setup_site_session_path'] = '';
                 }
 
                 $_SESSION['setup_site_custom_log_dir']          = get_boolean_from_request('setup_site_custom_log_dir');
                 if($_SESSION['setup_site_custom_log_dir']){
                     $_SESSION['setup_site_log_dir']                 = $_REQUEST['setup_site_log_dir'];
-                }else{
+                } else{
                     $_SESSION['setup_site_log_dir'] = '.';
                 }
 
                 $_SESSION['setup_site_specify_guid']            = get_boolean_from_request('setup_site_specify_guid');
                 if($_SESSION['setup_site_specify_guid']){
                     $_SESSION['setup_site_guid']                    = $_REQUEST['setup_site_guid'];
-                }else{
+                } else{
                     $_SESSION['setup_site_guid'] = '';
                 }
                 $_SESSION['siteConfig_submitted']               = true;
                 if(isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])){
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = get_boolean_from_request('setup_site_sugarbeet_anonymous_stats');
-                }else{
+                } else{
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = 0;
                 }
 
@@ -640,13 +639,12 @@ 
 
     if($next_step == 9999) {
         $the_file = 'SilentInstall';
-    }else if($next_step == 9191) {
+    } else if($next_step == 9191) {
         $_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
         $_SESSION['oc_username']    = $_REQUEST['oc_username'];
         $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
         $the_file = 'oc_convert.php';
-    }
-    else{
+    } else{
         $the_file = $workflow[$next_step];
 
     }

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Metadata.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 
 class OneLogin_Saml2_Metadata
 {
-    const TIME_VALID = 172800;  // 2 days
+    const TIME_VALID = 172800; // 2 days
     const TIME_CACHED = 604800; // 1 week
 
     /**
@@ -27,9 +27,9 @@ 
     {
 
         if (!isset($validUntil)) {
-            $validUntil =  time() + self::TIME_VALID;
+            $validUntil = time() + self::TIME_VALID;
         }
-        $validUntilTime =  gmdate('Y-m-d\TH:i:s\Z', $validUntil);
+        $validUntilTime = gmdate('Y-m-d\TH:i:s\Z', $validUntil);
 
         if (!isset($cacheDuration)) {
             $cacheDuration = self::TIME_CACHED;
@@ -103,7 +103,7 @@ 
             $attrCsDesc = '';
             if (isset($sp['attributeConsumingService']['serviceDescription'])) {
                 $attrCsDesc = sprintf(
-                    '            <md:ServiceDescription xml:lang="en">%s</md:ServiceDescription>' . PHP_EOL,
+                    '            <md:ServiceDescription xml:lang="en">%s</md:ServiceDescription>'.PHP_EOL,
                     $sp['attributeConsumingService']['serviceDescription']
                 );
             }
@@ -130,7 +130,7 @@ 
                         $attribute['attributeValue'] = array($attribute['attributeValue']);
                     }
                     foreach ($attribute['attributeValue'] as $attrValue) {
-                        $reqAttrAuxStr .=<<<ATTRIBUTEVALUE
+                        $reqAttrAuxStr .= <<<ATTRIBUTEVALUE
 
                 <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">{$attrValue}</saml:AttributeValue>
 ATTRIBUTEVALUE;
@@ -138,7 +138,7 @@ 
                     $reqAttrAuxStr .= "\n            </md:RequestedAttribute>";
                 }
 
-                $requestedAttributeData[] = $requestedAttributeStr . $reqAttrAuxStr;
+                $requestedAttributeData[] = $requestedAttributeStr.$reqAttrAuxStr;
             }
 
             $requestedAttributeStr = implode(PHP_EOL, $requestedAttributeData);
@@ -206,7 +206,7 @@ 
             if (!$xml) {
                 throw new Exception('Error parsing metadata');
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw new Exception('Error parsing metadata. '.$e->getMessage());
         }
 

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/LogoutRequest.php

Indentation +6 added lines, -6 removed lines

@@ -7,9 +7,9 @@ 
 class OneLogin_Saml2_LogoutRequest
 {
     /**
-    * Contains the ID of the Logout Request
-    * @var string
-    */
+     * Contains the ID of the Logout Request
+     * @var string
+     */
     public $id;
 
     /**
@@ -25,9 +25,9 @@ 
     protected $_logoutRequest;
 
     /**
-    * After execute a validation process, this var contains the cause
-    * @var string
-    */
+     * After execute a validation process, this var contains the cause
+     * @var string
+     */
     private $_error;
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -376,7 +376,7 @@
             }
 
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Response.php

Indentation +11 added lines, -11 removed lines

@@ -470,11 +470,11 @@ 
         }
     }
 
-   /**
-    * Checks that the samlp:Response/saml:Assertion/saml:Conditions element exists and is unique.
-    *
-    * @return boolean true if the Conditions element exists and is unique
-    */
+    /**
+     * Checks that the samlp:Response/saml:Assertion/saml:Conditions element exists and is unique.
+     *
+     * @return boolean true if the Conditions element exists and is unique
+     */
     public function checkOneCondition()
     {
         $entries = $this->_queryAssertion("/saml:Conditions");
@@ -485,11 +485,11 @@ 
         }
     }
 
-   /**
-    * Checks that the samlp:Response/saml:Assertion/saml:AuthnStatement element exists and is unique.
-    *
-    * @return boolean true if the AuthnStatement element exists and is unique
-    */
+    /**
+     * Checks that the samlp:Response/saml:Assertion/saml:AuthnStatement element exists and is unique.
+     *
+     * @return boolean true if the AuthnStatement element exists and is unique
+     */
     public function checkOneAuthnStatement()
     {
         $entries = $this->_queryAssertion("/saml:AuthnStatement");
@@ -1075,7 +1075,7 @@ 
               !$decrypted->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns') &&
               !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml') &&
               !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml2')
-              ) {
+                ) {
                 if (strpos($encryptedAssertion->tagName, 'saml2:') !== false) {
                     $ns = 'xmlns:saml2';
                 } else if (strpos($encryptedAssertion->tagName, 'saml:') !== false) {

Spacing +6 added lines, -6 removed lines

@@ -398,7 +398,7 @@ 
                 }
             }
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {
@@ -736,7 +736,7 @@ 
 
             $attributeValues = array();
             foreach ($entry->childNodes as $childNode) {
-                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '') . 'AttributeValue';
+                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '').'AttributeValue';
                 if ($childNode->nodeType == XML_ELEMENT_NODE && $childNode->tagName === $tagName) {
                     $attributeValues[] = $childNode->nodeValue;
                 }
@@ -961,7 +961,7 @@ 
         $xpath->registerNamespace('xenc', OneLogin_Saml2_Constants::NS_XENC);
 
         $assertionNode = '/samlp:Response/saml:Assertion';
-        $signatureQuery = $assertionNode . '/ds:Signature/ds:SignedInfo/ds:Reference';
+        $signatureQuery = $assertionNode.'/ds:Signature/ds:SignedInfo/ds:Reference';
         $assertionReferenceNode = $xpath->query($signatureQuery)->item(0);
         if (!$assertionReferenceNode) {
             // is the response signed as a whole?
@@ -974,9 +974,9 @@ 
                 } else {
                     $id = substr($responseReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
                 }
-                $nameQuery = "/samlp:Response[@ID='$id']/saml:Assertion" . $assertionXpath;
+                $nameQuery = "/samlp:Response[@ID='$id']/saml:Assertion".$assertionXpath;
             } else {
-                $nameQuery = "/samlp:Response/saml:Assertion" . $assertionXpath;
+                $nameQuery = "/samlp:Response/saml:Assertion".$assertionXpath;
             }
         } else {
             $uri = $assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue;
@@ -985,7 +985,7 @@ 
             } else {
                 $id = substr($assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
             }
-            $nameQuery = $assertionNode."[@ID='$id']" . $assertionXpath;
+            $nameQuery = $assertionNode."[@ID='$id']".$assertionXpath;
         }
 
         return $xpath->query($nameQuery);

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Auth.php

Spacing +6 added lines, -6 removed lines

@@ -155,7 +155,7 @@ 
      */
     public function setStrict($value)
     {
-        if (! (is_bool($value))) {
+        if (!(is_bool($value))) {
             throw new OneLogin_Saml2_Error(
                 'Invalid value passed to setStrict()',
                 OneLogin_Saml2_Error::SETTINGS_INVALID_SYNTAX
@@ -269,7 +269,7 @@ 
 
                 $security = $this->_settings->getSecurityData();
                 if (isset($security['logoutResponseSigned']) && $security['logoutResponseSigned']) {
-                    $signature = $this->buildResponseSignature($logoutResponse, isset($parameters['RelayState'])? $parameters['RelayState']: null, $security['signatureAlgorithm']);
+                    $signature = $this->buildResponseSignature($logoutResponse, isset($parameters['RelayState']) ? $parameters['RelayState'] : null, $security['signatureAlgorithm']);
                     $parameters['SigAlg'] = $security['signatureAlgorithm'];
                     $parameters['Signature'] = $signature;
                 }
@@ -579,13 +579,13 @@ 
             if (isset($relayState)) {
                 $msg .= '&RelayState='.rawurlencode($relayState);
             }
-            $msg .= '&SigAlg=' . rawurlencode($signAlgorithm);
+            $msg .= '&SigAlg='.rawurlencode($signAlgorithm);
         } else {
             $msg = 'SAMLRequest='.urlencode($samlRequest);
             if (isset($relayState)) {
                 $msg .= '&RelayState='.urlencode($relayState);
             }
-            $msg .= '&SigAlg=' . urlencode($signAlgorithm);
+            $msg .= '&SigAlg='.urlencode($signAlgorithm);
         }
         $signature = $objKey->signData($msg);
         return base64_encode($signature);
@@ -622,13 +622,13 @@ 
             if (isset($relayState)) {
                 $msg .= '&RelayState='.rawurlencode($relayState);
             }
-            $msg .= '&SigAlg=' . rawurlencode($signAlgorithm);
+            $msg .= '&SigAlg='.rawurlencode($signAlgorithm);
         } else {
             $msg = 'SAMLResponse='.urlencode($samlResponse);
             if (isset($relayState)) {
                 $msg .= '&RelayState='.urlencode($relayState);
             }
-            $msg .= '&SigAlg=' . urlencode($signAlgorithm);
+            $msg .= '&SigAlg='.urlencode($signAlgorithm);
         }
         $signature = $objKey->signData($msg);
         return base64_encode($signature);

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/IdPMetadataParser.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
             } else {
                 throw new Exception(curl_error($ch), curl_errno($ch));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
         }
         return $metadataInfo;
     }
@@ -63,7 +63,7 @@ 
                 $data = file_get_contents($filepath);
                 $metadataInfo = self::parseXML($data, $entityId);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
         }
         return $metadataInfo;
     }
@@ -95,9 +95,9 @@ 
 
             $customIdPStr = '';
             if (!empty($entityId)) {
-                $customIdPStr = '[@entityID="' . $entityId . '"]';
+                $customIdPStr = '[@entityID="'.$entityId.'"]';
             }
-            $idpDescryptorXPath = '//md:EntityDescriptor' . $customIdPStr . '/md:IDPSSODescriptor';
+            $idpDescryptorXPath = '//md:EntityDescriptor'.$customIdPStr.'/md:IDPSSODescriptor';
 
             $idpDescriptorNodes = OneLogin_Saml2_Utils::query($dom, $idpDescryptorXPath);
 
@@ -179,7 +179,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw new Exception('Error parsing metadata. '.$e->getMessage());
         }
 

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/LogoutResponse.php

Indentation +9 added lines, -9 removed lines

@@ -7,9 +7,9 @@ 
 class OneLogin_Saml2_LogoutResponse
 {
     /**
-    * Contains the ID of the Logout Response
-    * @var string
-    */
+     * Contains the ID of the Logout Response
+     * @var string
+     */
     public $id;
 
     /**
@@ -31,9 +31,9 @@ 
     public $document;
 
     /**
-    * After execute a validation process, if it fails, this var contains the cause
-    * @var string
-    */
+     * After execute a validation process, if it fails, this var contains the cause
+     * @var string
+     */
     private $_error;
 
     /**
@@ -270,9 +270,9 @@ 
         return $this->_error;
     }
 
-   /**
-    * @return the ID of the Response
-    */
+    /**
+     * @return the ID of the Response
+     */
     public function getId()
     {
         return $this->id;

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
                 }
             }
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Utils.php

Spacing +28 added lines, -28 removed lines

@@ -124,7 +124,7 @@ 
             }
         }
 
-        $schemaFile = dirname(__FILE__).'/schemas/' . $schema;
+        $schemaFile = dirname(__FILE__).'/schemas/'.$schema;
         $oldEntityLoader = libxml_disable_entity_loader(false);
         $res = $dom->schemaValidate($schemaFile);
         libxml_disable_entity_loader($oldEntityLoader);
@@ -220,7 +220,7 @@ 
      */
     public static function getStringBetween($str, $start, $end)
     {
-        $str = ' ' . $str;
+        $str = ' '.$str;
         $ini = strpos($str, $start);
 
         if ($ini == 0) {
@@ -249,13 +249,13 @@ 
         assert('is_array($parameters)');
 
         if (substr($url, 0, 1) === '/') {
-            $url = self::getSelfURLhost() . $url;
+            $url = self::getSelfURLhost().$url;
         }
 
         /* Verify that the URL is to a http or https site. */
         if (!preg_match('@^https?:\/\/@i', $url)) {
             throw new OneLogin_Saml2_Error(
-                'Redirect to invalid URL: ' . $url,
+                'Redirect to invalid URL: '.$url,
                 OneLogin_Saml2_Error::REDIRECT_INVALID_URL
             );
         }
@@ -274,17 +274,17 @@ 
             } else if (is_array($value)) {
                 $param = "";
                 foreach ($value as $val) {
-                    $param .= urlencode($name) . "[]=" . urlencode($val). '&';
+                    $param .= urlencode($name)."[]=".urlencode($val).'&';
                 }
                 if (!empty($param)) {
                     $param = substr($param, 0, -1);
                 }
             } else {
-                $param = urlencode($name) . '=' . urlencode($value);
+                $param = urlencode($name).'='.urlencode($value);
             }
 
             if (!empty($param)) {
-                $url .= $paramPrefix . $param;
+                $url .= $paramPrefix.$param;
                 $paramPrefix = '&';
             }
         }
@@ -295,7 +295,7 @@ 
 
         header('Pragma: no-cache');
         header('Cache-Control: no-cache, must-revalidate');
-        header('Location: ' . $url);
+        header('Location: '.$url);
         exit();
     }
 
@@ -376,10 +376,10 @@ 
         $portnumber = self::getSelfPort();
 
         if (isset($portnumber) && ($portnumber != '80') && ($portnumber != '443')) {
-            $port = ':' . $portnumber;
+            $port = ':'.$portnumber;
         }
 
-        return $protocol."://" . $currenthost . $port;
+        return $protocol."://".$currenthost.$port;
     }
 
     /**
@@ -400,7 +400,7 @@ 
         } else if ($baseurlpath == '/') {
             self::$_baseurlpath = '/';
         } else {
-            self::$_baseurlpath = '/' . trim($baseurlpath, '/') . '/';
+            self::$_baseurlpath = '/'.trim($baseurlpath, '/').'/';
         }
     }
 
@@ -570,7 +570,7 @@ 
             $route = $infoWithBaseURLPath;
         }
 
-        $selfRoutedURLNoQuery = $selfURLhost . $route;
+        $selfRoutedURLNoQuery = $selfURLhost.$route;
         return $selfRoutedURLNoQuery;
     }
 
@@ -598,7 +598,7 @@ 
             $requestURI = $infoWithBaseURLPath;
         }
 
-        return $selfURLhost . $requestURI;
+        return $selfURLhost.$requestURI;
     }
 
     /**
@@ -645,7 +645,7 @@ 
      */
     public static function generateUniqueID()
     {
-        return 'ONELOGIN_' . sha1(uniqid(mt_rand(), true));
+        return 'ONELOGIN_'.sha1(uniqid(mt_rand(), true));
     }
 
     /**
@@ -682,10 +682,10 @@ 
         /* We use a very strict regex to parse the timestamp. */
         $exp1 = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)';
         $exp2 = 'T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d+)?Z$/D';
-        if (preg_match($exp1 . $exp2, $time, $matches) == 0) {
+        if (preg_match($exp1.$exp2, $time, $matches) == 0) {
             throw new Exception(
-                'Invalid SAML2 timestamp passed to' .
-                ' parseSAML2Time: ' . $time
+                'Invalid SAML2 timestamp passed to'.
+                ' parseSAML2Time: '.$time
             );
         }
 
@@ -729,7 +729,7 @@ 
         /* Parse the duration. We use a very strict pattern. */
         $durationRegEx = '#^(-?)P(?:(?:(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)S)?)?)|(?:(\\d+)W))$#D';
         if (!preg_match($durationRegEx, $duration, $matches)) {
-            throw new Exception('Invalid ISO 8601 duration: ' . $duration);
+            throw new Exception('Invalid ISO 8601 duration: '.$duration);
         }
 
         $durYears = (empty($matches[2]) ? 0 : (int)$matches[2]);
@@ -1091,9 +1091,9 @@ 
 
             if ($inputKeyAlgo !== $symKeyInfoAlgo) {
                 throw new OneLogin_Saml2_ValidationError(
-                    'Algorithm mismatch between input key and key used to encrypt ' .
-                    ' the symmetric key for the message. Key was: ' .
-                    var_export($inputKeyAlgo, true) . '; message was: ' .
+                    'Algorithm mismatch between input key and key used to encrypt '.
+                    ' the symmetric key for the message. Key was: '.
+                    var_export($inputKeyAlgo, true).'; message was: '.
                     var_export($symKeyInfoAlgo, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
@@ -1105,7 +1105,7 @@ 
             if ($keySize === null) {
                 // To protect against "key oracle" attacks
                 throw new OneLogin_Saml2_ValidationError(
-                    'Unknown key size for encryption algorithm: ' . var_export($symmetricKey->type, true),
+                    'Unknown key size for encryption algorithm: '.var_export($symmetricKey->type, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
             }
@@ -1115,7 +1115,7 @@ 
                 $encryptedKey = $encKey->getCipherValue();
                 $pkey = openssl_pkey_get_details($symmetricKeyInfo->key);
                 $pkey = sha1(serialize($pkey), true);
-                $key = sha1($encryptedKey . $pkey, true);
+                $key = sha1($encryptedKey.$pkey, true);
 
                 /* Make sure that the key has the correct length. */
                 if (strlen($key) > $keySize) {
@@ -1129,8 +1129,8 @@ 
             $symKeyAlgo = $symmetricKey->getAlgorithm();
             if ($inputKeyAlgo !== $symKeyAlgo) {
                 throw new OneLogin_Saml2_ValidationError(
-                    'Algorithm mismatch between input key and key in message. ' .
-                    'Key was: ' . var_export($inputKeyAlgo, true) . '; message was: ' .
+                    'Algorithm mismatch between input key and key in message. '.
+                    'Key was: '.var_export($inputKeyAlgo, true).'; message was: '.
                     var_export($symKeyAlgo, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
@@ -1243,7 +1243,7 @@ 
         $objXMLSecDSig->add509Cert($cert, true);
 
         $insertBefore = $rootNode->firstChild;
-        $messageTypes = array('AuthnRequest', 'Response', 'LogoutRequest','LogoutResponse');
+        $messageTypes = array('AuthnRequest', 'Response', 'LogoutRequest', 'LogoutResponse');
         if (in_array($rootNode->localName, $messageTypes)) {
             $issuerNodes = self::query($dom, '/'.$rootNode->tagName.'/saml:Issuer');
             if ($issuerNodes->length == 1) {
@@ -1309,7 +1309,7 @@ 
 
         try {
             $retVal = $objXMLSecDSig->validateReference();
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw $e;
         }
 
@@ -1401,7 +1401,7 @@ 
             if ($signAlg != XMLSecurityKey::RSA_SHA1) {
                 try {
                     $objKey = OneLogin_Saml2_Utils::castKey($objKey, $signAlg, 'public');
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $ex = new OneLogin_Saml2_ValidationError(
                         "Invalid signAlg in the recieved ".$strMessageType,
                         OneLogin_Saml2_ValidationError::INVALID_SIGNATURE