adamjakab / SuiteCRM

include/Dashlets/DashletGenericChart.php

Indentation +10 added lines, -10 removed lines

@@ -139,7 +139,7 @@ 
      */
     public function setRefreshIcon()
     {
-    	$additionalTitle = '';
+        $additionalTitle = '';
         if($this->isRefreshable)
 
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
@@ -165,9 +165,9 @@ 
     public function displayScript()
     {
 
-		require_once('include/SugarCharts/SugarChartFactory.php');
-		$sugarChart = SugarChartFactory::getInstance();
-		return $sugarChart->getDashletScript($this->id);
+        require_once('include/SugarCharts/SugarChartFactory.php');
+        $sugarChart = SugarChartFactory::getInstance();
+        return $sugarChart->getDashletScript($this->id);
 
     }
 
@@ -272,11 +272,11 @@ 
         $this->getConfigureSmartyInstance()->assign('showClearButton', $this->isConfigPanelClearShown);
         
         if($this->isAutoRefreshable()) {
-       		$this->getConfigureSmartyInstance()->assign('isRefreshable', true);
-			$this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
-			$this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
-			$this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
-		}
+                $this->getConfigureSmartyInstance()->assign('isRefreshable', true);
+            $this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
+            $this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
+            $this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
+        }
 
         return parent::displayOptions() . $this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
     }
@@ -339,7 +339,7 @@ 
             $dashletOffset = 0;
             $module = $_REQUEST['module'];
             if(isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
-            	$dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
+                $dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
             }
         }
 

Braces +59 added lines, -36 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.
@@ -121,10 +123,12 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
-            $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
-            $this->autoRefresh = $options['autoRefresh'];
+        if ( empty($options['title']) ) {
+                    $this->title = $this->dashletStrings['LBL_TITLE'];
+        }
+        if ( isset($options['autoRefresh']) ) {
+                    $this->autoRefresh = $options['autoRefresh'];
+        }
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
@@ -140,8 +144,8 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
-
+        if($this->isRefreshable) {
+        
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
@@ -154,6 +158,7 @@ 
                     translate('LBL_DASHLET_REFRESH', 'Home')
                 )
                 . '</a>';
+        }
         return $additionalTitle;
     }
 
@@ -200,25 +205,32 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach($req as $name => $value) {
+                    if(!is_array($value)) $req[$name] = trim($value);
+        }
 
         foreach($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
-                $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+            }
+            if ( $widgetDef['type'] == 'date') {
+                // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            } elseif ( $widgetDef['type'] == 'time') {
+                // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            } elseif ( $widgetDef['type'] == 'datepicker') {
+                // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif (!empty($req[$widgetDef['name']]))
-                $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            } elseif (!empty($req[$widgetDef['name']])) {
+                            $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            }
         }
 
-        if (!empty($req['dashletTitle']))
-            $options['title'] = $req['dashletTitle'];
+        if (!empty($req['dashletTitle'])) {
+                    $options['title'] = $req['dashletTitle'];
+        }
 
         $options['autoRefresh'] = empty($req['autoRefresh']) ? '0' : $req['autoRefresh'];
 
@@ -241,19 +253,24 @@ 
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
-                        $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    }
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') {
+                        $widgetDef['remove_blank'] = true;
+                    }
+                    // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
-                        $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    if ( empty($widgetDef['input_name0']) ) {
+                                            $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    }
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
-                        $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] ) {
+                                            $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    }
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
-                }
-                else { // ability to create spacers in input fields
+                } else { // ability to create spacers in input fields
                     $currentSearchFields['blank' + $count]['label'] = '';
                     $currentSearchFields['blank' + $count]['input'] = '';
                     $count++;
@@ -289,8 +306,9 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
-            $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        if ( !($this->_seedBean instanceof SugarBean) ) {
+                    $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        }
 
         return $this->_seedBean;
     }
@@ -412,9 +430,14 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if(isset($sortby1[0]) && $sortby1[0]==array()) {
+            unset($sortby1[0]);
+        }
+        //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if($ifsort2==false) {
+            $sortby2=array(0);
+        }
 
         if($keycolname2!=null) {
             $sortby2 = array();
@@ -438,7 +461,9 @@ 
 
         foreach($sortby1 as $sort1) {
             foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
+                if($ifsort2) {
+                    $a=0;
+                }
                 foreach($data_set as $key => $value){
                     if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
                         if($translate1) {
@@ -461,15 +486,13 @@ 
                     if($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
-                    }
-                    else {
+                    } else {
                         $val[$keycolname1] = $sort1;
                     }
                     if($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
-                    }
-                    elseif($keycolname2!=null) {
+                    } elseif($keycolname2!=null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

Spacing +67 added lines, -67 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.
@@ -59,7 +59,7 @@ 
     /**
      * @see Dashlet::$isRefreshable
      */
-    public $isRefreshable  = true;
+    public $isRefreshable = true;
 
     /**
      * location of smarty template file for configuring
@@ -105,15 +105,15 @@ 
     {
         parent::__construct($id);
 
-        if ( isset($options) ) {
-            foreach ( $options as $key => $value ) {
+        if (isset($options)) {
+            foreach ($options as $key => $value) {
                 $this->$key = $value;
             }
         }
 
         // load searchfields
         $classname = get_class($this);
-        if ( is_file("modules/Charts/Dashlets/$classname/$classname.data.php") ) {
+        if (is_file("modules/Charts/Dashlets/$classname/$classname.data.php")) {
             require("modules/Charts/Dashlets/$classname/$classname.data.php");
             $this->_searchFields = $dashletData[$classname]['searchFields'];
         }
@@ -121,16 +121,16 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
+        if (empty($options['title']))
             $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
+        if (isset($options['autoRefresh']))
             $this->autoRefresh = $options['autoRefresh'];
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
         // fake a reporter object here just to pass along the db type used in many widgets.
         // this should be taken out when sugarwidgets change
-        $temp = (object) array('db' => &$GLOBALS['db'], 'report_def_str' => '');
+        $temp = (object)array('db' => &$GLOBALS['db'], 'report_def_str' => '');
         $this->layoutManager->setAttributePtr('reporter', $temp);
     }
 
@@ -140,14 +140,14 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
+        if ($this->isRefreshable)
 
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
                 . SugarThemeRegistry::current()->getImage(
                     'dashlet-header-refresh',
-                    'border="0" align="absmiddle" title="'. translate('LBL_DASHLET_REFRESH', 'Home') . '"',
+                    'border="0" align="absmiddle" title="'.translate('LBL_DASHLET_REFRESH', 'Home').'"',
                     null,
                     null,
                     '.gif',
@@ -177,7 +177,7 @@ 
      */
     protected function getConfigureSmartyInstance()
     {
-        if ( !($this->_configureSS instanceof Sugar_Smarty) ) {
+        if (!($this->_configureSS instanceof Sugar_Smarty)) {
 
             $this->_configureSS = new Sugar_Smarty();
         }
@@ -200,18 +200,18 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach ($req as $name => $value)
+            if (!is_array($value)) $req[$name] = trim($value);
 
-        foreach($this->_searchFields as $name => $params) {
+        foreach ($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
+            if (isset($this->getSeedBean()->field_defs[$name]))
                 $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ($widgetDef['type'] == 'date')           // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            elseif ($widgetDef['type'] == 'time')       // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            elseif ($widgetDef['type'] == 'datepicker') // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
             elseif (!empty($req[$widgetDef['name']]))
                 $options[$widgetDef['name']] = $req[$widgetDef['name']];
@@ -234,36 +234,36 @@ 
     {
         $currentSearchFields = array();
 
-        if ( is_array($this->_searchFields) ) {
-            foreach($this->_searchFields as $name=>$params) {
-                if(!empty($name)) {
+        if (is_array($this->_searchFields)) {
+            foreach ($this->_searchFields as $name=>$params) {
+                if (!empty($name)) {
                     $name = strtolower($name);
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
+                    if (isset($this->getSeedBean()->field_defs[$name]))
                         $widgetDef = $this->getSeedBean()->field_defs[$name];
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if ($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
+                    if (empty($widgetDef['input_name0']))
                         $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
+                    if ($currentSearchFields[$name]['label'] == $widgetDef['vname'])
                         $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
                 }
                 else { // ability to create spacers in input fields
-                    $currentSearchFields['blank' + $count]['label'] = '';
-                    $currentSearchFields['blank' + $count]['input'] = '';
+                    $currentSearchFields['blank' +$count]['label'] = '';
+                    $currentSearchFields['blank' +$count]['input'] = '';
                     $count++;
                 }
             }
         }
         $this->currentSearchFields = $currentSearchFields;
-        $this->getConfigureSmartyInstance()->assign('title',translate('LBL_TITLE','Charts'));
-        $this->getConfigureSmartyInstance()->assign('save',$GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']);
-        $this->getConfigureSmartyInstance()->assign('clear',$GLOBALS['app_strings']['LBL_CLEAR_BUTTON_LABEL']);
+        $this->getConfigureSmartyInstance()->assign('title', translate('LBL_TITLE', 'Charts'));
+        $this->getConfigureSmartyInstance()->assign('save', $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']);
+        $this->getConfigureSmartyInstance()->assign('clear', $GLOBALS['app_strings']['LBL_CLEAR_BUTTON_LABEL']);
         $this->getConfigureSmartyInstance()->assign('id', $this->id);
         $this->getConfigureSmartyInstance()->assign('searchFields', $this->currentSearchFields);
         $this->getConfigureSmartyInstance()->assign('dashletTitle', $this->title);
@@ -271,14 +271,14 @@ 
         $this->getConfigureSmartyInstance()->assign('module', $_REQUEST['module']);
         $this->getConfigureSmartyInstance()->assign('showClearButton', $this->isConfigPanelClearShown);
 
-        if($this->isAutoRefreshable()) {
+        if ($this->isAutoRefreshable()) {
        		$this->getConfigureSmartyInstance()->assign('isRefreshable', true);
 			$this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
 			$this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
 			$this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
 		}
 
-        return parent::displayOptions() . $this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
+        return parent::displayOptions().$this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
+        if (!($this->_seedBean instanceof SugarBean))
             $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
 
         return $this->_seedBean;
@@ -322,7 +322,7 @@ 
      */
     public function display()
     {
-        return parent::display() . $this->processAutoRefresh();
+        return parent::display().$this->processAutoRefresh();
     }
 
     /**
@@ -335,28 +335,28 @@ 
     {
         global $sugar_config;
 
-        if ( empty($dashletOffset) ) {
+        if (empty($dashletOffset)) {
             $dashletOffset = 0;
             $module = $_REQUEST['module'];
-            if(isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
+            if (isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
             	$dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
             }
         }
 
-        if ( !$this->isRefreshable ) {
+        if (!$this->isRefreshable) {
             return '';
         }
-        if ( !empty($sugar_config['dashlet_auto_refresh_min']) && $sugar_config['dashlet_auto_refresh_min'] == -1 ) {
+        if (!empty($sugar_config['dashlet_auto_refresh_min']) && $sugar_config['dashlet_auto_refresh_min'] == -1) {
             return '';
         }
         $autoRefreshSS = new Sugar_Smarty();
         $autoRefreshSS->assign('dashletOffset', $dashletOffset);
         $autoRefreshSS->assign('dashletId', $this->id);
-        $autoRefreshSS->assign('strippedDashletId', str_replace("-","",$this->id)); //javascript doesn't like "-" in function names
+        $autoRefreshSS->assign('strippedDashletId', str_replace("-", "", $this->id)); //javascript doesn't like "-" in function names
         $autoRefreshSS->assign('dashletRefreshInterval', $this->getAutoRefresh());
         $autoRefreshSS->assign('url', "predefined_chart");
         $tpl = 'include/Dashlets/DashletGenericAutoRefresh.tpl';
-        if ( $_REQUEST['action'] == "DynamicAction" ) {
+        if ($_REQUEST['action'] == "DynamicAction") {
             $tpl = 'include/Dashlets/DashletGenericAutoRefreshDynamic.tpl';
         }
 
@@ -372,7 +372,7 @@ 
 
         $row = $db->fetchByAssoc($result);
 
-        while ($row != null){
+        while ($row != null) {
             $dataSet[] = $row;
             $row = $db->fetchByAssoc($result);
         }
@@ -392,19 +392,19 @@ 
     bool $ifsort2                 Whether to sort by the second column or just translate the second column.
      * @return        The sorted and translated data.
      */
-    function sortData($data_set, $keycolname1=null, $translate1=false, $keycolname2=null, $translate2=false, $ifsort2=false) {
+    function sortData($data_set, $keycolname1 = null, $translate1 = false, $keycolname2 = null, $translate2 = false, $ifsort2 = false) {
         //You can set whether the columns need to be translated or sorted. It the column needn't to be translated, the sorting must be done in SQL, this function will not do the sorting.
         global $app_list_strings;
         $sortby1[] = array();
         foreach ($data_set as $row) {
-            $sortby1[]  = $row[$keycolname1];
+            $sortby1[] = $row[$keycolname1];
         }
         $sortby1 = array_unique($sortby1);
         //The data is from the database, the sorting should be done in the sql. So I will not do the sort here.
-        if($translate1) {
+        if ($translate1) {
             $temp_sortby1 = array();
-            foreach(array_keys($app_list_strings[$keycolname1.'_dom']) as $sortby1_value) {
-                if(in_array($sortby1_value, $sortby1)) {
+            foreach (array_keys($app_list_strings[$keycolname1.'_dom']) as $sortby1_value) {
+                if (in_array($sortby1_value, $sortby1)) {
                     $temp_sortby1[] = $sortby1_value;
                 }
             }
@@ -412,21 +412,21 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if (isset($sortby1[0]) && $sortby1[0] == array()) unset($sortby1[0]); //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if ($ifsort2 == false) $sortby2 = array(0);
 
-        if($keycolname2!=null) {
+        if ($keycolname2 != null) {
             $sortby2 = array();
             foreach ($data_set as $row) {
-                $sortby2[]  = $row[$keycolname2];
+                $sortby2[] = $row[$keycolname2];
             }
             //The data is from the database, the sorting should be done in the sql. So I will not do the sort here.
             $sortby2 = array_unique($sortby2);
-            if($translate2) {
+            if ($translate2) {
                 $temp_sortby2 = array();
-                foreach(array_keys($app_list_strings[$keycolname2.'_dom']) as $sortby2_value) {
-                    if(in_array($sortby2_value, $sortby2)) {
+                foreach (array_keys($app_list_strings[$keycolname2.'_dom']) as $sortby2_value) {
+                    if (in_array($sortby2_value, $sortby2)) {
                         $temp_sortby2[] = $sortby2_value;
                     }
                 }
@@ -434,42 +434,42 @@ 
             }
         }
 
-        $data=array();
+        $data = array();
 
-        foreach($sortby1 as $sort1) {
-            foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
-                foreach($data_set as $key => $value){
-                    if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
-                        if($translate1) {
+        foreach ($sortby1 as $sort1) {
+            foreach ($sortby2 as $sort2) {
+                if ($ifsort2) $a = 0;
+                foreach ($data_set as $key => $value) {
+                    if ($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2] == $sort2)) {
+                        if ($translate1) {
                             $value[$keycolname1.'_dom_option'] = $value[$keycolname1];
                             $value[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$value[$keycolname1]];
                         }
-                        if($translate2) {
+                        if ($translate2) {
                             $value[$keycolname2.'_dom_option'] = $value[$keycolname2];
                             $value[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$value[$keycolname2]];
                         }
                         array_push($data, $value);
                         unset($data_set[$key]);
-                        $a=1;
+                        $a = 1;
                     }
                 }
-                if($ifsort2 && $a==0) {//Add 0 for sorting by the second column, if the first row doesn't have a certain col, it will fill the column with 0.
-                    $val=array();
+                if ($ifsort2 && $a == 0) {//Add 0 for sorting by the second column, if the first row doesn't have a certain col, it will fill the column with 0.
+                    $val = array();
                     $val['total'] = 0;
                     $val['count'] = 0;
-                    if($translate1) {
+                    if ($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
                     }
                     else {
                         $val[$keycolname1] = $sort1;
                     }
-                    if($translate2) {
+                    if ($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
                     }
-                    elseif($keycolname2!=null) {
+                    elseif ($keycolname2 != null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

include/Dashlets/DashletCacheBuilder.php

Spacing +7 added lines, -7 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.
@@ -64,28 +64,28 @@ 
         $cacheDir = create_cache_directory('dashlets/');
         $allDashlets = array_merge($dashletFiles, $dashletFilesCustom);
         $dashletFiles = array();
-        foreach($allDashlets as $num => $file) {
-            if(substr_count($file, '.meta') == 0) { // ignore meta data files
+        foreach ($allDashlets as $num => $file) {
+            if (substr_count($file, '.meta') == 0) { // ignore meta data files
                 $class = substr($file, strrpos($file, '/') + 1, -4);
                 $dashletFiles[$class] = array();
                 $dashletFiles[$class]['file'] = $file;
                 $dashletFiles[$class]['class'] = $class;
-                if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
+                if (is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
+                    if (isset($dashletMeta[$class]['module']))
                         $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
                 }
                 
                 $filesInDirectory = array();
                 getFiles($filesInDirectory, substr($file, 0, strrpos($file, '/')), '/^.*\/Dashlets\/[^\.]*\.icon\.(jpg|jpeg|gif|png)$/i');
-                if(!empty($filesInDirectory)) {
+                if (!empty($filesInDirectory)) {
                     $dashletFiles[$class]['icon'] = $filesInDirectory[0]; // take the first icon we see
                 }
             }
         }
         
-        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir . 'dashlets.php');
+        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir.'dashlets.php');
     }
 }
 ?>
\ No newline at end of file

Braces +6 added lines, -3 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.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();

include/Dashlets/DashletRssFeedTitle.php

Indentation +65 added lines, -65 removed lines

@@ -43,79 +43,79 @@
  * Created: Sep 12, 2011
  */
 class DashletRssFeedTitle {
-	public $defaultEncoding = "UTF-8";
-	public $readBytes = 8192;
-	public $url;
-	public $cut = 70;
-	public $contents = "";
-	public $title = "";
-	public $endWith = "...";
-	public $xmlEncoding = false;
-	public $fileOpen = false;
+    public $defaultEncoding = "UTF-8";
+    public $readBytes = 8192;
+    public $url;
+    public $cut = 70;
+    public $contents = "";
+    public $title = "";
+    public $endWith = "...";
+    public $xmlEncoding = false;
+    public $fileOpen = false;
 
-	public function __construct($url) {
-		$this->url = $url;
-	}
+    public function __construct($url) {
+        $this->url = $url;
+    }
 
-	public function generateTitle() {
-		if ($this->readFeed()) {
-			$this->getTitle();
-			if (!empty($this->title)) {
-				$this->convertEncoding();
-				$this->cutLength();
-			}
-		}
-		return $this->title;
-	}
+    public function generateTitle() {
+        if ($this->readFeed()) {
+            $this->getTitle();
+            if (!empty($this->title)) {
+                $this->convertEncoding();
+                $this->cutLength();
+            }
+        }
+        return $this->title;
+    }
 
-	/**
-	 * @todo use curl with waiting timeout instead of fopen
-	 */
-	public function readFeed() {
-		if ($this->url) {
+    /**
+     * @todo use curl with waiting timeout instead of fopen
+     */
+    public function readFeed() {
+        if ($this->url) {
                     if (!in_array(strtolower(parse_url($this->url, PHP_URL_SCHEME)), array("http", "https"), true)) {
                         return false;
                     }
-			$fileOpen = @fopen($this->url, 'r');
-			if ($fileOpen) {
-				$this->fileOpen = true;
-				$this->contents = fread($fileOpen, $this->readBytes);
-				fclose($fileOpen);
-				return true;
-			}
-		}
-		return false;
-	}
+            $fileOpen = @fopen($this->url, 'r');
+            if ($fileOpen) {
+                $this->fileOpen = true;
+                $this->contents = fread($fileOpen, $this->readBytes);
+                fclose($fileOpen);
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 */
-	public function getTitle() {
-		$matches = array ();
-		preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
-		}
-	}
+    /**
+     *
+     */
+    public function getTitle() {
+        $matches = array ();
+        preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
+        }
+    }
 
-	public function cutLength() {
-		if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
-			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
-		}
-	}
+    public function cutLength() {
+        if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
+            $this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
+        }
+    }
 
-	private function _identifyXmlEncoding() {
-		$matches = array ();
-		preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
-		}
-	}
+    private function _identifyXmlEncoding() {
+        $matches = array ();
+        preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
+        }
+    }
 
-	public function convertEncoding() {
-		$this->_identifyXmlEncoding();
-		if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
-			$this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
-		}
-	}
+    public function convertEncoding() {
+        $this->_identifyXmlEncoding();
+        if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
+            $this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 	 *
 	 */
 	public function getTitle() {
-		$matches = array ();
+		$matches = array();
 		preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
 		if (isset($matches[0])) {
 			$this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
@@ -100,12 +100,12 @@ 
 
 	public function cutLength() {
 		if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
-			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
+			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding).$this->endWith;
 		}
 	}
 
 	private function _identifyXmlEncoding() {
-		$matches = array ();
+		$matches = array();
 		preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
 		if (isset($matches[0])) {
 			$this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');

include/Smarty/plugins/function.sugar_number_format.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
     
-	if(!isset($params['var']) || $params['var'] === '') {  
+    if(!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 

Spacing +2 added lines, -2 removed lines

@@ -37,11 +37,11 @@
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
     
-	if(!isset($params['var']) || $params['var'] === '') {  
+	if (!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 
-    if ( !isset($params['precision']) ) {
+    if (!isset($params['precision'])) {
         $params['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits');
     }
 

include/Smarty/plugins/modifier.wordwrap.php

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
  * @param boolean
  * @return string
  */
-function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false)
+function smarty_modifier_wordwrap($string, $length = 80, $break = "\n", $cut = false)
 {
-    return wordwrap($string,$length,$break,$cut);
+    return wordwrap($string, $length, $break, $cut);
 }
 
 ?>

include/Smarty/plugins/function.html_options.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
  */
 function smarty_function_html_options($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
     
     $name = null;
     $values = null;
@@ -39,8 +39,8 @@ 
     
     $extra = '';
     
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
                 $$_key = (string)$_val;
                 break;
@@ -59,7 +59,7 @@ 
                 break;
                 
             default:
-                if(!is_array($_val)) {
+                if (!is_array($_val)) {
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
                     $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -87,8 +87,8 @@ 
 
     }
 
-    if(!empty($name)) {
-        $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+    if (!empty($name)) {
+        $_html_result = '<select name="'.$name.'"'.$extra.'>'."\n".$_html_result.'</select>'."\n";
     }
 
     return $_html_result;
@@ -96,12 +96,12 @@ 
 }
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
-    if(!is_array($value)) {
-        $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
-            smarty_function_escape_special_chars($key) . '"';
+    if (!is_array($value)) {
+        $_html_result = '<option label="'.smarty_function_escape_special_chars($value).'" value="'.
+            smarty_function_escape_special_chars($key).'"';
         if (in_array((string)$key, $selected))
             $_html_result .= ' selected="selected"';
-        $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
+        $_html_result .= '>'.smarty_function_escape_special_chars($value).'</option>'."\n";
     } else {
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
     }
@@ -109,7 +109,7 @@ 
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+    $optgroup_html = '<optgroup label="'.smarty_function_escape_special_chars($key).'">'."\n";
     foreach ($values as $key => $value) {
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
     }

Braces +10 added lines, -6 removed lines

@@ -68,15 +68,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = '';
 
     if (isset($options)) {
         
-        foreach ($options as $_key=>$_val)
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        }
 
     } else {
         
@@ -99,8 +102,9 @@ 
     if(!is_array($value)) {
         $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
             smarty_function_escape_special_chars($key) . '"';
-        if (in_array((string)$key, $selected))
-            $_html_result .= ' selected="selected"';
+        if (in_array((string)$key, $selected)) {
+                    $_html_result .= ' selected="selected"';
+        }
         $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
     } else {
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);

include/Smarty/plugins/block.nocache.php

Indentation +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 //implements Smarty 3 style {nocache}{/nocache} block to prevent caching of a section of a template.
 //remove this upon upgrade to Smarty 3
 function smarty_block_nocache($param, $content, &$smarty) {
-   return $content;
+    return $content;
 } 
 ?>
\ No newline at end of file

include/Smarty/plugins/function.html_radios.php

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
  */
 function smarty_function_html_radios($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
    
     $name = 'radio';
     $values = null;
@@ -52,8 +52,8 @@ 
     $output = null;
     $extra = '';
 
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string)$_val;
@@ -61,8 +61,8 @@ 
 
             case 'checked':
             case 'selected':
-                if(is_array($_val)) {
-                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                if (is_array($_val)) {
+                    $smarty->trigger_error('html_radios: the "'.$_key.'" attribute cannot be an array', E_USER_WARNING);
                 } else {
                     $selected = (string)$_val;
                 }
@@ -91,7 +91,7 @@ 
                 break;
 
             default:
-                if(!is_array($_val)) {
+                if (!is_array($_val)) {
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
                     $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -119,10 +119,10 @@ 
 
     }
 
-    if(!empty($params['assign'])) {
+    if (!empty($params['assign'])) {
         $smarty->assign($params['assign'], $_html_result);
     } else {
-        return implode("\n",$_html_result);
+        return implode("\n", $_html_result);
     }
 
 }
@@ -130,25 +130,25 @@ 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
     if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
+      if ($label_ids) {
+          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name.'_'.$value));
+          $_output .= '<label for="'.$_id.'">';
       } else {
           $_output .= '<label>';           
       }
    }
    $_output .= '<input type="radio" name="'
-        . smarty_function_escape_special_chars($name) . '" value="'
-        . smarty_function_escape_special_chars($value) . '"';
+        . smarty_function_escape_special_chars($name).'" value="'
+        . smarty_function_escape_special_chars($value).'"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+   if ($labels && $label_ids) $_output .= ' id="'.$_id.'"';
 
-    if ((string)$value==$selected) {
+    if ((string)$value == $selected) {
         $_output .= ' checked="checked"';
     }
-    $_output .= $extra . ' />' . $output;
+    $_output .= $extra.' />'.$output;
     if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
+    $_output .= $separator;
 
     return $_output;
 }

Braces +13 added lines, -6 removed lines

@@ -100,15 +100,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
 
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        }
 
     } else {
 
@@ -141,13 +144,17 @@ 
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+   if ($labels && $label_ids) {
+       $_output .= ' id="' . $_id . '"';
+   }
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
+    if ($labels) {
+        $_output .= '</label>';
+    }
     $_output .=  $separator;
 
     return $_output;

Indentation +9 added lines, -9 removed lines

@@ -130,18 +130,18 @@
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
     if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
-      } else {
-          $_output .= '<label>';           
-      }
-   }
-   $_output .= '<input type="radio" name="'
+        if($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';           
+        }
+    }
+    $_output .= '<input type="radio" name="'
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';

include/Smarty/plugins/function.sugar_getimage.php

Indentation +19 added lines, -19 removed lines

@@ -53,28 +53,28 @@
 
 function smarty_function_sugar_getimage($params, &$smarty) {
 
-	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+    // error checking for required parameters
+    if(!isset($params['name'])) 
+        $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
 
-	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
-		$params['attr'] = $params['other_attributes'];
+    // temp hack to deprecate the use of other_attributes
+    if(isset($params['other_attributes']))
+        $params['attr'] = $params['other_attributes'];
 
-	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['width']))
-		$params['width'] = null;
-	if(!isset($params['height']))
-		$params['height'] = null;
-	if(!isset($params['alt'])) 
-		$params['alt'] = '';
+    // set defaults
+    if(!isset($params['attr']))
+        $params['attr'] = '';
+    if(!isset($params['width']))
+        $params['width'] = null;
+    if(!isset($params['height']))
+        $params['height'] = null;
+    if(!isset($params['alt'])) 
+        $params['alt'] = '';
 
-	// deprecated ?
-	if(!isset($params['ext']))
-		$params['ext'] = null;
+    // deprecated ?
+    if(!isset($params['ext']))
+        $params['ext'] = null;
 
-	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
+    return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
 }
 ?>

Spacing +8 added lines, -8 removed lines

@@ -54,25 +54,25 @@
 function smarty_function_sugar_getimage($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	if (!isset($params['name'])) 
+		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'].'name');
 
 	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
+	if (isset($params['other_attributes']))
 		$params['attr'] = $params['other_attributes'];
 
 	// set defaults
-	if(!isset($params['attr']))
+	if (!isset($params['attr']))
 		$params['attr'] = '';
-	if(!isset($params['width']))
+	if (!isset($params['width']))
 		$params['width'] = null;
-	if(!isset($params['height']))
+	if (!isset($params['height']))
 		$params['height'] = null;
-	if(!isset($params['alt'])) 
+	if (!isset($params['alt'])) 
 		$params['alt'] = '';
 
 	// deprecated ?
-	if(!isset($params['ext']))
+	if (!isset($params['ext']))
 		$params['ext'] = null;
 
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	

Braces +21 added lines, -14 removed lines

@@ -54,26 +54,33 @@
 function smarty_function_sugar_getimage($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	if(!isset($params['name'])) {
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	}
 
 	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
-		$params['attr'] = $params['other_attributes'];
+	if(isset($params['other_attributes'])) {
+			$params['attr'] = $params['other_attributes'];
+	}
 
 	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['width']))
-		$params['width'] = null;
-	if(!isset($params['height']))
-		$params['height'] = null;
-	if(!isset($params['alt'])) 
-		$params['alt'] = '';
+	if(!isset($params['attr'])) {
+			$params['attr'] = '';
+	}
+	if(!isset($params['width'])) {
+			$params['width'] = null;
+	}
+	if(!isset($params['height'])) {
+			$params['height'] = null;
+	}
+	if(!isset($params['alt'])) {
+			$params['alt'] = '';
+	}
 
 	// deprecated ?
-	if(!isset($params['ext']))
-		$params['ext'] = null;
+	if(!isset($params['ext'])) {
+			$params['ext'] = null;
+	}
 
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
 }