adamjakab / SuiteCRM

modules/AOR_Reports/aor_utils.php

Spacing +4 added lines, -4 removed lines

@@ -111,9 +111,9 @@ 
             if ($_REQUEST['parameter_type'][$key] === 'Date') {
                 $values = array();
                 $values[] = $_REQUEST['parameter_value'][0];
-                $values[] = $_REQUEST['parameter_value'][1];;
-                $values[] = $_REQUEST['parameter_value'][2];;
-                $values[] = $_REQUEST['parameter_value'][3];;
+                $values[] = $_REQUEST['parameter_value'][1]; ;
+                $values[] = $_REQUEST['parameter_value'][2]; ;
+                $values[] = $_REQUEST['parameter_value'][3]; ;
 
                 $params[$parameterId] = array(
                     'id' => $parameterId,
@@ -392,7 +392,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));

install.php

Spacing +111 added lines, -111 removed lines

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