adamjakab / SuiteCRM

install/language/en_us.lang.php

Indentation +396 added lines, -396 removed lines

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

include/InlineEditing/InlineEditing.php

Indentation +5 added lines, -5 removed lines

@@ -427,7 +427,7 @@ 
     }
 
     //if field is of type radio.
-     if ($vardef['type'] == "radioenum" || $vardef['type'] == "enum" || $vardef['type'] == "dynamicenum") {
+        if ($vardef['type'] == "radioenum" || $vardef['type'] == "enum" || $vardef['type'] == "dynamicenum") {
         $value = $app_list_strings[$vardef['options']][$value];
     }
 
@@ -476,10 +476,10 @@ 
             $value .= "</a>";
         }
     }
-	if($vardef['type'] == "url")
-	{
-		$value = '<a href='.$value.' target="_blank">'.$value.'</a>';
-	}
+    if($vardef['type'] == "url")
+    {
+        $value = '<a href='.$value.' target="_blank">'.$value.'</a>';
+    }
 
     return $value;
 }

Spacing +37 added lines, -37 removed lines

@@ -42,9 +42,9 @@ 
 
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
-    $bean = BeanFactory::getBean($module,$id);
+    $bean = BeanFactory::getBean($module, $id);
 
-    if(!checkAccess($bean)){
+    if (!checkAccess($bean)) {
         return false;
     }
 
@@ -54,7 +54,7 @@ 
     $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('include/InlineEditing/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('include/InlineEditing/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     if (!is_file($file)
         || inDeveloperMode()
@@ -99,7 +99,7 @@ 
         if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
-            $vardef['id_name'] = $vardef['name'] . '_id';
+            $vardef['id_name'] = $vardef['name'].'_id';
             if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $vardef['module'] = $focus->{$vardef['name']}->getRelatedModuleName();
             }
@@ -135,15 +135,15 @@ 
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
         // remove extra wrong javascript which breaks auto complete on flexi relationship parent fields
-        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/","",$contents);
+        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/", "", $contents);
 
 
         if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
 
-            $contents = str_replace('"' . $vardef['id_name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.id_name}"{literal}', $contents);
-            $contents = str_replace('"' . $vardef['name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
             // regex below fixes button javascript for flexi relationship
-            if($vardef['type'] == 'parent') {
+            if ($vardef['type'] == 'parent') {
                 $contents = str_replace("onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"{\$fields.parent_name.id_name}", "onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"parent_id", $contents);
             }
         }
@@ -177,10 +177,10 @@ 
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if (!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
@@ -219,7 +219,7 @@ 
     }
 
     if ($fieldlist[$fieldname]['type'] == 'link') {
-        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'] . '_id';
+        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
         if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $relateField = $fieldlist[$fieldname]['name'];
@@ -227,7 +227,7 @@ 
         }
     }
 
-    if($fieldlist[$fieldname]['type'] == 'parent'){
+    if ($fieldlist[$fieldname]['type'] == 'parent') {
         $fieldlist['parent_id']['name'] = 'parent_id';
     }
 
@@ -238,15 +238,15 @@ 
     }
 
     if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
-        if($value){
+        if ($value) {
             $relateIdField = $fieldlist[$fieldname]['id_name'];
-            $rel_value =  $bean->$relateIdField;
+            $rel_value = $bean->$relateIdField;
 
         }
         $fieldlist[$fieldlist[$fieldname]['id_name']]['value'] = $rel_value;
         $fieldlist[$fieldname]['value'] = $value;
         $fieldlist[$fieldname]['id_name'] = $aow_field;
-        $fieldlist[$fieldname]['name'] = $aow_field . '_display';
+        $fieldlist[$fieldname]['name'] = $aow_field.'_display';
     } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if (!$value) {
@@ -310,14 +310,14 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent') {
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else{
+        } else {
             $bean->$field = $value;
         }
 
@@ -342,7 +342,7 @@ 
 
     $fieldlist[$field] = $bean->getFieldDefinition($field);
 
-    if(is_array($listViewDefs)){
+    if (is_array($listViewDefs)) {
         $fieldlist[$field] = array_merge($fieldlist[$field], $listViewDefs);
     }
 
@@ -380,7 +380,7 @@ 
         $vardef['module'] = $bean->module_dir;
 
         $SugarWidgetSubPanelDetailViewLink = new SugarWidgetSubPanelDetailViewLink($vardef);
-        $value = "<b>" . $SugarWidgetSubPanelDetailViewLink->displayList($vardef) . "</b>";
+        $value = "<b>".$SugarWidgetSubPanelDetailViewLink->displayList($vardef)."</b>";
 
     }
 
@@ -393,7 +393,7 @@ 
         }
         $datetime_format = $timedate->get_date_time_format();
         // create utc date (as it's utc in db)
-        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value,new DateTimeZone('UTC'));
+        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value, new DateTimeZone('UTC'));
         // convert it to timezone the user uses
         $datetime = $timedate->tzUser($datetime);
 
@@ -432,24 +432,24 @@ 
     }
 
     //if field is of type relate.
-    if ($vardef['type'] == "relate" || $vardef['type'] == "parent")  {
+    if ($vardef['type'] == "relate" || $vardef['type'] == "parent") {
 
-        if($vardef['source'] == "non-db"){
+        if ($vardef['source'] == "non-db") {
 
-            if($vardef['module'] == "Employees"){
+            if ($vardef['module'] == "Employees") {
                 $vardef['ext2'] = "Users";
                 $vardef['rname'] = "full_name";
             }
 
         }
-        if($vardef['type'] == "parent") {
+        if ($vardef['type'] == "parent") {
             $vardef['module'] = $bean->parent_type;
             $name = $bean->parent_name;
         }
         $idName = $vardef['id_name'];
         $record = $bean->$idName;
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value = "<a class=\"listViewTdLinkS1\" href=\"index.php?action=DetailView&module=".$vardef['module']."&record=$record\">";
         } else {
             $value = "";
@@ -457,26 +457,26 @@ 
 
 
         //To fix github bug 880 (the rname was null and was causing a 500 error in the getFieldValueFromModule call to $fieldname
-        $fieldName = 'name';//$vardef['name'];
-        if(!is_null($vardef['rname']))
+        $fieldName = 'name'; //$vardef['name'];
+        if (!is_null($vardef['rname']))
             $fieldName = $vardef['rname'];
 
-        if($vardef['ext2']){
+        if ($vardef['ext2']) {
 
-            $value .= getFieldValueFromModule($fieldName,$vardef['ext2'],$record);
+            $value .= getFieldValueFromModule($fieldName, $vardef['ext2'], $record);
 
-        }else if(!empty($vardef['rname'])){
-            $value .= getFieldValueFromModule($fieldName,$vardef['module'],$record);
+        } else if (!empty($vardef['rname'])) {
+            $value .= getFieldValueFromModule($fieldName, $vardef['module'], $record);
 
         } else {
             $value .= $name;
         }
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value .= "</a>";
         }
     }
-	if($vardef['type'] == "url")
+	if ($vardef['type'] == "url")
 	{
 		$value = '<a href='.$value.' target="_blank">'.$value.'</a>';
 	}
@@ -487,7 +487,7 @@ 
 function getFieldValueFromModule($fieldname, $module, $id)
 {
     //Github bug 880, if the fieldname is null, do no call from bean
-    if(is_null($fieldname))
+    if (is_null($fieldname))
         return '';
 
     $bean = BeanFactory::getBean($module, $id);
@@ -508,11 +508,11 @@ 
     return $value;
 }
 
-function checkAccess($bean){
+function checkAccess($bean) {
 
-    if($bean->ACLAccess('EditView')) {
+    if ($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

include/SugarEmailAddress/SugarEmailAddress.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -81,9 +81,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarEmailAddress(){
+    public function SugarEmailAddress() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -99,16 +99,16 @@ 
      * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
-        if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
             if (empty($this->addresses) || !isset($_REQUEST['massupdate'])) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == "1") ? true : false;
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == "1") ? true : false;
 
                 $isPrimary = true;
-                for($i = 1; $i <= 10; $i++){
+                for ($i = 1; $i <= 10; $i++) {
                     $email = 'email'.$i;
-                    if(isset($bean->$email) && !empty($bean->$email)){
+                    if (isset($bean->$email) && !empty($bean->$email)) {
                         $opt_out_field = $email.'_opt_out';
                         $invalid_field = $email.'_invalid';
                         $field_optOut = (isset($bean->$opt_out_field)) ? $bean->$opt_out_field : $optOut;
@@ -119,8 +119,8 @@ 
                 }
             }
         }
-        $this->populateAddresses($bean->id, $bean->module_dir, array(),'');
-        if(isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
+        $this->populateAddresses($bean->id, $bean->module_dir, array(), '');
+        if (isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
             $this->populateLegacyFields($bean);
         }
     }
@@ -142,11 +142,11 @@ 
         return;
     }
 
-    function populateLegacyFields(&$bean){
+    function populateLegacyFields(&$bean) {
         $primary_found = false;
         $alternate_found = false;
         $alternate2_found = false;
-        foreach($this->addresses as $k=>$address) {
+        foreach ($this->addresses as $k=>$address) {
             if ($primary_found && $alternate_found)
                 break;
             if ($address['primary_address'] == 1 && !$primary_found) {
@@ -155,7 +155,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -192,27 +192,27 @@ 
         $args = func_get_args();
         return call_user_func_array(array($this, '_save'), $args);
     }
-    private function _save($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='', $in_workflow=false) {
-        if(empty($this->addresses) || $in_workflow){
-            $this->populateAddresses($id, $module, $new_addrs,$primary);
+    private function _save($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '', $in_workflow = false) {
+        if (empty($this->addresses) || $in_workflow) {
+            $this->populateAddresses($id, $module, $new_addrs, $primary);
         }
 
         //find all email addresses..
-        $current_links=array();
+        $current_links = array();
         // Need to correct this to handle the Employee/User split
         $module = $this->getCorrectedModule($module);
-        $q2="select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
+        $q2 = "select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
         $r2 = $this->db->query($q2);
-        while(($row2=$this->db->fetchByAssoc($r2)) != null ) {
-            $current_links[$row2['email_address_id']]=$row2;
+        while (($row2 = $this->db->fetchByAssoc($r2)) != null) {
+            $current_links[$row2['email_address_id']] = $row2;
         }
 
         $isConversion = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? true : false;
 
         if (!empty($this->addresses)) {
             // insert new relationships and create email address record, if they don't exist
-            foreach($this->addresses as $address) {
-                if(!empty($address['email_address'])) {
+            foreach ($this->addresses as $address) {
+                if (!empty($address['email_address'])) {
                     $guid = create_guid();
                     $emailId = isset($address['email_address_id'])
                         && isset($current_links[$address['email_address_id']])
@@ -220,14 +220,14 @@ 
                     $emailId = $this->AddUpdateEmailAddress($address['email_address'],
                                                             $address['invalid_email'],
                                                             $address['opt_out'],
-                                                            $emailId);// this will save the email address if not found
+                                                            $emailId); // this will save the email address if not found
 
                     //verify linkage and flags.
-                    $upd_eabr="";
+                    $upd_eabr = "";
                     if (isset($current_links[$emailId])) {
                         if (!$isConversion) { // do not update anything if this is for lead conversion
-                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address'] ) {
-                            $upd_eabr="UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
+                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address']) {
+                            $upd_eabr = "UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
                         }
 
                         unset($current_links[$emailId]);
@@ -258,13 +258,13 @@ 
         // for lead conversion, do not delete email addresses
         if (!empty($current_links) && !$isConversion) {
 
-            $delete="";
+            $delete = "";
             foreach ($current_links as $eabr) {
 
-                $delete.=empty($delete) ? "'".$this->db->quote($eabr['id']) . "' " : ",'" . $this->db->quote($eabr['id']) . "'";
+                $delete .= empty($delete) ? "'".$this->db->quote($eabr['id'])."' " : ",'".$this->db->quote($eabr['id'])."'";
             }
 
-            $eabr_unlink="update email_addr_bean_rel set deleted=1 where id in ({$delete})";
+            $eabr_unlink = "update email_addr_bean_rel set deleted=1 where id in ({$delete})";
             $this->db->query($eabr_unlink);
         }
         $this->stateBeforeWorkflow = null;
@@ -286,7 +286,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -324,10 +324,10 @@ 
         $r = $this->db->query($q, true);
 
         $retArr = array();
-        while($a = $this->db->fetchByAssoc($r)) {
+        while ($a = $this->db->fetchByAssoc($r)) {
             $retArr[] = $a['bean_id'];
         }
-        if(count($retArr) > 0) {
+        if (count($retArr) > 0) {
             return $retArr;
         } else {
             return false;
@@ -347,7 +347,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -356,12 +356,12 @@ 
                 WHERE ea.email_address_caps = $emailCaps and eabl.deleted=0 ";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r)) {
-            if(isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
+        while ($a = $this->db->fetchByAssoc($r)) {
+            if (isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
                 $className = $beanList[$a['bean_module']];
 
-                if(isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
-                    if(!class_exists($className)) {
+                if (isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
+                    if (!class_exists($className)) {
                         require_once($beanFiles[$className]);
                     }
 
@@ -389,7 +389,7 @@ 
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
      */
-    function populateAddresses($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='') {
+    function populateAddresses($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '') {
         $module = $this->getCorrectedModule($module);
         //One last check for the ConvertLead action in which case we need to change $module to 'Leads'
         $module = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? 'Leads' : $module;
@@ -400,54 +400,54 @@ 
         $hasEmailValue = false;
         $email_ids = array();
 
-        if (isset($_REQUEST) && isset($_REQUEST[$module .'_email_widget_id'])) {
+        if (isset($_REQUEST) && isset($_REQUEST[$module.'_email_widget_id'])) {
 
             $fromRequest = false;
             // determine which array to process
-            foreach($_REQUEST as $k => $v) {
-                if(strpos($k, 'emailAddress') !== false) {
+            foreach ($_REQUEST as $k => $v) {
+                if (strpos($k, 'emailAddress') !== false) {
                    $fromRequest = true;
                    break;
                 }
-            $widget_id = $_REQUEST[$module .'_email_widget_id'];
+            $widget_id = $_REQUEST[$module.'_email_widget_id'];
     }
 
             //Iterate over the widgets for this module, in case there are multiple email widgets for this module
-            while(isset($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount]))
+            while (isset($_REQUEST[$module.$widget_id."emailAddress".$widgetCount]))
             {
-                if (empty($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount])) {
+                if (empty($_REQUEST[$module.$widget_id."emailAddress".$widgetCount])) {
                     $widgetCount++;
                     continue;
                 }
 
                 $hasEmailValue = true;
 
-                $eId = $module . $widget_id;
-                if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                $eId = $module.$widget_id;
+                if (isset($_REQUEST[$eId.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$eId.'emailAddressPrimaryFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$module.'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$eId.'emailAddressOptOutFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$module.'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$eId.'emailAddressInvalidFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$module.'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$eId.'emailAddressDeleteFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$module.'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -455,36 +455,36 @@ 
                 $replyToField = '';
                 $invalidField = '';
                 $optOutField = '';
-                if($fromRequest && empty($primary) && isset($primaryValue)) {
+                if ($fromRequest && empty($primary) && isset($primaryValue)) {
                     $primaryField = $primaryValue;
                 }
 
-                if($fromRequest && empty($replyTo)) {
-                    if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
-                    } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                if ($fromRequest && empty($replyTo)) {
+                    if (isset($_REQUEST[$eId.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$eId.'emailAddressReplyToFlag'];
+                    } else if (isset($_REQUEST[$module.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$module.'emailAddressReplyToFlag'];
                     }
                 }
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
                             $new_addrs[$k] = $v;
                         }
                     }
                 }
-                if($fromRequest && empty($email_ids)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($email_ids)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
                             $key = str_replace('emailAddressId', 'emailAddress', $k);
                             $email_ids[$key] = $v;
                         }
                     }
                 }
 
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
                               $new_addrs[$k] = $v;
@@ -493,21 +493,21 @@ 
                 }
 
                 //empty the addresses array if the post happened from email address widget.
-                if($post_from_email_address_widget) {
-                    $this->addresses=array();  //this gets populated during retrieve of the contact bean.
+                if ($post_from_email_address_widget) {
+                    $this->addresses = array(); //this gets populated during retrieve of the contact bean.
                 } else {
                     $optOutValues = array();
                     $invalidValues = array();
-                    foreach($new_addrs as $k=>$email) {
+                    foreach ($new_addrs as $k=>$email) {
                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
                        $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
+                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '".$this->db->quote(strtoupper($email))."'");
+                       if (!empty($result)) {
+                          $row = $this->db->fetchByAssoc($result);
+                          if (!empty($row['opt_out'])) {
                              $optOutValues[$k] = "emailAddress$count";
                           }
-                          if(!empty($row['invalid_email'])) {
+                          if (!empty($row['invalid_email'])) {
                              $invalidValues[$k] = "emailAddress$count";
                           }
                        }
@@ -515,11 +515,11 @@ 
                 }
                 // Re-populate the addresses class variable if we have new address(es).
                 if (!empty($new_addrs)) {
-                    foreach($new_addrs as $k => $reqVar) {
+                    foreach ($new_addrs as $k => $reqVar) {
                         //$key = preg_match("/^$eId/s", $k) ? substr($k, strlen($eId)) : $k;
                         $reqVar = trim($reqVar);
-                        if(strpos($k, 'emailAddress') !== false) {
-                            if(!empty($reqVar) && !in_array($k, $deleteValues)) {
+                        if (strpos($k, 'emailAddress') !== false) {
+                            if (!empty($reqVar) && !in_array($k, $deleteValues)) {
                                 $email_id   = (array_key_exists($k, $email_ids)) ? $email_ids[$k] : null;
                                 $primary    = ($k == $primaryValue) ? true : false;
                                 $replyTo    = ($k == $replyToField) ? true : false;
@@ -536,7 +536,7 @@ 
         }
 
         //If no widgets, set addresses array to empty
-        if($post_from_email_address_widget && !$hasEmailValue) {
+        if ($post_from_email_address_widget && !$hasEmailValue) {
            $this->addresses = array();
         }
     }
@@ -547,9 +547,9 @@ 
      * @param bool $primary Default false
      * @param bool $replyTo Default false
      */
-    function addAddress($addr, $primary=false, $replyTo=false, $invalid=false, $optOut=false, $email_id = null) {
+    function addAddress($addr, $primary = false, $replyTo = false, $invalid = false, $optOut = false, $email_id = null) {
         $addr = html_entity_decode($addr, ENT_QUOTES);
-        if(preg_match($this->regex, $addr)) {
+        if (preg_match($this->regex, $addr)) {
             $primaryFlag = ($primary) ? '1' : '0';
             $replyToFlag = ($replyTo) ? '1' : '0';
             $invalidFlag = ($invalid) ? '1' : '0';
@@ -585,17 +585,17 @@ 
      * Updates invalid_email and opt_out flags for each address
      */
     function updateFlags() {
-        if(!empty($this->addresses)) {
-            foreach($this->addresses as $addressMeta) {
-                if(isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
+        if (!empty($this->addresses)) {
+            foreach ($this->addresses as $addressMeta) {
+                if (isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
                     $address = $this->db->quote($this->_cleanAddress($addressMeta['email_address']));
 
                     $q = "SELECT * FROM email_addresses WHERE email_address = '{$address}'";
                     $r = $this->db->query($q);
                     $a = $this->db->fetchByAssoc($r);
 
-                    if(!empty($a)) {
-                        if(isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
+                    if (!empty($a)) {
+                        if (isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
                             $qUpdate = "UPDATE email_addresses SET invalid_email = ".intval($addressMeta['invalid_email']).", opt_out = ".intval($addressMeta['opt_out']).", date_modified = '".TimeDate::getInstance()->nowDb()."' WHERE id = '".$this->db->quote($a['id'])."'";
                             $rUpdate = $this->db->query($qUpdate);
                         }
@@ -608,7 +608,7 @@ 
     public function splitEmailAddress($addr)
     {
         $email = $this->_cleanAddress($addr);
-        if(!preg_match($this->regex, $email)) {
+        if (!preg_match($this->regex, $email)) {
             $email = ''; // remove bad email addr
         }
         $name = trim(str_replace(array($email, '<', '>', '"', "'"), '', $addr));
@@ -624,8 +624,8 @@ 
     function _cleanAddress($addr) {
         $addr = trim(from_html($addr));
 
-        if(strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
-            $address = trim(substr($addr, strrpos($addr, "<") +1, strrpos($addr, ">") - strrpos($addr, "<") -1));
+        if (strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
+            $address = trim(substr($addr, strrpos($addr, "<") + 1, strrpos($addr, ">") - strrpos($addr, "<") - 1));
         } else {
             $address = trim($addr);
         }
@@ -646,11 +646,11 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(!empty($a) && !empty($a['id'])) {
+        if (!empty($a) && !empty($a['id'])) {
             return $a['id'];
         } else {
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted)
@@ -672,7 +672,7 @@ 
      *        to propagate to the new SugarEmailAddress - see bug 39188
      * @return String GUID of Email Address or '' if cleaned address was empty.
      */
-    public function AddUpdateEmailAddress($addr,$invalid=0,$opt_out=0,$id=null)
+    public function AddUpdateEmailAddress($addr, $invalid = 0, $opt_out = 0, $id = null)
     {
         // sanity checks to avoid SQL injection.
         $invalid = intval($invalid);
@@ -722,12 +722,12 @@ 
             if ($duplicate_email['invalid_email'] != $new_invalid ||
                 $duplicate_email['opt_out'] != $new_opt_out ||
                 (trim($duplicate_email['email_address']) != $address)) {
-                $upd_q = 'UPDATE ' . $this->table_name . ' ' .
-                    'SET email_address=\'' . $address . '\', ' .
-                    'invalid_email=' . $new_invalid . ', ' .
-                    'opt_out=' . $new_opt_out . ', ' .
-                    'date_modified=' . $this->db->now() . ' ' .
-                    'WHERE id=\'' . $this->db->quote($duplicate_email['id']) . '\'';
+                $upd_q = 'UPDATE '.$this->table_name.' '.
+                    'SET email_address=\''.$address.'\', '.
+                    'invalid_email='.$new_invalid.', '.
+                    'opt_out='.$new_opt_out.', '.
+                    'date_modified='.$this->db->now().' '.
+                    'WHERE id=\''.$this->db->quote($duplicate_email['id']).'\'';
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
@@ -735,7 +735,7 @@ 
         else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted, invalid_email, opt_out)
@@ -751,12 +751,12 @@ 
      * @param object $focus Object in focus
      * @return string email
      */
-    function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
+    function getPrimaryAddress($focus, $parent_id = null, $parent_type = null) {
 
-        $parent_type=empty($parent_type) ? $focus->module_dir : $parent_type;
+        $parent_type = empty($parent_type) ? $focus->module_dir : $parent_type;
         // Bug63174: Email address is not shown in the list view for employees
         $parent_type = $this->getCorrectedModule($parent_type);
-        $parent_id=empty($parent_id) ? $focus->id : $parent_id;
+        $parent_id = empty($parent_id) ? $focus->id : $parent_id;
 
         $q = "SELECT ea.email_address FROM email_addresses ea
                 LEFT JOIN email_addr_bean_rel ear ON ea.id = ear.email_address_id
@@ -768,7 +768,7 @@ 
         $r = $this->db->limitQuery($q, 0, 1);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -809,7 +809,7 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -834,7 +834,7 @@ 
                 ORDER BY ear.reply_to_address, ear.primary_address DESC";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r, FALSE)) {
+        while ($a = $this->db->fetchByAssoc($r, FALSE)) {
             $return[] = $a;
         }
 
@@ -848,9 +848,9 @@ 
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
+    function getEmailAddressWidgetEditView($id, $module, $asMetadata = false, $tpl = '', $tabindex = '0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings, $dictionary, $beanList;
@@ -861,33 +861,33 @@ 
         $passedModule = $module;
         $module = $this->getCorrectedModule($module);
         $saveModule = $module;
-        if(isset($_POST['is_converted']) && $_POST['is_converted']==true){
-            $id=$_POST['return_id'];
-            $module=$_POST['return_module'];
+        if (isset($_POST['is_converted']) && $_POST['is_converted'] == true) {
+            $id = $_POST['return_id'];
+            $module = $_POST['return_module'];
         }
         $prefillDataArr = array();
-        if(!empty($id)) {
+        if (!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
             if (empty($prefillDataArr) && $module == "Contacts")
                 $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
-        } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
-            $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
+        } else if (isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])) {
+            $widget_id = isset($_REQUEST[$module.'_email_widget_id']) ? $_REQUEST[$module.'_email_widget_id'] : '0';
             $count = 0;
-            $key = $module . $widget_id . 'emailAddress'.$count;
-            while(isset($_REQUEST[$key])) {
+            $key = $module.$widget_id.'emailAddress'.$count;
+            while (isset($_REQUEST[$key])) {
                    $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
+                   $prefillDataArr[] = array('email_address'=>$email,
                                              'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
                                              'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
                                              'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
                                              'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                   $key = $module.$widget_id.'emailAddress'.++$count;
             } //while
         }
 
-        if(!empty($prefillDataArr)) {
+        if (!empty($prefillDataArr)) {
             $json = new JSON(JSON_LOOSE_TYPE);
             $prefillData = $json->encode($prefillDataArr);
             $prefill = !empty($prefillDataArr) ? 'true' : 'false';
@@ -910,23 +910,23 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
+        if ($this->view == "QuickCreate") {
             // Fixed #1120 - fixed email validation for: Accounts -> Contacts subpanel -> Select -> Create Contact -> Save.
             // If email is required it should highlight this field and show an error message.
             // It didnt because the the form was named form_DCSubpanelQuickCreate_Contacts instead of expected form_SubpanelQuickCreate_Contacts
-            if($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
-                $form = 'form_'.$this->view .'_'.$module;
+            if ($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
+                $form = 'form_'.$this->view.'_'.$module;
             } else {
-                $form = 'form_DC'.$this->view .'_'.$module;
+                $form = 'form_DC'.$this->view.'_'.$module;
             }
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+            if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'SubpanelCreates' || $_REQUEST['action'] == 'SubpanelEdits') {
+                $form = 'form_Subpanel'.$this->view.'_'.$module;
             }
         }
 
         $this->smarty->assign('emailView', $form);
 
-        if($module == 'Users') {
+        if ($module == 'Users') {
             $this->smarty->assign('useReplyTo', true);
         } else {
             $this->smarty->assign('useOptOut', true);
@@ -937,7 +937,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -955,18 +955,18 @@ 
      * @param object $focus Bean in focus
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetDetailView($focus, $tpl='')
+    function getEmailAddressWidgetDetailView($focus, $tpl = '')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if (empty($focus->id))return '';
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
-        foreach($prefillData as $addressItem) {
+        foreach ($prefillData as $addressItem) {
             $key = ($addressItem['primary_address'] == 1) ? 'primary' : "";
             $key = ($addressItem['reply_to_address'] == 1) ? 'reply_to' : $key;
             $key = ($addressItem['opt_out'] == 1) ? 'opt_out' : $key;
@@ -992,7 +992,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -1002,49 +1002,49 @@ 
         $invalid = array();
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $this->smarty->assign('email_widget_id',$widget_id);
-        $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $this->smarty->assign('email_widget_id', $widget_id);
+        $this->smarty->assign('emailAddressWidget', $_POST['emailAddressWidget']);
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+        if (isset($_POST[$mod.$widget_id.'emailAddressPrimaryFlag'])) {
+           $primary = $_POST[$mod.$widget_id.'emailAddressPrimaryFlag'];
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
-            $emails[] = $_POST[$mod . $widget_id . 'emailAddress' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddress".$count])) {
+            $emails[] = $_POST[$mod.$widget_id.'emailAddress'.$count];
             $count++;
         }
 
-        if($count == 0) {
+        if ($count == 0) {
            return "";
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressOptOutFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressOptOutFlag'] as $v) {
               $optOut[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressInvalidFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressInvalidFlag'] as $v) {
               $invalid[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressReplyToFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressReplyToFlag'] as $v) {
               $replyTo[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressDeleteFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressDeleteFlag'] as $v) {
               $delete[] = $v;
            }
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
-            $verified[] = $_POST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddressVerifiedValue".$count])) {
+            $verified[] = $_POST[$mod.$widget_id.'emailAddressVerifiedValue'.$count];
             $count++;
         }
 
@@ -1069,33 +1069,33 @@ 
         $count = 0;
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $get .= '&' . $mod . '_email_widget_id='. $widget_id;
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $get .= '&'.$mod.'_email_widget_id='.$widget_id;
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddress'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddress".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddress'.$count]);
               $count++;
         } //while
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddressVerifiedValue".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count]);
               $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
-            if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+            if (isset($_REQUEST[$optionIdentifier])) {
+               if (is_array($_REQUEST[$optionIdentifier])) {
+                   foreach ($_REQUEST[$optionIdentifier] as $optOut) {
+                      $get .= "&".$optionIdentifier."[".$count."]=".$optOut;
                       $count++;
                    } //foreach
                } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                   $get .= "&".$optionIdentifier."=".$_REQUEST[$optionIdentifier];
                }
             } //if
         } //foreach
@@ -1113,7 +1113,7 @@ 
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
-        return ($module == "Employees")? "Users" : $module;
+        return ($module == "Employees") ? "Users" : $module;
     }
 
     public function stash($parentBeanId, $moduleName)
@@ -1123,7 +1123,7 @@ 
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result, false))
         {
-            $ids[] =$this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
+            $ids[] = $this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
         }
         if (!empty($ids))
         {
@@ -1147,15 +1147,15 @@ 
  * @param string $view DetailView or EditView
  * @return string
  */
-function getEmailAddressWidget($focus, $field, $value, $view, $tabindex='0') {
+function getEmailAddressWidget($focus, $field, $value, $view, $tabindex = '0') {
     $sea = new SugarEmailAddress();
     $sea->setView($view);
 
-        if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
+        if ($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
             if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
 
-            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
+            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false, '', $tabindex);
         }
 
     return $sea->getEmailAddressWidgetDetailView($focus);

include/utils/sugar_file_utils.php

Spacing +2 added lines, -2 removed lines

@@ -186,7 +186,7 @@ 
     $temp = tempnam($dir, 'temp');
 
     if (!($f = @fopen($temp, $mode))) {
-        $temp = $dir . DIRECTORY_SEPARATOR . uniqid('temp');
+        $temp = $dir.DIRECTORY_SEPARATOR.uniqid('temp');
         if (!($f = @fopen($temp, $mode))) {
             trigger_error("sugar_file_put_contents_atomic() : error writing temporary file '$temp'", E_USER_WARNING);
 
@@ -393,7 +393,7 @@ 
     }
     if (!is_windows()) {
         $conf_inst = SugarConfig::getInstance();
-        $mode = $conf_inst->get('default_permissions.' . $key, $mode);
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
     }
 
     return $mode;

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignMarketingEmailButton.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,11 +48,11 @@ 
         $id = $layout_def['focus']->id;
         $module = $layout_def['focus']->module_name;
 
-        $href = "index.php?module=$module&action=WizardMarketing&campaign_id=$id" . (!empty($layout_def['func']) ? '&func=' . $layout_def['func'] : '');
+        $href = "index.php?module=$module&action=WizardMarketing&campaign_id=$id".(!empty($layout_def['func']) ? '&func='.$layout_def['func'] : '');
 
         $label = $app_strings['LBL_CREATE_BUTTON_LABEL'];
 
-        return '<a onclick="location.href=\'' . $href . '\';">' . $label . '</a>';
+        return '<a onclick="location.href=\''.$href.'\';">'.$label.'</a>';
     }
 
 }
\ No newline at end of file

tests/tests/modules/Contacts/ContactTest.php

Indentation +211 added lines, -211 removed lines

@@ -2,68 +2,68 @@ 
 
 class ContactTest extends PHPUnit_Framework_TestCase {
 
-	public function testContact() {
+    public function testContact() {
 
-		//execute the contructor and check for the Object type and  attributes
-		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+        //execute the contructor and check for the Object type and  attributes
+        $contact = new Contact();
+        $this->assertInstanceOf('Contact',$contact);
+        $this->assertInstanceOf('Person',$contact);
+        $this->assertInstanceOf('SugarBean',$contact);
 
-		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
-		$this->assertAttributeEquals('Contact', 'object_name', $contact);
-		$this->assertAttributeEquals('contacts', 'table_name', $contact);
-		$this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
-		$this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
-		$this->assertAttributeEquals(true, 'importable', $contact);
-		$this->assertAttributeEquals(true, 'new_schema', $contact);
+        $this->assertAttributeEquals('Contacts', 'module_dir', $contact);
+        $this->assertAttributeEquals('Contact', 'object_name', $contact);
+        $this->assertAttributeEquals('contacts', 'table_name', $contact);
+        $this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
+        $this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
+        $this->assertAttributeEquals(true, 'importable', $contact);
+        $this->assertAttributeEquals(true, 'new_schema', $contact);
 
-	}
+    }
 
-	public function testadd_list_count_joins()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testadd_list_count_joins()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty strings
-		$query = "";
-		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with empty strings
+        $query = "";
+        $contact->add_list_count_joins($query, '');
+        $this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'accounts.name');
-		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'accounts.name');
+        $query = preg_replace('/\s+/', '', $query);
+        $expected =preg_replace('/\s+/', '', $expected);
+        $this->assertSame($expected,$query);
 		
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'contacts.name');
+        $this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-	}
+    }
 
-	public function testlistviewACLHelper()
-	{
-		$contact = new Contact();
+    public function testlistviewACLHelper()
+    {
+        $contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
-		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+        $expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+        $actual = $contact->listviewACLHelper();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
-	{
+    public function testcreate_new_list_query()
+    {
         /*
 		$contact = new Contact();
 
@@ -79,239 +79,239 @@ 
 		$this->assertSame($expected,$actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
 
-	public function testaddress_popup_create_new_list_query()
-	{
+    public function testaddress_popup_create_new_list_query()
+    {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testcreate_export_query()
-	{
-		$contact = new Contact();
+    public function testcreate_export_query()
+    {
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testfill_in_additional_list_fields() {
+    public function testfill_in_additional_list_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "firstn";
-		$contact->last_name = "lastn";
-		$contact->email1 = "1@test.com";
-		$contact->email2 = "2@test.com";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "firstn";
+        $contact->last_name = "lastn";
+        $contact->email1 = "1@test.com";
+        $contact->email2 = "2@test.com";
 
 
-		$contact->fill_in_additional_list_fields();
+        $contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+        $this->assertEquals("firstn lastn",$contact->full_name);
+        $this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
+        $this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields() {
+    public function testfill_in_additional_detail_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->id = "1";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->id = "1";
 
-		$contact->fill_in_additional_detail_fields();
+        $contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+        $this->assertEquals("",$contact->account_name);
+        $this->assertEquals("",$contact->account_id);
+        $this->assertEquals("",$contact->report_to_name);
 
-	}
+    }
 
 
-	public function testload_contacts_users_relationship(){
+    public function testload_contacts_users_relationship(){
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->load_contacts_users_relationship();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->load_contacts_users_relationship();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
-	public function testget_list_view_data() {
+    public function testget_list_view_data() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-
-		$expected = array (
-					  'NAME' => 'first last',
-					  'DELETED' => 0,
-					  'FIRST_NAME' => 'first',
-					  'LAST_NAME' => 'last',
-					  'FULL_NAME' => 'first last',
-					  'DO_NOT_CALL' => '0',
-					  'PORTAL_USER_TYPE' => 'Single user',
-					  'ENCODED_NAME' => 'first last',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
-					);
-
-		$actual = $contact->get_list_view_data();
-		//$this->assertSame($expected, $actual);
-		$this->assertEquals($expected['NAME'], $actual['NAME']);
-		$this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
-		$this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
-		$this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
-		$this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
-		$this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
-
-	}
-
-
-	public function testbuild_generic_where_clause ()
-	{
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
 
-		$contact = new Contact();
+        $expected = array (
+                        'NAME' => 'first last',
+                        'DELETED' => 0,
+                        'FIRST_NAME' => 'first',
+                        'LAST_NAME' => 'last',
+                        'FULL_NAME' => 'first last',
+                        'DO_NOT_CALL' => '0',
+                        'PORTAL_USER_TYPE' => 'Single user',
+                        'ENCODED_NAME' => 'first last',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
+                    );
 
-		//test with string
-		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
-		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        $actual = $contact->get_list_view_data();
+        //$this->assertSame($expected, $actual);
+        $this->assertEquals($expected['NAME'], $actual['NAME']);
+        $this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
+        $this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
+        $this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
+        $this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
+        $this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
 
+    }
 
-		//test with number
-		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
-		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
 
-	}
+    public function testbuild_generic_where_clause ()
+    {
 
-	public function testset_notification_body()
-	{
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-		$contact->description = "some text";
-		$contact->fill_in_additional_list_fields();
+        //test with string
+        $expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
+        $actual = $contact->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+        //test with number
+        $expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
+        $actual = $contact->build_generic_where_clause(1);
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testget_contact_id_by_email()
-	{
-		$contact = new Contact();
+    public function testset_notification_body()
+    {
+        $contact = new Contact();
 
-		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
+        $contact->description = "some text";
+        $contact->fill_in_additional_list_fields();
 
+        $result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		//$result = $contact->get_contact_id_by_email("test@test.com");
-		//$this->assertEquals(null,$result);
+        $this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
+        $this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
 
-		$this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
+    }
 
-	}
+    public function testget_contact_id_by_email()
+    {
+        $contact = new Contact();
 
-	public function testsave_relationship_changes() {
+        $result = $contact->get_contact_id_by_email("");
+        $this->assertEquals(null,$result);
 
-		$contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->save_relationship_changes(true);
-			$contact->save_relationship_changes(false);
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //$result = $contact->get_contact_id_by_email("test@test.com");
+        //$this->assertEquals(null,$result);
 
-	}
+        $this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
 
-	public function testbean_implements()
-	{
-		$contact = new Contact();
-		$this->assertEquals(false, $contact->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
-	}
+    }
 
-	public function testget_unlinked_email_query()
-	{
-		$contact = new Contact();
+    public function testsave_relationship_changes() {
 
-		//execute the method and verify that it retunrs expected results
-		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
-		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+        $contact = new Contact();
+
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->save_relationship_changes(true);
+            $contact->save_relationship_changes(false);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
+
+    }
+
+    public function testbean_implements()
+    {
+        $contact = new Contact();
+        $this->assertEquals(false, $contact->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
+    }
+
+    public function testget_unlinked_email_query()
+    {
+        $contact = new Contact();
+
+        //execute the method and verify that it retunrs expected results
+        $expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
+        $actual = $contact->get_unlinked_email_query();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
     public function testprocess_sync_to_outlook()
     {
-    	$contact = new Contact();
+        $contact = new Contact();
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-   			$contact->process_sync_to_outlook("all");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+                $contact->process_sync_to_outlook("all");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$contact->process_sync_to_outlook("1");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->process_sync_to_outlook("1");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
 
-	}
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -6,9 +6,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+		$this->assertInstanceOf('Contact', $contact);
+		$this->assertInstanceOf('Person', $contact);
+		$this->assertInstanceOf('SugarBean', $contact);
 
 		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
 		$this->assertAttributeEquals('Contact', 'object_name', $contact);
@@ -29,7 +29,7 @@ 
 		//test with empty strings
 		$query = "";
 		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 		//test with valid string
@@ -37,14 +37,14 @@ 
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'accounts.name');
 		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+		$expected = preg_replace('/\s+/', '', $expected);
+		$this->assertSame($expected, $query);
 		
 		//test with valid string
 		$query = "";
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 	}
@@ -53,9 +53,9 @@ 
 	{
 		$contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a");
 		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -89,14 +89,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -106,14 +106,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -130,9 +130,9 @@ 
 
 		$contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+		$this->assertEquals("firstn lastn", $contact->full_name);
+		$this->assertEquals("firstn lastn <1@test.com>", $contact->email_and_name1);
+		$this->assertEquals("firstn lastn <2@test.com>", $contact->email_and_name2);
 
 	}
 
@@ -145,14 +145,14 @@ 
 
 		$contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+		$this->assertEquals("", $contact->account_name);
+		$this->assertEquals("", $contact->account_id);
+		$this->assertEquals("", $contact->report_to_name);
 
 	}
 
 
-	public function testload_contacts_users_relationship(){
+	public function testload_contacts_users_relationship() {
 
 		$contact = new Contact();
 
@@ -175,7 +175,7 @@ 
 		$contact->first_name = "first";
 		$contact->last_name = "last";
 
-		$expected = array (
+		$expected = array(
 					  'NAME' => 'first last',
 					  'DELETED' => 0,
 					  'FIRST_NAME' => 'first',
@@ -201,7 +201,7 @@ 
 	}
 
 
-	public function testbuild_generic_where_clause ()
+	public function testbuild_generic_where_clause()
 	{
 
 		$contact = new Contact();
@@ -209,13 +209,13 @@ 
 		//test with string
 		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
 		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with number
 		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
 		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -231,8 +231,8 @@ 
 
 		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+		$this->assertEquals($contact->full_name, $result->_tpl_vars['CONTACT_NAME']);
+		$this->assertEquals($contact->description, $result->_tpl_vars['CONTACT_DESCRIPTION']);
 
 	}
 
@@ -241,7 +241,7 @@ 
 		$contact = new Contact();
 
 		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 
 		//$result = $contact->get_contact_id_by_email("test@test.com");
@@ -282,7 +282,7 @@ 
 		//execute the method and verify that it retunrs expected results
 		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
 		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 

tests/tests/modules/AOR_Reports/AOR_ReportTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $output = $me->jsParser();
 
             return $output;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             // Exception handling is left up to the implementer.
             throw $e;
         }

tests/tests/modules/Leads/LeadTest.php

Indentation +216 added lines, -216 removed lines

@@ -3,102 +3,102 @@ 
 class LeadTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testLead()
-	{
+    public function testLead()
+    {
 
-		//execute the contructor and check for the Object type and  attributes
-		$lead = new Lead();
+        //execute the contructor and check for the Object type and  attributes
+        $lead = new Lead();
 
-		$this->assertInstanceOf('Lead',$lead);
-		$this->assertInstanceOf('Person',$lead);
-		$this->assertInstanceOf('SugarBean',$lead);
+        $this->assertInstanceOf('Lead',$lead);
+        $this->assertInstanceOf('Person',$lead);
+        $this->assertInstanceOf('SugarBean',$lead);
 
-		$this->assertAttributeEquals('Leads', 'module_dir', $lead);
-		$this->assertAttributeEquals('Lead', 'object_name', $lead);
-		$this->assertAttributeEquals('Leads', 'object_names', $lead);
-		$this->assertAttributeEquals('leads', 'table_name', $lead);
+        $this->assertAttributeEquals('Leads', 'module_dir', $lead);
+        $this->assertAttributeEquals('Lead', 'object_name', $lead);
+        $this->assertAttributeEquals('Leads', 'object_names', $lead);
+        $this->assertAttributeEquals('leads', 'table_name', $lead);
 
-		$this->assertAttributeEquals(true, 'new_schema', $lead);
-		$this->assertAttributeEquals(true, 'importable', $lead);
+        $this->assertAttributeEquals(true, 'new_schema', $lead);
+        $this->assertAttributeEquals(true, 'importable', $lead);
 
-	}
+    }
 
-	public function testget_account()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testget_account()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_account();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_account();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->account_id =1;
-		$result = $lead->get_account();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->account_id =1;
+        $result = $lead->get_account();
+        $this->assertEquals(null,$result);
 
 
-	}
+    }
 
-	public function testget_opportunity()
-	{
+    public function testget_opportunity()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_opportunity();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_opportunity();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->opportunity_id =1;
-		$result = $lead->get_opportunity();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->opportunity_id =1;
+        $result = $lead->get_opportunity();
+        $this->assertEquals(null,$result);
 
-	}
+    }
 
-	public function testget_contact()
-	{
+    public function testget_contact()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_contact();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_contact();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->contact_id =1;
-		$result = $lead->get_contact();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->contact_id =1;
+        $result = $lead->get_contact();
+        $this->assertEquals(null,$result);
 
 
-	}
+    }
 
-	public function testcreate_list_query()
-	{
-		$lead = new Lead();
+    public function testcreate_list_query()
+    {
+        $lead = new Lead();
 
-		//test with empty string params
-		$expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where  leads.deleted=0 ";
-		$actual = $lead->create_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where  leads.deleted=0 ";
+        $actual = $lead->create_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where (users.user_name=\"\") AND  leads.deleted=0  ORDER BY leads.id";
-		$actual = $lead->create_list_query('leads.id','users.user_name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where (users.user_name=\"\") AND  leads.deleted=0  ORDER BY leads.id";
+        $actual = $lead->create_list_query('leads.id','users.user_name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
-	{
+    public function testcreate_new_list_query()
+    {
         /*
 		$lead = new Lead();
 
@@ -114,26 +114,26 @@ 
 		$this->assertSame($expected,$actual);
         */
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
     public function testSaveAndConverted_lead()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$lead->first_name = "firstn";
-    	$lead->last_name ="lastnn";
-    	$lead->lead_source = "test";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastnn";
+        $lead->lead_source = "test";
 
-    	$result = $lead->save();
+        $result = $lead->save();
 
-    	//test for record ID to verify that record is saved
-    	$this->assertTrue(isset($lead->id));
-    	$this->assertEquals(36, strlen($lead->id));
-    	$this->assertEquals("New", $lead->status);
+        //test for record ID to verify that record is saved
+        $this->assertTrue(isset($lead->id));
+        $this->assertEquals(36, strlen($lead->id));
+        $this->assertEquals("New", $lead->status);
 
 
-    	//test converted_lead method after saving
-    	/*$lead->converted_lead("'" . $lead->id . "'" , "'1'", "'1'", "'1'");
+        //test converted_lead method after saving
+        /*$lead->converted_lead("'" . $lead->id . "'" , "'1'", "'1'", "'1'");
 
     	//retrieve back to test if attributes are updated in db
     	$lead = $lead->retrieve($lead->id);
@@ -144,206 +144,206 @@ 
     	$this->assertEquals("1", $lead->opportunity_id);
 		*/
 
-    	$this->markTestSkipped("converted_lead: Error in query, id's not properly escaped ");
+        $this->markTestSkipped("converted_lead: Error in query, id's not properly escaped ");
 
 
-    	//mark the record as deleted and verify that this record cannot be retrieved anymore.
-    	$lead->mark_deleted($lead->id);
-    	$result = $lead->retrieve($lead->id);
-    	$this->assertEquals(null,$result);
+        //mark the record as deleted and verify that this record cannot be retrieved anymore.
+        $lead->mark_deleted($lead->id);
+        $result = $lead->retrieve($lead->id);
+        $this->assertEquals(null,$result);
 
     }
 
 
 
-	public function testfill_in_additional_list_fields()
-	{
-		$lead = new Lead();
+    public function testfill_in_additional_list_fields()
+    {
+        $lead = new Lead();
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
 
-		$lead->fill_in_additional_list_fields();
+        $lead->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn", $lead->name );
+        $this->assertEquals("firstn lastn", $lead->name );
 
-	}
+    }
 
 
-	public function testfill_in_additional_detail_fields()
-	{
+    public function testfill_in_additional_detail_fields()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
 
-		$lead->fill_in_additional_detail_fields();
+        $lead->fill_in_additional_detail_fields();
 
-		$this->assertEquals("firstn lastn", $lead->name );
+        $this->assertEquals("firstn lastn", $lead->name );
 
 
 
-	}
+    }
 
-	public function testget_list_view_data(){
+    public function testget_list_view_data(){
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		$expected = array (
-					  'NAME' => ' ',
-					  'DELETED' => 0,
-					  'FULL_NAME' => ' ',
-					  'DO_NOT_CALL' => '0',
-					  'CONVERTED' => '0',
-					  'ENCODED_NAME' => ' ',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Leads\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Leads\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Leads","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Leads","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'ACC_NAME_FROM_ACCOUNTS' => NULL,
-					);
+        $expected = array (
+                        'NAME' => ' ',
+                        'DELETED' => 0,
+                        'FULL_NAME' => ' ',
+                        'DO_NOT_CALL' => '0',
+                        'CONVERTED' => '0',
+                        'ENCODED_NAME' => ' ',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Leads\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Leads\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Leads","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Leads","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'ACC_NAME_FROM_ACCOUNTS' => NULL,
+                    );
 
-		$actual = $lead->get_list_view_data();
+        $actual = $lead->get_list_view_data();
 
-		//$this->assertSame($expected, $actual);
-		$this->assertEquals($expected['NAME'], $actual['NAME']);
-		$this->assertEquals($expected['DELETED'], $actual['DELETED']);
-		$this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
-		$this->assertEquals($expected['DO_NOT_CALL'], $actual['DO_NOT_CALL']);
-		$this->assertEquals($expected['EMAIL1_LINK'], $actual['EMAIL1_LINK']);
+        //$this->assertSame($expected, $actual);
+        $this->assertEquals($expected['NAME'], $actual['NAME']);
+        $this->assertEquals($expected['DELETED'], $actual['DELETED']);
+        $this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
+        $this->assertEquals($expected['DO_NOT_CALL'], $actual['DO_NOT_CALL']);
+        $this->assertEquals($expected['EMAIL1_LINK'], $actual['EMAIL1_LINK']);
 
-	}
+    }
 
 
     public function testget_linked_fields()
     {
-    	$lead = new Lead();
-
-    	$expected = array (
-					  'created_by_link',
-					  'modified_user_link',
-					  'assigned_user_link',
-					  'email_addresses_primary',
-					  'email_addresses',
-					  'reports_to_link',
-					  'reportees',
-					  'contacts',
-					  'accounts',
-					  'contact',
-					  'opportunity',
-					  'campaign_leads',
-					  'tasks',
-					  'notes',
-					  'meetings',
-					  'calls',
-					  'emails',
-					  'campaigns',
-					  'prospect_lists',
-					  'fp_events_leads_1',
-					  'SecurityGroups',
-					);
-    	$actual = $lead->get_linked_fields();
-    	$this->assertTrue(is_array($actual));
+        $lead = new Lead();
+
+        $expected = array (
+                        'created_by_link',
+                        'modified_user_link',
+                        'assigned_user_link',
+                        'email_addresses_primary',
+                        'email_addresses',
+                        'reports_to_link',
+                        'reportees',
+                        'contacts',
+                        'accounts',
+                        'contact',
+                        'opportunity',
+                        'campaign_leads',
+                        'tasks',
+                        'notes',
+                        'meetings',
+                        'calls',
+                        'emails',
+                        'campaigns',
+                        'prospect_lists',
+                        'fp_events_leads_1',
+                        'SecurityGroups',
+                    );
+        $actual = $lead->get_linked_fields();
+        $this->assertTrue(is_array($actual));
         sort($expected);
         $actualKeys = array_keys($actual);
         sort($actualKeys);
-    	$this->assertSame($expected ,$actualKeys);
+        $this->assertSame($expected ,$actualKeys);
 
     }
 
-	public function testbuild_generic_where_clause ()
-	{
+    public function testbuild_generic_where_clause ()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test with empty string params
-		$expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
-		$actual = $lead->build_generic_where_clause("");
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
+        $actual = $lead->build_generic_where_clause("");
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
-		$actual = $lead->build_generic_where_clause("123");
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
+        $actual = $lead->build_generic_where_clause("123");
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testset_notification_body()
-	{
+    public function testset_notification_body()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test with attributes preset and verify template variables are set accordingly
+        //test with attributes preset and verify template variables are set accordingly
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
-		$lead->salutation = "Mr";
-		$lead->lead_source = "Email";
-		$lead->status = "New";
-		$lead->description = "tes description";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
+        $lead->salutation = "Mr";
+        $lead->lead_source = "Email";
+        $lead->status = "New";
+        $lead->description = "tes description";
 
-		$result = $lead->set_notification_body(new Sugar_Smarty(), $lead);
+        $result = $lead->set_notification_body(new Sugar_Smarty(), $lead);
 
-		$this->assertEquals("Mr firstn lastn" ,$result->_tpl_vars['LEAD_NAME']);
-		$this->assertEquals($lead->lead_source ,$result->_tpl_vars['LEAD_SOURCE']);
-		$this->assertEquals($lead->status ,$result->_tpl_vars['LEAD_STATUS']);
-		$this->assertEquals($lead->description ,$result->_tpl_vars['LEAD_DESCRIPTION']);
+        $this->assertEquals("Mr firstn lastn" ,$result->_tpl_vars['LEAD_NAME']);
+        $this->assertEquals($lead->lead_source ,$result->_tpl_vars['LEAD_SOURCE']);
+        $this->assertEquals($lead->status ,$result->_tpl_vars['LEAD_STATUS']);
+        $this->assertEquals($lead->description ,$result->_tpl_vars['LEAD_DESCRIPTION']);
 
-	}
+    }
 
-	public function testbean_implements()
-	{
-		$lead = new Lead();
+    public function testbean_implements()
+    {
+        $lead = new Lead();
 
-		$this->assertEquals(false, $lead->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $lead->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $lead->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $lead->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $lead->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $lead->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
-	public function testlistviewACLHelper()
-	{
-		$lead = new Lead();
+    public function testlistviewACLHelper()
+    {
+        $lead = new Lead();
 
-		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a", "OPPORTUNITY"=>"a", "CONTACT"=>"a" );
-		$actual = $lead->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+        $expected = array("MAIN"=>"a", "ACCOUNT"=>"a", "OPPORTUNITY"=>"a", "CONTACT"=>"a" );
+        $actual = $lead->listviewACLHelper();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testconvertCustomFieldsForm()
-	{
-		$lead = new Lead();
+    public function testconvertCustomFieldsForm()
+    {
+        $lead = new Lead();
 
-		$form = "";
-		$prefix = "";
-		$tempBean = new Contact();
+        $form = "";
+        $prefix = "";
+        $tempBean = new Contact();
 
-		$result = $lead->convertCustomFieldsForm($form, $tempBean, $prefix);
+        $result = $lead->convertCustomFieldsForm($form, $tempBean, $prefix);
 
-		$this->assertEquals(true,$result);
-		$this->assertgreaterThanOrEqual("", $form); //no filed with source = custom_fields
+        $this->assertEquals(true,$result);
+        $this->assertgreaterThanOrEqual("", $form); //no filed with source = custom_fields
 
-	}
+    }
 
 
-	public function testget_unlinked_email_query()
-	{
-		$lead = new Lead();
+    public function testget_unlinked_email_query()
+    {
+        $lead = new Lead();
 
-		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Leads' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Leads' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
-		$actual = $lead->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+        $expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Leads' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Leads' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
+        $actual = $lead->get_unlinked_email_query();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
     public function testget_old_related_calls()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$expected = array();
+        $expected = array();
         $expected['select']='SELECT calls.id ';
         $expected['from']='FROM calls ';
         $expected['where']=" WHERE calls.parent_id = '$this->id'
@@ -351,28 +351,28 @@ 
         $expected['join'] = "";
         $expected['join_tables'][0] = '';
 
-    	$actual = $lead->get_old_related_calls();
-    	$this->assertSame($expected,$actual);
+        $actual = $lead->get_old_related_calls();
+        $this->assertSame($expected,$actual);
 
     }
 
 
     public function testgetActivitiesOptions()
-	{
-		$lead = new Lead();
+    {
+        $lead = new Lead();
 
-		$expected = array( "copy"=>"Copy", "move"=>"Move", "donothing"=>"Do Nothing");
-		$actual = $lead->getActivitiesOptions();
-		$this->assertSame($expected,$actual);
+        $expected = array( "copy"=>"Copy", "move"=>"Move", "donothing"=>"Do Nothing");
+        $actual = $lead->getActivitiesOptions();
+        $this->assertSame($expected,$actual);
 
     }
 
 
     public function testget_old_related_meetings()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$expected = array();
+        $expected = array();
         $expected['select']='SELECT meetings.id ';
         $expected['from']='FROM meetings ';
         $expected['where']=" WHERE meetings.parent_id = ''
@@ -380,8 +380,8 @@ 
         $expected['join'] = "";
         $expected['join_tables'][0] = '';
 
-    	$actual = $lead->get_old_related_meetings();
-    	 $this->assertSame($expected,$actual);
+        $actual = $lead->get_old_related_meetings();
+            $this->assertSame($expected,$actual);
 
     }
 

tests/tests/modules/Project/ProjectTest.php

Indentation +101 added lines, -101 removed lines

@@ -3,132 +3,132 @@ 
 class ProjectTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testProject()
-	{
-		//execute the contructor and check for the Object type and  attributes
-		$project = new Project();
+    public function testProject()
+    {
+        //execute the contructor and check for the Object type and  attributes
+        $project = new Project();
 
-		$this->assertInstanceOf('Project',$project);
-		$this->assertInstanceOf('SugarBean',$project);
+        $this->assertInstanceOf('Project',$project);
+        $this->assertInstanceOf('SugarBean',$project);
 
 
-		$this->assertAttributeEquals('project', 'table_name', $project);
-		$this->assertAttributeEquals('Project', 'module_dir', $project);
-		$this->assertAttributeEquals('Project', 'object_name', $project);
+        $this->assertAttributeEquals('project', 'table_name', $project);
+        $this->assertAttributeEquals('Project', 'module_dir', $project);
+        $this->assertAttributeEquals('Project', 'object_name', $project);
 
-		$this->assertAttributeEquals(true, 'new_schema', $project);
+        $this->assertAttributeEquals(true, 'new_schema', $project);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testfill_in_additional_detail_fields()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$project = new Project();
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
-	public function testfill_in_additional_list_fields()
-	{
-		$project = new Project();
+    public function testfill_in_additional_list_fields()
+    {
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
     public function testsave_relationship_changes()
     {
 
-    	$project = new Project();
+        $project = new Project();
 
-    	$project->id =1;
-    	$_REQUEST['relate_id'] = 2;
-    	$_REQUEST['relate_to'] = "contacts";
+        $project->id =1;
+        $_REQUEST['relate_id'] = 2;
+        $_REQUEST['relate_to'] = "contacts";
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$project->save_relationship_changes(true);
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $project->save_relationship_changes(true);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
     }
 
 
-	public function test_get_total_estimated_effort()
-	{
-		//$project = new Project();
-		//$result = $project->_get_total_estimated_effort("1");
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    public function test_get_total_estimated_effort()
+    {
+        //$project = new Project();
+        //$result = $project->_get_total_estimated_effort("1");
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
 
-	}
+    }
 
 
-	public function test_get_total_actual_effort()
-	{
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
-	}
+    public function test_get_total_actual_effort()
+    {
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    }
 
 
-	public function testget_summary_text()
-	{
-		$project = new Project();
+    public function testget_summary_text()
+    {
+        $project = new Project();
 
-		//test without setting name
-		$this->assertEquals(Null,$project->get_summary_text());
+        //test without setting name
+        $this->assertEquals(Null,$project->get_summary_text());
 
-		//test with name set
-		$project->name = "test";
-		$this->assertEquals('test',$project->get_summary_text());
+        //test with name set
+        $project->name = "test";
+        $this->assertEquals('test',$project->get_summary_text());
 
-	}
+    }
 
 
-	public function testbuild_generic_where_clause ()
-	{
+    public function testbuild_generic_where_clause ()
+    {
 
-		$project = new Project();
+        $project = new Project();
 
-		//test with empty string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testget_list_view_data()
-	{
+    public function testget_list_view_data()
+    {
         /*
 		$project = new Project();
 
@@ -146,44 +146,44 @@ 
 		$this->assertSame($expected, $actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
-	public function testbean_implements(){
+    public function testbean_implements(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$this->assertEquals(false, $project->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $project->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
     public function testcreate_export_query()
     {
-    	$project = new Project();
+        $project = new Project();
 
-    	//test with empty string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
-    	$actual = $project->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
+        $actual = $project->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-    	//test with valid string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
-    	$actual = $project->create_export_query('project.id','users.user_name');
-    	$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
+        $actual = $project->create_export_query('project.id','users.user_name');
+        $this->assertSame($expected,$actual);
 
     }
 
-	public function testgetAllProjectTasks(){
+    public function testgetAllProjectTasks(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$project->id = 1;
-		$result = $project->getAllProjectTasks();
-		$this->assertTrue(is_array($result));
+        $project->id = 1;
+        $result = $project->getAllProjectTasks();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
 }
 ?>