adamjakab / SuiteCRM

include/MVC/Controller/file_access_control_map.php

Indentation +24 added lines, -24 removed lines

@@ -46,29 +46,29 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $file_access_control_map = array(
-	'modules' => array(
-		'administration' => array(
-			'actions' => array(
-				'backups',
-				'updater',
-			),
-			'links'	=> array(
-				'update',
-				'backup_management',
-				'upgrade_wizard',
-				'moduleBuilder',
-			),
-		),
-		'upgradewizard' => array(
-				'actions' => array(
-					'index',
-				),
-		),
-		'modulebuilder' => array(
-				'actions' => array(
-					'index' => array('params' => array('type' => array('mb'))),
-				),
-		),
-	)
+    'modules' => array(
+        'administration' => array(
+            'actions' => array(
+                'backups',
+                'updater',
+            ),
+            'links'	=> array(
+                'update',
+                'backup_management',
+                'upgrade_wizard',
+                'moduleBuilder',
+            ),
+        ),
+        'upgradewizard' => array(
+                'actions' => array(
+                    'index',
+                ),
+        ),
+        'modulebuilder' => array(
+                'actions' => array(
+                    'index' => array('params' => array('type' => array('mb'))),
+                ),
+        ),
+    )
 );
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 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.

Braces +3 added lines, -1 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.

include/javascript/getYUIComboFile.php

Indentation +23 added lines, -23 removed lines

@@ -42,13 +42,13 @@ 
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
-	"2_9_0" => "include/javascript/yui",
-	"3.3.0" => "include/javascript/yui3",
-	"3_3_0" => "include/javascript/yui3"
+    "2_9_0" => "include/javascript/yui",
+    "3.3.0" => "include/javascript/yui3",
+    "3_3_0" => "include/javascript/yui3"
 );
 $types = array(
     "js" => "application/javascript",
-	"css" => "text/css",
+    "css" => "text/css",
 );
 $out = "";
 
@@ -57,36 +57,36 @@ 
 
 foreach ($_REQUEST as $param => $val)
 {
-	//No backtracking in the path
-	if (strpos($param, "..") !== false)
+    //No backtracking in the path
+    if (strpos($param, "..") !== false)
         continue;
 
-	$version = explode("/", $param);
-	$version = $version[0];
+    $version = explode("/", $param);
+    $version = $version[0];
     if (empty($yui_path[$version])) continue;
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
-	$extension = substr($path, strrpos($path, "_") + 1);
+    $extension = substr($path, strrpos($path, "_") + 1);
 
-	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+    //Only allowed file extensions
+    if (empty($types[$extension]))
+        continue;
 
-	if (empty($contentType))
+    if (empty($contentType))
     {
         $contentType = $types[$extension];
     }
-	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
-	$contents = '';
-	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
-	}
-	$path = empty($contents) ? $path : $contents;
-	$allpath .= md5($path);
+    //Put together the final filepath
+    $path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+    $contents = '';
+    if (is_file($path)) {
+        $out .= "/*" . $path . "*/\n";
+        $contents =  file_get_contents($path);
+        $out .= $contents . "\n";
+    }
+    $path = empty($contents) ? $path : $contents;
+    $allpath .= md5($path);
 }
 
 $etag = '"'.md5($allpath).'"';

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.
@@ -65,7 +65,7 @@ 
 	$version = $version[0];
     if (empty($yui_path[$version])) continue;
 
-    $path = $yui_path[$version] . substr($param, strlen($version));
+    $path = $yui_path[$version].substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
@@ -78,12 +78,12 @@ 
         $contentType = $types[$extension];
     }
 	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+	$path = substr($path, 0, strrpos($path, "_")).".".$extension;
 	$contents = '';
 	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
+	   $out .= "/*".$path."*/\n";
+	   $contents = file_get_contents($path);
+	   $out .= $contents."\n";
 	}
 	$path = empty($contents) ? $path : $contents;
 	$allpath .= md5($path);
@@ -95,6 +95,6 @@ 
 header("Cache-Control: private");
 header("Pragma: dummy=bogus");
 header("Etag: $etag");
-header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
+header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
 header("Content-Type: $contentType");
 echo ($out);
\ No newline at end of file

Braces +15 added lines, -7 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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

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

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::Dashlet($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);

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

Doc Comments +6 added lines

@@ -364,6 +364,10 @@ 
     }
 
     //Added as the rgraph charts do not use SugarCharts and this is where this method was previously
+
+    /**
+     * @param string $query
+     */
     function getChartData($query)
     {
         global $app_list_strings, $db;
@@ -390,6 +394,8 @@ 
     string $keycolname1      We will sort by this key secondly, and  it can be null, then it will only sort by the first column.
     bool $translate1            Whether to trabslate the second column
     bool $ifsort2                 Whether to sort by the second column or just translate the second column.
+    * @param string $keycolname1
+    * @param string $keycolname2
      * @return        The sorted and translated data.
      */
     function sortData($data_set, $keycolname1=null, $translate1=false, $keycolname2=null, $translate2=false, $ifsort2=false) {

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/SugarPHPMailer.php

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -67,7 +67,7 @@ 
 		$admin = new Administration();
 		$admin->retrieveSettings();
 
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+		if (isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
 			$this->disclosureEnabled = true;
 			$this->disclosureText = $admin->settings['disclosure_text'];
 		}
@@ -76,14 +76,14 @@ 
 		$this->oe->getUserMailerSettings($current_user);
 
 		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+		$this->PluginDir = 'include/phpmailer/';
+		$this->Mailer = 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
-        $this->IsHTML(false);  // default to plain-text email
+		$this->Encoding = 'quoted-printable';
+        $this->IsHTML(false); // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
-        $this->WordWrap		= 996;
+        $this->WordWrap = 996;
 		// cn: gmail fix
 		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
@@ -103,7 +103,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -116,7 +116,7 @@ 
             	$this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -137,7 +137,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -149,7 +149,7 @@ 
             if ($oe->mail_smtpssl == 2) {
             	$this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -223,31 +223,31 @@ 
 	function prepForOutbound() {
 		global $locale;
 
-		if($this->preppedForOutbound == false) {
+		if ($this->preppedForOutbound == false) {
 			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
 			//$this->preppedForOutbound = true; // flag so we don't redo this
 			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
 
 			// handle disclosure
-			if($this->disclosureEnabled) {
+			if ($this->disclosureEnabled) {
 				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
 				$this->AltBody .= "\r\r{$this->disclosureText}";
 			}
 
 			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
-            $subjectUTF8		= from_html(trim($this->Subject));
-            $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
-            $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+			$this->Body = from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+			$this->AltBody = from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            $subjectUTF8 = from_html(trim($this->Subject));
+            $subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+            $this->Subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
 			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+			if ($this->ContentType == "text/html") {
+				if (strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+					$head = <<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -263,7 +263,7 @@ 
 			// Headers /////////////////////////////////
 			// the below is done in PHPMailer::CreateHeader();
 			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+			$this->FromName = $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
 			/*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
@@ -296,14 +296,14 @@ 
 	{
 		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
 		$i = 0;
-        foreach($matches[2] as $match) {
+        foreach ($matches[2] as $match) {
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
+			if (!file_exists($file_location)) continue;
+			if ($object) {
+			    if (preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+			        switch (strtolower($typematch[1])) {
 			            case 'documents':
 			                $beanname = 'DocumentRevisions';
 			                break;
@@ -313,10 +313,10 @@ 
 			        }
 			    }
 			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
+			    if (isset($beanname)) {
 			        $bean = SugarModule::get($beanname)->loadBean();
     			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
+    			    if (!empty($bean->id)) {
         			    $mime_type = $bean->file_mime_type;
         			    $filename = $bean->filename;
     			    }
@@ -330,7 +330,7 @@ 
 		    $i++;
         }
 		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+		$this->Body = preg_replace("|\"$regex|i", '"cid:', $this->Body);
 		// remove bad img line from outbound email
 		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
 	}
@@ -345,7 +345,7 @@ 
 		$this->ClearAttachments();
 
 		//replace references to cache/images with cid tag
-        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
+        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';', '="cid:', $this->Body);
 
 		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
 
@@ -356,13 +356,13 @@ 
 				return;
 		}
 		//Handle regular attachments.
-		foreach($notes as $note) {
+		foreach ($notes as $note) {
 				$mime_type = 'text/plain';
 				$file_location = '';
 				$filename = '';
 
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+				if ($note->object_name == 'Note') {
+					if (!empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
 						$file_location = $note->file->temp_file_location;
 						$filename = $note->file->original_file_name;
 						$mime_type = $note->file->mime_type;
@@ -371,7 +371,7 @@ 
 						$filename = $note->id.$note->filename;
 						$mime_type = $note->file_mime_type;
 					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
+				} elseif ($note->object_name == 'DocumentRevision') { // from Documents
 					$filename = $note->id.$note->filename;
 					$file_location = "upload://$filename";
 					$mime_type = $note->file_mime_type;
@@ -397,7 +397,7 @@ 
 		$connection = parent::SmtpConnect();
 		if (!$connection) {
 			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
+			if (isset($this->oe) && $this->oe->type == "system") {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
 			} else {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
@@ -411,7 +411,7 @@ 
      */
     public function PreSend() {
         //check to see if message body is empty
-        if(empty($this->Body)){
+        if (empty($this->Body)) {
             //PHPMailer will throw an error if the body is empty, so insert a blank space if body is empty
             $this->Body = " ";
         }

Braces +10 added lines, -6 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,9 +123,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+					$this->Mailer = "sendmail";
 		}
-		else
-			$this->Mailer = "sendmail";
 	}
 
 	/**
@@ -154,9 +156,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+				  $this->Mailer = "sendmail";
 		}
-		else
-		  $this->Mailer = "sendmail";
 	}
 
     /**
@@ -300,7 +302,9 @@ 
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
+			if(!file_exists($file_location)) {
+			    continue;
+			}
 			if($object) {
 			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
 			        switch(strtolower($typematch[1])) {

Indentation +236 added lines, -236 removed lines

@@ -48,117 +48,117 @@ 
  */
 class SugarPHPMailer extends PHPMailer
 {
-	var $oe; // OutboundEmail
-	var $protocol = "tcp://";
-	var $preppedForOutbound = false;
-	var $disclosureEnabled;
-	var $disclosureText;
-	var $isHostEmpty = false;
-	var $opensslOpened = true;
-
-	/**
-	 * Sole constructor
-	 */
-	public function __construct() {
+    var $oe; // OutboundEmail
+    var $protocol = "tcp://";
+    var $preppedForOutbound = false;
+    var $disclosureEnabled;
+    var $disclosureText;
+    var $isHostEmpty = false;
+    var $opensslOpened = true;
+
+    /**
+     * Sole constructor
+     */
+    public function __construct() {
         parent::__construct();
-		global $locale;
-		global $current_user;
-		global $sugar_config;
+        global $locale;
+        global $current_user;
+        global $sugar_config;
 
-		$admin = new Administration();
-		$admin->retrieveSettings();
+        $admin = new Administration();
+        $admin->retrieveSettings();
 
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
-			$this->disclosureEnabled = true;
-			$this->disclosureText = $admin->settings['disclosure_text'];
-		}
+        if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+            $this->disclosureEnabled = true;
+            $this->disclosureText = $admin->settings['disclosure_text'];
+        }
 
-		$this->oe = new OutboundEmail();
-		$this->oe->getUserMailerSettings($current_user);
+        $this->oe = new OutboundEmail();
+        $this->oe->getUserMailerSettings($current_user);
 
-		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+        $this->SetLanguage('en', 'include/phpmailer/language/');
+        $this->PluginDir	= 'include/phpmailer/';
+        $this->Mailer	 	= 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
+        $this->Encoding		= 'quoted-printable';
         $this->IsHTML(false);  // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
         $this->WordWrap		= 996;
-		// cn: gmail fix
-		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
+        // cn: gmail fix
+        $this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
-	}
+    }
 
 
-	/**
-	 * Prefills outbound details
-	 */
-	function setMailer() {
-		global $current_user;
+    /**
+     * Prefills outbound details
+     */
+    function setMailer() {
+        global $current_user;
 
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getUserMailerSettings($current_user);
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getUserMailerSettings($current_user);
 
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
-            	$this->SMTPSecure = 'ssl';
+                $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-			$this->Mailer = "sendmail";
-	}
-
-	/**
-	 * Prefills mailer for system
-	 */
-	function setMailerForSystem() {
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getSystemMailerSettings();
-
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
-
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
+
+    /**
+     * Prefills mailer for system
+     */
+    function setMailerForSystem() {
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getSystemMailerSettings();
+
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
                 $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-		  $this->Mailer = "sendmail";
-	}
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
@@ -217,38 +217,38 @@ 
         return join("", $mime);
     }*/
 
-	/**
-	 * handles Charset translation for all visual parts of the email.
-	 * @param string charset Default = ''
-	 */
-	function prepForOutbound() {
-		global $locale;
-
-		if($this->preppedForOutbound == false) {
-			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
-			//$this->preppedForOutbound = true; // flag so we don't redo this
-			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
-
-			// handle disclosure
-			if($this->disclosureEnabled) {
-				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
-				$this->AltBody .= "\r\r{$this->disclosureText}";
-			}
+    /**
+     * handles Charset translation for all visual parts of the email.
+     * @param string charset Default = ''
+     */
+    function prepForOutbound() {
+        global $locale;
+
+        if($this->preppedForOutbound == false) {
+            //bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
+            //$this->preppedForOutbound = true; // flag so we don't redo this
+            $OBCharset = $locale->getPrecedentPreference('default_email_charset');
+
+            // handle disclosure
+            if($this->disclosureEnabled) {
+                $this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
+                $this->AltBody .= "\r\r{$this->disclosureText}";
+            }
 
-			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            // body text
+            $this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+            $this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
             $subjectUTF8		= from_html(trim($this->Subject));
             $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
             $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
-			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+            // HTML email RFC compliance
+            if($this->ContentType == "text/html") {
+                if(strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+                    $head=<<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -257,15 +257,15 @@ 
 </head>
 <body>
 eoq;
-					$this->Body = $head.$this->Body."</body></html>";
-				}
-			}
+                    $this->Body = $head.$this->Body."</body></html>";
+                }
+            }
 
-			// Headers /////////////////////////////////
-			// the below is done in PHPMailer::CreateHeader();
-			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
-			/*
+            // Headers /////////////////////////////////
+            // the below is done in PHPMailer::CreateHeader();
+            //$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
+            $this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+            /*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
 			}
@@ -283,129 +283,129 @@ 
 			}
 			*/
 
-		}
-	}
-
-	/**
-	 * Replace images with locations specified by regex with cid: images
-	 * and attach needed files
-	 * @param string $regex Regular expression
-	 * @param string $local_prefix Prefix where local files are stored
-	 * @param bool $object Use attachment object
-	 */
-	public function replaceImageByRegex($regex, $local_prefix, $object = false)
-	{
-		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
-		$i = 0;
+        }
+    }
+
+    /**
+     * Replace images with locations specified by regex with cid: images
+     * and attach needed files
+     * @param string $regex Regular expression
+     * @param string $local_prefix Prefix where local files are stored
+     * @param bool $object Use attachment object
+     */
+    public function replaceImageByRegex($regex, $local_prefix, $object = false)
+    {
+        preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
+        $i = 0;
         foreach($matches[2] as $match) {
-			$filename = urldecode($match);
-			$cid = $filename;
-			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
-			            case 'documents':
-			                $beanname = 'DocumentRevisions';
-			                break;
-			            case 'notes':
-			                $beanname = 'Notes';
-			                break;
-			        }
-			    }
-			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
-			        $bean = SugarModule::get($beanname)->loadBean();
-    			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
-        			    $mime_type = $bean->file_mime_type;
-        			    $filename = $bean->filename;
-    			    }
-			    }
-			} else {
-			    $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-			}
-		    if (!$this->embeddedAttachmentExists($cid)) {
-		    	$this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
-		    }
-		    $i++;
+            $filename = urldecode($match);
+            $cid = $filename;
+            $file_location = $local_prefix.$filename;
+            if(!file_exists($file_location)) continue;
+            if($object) {
+                if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+                    switch(strtolower($typematch[1])) {
+                        case 'documents':
+                            $beanname = 'DocumentRevisions';
+                            break;
+                        case 'notes':
+                            $beanname = 'Notes';
+                            break;
+                    }
+                }
+                $mime_type = "application/octet-stream";
+                if(isset($beanname)) {
+                    $bean = SugarModule::get($beanname)->loadBean();
+                    $bean->retrieve($filename);
+                    if(!empty($bean->id)) {
+                        $mime_type = $bean->file_mime_type;
+                        $filename = $bean->filename;
+                    }
+                }
+            } else {
+                $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+            }
+            if (!$this->embeddedAttachmentExists($cid)) {
+                $this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
+            }
+            $i++;
         }
-		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
-		// remove bad img line from outbound email
-		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
-	}
-
-	/**
-	 * @param notes	array of note beans
-	 */
-	function handleAttachments($notes) {
-		global $sugar_config;
-
-		// cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
-		$this->ClearAttachments();
-
-		//replace references to cache/images with cid tag
+        //replace references to cache with cid tag
+        $this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+        // remove bad img line from outbound email
+        $this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
+    }
+
+    /**
+     * @param notes	array of note beans
+     */
+    function handleAttachments($notes) {
+        global $sugar_config;
+
+        // cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
+        $this->ClearAttachments();
+
+        //replace references to cache/images with cid tag
         $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
 
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
-
-		//Replace any embeded images using the secure entryPoint for src url.
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
-
-		if (empty($notes)) {
-				return;
-		}
-		//Handle regular attachments.
-		foreach($notes as $note) {
-				$mime_type = 'text/plain';
-				$file_location = '';
-				$filename = '';
-
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
-						$file_location = $note->file->temp_file_location;
-						$filename = $note->file->original_file_name;
-						$mime_type = $note->file->mime_type;
-					} else {
-						$file_location = "upload://{$note->id}";
-						$filename = $note->id.$note->filename;
-						$mime_type = $note->file_mime_type;
-					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
-					$filename = $note->id.$note->filename;
-					$file_location = "upload://$filename";
-					$mime_type = $note->file_mime_type;
-				}
-
-				$filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
-				if (!$note->embed_flag) {
-					$this->AddAttachment($file_location, $filename, 'base64', $mime_type);
-				} // else
-			}
-	}
-
-	/**
-	 * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
-	 *
-	 */
-	function SetError($msg) {
-		$GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
-		parent::SetError($msg);
-	}
-
-	function SmtpConnect($options = array()) {
-		$connection = parent::SmtpConnect();
-		if (!$connection) {
-			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
-			} else {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
-			} // else
-		}
-		return $connection;
-	} // fn
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
+
+        //Replace any embeded images using the secure entryPoint for src url.
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
+
+        if (empty($notes)) {
+                return;
+        }
+        //Handle regular attachments.
+        foreach($notes as $note) {
+                $mime_type = 'text/plain';
+                $file_location = '';
+                $filename = '';
+
+                if($note->object_name == 'Note') {
+                    if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+                        $file_location = $note->file->temp_file_location;
+                        $filename = $note->file->original_file_name;
+                        $mime_type = $note->file->mime_type;
+                    } else {
+                        $file_location = "upload://{$note->id}";
+                        $filename = $note->id.$note->filename;
+                        $mime_type = $note->file_mime_type;
+                    }
+                } elseif($note->object_name == 'DocumentRevision') { // from Documents
+                    $filename = $note->id.$note->filename;
+                    $file_location = "upload://$filename";
+                    $mime_type = $note->file_mime_type;
+                }
+
+                $filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
+                if (!$note->embed_flag) {
+                    $this->AddAttachment($file_location, $filename, 'base64', $mime_type);
+                } // else
+            }
+    }
+
+    /**
+     * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
+     *
+     */
+    function SetError($msg) {
+        $GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
+        parent::SetError($msg);
+    }
+
+    function SmtpConnect($options = array()) {
+        $connection = parent::SmtpConnect();
+        if (!$connection) {
+            global $app_strings;
+            if(isset($this->oe) && $this->oe->type == "system") {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
+            } else {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
+            } // else
+        }
+        return $connection;
+    } // fn
 
     /*
      * overloads PHPMailer::PreSend() to allow for empty messages to go out.

include/MySugar/retrieve_dash_page.php

Spacing +34 added lines, -34 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.
@@ -42,7 +42,7 @@ 
 require_once('include/MySugar/MySugar.php');
 
 // build dashlet cache file if not found
-if(!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
+if (!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
     require_once('include/Dashlets/DashletCacheBuilder.php');
 
     $dc = new DashletCacheBuilder();
@@ -60,7 +60,7 @@ 
 
 $hasUserPreferences = (!isset($pages) || empty($pages) || !isset($dashlets) || empty($dashlets)) ? false : true;
 
-if(!$hasUserPreferences){
+if (!$hasUserPreferences) {
     $dashlets = array();
 
     //list of preferences to move over and to where
@@ -85,7 +85,7 @@ 
     $old_columns = $current_user->getPreference('columns', 'home');
     $old_dashlets = $current_user->getPreference('dashlets', 'home');
 
-    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)){
+    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)) {
         $columns = $old_columns;
         $dashlets = $old_dashlets;
 
@@ -95,7 +95,7 @@ 
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
     }
-    else{
+    else {
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -106,7 +106,7 @@ 
                 'height' => 315,
             ));
 
-        $dashlets[create_guid()] = array ('className' => 'SugarFeedDashlet',
+        $dashlets[create_guid()] = array('className' => 'SugarFeedDashlet',
             'module' => 'SugarFeed',
             'forceColumn' => 1,
             'fileLocation' => $dashletsFiles['SugarFeedDashlet']['file'],
@@ -121,15 +121,15 @@ 
                 'height' => 315,
             ));
 
-        foreach($defaultDashlets as $dashletName=>$module){
+        foreach ($defaultDashlets as $dashletName=>$module) {
             // clint - fixes bug #20398
             // only display dashlets that are from visibile modules and that the user has permission to list
             $myDashlet = new MySugar($module);
             $displayDashlet = $myDashlet->checkDashletDisplay();
-            if (isset($dashletsFiles[$dashletName]) && $displayDashlet){
+            if (isset($dashletsFiles[$dashletName]) && $displayDashlet) {
                 $options = array();
-                $prefsforthisdashlet = array_keys($prefstomove,$dashletName);
-                foreach ( $prefsforthisdashlet as $pref ) {
+                $prefsforthisdashlet = array_keys($prefstomove, $dashletName);
+                foreach ($prefsforthisdashlet as $pref) {
                     $options[$pref] = $current_user->getPreference($pref);
                 }
                 $dashlets[create_guid()] = array('className' => $dashletName,
@@ -149,8 +149,8 @@ 
         $columns[1]['width'] = '40%';
         $columns[1]['dashlets'] = array();
 
-        foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
+        foreach ($dashlets as $guid=>$dashlet) {
+            if ($dashlet['forceColumn'] == 0) array_push($columns[0]['dashlets'], $guid);
             else array_push($columns[1]['dashlets'], $guid);
             $count++;
         }
@@ -165,29 +165,29 @@ 
 // handles upgrading from versions that had the 'Dashboard' module; move those items over to the Home page
 $pagesDashboard = $current_user->getPreference('pages', 'Dashboard');
 $dashletsDashboard = $current_user->getPreference('dashlets', 'Dashboard');
-if ( !empty($pagesDashboard) ) {
+if (!empty($pagesDashboard)) {
     // move dashlets from the dashboard to be at the end of the home screen dashlets
-    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn ) {
-        foreach ($dashboardColumn['dashlets'] as $dashletItem ) {
+    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn) {
+        foreach ($dashboardColumn['dashlets'] as $dashletItem) {
             $pages[0]['columns'][$dashboardColumnKey]['dashlets'][] = $dashletItem;
         }
     }
-    $pages = array_merge($pages,$pagesDashboard);
+    $pages = array_merge($pages, $pagesDashboard);
     $current_user->setPreference('pages', $pages, 0, 'Home');
 }
-if ( !empty($dashletsDashboard) ) {
-    $dashlets = array_merge($dashlets,$dashletsDashboard);
+if (!empty($dashletsDashboard)) {
+    $dashlets = array_merge($dashlets, $dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if (!empty($pagesDashboard) || !empty($dashletsDashboard))
     $current_user->resetPreferences('Dashboard');
 
-if (empty($pages)){
+if (empty($pages)) {
     $pages = array();
     $pageIndex = 0;
     $pages[0]['columns'] = $columns;
     $pages[0]['numColumns'] = '2';
-    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME';	// "My Sugar"
+    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME'; // "My Sugar"
     $pageIndex++;
     $current_user->setPreference('pages', $pages, 0, 'Home');
     $activePage = 0;
@@ -206,32 +206,32 @@ 
 $dashletIds = array(); // collect ids to pass to javascript
 $display = array();
 
-foreach($pages[$activePage]['columns'] as $colNum => $column) {
-    if ($colNum == $numCols){
+foreach ($pages[$activePage]['columns'] as $colNum => $column) {
+    if ($colNum == $numCols) {
         break;
     }
     $display[$colNum]['width'] = $column['width'];
     $display[$colNum]['dashlets'] = array();
-    foreach($column['dashlets'] as $num => $id) {
+    foreach ($column['dashlets'] as $num => $id) {
         // clint - fixes bug #20398
         // only display dashlets that are from visibile modules and that the user has permission to list
-        if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
+        if (!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
+            if (!empty($dashletsFiles[$dashlets[$id]['className']]['module']))
                 $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
+            elseif (!empty($dashlets[$id]['module']))
                 $module = $dashlets[$id]['module'];
 
             $myDashlet = new MySugar($module);
 
-            if($myDashlet->checkDashletDisplay()) {
+            if ($myDashlet->checkDashletDisplay()) {
                 require_once($dashlets[$id]['fileLocation']);
                 $dashlet = new $dashlets[$id]['className']($id, (isset($dashlets[$id]['options']) ? $dashlets[$id]['options'] : array()));
                 // Need to add support to dynamically display/hide dashlets
                 // If it has a method 'shouldDisplay' we will call it to see if we should display it or not
-                if (method_exists($dashlet,'shouldDisplay')) {
+                if (method_exists($dashlet, 'shouldDisplay')) {
                     if (!$dashlet->shouldDisplay()) {
                         // This dashlet doesn't want us to show it, skip it.
                         continue;
@@ -242,7 +242,7 @@ 
 
                 $dashlets = $current_user->getPreference('dashlets', 'Home'); // Using hardcoded 'Home' because DynamicAction.php $_REQUEST['module'] value is always Home
                 $lvsParams = array();
-                if(!empty($dashlets[$id]['sort_options'])){
+                if (!empty($dashlets[$id]['sort_options'])) {
                     $lvsParams = $dashlets[$id]['sort_options'];
                 }
 
@@ -251,10 +251,10 @@ 
                     $display[$colNum]['dashlets'][$id]['display'] = $dashlet->display();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
-                    if($dashlet->hasScript) {
+                    if ($dashlet->hasScript) {
                         $display[$colNum]['dashlets'][$id]['script'] = $dashlet->displayScript();
                     }
-                } catch (Exception $ex) {
+                }catch (Exception $ex) {
                     $display[$colNum]['dashlets'][$id]['display'] = $ex->getMessage();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
@@ -267,7 +267,7 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);
@@ -277,7 +277,7 @@ 
 
 $sugar_smarty->assign('maxCount', empty($sugar_config['max_dashlets_homepage']) ? 15 : $sugar_config['max_dashlets_homepage']);
 $sugar_smarty->assign('dashletCount', $count);
-$sugar_smarty->assign('dashletIds', '["' . implode('","', $dashletIds) . '"]');
+$sugar_smarty->assign('dashletIds', '["'.implode('","', $dashletIds).'"]');
 $sugar_smarty->assign('columns', $display);
 
 global $theme;

Braces +20 added lines, -11 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.
@@ -94,8 +96,7 @@ 
         $old_dashlets = array();
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
-    }
-    else{
+    } else{
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -150,8 +151,11 @@ 
         $columns[1]['dashlets'] = array();
 
         foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
-            else array_push($columns[1]['dashlets'], $guid);
+            if( $dashlet['forceColumn'] == 0 ) {
+                array_push($columns[0]['dashlets'], $guid);
+            } else {
+                array_push($columns[1]['dashlets'], $guid);
+            }
             $count++;
         }
     }
@@ -179,8 +183,9 @@ 
     $dashlets = array_merge($dashlets,$dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if ( !empty($pagesDashboard) || !empty($dashletsDashboard) ) {
     $current_user->resetPreferences('Dashboard');
+}
 
 if (empty($pages)){
     $pages = array();
@@ -217,12 +222,14 @@ 
         // only display dashlets that are from visibile modules and that the user has permission to list
         if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
-                $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) ) {
+                            $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            }
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
-                $module = $dashlets[$id]['module'];
+            elseif ( !empty($dashlets[$id]['module']) ) {
+                            $module = $dashlets[$id]['module'];
+            }
 
             $myDashlet = new MySugar($module);
 
@@ -267,7 +274,9 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+    $sugar_smarty->assign('lock_homepage', true);
+}
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);

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