adamjakab / SuiteCRM

modules/Users/authentication/AuthenticationController.php

Spacing +18 added lines, -18 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.
@@ -44,7 +44,7 @@ 
 {
 	public $loggedIn = false; //if a user has attempted to login
 	public $authenticated = false;
-	public $loginSuccess = false;// if a user has successfully logged in
+	public $loginSuccess = false; // if a user has successfully logged in
 
 	protected static $authcontrollerinstance = null;
 
@@ -81,10 +81,10 @@ 
         }
 
         // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
-            require_once('custom/modules/Users/authentication/'.$type.'/' . $type . '.php');
-        } elseif (file_exists('modules/Users/authentication/'.$type.'/' . $type . '.php')) {
-            require_once('modules/Users/authentication/'.$type.'/' . $type . '.php');
+		if (file_exists('custom/modules/Users/authentication/'.$type.'/'.$type.'.php')) {
+            require_once('custom/modules/Users/authentication/'.$type.'/'.$type.'.php');
+        } elseif (file_exists('modules/Users/authentication/'.$type.'/'.$type.'.php')) {
+            require_once('modules/Users/authentication/'.$type.'/'.$type.'.php');
         } else {
             require_once('modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php');
             $type = 'SugarAuthenticate';
@@ -124,21 +124,21 @@ 
 	public function login($username, $password, $PARAMS = array())
 	{
 		//kbrill bug #13225
-		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
+		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts'])) ? $_SESSION['loginAttempts'] + 1 : 1;
 		unset($GLOBALS['login_error']);
 
-		if($this->loggedIn)return $this->loginSuccess;
+		if ($this->loggedIn)return $this->loginSuccess;
 		LogicHook::initialize()->call_custom_logic('Users', 'before_login');
 
 		$this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
 		$this->loggedIn = true;
 
-		if($this->loginSuccess){
+		if ($this->loginSuccess) {
 			//Ensure the user is authorized
 			checkAuthUserStatus();
 
 			//loginLicense();
-			if(!empty($GLOBALS['login_error'])){
+			if (!empty($GLOBALS['login_error'])) {
 				unset($_SESSION['authenticated_user_id']);
 				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
 				$this->loginSuccess = false;
@@ -146,13 +146,13 @@ 
 			}
 
 			//call business logic hook
-			if(isset($GLOBALS['current_user']))
+			if (isset($GLOBALS['current_user']))
 				$GLOBALS['current_user']->call_custom_logic('after_login');
 
 			// Check for running Admin Wizard
 			$config = new Administration();
 			$config->retrieveSettings();
-		    if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
+		    if (is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') {
 				$GLOBALS['module'] = 'Configurator';
 				$GLOBALS['action'] = 'AdminWizard';
 				ob_clean();
@@ -165,18 +165,18 @@ 
 			if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
 				$checkTimeZone = false;
 			} // if
-			if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
+			if (empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone') {
 				$GLOBALS['module'] = 'Users';
 				$GLOBALS['action'] = 'Wizard';
 				ob_clean();
 				header("Location: index.php?module=Users&action=Wizard");
 				sugar_cleanup(true);
 			}
-		}else{
+		} else {
 			//kbrill bug #13225
 			LogicHook::initialize();
 			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
-			$GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
+			$GLOBALS['log']->fatal('FAILED LOGIN:attempts['.$_SESSION['loginAttempts'].'] - '.$username);
 		}
 		// if password has expired, set a session variable
 
@@ -191,11 +191,11 @@ 
 	 */
 	public function sessionAuthenticate()
 	{
-		if(!$this->authenticated){
+		if (!$this->authenticated) {
 			$this->authenticated = $this->authController->sessionAuthenticate();
 		}
-		if($this->authenticated){
-			if(!isset($_SESSION['userStats']['pages'])){
+		if ($this->authenticated) {
+			if (!isset($_SESSION['userStats']['pages'])) {
 			    $_SESSION['userStats']['loginTime'] = time();
 			    $_SESSION['userStats']['pages'] = 0;
 			}

install/installConfig.php

Spacing +78 added lines, -78 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
 
@@ -87,9 +87,9 @@ 
 
     public static function getSelect($name, $options, $default) {
         $out = "<select name=\"$name\">";
-        foreach($options as $key => $value) {
+        foreach ($options as $key => $value) {
             $selected = '';
-            if($key==$default) $selected = ' selected="selected"';
+            if ($key == $default) $selected = ' selected="selected"';
             $out .= "<option label=\"$value\" value=\"$key\"$selected>$value</option>";
         }
         $out .= "</select>";
@@ -238,13 +238,13 @@ 
         <div class=\"form_section\">
           <h3>{$mod_strings['LBL_SYSOPTS_DB']}</h3>";
 
-        foreach($drivers as $type => $driver) {
-            $oci = ($type == "oci8")?"":'none'; // hack for special oracle message
-            $out_dbtypesel.=<<<EOQ
+        foreach ($drivers as $type => $driver) {
+            $oci = ($type == "oci8") ? "" : 'none'; // hack for special oracle message
+            $out_dbtypesel .= <<<EOQ
                 <input type="radio" class="checkbox" name="setup_db_type" id="setup_db_type" value="$type" {$checked[$type]} onclick="onDBTypeClick(this);//document.getElementById('ociMsg').style.display='$oci'"/>{$mod_strings[$driver->label]}<br>
 EOQ;
         }
-        $out_dbtypesel.=<<<EOQ
+        $out_dbtypesel .= <<<EOQ
         </div>
             <div name="ociMsg" id="ociMsg" style="display:none"></div>
     <!-- </div> -->
@@ -254,7 +254,7 @@ 
         $out2 = $out_dbtypesel;
 
 
-        $out2.=<<<EOQ2
+        $out2 .= <<<EOQ2
 
         <!-- <div class="floatbox"> -->
 
@@ -265,25 +265,25 @@ 
 
         $config_params = $db->installConfig();
         $form = '';
-        foreach($config_params as $group => $gdata) {
-            $form.= "<div class='install_block'>";
-            if($mod_strings[$group . '_LABEL']) {
-                $form .= "<label>{$mod_strings[$group . '_LABEL']}" . "<i> i <div class=\"tooltip\">{$mod_strings[$group]}</div></i></label>\n";
+        foreach ($config_params as $group => $gdata) {
+            $form .= "<div class='install_block'>";
+            if ($mod_strings[$group.'_LABEL']) {
+                $form .= "<label>{$mod_strings[$group.'_LABEL']}"."<i> i <div class=\"tooltip\">{$mod_strings[$group]}</div></i></label>\n";
             }
-            foreach($gdata as $name => $value) {
+            foreach ($gdata as $name => $value) {
 
-                if(!empty($value)) {
-                    if(!empty($value['required'])) {
+                if (!empty($value)) {
+                    if (!empty($value['required'])) {
                         $form .= "<span class=\"required\">*</span>";
                     }
                     else {
                     }
-                    if(!empty($_SESSION[$name])) {
+                    if (!empty($_SESSION[$name])) {
                         $sessval = $_SESSION[$name];
                     } else {
                         $sessval = '';
                     }
-                    if(!empty($value["type"])) {
+                    if (!empty($value["type"])) {
                         $type = $value["type"];
                     } else {
                         $type = '';
@@ -293,9 +293,9 @@ 
 
 FORM;
                     //if the type is password, set a hidden field to capture the value.  This is so that we can properly encode special characters, which is a limitation with password fields
-                    if($type=='password'){
+                    if ($type == 'password') {
                         $form .= "</div><div class=\"install_block\"><label>{$mod_strings['LBL_DBCONF_TITLE_PSWD_INFO_LABEL']}</label><span>&nbsp;</span><input type='$type' name='{$name}_entry' id='{$name}_entry' value='".urldecode($sessval)."'><input type='hidden' name='$name' id='$name' value='".urldecode($sessval)."'></div><div class=\"install_block\">";
-                    }else{
+                    } else {
                         $form .= "<input type='$type' name='$name' id='$name' value='$sessval'>";
                     }
 
@@ -319,7 +319,7 @@ 
 
 
 //if we are installing in custom mode, include the following html
-        if($db->supports("create_user")) {
+        if ($db->supports("create_user")) {
 // create / set db user dropdown
             $auto_select = '';
             $provide_select = '';
@@ -342,9 +342,9 @@ 
                 $same_select = 'selected';
             }
             $dbUSRDD = "<select name='dbUSRData' id='dbUSRData' onchange='toggleDBUser();'>";
-            $dbUSRDD .= "<option value='provide' $provide_select>" . $mod_strings['LBL_DBCONFIG_PROVIDE_DD'] . "</option>";
-            $dbUSRDD .= "<option value='create' $create_select>" . $mod_strings['LBL_DBCONFIG_CREATE_DD'] . "</option>";
-            $dbUSRDD .= "<option value='same' $same_select>" . $mod_strings['LBL_DBCONFIG_SAME_DD'] . "</option>";
+            $dbUSRDD .= "<option value='provide' $provide_select>".$mod_strings['LBL_DBCONFIG_PROVIDE_DD']."</option>";
+            $dbUSRDD .= "<option value='create' $create_select>".$mod_strings['LBL_DBCONFIG_CREATE_DD']."</option>";
+            $dbUSRDD .= "<option value='same' $same_select>".$mod_strings['LBL_DBCONFIG_SAME_DD']."</option>";
             $dbUSRDD .= "</select><br>&nbsp;";
 
 
@@ -388,12 +388,12 @@ 
 
 EOQ2;
         }
-        $out =$out2;
+        $out = $out2;
 
 
 
         // ------ siteConfig_a.php
-        $out .=<<<EOQ
+        $out .= <<<EOQ
         </div>
     </div>
     <div class="floatbox" id="fb6">
@@ -405,8 +405,8 @@ 
                     <h3>{$mod_strings['LBL_SITECFG_TITLE2']}<div class="tooltip-toggle"><em> i </em><div class="tooltip">{$mod_strings['LBL_SITECFG_PASSWORD_MSG']}</div></div></h3>
 EOQ;
         //hide this in typical mode
-        if(!empty($_SESSION['install_type']) && strtolower($_SESSION['install_type'])=='custom'){
-            $out .=<<<EOQ
+        if (!empty($_SESSION['install_type']) && strtolower($_SESSION['install_type']) == 'custom') {
+            $out .= <<<EOQ
 <div class='install_block'>
     {$mod_strings['LBL_SITECFG_URL_MSG']}
     <span class="required">*</span>
@@ -419,17 +419,17 @@ 
 </div>
 EOQ;
             $db = getDbConnection();
-            if($db->supports("collation")) {
+            if ($db->supports("collation")) {
                 $collationOptions = $db->getCollationList();
             }
-            if(!empty($collationOptions)) {
-                if(isset($_SESSION['setup_db_options']['collation'])) {
+            if (!empty($collationOptions)) {
+                if (isset($_SESSION['setup_db_options']['collation'])) {
                     $default = $_SESSION['setup_db_options']['collation'];
                 } else {
                     $default = $db->getDefaultCollation();
                 }
                 $options = get_select_options_with_id(array_combine($collationOptions, $collationOptions), $default);
-                $out .=<<<EOQ
+                $out .= <<<EOQ
      <div class='install_block'>
         <br>{$mod_strings['LBL_SITECFG_COLLATION_MSG']}
         <span class="required">*</span>
@@ -441,15 +441,15 @@ 
         }
 
         $help_url = get_help_button_url();
-        if(!isset($_SESSION['email1'])) {
+        if (!isset($_SESSION['email1'])) {
             $_SESSION['email1'] = null;
         }
 
-		if(!isset($_SESSION['setup_site_admin_user_name'])) {
+		if (!isset($_SESSION['setup_site_admin_user_name'])) {
 			$_SESSION['setup_site_admin_user_name'] = null;
 		}
 		
-        $out .=<<<EOQ
+        $out .= <<<EOQ
 <div class='install_block'>
     <!--
     <p class="ibmsg">{$mod_strings['LBL_SITECFG_PASSWORD_MSG']}</p>
@@ -498,7 +498,7 @@ 
 EOQ;
 
 
-        $out.=<<<EOQ
+        $out .= <<<EOQ
 </div><!-- dbg2 -->
 EOQ;
 
@@ -517,7 +517,7 @@ 
         $demoDD = "<select name='demoData' id='demoData' class='select'><option value='no' >".$mod_strings['LBL_NO']."</option><option value='yes'>".$mod_strings['LBL_YES']."</option>";
         $demoDD .= "</select>";
 
-        $out .=<<<EOQ3
+        $out .= <<<EOQ3
         </div>
         </div>
 
@@ -559,7 +559,7 @@ 
         $notify_allow_default_outbound_checked = empty($_SESSION['notify_allow_default_outbound']) ? '' : ' checked="checked" ';
 
         // set default smtp toggle buttons selected value
-        if(empty($_SESSION['smtp_tab_selected'])) $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
+        if (empty($_SESSION['smtp_tab_selected'])) $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
 
         $out .= <<<EOQ
         <div class="floatbox full" id="fb2">
@@ -817,7 +817,7 @@ 
 
 
         // db setup (dbConfig_a.php)
-        $out2 =<<<EOQ2
+        $out2 = <<<EOQ2
             <input type='hidden' name='setup_db_drop_tables' id='setup_db_drop_tables' value=''>
         </div>
 EOQ2;
@@ -836,7 +836,7 @@ 
         $currentLogoLink = SugarThemeRegistry::current()->getImageURL('company_logo.png');
         // show logo if we have
         $hiddenLogo = '';
-        if(!file_exists($currentLogoLink)) {
+        if (!file_exists($currentLogoLink)) {
             $hiddenLogo = 'display:none;';
         }
 
@@ -989,10 +989,10 @@ 
 EOQ;
 
 
-$out.= "<div class=\"floatbox full\">";
-$out.= "    <h3 onclick=\"$(this).next().toggle();\" class=\"toggler\">&raquo; {$mod_strings['LBL_SITECFG_SECURITY_TITLE']}</h3>";
+$out .= "<div class=\"floatbox full\">";
+$out .= "    <h3 onclick=\"$(this).next().toggle();\" class=\"toggler\">&raquo; {$mod_strings['LBL_SITECFG_SECURITY_TITLE']}</h3>";
 
-        $out.=<<<EOQ
+        $out .= <<<EOQ
 
 <div class="security-block" style="display:none;">
 <table cellspacing="0" cellpadding="0" border="0" align="center" class="shell">
@@ -1081,7 +1081,7 @@ 
 </div><!-- dbg1 -->
 EOQ;
 
-$out.= "</div>";
+$out .= "</div>";
 
 
 
@@ -1089,7 +1089,7 @@ 
     }
 
     private function getFormControlls($mod_strings, $formId) {
-        $out =<<<EOQ
+        $out = <<<EOQ
         <div id="checkingDiv" style="display:none">
                     <p><img alt="{$mod_strings['LBL_LICENSE_CHKDB_HEADER']}" src='install/processing.gif'> <br>{$mod_strings['LBL_LICENSE_CHKDB_HEADER']}</p>
            </div>
@@ -1375,7 +1375,7 @@ 
     }
 
     private function getFormScripts($mod_strings, $next_step) {
-        $out =<<<EOQ
+        $out = <<<EOQ
             /**
              * Submit form without step.
              */
@@ -1575,7 +1575,7 @@ 
      * @return string   output
      */
     public function show($data = null) {
-        foreach($data as $__key => $__val) {
+        foreach ($data as $__key => $__val) {
             $$__key = $__val;
         }
         $formId = 'installForm';
@@ -1633,7 +1633,7 @@ 
 
 
 
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
 
@@ -1641,20 +1641,20 @@ 
 
 //---------------- systemOption: db driver select
 
-if(!isset($_SESSION['setup_db_type']) || $_SESSION['setup_db_type'] ==''){
+if (!isset($_SESSION['setup_db_type']) || $_SESSION['setup_db_type'] == '') {
     $_SESSION['setup_db_type'] = 'mysql';
 }
 $setup_db_type = $_SESSION['setup_db_type'];
 
 $errs = '';
-if(isset($validation_errors)) {
-    if(count($validation_errors) > 0) {
+if (isset($validation_errors)) {
+    if (count($validation_errors) > 0) {
         $errs  = '<div id="errorMsgs">';
         $errs .= "<p>{$mod_strings['LBL_SYSOPTS_ERRS_TITLE']}</p>";
         $errs .= '<ul>';
 
-        foreach($validation_errors as $error) {
-            $errs .= '<li>' . $error . '</li>';
+        foreach ($validation_errors as $error) {
+            $errs .= '<li>'.$error.'</li>';
         }
 
         $errs .= '</ul>';
@@ -1663,7 +1663,7 @@ 
 }
 
 $drivers = DBManagerFactory::getDbDrivers();
-foreach(array_keys($drivers) as $dname) {
+foreach (array_keys($drivers) as $dname) {
     $checked[$dname] = '';
 }
 $checked[$setup_db_type] = 'checked="checked"';
@@ -1672,8 +1672,8 @@ 
 
 //----------------- dbConfig_a: db name user pass...
 
-if(empty($_SESSION['setup_db_host_name'])){
-    $_SESSION['setup_db_host_name'] = (isset($sugar_config['db_host_name']))  ? $sugar_config['db_host_name'] :  $_SERVER['SERVER_NAME'];
+if (empty($_SESSION['setup_db_host_name'])) {
+    $_SESSION['setup_db_host_name'] = (isset($sugar_config['db_host_name'])) ? $sugar_config['db_host_name'] : $_SERVER['SERVER_NAME'];
 }
 
 
@@ -1682,16 +1682,16 @@ 
 $createDb = (!empty($_SESSION['setup_db_create_database'])) ? 'checked="checked"' : '';
 $dropCreate = (!empty($_SESSION['setup_db_drop_tables'])) ? 'checked="checked"' : '';
 $instanceName = '';
-if (isset($_SESSION['setup_db_host_instance']) && !empty($_SESSION['setup_db_host_instance'])){
+if (isset($_SESSION['setup_db_host_instance']) && !empty($_SESSION['setup_db_host_instance'])) {
     $instanceName = $_SESSION['setup_db_host_instance'];
 }
 
-$setupDbPortNum ='';
-if (isset($_SESSION['setup_db_port_num']) && !empty($_SESSION['setup_db_port_num'])){
+$setupDbPortNum = '';
+if (isset($_SESSION['setup_db_port_num']) && !empty($_SESSION['setup_db_port_num'])) {
     $setupDbPortNum = $_SESSION['setup_db_port_num'];
 }
 
-if(!isset($_SESSION['setup_db_manager'])) {
+if (!isset($_SESSION['setup_db_manager'])) {
     $_SESSION['setup_db_manager'] = null;
 }
 
@@ -1704,54 +1704,54 @@ 
 //----------------- siteConfig_a.php Site Config & admin user
 
 
-if( is_file("config.php") ){
-    if(!empty($sugar_config['default_theme']))
+if (is_file("config.php")) {
+    if (!empty($sugar_config['default_theme']))
         $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
 
-    if(!empty($sugar_config['disable_persistent_connections']))
+    if (!empty($sugar_config['disable_persistent_connections']))
         $_SESSION['disable_persistent_connections'] =
             $sugar_config['disable_persistent_connections'];
-    if(!empty($sugar_config['default_language']))
+    if (!empty($sugar_config['default_language']))
         $_SESSION['default_language'] = $sugar_config['default_language'];
-    if(!empty($sugar_config['translation_string_prefix']))
+    if (!empty($sugar_config['translation_string_prefix']))
         $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
-    if(!empty($sugar_config['default_charset']))
+    if (!empty($sugar_config['default_charset']))
         $_SESSION['default_charset'] = $sugar_config['default_charset'];
 
-    if(!empty($sugar_config['default_currency_name']))
+    if (!empty($sugar_config['default_currency_name']))
         $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
-    if(!empty($sugar_config['default_currency_symbol']))
+    if (!empty($sugar_config['default_currency_symbol']))
         $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
-    if(!empty($sugar_config['default_currency_iso4217']))
+    if (!empty($sugar_config['default_currency_iso4217']))
         $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
 
-    if(!empty($sugar_config['rss_cache_time']))
+    if (!empty($sugar_config['rss_cache_time']))
         $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
-    if(!empty($sugar_config['languages']))
+    if (!empty($sugar_config['languages']))
     {
         // We need to encode the languages in a way that can be retrieved later.
         $language_keys = Array();
         $language_values = Array();
 
-        foreach($sugar_config['languages'] as $key=>$value)
+        foreach ($sugar_config['languages'] as $key=>$value)
         {
             $language_keys[] = $key;
             $language_values[] = $value;
         }
 
-        $_SESSION['language_keys'] = urlencode(implode(",",$language_keys));
-        $_SESSION['language_values'] = urlencode(implode(",",$language_values));
+        $_SESSION['language_keys'] = urlencode(implode(",", $language_keys));
+        $_SESSION['language_values'] = urlencode(implode(",", $language_values));
     }
 }
 
 ////	errors
 $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>' . $error . '</li>';
+        foreach ($validation_errors as $error) {
+            $errors .= '<li>'.$error.'</li>';
         }
         $errors .= '</ul></div>';
     }

install/performSetup.php

Spacing +58 added lines, -58 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.
@@ -40,10 +40,10 @@ 
 
 function installStatus($msg, $cmd = null, $overwrite = false, $before = '[ok]<br>') {
     $fname = 'install/status.json';
-    if(!$overwrite && file_exists($fname)) {
+    if (!$overwrite && file_exists($fname)) {
         $stat = json_decode(file_get_contents($fname));
         //$msg = json_encode($stat);
-        $msg = $stat->message . $before . $msg;
+        $msg = $stat->message.$before.$msg;
     }
     file_put_contents($fname, json_encode(array(
         'message' => $msg,
@@ -55,10 +55,10 @@ 
 // This file will load the configuration settings from session data,
 // write to the config file, and execute any necessary database steps.
 $GLOBALS['installing'] = true;
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
-ini_set("output_buffering","0");
+ini_set("output_buffering", "0");
 set_time_limit(3600);
 // flush after each output so the user can see the progress in real-time
 ob_implicit_flush();
@@ -98,9 +98,9 @@ 
 $parsed_url                         = parse_url($setup_site_url);
 $setup_site_host_name               = $parsed_url['host'];
 $setup_site_log_dir                 = isset($_SESSION['setup_site_custom_log_dir']) ? $_SESSION['setup_site_log_dir'] : '.';
-$setup_site_log_file                = 'suitecrm.log';  // may be an option later
+$setup_site_log_file                = 'suitecrm.log'; // may be an option later
 $setup_site_session_path            = isset($_SESSION['setup_site_custom_session_path']) ? $_SESSION['setup_site_session_path'] : '';
-$setup_site_log_level				='fatal';
+$setup_site_log_level = 'fatal';
 
 /*sugar_cache_clear('TeamSetsCache');
 if ( file_exists($cache_dir .'modules/Teams/TeamSetCache.php') ) {
@@ -112,7 +112,7 @@ 
 	unlink($cache_dir.'modules/Teams/TeamSetMD5Cache.php');
 }*/
 $langHeader = get_language_header();
-$out =<<<EOQ
+$out = <<<EOQ
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!DOCTYPE HTML>
 <html {$langHeader}>
@@ -153,7 +153,7 @@ 
 //handleLog4Php();
 
 $server_software = $_SERVER["SERVER_SOFTWARE"];
-if(strpos($server_software,'Microsoft-IIS') !== false)
+if (strpos($server_software, 'Microsoft-IIS') !== false)
 {
     installLog("calling handleWebConfig()");
 	handleWebConfig();
@@ -169,7 +169,7 @@ 
 echo "<br>";
 
 // create the SugarCRM database
-if($setup_db_create_database) {
+if ($setup_db_create_database) {
     installLog("calling handleDbCreateDatabase()");
     installerHook('pre_handleDbCreateDatabase');
     handleDbCreateDatabase();
@@ -193,19 +193,19 @@ 
 $ModuleInstaller->rebuild_tabledictionary();*/
 
 // create the SugarCRM database user
-if($setup_db_create_sugarsales_user){
+if ($setup_db_create_sugarsales_user) {
     installerHook('pre_handleDbCreateSugarUser');
     handleDbCreateSugarUser();
     installerHook('post_handleDbCreateSugarUser');
 }
 
-foreach( $beanFiles as $bean => $file ){
-    require_once( $file );
+foreach ($beanFiles as $bean => $file) {
+    require_once($file);
 }
 echo "<br>";
 // load up the config_override.php file.
 // This is used to provide default user settings
-if( is_file("config_override.php") ){
+if (is_file("config_override.php")) {
     require_once("config_override.php");
 }
 
@@ -219,7 +219,7 @@ 
 $new_report     = 1;
 
 // add non-module Beans to this array to keep the installer from erroring.
-$nonStandardModules = array (
+$nonStandardModules = array(
     //'Tracker',
 );
 
@@ -234,29 +234,29 @@ 
 installerHook('pre_createAllModuleTables');
 
 
-foreach( $beanFiles as $bean => $file ) {
-	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
+foreach ($beanFiles as $bean => $file) {
+	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask', 'jjwg_Maps', 'jjwg_Address_Cache', 'jjwg_Areas', 'jjwg_Markers');
 
-	if(in_array($bean, $doNotInit)) {
+	if (in_array($bean, $doNotInit)) {
 		$focus = new $bean(false);
 	} else {
 	    $focus = new $bean();
 	}
 
-	if ( $bean == 'Configurator' )
+	if ($bean == 'Configurator')
 	    continue;
 
     $table_name = $focus->table_name;
     //installStatus(sprintf($mod_strings['STAT_CREATE_DB_TABLE'], $focus->table_name ));
      installLog("processing table ".$focus->table_name);
     // check to see if we have already setup this table
-    if(!in_array($table_name, $processed_tables)) {
-        if(!file_exists("modules/".$focus->module_dir."/vardefs.php")){
+    if (!in_array($table_name, $processed_tables)) {
+        if (!file_exists("modules/".$focus->module_dir."/vardefs.php")) {
             continue;
         }
-        if(!in_array($bean, $nonStandardModules)) {
+        if (!in_array($bean, $nonStandardModules)) {
             require_once("modules/".$focus->module_dir."/vardefs.php"); // load up $dictionary
-            if($dictionary[$focus->object_name]['table'] == 'does_not_exist') {
+            if ($dictionary[$focus->object_name]['table'] == 'does_not_exist') {
                 continue; // support new vardef definitions
             }
         } else {
@@ -268,17 +268,17 @@ 
 
         $focus->db->database = $db->database; // set db connection so we do not need to reconnect
 
-        if($setup_db_drop_tables) {
+        if ($setup_db_drop_tables) {
             drop_table_install($focus);
             installLog("dropping table ".$focus->table_name);
         }
 
-        if(create_table_if_not_exist($focus)) {
+        if (create_table_if_not_exist($focus)) {
             installLog("creating table ".$focus->table_name);
-            if( $bean == "User" ){
+            if ($bean == "User") {
                 $new_tables = 1;
             }
-            if($bean == "Administration")
+            if ($bean == "Administration")
                 $new_config = 1;
 
 
@@ -303,20 +303,20 @@ 
 ////    START RELATIONSHIP CREATION
 
     ksort($rel_dictionary);
-    foreach( $rel_dictionary as $rel_name => $rel_data ){
+    foreach ($rel_dictionary as $rel_name => $rel_data) {
         $table = $rel_data['table'];
 
-        if( $setup_db_drop_tables ){
-            if( $db->tableExists($table) ){
+        if ($setup_db_drop_tables) {
+            if ($db->tableExists($table)) {
                 $db->dropTableName($table);
             }
         }
 
-        if( !$db->tableExists($table) ){
+        if (!$db->tableExists($table)) {
             $db->createTableParams($table, $rel_data['fields'], $rel_data['indices']);
         }
 
-        SugarBean::createRelationshipMeta($rel_name,$db,$table,$rel_dictionary,'');
+        SugarBean::createRelationshipMeta($rel_name, $db, $table, $rel_dictionary, '');
     }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -376,7 +376,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////
 ////    FINALIZE LANG PACK INSTALL
-    if(isset($_SESSION['INSTALLED_LANG_PACKS']) && is_array($_SESSION['INSTALLED_LANG_PACKS']) && !empty($_SESSION['INSTALLED_LANG_PACKS'])) {
+    if (isset($_SESSION['INSTALLED_LANG_PACKS']) && is_array($_SESSION['INSTALLED_LANG_PACKS']) && !empty($_SESSION['INSTALLED_LANG_PACKS'])) {
         updateUpgradeHistory();
     }
 
@@ -393,7 +393,7 @@ 
 
     $memoryUsed = '';
     if (function_exists('memory_get_usage')) {
-        $memoryUsed = $mod_strings['LBL_PERFORM_OUTRO_5'] . memory_get_usage() . $mod_strings['LBL_PERFORM_OUTRO_6'];
+        $memoryUsed = $mod_strings['LBL_PERFORM_OUTRO_5'].memory_get_usage().$mod_strings['LBL_PERFORM_OUTRO_6'];
     }
 
 
@@ -421,14 +421,14 @@ 
 FP;
     }
 
-    if( isset($_SESSION['setup_site_sugarbeet_automatic_checks']) && $_SESSION['setup_site_sugarbeet_automatic_checks'] == true){
+    if (isset($_SESSION['setup_site_sugarbeet_automatic_checks']) && $_SESSION['setup_site_sugarbeet_automatic_checks'] == true) {
         set_CheckUpdates_config_setting('automatic');
-    }else{
+    } else {
         set_CheckUpdates_config_setting('manual');
     }
-    if(!empty($_SESSION['setup_system_name'])){
-        $admin=new Administration();
-        $admin->saveSetting('system','name',$_SESSION['setup_system_name']);
+    if (!empty($_SESSION['setup_system_name'])) {
+        $admin = new Administration();
+        $admin->saveSetting('system', 'name', $_SESSION['setup_system_name']);
     }
 
     // Bug 28601 - Set the default list of tabs to show
@@ -490,16 +490,16 @@ 
 
 // populating the db with seed data
 installLog("populating the db with seed data");
-if( $_SESSION['demoData'] != 'no' ){
+if ($_SESSION['demoData'] != 'no') {
     installerHook('pre_installDemoData');
-    set_time_limit( 301 );
+    set_time_limit(301);
 
     echo "<br>";
     echo "<b>{$mod_strings['LBL_PERFORM_DEMO_DATA']}</b>";
     echo "<br><br>";
 
-    print( $render_table_close );
-    print( $render_table_open );
+    print($render_table_close);
+    print($render_table_open);
 
     global $current_user;
     $current_user = new User();
@@ -539,7 +539,7 @@ 
 //$focus->retrieveSettings();
 // switch off the adminwizard (mark that we have got past this point)
 installLog('AdminWizard OFF');
-$focus->saveSetting('system','adminwizard',1);
+$focus->saveSetting('system', 'adminwizard', 1);
 
 installLog('saveConfig');
 $focus->saveConfig();
@@ -554,10 +554,10 @@ 
 
 installLog('handleOverride');
 // add local settings to config overrides
-if(!empty($_SESSION['default_date_format'])) $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
-if(!empty($_SESSION['default_time_format'])) $sugar_config['default_time_format'] = $_SESSION['default_time_format'];
-if(!empty($_SESSION['default_language'])) $sugar_config['default_language'] = $_SESSION['default_language'];
-if(!empty($_SESSION['default_locale_name_format'])) $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
+if (!empty($_SESSION['default_date_format'])) $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
+if (!empty($_SESSION['default_time_format'])) $sugar_config['default_time_format'] = $_SESSION['default_time_format'];
+if (!empty($_SESSION['default_language'])) $sugar_config['default_language'] = $_SESSION['default_language'];
+if (!empty($_SESSION['default_locale_name_format'])) $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
 //$configurator->handleOverride();
 
 
@@ -576,9 +576,9 @@ 
 $currency = new Currency;
 installLog('retrieve');
 $currency->retrieve($currency->retrieve_id_by_name($_REQUEST['default_currency_name']));
-if ( !empty($currency->id)
+if (!empty($currency->id)
     && $currency->symbol == $_REQUEST['default_currency_symbol']
-    && $currency->iso4217 == $_REQUEST['default_currency_iso4217'] ) {
+    && $currency->iso4217 == $_REQUEST['default_currency_iso4217']) {
     $currency->deleted = 1;
     installLog('DBG: save currency');
     $currency->save();
@@ -601,7 +601,7 @@ 
 $sugar_config = get_sugar_config_defaults();
 
 // set local settings -  if neccessary you can set here more fields as named in User module / EditView form...
-if(isset($_REQUEST['timezone']) && $_REQUEST['timezone']) {
+if (isset($_REQUEST['timezone']) && $_REQUEST['timezone']) {
     $current_user->setPreference('timezone', $_REQUEST['timezone']);
 }
 
@@ -620,7 +620,7 @@ 
 //$_POST[''] = $_REQUEST['export_delimiter'];
 
 $_POST['record'] = $current_user->id;
-$_POST['is_admin'] = ( $current_user->is_admin ? 'on' : '' );
+$_POST['is_admin'] = ($current_user->is_admin ? 'on' : '');
 $_POST['use_real_names'] = true;
 $_POST['reminder_checked'] = '1';
 $_POST['reminder_time'] = 1800;
@@ -628,7 +628,7 @@ 
 $_POST['mailmerge_on'] = 'on';
 $_POST['receive_notifications'] = $current_user->receive_notifications;
 installLog('DBG: SugarThemeRegistry::getDefault');
-$_POST['user_theme'] = (string) SugarThemeRegistry::getDefault();
+$_POST['user_theme'] = (string)SugarThemeRegistry::getDefault();
 
 // save and redirect to new view
 $_REQUEST['return_module'] = 'Home';
@@ -638,15 +638,15 @@ 
 
 // restore superglobals and vars
 $GLOBALS = $varStack['GLOBALS'];
-foreach($varStack['defined_vars'] as $__key => $__value) $$__key = $__value;
+foreach ($varStack['defined_vars'] as $__key => $__value) $$__key = $__value;
 
 
 
 $endTime = microtime(true);
 $deltaTime = $endTime - $startTime;
 
-if( count( $bottle ) > 0 ){
-    foreach( $bottle as $bottle_message ){
+if (count($bottle) > 0) {
+    foreach ($bottle as $bottle_message) {
         $bottleMsg .= "{$bottle_message}\n";
     }
 } else {
@@ -654,7 +654,7 @@ 
 }
 installerHook('post_installModules');
 
-$out =<<<EOQ
+$out = <<<EOQ
 <br><p><b>{$mod_strings['LBL_PERFORM_OUTRO_1']} {$setup_sugar_version} {$mod_strings['LBL_PERFORM_OUTRO_2']}</b></p>
 
 {$mod_strings['LBL_PERFORM_OUTRO_3']} {$deltaTime} {$mod_strings['LBL_PERFORM_OUTRO_4']}<br />
@@ -676,6 +676,6 @@ 
 echo $out;
 
 $loginURL = str_replace('install.php', 'index.php', "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-installStatus(sprintf($mod_strings['STAT_INSTALL_FINISH_LOGIN'], $loginURL ) , array('function' => 'redirect', 'arguments' => $loginURL) );
+installStatus(sprintf($mod_strings['STAT_INSTALL_FINISH_LOGIN'], $loginURL), array('function' => 'redirect', 'arguments' => $loginURL));
 
 ?>

include/utils.php

Spacing +13 added lines, -13 removed lines

@@ -120,8 +120,8 @@ 
             'd.m.Y' => '23.12.2010',
             'm.d.Y' => '12.23.2010',
         ) : $dateFormats,
-        'dbconfig' => $dbconfig,  // this must be set!!
-        'dbconfigoption' => $dbconfigoption,  // this must be set!!
+        'dbconfig' => $dbconfig, // this must be set!!
+        'dbconfigoption' => $dbconfigoption, // this must be set!!
         'default_action' => empty($default_action) ? 'index' : $default_action,
         'default_charset' => empty($default_charset) ? 'UTF-8' : $default_charset,
         'default_currency_name' => empty($default_currency_name) ? 'US Dollar' : $default_currency_name,
@@ -149,7 +149,7 @@ 
         'display_inbound_email_buttons' => empty($display_inbound_email_buttons) ? false : $display_inbound_email_buttons,
         'history_max_viewed' => empty($history_max_viewed) ? 50 : $history_max_viewed,
         'host_name' => empty($host_name) ? 'localhost' : $host_name,
-        'import_dir' => $import_dir,  // this must be set!!
+        'import_dir' => $import_dir, // this must be set!!
         'import_max_records_per_file' => 100,
         'import_max_records_total_limit' => '',
         'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
@@ -169,21 +169,21 @@ 
         ),
         'require_accounts' => empty($requireAccounts) ? true : $requireAccounts,
         'rss_cache_time' => empty($RSS_CACHE_TIME) ? '10800' : $RSS_CACHE_TIME,
-        'session_dir' => $session_dir,  // this must be set!!
-        'site_url' => empty($site_URL) ? $site_url : $site_URL,  // this must be set!!
+        'session_dir' => $session_dir, // this must be set!!
+        'site_url' => empty($site_URL) ? $site_url : $site_URL, // this must be set!!
         'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
         'showThemePicker' => true,
         'sugar_version' => empty($sugar_version) ? 'unknown' : $sugar_version,
         'time_formats' => empty($timeFormats) ? array(
             'H:i' => '23:00', 'h:ia' => '11:00 pm', 'h:iA' => '11:00PM',
-            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM', ) : $timeFormats,
-        'tmp_dir' => $tmp_dir,  // this must be set!!
+            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM',) : $timeFormats,
+        'tmp_dir' => $tmp_dir, // this must be set!!
         'translation_string_prefix' => empty($translation_string_prefix) ? false : $translation_string_prefix,
         'unique_key' => empty($unique_key) ? md5(create_guid()) : $unique_key,
         'upload_badext' => empty($upload_badext) ? array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', ) : $upload_badext,
-        'upload_dir' => $upload_dir,  // this must be set!!
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm',) : $upload_badext,
+        'upload_dir' => $upload_dir, // this must be set!!
         'upload_maxsize' => empty($upload_maxsize) ? 30000000 : $upload_maxsize,
         'import_max_execution_time' => empty($import_max_execution_time) ? 3600 : $import_max_execution_time,
         'lock_homepage' => false,
@@ -249,7 +249,7 @@ 
         'date_formats' => array(
             'Y-m-d' => '2010-12-23', 'm-d-Y' => '12-23-2010', 'd-m-Y' => '23-12-2010',
             'Y/m/d' => '2010/12/23', 'm/d/Y' => '12/23/2010', 'd/m/Y' => '23/12/2010',
-            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010', ),
+            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010',),
         'name_formats' => array(
             's f l' => 's f l', 'f l' => 'f l', 's l' => 's l', 'l, s f' => 'l, s f',
             'l, f' => 'l, f', 's l, f' => 's l, f', 'l s f' => 'l s f', 'l f s' => 'l f s',
@@ -258,7 +258,7 @@ 
             'persistent' => true,
             'autofree' => false,
             'debug' => 0,
-            'ssl' => false, ),
+            'ssl' => false,),
         'default_action' => 'index',
         'default_charset' => return_session_value_or_default('default_charset',
             'UTF-8'),
@@ -321,12 +321,12 @@ 
         'sugarbeet' => true,
         'time_formats' => array(
             'H:i' => '23:00', 'h:ia' => '11:00pm', 'h:iA' => '11:00PM', 'h:i a' => '11:00 pm', 'h:i A' => '11:00 PM',
-            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM', ),
+            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM',),
         'tracker_max_display_length' => 15,
         'translation_string_prefix' => return_session_value_or_default('translation_string_prefix', false),
         'upload_badext' => array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml', ),
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml',),
         'upload_maxsize' => 30000000,
         'import_max_execution_time' => 3600,
 //	'use_php_code_json' => returnPhpJsonStatus(),

modules/ProspectLists/ProspectList.php

Spacing +37 added lines, -37 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.
@@ -99,9 +99,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 ProspectList(){
+    public function ProspectList() {
         $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 {
@@ -135,18 +135,18 @@ 
         $query .= $custom_join['join'];
 
 			$where_auto = '1=1';
-				if($show_deleted == 0){
+				if ($show_deleted == 0) {
                 	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
+				} else if ($show_deleted == 1) {
                 	$where_auto = "$this->table_name.deleted=1";
 				}
 
-		if($where != "")
+		if ($where != "")
 			$query .= "where $where AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto;
 
-		if($order_by != "")
+		if ($order_by != "")
 			$query .= " ORDER BY $order_by";
 		else
 			$query .= " ORDER BY prospect_lists.name";
@@ -162,17 +162,17 @@ 
                                 prospect_lists.*,
                                 users.user_name as assigned_user_name ";
 	                            $query .= "FROM prospect_lists ";
-		$query .= 				"LEFT JOIN users
+		$query .= "LEFT JOIN users
                                 ON prospect_lists.assigned_user_id=users.id ";
 
 		$where_auto = " prospect_lists.deleted=0";
 
-        if($where != "")
+        if ($where != "")
                 $query .= " WHERE $where AND ".$where_auto;
         else
                 $query .= " WHERE ".$where_auto;
 
-        if($order_by != "")
+        if ($order_by != "")
                 $query .= " ORDER BY $order_by";
         else
                 $query .= " ORDER BY prospect_lists.name";
@@ -181,7 +181,7 @@ 
 
 	function create_export_members_query($record_id)
 	{
-		$members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+		$members = array('Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
@@ -190,31 +190,31 @@ 
 
 		// query all custom fields in the fields_meta_data table for the modules which are being exported
 		$db = DBManagerFactory::getInstance();
-		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
-					implode("', '", array_keys($members)) . "')",
+		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('".
+					implode("', '", array_keys($members))."')",
 					true,
 					"ProspectList::create_export_members_query() : error querying custom fields");
 
 		// cycle through the custom fields and put them in the members array according to
 		// what module the field belongs
 		// take into account that the same custom field may exist in more modules
-		while($val = $db->fetchByAssoc($result, false))
+		while ($val = $db->fetchByAssoc($result, false))
 		{
 			$fieldname = $val['name'];
 
-			foreach($members as $membername => &$memberarr)
+			foreach ($members as $membername => &$memberarr)
 			{
 				// if the field belongs to this module, then query it in the cstm table
 				if ($membername == $val['custom_module'])
 				{
 					$memberarr['has_custom_fields'] = true;
 					$memberarr['fields'][$fieldname] =
-						strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
+						strtolower($membername).'_cstm.'.$fieldname.' AS '.$fieldname;
 				}
 				// else, only if for this module no entry exists for this field, query an empty string
 				else if (!isset($memberarr['fields'][$val['name']]))
 				{
-					$memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
+					$memberarr['fields'][$fieldname] = "'' AS ".$fieldname;
 				}
 			}
 		}
@@ -224,7 +224,7 @@ 
 				l.account_name AS account_name,
 				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				l.do_not_call AS do_not_call, l.phone_fax AS phone_fax, l.phone_other AS phone_other, l.phone_home AS phone_home, l.phone_mobile AS phone_mobile, l.phone_work AS phone_work
-				".(count($members['Leads']['fields']) ? ', ' : '') . implode(', ', $members['Leads']['fields'])."
+				".(count($members['Leads']['fields']) ? ', ' : '').implode(', ', $members['Leads']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN leads l ON plp.related_id=l.id
 				".($members['Leads']['has_custom_fields'] ? 'LEFT join leads_cstm ON l.id = leads_cstm.id_c' : '')."
@@ -239,7 +239,7 @@ 
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				0 AS do_not_call, u.phone_fax AS phone_fax, u.phone_other AS phone_other, u.phone_home AS phone_home, u.phone_mobile AS phone_mobile, u.phone_work AS phone_work
-				".(count($members['Users']['fields']) ? ', ' : '') . implode(', ', $members['Users']['fields'])."
+				".(count($members['Users']['fields']) ? ', ' : '').implode(', ', $members['Users']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN users u ON plp.related_id=u.id
 				".($members['Users']['has_custom_fields'] ? 'LEFT join users_cstm ON u.id = users_cstm.id_c' : '')."
@@ -254,7 +254,7 @@ 
 				a.name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				c.do_not_call AS do_not_call, c.phone_fax AS phone_fax, c.phone_other AS phone_other, c.phone_home AS phone_home, c.phone_mobile AS phone_mobile, c.phone_work AS phone_work
-				".(count($members['Contacts']['fields']) ? ', ' : '') . implode(', ', $members['Contacts']['fields'])."
+				".(count($members['Contacts']['fields']) ? ', ' : '').implode(', ', $members['Contacts']['fields'])."
 FROM prospect_lists_prospects plp
 				INNER JOIN contacts c ON plp.related_id=c.id LEFT JOIN accounts_contacts ac ON ac.contact_id=c.id
 				LEFT JOIN accounts a ON ac.account_id=a.id AND ac.deleted=0
@@ -270,7 +270,7 @@ 
 				p.account_name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				p.do_not_call AS do_not_call, p.phone_fax AS phone_fax, p.phone_other AS phone_other, p.phone_home AS phone_home, p.phone_mobile AS phone_mobile, p.phone_work AS phone_work
-				".(count($members['Prospects']['fields']) ? ', ' : '') . implode(', ', $members['Prospects']['fields'])."
+				".(count($members['Prospects']['fields']) ? ', ' : '').implode(', ', $members['Prospects']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN prospects p ON plp.related_id=p.id
 				".($members['Prospects']['has_custom_fields'] ? 'LEFT join prospects_cstm ON p.id = prospects_cstm.id_c' : '')."
@@ -285,7 +285,7 @@ 
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				0 AS do_not_call, a.phone_fax as phone_fax, a.phone_alternate AS phone_other, '' AS phone_home, '' AS phone_mobile, a.phone_office AS phone_office
-				".(count($members['Accounts']['fields']) ? ', ' : '') . implode(', ', $members['Accounts']['fields'])."
+				".(count($members['Accounts']['fields']) ? ', ' : '').implode(', ', $members['Accounts']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN accounts a ON plp.related_id=a.id
 				".($members['Accounts']['has_custom_fields'] ? 'LEFT join accounts_cstm ON a.id = accounts_cstm.id_c' : '')."
@@ -302,11 +302,11 @@ 
 	function save_relationship_changes($is_update, $exclude = array())
     {
     	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
+		if ($this->lead_id != "")
 	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
+    	if ($this->contact_id != "")
     		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
+    	if ($this->prospect_id != "")
     		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
     }
 
@@ -314,9 +314,9 @@ 
 	{
 		$link_field = sprintf("%s_id", $link_name);
 
-		foreach($link_ids as $link_id)
+		foreach ($link_ids as $link_id)
 		{
-			$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+			$this->set_relationship('prospect_lists_prospects', array($link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id));
 		}
 	}
 
@@ -324,7 +324,7 @@ 
 	{
 		$link_field = sprintf("%s_id", $link_name);
 
-		$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+		$this->set_relationship('prospect_lists_prospects', array($link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id));
 	}
 
 
@@ -354,7 +354,7 @@ 
 	}
 
 
-	function update_currency_id($fromid, $toid){
+	function update_currency_id($fromid, $toid) {
 	}
 
 
@@ -365,14 +365,14 @@ 
 
 		$row = $this->db->fetchByAssoc($result);
 
-		if($row)
+		if ($row)
 			return $row['num'];
 		else
 			return 0;
 	}
 
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		$temp_array = $this->get_list_view_array();
 		$temp_array["ENTRY_COUNT"] = $this->get_entry_count();
 		return $temp_array;
@@ -381,16 +381,16 @@ 
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
 	*/
-	function build_generic_where_clause ($the_query_string)
+	function build_generic_where_clause($the_query_string)
 	{
 		$where_clauses = Array();
 		$the_query_string = $GLOBALS['db']->quote($the_query_string);
 		array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
 
 		$the_where = "";
-		foreach($where_clauses as $clause)
+		foreach ($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if ($the_where != "") $the_where .= " or ";
 			$the_where .= $clause;
 		}
 
@@ -404,14 +404,14 @@ 
 
 	}
 
-    function mark_deleted($id){
+    function mark_deleted($id) {
         $query = "UPDATE prospect_lists_prospects SET deleted = 1 WHERE prospect_list_id = '{$id}' ";
         $this->db->query($query);
         return parent::mark_deleted($id);
     }
 
-	 function bean_implements($interface){
-		switch($interface){
+	 function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;

include/database/MssqlManager.php

Spacing +254 added lines, -254 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.
@@ -175,11 +175,11 @@ 
         ini_set('mssql.datetimeconvert', '0');
 
         //set the text size and textlimit to max number so that blob columns are not truncated
-        ini_set('mssql.textlimit','2147483647');
-        ini_set('mssql.textsize','2147483647');
-        ini_set('mssql.charset','UTF-8');
+        ini_set('mssql.textlimit', '2147483647');
+        ini_set('mssql.textsize', '2147483647');
+        ini_set('mssql.charset', 'UTF-8');
 
-        if(!empty($configOptions['db_host_instance'])) {
+        if (!empty($configOptions['db_host_instance'])) {
             $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
         }
         //set the connections parameters
@@ -191,37 +191,37 @@ 
 
         //create persistent connection
         if ($this->getOption('persistent')) {
-            $this->database =@mssql_pconnect(
-                $connect_param ,
+            $this->database = @mssql_pconnect(
+                $connect_param,
                 $configOptions['db_user_name'],
                 $configOptions['db_password']
                 );
         }
         //if no persistent connection created, then create regular connection
-        if(!$this->database){
+        if (!$this->database) {
             $this->database = mssql_connect(
-                    $connect_param ,
+                    $connect_param,
                     $configOptions['db_user_name'],
                     $configOptions['db_password']
                     );
-            if(!$this->database){
+            if (!$this->database) {
                 $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name'].
                     " as ".$configOptions['db_user_name'].".");
-                if($dieOnError) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
                 }
             }
-            if($this->database && $this->getOption('persistent')){
+            if ($this->database && $this->getOption('persistent')) {
                 $_SESSION['administrator_error'] = "<B>Severe Performance Degradation: Persistent Database Connections "
                     . "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false in your "
                     . "config.php file</B>";
             }
         }
         //make sure connection exists
-        if(!$this->database) {
-                if($dieOnError) {
+        if (!$this->database) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
@@ -235,19 +235,19 @@ 
         //mssql db maximum number of 5 times at the interval of .2 second. If can not connect
         //it will throw an Unable to select database message.
 
-        if(!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)){
+        if (!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)) {
 			$connected = false;
-			for($i=0;$i<5;$i++){
+			for ($i = 0; $i < 5; $i++) {
 				usleep(200000);
-				if(@mssql_select_db($configOptions['db_name'], $this->database)){
+				if (@mssql_select_db($configOptions['db_name'], $this->database)) {
 					$connected = true;
 					break;
 				}
 			}
-			if(!$connected){
-			    $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
-                if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			if (!$connected) {
+			    $GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}");
+                if ($dieOnError) {
+                    if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                     } else {
                         sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -258,7 +258,7 @@ 
 			}
          }
 
-        if(!$this->checkError('Could Not Connect', $dieOnError))
+        if (!$this->checkError('Could Not Connect', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         $this->connectOptions = $configOptions;
@@ -280,16 +280,16 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
-        if(is_array($sql)) {
+        if (is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         // Flag if there are odd number of single quotes
         if ((substr_count($sql, "'") & 1))
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
 
 		$sql = $this->_appendN($sql);
 
-        $GLOBALS['log']->debug('Query:' . $sql);
+        $GLOBALS['log']->debug('Query:'.$sql);
         $this->checkConnection();
         $this->countQuery($sql);
         $this->query_time = microtime(true);
@@ -297,7 +297,7 @@ 
         // Bug 34892 - Clear out previous error message by checking the @@ERROR global variable
 		@mssql_query("SELECT @@ERROR", $this->database);
 
-        $result = $suppress?@mssql_query($sql, $this->database):mssql_query($sql, $this->database);
+        $result = $suppress ? @mssql_query($sql, $this->database) : mssql_query($sql, $this->database);
 
         if (!$result) {
             // awu Bug 10657: ignoring mssql error message 'Changed database context to' - an intermittent
@@ -309,13 +309,13 @@ 
 			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
 			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
-				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
+				$GLOBALS['log']->debug($sqlmsg.": ".$sql);
 			else {
-				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
+				$GLOBALS['log']->fatal($sqlmsg.": ".$sql);
+				if ($dieOnError)
+					sugar_die('SQL Error : '.$sqlmsg);
 				else
-					echo 'SQL Error : ' . $sqlmsg;
+					echo 'SQL Error : '.$sqlmsg;
 			}
         }
 
@@ -323,7 +323,7 @@ 
         $GLOBALS['log']->debug('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+        $this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
         return $result;
     }
@@ -341,14 +341,14 @@ 
     {
         //set the start to 0, no negs
         if ($start < 0)
-            $start=0;
+            $start = 0;
 
-        $GLOBALS['log']->debug(print_r(func_get_args(),true));
+        $GLOBALS['log']->debug(print_r(func_get_args(), true));
 
         $this->lastsql = $sql;
 
         //change the casing to lower for easier string comparison, and trim whitespaces
-        $sql = strtolower(trim($sql)) ;
+        $sql = strtolower(trim($sql));
 
         //set default sql
         $limitUnionSQL = $sql;
@@ -364,16 +364,16 @@ 
         $arr_count = 0;
 
         //process if there are elements
-        if ($unionOrderByCount){
+        if ($unionOrderByCount) {
             //we really want the last order by, so reconstruct string
             //adding a 1 to count, as we dont wish to process the last element
             $unionsql = '';
-            while ($unionOrderByCount>$arr_count+1) {
+            while ($unionOrderByCount > $arr_count + 1) {
                 $unionsql .= $orderByArray[$arr_count];
-                $arr_count = $arr_count+1;
+                $arr_count = $arr_count + 1;
                 //add an "order by" string back if we are coming into loop again
                 //remember they were taken out when array was created
-                if ($unionOrderByCount>$arr_count+1) {
+                if ($unionOrderByCount > $arr_count + 1) {
                     $unionsql .= "order by";
                 }
             }
@@ -403,7 +403,7 @@ 
         //so we do not want to strip the alias like in other queries.  Just add the "order by" string and
         //pass column name as is
         if ($unionOrderBy != '') {
-            $unionOrderBy = ' order by ' . $unionOrderBy;
+            $unionOrderBy = ' order by '.$unionOrderBy;
         }
 
         //Bug 56560, use top query in conjunction with rownumber() function
@@ -412,13 +412,13 @@ 
         //If not for paging, no need to use rownumber() function
         if ($count == 1 && $start == 0)
         {
-            $limitUnionSQL = "SELECT TOP $count * FROM (" .$unionsql .") as top_count ".$unionOrderBy;
+            $limitUnionSQL = "SELECT TOP $count * FROM (".$unionsql.") as top_count ".$unionOrderBy;
         }
         else
         {
             $limitUnionSQL = "SELECT TOP $count * FROM( select ROW_NUMBER() OVER ( order by "
             .$rowNumOrderBy.") AS row_number, * FROM ("
-            .$unionsql .") As numbered) "
+            .$unionsql.") As numbered) "
             . "As top_count_limit WHERE row_number > $start "
             .$unionOrderBy;
         }
@@ -437,64 +437,64 @@ 
         $newSQL = $sql;
         $distinctSQLARRAY = array();
         if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql))
-            $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
+            $newSQL = $this->handleUnionLimitQuery($sql, $start, $count);
         else {
             if ($start < 0)
                 $start = 0;
-            $GLOBALS['log']->debug(print_r(func_get_args(),true));
+            $GLOBALS['log']->debug(print_r(func_get_args(), true));
             $this->lastsql = $sql;
             $matches = array();
-            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU',$sql, $matches);
+            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU', $sql, $matches);
             if (!empty($matches[3])) {
                 if ($start == 0) {
                     $match_two = strtolower($matches[2]);
-                    if (!strpos($match_two, "distinct")> 0 && strpos($match_two, "distinct") !==0) {
+                    if (!strpos($match_two, "distinct") > 0 && strpos($match_two, "distinct") !== 0) {
                         $orderByMatch = array();
-                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
                         if (!empty($orderByMatch[3])) {
                             $selectPart = array();
                             preg_match('/^(.*)(\bFROM\b.*)$/isU', $matches[2], $selectPart);
                             $newSQL = "SELECT TOP $count * FROM
                                 (
-                                    " . $matches[1] . $selectPart[1] . ", ROW_NUMBER()
-                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number
-                                    " . $selectPart[2] . $orderByMatch[1]. "
+                                    ".$matches[1].$selectPart[1].", ROW_NUMBER()
+                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number
+                                    " . $selectPart[2].$orderByMatch[1]."
                                 ) AS a
                                 WHERE row_number > $start";
                         }
                         else {
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                     else {
                         $distinct_o = strpos($match_two, "distinct");
                         $up_to_distinct_str = substr($match_two, 0, $distinct_o);
                         //check to see if the distinct is within a function, if so, then proceed as normal
-                        if (strpos($up_to_distinct_str,"(")) {
+                        if (strpos($up_to_distinct_str, "(")) {
                             //proceed as normal
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                         else {
                             //if distinct is not within a function, then parse
                             //string contains distinct clause, "TOP needs to come after Distinct"
                             //get position of distinct
                             $match_zero = strtolower($matches[0]);
-                            $distinct_pos = strpos($match_zero , "distinct");
+                            $distinct_pos = strpos($match_zero, "distinct");
                             //get position of where
                             $where_pos = strpos($match_zero, "where");
                             //parse through string
-                            $beg = substr($matches[0], 0, $distinct_pos+9 );
-                            $mid = substr($matches[0], strlen($beg), ($where_pos+5) - (strlen($beg)));
-                            $end = substr($matches[0], strlen($beg) + strlen($mid) );
+                            $beg = substr($matches[0], 0, $distinct_pos + 9);
+                            $mid = substr($matches[0], strlen($beg), ($where_pos + 5) - (strlen($beg)));
+                            $end = substr($matches[0], strlen($beg) + strlen($mid));
                             //repopulate matches array
                             $matches[1] = $beg; $matches[2] = $mid; $matches[3] = $end;
 
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                 } else {
                     $orderByMatch = array();
-                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
 
                     //if there is a distinct clause, parse sql string as we will have to insert the rownumber
                     //for paging, AFTER the distinct clause
@@ -512,8 +512,8 @@ 
 
                         //take out the select and distinct from string so we can reuse in group by
                         $dist_str = 'distinct';
-                        preg_match('/\b' . $dist_str . '\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
-                        $matches_sql = trim(substr($matches_sql,$matchesPartSQL[0][1] + strlen($dist_str)));
+                        preg_match('/\b'.$dist_str.'\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
+                        $matches_sql = trim(substr($matches_sql, $matchesPartSQL[0][1] + strlen($dist_str)));
                         //get the position of where and from for further processing
                         preg_match('/\bfrom\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
                         $from_pos = $matchesPartSQL[0][1];
@@ -521,17 +521,17 @@ 
                         $where_pos = $matchesPartSQL[0][1];
                         //split the sql into a string before and after the from clause
                         //we will use the columns being selected to construct the group by clause
-                        if ($from_pos>0 ) {
+                        if ($from_pos > 0) {
                             $distinctSQLARRAY[0] = substr($matches_sql, 0, $from_pos);
                             $distinctSQLARRAY[1] = substr($matches_sql, $from_pos);
                             //get position of order by (if it exists) so we can strip it from the string
                             $ob_pos = strpos($distinctSQLARRAY[1], "order by");
                             if ($ob_pos) {
-                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1],0,$ob_pos);
+                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1], 0, $ob_pos);
                             }
 
                             // strip off last closing parentheses from the where clause
-                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/',' ',$distinctSQLARRAY[1]);
+                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/', ' ', $distinctSQLARRAY[1]);
                         }
 
                         $grpByStr = array();
@@ -550,30 +550,30 @@ 
                             $newSQL = "SELECT TOP $count * FROM
                                         (
                                             SELECT ROW_NUMBER()
-                                                OVER (ORDER BY " . preg_replace('/^' . $dist_str . '\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])) . ") AS row_number,
-                                                count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                " . $distinctSQLARRAY[1] . "
-                                                group by " . $grpByStr . "
+                                                OVER (ORDER BY ".preg_replace('/^'.$dist_str.'\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])).") AS row_number,
+                                                count(*) counter, " . $distinctSQLARRAY[0]."
+                                                " . $distinctSQLARRAY[1]."
+                                                group by " . $grpByStr."
                                         ) AS a
                                         WHERE row_number > $start";
                         }
                         else {
                         $newSQL = "SELECT TOP $count * FROM
                                     (
-                                        " . $matches[1] . " ROW_NUMBER()
-                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number,
-                                        " . $matches[2] . $orderByMatch[1]. "
+                                        ".$matches[1]." ROW_NUMBER()
+                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number,
+                                        " . $matches[2].$orderByMatch[1]."
                                     ) AS a
                                     WHERE row_number > $start";
                         }
-                    }else{
+                    } else {
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
                              $newSQL = "SELECT TOP $count * FROM
                                             (
-                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                        " . $distinctSQLARRAY[1] . "
-                                                    group by " . $grpByStr . "
+                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, ".$distinctSQLARRAY[0]."
+                                                        " . $distinctSQLARRAY[1]."
+                                                    group by " . $grpByStr."
                                             )
                                             AS a
                                             WHERE row_number > $start";
@@ -581,7 +581,7 @@ 
                         else {
                              $newSQL = "SELECT TOP $count * FROM
                                            (
-                                  " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
+                                  ".$matches[1]." ROW_NUMBER() OVER (ORDER BY ".$sqlArray['FROM'][0]['alias'].".id) AS row_number, ".$matches[2].$matches[3]."
                                            )
                                            AS a
                                            WHERE row_number > $start";
@@ -591,9 +591,9 @@ 
             }
         }
 
-        $GLOBALS['log']->debug('Limit Query: ' . $newSQL);
-        if($execute) {
-            $result =  $this->query($newSQL, $dieOnError, $msg);
+        $GLOBALS['log']->debug('Limit Query: '.$newSQL);
+        if ($execute) {
+            $result = $this->query($newSQL, $dieOnError, $msg);
             $this->dump_slow_queries($newSQL);
             return $result;
         } else {
@@ -615,15 +615,15 @@ 
     private function removePatternFromSQL($p_sql, $strip_beg, $strip_end, $patt = 'patt')
     {
         //strip all single quotes out
-        $count = substr_count ( $p_sql, $strip_beg);
+        $count = substr_count($p_sql, $strip_beg);
         $increment = 1;
         if ($strip_beg != $strip_end)
             $increment = 2;
 
-        $i=0;
+        $i = 0;
         $offset = 0;
         $strip_array = array();
-        while ($i<$count && $offset<strlen($p_sql)) {
+        while ($i < $count && $offset < strlen($p_sql)) {
             if ($offset > strlen($p_sql))
             {
 				break;
@@ -634,23 +634,23 @@ 
             {
                 break;
             }
-            $sec_sin = strpos($p_sql, $strip_end, $beg_sin+1);
-            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin +1);
+            $sec_sin = strpos($p_sql, $strip_end, $beg_sin + 1);
+            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin + 1);
             if ($increment > 1) {
                 //we are in here because beginning and end patterns are not identical, so search for nesting
-                $exists = strpos($strip_array[$patt.$i], $strip_beg );
-                if ($exists>=0) {
-                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg ));
-                    $strip_array[$patt.$i] = substr($p_sql,$nested_pos+$beg_sin,$sec_sin - ($nested_pos+$beg_sin)+1);
-                    $p_sql = substr($p_sql, 0, $nested_pos+$beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+                $exists = strpos($strip_array[$patt.$i], $strip_beg);
+                if ($exists >= 0) {
+                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg));
+                    $strip_array[$patt.$i] = substr($p_sql, $nested_pos + $beg_sin, $sec_sin - ($nested_pos + $beg_sin) + 1);
+                    $p_sql = substr($p_sql, 0, $nested_pos + $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
                     $i = $i + 1;
                     continue;
                 }
             }
-            $p_len = strlen("##". $patt.$i."##");
-            $p_sql = substr($p_sql, 0, $beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+            $p_len = strlen("##".$patt.$i."##");
+            $p_sql = substr($p_sql, 0, $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
             //move the marker up
-            $offset = ($sec_sin-($sec_sin-$beg_sin))+$p_len+1; // Adjusting the starting point of the marker
+            $offset = ($sec_sin - ($sec_sin - $beg_sin)) + $p_len + 1; // Adjusting the starting point of the marker
 
             $i = $i + 1;
         }
@@ -672,7 +672,7 @@ 
         $pattern_array = array_reverse($pattern_array);
 
         foreach ($pattern_array as $key => $replace) {
-            $token = str_replace( " ##".$key."## ", $replace,$token);
+            $token = str_replace(" ##".$key."## ", $replace, $token);
         }
 
         return $token;
@@ -688,11 +688,11 @@ 
 	private function getAliasFromSQL($sql, $alias)
     {
         $matches = array();
-        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU',$sql, $matches);
+        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU', $sql, $matches);
         //parse all single and double  quotes out of array
-        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'","sin_");
+        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'", "sin_");
         $new_sql = array_pop($sin_array);
-        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"","dub_");
+        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"", "dub_");
         $new_sql = array_pop($dub_array);
 
         //search for parenthesis
@@ -701,7 +701,7 @@ 
 
         //all functions should be removed now, so split the array on commas
         $mstr_sql_array = explode(",", $new_sql);
-        foreach($mstr_sql_array as $token ) {
+        foreach ($mstr_sql_array as $token) {
             if (strpos($token, $alias)) {
                 //found token, add back comments
                 $token = $this->addPatternToSQL($token, $paren_array);
@@ -739,7 +739,7 @@ 
         $found = $found_in_sql;
 
         //if still no match found, then we need to parse through the string
-        if (!$found_in_sql){
+        if (!$found_in_sql) {
             //get count of how many times the match exists in string
             $found_count = substr_count($sql, $orderMatch);
             $i = 0;
@@ -748,21 +748,21 @@ 
             //loop through string as many times as there is a match
             while ($found_count > $i) {
                 //get the first match
-                $found_in_sql = strpos($sql, $orderMatch,$first_);
+                $found_in_sql = strpos($sql, $orderMatch, $first_);
                 //make sure there was a match
-                if($found_in_sql){
+                if ($found_in_sql) {
                     //grab the next 2 individual characters
-                    $str_plusone = substr($sql,$found_in_sql + $len,1);
-                    $str_plustwo = substr($sql,$found_in_sql + $len+1,1);
+                    $str_plusone = substr($sql, $found_in_sql + $len, 1);
+                    $str_plustwo = substr($sql, $found_in_sql + $len + 1, 1);
                     //if one of those characters is a comma, then we have our alias
-                    if ($str_plusone === "," || $str_plustwo === ","){
+                    if ($str_plusone === "," || $str_plustwo === ",") {
                         //keep track of this position
                         $found = $found_in_sql;
                     }
                 }
                 //set the offset and increase the iteration counter
-                $first_ = $found_in_sql+$len;
-                $i = $i+1;
+                $first_ = $found_in_sql + $len;
+                $i = $i + 1;
             }
         }
         //return $found, defaults have been set, so if no match was found it will be a negative number
@@ -794,8 +794,8 @@ 
         $firstSpace = strpos($orig_order_match, " ");
 
         //split order by into column name and ascending/descending
-        $orderMatch = " " . strtolower(substr($orig_order_match, 0, $firstSpace));
-        $asc_desc = trim(substr($orig_order_match,$firstSpace));
+        $orderMatch = " ".strtolower(substr($orig_order_match, 0, $firstSpace));
+        $asc_desc = trim(substr($orig_order_match, $firstSpace));
 
         //look for column name as an alias in sql string
         $found_in_sql = $this->findColumnByAlias($sql, $orderMatch);
@@ -806,18 +806,18 @@ 
             $colMatchPos = strpos($sql, $orderMatch);
             if ($colMatchPos !== false) {
                 //grab sub string up to column name
-                $containsColStr = substr($sql,0, $colMatchPos);
+                $containsColStr = substr($sql, 0, $colMatchPos);
                 //get position of first space, so we can grab table name
                 $lastSpacePos = strrpos($containsColStr, " ");
                 //use positions of column name, space before name, and length of column to find the correct column name
-                $col_name = substr($sql, $lastSpacePos, $colMatchPos-$lastSpacePos+strlen($orderMatch));
+                $col_name = substr($sql, $lastSpacePos, $colMatchPos - $lastSpacePos + strlen($orderMatch));
 				//bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
 				$containsCommaPos = strpos($col_name, ",");
-				if($containsCommaPos !== false) {
-					$col_name = substr($col_name, $containsCommaPos+1);
+				if ($containsCommaPos !== false) {
+					$col_name = substr($col_name, $containsCommaPos + 1);
 				}
                 //add the "asc/desc" order back
-                $col_name = $col_name. " ". $asc_desc;
+                $col_name = $col_name." ".$asc_desc;
 
                 //return column name
                 return $col_name;
@@ -831,22 +831,22 @@ 
             //grab string up to the aliased column
             $GLOBALS['log']->debug("order by found, process sql string");
 
-            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch )));
+            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch)));
             if (empty($psql))
                 $psql = trim(substr($sql, 0, $found_in_sql));
 
             //grab the last comma before the alias
-            preg_match('/\s+' . trim($orderMatch). '/', $psql, $match, PREG_OFFSET_CAPTURE);
+            preg_match('/\s+'.trim($orderMatch).'/', $psql, $match, PREG_OFFSET_CAPTURE);
             $comma_pos = $match[0][1];
             //substring between the comma and the alias to find the joined_table alias and column name
-            $col_name = substr($psql,0, $comma_pos);
+            $col_name = substr($psql, 0, $comma_pos);
 
             //make sure the string does not have an end parenthesis
             //and is not part of a function (i.e. "ISNULL(leads.last_name,'') as name"  )
             //this is especially true for unified search from home screen
 
             $alias_beg_pos = 0;
-            if(strpos($psql, " as "))
+            if (strpos($psql, " as "))
                 $alias_beg_pos = strpos($psql, " as ");
 
             // Bug # 44923 - This breaks the query and does not properly filter isnull
@@ -855,13 +855,13 @@ 
                 $alias_beg_pos = strpos($psql, " "); */
 
             if ($alias_beg_pos > 0) {
-                $col_name = substr($psql,0, $alias_beg_pos );
+                $col_name = substr($psql, 0, $alias_beg_pos);
             }
             //add the "asc/desc" order back
-            $col_name = $col_name. " ". $asc_desc;
+            $col_name = $col_name." ".$asc_desc;
 
             //pass in new order by
-            $GLOBALS['log']->debug("order by being returned is " . $col_name);
+            $GLOBALS['log']->debug("order by being returned is ".$col_name);
             return $col_name;
         }
     }
@@ -877,12 +877,12 @@ 
     {
 
         global $beanList, $beanFiles;
-        $GLOBALS['log']->debug("Module being processed is " . $module_str);
+        $GLOBALS['log']->debug("Module being processed is ".$module_str);
         //get the right module files
         //the module string exists in bean list, then process bean for correct table name
         //note that we exempt the reports module from this, as queries from reporting module should be parsed for
         //correct table name.
-        if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str])  &&  isset($beanFiles[$beanList[$module_str]])){
+        if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str]) && isset($beanFiles[$beanList[$module_str]])) {
             //if the class is not already loaded, then load files
             if (!class_exists($beanList[$module_str]))
                 require_once($beanFiles[$beanList[$module_str]]);
@@ -894,7 +894,7 @@ 
             //make sure table name is not just a blank space, or empty
             $tbl_name = trim($tbl_name);
 
-            if(empty($tbl_name)){
+            if (empty($tbl_name)) {
                 $GLOBALS['log']->debug("Could not find table name for module $module_str. ");
                 $tbl_name = $module_str;
             }
@@ -911,20 +911,20 @@ 
             $sql = str_replace(array("\n", "\r"), " ", $sql);
 
             //look for the location of the "from" in sql string
-            $fromLoc = strpos($sql," from " );
-            if ($fromLoc>0){
+            $fromLoc = strpos($sql, " from ");
+            if ($fromLoc > 0) {
                 //found from, substring from the " FROM " string in sql to end
-                $tableEnd = substr($sql, $fromLoc+6);
+                $tableEnd = substr($sql, $fromLoc + 6);
                 //We know that tablename will be next parameter after from, so
                 //grab the next space after table name.
                 // MFH BUG #14009: Also check to see if there are any carriage returns before the next space so that we don't grab any arbitrary joins or other tables.
-                $carriage_ret = strpos($tableEnd,"\n");
-                $next_space = strpos($tableEnd," " );
+                $carriage_ret = strpos($tableEnd, "\n");
+                $next_space = strpos($tableEnd, " ");
                 if ($carriage_ret < $next_space)
                     $next_space = $carriage_ret;
                 if ($next_space > 0) {
-                    $tbl_name= substr($tableEnd,0, $next_space);
-                    if(empty($tbl_name)){
+                    $tbl_name = substr($tableEnd, 0, $next_space);
+                    if (empty($tbl_name)) {
                         $GLOBALS['log']->debug("Could not find table name sql either, return $module_str. ");
                         $tbl_name = $module_str;
                     }
@@ -932,11 +932,11 @@ 
 
                 //grab the table, to see if it is aliased
                 $aliasTableEnd = trim(substr($tableEnd, $next_space));
-                $alias_space = strpos ($aliasTableEnd, " " );
-                if ($alias_space > 0){
-                    $alias_tbl_name= substr($aliasTableEnd,0, $alias_space);
+                $alias_space = strpos($aliasTableEnd, " ");
+                if ($alias_space > 0) {
+                    $alias_tbl_name = substr($aliasTableEnd, 0, $alias_space);
                     strtolower($alias_tbl_name);
-                    if(empty($alias_tbl_name)
+                    if (empty($alias_tbl_name)
                         || $alias_tbl_name == "where"
                         || $alias_tbl_name == "inner"
                         || $alias_tbl_name == "left"
@@ -948,9 +948,9 @@ 
                     elseif ($alias_tbl_name == "as") {
                             //the next word is the table name
                             $aliasTableEnd = trim(substr($aliasTableEnd, $alias_space));
-                            $alias_space = strpos ($aliasTableEnd, " " );
+                            $alias_space = strpos($aliasTableEnd, " ");
                             if ($alias_space > 0) {
-                                $alias_tbl_name= trim(substr($aliasTableEnd,0, $alias_space));
+                                $alias_tbl_name = trim(substr($aliasTableEnd, 0, $alias_space));
                                 if (!empty($alias_tbl_name))
                                     $tbl_name = $alias_tbl_name;
                             }
@@ -975,7 +975,7 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
+		if (!isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -983,7 +983,7 @@ 
             $meta = mssql_fetch_field($result, $i);
             if (!$meta)
                 return 0;
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $meta->name = strtolower($meta->name);
 
             $field_array[] = $meta->name;
@@ -1012,11 +1012,11 @@ 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
         //We need to iterate through the returned row array and strip empty spaces
-        if(!empty($row)){
-            foreach($row as $key => $column) {
+        if (!empty($row)) {
+            foreach ($row as $key => $column) {
                //notice we only strip if one space is returned.  we do not want to strip
                //strings with intentional spaces (" foo ")
-               if (!empty($column) && $column ==" ") {
+               if (!empty($column) && $column == " ") {
                    $row[$key] = '';
                }
             }
@@ -1029,10 +1029,10 @@ 
      */
     public function quote($string)
     {
-        if(is_array($string)) {
+        if (is_array($string)) {
             return $this->arrayQuote($string);
         }
-        return str_replace("'","''", $this->quoteInternal($string));
+        return str_replace("'", "''", $this->quoteInternal($string));
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
                 }
                 return $tables;
             }
@@ -1085,7 +1085,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL fetching table list');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
             $tables = array();
             $r = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
             if (is_resource($r)) {
@@ -1109,7 +1109,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL about to wakeup FTS');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
                 //create wakeup catalog
                 $FTSqry[] = "if not exists(  select * from sys.fulltext_catalogs where name ='wakeup_catalog' )
                 CREATE FULLTEXT CATALOG wakeup_catalog
@@ -1149,7 +1149,7 @@ 
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup START FULL POPULATION';
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup SET CHANGE_TRACKING AUTO';
 
-                foreach($FTSqry as $q){
+                foreach ($FTSqry as $q) {
                     sleep(3);
                     $this->query($q);
                 }
@@ -1172,12 +1172,12 @@ 
     {
         // convert the parameters array into a comma delimited string
         if (!empty($additional_parameters)) {
-            $additional_parameters_string = ','.implode(',',$additional_parameters);
+            $additional_parameters_string = ','.implode(',', $additional_parameters);
         } else {
             $additional_parameters_string = '';
         }
         $all_parameters = $additional_parameters;
-        if(is_array($string)) {
+        if (is_array($string)) {
             $all_parameters = array_merge($string, $all_parameters);
         } elseif (!is_null($string)) {
             array_unshift($all_parameters, $string);
@@ -1189,22 +1189,22 @@ 
             case 'left':
                 return "LEFT($string$additional_parameters_string)";
             case 'date_format':
-                if(!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
+                if (!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
                     $additional_parameters[0] = trim($additional_parameters[0], "'");
                 }
-                if(!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
+                if (!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
                     $len = $this->date_formats[$additional_parameters[0]];
-                    return "LEFT(CONVERT(varchar($len),". $string . ",120),$len)";
+                    return "LEFT(CONVERT(varchar($len),".$string.",120),$len)";
                 } else {
-                   return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
+                   return "LEFT(CONVERT(varchar(10),".$string.",120),10)";
                 }
             case 'ifnull':
-                if(empty($additional_parameters_string)) {
+                if (empty($additional_parameters_string)) {
                     $additional_parameters_string = ",''";
                 }
                 return "ISNULL($string$additional_parameters_string)";
             case 'concat':
-                return implode("+",$all_parameters);
+                return implode("+", $all_parameters);
             case 'text2char':
                 return "CAST($string AS varchar(8000))";
             case 'quarter':
@@ -1220,7 +1220,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return 'DATEADD(minute, ' . $operation . abs($getUserUTCOffset) . ', ' . $string. ')';
+                return 'DATEADD(minute, '.$operation.abs($getUserUTCOffset).', '.$string.')';
             case 'avg':
                 return "avg($string)";
         }
@@ -1233,9 +1233,9 @@ 
      */
     public function fromConvert($string, $type)
     {
-        switch($type) {
+        switch ($type) {
             case 'datetimecombo':
-            case 'datetime': return substr($string, 0,19);
+            case 'datetime': return substr($string, 0, 19);
             case 'date': return substr($string, 0, 10);
             case 'time': return substr($string, 11);
 		}
@@ -1264,8 +1264,8 @@ 
     public function isTextType($type)
     {
         $type = strtolower($type);
-        if(!isset($this->type_map[$type])) return false;
-        return in_array($this->type_map[$type], array('ntext','text','image', 'nvarchar(max)'));
+        if (!isset($this->type_map[$type])) return false;
+        return in_array($this->type_map[$type], array('ntext', 'text', 'image', 'nvarchar(max)'));
     }
 
     /**
@@ -1275,13 +1275,13 @@ 
     public function emptyValue($type)
     {
         $ctype = $this->getColumnType($type);
-        if($ctype == "datetime") {
+        if ($ctype == "datetime") {
             return $this->convert($this->quoted("1970-01-01 00:00:00"), "datetime");
         }
-        if($ctype == "date") {
+        if ($ctype == "date") {
             return $this->convert($this->quoted("1970-01-01"), "datetime");
         }
-        if($ctype == "time") {
+        if ($ctype == "time") {
             return $this->convert($this->quoted("00:00:00"), "time");
         }
         return parent::emptyValue($type);
@@ -1304,21 +1304,21 @@ 
      */
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
     {
-        switch($action){
+        switch ($action) {
         case 'add':
-             $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
-            return "ADD " . $f_def;
+             $f_def = $this->oneColumnSQLRep($def, $ignoreRequired, $tablename, false);
+            return "ADD ".$f_def;
             break;
         case 'drop':
-            return "DROP COLUMN " . $def['name'];
+            return "DROP COLUMN ".$def['name'];
             break;
         case 'modify':
             //You cannot specify a default value for a column for MSSQL
-            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
+            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired, $tablename, true);
             $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
                         $f_def['required'].' '.$f_def['auto_increment']."\n";
-            if (!empty( $f_def['default']))
-                $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            if (!empty($f_def['default']))
+                $f_stmt .= " ALTER TABLE ".$tablename." ADD  ".$f_def['default']." FOR ".$def['name'];
             return $f_stmt;
             break;
         default:
@@ -1334,7 +1334,7 @@ 
      */
     protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
-        $sql=$sql2='';
+        $sql = $sql2 = '';
         $constraints = $this->get_field_default_constraint_name($tablename);
         $columns = array();
         if ($this->isFieldArray($fieldDefs)) {
@@ -1343,41 +1343,41 @@ 
           		//if the column is being modified drop the default value
           		//constraint if it exists. alterSQLRep will add the constraint back
           		if (!empty($constraints[$def['name']])) {
-          			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
+          			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$def['name']];
           		}
           		//check to see if we need to drop related indexes before the alter
           		$indices = $this->get_indices($tablename);
-                foreach ( $indices as $index ) {
-                    if ( in_array($def['name'],$index['fields']) ) {
-                        $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                        $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+                foreach ($indices as $index) {
+                    if (in_array($def['name'], $index['fields'])) {
+                        $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                        $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                     }
                 }
 
-          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
+          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired, $tablename);
       		}
         }
         else {
             //if the column is being modified drop the default value
       		//constraint if it exists. alterSQLRep will add the constraint back
       		if (!empty($constraints[$fieldDefs['name']])) {
-      			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
+      			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$fieldDefs['name']];
       		}
       		//check to see if we need to drop related indexes before the alter
             $indices = $this->get_indices($tablename);
-            foreach ( $indices as $index ) {
-                if ( in_array($fieldDefs['name'],$index['fields']) ) {
-                    $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                    $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+            foreach ($indices as $index) {
+                if (in_array($fieldDefs['name'], $index['fields'])) {
+                    $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                    $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                 }
             }
 
 
-          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
+          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired, $tablename);
         }
 
         $columns = implode(", ", $columns);
-        $sql .= " ALTER TABLE $tablename $columns " . $sql2;
+        $sql .= " ALTER TABLE $tablename $columns ".$sql2;
 
         return $sql;
     }
@@ -1392,7 +1392,7 @@ 
      */
     public function setAutoIncrementStart($table, $field_name, $start_value)
     {
-        if($start_value > 1)
+        if ($start_value > 1)
             $start_value -= 1;
 		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
@@ -1427,11 +1427,11 @@ 
         $result = $this->query($query);
 
         $indices = array();
-        while (($row=$this->fetchByAssoc($result)) != null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $index_type = 'index';
             if ($row['is_primary_key'] == '1')
                 $index_type = 'primary';
-            elseif ($row['is_unique'] == 1 )
+            elseif ($row['is_unique'] == 1)
                 $index_type = 'unique';
             $name = strtolower($row['index_name']);
             $indices[$name]['name']     = $name;
@@ -1450,36 +1450,36 @@ 
         $result = $this->query("sp_columns $tablename");
 
         $columns = array();
-        while (($row=$this->fetchByAssoc($result)) !=null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $column_name = strtolower($row['COLUMN_NAME']);
-            $columns[$column_name]['name']=$column_name;
-            $columns[$column_name]['type']=strtolower($row['TYPE_NAME']);
-            if ( $row['TYPE_NAME'] == 'decimal' ) {
-                $columns[$column_name]['len']=strtolower($row['PRECISION']);
-                $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            $columns[$column_name]['name'] = $column_name;
+            $columns[$column_name]['type'] = strtolower($row['TYPE_NAME']);
+            if ($row['TYPE_NAME'] == 'decimal') {
+                $columns[$column_name]['len'] = strtolower($row['PRECISION']);
+                $columns[$column_name]['len'] .= ','.strtolower($row['SCALE']);
             }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) )
-				$columns[$column_name]['len']=strtolower($row['PRECISION']);
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) )
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+			elseif (in_array($row['TYPE_NAME'], array('nchar', 'nvarchar')))
+				$columns[$column_name]['len'] = strtolower($row['PRECISION']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text')))
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
+            if (stristr($row['TYPE_NAME'], 'identity')) {
                 $columns[$column_name]['auto_increment'] = '1';
-                $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
+                $columns[$column_name]['type'] = str_replace(' identity', '', strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'], 'PRI')))
                 $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
 
             $column_def = 1;
-            if ( strtolower($tablename) == 'relationships' ) {
+            if (strtolower($tablename) == 'relationships') {
                 $column_def = $this->getOne("select cdefault from syscolumns where id = object_id('relationships') and name = '$column_name'");
             }
-            if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
+            if ($column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
-                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
+                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'], ENT_QUOTES);
+                if (preg_match('/\([\(|\'](.*)[\)|\']\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
+                elseif (preg_match('/\(N\'(.*)\'\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
                 else
                     $columns[$column_name]['default'] = $row['COLUMN_DEF'];
@@ -1494,7 +1494,7 @@ 
      */
     protected function ftsCatalogName()
     {
-        if(isset($this->connectOptions['db_name'])) {
+        if (isset($this->connectOptions['db_name'])) {
             return $this->connectOptions['db_name']."_fts_catalog";
         }
         return 'sugar_fts_catalog';
@@ -1506,11 +1506,11 @@ 
     public function add_drop_constraint($table, $definition, $drop = false)
     {
         $type         = $definition['type'];
-        $fields       = is_array($definition['fields'])?implode(',',$definition['fields']):$definition['fields'];
+        $fields       = is_array($definition['fields']) ? implode(',', $definition['fields']) : $definition['fields'];
         $name         = $definition['name'];
         $sql          = '';
 
-        switch ($type){
+        switch ($type) {
         // generic indices
         case 'index':
         case 'alternate_key':
@@ -1548,13 +1548,13 @@ 
             if ($this->full_text_indexing_enabled() && $drop) {
                 $sql = "DROP FULLTEXT INDEX ON {$table}";
             } elseif ($this->full_text_indexing_enabled()) {
-                $catalog_name=$this->ftsCatalogName();
-                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
+                $catalog_name = $this->ftsCatalogName();
+                if (isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
                     $catalog_name = $definition['catalog_name'];
 
                 $language = "Language 1033";
                 if (isset($definition['language']) && !empty($definition['language']))
-                    $language = "Language " . $definition['language'];
+                    $language = "Language ".$definition['language'];
 
                 $key_index = $definition['key_index'];
 
@@ -1562,7 +1562,7 @@ 
                 if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
                     $change_tracking = $definition['change_tracking'];
 
-                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
+                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking";
             }
             break;
         }
@@ -1586,11 +1586,11 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
+    	if (!isset($_SESSION['IsFulltextInstalled']))
             $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
 
         // check to see if FTS Indexing service is installed
-        if(empty($_SESSION['IsFulltextInstalled']))
+        if (empty($_SESSION['IsFulltextInstalled']))
             return false;
 
         // grab the dbname if it was not passed through
@@ -1640,7 +1640,7 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
+        if (empty($column) && isset($results[$table]))
             return $results[$table];
 
         $query = <<<EOQ
@@ -1654,17 +1654,17 @@ 
             on s.schema_id = o.schema_id
     where o.name = '$table'
 EOQ;
-        if ( !empty($column) )
+        if (!empty($column))
             $query .= " and c.name = '$column'";
         $res = $this->query($query);
-        if ( !empty($column) ) {
+        if (!empty($column)) {
             $row = $this->fetchByAssoc($res);
             if (!empty($row))
                 return $row['ctrt'];
         }
         else {
             $returnResult = array();
-            while ( $row = $this->fetchByAssoc($res) )
+            while ($row = $this->fetchByAssoc($res))
                 $returnResult[$row['dtrt']] = $row['ctrt'];
             $results[$table] = $returnResult;
             return $returnResult;
@@ -1678,14 +1678,14 @@ 
      */
     public function massageFieldDef(&$fieldDef, $tablename)
     {
-        parent::massageFieldDef($fieldDef,$tablename);
+        parent::massageFieldDef($fieldDef, $tablename);
 
         if ($fieldDef['type'] == 'int')
             $fieldDef['len'] = '4';
 
-        if(empty($fieldDef['len']))
+        if (empty($fieldDef['len']))
         {
-            switch($fieldDef['type']) {
+            switch ($fieldDef['type']) {
                 case 'bit'      :
                 case 'bool'     : $fieldDef['len'] = '1'; break;
                 case 'smallint' : $fieldDef['len'] = '2'; break;
@@ -1695,22 +1695,22 @@ 
                                   $fieldDef['len'] = $this->isTextType($fieldDef['dbType']) ? 'max' : '255';
                                   break;
                 case 'image'    : $fieldDef['len'] = '2147483647'; break;
-                case 'ntext'    : $fieldDef['len'] = '2147483646'; break;   // Note: this is from legacy code, don't know if this is correct
+                case 'ntext'    : $fieldDef['len'] = '2147483646'; break; // Note: this is from legacy code, don't know if this is correct
             }
         }
-        if($fieldDef['type'] == 'decimal'
+        if ($fieldDef['type'] == 'decimal'
            && empty($fieldDef['precision'])
            && !strpos($fieldDef['len'], ','))
         {
              $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
         }
 
-        if(empty($fieldDef['default'])
-            && in_array($fieldDef['type'],array('bit','bool')))
+        if (empty($fieldDef['default'])
+            && in_array($fieldDef['type'], array('bit', 'bool')))
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
+		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']))
 			$fieldDef['default'] = '';
 //        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
@@ -1741,13 +1741,13 @@ 
     protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
     {
     	//Bug 25814
-		if(isset($fieldDef['name'])){
+		if (isset($fieldDef['name'])) {
 		    $colType = $this->getFieldType($fieldDef);
-        	if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
-				$fieldDef['len'] = min($fieldDef['len'],38);
+        	if (stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])) {
+				$fieldDef['len'] = min($fieldDef['len'], 38);
 			}
 		    //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
-			if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
+			if (stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8) {
 				unset($fieldDef['len']);
 			}
 		}
@@ -1756,10 +1756,10 @@ 
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
 		// Bug 24307 - Don't add precision for float fields.
-		if ( stristr($ref['colType'],'float') )
-			$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		if (stristr($ref['colType'], 'float'))
+			$ref['colType'] = preg_replace('/(,\d+)/', '', $ref['colType']);
 
-        if ( $return_as_array )
+        if ($return_as_array)
             return $ref;
         else
             return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -1774,10 +1774,10 @@ 
     public function save_audit_records(SugarBean $bean, $changes)
 	{
 		//Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
-		if($changes['data_type'] == 'date'){
-			$changes['before'] = str_replace(' 00:00:00','',$changes['before']);
+		if ($changes['data_type'] == 'date') {
+			$changes['before'] = str_replace(' 00:00:00', '', $changes['before']);
 		}
-		parent::save_audit_records($bean,$changes);
+		parent::save_audit_records($bean, $changes);
 	}
 
     /**
@@ -1788,7 +1788,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             mssql_close($this->database);
             $this->database = null;
@@ -1800,7 +1800,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             mssql_free_result($dbResult);
     }
 
@@ -1811,11 +1811,11 @@ 
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
-        if(empty($sqlmsg)) return false;
+        if (empty($sqlmsg)) return false;
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
-			or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
+			or !isset($app_strings['ERR_MSSQL_WARNING'])) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before language is set.
 		    return false;
@@ -1824,7 +1824,7 @@ 
         $sqlpos = strpos($sqlmsg, 'Changed database context to');
         $sqlpos2 = strpos($sqlmsg, 'Warning:');
         $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
-        if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
+        if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
             return false;
         } else {
         	global $app_strings;
@@ -1832,18 +1832,18 @@ 
             if (empty($app_strings) or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])) {
                 //ignore the message from sql-server if $app_strings array is empty. This will happen
                 //only if connection if made before languge is set.
-                $GLOBALS['log']->debug("Ignoring this database message: " . $sqlmsg);
+                $GLOBALS['log']->debug("Ignoring this database message: ".$sqlmsg);
                 return false;
             }
             else {
                 $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
-                if ( $sqlpos !== false )
+                if ($sqlpos !== false)
                     return false;
             }
         }
 
-        if ( strlen($sqlmsg) > 2 ) {
-        	return "SQL Server error: " . $sqlmsg;
+        if (strlen($sqlmsg) > 2) {
+        	return "SQL Server error: ".$sqlmsg;
         }
 
         return false;
@@ -1864,7 +1864,7 @@ 
      */
     public function validateQuery($query)
     {
-        if(!$this->isSelect($query)) {
+        if (!$this->isSelect($query)) {
             return false;
         }
         $this->query("SET SHOWPLAN_TEXT ON");
@@ -1888,7 +1888,7 @@ 
 
         // Flag if there are odd number of single quotes, just continue without trying to append N
         if ((substr_count($sql, "'") & 1)) {
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
             return $sql;
         }
 
@@ -1918,7 +1918,7 @@ 
                 // We are assuming that all nvarchar columns are no more than 200 characters in length
                 // One problem we face is the image column type in reports which cannot accept nvarchar data
                 if (!empty($value) && !is_numeric(trim(str_replace(array("'", ","), "", $value))) && !preg_match('/^\'[\,]\'$/', $value)) {
-                    $replace[$value] = 'N' . trim($value, "N");
+                    $replace[$value] = 'N'.trim($value, "N");
                 }
             }
         }
@@ -1929,7 +1929,7 @@ 
         if (!empty($pairs))
             $sql = str_replace(array_keys($pairs), $pairs, $sql);
 
-        if(strpos($sql, "<@#@#@PAIR@#@#@>"))
+        if (strpos($sql, "<@#@#@PAIR@#@#@>"))
             $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
 
         return $sql;
@@ -1956,22 +1956,22 @@ 
     public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
     {
         $condition = $or_condition = array();
-        foreach($must_terms as $term) {
+        foreach ($must_terms as $term) {
             $condition[] = $this->quoteTerm($term);
         }
 
-        foreach($terms as $term) {
+        foreach ($terms as $term) {
             $or_condition[] = $this->quoteTerm($term);
         }
 
-        if(!empty($or_condition)) {
+        if (!empty($or_condition)) {
             $condition[] = "(".join(" | ", $or_condition).")";
         }
 
-        foreach($exclude_terms as $term) {
+        foreach ($exclude_terms as $term) {
             $condition[] = " NOT ".$this->quoteTerm($term);
         }
-        $condition = $this->quoted(join(" AND ",$condition));
+        $condition = $this->quoted(join(" AND ", $condition));
         return "CONTAINS($field, $condition)";
     }
 
@@ -2060,7 +2060,7 @@ 
     public function isDatabaseNameValid($name)
     {
         // No funny chars, does not begin with number
-        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name)==0;
+        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name) == 0;
     }
 
     public function installConfig()

tests/tests/modules/Employees/EmployeeTest.php

Spacing +14 added lines, -14 removed lines

@@ -7,9 +7,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$employee = new Employee();
-		$this->assertInstanceOf('Employee',$employee);
-		$this->assertInstanceOf('Person',$employee);
-		$this->assertInstanceOf('SugarBean',$employee);
+		$this->assertInstanceOf('Employee', $employee);
+		$this->assertInstanceOf('Person', $employee);
+		$this->assertInstanceOf('SugarBean', $employee);
 
 		$this->assertAttributeEquals('Employees', 'module_dir', $employee);
 		$this->assertAttributeEquals('Employee', 'object_name', $employee);
@@ -26,11 +26,11 @@ 
 		$employee = new Employee();
 
 		//test without setting name
-		$this->assertEquals(' ',$employee->get_summary_text());
+		$this->assertEquals(' ', $employee->get_summary_text());
 
 		//test with name set
 		$employee->retrieve(1);
-		$this->assertEquals('Administrator',$employee->get_summary_text());
+		$this->assertEquals('Administrator', $employee->get_summary_text());
 
     }
 
@@ -80,15 +80,15 @@ 
 	public function testverify_data()
 	{
 		$employee = new Employee();
-		$this->assertEquals(true ,$employee->verify_data() );
+		$this->assertEquals(true, $employee->verify_data());
 
 	}
 
-	public function testget_list_view_data(){
+	public function testget_list_view_data() {
 
 		$employee = new Employee();
 
-		$expected = array (
+		$expected = array(
 					  'SUGAR_LOGIN' => '1',
 					  'FULL_NAME' => ' ',
 					  'NAME' => ' ',
@@ -110,7 +110,7 @@ 
 
 	}
 
-	public function testlist_view_parse_additional_sections(){
+	public function testlist_view_parse_additional_sections() {
 
 		$employee = new Employee();
 
@@ -132,14 +132,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
-		$actual = $employee->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $employee->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE users.user_name=\"\" AND  users.deleted = 0 ORDER BY users.id";
-		$actual = $employee->create_export_query('users.id','users.user_name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $employee->create_export_query('users.id', 'users.user_name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -170,7 +170,7 @@ 
     {
     	$employee = new Employee();
     	$result = $employee->hasCustomFields();
-    	$this->assertEquals(false,$result);
+    	$this->assertEquals(false, $result);
     }
 
 }

data/SugarBean.php

Spacing +207 added lines, -207 removed lines

@@ -311,17 +311,17 @@ 
                     $this->optimistic_lock = true;
                 }
             }
-            $loaded_defs[$this->object_name]['column_fields'] =& $this->column_fields;
-            $loaded_defs[$this->object_name]['list_fields'] =& $this->list_fields;
-            $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
-            $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
-            $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
+            $loaded_defs[$this->object_name]['column_fields'] = & $this->column_fields;
+            $loaded_defs[$this->object_name]['list_fields'] = & $this->list_fields;
+            $loaded_defs[$this->object_name]['required_fields'] = & $this->required_fields;
+            $loaded_defs[$this->object_name]['field_name_map'] = & $this->field_name_map;
+            $loaded_defs[$this->object_name]['field_defs'] = & $this->field_defs;
         } else {
-            $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'];
-            $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
-            $this->required_fields =& $loaded_defs[$this->object_name]['required_fields'];
-            $this->field_name_map =& $loaded_defs[$this->object_name]['field_name_map'];
-            $this->field_defs =& $loaded_defs[$this->object_name]['field_defs'];
+            $this->column_fields = & $loaded_defs[$this->object_name]['column_fields'];
+            $this->list_fields = & $loaded_defs[$this->object_name]['list_fields'];
+            $this->required_fields = & $loaded_defs[$this->object_name]['required_fields'];
+            $this->field_name_map = & $loaded_defs[$this->object_name]['field_name_map'];
+            $this->field_defs = & $loaded_defs[$this->object_name]['field_defs'];
             $this->added_custom_field_defs = true;
 
             if (!isset($this->custom_fields) &&
@@ -343,9 +343,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 SugarBean(){
+    public function SugarBean() {
         $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 {
@@ -457,14 +457,14 @@ 
     {
         //load the module dictionary if not supplied.
         if ((!isset($dictionary) or empty($dictionary)) && !empty($module_dir)) {
-            $filename = 'modules/' . $module_dir . '/vardefs.php';
+            $filename = 'modules/'.$module_dir.'/vardefs.php';
             if (file_exists($filename)) {
                 include($filename);
             }
         }
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -495,7 +495,7 @@ 
         //load the module dictionary if not supplied.
         if (empty($dictionary) && !empty($module_dir)) {
             if ($is_custom) {
-                $filename = 'custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
+                $filename = 'custom/modules/'.$module_dir.'/Ext/Vardefs/vardefs.ext.php';
             } else {
                 if ($key == 'User') {
                     // a very special case for the Employees module
@@ -503,7 +503,7 @@ 
                     // Users/vardefs.php
                     $filename = 'modules/Users/vardefs.php';
                 } else {
-                    $filename = 'modules/' . $module_dir . '/vardefs.php';
+                    $filename = 'modules/'.$module_dir.'/vardefs.php';
                 }
             }
 
@@ -514,14 +514,14 @@ 
                     $dictionary = $GLOBALS['dictionary'];
                 }
             } else {
-                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
+                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found".$filename);
                 return;
             }
         }
 
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -530,18 +530,18 @@ 
                 $beanList_ucase = array_change_key_case($beanList, CASE_UPPER);
                 foreach ($RelationshipDefs as $rel_name => $rel_def) {
                     if (isset($rel_def['lhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['lhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' lhs module is missing ' . $rel_def['lhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' lhs module is missing '.$rel_def['lhs_module']);
                         continue;
                     }
                     if (isset($rel_def['rhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['rhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' rhs module is missing ' . $rel_def['rhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' rhs module is missing '.$rel_def['rhs_module']);
                         continue;
                     }
 
 
                     //check whether relationship exists or not first.
                     if (Relationship::exists($rel_name, $db)) {
-                        $GLOBALS['log']->debug('Skipping, relationship already exists ' . $rel_name);
+                        $GLOBALS['log']->debug('Skipping, relationship already exists '.$rel_name);
                     } else {
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
@@ -559,10 +559,10 @@ 
 
 
                         $column_list = implode(",", array_keys($toInsert));
-                        $value_list = "'" . implode("','", array_values($toInsert)) . "'";
+                        $value_list = "'".implode("','", array_values($toInsert))."'";
 
                         //create the record. todo add error check.
-                        $insert_string = "INSERT into relationships (" . $column_list . ") values (" . $value_list . ")";
+                        $insert_string = "INSERT into relationships (".$column_list.") values (".$value_list.")";
                         $db->query($insert_string, true);
                     }
                 }
@@ -638,11 +638,11 @@ 
                     $tmp_final_query = $parentbean->$shortcut_function_name();
                 }
                 if (!$first) {
-                    $final_query_rows .= ' UNION ALL ( ' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ' )';
-                    $final_query .= ' UNION ALL ( ' . $tmp_final_query . ' )';
+                    $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters).' )';
+                    $final_query .= ' UNION ALL ( '.$tmp_final_query.' )';
                 } else {
-                    $final_query_rows = '(' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ')';
-                    $final_query = '(' . $tmp_final_query . ')';
+                    $final_query_rows = '('.$parentbean->create_list_count_query($tmp_final_query, $parameters).')';
+                    $final_query = '('.$tmp_final_query.')';
                     $first = false;
                 }
             }
@@ -673,32 +673,32 @@ 
                 }
                 $subquery['select'] = substr($subquery['select'], 0, strlen($subquery['select']) - 1);
                 //Put the query into the final_query
-                $query = $subquery['select'] . " " . $subquery['from'] . " " . $subquery['where'];
+                $query = $subquery['select']." ".$subquery['from']." ".$subquery['where'];
                 if (!$first) {
-                    $query = ' UNION ALL ( ' . $query . ' )';
+                    $query = ' UNION ALL ( '.$query.' )';
                     $final_query_rows .= " UNION ALL ";
                 } else {
-                    $query = '(' . $query . ')';
+                    $query = '('.$query.')';
                     $first = false;
                 }
                 $query_array = $subquery['query_array'];
                 $select_position = strpos($query_array['select'], "SELECT");
                 $distinct_position = strpos($query_array['select'], "DISTINCT");
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name)) {
-                    $query_rows = "( SELECT count(DISTINCT " . $subpanel_def->table_name . ".id)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(DISTINCT ".$subpanel_def->table_name.".id)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } elseif ($select_position !== false && $distinct_position != false) {
-                    $query_rows = "( " . substr_replace($query_array['select'], "SELECT count(", $select_position, 6) . ")" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( ".substr_replace($query_array['select'], "SELECT count(", $select_position, 6).")".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } else {
                     //resort to default behavior.
-                    $query_rows = "( SELECT count(*)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(*)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
                 if (!empty($subquery['secondary_select'])) {
-                    $subquerystring = $subquery['secondary_select'] . $subquery['secondary_from'] . $query_array['join'] . $subquery['where'];
+                    $subquerystring = $subquery['secondary_select'].$subquery['secondary_from'].$query_array['join'].$subquery['where'];
                     if (!empty($subquery['secondary_where'])) {
                         if (empty($subquery['where'])) {
-                            $subquerystring .= " WHERE " . $subquery['secondary_where'];
+                            $subquerystring .= " WHERE ".$subquery['secondary_where'];
                         } else {
-                            $subquerystring .= " AND " . $subquery['secondary_where'];
+                            $subquerystring .= " AND ".$subquery['secondary_where'];
                         }
                     }
                     $secondary_queries[] = $subquerystring;
@@ -721,12 +721,12 @@ 
             }
 
             if (!empty($sort_order)) {
-                $order_by .= ' ' . $sort_order;
+                $order_by .= ' '.$sort_order;
             }
 
             $order_by = $parentbean->process_order_by($order_by, $submodule, $suppress_table_name);
             if (!empty($order_by)) {
-                $final_query .= ' ORDER BY ' . $order_by;
+                $final_query .= ' ORDER BY '.$order_by;
             }
         }
 
@@ -794,7 +794,7 @@ 
                     if (empty($where_definition)) {
                         $where_definition = $table_where;
                     } else {
-                        $where_definition .= ' AND ' . $table_where;
+                        $where_definition .= ' AND '.$table_where;
                     }
                 }
 
@@ -815,7 +815,7 @@ 
 
 
                 if (!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by]) && (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db')) {
-                    $order_by = $submodule->table_name . '.' . $order_by;
+                    $order_by = $submodule->table_name.'.'.$order_by;
                 }
                 $table_name = $this_subpanel->table_name;
                 $panel_name = $this_subpanel->name;
@@ -831,8 +831,8 @@ 
 
                 $subquery = $submodule->create_new_list_query('', $subwhere, $list_fields, $params, 0, '', true, $parentbean, $singleSelect);
 
-                $subquery['select'] = $subquery['select'] . " , '$panel_name' panel_name ";
-                $subquery['from'] = $subquery['from'] . $query_array['join'];
+                $subquery['select'] = $subquery['select']." , '$panel_name' panel_name ";
+                $subquery['from'] = $subquery['from'].$query_array['join'];
                 $subquery['query_array'] = $query_array;
                 $subquery['params'] = $params;
 
@@ -870,7 +870,7 @@ 
         $use_count_query = false;
         $processing_collection = $subpanel_def->isCollection();
 
-        $GLOBALS['log']->debug("process_union_list_query: " . $query);
+        $GLOBALS['log']->debug("process_union_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_subpanel'];
         }
@@ -947,9 +947,9 @@ 
                         if (isset($row[$field])) {
                             $current_bean->$field = $this->convertField($row[$field], $value);
                             unset($row[$field]);
-                        } elseif (isset($row[$this->table_name . '.' . $field])) {
-                            $current_bean->$field = $this->convertField($row[$this->table_name . '.' . $field], $value);
-                            unset($row[$this->table_name . '.' . $field]);
+                        } elseif (isset($row[$this->table_name.'.'.$field])) {
+                            $current_bean->$field = $this->convertField($row[$this->table_name.'.'.$field], $value);
+                            unset($row[$this->table_name.'.'.$field]);
                         } else {
                             $current_bean->$field = "";
                             unset($row[$field]);
@@ -1116,7 +1116,7 @@ 
                         $class = $beanList[$child_info['parent_type']];
                         // Added to avoid error below; just silently fail and write message to log
                         if (empty($beanFiles[$class])) {
-                            $GLOBALS['log']->error($this->object_name . '::retrieve_parent_fields() - cannot load class "' . $class . '", skip loading.');
+                            $GLOBALS['log']->error($this->object_name.'::retrieve_parent_fields() - cannot load class "'.$class.'", skip loading.');
                             continue;
                         }
                         require_once($beanFiles[$class]);
@@ -1127,7 +1127,7 @@ 
                         $queries[$child_info['parent_type']] = "SELECT id ";
                         $field_def = $templates[$child_info['parent_type']]->field_defs['name'];
                         if (isset($field_def['db_concat_fields'])) {
-                            $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
+                            $queries[$child_info['parent_type']] .= ' , '.$this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']).' parent_name';
                         } else {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
@@ -1137,7 +1137,7 @@ 
                         } elseif (isset($templates[$child_info['parent_type']]->field_defs['created_by'])) {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
-                        $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name . " WHERE id IN ('{$child_info['parent_id']}'";
+                        $queries[$child_info['parent_type']] .= " FROM ".$templates[$child_info['parent_type']]->table_name." WHERE id IN ('{$child_info['parent_id']}'";
                     } else {
                         if (empty($parent_child_map[$child_info['parent_id']])) {
                             $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
@@ -1149,7 +1149,7 @@ 
         }
         $results = array();
         foreach ($queries as $query) {
-            $result = $this->db->query($query . ')');
+            $result = $this->db->query($query.')');
             while ($row = $this->db->fetchByAssoc($result)) {
                 $results[$row['id']] = $row;
             }
@@ -1234,7 +1234,7 @@ 
      */
     public function get_custom_table_name()
     {
-        return $this->getTableName() . '_cstm';
+        return $this->getTableName().'_cstm';
     }
 
     /**
@@ -1474,7 +1474,7 @@ 
      */
     public function load_relationship($rel_name)
     {
-        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (" . $rel_name . ").");
+        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (".$rel_name.").");
 
         if (empty($rel_name)) {
             $GLOBALS['log']->error("SugarBean.load_relationships, Null relationship name passed.");
@@ -1509,7 +1509,7 @@ 
                 return true;
             }
         }
-        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (" . $rel_name . ")");
+        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (".$rel_name.")");
         return false;
     }
 
@@ -1616,7 +1616,7 @@ 
                         $idField = $value_array['id_name'];
                         if (isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type']) && $fieldDefs[$idField]['type'] == 'link') {
                             $tmpFieldDefs = $fieldDefs[$idField];
-                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir) . " " . $GLOBALS['app_strings']['LBL_ID'];
+                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir)." ".$GLOBALS['app_strings']['LBL_ID'];
                             $importableFields[$idField] = $tmpFieldDefs;
                         }
                     }
@@ -1640,8 +1640,8 @@ 
 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("create_tables: Metadata for table " . $this->table_name . " does not exist");
-            display_notice("meta data absent for table " . $this->table_name . " keyed to $key ");
+            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name." does not exist");
+            display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
         } else {
             if (!$this->db->tableExists($this->table_name)) {
                 $this->db->createTable($this);
@@ -1702,7 +1702,7 @@ 
      */
     public function get_audit_table_name()
     {
-        return $this->getTableName() . '_audit';
+        return $this->getTableName().'_audit';
     }
 
     /**
@@ -1720,7 +1720,7 @@ 
         require('metadata/audit_templateMetaData.php');
 
         // Bug: 52583 Need ability to customize template for audit tables
-        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        $custom = 'custom/metadata/audit_templateMetaData_'.$this->getTableName().'.php';
         if (file_exists($custom)) {
             require($custom);
         }
@@ -1730,7 +1730,7 @@ 
 
         // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
         foreach ($indices as $nr => $properties) {
-            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+            $indices[$nr]['name'] = 'idx_'.strtolower($this->getTableName()).'_'.$properties['name'];
         }
 
         $engine = null;
@@ -1754,8 +1754,8 @@ 
         global $dictionary;
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("drop_tables: Metadata for table " . $this->table_name . " does not exist");
-            echo "meta data absent for table " . $this->table_name . "<br>\n";
+            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name." does not exist");
+            echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
             if (empty($this->table_name)) {
                 return;
@@ -1763,8 +1763,8 @@ 
             if ($this->db->tableExists($this->table_name)) {
                 $this->db->dropTable($this);
             }
-            if ($this->db->tableExists($this->table_name . '_cstm')) {
-                $this->db->dropTableName($this->table_name . '_cstm');
+            if ($this->db->tableExists($this->table_name.'_cstm')) {
+                $this->db->dropTableName($this->table_name.'_cstm');
                 DynamicField::deleteCache();
             }
             if ($this->db->tableExists($this->get_audit_table_name())) {
@@ -2059,7 +2059,7 @@ 
                     break;
             }
             if ($reformatted) {
-                $GLOBALS['log']->deprecated('Formatting correction: ' . $this->module_dir . '->' . $field . ' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
+                $GLOBALS['log']->deprecated('Formatting correction: '.$this->module_dir.'->'.$field.' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
             }
         }
     }
@@ -2101,7 +2101,7 @@ 
                     $_SESSION['o_lock_object'] = $this->toArray();
                     $saveform = "<form name='save' id='save' method='POST'>";
                     foreach ($_POST as $key => $arg) {
-                        $saveform .= "<input type='hidden' name='" . addslashes($key) . "' value='" . addslashes($arg) . "'>";
+                        $saveform .= "<input type='hidden' name='".addslashes($key)."' value='".addslashes($arg)."'>";
                     }
                     $saveform .= "</form><script>document.getElementById('save').submit();</script>";
                     $_SESSION['o_lock_save'] = $saveform;
@@ -2281,7 +2281,7 @@ 
                     if ($rel_name == $new_rel_link && $this->$id != $new_rel_id) {
                         $new_rel_id = '';
                     }
-                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: ' . $rel_name . ' = ' . $this->$id);
+                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name.' = '.$this->$id);
                     //already related the new relationship id so let's set it to false so we don't add it again using the _REQUEST['relate_i'] mechanism in a later block
                     $this->load_relationship($rel_name);
                     $rel_add = $this->$rel_name->add($this->$id);
@@ -2292,7 +2292,7 @@ 
                 } else {
                     //if before value is not empty then attempt to delete relationship
                     if (!empty($this->rel_fields_before_value[$id])) {
-                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute' . $rel_name);
+                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute'.$rel_name);
                         $this->load_relationship($rel_name);
                         $this->$rel_name->delete($this->id, $this->rel_fields_before_value[$id]);
                     }
@@ -2342,7 +2342,7 @@ 
                             } else {
                                 $modified_relationships['remove']['failure'][] = $linkField;
                             }
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned ".var_export($success, true));
                         }
 
                         if (!empty($this->$idName) && is_string($this->$idName)) {
@@ -2357,7 +2357,7 @@ 
                                 $modified_relationships['add']['failure'][] = $linkField;
                             }
 
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned ".var_export($success, true));
                         }
                     } else {
                         $GLOBALS['log']->fatal("Failed to load relationship {$linkField} while saving {$this->module_dir}");
@@ -2741,10 +2741,10 @@ 
             $template_name = "Default";
         }
         if (!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         if ($this->special_notification) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         $xtpl->assign("ASSIGNED_USER", $this->new_assigned_user_name);
         $xtpl->assign("ASSIGNER", $current_user->name);
@@ -2755,17 +2755,17 @@ 
             $parsedSiteUrl['port'] = 80;
         }
 
-        $port = ($parsedSiteUrl['port'] != 80) ? ":" . $parsedSiteUrl['port'] : '';
+        $port = ($parsedSiteUrl['port'] != 80) ? ":".$parsedSiteUrl['port'] : '';
         $path = !empty($parsedSiteUrl['path']) ? $parsedSiteUrl['path'] : "";
         $cleanUrl = "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
 
-        $xtpl->assign("URL", $cleanUrl . "/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
+        $xtpl->assign("URL", $cleanUrl."/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
         $xtpl->assign("SUGAR", "Sugar v{$sugar_version}");
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $notify_mail->Body = from_html(trim($xtpl->text($template_name)));
-        $notify_mail->Subject = from_html($xtpl->text($template_name . "_Subject"));
+        $notify_mail->Subject = from_html($xtpl->text($template_name."_Subject"));
 
         // cn: bug 8568 encode notify email in User's outbound email encoding
         $notify_mail->prepForOutbound();
@@ -2857,7 +2857,7 @@ 
                 if (empty($where)) {
                     $where = $owner_where;
                 } else {
-                    $where .= ' AND ' . $owner_where;
+                    $where .= ' AND '.$owner_where;
                 }
             }
         }
@@ -2911,7 +2911,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
         /* BEGIN - SECURITY GROUPS */
@@ -2925,9 +2925,9 @@ 
             $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
             //$group_where = "user_name = 'admin'";
             if (empty($where)) {
-                $where = " (" . $group_where . ") ";
+                $where = " (".$group_where.") ";
             } else {
-                $where .= " AND (" . $group_where . ") ";
+                $where .= " AND (".$group_where.") ";
             }
         } elseif ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list')) {
             require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -2936,12 +2936,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -2960,7 +2960,7 @@ 
         $ret_array['order_by'] = '';
         //secondary selects are selects that need to be run after the primary query to retrieve additional info on main
         if ($singleSelect) {
-            $ret_array['secondary_select'] =& $ret_array['select'];
+            $ret_array['secondary_select'] = & $ret_array['select'];
             $ret_array['secondary_from'] = &$ret_array['from'];
         } else {
             $ret_array['secondary_select'] = '';
@@ -3034,7 +3034,7 @@ 
             //alias is used to alias field names
             $alias = '';
             if (isset($value['alias'])) {
-                $alias = ' as ' . $value['alias'] . ' ';
+                $alias = ' as '.$value['alias'].' ';
             }
 
             if (empty($this->field_defs[$field]) || !empty($value['force_blank'])) {
@@ -3073,29 +3073,29 @@ 
                 $selectedFields["$this->table_name.$field"] = true;
             } elseif ((!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter))) {
                 //add this column only if it has NOT already been added to select statement string
-                $colPos = strpos($ret_array['select'], "$this->table_name" . "_cstm" . ".$field");
+                $colPos = strpos($ret_array['select'], "$this->table_name"."_cstm".".$field");
                 if (!$colPos || $colPos < 0) {
-                    $ret_array['select'] .= ", $this->table_name" . "_cstm" . ".$field $alias";
+                    $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
                 }
 
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
             if ($data['type'] != 'relate' && isset($data['db_concat_fields'])) {
-                $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
+                $ret_array['select'] .= ", ".$this->db->concat($this->table_name, $data['db_concat_fields'])." as $field";
                 $selectedFields[$this->db->concat($this->table_name, $data['db_concat_fields'])] = true;
             }
             //Custom relate field or relate fields built in module builder which have no link field associated.
             if ($data['type'] == 'relate' && (isset($data['custom_module']) || isset($data['ext2']))) {
-                $joinTableAlias = 'jt' . $jtcount;
+                $joinTableAlias = 'jt'.$jtcount;
                 $relateJoinInfo = $this->custom_fields->getRelateJoin($data, $joinTableAlias, false);
                 $ret_array['select'] .= $relateJoinInfo['select'];
                 $ret_array['from'] .= $relateJoinInfo['from'];
                 //Replace any references to the relationship in the where clause with the new alias
                 //If the link isn't set, assume that search used the local table for the field
                 $searchTable = isset($data['link']) ? $relateJoinInfo['rel_table'] : $this->table_name;
-                $field_name = $relateJoinInfo['rel_table'] . '.' . !empty($data['name']) ? $data['name'] : 'name';
-                $where = preg_replace('/(^|[\s(])' . $field_name . '/', '${1}' . $relateJoinInfo['name_field'], $where);
+                $field_name = $relateJoinInfo['rel_table'].'.'.!empty($data['name']) ? $data['name'] : 'name';
+                $where = preg_replace('/(^|[\s(])'.$field_name.'/', '${1}'.$relateJoinInfo['name_field'], $where);
                 $jtcount++;
             }
             //Parent Field
@@ -3103,7 +3103,7 @@ 
                 //See if we need to join anything by inspecting the where clause
                 $match = preg_match('/(^|[\s(])parent_([a-zA-Z]+_?[a-zA-Z]+)_([a-zA-Z]+_?[a-zA-Z]+)\.name/', $where, $matches);
                 if ($match) {
-                    $joinTableAlias = 'jt' . $jtcount;
+                    $joinTableAlias = 'jt'.$jtcount;
                     $joinModule = $matches[2];
                     $joinTable = $matches[3];
                     $localTable = $this->table_name;
@@ -3124,7 +3124,7 @@ 
                     $ret_array['from'] .= " LEFT JOIN $joinTable $joinTableAlias
                         ON $localTable.{$data['id_name']} = $joinTableAlias.id";
                     //Replace any references to the relationship in the where clause with the new alias
-                    $where = preg_replace('/(^|[\s(])parent_' . $joinModule . '_' . $joinTable . '\.name/', '${1}' . $nameField, $where);
+                    $where = preg_replace('/(^|[\s(])parent_'.$joinModule.'_'.$joinTable.'\.name/', '${1}'.$nameField, $where);
                     $jtcount++;
                 }
             }
@@ -3133,7 +3133,7 @@ 
             {
                 $linkField = $data['link'];
                 $this->load_relationship($linkField);
-                if(!empty($this->$linkField))
+                if (!empty($this->$linkField))
                 {
                     $params = array();
                     if (empty($join_type)) {
@@ -3144,12 +3144,12 @@ 
                     if (isset($data['join_name'])) {
                         $params['join_table_alias'] = $data['join_name'];
                     } else {
-                        $params['join_table_alias'] = 'jt' . $jtcount;
+                        $params['join_table_alias'] = 'jt'.$jtcount;
                     }
                     if (isset($data['join_link_name'])) {
                         $params['join_table_link_alias'] = $data['join_link_name'];
                     } else {
-                        $params['join_table_link_alias'] = 'jtl' . $jtcount;
+                        $params['join_table_link_alias'] = 'jtl'.$jtcount;
                     }
                     $join_primary = !isset($data['join_primary']) || $data['join_primary'];
 
@@ -3182,20 +3182,20 @@ 
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
+                                    $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
                                 } else {
                                     if (isset($rel_mod->field_defs['created_by'])) {
-                                        $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".created_by {$field}_owner , '$rel_module' {$field}_mod";
+                                        $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".created_by {$field}_owner , '$rel_module' {$field}_mod";
                                     }
                                 }
                             }
                         }
 
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['secondary_select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
                             if (!isset($data['relationship_fields'])) {
-                                $ret_array['secondary_select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                                $ret_array['secondary_select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                             }
                         }
                         if (!$singleSelect) {
@@ -3211,54 +3211,54 @@ 
                             //27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not already added
                             if (!$singleSelect) {
-                                $ret_array['select'] .= ", '                                    '  " . $join['rel_key'] . ' ';
+                                $ret_array['select'] .= ", '                                    '  ".$join['rel_key'].' ';
                             }
-                            $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $join['rel_key'] . ' ' . $join['rel_key'];
+                            $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$join['rel_key'].' '.$join['rel_key'];
                         }
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                 if (!empty($secondarySelectedFields[$alias_name])) {
                                     continue;
                                 }
-                                $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $r_name . ' ' . $alias_name;
+                                $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$r_name.' '.$alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['secondary_from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['secondary_from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (isset($data['link_type']) && $data['link_type'] == 'relationship_info' && ($parentbean instanceof SugarBean)) {
-                                $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key'] . "='" . $parentbean->id . "'";
+                                $ret_array['secondary_where'] = $params['join_table_link_alias'].'.'.$join['rel_key']."='".$parentbean->id."'";
                             }
                         }
                     } else {
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
-                            $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                         }
                         if (isset($data['additionalFields'])) {
                             foreach ($data['additionalFields'] as $k => $v) {
                                 if (!empty($data['id_name']) && $data['id_name'] == $v && !empty($fields[$data['id_name']])) {
                                     continue;
                                 }
-                                $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $k . ' ' . $v;
+                                $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$k.' '.$v;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]])) {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($value['target_record_key']) && !empty($filter)) {
-                                    $selectedFields[$this->table_name . '.' . $value['target_record_key']] = true;
+                                    $selectedFields[$this->table_name.'.'.$value['target_record_key']] = true;
                                     $ret_array['select'] .= " , $this->table_name.{$value['target_record_key']} ";
                                 }
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.assigned_user_id ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.assigned_user_id '.$field.'_owner';
                                 } else {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.created_by ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.created_by '.$field.'_owner';
                                 }
-                                $ret_array['select'] .= "  , '" . $rel_module . "' " . $field . '_mod';
+                                $ret_array['select'] .= "  , '".$rel_module."' ".$field.'_mod';
                             }
                         }
                     }
@@ -3268,37 +3268,37 @@ 
                     if (isset($data['db_concat_fields'])) {
                         $buildWhere = false;
                         if (in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields'])) {
-                            $exp = '/\(\s*?' . $data['name'] . '.*?\%\'\s*?\)/';
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
                             if (preg_match($exp, $where, $matches)) {
                                 $search_expression = $matches[0];
                                 //Create three search conditions - first + last, first, last
-                                $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                                $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $first_name_search = str_replace($data['name'], $params['join_table_alias'].'.first_name', $search_expression);
+                                $last_name_search = str_replace($data['name'], $params['join_table_alias'].'.last_name', $search_expression);
                                 $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
                                 $buildWhere = true;
-                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                                $where = str_replace($search_expression, '('.$full_name_search.' OR '.$first_name_search.' OR '.$last_name_search.')', $where);
                             }
                         }
 
                         if (!$buildWhere) {
                             $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-                            $where = preg_replace('/' . $data['name'] . '/', $db_field, $where);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
                             // For relationship fields replace their alias by the corresponding link table and r_name
                             if (isset($data['relationship_fields'])) {
                                 foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                     $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-                                    $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                                    $where = preg_replace('/'.$alias_name.'/', $db_field, $where);
                                 }
                             }
                         }
                     } else {
-                        $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.' . $data['rname'], $where);
+                        $where = preg_replace('/(^|[\s(])'.$data['name'].'/', '${1}'.$params['join_table_alias'].'.'.$data['rname'], $where);
 
                         // For relationship fields replace their alias by the corresponding link table and r_name
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
-                                $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.' . $r_name, $where);
+                                $where = preg_replace('/(^|[\s(])'.$alias_name.'/', '${1}'.$params['join_table_link_alias'].'.'.$r_name, $where);
                             }
                         }
                     }
@@ -3312,12 +3312,12 @@ 
             }
         }
         if (!empty($filter)) {
-            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name . '.assigned_user_id'])) {
+            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id'])) {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
-            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name . '.created_by'])) {
+            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name.'.created_by'])) {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
-            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name . '.system_id'])) {
+            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id'])) {
                 $ret_array['select'] .= ", $this->table_name.system_id ";
             }
         }
@@ -3344,7 +3344,7 @@ 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $ret_array['order_by'] = " ORDER BY " . $order_by;
+            $ret_array['order_by'] = " ORDER BY ".$order_by;
         }
         if ($singleSelect) {
             unset($ret_array['secondary_where']);
@@ -3356,7 +3356,7 @@ 
             return $ret_array;
         }
 
-        return $ret_array['select'] . $ret_array['from'] . $ret_array['where'] . $ret_array['order_by'];
+        return $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
     }
 
 	public function get_relationship_field($field)
@@ -3431,9 +3431,9 @@ 
 
                 if (empty($field_defs['table']) && !$suppress_table_name) {
                     if ($source == 'db') {
-                        $list_column[0] = $bean_queried->table_name . '.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'.'.$list_column[0];
                     } elseif ($source == 'custom_fields') {
-                        $list_column[0] = $bean_queried->table_name . '_cstm.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'_cstm.'.$list_column[0];
                     }
                 }
 
@@ -3489,7 +3489,7 @@ 
          * if the row_offset is set to 'end' go to the end of the list
          */
         $toEnd = strval($row_offset) == 'end';
-        $GLOBALS['log']->debug("process_list_query: " . $query);
+        $GLOBALS['log']->debug("process_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3548,14 +3548,14 @@ 
             foreach ($this->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $temp->$field = $row[$field];
-                    $owner_field = $field . '_owner';
+                    $owner_field = $field.'_owner';
                     if (isset($row[$owner_field])) {
                         $temp->$owner_field = $row[$owner_field];
                     }
 
-                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): " . $field . " = " . $temp->$field);
-                } elseif (isset($row[$this->table_name . '.' . $field])) {
-                    $temp->$field = $row[$this->table_name . '.' . $field];
+                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
+                } elseif (isset($row[$this->table_name.'.'.$field])) {
+                    $temp->$field = $row[$this->table_name.'.'.$field];
                 } else {
                     $temp->$field = "";
                 }
@@ -3608,22 +3608,22 @@ 
     public function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
-        $pattern = '/\sORDER BY.*/is';  // ignores the case
+        $pattern = '/\sORDER BY.*/is'; // ignores the case
         $replacement = '';
         $query = preg_replace($pattern, $replacement, $query);
         //handle distinct clause
         $star = '*';
         if (substr_count(strtolower($query), 'distinct')) {
             if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                $star = 'DISTINCT '.$this->seed->table_name.'.id';
             } else {
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+                $star = 'DISTINCT '.$this->table_name.'.id';
             }
         }
 
         // change the select expression to 'count(*)'
-        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is';  // ignores the case
-        $replacement = 'SELECT count(' . $star . ') c FROM ';
+        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is'; // ignores the case
+        $replacement = 'SELECT count('.$star.') c FROM ';
 
         //if the passed query has union clause then replace all instances of the pattern.
         //this is very rare. I have seen this happening only from projects module.
@@ -3639,13 +3639,13 @@ 
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
                         if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                            $star = 'DISTINCT '.$this->seed->table_name.'.id';
                         } else {
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                            $star = 'DISTINCT '.$this->table_name.'.id';
                         }
                     }
                 } // if
-                $replacement = 'SELECT count(' . $star . ') c FROM ';
+                $replacement = 'SELECT count('.$star.') c FROM ';
                 $union_qs[$key] = preg_replace($pattern, $replacement, $union_query, 1);
             }
             $modified_select_query = implode(" UNION ALL ", $union_qs);
@@ -3711,7 +3711,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 
@@ -3723,12 +3723,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -3757,7 +3757,7 @@ 
     public function process_detail_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '', $offset = 0)
     {
         global $sugar_config;
-        $GLOBALS['log']->debug("process_detail_query: " . $query);
+        $GLOBALS['log']->debug("process_detail_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3823,14 +3823,14 @@ 
         }
         $custom_join = $this->getCustomJoin();
 
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name ";
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ";
 
         $query .= $custom_join['join'];
-        $query .= " WHERE $this->table_name.id = " . $this->db->quoted($id);
+        $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
         if ($deleted) {
             $query .= " AND $this->table_name.deleted=0";
         }
-        $GLOBALS['log']->debug("Retrieve $this->object_name : " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record by id $this->table_name:$id found ");
         if (empty($result)) {
             return null;
@@ -3981,7 +3981,7 @@ 
             }
             if (isset($row[$field])) {
                 $this->$field = $row[$field];
-                $owner = $field . '_owner';
+                $owner = $field.'_owner';
                 if (!empty($row[$owner])) {
                     $this->$owner = $row[$owner];
                 }
@@ -4178,12 +4178,12 @@ 
         $query = 'SELECT id';
         foreach ($fields as $field => $alias) {
             if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])) {
-                $query .= ' ,' . $this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) . ' as ' . $alias;
+                $query .= ' ,'.$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']).' as '.$alias;
             } elseif (!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                     $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db")
             ) {
-                $query .= ' ,' . $table . '.' . $field . ' as ' . $alias;
+                $query .= ' ,'.$table.'.'.$field.' as '.$alias;
             }
             if (!$return_array) {
                 $this->$alias = '';
@@ -4195,12 +4195,12 @@ 
 
 
         if (isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id'])) {
-            $query .= " , " . $table . ".assigned_user_id owner";
+            $query .= " , ".$table.".assigned_user_id owner";
         } elseif (isset($GLOBALS['dictionary'][$object]['fields']['created_by'])) {
-            $query .= " , " . $table . ".created_by owner";
+            $query .= " , ".$table.".created_by owner";
         }
-        $query .= ' FROM ' . $table . ' WHERE deleted=0 AND id=';
-        $result = $GLOBALS['db']->query($query . "'$id'");
+        $query .= ' FROM '.$table.' WHERE deleted=0 AND id=';
+        $result = $GLOBALS['db']->query($query."'$id'");
         $row = $GLOBALS['db']->fetchByAssoc($result);
         if ($return_array) {
             return $row;
@@ -4208,9 +4208,9 @@ 
         $owner = (empty($row['owner'])) ? '' : $row['owner'];
         foreach ($fields as $alias) {
             $this->$alias = (!empty($row[$alias])) ? $row[$alias] : '';
-            $alias = $alias . '_owner';
+            $alias = $alias.'_owner';
             $this->$alias = $owner;
-            $a_mod = $alias . '_mod';
+            $a_mod = $alias.'_mod';
             $this->$a_mod = $module;
         }
     }
@@ -4370,15 +4370,15 @@ 
         $entire_where = $query_array['where'];
         if (!empty($where)) {
             if (empty($entire_where)) {
-                $entire_where = ' WHERE ' . $where;
+                $entire_where = ' WHERE '.$where;
             } else {
-                $entire_where .= ' AND ' . $where;
+                $entire_where .= ' AND '.$where;
             }
         }
 
-        $query = 'SELECT ' . $child_seed->table_name . '.* ' . $query_array['from'] . ' ' . $entire_where;
+        $query = 'SELECT '.$child_seed->table_name.'.* '.$query_array['from'].' '.$entire_where;
         if (!empty($order_by)) {
-            $query .= " ORDER BY " . $order_by;
+            $query .= " ORDER BY ".$order_by;
         }
 
         return $child_seed->process_list_query($query, $row_offset, $limit, $max, $where);
@@ -4414,9 +4414,9 @@ 
      */
     public function process_full_list_query($query, $check_date = false)
     {
-        $GLOBALS['log']->debug("process_full_list_query: query is " . $query);
+        $GLOBALS['log']->debug("process_full_list_query: query is ".$query);
         $result = $this->db->query($query, false);
-        $GLOBALS['log']->debug("process_full_list_query: result is " . print_r($result, true));
+        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result, true));
         $class = get_class($this);
         $isFirstTime = true;
         $bean = new $class();
@@ -4432,7 +4432,7 @@ 
             foreach ($bean->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $bean->$field = $row[$field];
-                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): " . $field . " = " . $bean->$field);
+                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): ".$field." = ".$bean->$field);
                 } else {
                     $bean->$field = '';
                 }
@@ -4524,7 +4524,7 @@ 
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
         $date_modified = $GLOBALS['timedate']->nowDb();
-        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) . "'";
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='".$this->db->quote($id)."'";
         $this->db->query($query, true, "Error marking record undeleted: ");
 
         $this->restoreFiles();
@@ -4554,9 +4554,9 @@ 
         $directory = $this->deleteFileDirectory();
 
         foreach ($files as $file) {
-            if (sugar_is_file('upload://deleted/' . $directory . '/' . $file)) {
-                if (!sugar_rename('upload://deleted/' . $directory . '/' . $file, 'upload://' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $directory . '/' . $file . ' from deleted directory');
+            if (sugar_is_file('upload://deleted/'.$directory.'/'.$file)) {
+                if (!sugar_rename('upload://deleted/'.$directory.'/'.$file, 'upload://'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$directory.'/'.$file.' from deleted directory');
                 }
             }
         }
@@ -4565,7 +4565,7 @@ 
          * @var DBManager $db
          */
         global $db;
-        $db->query('DELETE FROM cron_remove_documents WHERE bean_id=' . $db->quoted($this->id));
+        $db->query('DELETE FROM cron_remove_documents WHERE bean_id='.$db->quoted($this->id));
 
         return true;
     }
@@ -4713,19 +4713,19 @@ 
 
         $directory = $this->deleteFileDirectory();
 
-        $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+        $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         if (!$isCreated) {
-            sugar_mkdir('upload://deleted/' . $directory, 0777, true);
-            $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+            sugar_mkdir('upload://deleted/'.$directory, 0777, true);
+            $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         }
         if (!$isCreated) {
             return false;
         }
 
         foreach ($files as $file) {
-            if (file_exists('upload://' . $file)) {
-                if (!sugar_rename('upload://' . $file, 'upload://deleted/' . $directory . '/' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $file . ' to deleted directory');
+            if (file_exists('upload://'.$file)) {
+                if (!sugar_rename('upload://'.$file, 'upload://deleted/'.$directory.'/'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$file.' to deleted directory');
                 }
             }
         }
@@ -4745,7 +4745,7 @@ 
         }
         if (empty($record['id'])) {
             $record['id'] = $db->quoted(create_guid());
-            $db->query('INSERT INTO cron_remove_documents (' . implode(', ', array_keys($record)) . ') VALUES(' . implode(', ', $record) . ')');
+            $db->query('INSERT INTO cron_remove_documents ('.implode(', ', array_keys($record)).') VALUES('.implode(', ', $record).')');
         } else {
             $db->query("UPDATE cron_remove_documents SET date_modified={$record['date_modified']} WHERE id={$record['id']}");
         }
@@ -4766,7 +4766,7 @@ 
      */
     public function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         $db = DBManagerFactory::getInstance('listviews');
 
         if (!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1) {
@@ -4813,7 +4813,7 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         // No need to do an additional query
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         if (empty($in) && !empty($query)) {
             $idList = $this->build_related_in($query);
             $in = $idList['in'];
@@ -4879,9 +4879,9 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $idList[] = $row['id'];
             if (empty($ids)) {
-                $ids = "('" . $row['id'] . "'";
+                $ids = "('".$row['id']."'";
             } else {
-                $ids .= ",'" . $row['id'] . "'";
+                $ids .= ",'".$row['id']."'";
             }
         }
         if (empty($ids)) {
@@ -4905,7 +4905,7 @@ 
      */
     public function build_related_list2($query, &$template, &$field_list)
     {
-        $GLOBALS['log']->debug("Finding linked values $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
 
         $result = $this->db->query($query, true);
 
@@ -5019,9 +5019,9 @@ 
     {
         $where_clause = $this->get_where($fields_array, $deleted);
         $custom_join = $this->getCustomJoin();
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name " . $custom_join['join'];
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ".$custom_join['join'];
         $query .= " $where_clause";
-        $GLOBALS['log']->debug("Retrieve $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name: ".$query);
         //requireSingleResult has been deprecated.
         //$result = $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record $where_clause:");
@@ -5060,7 +5060,7 @@ 
             }
             $name = $this->db->getValidDBName($name);
 
-            $where_clause .= "$name = " . $this->db->quoted($value);
+            $where_clause .= "$name = ".$this->db->quoted($value);
         }
         if (!empty($where_clause)) {
             if ($deleted) {
@@ -5158,7 +5158,7 @@ 
         $where = '';
 
         // make sure there is a date modified
-        $date_modified = $this->db->convert("'" . $GLOBALS['timedate']->nowDb() . "'", 'datetime');
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row = null;
         if ($check_duplicates) {
@@ -5168,7 +5168,7 @@ 
                 $where .= " AND $name = '$value' ";
             }
             $query .= $where;
-            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:" . $query);
+            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:".$query);
             $row = $this->db->fetchByAssoc($result);
         }
 
@@ -5177,16 +5177,16 @@ 
             if (isset($data_values)) {
                 $relate_values = array_merge($relate_values, $data_values);
             }
-            $query = "INSERT INTO $table (id, " . implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', " . $date_modified . ")";
+            $query = "INSERT INTO $table (id, ".implode(',', array_keys($relate_values)).", date_modified) VALUES ('".create_guid()."', "."'".implode("', '", $relate_values)."', ".$date_modified.")";
 
-            $this->db->query($query, false, "Creating Relationship:" . $query);
+            $this->db->query($query, false, "Creating Relationship:".$query);
         } elseif ($do_update) {
             $conds = array();
             foreach ($data_values as $key => $value) {
-                array_push($conds, $key . "='" . $this->db->quote($value) . "'");
+                array_push($conds, $key."='".$this->db->quote($value)."'");
             }
-            $query = "UPDATE $table SET " . implode(',', $conds) . ",date_modified=" . $date_modified . " " . $where;
-            $this->db->query($query, false, "Updating Relationship:" . $query);
+            $query = "UPDATE $table SET ".implode(',', $conds).",date_modified=".$date_modified." ".$where;
+            $this->db->query($query, false, "Updating Relationship:".$query);
         }
     }
 
@@ -5197,7 +5197,7 @@ 
             $query .= " AND $name = '$value' ";
         }
         $query .= " ORDER BY $select_id ";
-        $result = $this->db->query($query, false, "Retrieving Relationship:" . $query);
+        $result = $this->db->query($query, false, "Retrieving Relationship:".$query);
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result)) {
             $ids[] = $row;
@@ -5208,13 +5208,13 @@ 
     public function loadLayoutDefs()
     {
         global $layout_defs;
-        if (empty($this->layout_def) && file_exists('modules/' . $this->module_dir . '/layout_defs.php')) {
-            include_once('modules/' . $this->module_dir . '/layout_defs.php');
-            if (file_exists('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php')) {
-                include_once('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+        if (empty($this->layout_def) && file_exists('modules/'.$this->module_dir.'/layout_defs.php')) {
+            include_once('modules/'.$this->module_dir.'/layout_defs.php');
+            if (file_exists('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php')) {
+                include_once('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
             }
             if (empty($layout_defs[get_class($this)])) {
-                echo "\$layout_defs[" . get_class($this) . "]; does not exist";
+                echo "\$layout_defs[".get_class($this)."]; does not exist";
             }
 
             $this->layout_def = $layout_defs[get_class($this)];
@@ -5440,8 +5440,8 @@ 
         $tmp = explode(",", $order_by);
         $comma = ' ';
         foreach ($tmp as $stmp) {
-            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify." . trim($stmp));
-            $order_by_clause .= $comma . $stmp;
+            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify.".trim($stmp));
+            $order_by_clause .= $comma.$stmp;
             $comma = ", ";
         }
         return $order_by_clause;
@@ -5457,19 +5457,19 @@ 
         $street_field
     ) {
         if (isset($this->$street_field)) {
-            $street_field_2 = $street_field . '_2';
-            $street_field_3 = $street_field . '_3';
-            $street_field_4 = $street_field . '_4';
+            $street_field_2 = $street_field.'_2';
+            $street_field_3 = $street_field.'_3';
+            $street_field_4 = $street_field.'_4';
             if (isset($this->$street_field_2)) {
-                $this->$street_field .= "\n" . $this->$street_field_2;
+                $this->$street_field .= "\n".$this->$street_field_2;
                 unset($this->$street_field_2);
             }
             if (isset($this->$street_field_3)) {
-                $this->$street_field .= "\n" . $this->$street_field_3;
+                $this->$street_field .= "\n".$this->$street_field_3;
                 unset($this->$street_field_3);
             }
             if (isset($this->$street_field_4)) {
-                $this->$street_field .= "\n" . $this->$street_field_4;
+                $this->$street_field .= "\n".$this->$street_field_4;
                 unset($this->$street_field_4);
             }
             $this->$street_field = trim($this->$street_field, "\n");

modules/Tasks/metadata/SearchFields.php

Spacing +17 added lines, -17 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.
@@ -40,10 +40,10 @@ 
 global $current_user;
 $module_name = "Tasks";
 $searchFields['Tasks'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+	array(
+		'name' => array('query_type'=>'default'),
         'contact_name' => array('query_type' => 'default', 'db_field' => array('contacts.first_name', 'contacts.last_name'), 'force_unifiedsearch' => true),        
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'task_status_dom', 'template_var' => 'STATUS_FILTER'),
         
@@ -60,22 +60,22 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_due' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 				
 	);
 ?>