adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFieldcurrency.php

Indentation +44 added lines, -44 removed lines

@@ -52,7 +52,7 @@ 
         if (empty($global_currency_obj))
         {
         $global_currency_obj = new Currency();
-      //  $global_currency_symbol = '$';
+        //  $global_currency_symbol = '$';
                                                                                        
         if($current_user->getPreference('currency') )
         {
@@ -106,18 +106,18 @@ 
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
-	        $field_name = $layout_def['name'];
-	        $field_type = $field_def['type'];
-	        $module = $field_def['module'];
+            $field_name = $layout_def['name'];
+            $field_type = $field_def['type'];
+            $module = $field_def['module'];
 	
-	        $div_id = $module ."&$record&$field_name";
-	        $str = "<div id='$div_id'>".$display;
+            $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 .= "</div>";
-	        return $str;
+            $str .= "</div>";
+            return $str;
         }
         else
             return $display;
@@ -135,61 +135,61 @@ 
         );
         return $value;
     }                                                          
- function queryFilterEquals(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)."=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterEquals(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterNot_Equals(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterNot_Equals(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterGreater(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterGreater(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterLess(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterLess(&$layout_def)
+    {
+        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) {
-         return false;
-     } else {
-         return true;
-     }
- }
+    function isSystemCurrency(&$layout_def)
+    {
+        if (strpos($layout_def['name'],'_usdoll') === false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 
- function querySelect(&$layout_def)
- {
+    function querySelect(&$layout_def)
+    {
     // 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";
     }
     return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)."\n";
- }
+    }
 
- function queryGroupBy($layout_def)
- {
+    function queryGroupBy($layout_def)
+    {
     // add currency column to group by
     $table = $this->getCurrencyIdTable($layout_def);
     if($table) {
         return $this->_get_column_select($layout_def)." , ".$table.".currency_id \n";
     }
     return $this->_get_column_select($layout_def)." \n";
- }
+    }
 
- function getCurrencyIdTable($layout_def)
- {
+    function getCurrencyIdTable($layout_def)
+    {
     // We need to fetch the currency id as well
     if ( !$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
 
@@ -219,7 +219,7 @@ 
         }
     }
     return false;
- }
+    }
 
     /**
      * Return currency for layout_def

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;
                 }

Braces +16 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -57,8 +59,7 @@ 
         if($current_user->getPreference('currency') )
         {
                 $global_currency_obj->retrieve($current_user->getPreference('currency'));
-        }
-        else
+        } else
         {
                 $global_currency_obj->retrieve('-99');
         }
@@ -96,13 +97,13 @@ 
             
         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")])){ 
+        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")])){ 
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
@@ -118,9 +119,9 @@ 
             }
 	        $str .= "</div>";
 	        return $str;
+        } else {
+                    return $display;
         }
-        else
-            return $display;
     }
                              
     function displayListPlain($layout_def) {
@@ -200,8 +201,9 @@ 
         }
 
         $real_table = '';
-        if (!empty($this->reporter->all_fields[$layout_def['column_key']]['real_table']))
-            $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
+        if (!empty($this->reporter->all_fields[$layout_def['column_key']]['real_table'])) {
+                    $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
+        }
 
         $add_currency_id = false;
         if(!empty($table)) {
@@ -234,19 +236,16 @@ 
         {
             $currency_symbol = $layout_def['currency_symbol'];
             $currency_id = $layout_def['currency_id'];
-        }
-        else
+        } else
         {
             $key = strtoupper(isset($layout_def['varname']) ? $layout_def['varname'] : $this->_get_column_alias($layout_def));
             if ( $this->isSystemCurrency($layout_def) )
             {
                 $currency_id = '-99';
-            }
-            elseif (isset($layout_def['fields'][$key.'_CURRENCY']))
+            } elseif (isset($layout_def['fields'][$key.'_CURRENCY']))
             {
                 $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")];
             }

include/generic/DeleteRelationship.php

Indentation +43 added lines, -43 removed lines

@@ -66,55 +66,55 @@ 
 
 require_once('include/formbase.php');
 
- 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']))
- {
-	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')
- {
- 	$focus->retrieve($record);
- 	$focus->remove_user_from_team($linked_id);
- }
- else
- {
- 	// cut it off:
- 	$focus->load_relationship($linked_field);
- 	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);
- }
- if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {
+    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']))
+    {
+    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')
+    {
+        $focus->retrieve($record);
+        $focus->remove_user_from_team($linked_id);
+    }
+    else
+    {
+        // cut it off:
+        $focus->load_relationship($linked_field);
+        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);
+    }
+    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']}'";
-		 	$focus->db->query($del_query);
-	}
- 	$focus->db->query($query);
- }
+        $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);
+    }
 if ($bean_name == "Meeting") {
     $focus->retrieve($record);
     $user = new User();
     $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)
-    	{
-        	vCal::cache_sugar_vcal($user);
-    	}
+        if($focus->update_vcal)
+        {
+            vCal::cache_sugar_vcal($user);
+        }
     }
 }
 if ($bean_name == "User" && $linked_field == 'eapm') {
@@ -123,11 +123,11 @@ 
 }
 
 if(!empty($_REQUEST['return_url'])){
-	$_REQUEST['return_url'] =urldecode($_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'])){
-	handleRedirect();
+    handleRedirect();
 }
 
 

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();
 }
 

Braces +7 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -81,13 +83,13 @@ 
  {
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
- }
- else
+ } else
  {
  	// cut it off:
  	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
- 		unset($focus->$linked_field->_relationship->relationship_role_column);
+ 	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);
  }
  if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {

include/SugarTheme/SugarTheme.php

Indentation +181 added lines, -181 removed lines

@@ -246,12 +246,12 @@ 
      */
     private $_templateCache = array();
 
-	/**
-	 * Cache built of sprite meta data
-	 *
-	 * @var array
-	 */
-	private $_spriteCache = array();
+    /**
+     * Cache built of sprite meta data
+     *
+     * @var array
+     */
+    private $_spriteCache = array();
 
     /**
      * Size of the caches after the are initialized in the constructor
@@ -263,7 +263,7 @@ 
         'imageCache'    => 0,
         'jsCache'       => 0,
         'templateCache' => 0,
-		'spriteCache'	=> 0,
+        'spriteCache'	=> 0,
         );
 
     /**
@@ -329,21 +329,21 @@ 
                     $this->_templateCache = $caches['templateCache'];
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
-			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
-				$this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
-			}
+            if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
+                $this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
+            }
         }
         $this->_initialCacheSize = array(
             'jsCache'       => count($this->_jsCache),
             'cssCache'      => count($this->_cssCache),
             'imageCache'    => count($this->_imageCache),
             'templateCache' => count($this->_templateCache),
-			'spriteCache' 	=> count($this->_spriteCache),
+            'spriteCache' 	=> count($this->_spriteCache),
             );
     }
 
     /**
-	 * This is needed to prevent unserialize vulnerability
+     * This is needed to prevent unserialize vulnerability
      */
     public function __wakeup()
     {
@@ -380,8 +380,8 @@ 
 
             if (is_file("$cachedir/pathCache.php"))
                 unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/spriteCache.php"))
+                unlink("$cachedir/spriteCache.php");
 
         }
         elseif ( !inDeveloperMode() ) {
@@ -404,12 +404,12 @@ 
                     );
 
             }
-			if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
-				sugar_file_put_contents(
-					"$cachedir/spriteCache.php",
-					serialize($this->_spriteCache)
-				);
-			}
+            if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
+                sugar_file_put_contents(
+                    "$cachedir/spriteCache.php",
+                    serialize($this->_spriteCache)
+                );
+            }
         }
     }
 
@@ -438,7 +438,7 @@ 
     }
 
     public function __isset($key){
-    	return isset($this->$key);
+        return isset($this->$key);
 
     }
 
@@ -603,27 +603,27 @@ 
         $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('style.css').'" />';
 
 
-		// sprites
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+        // sprites
+        if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
-			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+            // system wide sprites
+            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"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+            // theme specific sprites
+            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"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
-			}
+            // parent sprites
+            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"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
-		}
+            // repeatable sprites
+            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) ) {
@@ -700,180 +700,180 @@ 
      *
      * @param  string $image image name
      * @param  string $other_attributes optional, other attributes to add to the image tag, not cached
-	 * @param  string $width optional, defaults to the actual image's width
-	 * @param  string $height optional, defaults to the actual image's height
-	 * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
+     * @param  string $width optional, defaults to the actual image's width
+     * @param  string $height optional, defaults to the actual image's height
+     * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
      * @param  string $alt optional, only used when image contains something useful, i.e. "Sally's profile pic"
      * @return string HTML image tag or sprite
      */
     public function getImage(
         $imageName,
         $other_attributes = '',
-		$width = null,
-		$height = null,
-		$ext = null,
+        $width = null,
+        $height = null,
+        $ext = null,
         $alt = ''
     )
     {
 
         static $cached_results = array();
 
-		// trap deprecated use of image extension
-		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))
-			$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']) {
-			// get sprite metadata
-			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)) )
-				{
+        // trap deprecated use of image extension
+        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))
+            $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']) {
+            // get sprite metadata
+            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)) )
+                {
                     $other_attributes .= ' data-orig="'.$imageName.'"';
 
-                     if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
-                     {
-                         return $sprite;
-                     }
-				}
-			}
-		}
-
-		// img caching
-		if(empty($cached_results[$imageName])) {
-			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+                        if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
+                        {
+                            return $sprite;
+                        }
+                }
+            }
+        }
+
+        // img caching
+        if(empty($cached_results[$imageName])) {
+            $imageURL = $this->getImageURL($imageName,false);
+            if ( empty($imageURL) )
+                return false;
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
                 $cached_results[$imageName] = '<img src="'.getJSPath($imageURL).'" ';
             }
 
-		}
+        }
 
-		$attr_width = (is_null($width)) ? "" : "width=\"$width\"";
-		$attr_height = (is_null($height)) ? "" : "height=\"$height\"";
+        $attr_width = (is_null($width)) ? "" : "width=\"$width\"";
+        $attr_height = (is_null($height)) ? "" : "height=\"$height\"";
 
         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\" />";
+    }
+
+    /**
+     * Returns sprite meta data
+     *
+     * @param  string $imageName Image filename including extension
+     * @return array  Sprite meta data
+     */
+    public function getSpriteMeta($imageName) {
+
+        // return from cache
+        if(isset($this->_spriteCache[$imageName]))
+            return $this->_spriteCache[$imageName];
+
+            // sprite keys are base on imageURL
+        $imageURL = $this->getImageURL($imageName,false);
+        if(empty($imageURL)) {
+            $this->_spriteCache[$imageName] = false;
+            return false;
+        }
+
+        // load meta data, includes default images
+        require_once("include/SugarTheme/SugarSprites.php");
+        $meta = SugarSprites::getInstance();
+        // add current theme dir
+        $meta->loadSpriteMeta($this->dirName);
+        // add parent theme dir
+        if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+            $meta->loadSpriteMeta($parent->dirName);
+        }
+
+        // add to cache
+        if(isset($meta->sprites[$imageURL])) {
+            $this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
+            // add imageURL to cache
+            //$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
+        } else {
+            $this->_spriteCache[$imageName] = false;
+            $GLOBALS['log']->debug("Sprites: miss for $imageURL");
+        }
+        return $this->_spriteCache[$imageName];
+    }
+
+    /**
+     * Returns sprite HTML span tag
+     *
+     * @param  string class The md5 id used in the CSS sprites class
+     * @param  string attr  optional, list of additional html attributes
+     * @param  string title optional, the title (equivalent to alt on img)
+     * @return string HTML span tag
+     */
+    public function getSprite($class, $attr, $title) {
+
+        // handle multiple class tags
+        $class_regex = '/class=["\']([^\'"]+)["\']/i';
+        preg_match($class_regex, $attr, $match);
+        if(isset($match[1])) {
+            $attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
+
+        // single class
+        } else {
+            $attr .= ' class="spr_'.$class.'"';
+        }
+
+        if($title)
+            $attr .= ' title="'.$title.'"';
+
+        // use </span> instead of /> to prevent weird UI results
+        $GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
+        return "<span {$attr}></span>";
     }
 
-	/**
-	 * Returns sprite meta data
-	 *
-	 * @param  string $imageName Image filename including extension
-	 * @return array  Sprite meta data
-	 */
-	public function getSpriteMeta($imageName) {
-
-		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
-
-			// sprite keys are base on imageURL
-		$imageURL = $this->getImageURL($imageName,false);
-		if(empty($imageURL)) {
-			$this->_spriteCache[$imageName] = false;
-			return false;
-		}
-
-		// load meta data, includes default images
-		require_once("include/SugarTheme/SugarSprites.php");
-		$meta = SugarSprites::getInstance();
-		// add current theme dir
-		$meta->loadSpriteMeta($this->dirName);
-		// add parent theme dir
-		if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-			$meta->loadSpriteMeta($parent->dirName);
-		}
-
-		// add to cache
-		if(isset($meta->sprites[$imageURL])) {
-			$this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
-			// add imageURL to cache
-			//$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
-		} else {
-			$this->_spriteCache[$imageName] = false;
-			$GLOBALS['log']->debug("Sprites: miss for $imageURL");
-		}
-		return $this->_spriteCache[$imageName];
-	}
-
-	/**
-	 * Returns sprite HTML span tag
-	 *
-	 * @param  string class The md5 id used in the CSS sprites class
-	 * @param  string attr  optional, list of additional html attributes
-	 * @param  string title optional, the title (equivalent to alt on img)
-	 * @return string HTML span tag
-	 */
-	public function getSprite($class, $attr, $title) {
-
-		// handle multiple class tags
-		$class_regex = '/class=["\']([^\'"]+)["\']/i';
-		preg_match($class_regex, $attr, $match);
-		if(isset($match[1])) {
-			$attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
-
-		// single class
-		} else {
-			$attr .= ' class="spr_'.$class.'"';
-		}
-
-		if($title)
-			$attr .= ' title="'.$title.'"';
-
-		// use </span> instead of /> to prevent weird UI results
-		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
-		return "<span {$attr}></span>";
-	}
-
-	/**
-	 * Returns a link HTML tag with or without an embedded image
-	 */
+    /**
+     * Returns a link HTML tag with or without an embedded image
+     */
     public function getLink(
-		$url,
-		$title,
-		$other_attributes = '',
+        $url,
+        $title,
+        $other_attributes = '',
         $img_name = '',
         $img_other_attributes = '',
-		$img_width = null,
-		$img_height = null,
-		$img_alt = '',
-		$img_placement = 'imageonly'
+        $img_width = null,
+        $img_height = null,
+        $img_alt = '',
+        $img_placement = 'imageonly'
     )
     {
 
-		if($img_name) {
-			$img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
-			if($img == false) {
-				$GLOBALS['log']->debug('Sprites: unknown image getLink');
-				$img = 'unknown';
-			}
-			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;
-			}
-		} else {
-			$inner_html = $title;
-		}
+        if($img_name) {
+            $img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
+            if($img == false) {
+                $GLOBALS['log']->debug('Sprites: unknown image getLink');
+                $img = 'unknown';
+            }
+            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;
+            }
+        } else {
+            $inner_html = $title;
+        }
 
-		return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
+        return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
 
-	}
+    }
 
     /**
      * Returns the URL for an image in the current theme. If not found in the current theme, will revert
@@ -905,8 +905,8 @@ 
             $imagePath = $filename;
         elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
             $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
+        elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
+            $imagePath = $filename;
         else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
@@ -1040,8 +1040,8 @@ 
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
-           $jsFileContents .= file_get_contents($filename);
-       } else {
+            $jsFileContents .= file_get_contents($filename);
+        } else {
             if (sugar_is_file($defaultFileName))
                 $jsFileContents .= file_get_contents($defaultFileName);
             if (sugar_is_file('custom/'.$defaultFileName))

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();
         }
     }

Braces +216 added lines, -158 removed lines

@@ -1,5 +1,7 @@ 
 <?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,8 +48,9 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if(!defined('JSMIN_AS_LIB')) {
     define('JSMIN_AS_LIB', true);
+}
 
 require_once("include/SugarTheme/cssmin.php");
 require_once("jssource/jsmin.php");
@@ -299,10 +302,11 @@ 
                 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);
-                    else
-                        $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;
+                    }
                 }
             }
         }
@@ -310,23 +314,28 @@ 
             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);
-                else
-                    $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'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
-                    $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
-                    $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
-                    $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
-                    $this->_templateCache = $caches['templateCache'];
+                if ( isset($caches['jsCache']) ) {
+                                    $this->_jsCache       = $caches['jsCache'];
+                }
+                if ( isset($caches['cssCache']) ) {
+                                    $this->_cssCache      = $caches['cssCache'];
+                }
+                if ( isset($caches['imageCache']) ) {
+                                    $this->_imageCache    = $caches['imageCache'];
+                }
+                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)) {
@@ -378,13 +387,14 @@ 
         // clear out the cache on destroy if we are asked to
         if ( $this->_clearCacheOnDestroy ) {
 
-            if (is_file("$cachedir/pathCache.php"))
-                unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/pathCache.php")) {
+                            unlink("$cachedir/pathCache.php");
+            }
+			if (is_file("$cachedir/spriteCache.php")) {
+							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']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
@@ -433,8 +443,9 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
-            return $this->$key;
+        if ( isset($this->$key) ) {
+                    return $this->$key;
+        }
     }
 
     public function __isset($key){
@@ -607,38 +618,44 @@ 
 		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
 			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('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"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('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"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+				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"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('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))
-                $color = $_SESSION['authenticated_user_theme_color'];
-            else
-                $color = $this->colors[0];
+            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))
-                $font = $_SESSION['authenticated_user_theme_font'];
-            else
-                $font = $this->fonts[0];
+            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];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('fonts.'.$font.'.css').'" id="current_font_style" />';
         }
 
@@ -669,23 +686,24 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
-            return $this->_templateCache[$templateName];
+        if ( isset($this->_templateCache[$templateName]) ) {
+                    return $this->_templateCache[$templateName];
+        }
 
         $templatePath = '';
-        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName))
-            $templatePath = $this->getTemplatePath().'/'.$templateName;
-        elseif (isset($this->parentTheme)
+        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getTemplatePath().'/'.$templateName;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '')
-            $templatePath = $filename;
-        elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '') {
+                    $templatePath = $filename;
+        } elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
+        } else {
             $GLOBALS['log']->warn("Template $templateName not found");
             return false;
         }
@@ -721,15 +739,17 @@ 
 		// trap deprecated use of image extension
 		if(is_null($ext)) {
 			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
+			if(count($imageNameExp) == 1) {
+							$imageName .= '.gif';
+			}
 		} else {
 			$imageName .= $ext;
 		}
 
 		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
-			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+		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']) {
 			// get sprite metadata
@@ -751,8 +771,9 @@ 
 		// img caching
 		if(empty($cached_results[$imageName])) {
 			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+			if ( empty($imageURL) ) {
+							return false;
+			}
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
@@ -779,8 +800,9 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
+	    if(isset($this->_spriteCache[$imageName])) {
+	    			return $this->_spriteCache[$imageName];
+	    }
 
 			// sprite keys are base on imageURL
 		$imageURL = $this->getImageURL($imageName,false);
@@ -832,8 +854,9 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
-			$attr .= ' title="'.$title.'"';
+		if($title) {
+					$attr .= ' title="'.$title.'"';
+		}
 
 		// use </span> instead of /> to prevent weird UI results
 		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
@@ -887,35 +910,37 @@ 
         $addJSPath = true
         ){
         if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
-                return getJSPath($this->_imageCache[$imageName]);
-            else
-                return $this->_imageCache[$imageName];
+            if ( $addJSPath ) {
+                            return getJSPath($this->_imageCache[$imageName]);
+            } else {
+                            return $this->_imageCache[$imageName];
+            }
         }
         $imagePath = '';
-        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (isset($this->parentTheme)
+        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '') {
+					$imagePath = $filename;
+		} else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
         }
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
-            return getJSPath($imagePath);
+        if ( $addJSPath ) {
+                    return getJSPath($imagePath);
+        }
 
         return $imagePath;
     }
@@ -931,14 +956,16 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( sugar_is_file($imageName) )
-            return $imageName;
+        if ( sugar_is_file($imageName) ) {
+                    return $imageName;
+        }
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['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 '';
     }
@@ -954,10 +981,11 @@ 
     public function getCSSURL($cssFileName, $returnURL = true)
     {
         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]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_cssCache[$cssFileName]);
+            } else {
+                            return sugar_cached($this->_cssCache[$cssFileName]);
+            }
         }
 
         $cssFileContents = '';
@@ -965,13 +993,15 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
-            $cssFileContents .= file_get_contents($filename);
-        else {
-            if (sugar_is_file($defaultFileName))
-                $cssFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '') {
+                    $cssFileContents .= file_get_contents($filename);
+        } else {
+            if (sugar_is_file($defaultFileName)) {
+                            $cssFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
         }
         if (sugar_is_file($fullFileName)) {
             $cssFileContents .= file_get_contents($fullFileName);
@@ -995,10 +1025,11 @@ 
         // 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;
-            else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            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;
+            }
         }
 
         // minify the css
@@ -1011,8 +1042,9 @@ 
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1028,10 +1060,11 @@ 
     public function getJSURL($jsFileName, $returnURL = true)
     {
         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]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_jsCache[$jsFileName]);
+            } else {
+                            return sugar_cached($this->_jsCache[$jsFileName]);
+            }
         }
 
         $jsFileContents = '';
@@ -1042,15 +1075,19 @@ 
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
-            if (sugar_is_file($defaultFileName))
-                $jsFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            if (sugar_is_file($defaultFileName)) {
+                            $jsFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
+        }
+        if (sugar_is_file($fullFileName)) {
+                    $jsFileContents .= file_get_contents($fullFileName);
+        }
+        if (sugar_is_file('custom/'.$fullFileName)) {
+                    $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         }
-        if (sugar_is_file($fullFileName))
-            $jsFileContents .= file_get_contents($fullFileName);
-        if (sugar_is_file('custom/'.$fullFileName))
-            $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         if (empty($jsFileContents)) {
             $GLOBALS['log']->warn("Javascript File $jsFileName not found");
             return false;
@@ -1071,8 +1108,9 @@ 
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1097,7 +1135,9 @@ 
         $imageArray = array();
         foreach ( $pathsToSearch as $path )
         {
-            if (!sugar_is_dir($path)) $path = "custom/$path";
+            if (!sugar_is_dir($path)) {
+                $path = "custom/$path";
+            }
             if (sugar_is_dir($path) && is_readable($path) && $dir = opendir($path)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1105,10 +1145,12 @@ 
                             || $file == ".svn"
                             || $file == "CVS"
                             || $file == "Attic"
-                            )
-                        continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                            ) {
+                                            continue;
+                    }
+                    if ( !isset($imageArray[$file]) ) {
+                                            $imageArray[$file] = $this->getImageURL($file,false);
+                    }
                 }
                 closedir($dir);
             }
@@ -1189,8 +1231,9 @@ 
         }
 
         // Assume theme is designed for 5.5.x if not specified otherwise
-        if ( !isset($themedef['version']) )
-            $themedef['version']['regex_matches'] = array('5\.5\.*');
+        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;
@@ -1210,8 +1253,9 @@ 
                 }
             }
         }
-        if ( !$version_ok )
-            return false;
+        if ( !$version_ok ) {
+                    return false;
+        }
 
         $theme = new SugarTheme($themedef);
         self::$_themes[$theme->dirName] = $theme;
@@ -1226,8 +1270,9 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
-            unset(self::$_themes[$themeName]);
+        if ( self::exists($themeName) ) {
+                    unset(self::$_themes[$themeName]);
+        }
     }
 
     /**
@@ -1239,8 +1284,9 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
-            return self::$_themes[$themeName];
+        if ( isset(self::$_themes[$themeName]) ) {
+                    return self::$_themes[$themeName];
+        }
     }
 
     /**
@@ -1250,8 +1296,9 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         return self::$_themes[self::$_currentTheme];
     }
@@ -1263,8 +1310,9 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
@@ -1295,8 +1343,9 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         self::$_currentTheme = $themeName;
 
@@ -1333,8 +1382,9 @@ 
                             || $file == "default"
                             || !sugar_is_dir("./$dirPath".$file)
                             || !sugar_is_file("./{$dirPath}{$file}/themedef.php")
-                            )
-                        continue;
+                            ) {
+                                            continue;
+                    }
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
                     $themedef = array_merge($themedef,$themedefDefault);
@@ -1343,9 +1393,10 @@ 
                     // if so, then it will override the current one
                     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']) ) {
@@ -1400,12 +1451,14 @@ 
     {
         $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) )
-                continue;
+            if ( in_array($themename,$disabledThemes) ) {
+                            continue;
+            }
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
         asort($themelist, SORT_STRING);
@@ -1421,12 +1474,14 @@ 
     {
         $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) )
-                $themelist[$themeobject->dirName] = $themeobject->name;
+            if ( in_array($themename,$disabledThemes) ) {
+                            $themelist[$themeobject->dirName] = $themeobject->name;
+            }
         }
 
         return $themelist;
@@ -1441,8 +1496,9 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
-            $themelist[$themeobject->dirName] = $themeobject->name;
+        foreach ( self::$_themes as $themename => $themeobject ) {
+                    $themelist[$themeobject->dirName] = $themeobject->name;
+        }
 
         return $themelist;
     }
@@ -1456,8 +1512,9 @@ 
     {
         $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) {
             $themearray['name'] = $themeobject->name;
@@ -1478,8 +1535,9 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         $config = array();
 

Doc Comments +4 added lines, -2 removed lines

@@ -458,7 +458,7 @@ 
     /**
      * Return array of all valid fields that can be specified in the themedef.php file
      *
-     * @return array
+     * @return string[]
      */
     public static function getThemeDefFields()
     {
@@ -698,7 +698,7 @@ 
     /**
      * Returns an image tag for the given image.
      *
-     * @param  string $image image name
+     * @param  string $imageName image name
      * @param  string $other_attributes optional, other attributes to add to the image tag, not cached
 	 * @param  string $width optional, defaults to the actual image's width
 	 * @param  string $height optional, defaults to the actual image's height
@@ -817,6 +817,8 @@ 
 	 * @param  string class The md5 id used in the CSS sprites class
 	 * @param  string attr  optional, list of additional html attributes
 	 * @param  string title optional, the title (equivalent to alt on img)
+	 * @param string $attr
+	 * @param string $title
 	 * @return string HTML span tag
 	 */
 	public function getSprite($class, $attr, $title) {

include/SugarObjects/LanguageManager.php

Indentation +201 added lines, -201 removed lines

@@ -44,226 +44,226 @@ 
 class LanguageManager
 {
 
-	/**
-	 * Called from VardefManager to allow for caching a lang file for a module
-	 * @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){
-		global $mod_strings, $current_language;
-		if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
-        	$refresh = true;
-    	}
-		$temp_mod_strings = $mod_strings;
-		$lang = $current_language;
+    /**
+     * Called from VardefManager to allow for caching a lang file for a module
+     * @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){
+        global $mod_strings, $current_language;
+        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+            $refresh = true;
+        }
+        $temp_mod_strings = $mod_strings;
+        $lang = $current_language;
         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'))){
-			$loaded_mod_strings = array();
-			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-			$createdModules[$module] = true;
-			LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
-		}
-	}
+        static $createdModules = array();
+        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);
+            $createdModules[$module] = true;
+            LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
+        }
+    }
 
-	/**
-	 * Load the module  tempalte lauguage files
-	 * @param module - the name of the module we are working with
-	 * @param templates - an array of templates this module uses
-	 * @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){
-		$templates = array_reverse($templates);
-		foreach($templates as $template){
-			$temp = LanguageManager::addTemplate($module,$lang, $template);
-			$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
-		}
-		return $loaded_mod_strings;
-	}
+    /**
+     * Load the module  tempalte lauguage files
+     * @param module - the name of the module we are working with
+     * @param templates - an array of templates this module uses
+     * @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){
+        $templates = array_reverse($templates);
+        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';
-		$templates = array();
-		$fields = array();
-		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)){
-					require($path);
-					$templates[$template] = $mod_strings;
-				}
-			}
-		}
-		if(!empty($templates[$template])){
-			return $templates[$template];
-		}
-	}
+    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)){
+                require($path);
+                $templates[$template] = $mod_strings;
+            }else{
+                $path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
+                if(file_exists($path)){
+                    require($path);
+                    $templates[$template] = $mod_strings;
+                }
+            }
+        }
+        if(!empty($templates[$template])){
+            return $templates[$template];
+        }
+    }
 
-	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
-			$lang = $GLOBALS['sugar_config']['default_language'];
+    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);
-		include($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);
-	}
+        // put the item in the sugar cache.
+        $key = self::getLanguageCacheKey($module,$lang);
+        sugar_cache_put($key,$loaded_mod_strings);
+    }
 
-	/**
-	 * clear out the language cache.
-	 * @param string module_dir the module_dir to clear, if not specified then clear
-	 *                      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)) {
-			$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) {
-				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 ($entry == "." || $entry == "..") continue;
-						foreach($languages as $clean_lang) {
-							LanguageManager::_clearCache($entry, $clean_lang);
-						}
-				}
-				closedir($dir);
-			}
-		}
-	}
+    /**
+     * clear out the language cache.
+     * @param string module_dir the module_dir to clear, if not specified then clear
+     *                      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)) {
+            $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) {
+                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 ($entry == "." || $entry == "..") continue;
+                        foreach($languages as $clean_lang) {
+                            LanguageManager::_clearCache($entry, $clean_lang);
+                        }
+                }
+                closedir($dir);
+            }
+        }
+    }
 
-	/**
-	 * PRIVATE function used within clearLanguageCache so we do not repeat logic
-	 * @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)){
-			$file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
-			if(file_exists($file)){
-				unlink($file);
-				$key = self::getLanguageCacheKey($module_dir,$lang);
-				sugar_cache_clear($key);
-			}
-		}
-	}
+    /**
+     * PRIVATE function used within clearLanguageCache so we do not repeat logic
+     * @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)){
+            $file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
+            if(file_exists($file)){
+                unlink($file);
+                $key = self::getLanguageCacheKey($module_dir,$lang);
+                sugar_cache_clear($key);
+            }
+        }
+    }
 
-	/**
-	 * Given a module, search all of the specified locations, and any others as specified
-	 * in order to refresh the cache file
-	 *
-	 * @param string $module the given module we want to load the vardefs for
-	 * @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){
-		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
-		$lang_paths = array(
-					'modules/'.$module.'/language/'.$lang.'.lang.php',
-					'modules/'.$module.'/language/'.$lang.'.lang.override.php',
-					'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
-					'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
-				 );
+    /**
+     * Given a module, search all of the specified locations, and any others as specified
+     * in order to refresh the cache file
+     *
+     * @param string $module the given module we want to load the vardefs for
+     * @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){
+        // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
+        $lang_paths = array(
+                    'modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'modules/'.$module.'/language/'.$lang.'.lang.override.php',
+                    'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
+                    );
 
-		#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])){
-				$object = $GLOBALS['beanList'][$module];
+        #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])){
+                $object = $GLOBALS['beanList'][$module];
 
-				if ($object == 'aCase')
-		            $object = 'Case';
+                if ($object == 'aCase')
+                    $object = 'Case';
 
-		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
-		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
-					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-					$createdModules[$module] = true;
-		        }
-		}
-		//end of fix #27023
+                if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
+                    $templates = $GLOBALS["dictionary"]["$object"]["templates"];
+                    $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))
-		{
-			$lang_paths = array_merge($lang_paths, $additional_search_paths);
-		}
+        // Add in additional search paths if they were provided.
+        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)){
-				require($path);
-				if(!empty($mod_strings)){
-					if (function_exists('sugarArrayMergeRecursive')){
-						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
-					}
-					else{
-						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
-					}
-				}
-			}
-		}
+        //search a predefined set of locations for the vardef files
+        foreach($lang_paths as $path){
+            if(file_exists($path)){
+                require($path);
+                if(!empty($mod_strings)){
+                    if (function_exists('sugarArrayMergeRecursive')){
+                        $loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
+                    }
+                    else{
+                        $loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
+                    }
+                }
+            }
+        }
 
-		//great! now that we have loaded all of our vardefs.
-		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
-			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
-	}
+        //great! now that we have loaded all of our vardefs.
+        //let's go save them to the cache file.
+        if(!empty($loaded_mod_strings))
+            LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+    }
 
-	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
+    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);
+        // Retrieve the vardefs from cache.
+        $key = self::getLanguageCacheKey($module,$lang);
 
-		if(!$refresh)
-		{
-			$return_result = sugar_cache_retrieve($key);
-			if(!empty($return_result) && is_array($return_result)){
-				return $return_result;
-			}
-		}
+        if(!$refresh)
+        {
+            $return_result = sugar_cache_retrieve($key);
+            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)){
-			LanguageManager::refreshLanguage($module, $lang);
-		}
+        // 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)){
+            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)){
-			global $mod_strings;
+        //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)){
+            global $mod_strings;
 
-			require $cachedfile;
+            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'])){
-				$mod_strings = array_map('translated_prefix', $mod_strings);
-			}
-			return $mod_strings;
-		}
-	}
+            // 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'])){
+                $mod_strings = array_map('translated_prefix', $mod_strings);
+            }
+            return $mod_strings;
+        }
+    }
 
     /**
      * Return the cache key for the module language definition
@@ -274,9 +274,9 @@ 
      * @return string
      */
     public static function getLanguageCacheKey($module, $lang)
-	{
-         return "LanguageManager.$module.$lang";
-	}
+    {
+            return "LanguageManager.$module.$lang";
+    }
 
     /**
      * Remove any cached js language strings.
@@ -302,5 +302,5 @@ 
 }
 
 function translated_prefix($key){
-	return '[translated]' . $key;
+    return '[translated]' . $key;
 }

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;
 }

Braces +28 added lines, -19 removed lines

@@ -56,8 +56,9 @@ 
     	}
 		$temp_mod_strings = $mod_strings;
 		$lang = $current_language;
-        if(empty($lang))
-            $lang = $GLOBALS['sugar_config']['default_language'];
+        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'))){
 			$loaded_mod_strings = array();
@@ -84,7 +85,9 @@ 
 	}
 
 	static function addTemplate($module, $lang, $template){
-		if($template == 'default')$template = 'basic';
+		if($template == 'default') {
+		    $template = 'basic';
+		}
 		$templates = array();
 		$fields = array();
 		if(empty($templates[$template])){
@@ -92,7 +95,7 @@ 
 			if(file_exists($path)){
 				require($path);
 				$templates[$template] = $mod_strings;
-			}else{
+			} else{
 				$path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
 				if(file_exists($path)){
 					require($path);
@@ -106,8 +109,9 @@ 
 	}
 
 	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
-			$lang = $GLOBALS['sugar_config']['default_language'];
+		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);
@@ -140,7 +144,9 @@ 
 			$cache_dir = sugar_cached('modules/');
 			if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
 				while(($entry = readdir($dir)) !== false) {
-					if ($entry == "." || $entry == "..") continue;
+					if ($entry == "." || $entry == "..") {
+					    continue;
+					}
 						foreach($languages as $clean_lang) {
 							LanguageManager::_clearCache($entry, $clean_lang);
 						}
@@ -188,8 +194,9 @@ 
 		if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
 				$object = $GLOBALS['beanList'][$module];
 
-				if ($object == 'aCase')
-		            $object = 'Case';
+				if ($object == 'aCase') {
+						            $object = 'Case';
+				}
 
 		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
 		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
@@ -212,8 +219,7 @@ 
 				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,8 +228,9 @@ 
 
 		//great! now that we have loaded all of our vardefs.
 		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
-			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+		if(!empty($loaded_mod_strings)) {
+					LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+		}
 	}
 
 	static function loadModuleLanguage($module, $lang, $refresh=false){
@@ -256,8 +263,9 @@ 
 			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($mod_strings)) {
+							sugar_cache_put($key,$mod_strings);
+			}
 			if(!empty($_SESSION['translation_mode'])){
 				$mod_strings = array_map('translated_prefix', $mod_strings);
 			}
@@ -292,10 +300,11 @@ 
             unlink($file);
         }
 
-        if( empty($GLOBALS['sugar_config']['js_lang_version']) )
-            $GLOBALS['sugar_config']['js_lang_version'] = 1;
-        else
-            $GLOBALS['sugar_config']['js_lang_version'] += 1;
+        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");
     }

Doc Comments +7 added lines

@@ -105,6 +105,10 @@ 
 		}
 	}
 
+	/**
+	 * @param string $module
+	 * @param string $lang
+	 */
 	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
 		if(empty($lang))
 			$lang = $GLOBALS['sugar_config']['default_language'];
@@ -226,6 +230,9 @@ 
 			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
 	}
 
+	/**
+	 * @param string $module
+	 */
 	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

include/SugarObjects/VardefManager.php

Indentation +7 added lines, -7 removed lines

@@ -89,9 +89,9 @@ 
      */
     public static function setCustomAllowedForModule($module, $enable) {
         if ($enable && isset($custom_disabled_modules[$module])) {
-              unset($custom_disabled_modules[$module]);
+                unset($custom_disabled_modules[$module]);
         } else if (!$enable) {
-              $custom_disabled_modules[$module] = true;
+                $custom_disabled_modules[$module] = true;
         }
     }
 
@@ -236,7 +236,7 @@ 
                     'modules/'.$module.'/vardefs.php',
                     'custom/modules/'.$module.'/Ext/Vardefs/vardefs.ext.php',
                     'custom/Extension/modules/'.$module.'/Ext/Vardefs/vardefs.php'
-                 );
+                    );
 
         // Add in additional search paths if they were provided.
         if(!empty($additional_search_paths) && is_array($additional_search_paths))
@@ -426,10 +426,10 @@ 
             //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)){
-				VardefManager::refreshVardefs($module, $object, null, true, $params);
-			}
+            $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.

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]);
                 }
             }
         }

Braces +44 added lines, -24 removed lines

@@ -96,14 +96,18 @@ 
     }
 
     static function addTemplate($module, $object, $template, $object_name=false){
-        if($template == 'default')$template = 'basic';
+        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'])){
             $table_name = $GLOBALS['dictionary'][$object]['table'];
-        }else{
+        } else{
             $table_name = strtolower($module);
         }
 
@@ -112,7 +116,7 @@ 
             if(file_exists($path)){
                 require($path);
                 $templates[$template] = $vardefs;
-            }else{
+            } else{
                 $path = 'include/SugarObjects/implements/' . $template . '/vardefs.php';
                 if(file_exists($path)){
                     require($path);
@@ -122,12 +126,22 @@ 
         }
        
         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($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 ;
         }
@@ -160,8 +174,9 @@ 
      */
     static function saveCache($module,$object, $additonal_objects= array()){
 
-        if (empty($GLOBALS['dictionary'][$object]))
-            $object = BeanFactory::getObjectName($module);
+        if (empty($GLOBALS['dictionary'][$object])) {
+                    $object = BeanFactory::getObjectName($module);
+        }
         $file = create_cache_directory('modules/' . $module . '/' . $object . 'vardefs.php');
 
         $out="<?php \n \$GLOBALS[\"dictionary\"][\"". $object . "\"]=" . var_export($GLOBALS['dictionary'][$object], true) .";";
@@ -189,7 +204,7 @@ 
         //otherwise go through each module and remove the vardefs.php
         if(!empty($module_dir) && !empty($object_name)){
             VardefManager::_clearCache($module_dir, $object_name);
-        }else{
+        } else{
             global $beanList;
             foreach($beanList as $module_dir => $object_name){
                 VardefManager::_clearCache($module_dir, $object_name);
@@ -308,11 +323,13 @@ 
         }
 
         //Cache link fields for this call in a static variable
-        if (!isset(self::$linkFields))
-            self::$linkFields = array();
+        if (!isset(self::$linkFields)) {
+                    self::$linkFields = array();
+        }
 
-        if (isset(self::$linkFields[$object]))
-            return self::$linkFields[$object];
+        if (isset(self::$linkFields[$object])) {
+                    return self::$linkFields[$object];
+        }
 
         $vardef = $dictionary[$object];
         $links = array();
@@ -335,8 +352,9 @@ 
     {
         $cacheKey = "LFR{$module}{$object}{$relName}";
         $cacheValue = sugar_cache_retrieve($cacheKey);
-        if(!empty($cacheValue))
-            return $cacheValue;
+        if(!empty($cacheValue)) {
+                    return $cacheValue;
+        }
 
         $relLinkFields = self::getLinkFieldsForModule($module, $object);
         $matches = array();
@@ -350,13 +368,15 @@ 
                 }
             }
         }
-        if (empty($matches))
-            return false;
-        if (sizeof($matches) == 1)
-            $results = $matches[0];
-        else
-            //For relationships where both sides are the same module, more than one link will be returned
+        if (empty($matches)) {
+                    return false;
+        }
+        if (sizeof($matches) == 1) {
+                    $results = $matches[0];
+        } else {
+                    //For relationships where both sides are the same module, more than one link will be returned
             $results = $matches;
+        }
 
         sugar_cache_put($cacheKey, $results);
         return $results ;

include/SugarObjects/templates/basic/vardefs.php

Indentation +136 added lines, -136 removed lines

@@ -39,141 +39,141 @@ 
 
 $vardefs = array(  
 'fields' => array (
-	  'id' =>
-	  array (
-	    'name' => 'id',
-	    'vname' => 'LBL_ID',
-	    'type' => 'id',
-	    'required'=>true,
-	    'reportable'=>true,
-	    'comment' => 'Unique identifier',
-		'inline_edit' => false,
-	  ),
-	  'name'=>
-	    array(
-	    'name'=>'name',
-	    'vname'=> 'LBL_NAME',
-	    'type'=>'name',
-	    'link' => true, // bug 39288 
-		'dbType' => 'varchar',
-	    'len'=>255,
+        'id' =>
+        array (
+        'name' => 'id',
+        'vname' => 'LBL_ID',
+        'type' => 'id',
+        'required'=>true,
+        'reportable'=>true,
+        'comment' => 'Unique identifier',
+        'inline_edit' => false,
+        ),
+        'name'=>
+        array(
+        'name'=>'name',
+        'vname'=> 'LBL_NAME',
+        'type'=>'name',
+        'link' => true, // bug 39288 
+        'dbType' => 'varchar',
+        'len'=>255,
         'unified_search' => true,
         'full_text_search' => array('boost' => 3),
         'required'=>true,
-		'importable' => 'required',
+        'importable' => 'required',
         'duplicate_merge' => 'enabled',
         //'duplicate_merge_dom_value' => '3',
         'merge_filter' => 'selected',
-	    ),
-	  'date_entered' =>
-	  array (
-	    'name' => 'date_entered',
-	    'vname' => 'LBL_DATE_ENTERED',
-	    'type' => 'datetime',
-	    'group'=>'created_by_name',
-	    'comment' => 'Date record created',
-	    'enable_range_search' => true,
-	  	'options' => 'date_range_search_dom',
-		'inline_edit' => false,
-	  ),
-	  'date_modified' =>
-	  array (
-	    'name' => 'date_modified',
-	    'vname' => 'LBL_DATE_MODIFIED',
-	    'type' => 'datetime',
-	    'group'=>'modified_by_name',
-	    'comment' => 'Date record last modified',
-	    'enable_range_search' => true,
-	    'options' => 'date_range_search_dom',
-		'inline_edit' => false,
-	  ),
-		'modified_user_id' =>
-	  array (
-	    'name' => 'modified_user_id',
-	    'rname' => 'user_name',
-	    'id_name' => 'modified_user_id',
-	    'vname' => 'LBL_MODIFIED',
-	    'type' => 'assigned_user_name',
-	    'table' => 'users',
-	    'isnull' => 'false',
-	     'group'=>'modified_by_name',
-	    'dbType' => 'id',
-	    'reportable'=>true,
-	    'comment' => 'User who last modified record',
+        ),
+        'date_entered' =>
+        array (
+        'name' => 'date_entered',
+        'vname' => 'LBL_DATE_ENTERED',
+        'type' => 'datetime',
+        'group'=>'created_by_name',
+        'comment' => 'Date record created',
+        'enable_range_search' => true,
+            'options' => 'date_range_search_dom',
+        'inline_edit' => false,
+        ),
+        'date_modified' =>
+        array (
+        'name' => 'date_modified',
+        'vname' => 'LBL_DATE_MODIFIED',
+        'type' => 'datetime',
+        'group'=>'modified_by_name',
+        'comment' => 'Date record last modified',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
+        'inline_edit' => false,
+        ),
+        'modified_user_id' =>
+        array (
+        'name' => 'modified_user_id',
+        'rname' => 'user_name',
+        'id_name' => 'modified_user_id',
+        'vname' => 'LBL_MODIFIED',
+        'type' => 'assigned_user_name',
+        'table' => 'users',
+        'isnull' => 'false',
+            'group'=>'modified_by_name',
+        'dbType' => 'id',
+        'reportable'=>true,
+        'comment' => 'User who last modified record',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),
-	  'modified_by_name' => 
-	  array (
-	    'name' => 'modified_by_name',
-	    'vname' => 'LBL_MODIFIED_NAME',
-	    'type' => 'relate',
-	    'reportable'=>false,
-	    'source'=>'non-db',
-	    'rname'=>'user_name',
-	    'table' => 'users',
-	    'id_name' => 'modified_user_id',
-	    'module'=>'Users',
-	    'link'=>'modified_user_link',
-	    'duplicate_merge'=>'disabled',
+        'inline_edit' => false,
+        ),
+        'modified_by_name' => 
+        array (
+        'name' => 'modified_by_name',
+        'vname' => 'LBL_MODIFIED_NAME',
+        'type' => 'relate',
+        'reportable'=>false,
+        'source'=>'non-db',
+        'rname'=>'user_name',
+        'table' => 'users',
+        'id_name' => 'modified_user_id',
+        'module'=>'Users',
+        'link'=>'modified_user_link',
+        'duplicate_merge'=>'disabled',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),  
-	  'created_by' =>
-	  array (
-	    'name' => 'created_by',
-	    'rname' => 'user_name',
-	    'id_name' => 'modified_user_id',
-	    'vname' => 'LBL_CREATED',
-	    'type' => 'assigned_user_name',
-	    'table' => 'users',
-	    'isnull' => 'false',
-	    'dbType' => 'id',
-	    'group'=>'created_by_name',
-	    'comment' => 'User who created record',
+        'inline_edit' => false,
+        ),  
+        'created_by' =>
+        array (
+        'name' => 'created_by',
+        'rname' => 'user_name',
+        'id_name' => 'modified_user_id',
+        'vname' => 'LBL_CREATED',
+        'type' => 'assigned_user_name',
+        'table' => 'users',
+        'isnull' => 'false',
+        'dbType' => 'id',
+        'group'=>'created_by_name',
+        'comment' => 'User who created record',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),
-	  'created_by_name' =>
-	  array (
-	    'name' => 'created_by_name',
-		'vname' => 'LBL_CREATED',
-		'type' => 'relate',
-		'reportable'=>false,
-	    'link' => 'created_by_link',
-	    'rname' => 'user_name',
-		'source'=>'non-db',
-		'table' => 'users',
-		'id_name' => 'created_by',
-		'module'=>'Users',
-		'duplicate_merge'=>'disabled',
+        'inline_edit' => false,
+        ),
+        'created_by_name' =>
+        array (
+        'name' => 'created_by_name',
+        'vname' => 'LBL_CREATED',
+        'type' => 'relate',
+        'reportable'=>false,
+        'link' => 'created_by_link',
+        'rname' => 'user_name',
+        'source'=>'non-db',
+        'table' => 'users',
+        'id_name' => 'created_by',
+        'module'=>'Users',
+        'duplicate_merge'=>'disabled',
         'importable' => 'false',
         'massupdate' => false,
-		'inline_edit' => false,
-	),
-	  'description' =>
-	  array (
-	    'name' => 'description',
-	    'vname' => 'LBL_DESCRIPTION',
-	    'type' => 'text',
-	    'comment' => 'Full text of the note',
-	    'rows' => 6,
-	    'cols' => 80,
-	  ),
-	  'deleted' =>
-	  array (
-	    'name' => 'deleted',
-	    'vname' => 'LBL_DELETED',
-	    'type' => 'bool',
-	    'default' => '0',
-	    'reportable'=>false,
-	    'comment' => 'Record deletion indicator'
-	  ),
+        'inline_edit' => false,
+    ),
+        'description' =>
+        array (
+        'name' => 'description',
+        'vname' => 'LBL_DESCRIPTION',
+        'type' => 'text',
+        'comment' => 'Full text of the note',
+        'rows' => 6,
+        'cols' => 80,
+        ),
+        'deleted' =>
+        array (
+        'name' => 'deleted',
+        'vname' => 'LBL_DELETED',
+        'type' => 'bool',
+        'default' => '0',
+        'reportable'=>false,
+        'comment' => 'Record deletion indicator'
+        ),
 	    
 /////////////////RELATIONSHIP LINKS////////////////////////////
-	  'created_by_link' =>
-  array (
-     'name' => 'created_by_link',
+        'created_by_link' =>
+    array (
+        'name' => 'created_by_link',
     'type' => 'link',
     'relationship' => strtolower($module) . '_created_by',
     'vname' => 'LBL_CREATED_USER',
@@ -181,9 +181,9 @@ 
     'module'=>'Users',
     'bean_name'=>'User',
     'source'=>'non-db',
-  ),
-  'modified_user_link' =>
-  array (
+    ),
+    'modified_user_link' =>
+    array (
         'name' => 'modified_user_link',
     'type' => 'link',
     'relationship' => strtolower($module). '_modified_user',
@@ -192,21 +192,21 @@ 
     'module'=>'Users',
     'bean_name'=>'User',
     'source'=>'non-db',
-  ),
+    ),
 
 ),
 'indices' => array (
-       'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
-       ),
+        'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
+        ),
 'relationships'=>array(
-	strtolower($module).'_modified_user' =>
-   array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
-   'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'modified_user_id',
-   'relationship_type'=>'one-to-many')
-   ,strtolower($module).'_created_by' =>
-   array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
-   'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'created_by',
-   'relationship_type'=>'one-to-many')
+    strtolower($module).'_modified_user' =>
+    array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
+    'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'modified_user_id',
+    'relationship_type'=>'one-to-many')
+    ,strtolower($module).'_created_by' =>
+    array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
+    'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'created_by',
+    'relationship_type'=>'one-to-many')
 ),
 
 

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/SugarObjects/templates/basic/language/en_us.lang.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 'LBL_MODIFIED_USER'=>'Modified by User',
 'LBL_LIST_NAME'=>'Name',
 'LBL_EDIT_BUTTON' => 'Edit',
- 'LBL_REMOVE' => 'Remove',
+    'LBL_REMOVE' => 'Remove',
 
 
 );
\ No newline at end of file

include/SugarObjects/templates/basic/Basic.php

Indentation +11 added lines, -11 removed lines

@@ -43,16 +43,16 @@
     /** 
      * Constructor
      */
-	public function Basic()
-	{
-		parent::SugarBean();
-	}
+    public function Basic()
+    {
+        parent::SugarBean();
+    }
 
-	/**
-	 * @see SugarBean::get_summary_text()
-	 */
-	public function get_summary_text()
-	{
-		return "$this->name";
-	}
+    /**
+     * @see SugarBean::get_summary_text()
+     */
+    public function get_summary_text()
+    {
+        return "$this->name";
+    }
 }
\ No newline at end of file

include/database/SqlsrvManager.php

Indentation +38 added lines, -38 removed lines

@@ -143,10 +143,10 @@ 
             'url'      => 'nvarchar',
             'encrypt'  => 'nvarchar',
             'file'     => 'nvarchar',
-	        'decimal_tpl' => 'decimal(%d, %d)',
+            'decimal_tpl' => 'decimal(%d, %d)',
     );
 
-	/**
+    /**
      * @see DBManager::connect()
      */
     public function connect(array $configOptions = null, $dieOnError = false)
@@ -203,10 +203,10 @@ 
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
         if(is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
@@ -232,15 +232,15 @@ 
         return $result;
     }
 
-	/**
+    /**
      * @see DBManager::getFieldsArray()
      */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
         $field_array = array();
 
         if ( !$result ) {
-        	return false;
+            return false;
         }
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
@@ -252,16 +252,16 @@ 
         }
 
         return $field_array;
-	}
+    }
 
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        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;
         }
@@ -277,7 +277,7 @@ 
         }
 
         return $row;
-	}
+    }
 
     /**
      * @see DBManager::convert()
@@ -291,7 +291,7 @@ 
             return parent::convert($string, $type, $additional_parameters);
     }
 
-	/**
+    /**
      * Compares two vardefs. Overriding 39098  due to bug: 39098 . IN 6.0 we changed the id columns to dbType = 'id'
      * for example emails_beans.  In 554 the field email_id was nvarchar but in 6.0 since it id dbType = 'id' we would want to alter
      * it to varchar. This code will prevent it.
@@ -317,7 +317,7 @@ 
      */
     public function disconnect()
     {
-    	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
+        $GLOBALS['log']->debug('Calling Mssql::disconnect()');
         if(!empty($this->database)){
             $this->freeResult();
             sqlsrv_close($this->database);
@@ -335,10 +335,10 @@ 
     }
 
 
-	/**
-	 * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
-	 *
-	 * @see MssqlHelper::indexSQL()
+    /**
+     * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
+     *
+     * @see MssqlHelper::indexSQL()
      */
     public function getConstraintSql($indices, $table)
     {
@@ -378,12 +378,12 @@ 
                 $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']);
             }
@@ -488,21 +488,21 @@ 
         return "TRUNCATE TABLE $name";
     }
 
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
         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_DB_CONTEXT'])
+            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;
+            return false;
         }
         $messages = array();
         foreach($errors as $error) {
@@ -515,7 +515,7 @@ 
             }
             $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;

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);

Braces +43 added lines, -31 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -153,16 +155,18 @@ 
     {
         global $sugar_config;
 
-        if (is_null($configOptions))
-            $configOptions = $sugar_config['dbconfig'];
+        if (is_null($configOptions)) {
+                    $configOptions = $sugar_config['dbconfig'];
+        }
 
         //set the connections parameters
         $connect_param = '';
         $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
-        if (empty($configOptions['db_host_instance']))
-            $connect_param = $configOptions['db_host_name'];
-        else
-            $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        if (empty($configOptions['db_host_instance'])) {
+                    $connect_param = $configOptions['db_host_name'];
+        } else {
+                    $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        }
 
         /*
          * Don't try to specifically use a persistent connection
@@ -192,8 +196,9 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
-            $GLOBALS['log']->info("connected to db");
+        if($this->checkError('Could Not Connect:', $dieOnError)) {
+                    $GLOBALS['log']->info("connected to db");
+        }
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
 
@@ -245,8 +250,9 @@ 
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
-                $key = strtolower($key);
+            if($make_lower_case==true) {
+                            $key = strtolower($key);
+            }
 
             $field_array[] = $key;
         }
@@ -259,7 +265,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
@@ -284,11 +292,12 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
-        // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
+        if ( $type == 'datetime') {
+                // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
-        else
-            return parent::convert($string, $type, $additional_parameters);
+        } else {
+                    return parent::convert($string, $type, $additional_parameters);
+        }
     }
 
 	/**
@@ -330,8 +339,9 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
-            sqlsrv_free_stmt($dbResult);
+        if(!empty($dbResult)) {
+                    sqlsrv_free_stmt($dbResult);
+        }
     }
 
 
@@ -377,14 +387,12 @@ 
             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')) ) {
+            } 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')) ) {
+			} elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
             if ( stristr($row['TYPE_NAME'],'identity') ) {
@@ -392,8 +400,9 @@ 
                 $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')))
-                $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            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' ) {
@@ -402,12 +411,13 @@ 
             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) )
-                    $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                else
-                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } else {
+                                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                }
             }
         }
         return $columns;
@@ -495,7 +505,9 @@ 
     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'])

Doc Comments +1 added lines, -1 removed lines

@@ -540,7 +540,7 @@
 
     /**
      * Execute data manipulation statement, then roll it back
-     * @param  $type
+     * @param  string $type
      * @param  $table
      * @param  $query
      * @return string