adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php

Spacing +13 added lines, -13 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.
@@ -63,26 +63,26 @@ 
 
 		$action = 'DeleteRelationship';
 		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];
+		$current_module = $layout_def['module'];
 		//in document revisions subpanel ,users are now allowed to 
 		//delete the latest revsion of a document. this will be tested here
 		//and if the condition is met delete button will be removed.
-		$hideremove=false;
-		if ($current_module=='DocumentRevisions') {
-			if ($layout_def['fields']['ID']==$layout_def['fields']['LATEST_REVISION_ID']) {
-				$hideremove=true;
+		$hideremove = false;
+		if ($current_module == 'DocumentRevisions') {
+			if ($layout_def['fields']['ID'] == $layout_def['fields']['LATEST_REVISION_ID']) {
+				$hideremove = true;
 			}
 		}
 		// Implicit Team-memberships are not "removeable" 
 		elseif ($_REQUEST['module'] == 'Teams' && $current_module == 'Users') {
-			if($layout_def['fields']['UPLINE'] != translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
+			if ($layout_def['fields']['UPLINE'] != translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
 				$hideremove = true;
 			}	
 			
 			//We also cannot remove the user whose private team is set to the parent_record_id value
 			$user = new User();
 			$user->retrieve($layout_def['fields']['ID']);
-			if($parent_record_id == $user->getPrivateTeamID())
+			if ($parent_record_id == $user->getPrivateTeamID())
 			{
 			    $hideremove = true;
 			}
@@ -94,22 +94,22 @@ 
 		$subpanel = $layout_def['subpanel_id'];
 		$return_id = $_REQUEST['record'];
 		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
+			$linked_field = $layout_def['linked_field_set'];
 		} else {
 			$linked_field = $layout_def['linked_field'];
 		}
 		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
+		if (!empty($layout_def['refresh_page'])) {
 			$refresh_page = 1;
 		}
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
 
 		$icon_remove_text = mb_strtolower($app_strings['LBL_ID_FF_REMOVE'], 'UTF-8');
 		
-         if($linked_field == 'get_emails_by_assign_or_link')
+         if ($linked_field == 'get_emails_by_assign_or_link')
             $linked_field = 'emails';
 		//based on listview since that lets you select records
-		if($layout_def['ListView'] && !$hideremove) {
+		if ($layout_def['ListView'] && !$hideremove) {
             $retStr = "<a href=\"javascript:sub_p_rem('$subpanel', '$linked_field'" 
                     .", '$record', $refresh_page);\"" 
 			. ' class="listViewTdToolsS1"'
@@ -118,7 +118,7 @@ 
 			. ">$icon_remove_text</a>";
         return $retStr;
             
-		}else{
+		} else {
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetFieldcurrency.php

Spacing +26 added lines, -26 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,13 +48,13 @@ 
                                                                                        
 function get_currency()
 {
-        global $current_user,$global_currency_obj;
+        global $current_user, $global_currency_obj;
         if (empty($global_currency_obj))
         {
         $global_currency_obj = new Currency();
       //  $global_currency_symbol = '$';
                                                                                        
-        if($current_user->getPreference('currency') )
+        if ($current_user->getPreference('currency'))
         {
                 $global_currency_obj->retrieve($current_user->getPreference('currency'));
         }
@@ -82,9 +82,9 @@ 
             $currency_id = $locale->getPrecedentPreference('currency');
 
             // If it's not grouped, or if it's grouped around a system currency column, look up the currency symbol so we can display it next to the amount
-            if ( empty($layout_def['group_function']) || $this->isSystemCurrency($layout_def) ) {
+            if (empty($layout_def['group_function']) || $this->isSystemCurrency($layout_def)) {
                 $c = $this->getCurrency($layout_def);
-                if(!empty($c['currency_id']) && !empty($c['currency_symbol']))
+                if (!empty($c['currency_id']) && !empty($c['currency_symbol']))
                 {
                     $symbol = $c['currency_symbol'];
                     $currency_id = $c['currency_id'];
@@ -94,15 +94,15 @@ 
             $layout_def['currency_id'] = $currency_id;
             $display = $this->displayListPlain($layout_def);
             
-        if(!empty($layout_def['column_key'])){
+        if (!empty($layout_def['column_key'])) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];    
-        }else if(!empty($layout_def['fields'])){
+        } else if (!empty($layout_def['fields'])) {
             $field_def = $layout_def['fields'];
         }
         $record = '';
         if ($layout_def['table_key'] == 'self' && isset($layout_def['fields']['PRIMARYID']))
             $record = $layout_def['fields']['PRIMARYID'];
-        else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])){ 
+        else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])) { 
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
@@ -110,11 +110,11 @@ 
 	        $field_type = $field_def['type'];
 	        $module = $field_def['module'];
 	
-	        $div_id = $module ."&$record&$field_name";
+	        $div_id = $module."&$record&$field_name";
 	        $str = "<div id='$div_id'>".$display;
             global $sugar_config;
             if (isset ($sugar_config['enable_inline_reports_edit']) && $sugar_config['enable_inline_reports_edit']) {
-                $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\",\"$currency_id\",\"$symbol\");'");
+                $str .= "&nbsp;".SugarThemeRegistry::current()->getImage("edit_inline", "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\",\"$currency_id\",\"$symbol\");'");
             }
 	        $str .= "</div>";
 	        return $str;
@@ -155,13 +155,13 @@ 
      return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
  }
 
- function queryFilterBetween(&$layout_def){
-     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND ". $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
+ function queryFilterBetween(&$layout_def) {
+     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))." AND ".$this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
  }
 
  function isSystemCurrency(&$layout_def)
  {
-     if (strpos($layout_def['name'],'_usdoll') === false) {
+     if (strpos($layout_def['name'], '_usdoll') === false) {
          return false;
      } else {
          return true;
@@ -172,8 +172,8 @@ 
  {
     // add currency column to select
     $table = $this->getCurrencyIdTable($layout_def);
-    if($table) {
-        return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)." , ".$table.".currency_id ". $this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency") . "\n";
+    if ($table) {
+        return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)." , ".$table.".currency_id ".$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")."\n";
     }
     return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)."\n";
  }
@@ -182,7 +182,7 @@ 
  {
     // add currency column to group by
     $table = $this->getCurrencyIdTable($layout_def);
-    if($table) {
+    if ($table) {
         return $this->_get_column_select($layout_def)." , ".$table.".currency_id \n";
     }
     return $this->_get_column_select($layout_def)." \n";
@@ -191,9 +191,9 @@ 
  function getCurrencyIdTable($layout_def)
  {
     // We need to fetch the currency id as well
-    if ( !$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
+    if (!$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
 
-        if ( !empty($layout_def['table_alias']) ) {
+        if (!empty($layout_def['table_alias'])) {
             $table = $layout_def['table_alias'];
         } else {
             $table = '';
@@ -204,16 +204,16 @@ 
             $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
 
         $add_currency_id = false;
-        if(!empty($table)) {
+        if (!empty($table)) {
             $cols = $GLOBALS['db']->getHelper()->get_columns($real_table);
             $add_currency_id = isset($cols['currency_id']) ? true : false;
 
-            if(!$add_currency_id && preg_match('/.*?_cstm$/i', $real_table)) {
+            if (!$add_currency_id && preg_match('/.*?_cstm$/i', $real_table)) {
                 $table = str_replace('_cstm', '', $table);
                 $cols = $GLOBALS['db']->getHelper()->get_columns($table);
                 $add_currency_id = isset($cols['currency_id']) ? true : false;
             }
-            if($add_currency_id) {
+            if ($add_currency_id) {
                 return $table;
             }
         }
@@ -230,7 +230,7 @@ 
     {
         $currency_id = false;
         $currency_symbol = false;
-        if(isset($layout_def['currency_symbol']) && isset($layout_def['currency_id']))
+        if (isset($layout_def['currency_symbol']) && isset($layout_def['currency_id']))
         {
             $currency_symbol = $layout_def['currency_symbol'];
             $currency_id = $layout_def['currency_id'];
@@ -238,7 +238,7 @@ 
         else
         {
             $key = strtoupper(isset($layout_def['varname']) ? $layout_def['varname'] : $this->_get_column_alias($layout_def));
-            if ( $this->isSystemCurrency($layout_def) )
+            if ($this->isSystemCurrency($layout_def))
             {
                 $currency_id = '-99';
             }
@@ -246,14 +246,14 @@ 
             {
                 $currency_id = $layout_def['fields'][$key.'_CURRENCY'];
             }
-            elseif(isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
+            elseif (isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
             {
                 $currency_id = $layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")];
             }
-            if($currency_id)
+            if ($currency_id)
             {
                 $currency = BeanFactory::getBean('Currencies', $currency_id);
-                if(!empty($currency ->symbol))
+                if (!empty($currency ->symbol))
                 {
                     $currency_symbol = $currency ->symbol;
                 }

include/generic/DeleteRelationship.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,18 +66,18 @@ 
 
 require_once('include/formbase.php');
 
- global $beanFiles,$beanList;
+ global $beanFiles, $beanList;
  $bean_name = $beanList[$_REQUEST['module']];
  require_once($beanFiles[$bean_name]);
  $focus = new $bean_name();
- if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record']))
+ if (empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field']) || empty($_REQUEST['record']))
  {
 	die("need linked_field, linked_id and record fields");
  }
  $linked_field = $_REQUEST['linked_field'];
  $record = $_REQUEST['record'];
  $linked_id = $_REQUEST['linked_id'];
- if($bean_name == 'Team')
+ if ($bean_name == 'Team')
  {
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
@@ -86,21 +86,21 @@ 
  {
  	// cut it off:
  	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
+ 	if ($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
  		unset($focus->$linked_field->_relationship->relationship_role_column);
- 	$focus->$linked_field->delete($record,$linked_id);
+ 	$focus->$linked_field->delete($record, $linked_id);
  }
- if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {
+ if ($bean_name == 'Campaign' and $linked_field == 'prospectlists') {
 
- 	$query="SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
- 	$query.=" left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";
-	$query.=" where email_marketing.campaign_id='$record'";
- 	$query.=" and email_marketing_prospect_lists.prospect_list_id='$linked_id'";
+ 	$query = "SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
+ 	$query .= " left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";
+	$query .= " where email_marketing.campaign_id='$record'";
+ 	$query .= " and email_marketing_prospect_lists.prospect_list_id='$linked_id'";
 
- 	$result=$focus->db->query($query);
-	while (($row=$focus->db->fetchByAssoc($result)) != null) {
-			$del_query =" update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=".$focus->db->convert("'".TimeDate::getInstance()->nowDb()."'",'datetime');
- 			$del_query.=" WHERE  email_marketing_prospect_lists.id='{$row['id']}'";
+ 	$result = $focus->db->query($query);
+	while (($row = $focus->db->fetchByAssoc($result)) != null) {
+			$del_query = " update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=".$focus->db->convert("'".TimeDate::getInstance()->nowDb()."'", 'datetime');
+ 			$del_query .= " WHERE  email_marketing_prospect_lists.id='{$row['id']}'";
 		 	$focus->db->query($del_query);
 	}
  	$focus->db->query($query);
@@ -111,7 +111,7 @@ 
     $user->retrieve($linked_id);
     if (!empty($user->id)) {  //make sure that record exists. we may have a contact on our hands.
 
-    	if($focus->update_vcal)
+    	if ($focus->update_vcal)
     	{
         	vCal::cache_sugar_vcal($user);
     	}
@@ -122,11 +122,11 @@ 
     $eapm->mark_deleted($linked_id);
 }
 
-if(!empty($_REQUEST['return_url'])){
-	$_REQUEST['return_url'] =urldecode($_REQUEST['return_url']);
+if (!empty($_REQUEST['return_url'])) {
+	$_REQUEST['return_url'] = urldecode($_REQUEST['return_url']);
 }
-$GLOBALS['log']->debug("deleted relationship: bean: $bean_name, linked_field: $linked_field, linked_id:$linked_id" );
-if(empty($_REQUEST['refresh_page'])){
+$GLOBALS['log']->debug("deleted relationship: bean: $bean_name, linked_field: $linked_field, linked_id:$linked_id");
+if (empty($_REQUEST['refresh_page'])) {
 	handleRedirect();
 }
 

include/SugarTheme/SugarTheme.php

Spacing +139 added lines, -139 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.
@@ -46,7 +46,7 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if (!defined('JSMIN_AS_LIB'))
     define('JSMIN_AS_LIB', true);
 
 require_once("include/SugarTheme/cssmin.php");
@@ -114,7 +114,7 @@ 
      * @deprecated only here for BC during upgrades
      * @var array
      */
-    protected $fonts  = array();
+    protected $fonts = array();
 
     /**
      * Maximum sugar version this theme is for; defaults to 5.5.1 as all the themes without this
@@ -292,44 +292,44 @@ 
         )
     {
         // apply parent theme's properties first
-        if ( isset($defaults['parentTheme']) ) {
+        if (isset($defaults['parentTheme'])) {
             $themedef = array();
             include("themes/{$defaults['parentTheme']}/themedef.php");
-            foreach ( $themedef as $key => $value ) {
-                if ( property_exists(__CLASS__,$key) ) {
+            foreach ($themedef as $key => $value) {
+                if (property_exists(__CLASS__, $key)) {
                     // For all arrays ( except colors and fonts ) you can just specify the items
                     // to change instead of all of the values
-                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                        $this->$key = array_merge($this->$key,$value);
+                    if (is_array($this->$key) && !in_array($key, array('colors', 'fonts')))
+                        $this->$key = array_merge($this->$key, $value);
                     else
                         $this->$key = $value;
                 }
             }
         }
-        foreach ( $defaults as $key => $value ) {
-            if ( property_exists(__CLASS__,$key) ) {
+        foreach ($defaults as $key => $value) {
+            if (property_exists(__CLASS__, $key)) {
                 // For all arrays ( except colors and fonts ) you can just specify the items
                 // to change instead of all of the values
-                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                    $this->$key = array_merge($this->$key,$value);
+                if (is_array($this->$key) && !in_array($key, array('colors', 'fonts')))
+                    $this->$key = array_merge($this->$key, $value);
                 else
                     $this->$key = $value;
             }
         }
-        if ( !inDeveloperMode() ) {
-            if ( sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
+        if (!inDeveloperMode()) {
+            if (sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
+                if (isset($caches['jsCache']))
                     $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
+                if (isset($caches['cssCache']))
                     $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
+                if (isset($caches['imageCache']))
                     $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
+                if (isset($caches['templateCache']))
                     $this->_templateCache = $caches['templateCache'];
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
-			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
+			if (!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
 				$this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
 			}
         }
@@ -348,7 +348,7 @@ 
     public function __wakeup()
     {
         // clean all properties
-        foreach(get_object_vars($this) as $k => $v) {
+        foreach (get_object_vars($this) as $k => $v) {
             $this->$k = null;
         }
         throw new Exception("Not a serializable object");
@@ -361,14 +361,14 @@ 
     public function __destruct()
     {
         // Set the current directory to one which we expect it to be (i.e. the root directory of the install
-        $dir = realpath(dirname(__FILE__) . '/../..');
+        $dir = realpath(dirname(__FILE__).'/../..');
         static $includePathIsPatched = false;
         if ($includePathIsPatched == false)
         {
             $path = explode(PATH_SEPARATOR, get_include_path());
             if (in_array($dir, $path) == false)
             {
-                set_include_path($dir . PATH_SEPARATOR . get_include_path());
+                set_include_path($dir.PATH_SEPARATOR.get_include_path());
             }
             $includePathIsPatched = true;
         }
@@ -376,7 +376,7 @@ 
         $cachedir = sugar_cached($this->getFilePath());
         sugar_mkdir($cachedir, 0775, true);
         // clear out the cache on destroy if we are asked to
-        if ( $this->_clearCacheOnDestroy ) {
+        if ($this->_clearCacheOnDestroy) {
 
             if (is_file("$cachedir/pathCache.php"))
                 unlink("$cachedir/pathCache.php");
@@ -384,9 +384,9 @@ 
 				unlink("$cachedir/spriteCache.php");
 
         }
-        elseif ( !inDeveloperMode() ) {
+        elseif (!inDeveloperMode()) {
             // only update the caches if they have been changed in this request
-            if ( count($this->_jsCache) != $this->_initialCacheSize['jsCache']
+            if (count($this->_jsCache) != $this->_initialCacheSize['jsCache']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
                     || count($this->_imageCache) != $this->_initialCacheSize['imageCache']
                     || count($this->_templateCache) != $this->_initialCacheSize['templateCache']
@@ -404,7 +404,7 @@ 
                     );
 
             }
-			if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
+			if (count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
 				sugar_file_put_contents(
 					"$cachedir/spriteCache.php",
 					serialize($this->_spriteCache)
@@ -433,11 +433,11 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
+        if (isset($this->$key))
             return $this->$key;
     }
 
-    public function __isset($key){
+    public function __isset($key) {
     	return isset($this->$key);
 
     }
@@ -604,38 +604,38 @@ 
 
 
 		// sprites
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+		if (!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
 			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
+			if (file_exists("cache/sprites/default/sprites.css"))
 				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
 
 			// theme specific sprites
-			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
+			if (file_exists("cache/sprites/{$this->dirName}/sprites.css"))
 				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
 
 			// parent sprites
-			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
+			if ($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+				if (file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
 					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
 			}
 
 			// repeatable sprites
-			if(file_exists("cache/sprites/Repeatable/sprites.css"))
+			if (file_exists("cache/sprites/Repeatable/sprites.css"))
 				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
 		}
 
         // for BC during upgrade
-        if ( !empty($this->colors) ) {
-            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
+        if (!empty($this->colors)) {
+            if (isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
                 $color = $_SESSION['authenticated_user_theme_color'];
             else
                 $color = $this->colors[0];
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('colors.'.$color.'.css').'" id="current_color_style" />';
         }
 
-        if ( !empty($this->fonts) ) {
-            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
+        if (!empty($this->fonts)) {
+            if (isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
                 $font = $_SESSION['authenticated_user_theme_font'];
             else
                 $font = $this->fonts[0];
@@ -669,7 +669,7 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
+        if (isset($this->_templateCache[$templateName]))
             return $this->_templateCache[$templateName];
 
         $templatePath = '';
@@ -719,28 +719,28 @@ 
         static $cached_results = array();
 
 		// trap deprecated use of image extension
-		if(is_null($ext)) {
-			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
+		if (is_null($ext)) {
+			$imageNameExp = explode('.', $imageName);
+			if (count($imageNameExp) == 1)
 				$imageName .= '.gif';
 		} else {
 			$imageName .= $ext;
 		}
 
 		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
+		if (preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
 			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
 		// sprite handler, makes use of own caching mechanism
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+		if (!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 			// get sprite metadata
-			if($sp = $this->getSpriteMeta($imageName)) {
+			if ($sp = $this->getSpriteMeta($imageName)) {
 				// requested size should match
-				if( (!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
-					(!is_null($height) && $sp['height'] == $height) || (is_null($height)) )
+				if ((!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
+					(!is_null($height) && $sp['height'] == $height) || (is_null($height)))
 				{
                     $other_attributes .= ' data-orig="'.$imageName.'"';
 
-                     if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
+                     if ($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
                      {
                          return $sprite;
                      }
@@ -749,11 +749,11 @@ 
 		}
 
 		// img caching
-		if(empty($cached_results[$imageName])) {
-			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
+		if (empty($cached_results[$imageName])) {
+			$imageURL = $this->getImageURL($imageName, false);
+			if (empty($imageURL))
 				return false;
-            if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
+            if (strpos($imageURL, '.svg', strlen($imageURL) - 4)) {
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
                 $cached_results[$imageName] = '<img src="'.getJSPath($imageURL).'" ';
@@ -764,10 +764,10 @@ 
 		$attr_width = (is_null($width)) ? "" : "width=\"$width\"";
 		$attr_height = (is_null($height)) ? "" : "height=\"$height\"";
 
-        if(strpos($cached_results[$imageName], 'svg') !== false){
+        if (strpos($cached_results[$imageName], 'svg') !== false) {
             return $cached_results[$imageName];
         }
-		return $cached_results[$imageName] . " $attr_width $attr_height $other_attributes alt=\"$alt\" />";
+		return $cached_results[$imageName]." $attr_width $attr_height $other_attributes alt=\"$alt\" />";
     }
 
 	/**
@@ -779,12 +779,12 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
+	    if (isset($this->_spriteCache[$imageName]))
 			return $this->_spriteCache[$imageName];
 
 			// sprite keys are base on imageURL
-		$imageURL = $this->getImageURL($imageName,false);
-		if(empty($imageURL)) {
+		$imageURL = $this->getImageURL($imageName, false);
+		if (empty($imageURL)) {
 			$this->_spriteCache[$imageName] = false;
 			return false;
 		}
@@ -795,12 +795,12 @@ 
 		// add current theme dir
 		$meta->loadSpriteMeta($this->dirName);
 		// add parent theme dir
-		if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+		if ($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
 			$meta->loadSpriteMeta($parent->dirName);
 		}
 
 		// add to cache
-		if(isset($meta->sprites[$imageURL])) {
+		if (isset($meta->sprites[$imageURL])) {
 			$this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
 			// add imageURL to cache
 			//$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
@@ -824,7 +824,7 @@ 
 		// handle multiple class tags
 		$class_regex = '/class=["\']([^\'"]+)["\']/i';
 		preg_match($class_regex, $attr, $match);
-		if(isset($match[1])) {
+		if (isset($match[1])) {
 			$attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
 
 		// single class
@@ -832,7 +832,7 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
+		if ($title)
 			$attr .= ' title="'.$title.'"';
 
 		// use </span> instead of /> to prevent weird UI results
@@ -856,13 +856,13 @@ 
     )
     {
 
-		if($img_name) {
+		if ($img_name) {
 			$img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
-			if($img == false) {
+			if ($img == false) {
 				$GLOBALS['log']->debug('Sprites: unknown image getLink');
 				$img = 'unknown';
 			}
-			switch($img_placement) {
+			switch ($img_placement) {
 				case 'left': 	$inner_html = $img."<span class='title'>".$title."</span>"; break;
 				case 'right':	$inner_html = "<span class='title'>".$title."</span>".$img; break;
 				default:		$inner_html = $img; break;
@@ -885,9 +885,9 @@ 
     public function getImageURL(
         $imageName,
         $addJSPath = true
-        ){
-        if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
+        ) {
+        if (isset($this->_imageCache[$imageName])) {
+            if ($addJSPath)
                 return getJSPath($this->_imageCache[$imageName]);
             else
                 return $this->_imageCache[$imageName];
@@ -899,7 +899,7 @@ 
             $imagePath = $filename;
         elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName, false)) != '')
             $imagePath = $filename;
         elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
             $imagePath = $filename;
@@ -914,7 +914,7 @@ 
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
+        if ($addJSPath)
             return getJSPath($imagePath);
 
         return $imagePath;
@@ -931,13 +931,13 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( sugar_is_file($imageName) )
+        if (sugar_is_file($imageName))
             return $imageName;
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['extension']) )
-                if ( ( $extension != $pathParts['extension'] )
-                        && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension) )
+        foreach ($this->imageExtensions as $extension)
+            if (isset($pathParts['extension']))
+                if (($extension != $pathParts['extension'])
+                        && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension))
                     return $pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension;
 
         return '';
@@ -953,8 +953,8 @@ 
      */
     public function getCSSURL($cssFileName, $returnURL = true)
     {
-        if ( isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName])) ) {
-            if ( $returnURL )
+        if (isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName]))) {
+            if ($returnURL)
                 return getJSPath("cache/".$this->_cssCache[$cssFileName]);
             else
                 return sugar_cached($this->_cssCache[$cssFileName]);
@@ -965,7 +965,7 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName, false)) != '')
             $cssFileContents .= file_get_contents($filename);
         else {
             if (sugar_is_file($defaultFileName))
@@ -994,24 +994,24 @@ 
 
         // if this is the style.css file, prepend the base.css and calendar-win2k-cold-1.css
         // files before the theme styles
-        if ( $cssFileName == 'style.css' && !isset($this->parentTheme) ) {
-            if ( inDeveloperMode() )
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
+        if ($cssFileName == 'style.css' && !isset($this->parentTheme)) {
+            if (inDeveloperMode())
+                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css').$cssFileContents;
             else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css').$cssFileContents;
         }
 
         // minify the css
-        if ( !inDeveloperMode() && !sugar_is_file($cssFilePath) ) {
+        if (!inDeveloperMode() && !sugar_is_file($cssFilePath)) {
             $cssFileContents = cssmin::minify($cssFileContents);
         }
 
         // now write the css to cache
-        sugar_file_put_contents($cssFilePath,$cssFileContents);
+        sugar_file_put_contents($cssFilePath, $cssFileContents);
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
+        if ($returnURL)
             return getJSPath("cache/".$fullFileName);
 
         return sugar_cached($fullFileName);
@@ -1027,8 +1027,8 @@ 
      */
     public function getJSURL($jsFileName, $returnURL = true)
     {
-        if ( isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName])) ) {
-            if ( $returnURL )
+        if (isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName]))) {
+            if ($returnURL)
                 return getJSPath("cache/".$this->_jsCache[$jsFileName]);
             else
                 return sugar_cached($this->_jsCache[$jsFileName]);
@@ -1039,7 +1039,7 @@ 
         $defaultFileName = $this->getDefaultJSPath().'/'.$jsFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName, false)) != '' && !in_array($jsFileName, $this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
             if (sugar_is_file($defaultFileName))
@@ -1060,18 +1060,18 @@ 
         $jsFilePath = create_cache_directory($fullFileName);
 
         // minify the js
-        if ( !inDeveloperMode()&& !sugar_is_file(str_replace('.js','-min.js',$jsFilePath)) ) {
+        if (!inDeveloperMode() && !sugar_is_file(str_replace('.js', '-min.js', $jsFilePath))) {
             $jsFileContents = SugarMin::minify($jsFileContents);
-            $jsFilePath = str_replace('.js','-min.js',$jsFilePath);
-            $fullFileName = str_replace('.js','-min.js',$fullFileName);
+            $jsFilePath = str_replace('.js', '-min.js', $jsFilePath);
+            $fullFileName = str_replace('.js', '-min.js', $fullFileName);
         }
 
         // now write the js to cache
-        sugar_file_put_contents($jsFilePath,$jsFileContents);
+        sugar_file_put_contents($jsFilePath, $jsFileContents);
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
+        if ($returnURL)
             return getJSPath("cache/".$fullFileName);
 
         return sugar_cached($fullFileName);
@@ -1087,7 +1087,7 @@ 
         // first, lets get all the paths of where to look
         $pathsToSearch = array($this->getImagePath());
         $theme = $this;
-        while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceOf SugarTheme ) {
+        while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceOf SugarTheme) {
             $theme = SugarThemeRegistry::get($theme->parentTheme);
             $pathsToSearch[] = $theme->getImagePath();
         }
@@ -1095,7 +1095,7 @@ 
 
         // now build the array
         $imageArray = array();
-        foreach ( $pathsToSearch as $path )
+        foreach ($pathsToSearch as $path)
         {
             if (!sugar_is_dir($path)) $path = "custom/$path";
             if (sugar_is_dir($path) && is_readable($path) && $dir = opendir($path)) {
@@ -1107,8 +1107,8 @@ 
                             || $file == "Attic"
                             )
                         continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                    if (!isset($imageArray[$file]))
+                        $imageArray[$file] = $this->getImageURL($file, false);
                 }
                 closedir($dir);
             }
@@ -1130,13 +1130,13 @@ 
 
         $config = array();
 
-        foreach($this->config_options as $name => $def){
+        foreach ($this->config_options as $name => $def) {
             $config[$name] = $def;
 
             $value = '';
-            if(isset($sugar_config['theme_settings'][$this->dirName][$name])){
+            if (isset($sugar_config['theme_settings'][$this->dirName][$name])) {
                 $value = $sugar_config['theme_settings'][$this->dirName][$name];
-            } else if(isset($def['default'])){
+            } else if (isset($def['default'])) {
                 $value = $def['default'];
             }
             $config[$name] = $value;
@@ -1189,28 +1189,28 @@ 
         }
 
         // Assume theme is designed for 5.5.x if not specified otherwise
-        if ( !isset($themedef['version']) )
+        if (!isset($themedef['version']))
             $themedef['version']['regex_matches'] = array('5\.5\.*');
 
         // Check to see if theme is valid for this version of Sugar; return false if not
         $version_ok = false;
-        if( isset($themedef['version']['exact_matches']) ){
+        if (isset($themedef['version']['exact_matches'])) {
             $matches_empty = false;
-            foreach( $themedef['version']['exact_matches'] as $match ){
-                if( $match == $GLOBALS['sugar_version'] ){
+            foreach ($themedef['version']['exact_matches'] as $match) {
+                if ($match == $GLOBALS['sugar_version']) {
                     $version_ok = true;
                 }
             }
         }
-        if( !$version_ok && isset($themedef['version']['regex_matches']) ){
+        if (!$version_ok && isset($themedef['version']['regex_matches'])) {
             $matches_empty = false;
-            foreach( $themedef['version']['regex_matches'] as $match ){
-                if( preg_match( "/$match/", $GLOBALS['sugar_version'] ) ){
+            foreach ($themedef['version']['regex_matches'] as $match) {
+                if (preg_match("/$match/", $GLOBALS['sugar_version'])) {
                     $version_ok = true;
                 }
             }
         }
-        if ( !$version_ok )
+        if (!$version_ok)
             return false;
 
         $theme = new SugarTheme($themedef);
@@ -1226,7 +1226,7 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
+        if (self::exists($themeName))
             unset(self::$_themes[$themeName]);
     }
 
@@ -1239,7 +1239,7 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
+        if (isset(self::$_themes[$themeName]))
             return self::$_themes[$themeName];
     }
 
@@ -1250,7 +1250,7 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
+        if (!isset(self::$_currentTheme))
             self::buildRegistry();
 
         return self::$_themes[self::$_currentTheme];
@@ -1263,10 +1263,10 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
+        if (!isset(self::$_currentTheme))
             self::buildRegistry();
 
-        if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
+        if (isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme'])) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
         }
         $array_keys = array_keys(self::availableThemes());
@@ -1295,7 +1295,7 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
+        if (!self::exists($themeName))
             return false;
 
         self::$_currentTheme = $themeName;
@@ -1312,17 +1312,17 @@ 
     public static function buildRegistry()
     {
         self::$_themes = array();
-        $dirs = array("themes/","custom/themes/");
+        $dirs = array("themes/", "custom/themes/");
 
         // check for a default themedef file
         $themedefDefault = array();
-        if ( sugar_is_file("custom/themes/default/themedef.php") ) {
+        if (sugar_is_file("custom/themes/default/themedef.php")) {
             $themedef = array();
             require("custom/themes/default/themedef.php");
             $themedefDefault = $themedef;
         }
 
-        foreach ($dirs as $dirPath ) {
+        foreach ($dirs as $dirPath) {
             if (sugar_is_dir('./'.$dirPath) && is_readable('./'.$dirPath) && $dir = opendir('./'.$dirPath)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1337,18 +1337,18 @@ 
                         continue;
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
-                    $themedef = array_merge($themedef,$themedefDefault);
+                    $themedef = array_merge($themedef, $themedefDefault);
                     $themedef['dirName'] = $file;
                     // check for theme already existing in the registry
                     // if so, then it will override the current one
-                    if ( self::exists($themedef['dirName']) ) {
+                    if (self::exists($themedef['dirName'])) {
                         $existingTheme = self::get($themedef['dirName']);
-                        foreach ( SugarTheme::getThemeDefFields() as $field )
-                            if ( !isset($themedef[$field]) )
+                        foreach (SugarTheme::getThemeDefFields() as $field)
+                            if (!isset($themedef[$field]))
                                 $themedef[$field] = $existingTheme->$field;
                         self::remove($themedef['dirName']);
                     }
-                    if ( isset($themedef['name']) ) {
+                    if (isset($themedef['name'])) {
                         self::add($themedef);
                     }
                 }
@@ -1356,8 +1356,8 @@ 
             }
         }
         // default to setting the default theme as the current theme
-        if ( !isset($GLOBALS['sugar_config']['default_theme']) || !self::set($GLOBALS['sugar_config']['default_theme']) ) {
-            if ( count(self::availableThemes()) == 0 )
+        if (!isset($GLOBALS['sugar_config']['default_theme']) || !self::set($GLOBALS['sugar_config']['default_theme'])) {
+            if (count(self::availableThemes()) == 0)
             {
                 sugar_die('No valid themes are found on this instance');
             } else {
@@ -1379,9 +1379,9 @@ 
     private static function getDefaultThemeKey()
     {
         $availableThemes = self::availableThemes();
-        foreach($availableThemes as $key=>$theme)
+        foreach ($availableThemes as $key=>$theme)
         {
-            if(strtolower($key) == 'sugar')
+            if (strtolower($key) == 'sugar')
             {
                 return $key;
             }
@@ -1400,11 +1400,11 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes']))
+            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
 
-        foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
+        foreach (self::$_themes as $themename => $themeobject) {
+            if (in_array($themename, $disabledThemes))
                 continue;
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
@@ -1421,11 +1421,11 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes']))
+            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
 
-        foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
+        foreach (self::$_themes as $themename => $themeobject) {
+            if (in_array($themename, $disabledThemes))
                 $themelist[$themeobject->dirName] = $themeobject->name;
         }
 
@@ -1441,7 +1441,7 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
+        foreach (self::$_themes as $themename => $themeobject)
             $themelist[$themeobject->dirName] = $themeobject->name;
 
         return $themelist;
@@ -1478,18 +1478,18 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
+        if (!self::exists($themeName))
             return false;
 
         $config = array();
 
-        foreach(self::$_themes[$themeName]->config_options as $name => $def){
+        foreach (self::$_themes[$themeName]->config_options as $name => $def) {
             $config[$name] = $def;
 
             $value = '';
-            if(isset($sugar_config['theme_settings'][$themeName][$name])){
+            if (isset($sugar_config['theme_settings'][$themeName][$name])) {
                 $value = $sugar_config['theme_settings'][$themeName][$name];
-            } else if(isset($def['default'])){
+            } else if (isset($def['default'])) {
                 $value = $def['default'];
             }
             $config[$name]['value'] = $value;
@@ -1505,7 +1505,7 @@ 
      */
     public static function clearAllCaches()
     {
-        foreach ( self::$_themes as $themeobject ) {
+        foreach (self::$_themes as $themeobject) {
             $themeobject->clearCache();
         }
     }

include/SugarObjects/LanguageManager.php

Spacing +60 added lines, -60 removed lines

@@ -49,21 +49,21 @@ 
 	 * @param module - the name of the module we are working with
 	 * @param templates - an array of templates this module uses
 	 */
-	static function createLanguageFile($module , $templates=array('default'), $refresh = false){
+	static function createLanguageFile($module, $templates = array('default'), $refresh = false) {
 		global $mod_strings, $current_language;
-		if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+		if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
         	$refresh = true;
     	}
 		$temp_mod_strings = $mod_strings;
 		$lang = $current_language;
-        if(empty($lang))
+        if (empty($lang))
             $lang = $GLOBALS['sugar_config']['default_language'];
 		static $createdModules = array();
-		if(empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))){
+		if (empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))) {
 			$loaded_mod_strings = array();
-			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module, $templates, $lang, $loaded_mod_strings);
 			$createdModules[$module] = true;
-			LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
+			LanguageManager::refreshLanguage($module, $lang, $loaded_mod_strings);
 		}
 	}
 
@@ -74,48 +74,48 @@ 
 	 * @param lang - current language this module use
 	 * @param loaded_mod_strings - the string that we will add the module template language  into
 	 */
-	static function loadTemplateLanguage($module , $templates , $lang, $loaded_mod_strings){
+	static function loadTemplateLanguage($module, $templates, $lang, $loaded_mod_strings) {
 		$templates = array_reverse($templates);
-		foreach($templates as $template){
-			$temp = LanguageManager::addTemplate($module,$lang, $template);
+		foreach ($templates as $template) {
+			$temp = LanguageManager::addTemplate($module, $lang, $template);
 			$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
 		}
 		return $loaded_mod_strings;
 	}
 
-	static function addTemplate($module, $lang, $template){
-		if($template == 'default')$template = 'basic';
+	static function addTemplate($module, $lang, $template) {
+		if ($template == 'default')$template = 'basic';
 		$templates = array();
 		$fields = array();
-		if(empty($templates[$template])){
-			$path = 'include/SugarObjects/templates/' . $template . '/language/'.$lang.'.lang.php';
-			if(file_exists($path)){
+		if (empty($templates[$template])) {
+			$path = 'include/SugarObjects/templates/'.$template.'/language/'.$lang.'.lang.php';
+			if (file_exists($path)) {
 				require($path);
 				$templates[$template] = $mod_strings;
-			}else{
-				$path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
-				if(file_exists($path)){
+			} else {
+				$path = 'include/SugarObjects/implements/'.$template.'/language/'.$lang.'.lang.php';
+				if (file_exists($path)) {
 					require($path);
 					$templates[$template] = $mod_strings;
 				}
 			}
 		}
-		if(!empty($templates[$template])){
+		if (!empty($templates[$template])) {
 			return $templates[$template];
 		}
 	}
 
-	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
+	static function saveCache($module, $lang, $loaded_mod_strings, $additonal_objects = array()) {
+		if (empty($lang))
 			$lang = $GLOBALS['sugar_config']['default_language'];
 
-		$file = create_cache_directory('modules/' . $module . '/language/'.$lang.'.lang.php');
-		write_array_to_file('mod_strings',$loaded_mod_strings, $file);
+		$file = create_cache_directory('modules/'.$module.'/language/'.$lang.'.lang.php');
+		write_array_to_file('mod_strings', $loaded_mod_strings, $file);
 		include($file);
 
 		// put the item in the sugar cache.
-		$key = self::getLanguageCacheKey($module,$lang);
-		sugar_cache_put($key,$loaded_mod_strings);
+		$key = self::getLanguageCacheKey($module, $lang);
+		sugar_cache_put($key, $loaded_mod_strings);
 	}
 
 	/**
@@ -124,24 +124,24 @@ 
 	 *                      clear language cache for all modules.
 	 * @param string lang the name of the object we are clearing this is for sugar_cache
 	 */
-	static function clearLanguageCache($module_dir = '', $lang = ''){
-		if(empty($lang)) {
+	static function clearLanguageCache($module_dir = '', $lang = '') {
+		if (empty($lang)) {
 			$languages = array_keys($GLOBALS['sugar_config']['languages']);
 		} else {
 			$languages = array($lang);
 		}
 		//if we have a module name specified then just remove that language file
 		//otherwise go through each module and clean up the language
-		if(!empty($module_dir)) {
-			foreach($languages as $clean_lang) {
+		if (!empty($module_dir)) {
+			foreach ($languages as $clean_lang) {
 				LanguageManager::_clearCache($module_dir, $clean_lang);
 			}
 		} else {
 			$cache_dir = sugar_cached('modules/');
-			if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
-				while(($entry = readdir($dir)) !== false) {
+			if (file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
+				while (($entry = readdir($dir)) !== false) {
 					if ($entry == "." || $entry == "..") continue;
-						foreach($languages as $clean_lang) {
+						foreach ($languages as $clean_lang) {
 							LanguageManager::_clearCache($entry, $clean_lang);
 						}
 				}
@@ -155,12 +155,12 @@ 
 	 * @param string module_dir the module_dir to clear
 	 * @param string lang the name of the language file we are clearing this is for sugar_cache
 	 */
-	static function _clearCache($module_dir = '', $lang){
-		if(!empty($module_dir) && !empty($lang)){
+	static function _clearCache($module_dir = '', $lang) {
+		if (!empty($module_dir) && !empty($lang)) {
 			$file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
-			if(file_exists($file)){
+			if (file_exists($file)) {
 				unlink($file);
-				$key = self::getLanguageCacheKey($module_dir,$lang);
+				$key = self::getLanguageCacheKey($module_dir, $lang);
 				sugar_cache_clear($key);
 			}
 		}
@@ -174,7 +174,7 @@ 
 	 * @param string $lang the given language we wish to load
 	 * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
 	 */
-	static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null){
+	static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null) {
 		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
 		$lang_paths = array(
 					'modules/'.$module.'/language/'.$lang.'.lang.php',
@@ -185,35 +185,35 @@ 
 
 		#27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
 		static $createdModules;
-		if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
+		if (empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])) {
 				$object = $GLOBALS['beanList'][$module];
 
 				if ($object == 'aCase')
 		            $object = 'Case';
 
-		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
+		        if (!empty($GLOBALS["dictionary"]["$object"]["templates"])) {
 		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
-					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module, $templates, $lang, $loaded_mod_strings);
 					$createdModules[$module] = true;
 		        }
 		}
 		//end of fix #27023
 
 		// Add in additional search paths if they were provided.
-		if(!empty($additional_search_paths) && is_array($additional_search_paths))
+		if (!empty($additional_search_paths) && is_array($additional_search_paths))
 		{
 			$lang_paths = array_merge($lang_paths, $additional_search_paths);
 		}
 
 		//search a predefined set of locations for the vardef files
-		foreach($lang_paths as $path){
-			if(file_exists($path)){
+		foreach ($lang_paths as $path) {
+			if (file_exists($path)) {
 				require($path);
-				if(!empty($mod_strings)){
-					if (function_exists('sugarArrayMergeRecursive')){
+				if (!empty($mod_strings)) {
+					if (function_exists('sugarArrayMergeRecursive')) {
 						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
 					}
-					else{
+					else {
 						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
 					}
 				}
@@ -222,43 +222,43 @@ 
 
 		//great! now that we have loaded all of our vardefs.
 		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
+		if (!empty($loaded_mod_strings))
 			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
 	}
 
-	static function loadModuleLanguage($module, $lang, $refresh=false){
+	static function loadModuleLanguage($module, $lang, $refresh = false) {
 		//here check if the cache file exists, if it does then load it, if it doesn't
 		//then call refreshVardef
 		//if either our session or the system is set to developerMode then refresh is set to true
 
 		// Retrieve the vardefs from cache.
-		$key = self::getLanguageCacheKey($module,$lang);
+		$key = self::getLanguageCacheKey($module, $lang);
 
-		if(!$refresh)
+		if (!$refresh)
 		{
 			$return_result = sugar_cache_retrieve($key);
-			if(!empty($return_result) && is_array($return_result)){
+			if (!empty($return_result) && is_array($return_result)) {
 				return $return_result;
 			}
 		}
 
 		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
 		$cachedfile = sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php';
-		if($refresh || !file_exists($cachedfile)){
+		if ($refresh || !file_exists($cachedfile)) {
 			LanguageManager::refreshLanguage($module, $lang);
 		}
 
 		//at this point we should have the cache/modules/... file
 		//which was created from the refreshVardefs so let's try to load it.
-		if(file_exists($cachedfile)){
+		if (file_exists($cachedfile)) {
 			global $mod_strings;
 
 			require $cachedfile;
 
 			// now that we hae loaded the data from disk, put it in the cache.
-			if(!empty($mod_strings))
-				sugar_cache_put($key,$mod_strings);
-			if(!empty($_SESSION['translation_mode'])){
+			if (!empty($mod_strings))
+				sugar_cache_put($key, $mod_strings);
+			if (!empty($_SESSION['translation_mode'])) {
 				$mod_strings = array_map('translated_prefix', $mod_strings);
 			}
 			return $mod_strings;
@@ -288,19 +288,19 @@ 
     {
         $jsFiles = array();
         getFiles($jsFiles, sugar_cached('jsLanguage'));
-        foreach($jsFiles as $file) {
+        foreach ($jsFiles as $file) {
             unlink($file);
         }
 
-        if( empty($GLOBALS['sugar_config']['js_lang_version']) )
+        if (empty($GLOBALS['sugar_config']['js_lang_version']))
             $GLOBALS['sugar_config']['js_lang_version'] = 1;
         else
             $GLOBALS['sugar_config']['js_lang_version'] += 1;
 
-        write_array_to_file( "sugar_config", $GLOBALS['sugar_config'], "config.php");
+        write_array_to_file("sugar_config", $GLOBALS['sugar_config'], "config.php");
     }
 }
 
-function translated_prefix($key){
-	return '[translated]' . $key;
+function translated_prefix($key) {
+	return '[translated]'.$key;
 }

include/SugarObjects/VardefManager.php

Spacing +58 added lines, -58 removed lines

@@ -42,7 +42,7 @@ 
  * Vardefs management
  * @api
  */
-class VardefManager{
+class VardefManager {
     static $custom_disabled_modules = array();
     static $linkFields;
 
@@ -67,8 +67,8 @@ 
         if (isset(VardefManager::$custom_disabled_modules[$module]))
         {
             $vardef_paths = array(
-                'custom/modules/' . $module . '/Ext/Vardefs/vardefs.ext.php',
-                'custom/Extension/modules/' . $module . '/Ext/Vardefs/vardefs.php'
+                'custom/modules/'.$module.'/Ext/Vardefs/vardefs.ext.php',
+                'custom/Extension/modules/'.$module.'/Ext/Vardefs/vardefs.php'
             );
 
             //search a predefined set of locations for the vardef files
@@ -95,41 +95,41 @@ 
         }
     }
 
-    static function addTemplate($module, $object, $template, $object_name=false){
-        if($template == 'default')$template = 'basic';
+    static function addTemplate($module, $object, $template, $object_name = false) {
+        if ($template == 'default')$template = 'basic';
         $templates = array();
         $fields = array();
-        if(empty($object_name))$object_name = $object;
+        if (empty($object_name))$object_name = $object;
         $_object_name = strtolower($object_name);
-        if(!empty($GLOBALS['dictionary'][$object]['table'])){
+        if (!empty($GLOBALS['dictionary'][$object]['table'])) {
             $table_name = $GLOBALS['dictionary'][$object]['table'];
-        }else{
+        } else {
             $table_name = strtolower($module);
         }
 
-        if(empty($templates[$template])){
-            $path = 'include/SugarObjects/templates/' . $template . '/vardefs.php';
-            if(file_exists($path)){
+        if (empty($templates[$template])) {
+            $path = 'include/SugarObjects/templates/'.$template.'/vardefs.php';
+            if (file_exists($path)) {
                 require($path);
                 $templates[$template] = $vardefs;
-            }else{
-                $path = 'include/SugarObjects/implements/' . $template . '/vardefs.php';
-                if(file_exists($path)){
+            } else {
+                $path = 'include/SugarObjects/implements/'.$template.'/vardefs.php';
+                if (file_exists($path)) {
                     require($path);
                     $templates[$template] = $vardefs;
                 }
             }
         }
        
-        if(!empty($templates[$template])){
-            if(empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
+        if (!empty($templates[$template])) {
+            if (empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
+            if (empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
+            if (empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
             $GLOBALS['dictionary'][$object]['fields'] = array_merge($templates[$template]['fields'], $GLOBALS['dictionary'][$object]['fields']);
-            if(!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
-            if(!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            if (!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
+            if (!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
             // maintain a record of this objects inheritance from the SugarObject templates...
-            $GLOBALS['dictionary'][$object]['templates'][ $template ] = $template ;
+            $GLOBALS['dictionary'][$object]['templates'][$template] = $template;
         }
     }
 
@@ -142,7 +142,7 @@ 
      */
     static function cleanVardefs($fieldDefs)
     {
-        foreach($fieldDefs as $field => $defs)
+        foreach ($fieldDefs as $field => $defs)
         {
             if (empty($def['name']) || empty($def['type']))
             {
@@ -158,15 +158,15 @@ 
      * @param string $module the name of the module
      * @param string $object the name of the object
      */
-    static function saveCache($module,$object, $additonal_objects= array()){
+    static function saveCache($module, $object, $additonal_objects = array()) {
 
         if (empty($GLOBALS['dictionary'][$object]))
             $object = BeanFactory::getObjectName($module);
-        $file = create_cache_directory('modules/' . $module . '/' . $object . 'vardefs.php');
+        $file = create_cache_directory('modules/'.$module.'/'.$object.'vardefs.php');
 
-        $out="<?php \n \$GLOBALS[\"dictionary\"][\"". $object . "\"]=" . var_export($GLOBALS['dictionary'][$object], true) .";";
+        $out = "<?php \n \$GLOBALS[\"dictionary\"][\"".$object."\"]=".var_export($GLOBALS['dictionary'][$object], true).";";
         sugar_file_put_contents_atomic($file, $out);
-        if ( sugar_is_file($file) && is_readable($file)) {
+        if (sugar_is_file($file) && is_readable($file)) {
             include($file);
         }
 
@@ -174,7 +174,7 @@ 
         $key = "VardefManager.$module.$object";
         //Sometimes bad definitions can get in from left over extensions or file system lag(caching). We need to clean those.
         $data = self::cleanVardefs($GLOBALS['dictionary'][$object]);
-        sugar_cache_put($key,$data);
+        sugar_cache_put($key, $data);
     }
 
     /**
@@ -184,14 +184,14 @@ 
      *                      clear vardef cache for all modules.
      * @param string object_name the name of the object we are clearing this is for sugar_cache
      */
-    static function clearVardef($module_dir = '', $object_name = ''){
+    static function clearVardef($module_dir = '', $object_name = '') {
         //if we have a module name specified then just remove that vardef file
         //otherwise go through each module and remove the vardefs.php
-        if(!empty($module_dir) && !empty($object_name)){
+        if (!empty($module_dir) && !empty($object_name)) {
             VardefManager::_clearCache($module_dir, $object_name);
-        }else{
+        } else {
             global $beanList;
-            foreach($beanList as $module_dir => $object_name){
+            foreach ($beanList as $module_dir => $object_name) {
                 VardefManager::_clearCache($module_dir, $object_name);
             }
         }
@@ -202,8 +202,8 @@ 
      * @param string module_dir the module_dir to clear
      * @param string object_name the name of the object we are clearing this is for sugar_cache
      */
-    static function _clearCache($module_dir = '', $object_name = ''){
-        if(!empty($module_dir) && !empty($object_name)){
+    static function _clearCache($module_dir = '', $object_name = '') {
+        if (!empty($module_dir) && !empty($object_name)) {
 
             //Some modules like cases have a bean name that doesn't match the object name
             if (empty($GLOBALS['dictionary'][$object_name])) {
@@ -211,9 +211,9 @@ 
                 $object_name = $newName != false ? $newName : $object_name;
             }
 
-            $file = sugar_cached('modules/').$module_dir.'/' . $object_name . 'vardefs.php';
+            $file = sugar_cached('modules/').$module_dir.'/'.$object_name.'vardefs.php';
 
-            if(file_exists($file)){
+            if (file_exists($file)) {
                 unlink($file);
                 $key = "VardefManager.$module_dir.$object_name";
                 sugar_cache_clear($key);
@@ -229,7 +229,7 @@ 
      * @param string $object the given object we wish to load the vardefs for
      * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
      */
-    static function refreshVardefs($module, $object, $additional_search_paths = null, $cacheCustom = true, $params = array()){
+    static function refreshVardefs($module, $object, $additional_search_paths = null, $cacheCustom = true, $params = array()) {
         // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
         global $dictionary, $beanList;
         $vardef_paths = array(
@@ -239,20 +239,20 @@ 
                  );
 
         // Add in additional search paths if they were provided.
-        if(!empty($additional_search_paths) && is_array($additional_search_paths))
+        if (!empty($additional_search_paths) && is_array($additional_search_paths))
         {
             $vardef_paths = array_merge($vardef_paths, $additional_search_paths);
         }
         $found = false;
         //search a predefined set of locations for the vardef files
-        foreach($vardef_paths as $path){
-            if(file_exists($path)){
+        foreach ($vardef_paths as $path) {
+            if (file_exists($path)) {
                 require($path);
                 $found = true;
             }
         }
         //Some modules have multiple beans, we need to see if this object has a module_dir that is different from its module_name
-        if(!$found){
+        if (!$found) {
             $temp = BeanFactory::newBean($module);
             if ($temp)
             {
@@ -271,15 +271,15 @@ 
         }
 
         //load custom fields into the vardef cache
-        if($cacheCustom){
+        if ($cacheCustom) {
             require_once("modules/DynamicFields/DynamicField.php");
-            $df = new DynamicField ($module) ;
+            $df = new DynamicField($module);
             $df->buildCache($module, false);
         }
 
         //great! now that we have loaded all of our vardefs.
         //let's go save them to the cache file.
-        if(!empty($dictionary[$object])) {
+        if (!empty($dictionary[$object])) {
             VardefManager::saveCache($module, $object);
         }
     }
@@ -316,10 +316,10 @@ 
 
         $vardef = $dictionary[$object];
         $links = array();
-        foreach($vardef['fields'] as $name => $def)
+        foreach ($vardef['fields'] as $name => $def)
         {
             //Look through all link fields for related modules that have calculated fields that use that relationship
-            if(!empty($def['type']) && $def['type'] == 'link' && !empty($def['relationship']))
+            if (!empty($def['type']) && $def['type'] == 'link' && !empty($def['relationship']))
             {
                 $links[$name] = $def;
             }
@@ -335,14 +335,14 @@ 
     {
         $cacheKey = "LFR{$module}{$object}{$relName}";
         $cacheValue = sugar_cache_retrieve($cacheKey);
-        if(!empty($cacheValue))
+        if (!empty($cacheValue))
             return $cacheValue;
 
         $relLinkFields = self::getLinkFieldsForModule($module, $object);
         $matches = array();
         if (!empty($relLinkFields))
         {
-            foreach($relLinkFields as $rfName => $rfDef)
+            foreach ($relLinkFields as $rfName => $rfDef)
             {
                 if ($rfDef['relationship'] == $relName)
                 {
@@ -359,7 +359,7 @@ 
             $results = $matches;
 
         sugar_cache_put($cacheKey, $results);
-        return $results ;
+        return $results;
     }
 
 
@@ -398,22 +398,22 @@ 
      * @param string $object the given object we wish to load the vardefs for
      * @param bool   $refresh whether or not we wish to refresh the cache file.
      */
-    static function loadVardef($module, $object, $refresh=false, $params = array()){
+    static function loadVardef($module, $object, $refresh = false, $params = array()) {
         //here check if the cache file exists, if it does then load it, if it doesn't
         //then call refreshVardef
         //if either our session or the system is set to developerMode then refresh is set to true
-        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+        if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
             $refresh = true;
         }
         // Retrieve the vardefs from cache.
         $key = "VardefManager.$module.$object";
 
-        if(!$refresh)
+        if (!$refresh)
         {
             $return_result = sugar_cache_retrieve($key);
             $return_result = self::applyGlobalAccountRequirements($return_result);
 
-            if(!empty($return_result))
+            if (!empty($return_result))
             {
                 $GLOBALS['dictionary'][$object] = $return_result;
                 return;
@@ -422,28 +422,28 @@ 
 
         // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
         global $dictionary;
-        if(empty($GLOBALS['dictionary'][$object]) || $refresh){
+        if (empty($GLOBALS['dictionary'][$object]) || $refresh) {
             //if the consumer has demanded a refresh or the cache/modules... file
             //does not exist, then we should do out and try to reload things
 
-			$cachedfile = sugar_cached('modules/'). $module . '/' . $object . 'vardefs.php';
-			if($refresh || !file_exists($cachedfile)){
+			$cachedfile = sugar_cached('modules/').$module.'/'.$object.'vardefs.php';
+			if ($refresh || !file_exists($cachedfile)) {
 				VardefManager::refreshVardefs($module, $object, null, true, $params);
 			}
 
             //at this point we should have the cache/modules/... file
             //which was created from the refreshVardefs so let's try to load it.
-            if(file_exists($cachedfile))
+            if (file_exists($cachedfile))
             {
                 if (is_readable($cachedfile))
                 {
                     include($cachedfile);
                 }
                 // now that we hae loaded the data from disk, put it in the cache.
-                if(!empty($GLOBALS['dictionary'][$object]))
+                if (!empty($GLOBALS['dictionary'][$object]))
                 {
                     $GLOBALS['dictionary'][$object] = self::applyGlobalAccountRequirements($GLOBALS['dictionary'][$object]);
-                    sugar_cache_put($key,$GLOBALS['dictionary'][$object]);
+                    sugar_cache_put($key, $GLOBALS['dictionary'][$object]);
                 }
             }
         }

include/SugarObjects/templates/basic/vardefs.php

Spacing +15 added lines, -15 removed lines

@@ -38,9 +38,9 @@ 
  ********************************************************************************/
 
 $vardefs = array(  
-'fields' => array (
+'fields' => array(
 	  'id' =>
-	  array (
+	  array(
 	    'name' => 'id',
 	    'vname' => 'LBL_ID',
 	    'type' => 'id',
@@ -66,7 +66,7 @@ 
         'merge_filter' => 'selected',
 	    ),
 	  'date_entered' =>
-	  array (
+	  array(
 	    'name' => 'date_entered',
 	    'vname' => 'LBL_DATE_ENTERED',
 	    'type' => 'datetime',
@@ -77,7 +77,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'date_modified' =>
-	  array (
+	  array(
 	    'name' => 'date_modified',
 	    'vname' => 'LBL_DATE_MODIFIED',
 	    'type' => 'datetime',
@@ -88,7 +88,7 @@ 
 		'inline_edit' => false,
 	  ),
 		'modified_user_id' =>
-	  array (
+	  array(
 	    'name' => 'modified_user_id',
 	    'rname' => 'user_name',
 	    'id_name' => 'modified_user_id',
@@ -104,7 +104,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'modified_by_name' => 
-	  array (
+	  array(
 	    'name' => 'modified_by_name',
 	    'vname' => 'LBL_MODIFIED_NAME',
 	    'type' => 'relate',
@@ -120,7 +120,7 @@ 
 		'inline_edit' => false,
 	  ),  
 	  'created_by' =>
-	  array (
+	  array(
 	    'name' => 'created_by',
 	    'rname' => 'user_name',
 	    'id_name' => 'modified_user_id',
@@ -135,7 +135,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'created_by_name' =>
-	  array (
+	  array(
 	    'name' => 'created_by_name',
 		'vname' => 'LBL_CREATED',
 		'type' => 'relate',
@@ -152,7 +152,7 @@ 
 		'inline_edit' => false,
 	),
 	  'description' =>
-	  array (
+	  array(
 	    'name' => 'description',
 	    'vname' => 'LBL_DESCRIPTION',
 	    'type' => 'text',
@@ -161,7 +161,7 @@ 
 	    'cols' => 80,
 	  ),
 	  'deleted' =>
-	  array (
+	  array(
 	    'name' => 'deleted',
 	    'vname' => 'LBL_DELETED',
 	    'type' => 'bool',
@@ -172,10 +172,10 @@ 
 	    
 /////////////////RELATIONSHIP LINKS////////////////////////////
 	  'created_by_link' =>
-  array (
+  array(
      'name' => 'created_by_link',
     'type' => 'link',
-    'relationship' => strtolower($module) . '_created_by',
+    'relationship' => strtolower($module).'_created_by',
     'vname' => 'LBL_CREATED_USER',
     'link_type' => 'one',
     'module'=>'Users',
@@ -183,10 +183,10 @@ 
     'source'=>'non-db',
   ),
   'modified_user_link' =>
-  array (
+  array(
         'name' => 'modified_user_link',
     'type' => 'link',
-    'relationship' => strtolower($module). '_modified_user',
+    'relationship' => strtolower($module).'_modified_user',
     'vname' => 'LBL_MODIFIED_USER',
     'link_type' => 'one',
     'module'=>'Users',
@@ -195,7 +195,7 @@ 
   ),
 
 ),
-'indices' => array (
+'indices' => array(
        'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
        ),
 'relationships'=>array(

include/database/SqlsrvManager.php

Spacing +57 added lines, -57 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,14 +175,14 @@ 
                     "ReturnDatesAsStrings" => true,
                     "MultipleActiveResultSets" => true,
                     );
-        if(!empty($configOptions['db_name'])) {
+        if (!empty($configOptions['db_name'])) {
             $options["Database"] = $configOptions['db_name'];
         }
         $this->database = sqlsrv_connect($connect_param, $options);
-        if(empty($this->database)) {
+        if (empty($this->database)) {
             $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].".");
-            if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+            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.");
@@ -192,7 +192,7 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
+        if ($this->checkError('Could Not Connect:', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
@@ -208,26 +208,26 @@ 
 	 */
 	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);
         }
         $sql = $this->_appendN($sql);
 
         $this->countQuery($sql);
-        $GLOBALS['log']->info('Query:' . $sql);
+        $GLOBALS['log']->info('Query:'.$sql);
         $this->checkConnection();
         $this->query_time = microtime(true);
 
-        $result = $suppress?@sqlsrv_query($this->database, $sql):sqlsrv_query($this->database, $sql);
+        $result = $suppress ? @sqlsrv_query($this->database, $sql) : sqlsrv_query($this->database, $sql);
 
         $this->query_time = microtime(true) - $this->query_time;
         $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        $this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 
         //suppress non error messages
-        sqlsrv_configure('WarningsReturnAsErrors',false);
+        sqlsrv_configure('WarningsReturnAsErrors', false);
 
         return $result;
     }
@@ -239,13 +239,13 @@ 
 	{
         $field_array = array();
 
-        if ( !$result ) {
+        if (!$result) {
         	return false;
         }
 
-        foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
+        foreach (sqlsrv_field_metadata($result) as $fieldMetadata) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $key = strtolower($key);
 
             $field_array[] = $key;
@@ -261,12 +261,12 @@ 
 	{
 		if (empty($result))	return false;
 
-	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
+	    $row = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
             return false;
         }
 
-        foreach($row as $key => $column) {
+        foreach ($row as $key => $column) {
             // MSSQL returns a space " " when a varchar column is empty ("") and not null.
             // We need to strip empty spaces
             // notice we only strip if one space is returned.  we do not want to strip
@@ -284,7 +284,7 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
+        if ($type == 'datetime')
         // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
         else
@@ -300,10 +300,10 @@ 
      * @param  array  $fielddef2
      * @return bool   true if they match, false if they don't
      */
-    public function compareVarDefs($fielddef1,$fielddef2, $ignoreName = false)
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
     {
-        if((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])){
-            if(isset($fielddef1['type']) && isset($fielddef2['type'])){
+        if ((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])) {
+            if (isset($fielddef1['type']) && isset($fielddef2['type'])) {
                 $fielddef2['type'] = $fielddef1['type'];
             }
         }
@@ -318,7 +318,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             sqlsrv_close($this->database);
             $this->database = null;
@@ -330,7 +330,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             sqlsrv_free_stmt($dbResult);
     }
 
@@ -342,19 +342,19 @@ 
      */
     public function getConstraintSql($indices, $table)
     {
-        if ( $this->doesTableHaveAClusteredIndexDefined($table) ) {
+        if ($this->doesTableHaveAClusteredIndexDefined($table)) {
             return parent::getConstraintSql($indices, $table);
         }
 
         // check to see if one of the passed in indices is a primary one; if so we can bail as well
-        foreach ( $indices as $index ) {
-            if ( $index['type'] == 'primary' ) {
+        foreach ($indices as $index) {
+            if ($index['type'] == 'primary') {
                 return parent::getConstraintSql($indices, $table);
             }
         }
 
         // Change the first index listed to be a clustered one instead ( so we have at least one for the table )
-        if ( isset($indices[0]) ) {
+        if (isset($indices[0])) {
             $indices[0]['type'] = 'clustered';
         }
 
@@ -370,41 +370,41 @@ 
         $result = $this->query("sp_columns_90 $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']);
-				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
-				    $columns[$column_name]['len']='max';
+			elseif (in_array($row['TYPE_NAME'], array('nchar', 'nvarchar'))) {
+				$columns[$column_name]['len'] = strtolower($row['PRECISION']);
+				if ($row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0') {
+				    $columns[$column_name]['len'] = 'max';
 				}
 			}
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text'))) {
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
             }
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+            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'];
@@ -430,7 +430,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -453,7 +453,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -466,10 +466,10 @@ 
      * @see DBManager::changeColumnSQL()
      * @see MssqlHelper::changeColumnSQL()
      */
-    protected function changeColumnSQL($tablename,$fieldDefs, $action, $ignoreRequired = false)
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
         $sql = '';
-        if ( $action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename) ) {
+        if ($action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename)) {
             $sql .= "DROP FULLTEXT INDEX ON {$tablename}";
         }
 
@@ -495,33 +495,33 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        if (empty($errors)) 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 languge is set.
 		    return false;
         }
         $messages = array();
-        foreach($errors as $error) {
+        foreach ($errors as $error) {
             $sqlmsg = $error['message'];
             $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) {
                 continue;
             }
             $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
             $sqlpos2 = strpos($sqlmsg, $app_strings['ERR_MSSQL_WARNING']);
-    		if ( $sqlpos !== false || $sqlpos2 !== false) {
+    		if ($sqlpos !== false || $sqlpos2 !== false) {
                     continue;
             }
             $messages[] = $sqlmsg;
         }
 
-        if(!empty($messages)) {
+        if (!empty($messages)) {
             return join("\n", $messages);
         }
         return false;
@@ -548,7 +548,7 @@ 
     protected function verifyGenericQueryRollback($type, $table, $query)
     {
         $this->log->debug("verifying $type statement");
-        if(!sqlsrv_begin_transaction($this->database)) {
+        if (!sqlsrv_begin_transaction($this->database)) {
             return "Failed to create transaction";
         }
         $this->query($query, false);

include/database/MssqlManager.php

Spacing +253 added lines, -253 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']->info('Query:' . $sql);
+        $GLOBALS['log']->info('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']->info('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,22 +634,22 @@ 
             {
                 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_sql = substr($p_sql, 0, $beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+            $p_sql = substr($p_sql, 0, $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
             //move the marker up
-            $offset = $sec_sin+1;
+            $offset = $sec_sin + 1;
 
             $i = $i + 1;
         }
@@ -671,7 +671,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;
@@ -687,11 +687,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
@@ -700,7 +700,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);
@@ -738,7 +738,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;
@@ -747,21 +747,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
@@ -793,8 +793,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);
@@ -805,18 +805,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;
@@ -830,22 +830,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
@@ -854,13 +854,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;
         }
     }
@@ -876,12 +876,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]]);
@@ -893,7 +893,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;
             }
@@ -910,20 +910,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;
                     }
@@ -931,11 +931,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"
@@ -947,9 +947,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;
                             }
@@ -974,7 +974,7 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
+		if (!isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -982,7 +982,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;
@@ -1011,11 +1011,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] = '';
                }
             }
@@ -1028,10 +1028,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));
     }
 
     /**
@@ -1069,7 +1069,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
                 }
                 return $tables;
             }
@@ -1084,7 +1084,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)) {
@@ -1108,7 +1108,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
@@ -1148,7 +1148,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);
                 }
@@ -1171,12 +1171,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);
@@ -1188,22 +1188,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':
@@ -1219,7 +1219,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)";
         }
@@ -1232,9 +1232,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);
 		}
@@ -1263,8 +1263,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)'));
     }
 
     /**
@@ -1274,13 +1274,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);
@@ -1303,21 +1303,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:
@@ -1333,7 +1333,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)) {
@@ -1342,41 +1342,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;
     }
@@ -1391,7 +1391,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;
@@ -1426,11 +1426,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;
@@ -1449,36 +1449,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'];
@@ -1493,7 +1493,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';
@@ -1505,11 +1505,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':
@@ -1547,13 +1547,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'];
 
@@ -1561,7 +1561,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;
         }
@@ -1585,11 +1585,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
@@ -1639,7 +1639,7 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
+        if (empty($column) && isset($results[$table]))
             return $results[$table];
 
         $query = <<<EOQ
@@ -1653,17 +1653,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;
@@ -1677,14 +1677,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;
@@ -1694,22 +1694,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';
@@ -1740,13 +1740,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']);
 			}
 		}
@@ -1755,10 +1755,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']}";
@@ -1773,10 +1773,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);
 	}
 
     /**
@@ -1787,7 +1787,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;
@@ -1799,7 +1799,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             mssql_free_result($dbResult);
     }
 
@@ -1810,11 +1810,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;
@@ -1823,7 +1823,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;
@@ -1831,18 +1831,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;
@@ -1863,7 +1863,7 @@ 
      */
     public function validateQuery($query)
     {
-        if(!$this->isSelect($query)) {
+        if (!$this->isSelect($query)) {
             return false;
         }
         $this->query("SET SHOWPLAN_TEXT ON");
@@ -1887,7 +1887,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;
         }
 
@@ -1917,7 +1917,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");
                 }
             }
         }
@@ -1928,7 +1928,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;
@@ -1955,22 +1955,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)";
     }
 
@@ -2059,7 +2059,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()