adamjakab / SuiteCRM

modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.php

Spacing +29 added lines, -29 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,8 +59,8 @@ 
     {
         $this->getSeedBean()->disable_row_level_security = false;
 
-        $campaigns = $this->getSeedBean()->get_full_list("","");
-        if ( $campaigns != null )
+        $campaigns = $this->getSeedBean()->get_full_list("", "");
+        if ($campaigns != null)
             foreach ($campaigns as $c)
                 $this->_searchFields['campaign_id']['options'][$c->id] = $c->name;
         else
@@ -77,10 +77,10 @@ 
         $rawData = $this->constructQuery(
             $GLOBALS['app_list_strings']['roi_type_dom'],
             $GLOBALS['app_list_strings']['roi_type_dom'],
-            $this->campaign_id[0],null,true,true,true,$this->id);
+            $this->campaign_id[0], null, true, true, true, $this->id);
 
         $currency_symbol = $GLOBALS['sugar_config']['default_currency_symbol'];
-        if ($GLOBALS['current_user']->getPreference('currency')){
+        if ($GLOBALS['current_user']->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($GLOBALS['current_user']->getPreference('currency'));
@@ -93,7 +93,7 @@ 
         $chartHeight    = 500;
         $autoRefresh = $this->processAutoRefresh();
 
-        $chartReadyData = $this->prepareChartData($rawData,$currency_symbol,$thousands_symbol);
+        $chartReadyData = $this->prepareChartData($rawData, $currency_symbol, $thousands_symbol);
 
         //$chartReadyData['data'] = [[1.1,2.2],[3.3,4.4]];
         $jsonData = json_encode($chartReadyData['data']);
@@ -107,7 +107,7 @@ 
         //$colours = "['red','blue','green','orange','yellow','pink']";
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -216,12 +216,12 @@ 
         //   return $this->getTitle('<div align="center"></div>') . '<div align="center">' . $returnStr . '</div>'. $this->processAutoRefresh();
     }
 
-    protected function constructQuery($datay= array(),$targets=array(),$campaign_id = null, $cache_file_name='a_file', $refresh=false,$marketing_id='',$is_dashlet=false,$dashlet_id='') {
+    protected function constructQuery($datay = array(), $targets = array(), $campaign_id = null, $cache_file_name = 'a_file', $refresh = false, $marketing_id = '', $is_dashlet = false, $dashlet_id = '') {
         //global $app_strings,$mod_strings, $current_module_strings, $charset, $lang, $app_list_strings, $current_language,$sugar_config;
         global $mod_strings;
 
-        $campaign_id = (int) $campaign_id;
-        if(!$campaign_id) {
+        $campaign_id = (int)$campaign_id;
+        if (!$campaign_id) {
             $GLOBALS['log']->debug('roi chart need a campaign id');
             return false;
         }
@@ -232,18 +232,18 @@ 
 
         $focus = new Campaign();
         $focus->retrieve($campaign_id);
-        $opp_count=0;
-        $opp_query  = "select count(*) opp_count,sum(" . db_convert("amount_usdollar","IFNULL",array(0)).")  total_value";
+        $opp_count = 0;
+        $opp_query  = "select count(*) opp_count,sum(".db_convert("amount_usdollar", "IFNULL", array(0)).")  total_value";
         $opp_query .= " from opportunities";
         $opp_query .= " where campaign_id='$campaign_id'";
         $opp_query .= " and sales_stage='Prospecting'";
         $opp_query .= " and deleted=0";
 
-        $opp_result=$focus->db->query($opp_query);
-        $opp_data=$focus->db->fetchByAssoc($opp_result);
-        if (empty($opp_data['total_value'])) $opp_data['total_value']=0;
+        $opp_result = $focus->db->query($opp_query);
+        $opp_data = $focus->db->fetchByAssoc($opp_result);
+        if (empty($opp_data['total_value'])) $opp_data['total_value'] = 0;
 
-        $chartData['Total Value']= $opp_data['total_value'];
+        $chartData['Total Value'] = $opp_data['total_value'];
 
         //report query
         $opp_query1  = "select SUM(opp.amount) as revenue";
@@ -252,28 +252,28 @@ 
         $opp_query1 .= " where opp.sales_stage = 'Closed Won'and camp.id='$campaign_id' and opp.deleted=0";
         $opp_query1 .= " group by camp.name";
 
-        $opp_result1=$focus->db->query($opp_query1);
-        $opp_data1=$focus->db->fetchByAssoc($opp_result1);
+        $opp_result1 = $focus->db->query($opp_query1);
+        $opp_data1 = $focus->db->fetchByAssoc($opp_result1);
 
         //if (empty($opp_data1[]))
-        if (empty($opp_data1['revenue'])){
+        if (empty($opp_data1['revenue'])) {
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = 0;
             unset($opp_data1['revenue']);
-        }else{
+        } else {
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = $opp_data1['revenue'];
             unset($opp_data1['revenue']);
             $not_empty = true;
         }
 
-        $chartData['Revenue']= $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']];
+        $chartData['Revenue'] = $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']];
 
         $camp_query1  = "select camp.name, SUM(camp.actual_cost) as investment,SUM(camp.budget) as budget,SUM(camp.expected_revenue) as expected_revenue";
         $camp_query1 .= " from campaigns camp";
         $camp_query1 .= " where camp.id='$campaign_id'";
         $camp_query1 .= " group by camp.name";
 
-        $camp_result1=$focus->db->query($camp_query1);
-        $camp_data1=$focus->db->fetchByAssoc($camp_result1);
+        $camp_result1 = $focus->db->query($camp_query1);
+        $camp_data1 = $focus->db->fetchByAssoc($camp_result1);
 
 
         if (empty($camp_data1['investment']))
@@ -289,9 +289,9 @@ 
         else
             $not_empty = true;
 
-        $chartData['Investment']= $camp_data1['investment'];
-        $chartData['Budget']= $camp_data1['budget'];
-        $chartData['Expected Revenue']= $camp_data1['expected_revenue'];
+        $chartData['Investment'] = $camp_data1['investment'];
+        $chartData['Budget'] = $camp_data1['budget'];
+        $chartData['Expected Revenue'] = $camp_data1['expected_revenue'];
 
         /*
             $opp_data1[$mod_strings['LBL_ROI_CHART_INVESTMENT']]=$camp_data1['investment'];
@@ -313,16 +313,16 @@ 
         return $chartData;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be)
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $key=>$value)
+        foreach ($data as $key=>$value)
         {
             $formattedFloat = (float)number_format((float)$value, 2, '.', '');
             $chart['labels'][] = $key;

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php

Spacing +27 added lines, -27 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,16 +67,16 @@ 
     {
         global $timedate;
 
-        if(empty($options['pbss_date_start']))
+        if (empty($options['pbss_date_start']))
             $options['pbss_date_start'] = $timedate->nowDbDate();
 
-        if(empty($options['pbss_date_end']))
+        if (empty($options['pbss_date_end']))
             $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
 
-        if(empty($options['title']))
+        if (empty($options['title']))
             $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -109,7 +109,7 @@ 
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
@@ -135,20 +135,20 @@ 
         //These are taken in the same fashion as the hard-coded array above
         $module = 'Opportunities';
         $action = 'index';
-        $query  ='true';
-        $searchFormTab ='advanced_search';
+        $query  = 'true';
+        $searchFormTab = 'advanced_search';
 
         $chartWidth     = 900;
         $chartHeight    = 500;
 
-        $autoRefresh = $this->processAutoRefresh();//$autoRefresh
+        $autoRefresh = $this->processAutoRefresh(); //$autoRefresh
 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
         //<canvas id='$canvasId' width='$chartWidth' height='$chartHeight'>[No canvas support]</canvas>
         //<canvas id='test123'  width='$chartWidth' height='$chartHeight'>[No canvas support]</canvas>
 
         //There is always an ending anchor value, hence this check is that the data array is less than 2
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 2)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 2)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -272,13 +272,13 @@ 
         }
 
         $result = $db->query($query);
-        while($row = $db->fetchByAssoc($result, false))
+        while ($row = $db->fetchByAssoc($result, false))
             $temp_data[] = $row;
 
         // reorder and set the array based on the order of selected_datax
-        foreach($selected_datax as $sales_stage){
-            foreach($temp_data as $key => $value){
-                if ($value['sales_stage'] == $sales_stage){
+        foreach ($selected_datax as $sales_stage) {
+            foreach ($temp_data as $key => $value) {
+                if ($value['sales_stage'] == $sales_stage) {
                     $value['sales_stage'] = $app_list_strings['sales_stage_dom'][$value['sales_stage']];
                     $value['key'] = $sales_stage;
                     $value['value'] = $value['sales_stage'];
@@ -318,40 +318,40 @@ 
                         count(*) AS opp_count,
                         sum(amount_usdollar/1000) AS total
                     FROM users,opportunities  ";
-        $query .= " WHERE opportunities.date_closed >= ". db_convert("'".$this->pbss_date_start."'",'date').
-            " AND opportunities.date_closed <= ".db_convert("'".$this->pbss_date_end."'",'date') .
+        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->pbss_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->pbss_date_end."'", 'date').
             " AND opportunities.assigned_user_id = users.id  AND opportunities.deleted=0 ";
         $query .= " GROUP BY opportunities.sales_stage";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //return $data;
-        $chart['labels']=array();
-        $chart['data']=array();
+        $chart['labels'] = array();
+        $chart['data'] = array();
         $total = 0;
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             //$chart['labelsAndValues'][]=$i['key'].' ('.$currency.(int)$i['total'].')';
-            $chart['labelsAndValues'][]=$this->resizeLabel($i['key']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
-            $chart['labels'][]=$i['key'];
-            $chart['data'][]=(int)$i['total'];
-            $total+=(int)$i['total'];
+            $chart['labelsAndValues'][] = $this->resizeLabel($i['key']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
+            $chart['labels'][] = $i['key'];
+            $chart['data'][] = (int)$i['total'];
+            $total += (int)$i['total'];
         }
         //The funnel needs n+1 elements (to bind the shape to as per http://www.rgraph.net/demos/funnel-interactive-key.html)
         //$chart['data'][]=1;
-        $chart['total']=$total;
+        $chart['total'] = $total;
         return $chart;
     }
 
     protected function resizeLabel($label)
     {
-        if(strlen($label) < $this->maxLabelSizeBeforeTotal)
+        if (strlen($label) < $this->maxLabelSizeBeforeTotal)
             return $label;
         else
-            return substr($label,0,$this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
+            return substr($label, 0, $this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
 
     }
 

modules/Administration/DisplayWarnings.php

Spacing +25 added lines, -25 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.
@@ -41,37 +41,37 @@ 
 
 
 global $db;
-function displayAdminError($errorString){
-	$output = '<p class="error">' . $errorString .'</p>';
+function displayAdminError($errorString) {
+	$output = '<p class="error">'.$errorString.'</p>';
 		echo $output;
 }
 
-if(!empty($_SESSION['display_lotuslive_alert'])){
+if (!empty($_SESSION['display_lotuslive_alert'])) {
     displayAdminError(translate('MSG_RECONNECT_LOTUSLIVE', 'Administration'));
 }
 
 
 
 
-if(isset($_SESSION['rebuild_relationships'])){
+if (isset($_SESSION['rebuild_relationships'])) {
 	displayAdminError(translate('MSG_REBUILD_RELATIONSHIPS', 'Administration'));
 }
 
-if(isset($_SESSION['rebuild_extensions'])){
+if (isset($_SESSION['rebuild_extensions'])) {
 	displayAdminError(translate('MSG_REBUILD_EXTENSIONS', 'Administration'));
 }
 
-if ( (strpos($_SERVER["SERVER_SOFTWARE"],'Microsoft-IIS') !== false) && (php_sapi_name() == 'cgi-fcgi') && (ini_get('fastcgi.logging') != '0') ) {
+if ((strpos($_SERVER["SERVER_SOFTWARE"], 'Microsoft-IIS') !== false) && (php_sapi_name() == 'cgi-fcgi') && (ini_get('fastcgi.logging') != '0')) {
     displayAdminError(translate('LBL_FASTCGI_LOGGING', 'Administration'));
 }
-if(is_admin($current_user)){
-if(!empty($_SESSION['COULD_NOT_CONNECT'])){
-	displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration') . ' '. $timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
+if (is_admin($current_user)) {
+if (!empty($_SESSION['COULD_NOT_CONNECT'])) {
+	displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration').' '.$timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
 }
-if(!empty($_SESSION['EXCEEDING_OC_LICENSES']) && $_SESSION['EXCEEDING_OC_LICENSES'] == true){
+if (!empty($_SESSION['EXCEEDING_OC_LICENSES']) && $_SESSION['EXCEEDING_OC_LICENSES'] == true) {
     displayAdminError(translate('LBL_EXCEEDING_OC_LICENSES', 'Administration'));
 }
-if(isset($license) && !empty($license->settings['license_msg_admin'])){
+if (isset($license) && !empty($license->settings['license_msg_admin'])) {
     // UUDDLRLRBA
 	$GLOBALS['log']->fatal(base64_decode($license->settings['license_msg_admin']));
     //displayAdminError(base64_decode($license->settings['license_msg_admin']));
@@ -86,35 +86,35 @@ 
 //If sendmail has been configured by setting the config variable ignore this warning
 $sendMailEnabled = isset($sugar_config['allow_sendmail_outbound']) && $sugar_config['allow_sendmail_outbound'];
 
-if(trim($admin->settings['mail_smtpserver']) == '' && !$sendMailEnabled) {
-    if($admin->settings['notify_on']) {
+if (trim($admin->settings['mail_smtpserver']) == '' && !$sendMailEnabled) {
+    if ($admin->settings['notify_on']) {
         $smtp_error = true;
     }
 }
 
-if($smtp_error) {
-    displayAdminError(translate('WARN_NO_SMTP_SERVER_AVAILABLE_ERROR','Administration'));
+if ($smtp_error) {
+    displayAdminError(translate('WARN_NO_SMTP_SERVER_AVAILABLE_ERROR', 'Administration'));
 }
 
- if(!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version ){
+ if (!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version) {
        		displayAdminError(translate('WARN_REPAIR_CONFIG', 'Administration'));
         }
 
-        if( !isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == false ){
+        if (!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == false) {
         	displayAdminError(translate('WARN_INSTALLER_LOCKED', 'Administration'));
 		}
 
 
-        if(empty($GLOBALS['sugar_config']['admin_access_control'])){
-			if(isset($_SESSION['invalid_versions'])){
+        if (empty($GLOBALS['sugar_config']['admin_access_control'])) {
+			if (isset($_SESSION['invalid_versions'])) {
 				$invalid_versions = $_SESSION['invalid_versions'];
-				foreach($invalid_versions as $invalid){
-					displayAdminError(translate('WARN_UPGRADE', 'Administration'). $invalid['name'] .translate('WARN_UPGRADE2', 'Administration'));
+				foreach ($invalid_versions as $invalid) {
+					displayAdminError(translate('WARN_UPGRADE', 'Administration').$invalid['name'].translate('WARN_UPGRADE2', 'Administration'));
 				}
 			}
 
-			if (isset($_SESSION['available_version'])){
-				if($_SESSION['available_version'] != $sugar_version)
+			if (isset($_SESSION['available_version'])) {
+				if ($_SESSION['available_version'] != $sugar_version)
 				{
 					displayAdminError(translate('WARN_UPGRADENOTE', 'Administration').$_SESSION['available_version_description']);
 				}
@@ -122,7 +122,7 @@ 
         }
 
 
-		if(isset($_SESSION['administrator_error']))
+		if (isset($_SESSION['administrator_error']))
 		{
 			// Only print DB errors once otherwise they will still look broken
 			// after they are fixed.

modules/Administration/Administration.php

Spacing +21 added lines, -21 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.
@@ -68,7 +68,7 @@ 
 
     );
     var $disable_custom_fields = true;
-    var $checkbox_fields = Array("notify_send_by_default", "mail_smtpauth_req", "notify_on", 'portal_on', 'skypeout_on', 'system_mailmerge_on', 'proxy_auth', 'proxy_on', 'system_ldap_enabled','captcha_on');
+    var $checkbox_fields = Array("notify_send_by_default", "mail_smtpauth_req", "notify_on", 'portal_on', 'skypeout_on', 'system_mailmerge_on', 'proxy_auth', 'proxy_on', 'system_ldap_enabled', 'captcha_on');
 
     function Administration() {
         parent::SugarBean();
@@ -76,16 +76,16 @@ 
         $this->setupCustomFields('Administration');
     }
 
-    function retrieveSettings($category = FALSE, $clean=false) {
+    function retrieveSettings($category = FALSE, $clean = false) {
         // declare a cache for all settings
         $settings_cache = sugar_cache_retrieve('admin_settings_cache');
 
-        if($clean) {
+        if ($clean) {
             $settings_cache = array();
         }
 
         // Check for a cache hit
-        if(!empty($settings_cache)) {
+        if (!empty($settings_cache)) {
             $this->settings = $settings_cache;
             if (!empty($this->settings[$category]))
             {
@@ -93,7 +93,7 @@ 
             }
         }
 
-        if ( ! empty($category) ) {
+        if (!empty($category)) {
             $query = "SELECT category, name, value FROM {$this->table_name} WHERE category = '{$category}'";
         } else {
             $query = "SELECT category, name, value FROM {$this->table_name}";
@@ -101,12 +101,12 @@ 
 
         $result = $this->db->query($query, true, "Unable to retrieve system settings");
 
-        if(empty($result)) {
+        if (empty($result)) {
             return NULL;
         }
 
-        while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
+        while ($row = $this->db->fetchByAssoc($result)) {
+            if ($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
                 $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
             else
                 $this->settings[$row['category']."_".$row['name']] = $row['value'];
@@ -114,7 +114,7 @@ 
         }
         $this->settings[$category] = true;
 
-        if(!isset($this->settings["mail_sendtype"])) {
+        if (!isset($this->settings["mail_sendtype"])) {
             // outbound email settings
             $oe = new OutboundEmail();
             $oe->getSystemMailerSettings();
@@ -126,7 +126,7 @@ 
         }
 
         // At this point, we have built a new array that should be cached.
-        sugar_cache_put('admin_settings_cache',$this->settings);
+        sugar_cache_put('admin_settings_cache', $this->settings);
         return $this;
     }
 
@@ -136,16 +136,16 @@ 
         // outbound email settings
         $oe = new OutboundEmail();
 
-        foreach($_POST as $key => $val) {
+        foreach ($_POST as $key => $val) {
             $prefix = $this->get_config_prefix($key);
-            if(in_array($prefix[0], $this->config_categories)) {
-                if(is_array($val)){
-                    $val=implode(",",$val);
+            if (in_array($prefix[0], $this->config_categories)) {
+                if (is_array($val)) {
+                    $val = implode(",", $val);
                 }
                 $this->saveSetting($prefix[0], $prefix[1], $val);
             }
-            if(strpos($key, "mail_") !== false) {
-                if(in_array($key, $oe->field_defs)) {
+            if (strpos($key, "mail_") !== false) {
+                if (in_array($key, $oe->field_defs)) {
                     $oe->$key = $val;
                 }
             }
@@ -165,13 +165,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
+        if ($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
             $value = $this->encrpyt_before_save($value);
 
-        if( $row_count == 0){
+        if ($row_count == 0) {
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
         }
-        else{
+        else {
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');
@@ -179,7 +179,7 @@ 
     }
 
     function get_config_prefix($str) {
-        return Array(substr($str, 0, strpos($str, "_")), substr($str, strpos($str, "_")+1));
+        return Array(substr($str, 0, strpos($str, "_")), substr($str, strpos($str, "_") + 1));
     }
 }
 ?>

modules/AOR_Charts/AOR_Chart.php

Spacing +147 added lines, -147 removed lines

@@ -30,7 +30,7 @@ 
 	var $object_name = 'AOR_Chart';
 	var $table_name = 'aor_charts';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 	
 	var $id;
 	var $name;
@@ -52,148 +52,148 @@ 
 
 
 
-	function AOR_Chart(){
+	function AOR_Chart() {
 		parent::Basic();
 	}
 
-    function save_lines(array $post,AOR_Report $bean,$postKey){
+    function save_lines(array $post, AOR_Report $bean, $postKey) {
         $seenIds = array();
-        if(isset($post[$postKey.'id'])) {
-            foreach ($post[$postKey . 'id'] as $key => $id) {
+        if (isset($post[$postKey.'id'])) {
+            foreach ($post[$postKey.'id'] as $key => $id) {
                 if ($id) {
                     $aorChart = BeanFactory::getBean('AOR_Charts', $id);
                 } else {
                     $aorChart = BeanFactory::newBean('AOR_Charts');
                 }
-                $aorChart->name = $post[$postKey . 'title'][$key];
-                $aorChart->type = $post[$postKey . 'type'][$key];
-                $aorChart->x_field = $post[$postKey . 'x_field'][$key];
-                $aorChart->y_field = $post[$postKey . 'y_field'][$key];
+                $aorChart->name = $post[$postKey.'title'][$key];
+                $aorChart->type = $post[$postKey.'type'][$key];
+                $aorChart->x_field = $post[$postKey.'x_field'][$key];
+                $aorChart->y_field = $post[$postKey.'y_field'][$key];
                 $aorChart->aor_report_id = $bean->id;
                 $aorChart->save();
                 $seenIds[] = $aorChart->id;
             }
         }
         //Any beans that exist but aren't in $seenIds must have been removed.
-        foreach($bean->get_linked_beans('aor_charts','AOR_Charts') as $chart){
-            if(!in_array($chart->id,$seenIds)){
+        foreach ($bean->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
+            if (!in_array($chart->id, $seenIds)) {
                 $chart->mark_deleted($chart->id);
             }
         }
     }
 
-    private function getValidChartTypes(){
-        return array('bar','line','pie','radar','rose', 'grouped_bar', 'stacked_bar');
+    private function getValidChartTypes() {
+        return array('bar', 'line', 'pie', 'radar', 'rose', 'grouped_bar', 'stacked_bar');
     }
 
 
-    private function getColour($seed,$rgbArray = false){
+    private function getColour($seed, $rgbArray = false) {
         $hash = md5($seed);
         $r = hexdec(substr($hash, 0, 2));
         $g = hexdec(substr($hash, 2, 2));
         $b = hexdec(substr($hash, 4, 2));
-        if($rgbArray){
-            return array('R'=>$r,'G'=>$g,'B'=>$b);
+        if ($rgbArray) {
+            return array('R'=>$r, 'G'=>$g, 'B'=>$b);
         }
         $highR = $r + 10;
         $highG = $g + 10;
         $highB = $b + 10;
-        $main = '#'.str_pad(dechex($r),2,'0',STR_PAD_LEFT)
-            .str_pad(dechex($g),2,'0',STR_PAD_LEFT)
-            .str_pad(dechex($b),2,'0',STR_PAD_LEFT);
+        $main = '#'.str_pad(dechex($r), 2, '0', STR_PAD_LEFT)
+            .str_pad(dechex($g), 2, '0', STR_PAD_LEFT)
+            .str_pad(dechex($b), 2, '0', STR_PAD_LEFT);
         $highlight = '#'.dechex($highR).dechex($highG).dechex($highB);
-        return array('main'=>$main,'highlight'=>$highlight);
+        return array('main'=>$main, 'highlight'=>$highlight);
     }
 
-    function buildChartImageBar($chartPicture,$recordImageMap = false){
+    function buildChartImageBar($chartPicture, $recordImageMap = false) {
         $scaleSettings = array("DrawSubTicks" => false, "LabelRotation" => 30, 'MinDivHeight' => 50);
         $chartPicture->drawScale($scaleSettings);
         $chartPicture->drawBarChart(array("RecordImageMap"=>$recordImageMap));
     }
 
-    function buildChartImagePie($chartPicture,$chartData, $reportData,$imageHeight, $imageWidth, $xName,$recordImageMap){
-        $PieChart = new pPie($chartPicture,$chartData);
+    function buildChartImagePie($chartPicture, $chartData, $reportData, $imageHeight, $imageWidth, $xName, $recordImageMap) {
+        $PieChart = new pPie($chartPicture, $chartData);
         $x = 0;
-        foreach($reportData as $row){
-            $PieChart->setSliceColor($x,$this->getColour($row[$xName],true));
+        foreach ($reportData as $row) {
+            $PieChart->setSliceColor($x, $this->getColour($row[$xName], true));
             $x++;
         }
-        $PieChart->draw2DPie($imageWidth/3,$imageHeight/2,array("Border"=>TRUE,'Radius'=>200,''=>true,"RecordImageMap"=>$recordImageMap));
-        $PieChart->drawPieLegend($imageWidth*0.7,$imageHeight/3, array('FontSize'=>10,"FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf",'BoxSize'=>14));
+        $PieChart->draw2DPie($imageWidth / 3, $imageHeight / 2, array("Border"=>TRUE, 'Radius'=>200, ''=>true, "RecordImageMap"=>$recordImageMap));
+        $PieChart->drawPieLegend($imageWidth * 0.7, $imageHeight / 3, array('FontSize'=>10, "FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", 'BoxSize'=>14));
     }
 
-    function buildChartImageLine($chartPicture, $recordImageMap = false){
-        $scaleSettings = array("XMargin"=>10,"YMargin"=>10,"GridR"=>200,"GridG"=>200,"GridB"=>200,'MinDivHeight' => 50,"LabelRotation" => 30);
+    function buildChartImageLine($chartPicture, $recordImageMap = false) {
+        $scaleSettings = array("XMargin"=>10, "YMargin"=>10, "GridR"=>200, "GridG"=>200, "GridB"=>200, 'MinDivHeight' => 50, "LabelRotation" => 30);
         $chartPicture->drawScale($scaleSettings);
         $chartPicture->drawLineChart(array("RecordImageMap"=>$recordImageMap));
     }
 
-    function buildChartImageRadar($chartPicture, $chartData,$recordImageMap){
+    function buildChartImageRadar($chartPicture, $chartData, $recordImageMap) {
         $SplitChart = new pRadar();
-        $Options = array("LabelPos"=>RADAR_LABELS_HORIZONTAL,"RecordImageMap"=>$recordImageMap);
-        $SplitChart->drawRadar($chartPicture,$chartData,$Options);
+        $Options = array("LabelPos"=>RADAR_LABELS_HORIZONTAL, "RecordImageMap"=>$recordImageMap);
+        $SplitChart->drawRadar($chartPicture, $chartData, $Options);
 
     }
 
-    public function buildChartImage(array $reportData, array $fields,$asDataURI = true, $generateImageMapId = false){
+    public function buildChartImage(array $reportData, array $fields, $asDataURI = true, $generateImageMapId = false) {
         global $current_user;
         require_once 'modules/AOR_Charts/lib/pChart/pChart.php';
 
-        if($generateImageMapId !== false){
+        if ($generateImageMapId !== false) {
             $generateImageMapId = $current_user->id."-".$generateImageMapId;
         }
 
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
         $chartData = new pData();
         $chartData->loadPalette("modules/AOR_Charts/lib/pChart/palettes/navy.color", TRUE);
         $labels = array();
-        foreach($reportData as $row){
-            $chartData->addPoints($row[$yName],'data');
-            $chartData->addPoints($row[$xName],'Labels');
+        foreach ($reportData as $row) {
+            $chartData->addPoints($row[$yName], 'data');
+            $chartData->addPoints($row[$xName], 'Labels');
             $labels[] = $row[$xName];
         }
 
-        $chartData->setSerieDescription("Months","Month");
+        $chartData->setSerieDescription("Months", "Month");
         $chartData->setAbscissa("Labels");
 
         $imageHeight = 700;
         $imageWidth = 700;
 
-        $chartPicture = new pImage($imageWidth,$imageHeight,$chartData);
-        if($generateImageMapId){
+        $chartPicture = new pImage($imageWidth, $imageHeight, $chartData);
+        if ($generateImageMapId) {
             $imageMapDir = create_cache_directory('modules/AOR_Charts/ImageMap/'.$current_user->id.'/');
-            $chartPicture->initialiseImageMap($generateImageMapId,IMAGE_MAP_STORAGE_FILE,$generateImageMapId,$imageMapDir);
+            $chartPicture->initialiseImageMap($generateImageMapId, IMAGE_MAP_STORAGE_FILE, $generateImageMapId, $imageMapDir);
         }
 
         $chartPicture->Antialias = True;
 
-        $chartPicture->drawFilledRectangle(0,0,$imageWidth-1,$imageHeight-1,array("R"=>240,"G"=>240,"B"=>240,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0,));
+        $chartPicture->drawFilledRectangle(0, 0, $imageWidth - 1, $imageHeight - 1, array("R"=>240, "G"=>240, "B"=>240, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0,));
 
-        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf","FontSize"=>14));
+        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", "FontSize"=>14));
 
-        $chartPicture->drawText($imageWidth/2,20,$this->name,array("R"=>0,"G"=>0,"B"=>0,'Align'=>TEXT_ALIGN_TOPMIDDLE));
-        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf","FontSize"=>6));
+        $chartPicture->drawText($imageWidth / 2, 20, $this->name, array("R"=>0, "G"=>0, "B"=>0, 'Align'=>TEXT_ALIGN_TOPMIDDLE));
+        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", "FontSize"=>6));
 
-        $chartPicture->setGraphArea(60,60,$imageWidth-60,$imageHeight-100);
+        $chartPicture->setGraphArea(60, 60, $imageWidth - 60, $imageHeight - 100);
 
-        switch($this->type){
+        switch ($this->type) {
             case 'radar':
                 $this->buildChartImageRadar($chartPicture, $chartData, !empty($generateImageMapId));
                 break;
             case 'pie':
-                $this->buildChartImagePie($chartPicture,$chartData, $reportData,$imageHeight, $imageWidth, $xName, !empty($generateImageMapId));
+                $this->buildChartImagePie($chartPicture, $chartData, $reportData, $imageHeight, $imageWidth, $xName, !empty($generateImageMapId));
                 break;
             case 'line':
                 $this->buildChartImageLine($chartPicture, !empty($generateImageMapId));
@@ -203,50 +203,50 @@ 
                 $this->buildChartImageBar($chartPicture, !empty($generateImageMapId));
                 break;
         }
-        if($generateImageMapId) {
+        if ($generateImageMapId) {
             $chartPicture->replaceImageMapTitle("data", $labels);
         }
         ob_start();
         $chartPicture->render('');
         $img = ob_get_clean();
-        if($asDataURI){
+        if ($asDataURI) {
             return 'data:image/png;base64,'.base64_encode($img);
-        }else{
+        } else {
             return $img;
         }
     }
 
-    public function buildChartHTML(array $reportData, array $fields,$index = 0, $chartType = AOR_Report::CHART_TYPE_PCHART, AOR_Field $mainGroupField = null){
-        switch($chartType){
+    public function buildChartHTML(array $reportData, array $fields, $index = 0, $chartType = AOR_Report::CHART_TYPE_PCHART, AOR_Field $mainGroupField = null) {
+        switch ($chartType) {
             case AOR_Report::CHART_TYPE_PCHART:
-                return $this->buildChartHTMLPChart($reportData,$fields,$index);
+                return $this->buildChartHTMLPChart($reportData, $fields, $index);
             case AOR_Report::CHART_TYPE_CHARTJS:
-                return $this->buildChartHTMLChartJS($reportData,$fields);
+                return $this->buildChartHTMLChartJS($reportData, $fields);
             case AOR_Report::CHART_TYPE_RGRAPH:
-                return $this->buildChartHTMLRGraph($reportData,$fields, $mainGroupField);
+                return $this->buildChartHTMLRGraph($reportData, $fields, $mainGroupField);
         }
         return '';
     }
 
 
-    private function buildChartHTMLRGraph(array $reportData, array $fields, AOR_Field $mainGroupField = null){
+    private function buildChartHTMLRGraph(array $reportData, array $fields, AOR_Field $mainGroupField = null) {
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
         $defaultHeight = 500;
         $defaultWidth = 900;
 
-        switch($this->type){
+        switch ($this->type) {
             /*
              //Polar was not implemented for the previous library (it is not in the getValidChartTypes method)
             case 'polar':
@@ -257,56 +257,56 @@ 
             */
             case 'radar':
                 $chartFunction = 'Radar';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getRadarChartConfig();
-                $chart = $this->getRGraphRadarChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphRadarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'pie':
                 $chartFunction = 'Pie';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getPieChartConfig();
-                $chart = $this->getRGraphPieChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphPieChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'line':
                 $chartFunction = 'Line';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getLineChartConfig();
-                $chart = $this->getRGraphLineChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphLineChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'rose':
                 $chartFunction = 'Rose';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getRoseChartConfig();
-                $chart = $this->getRGraphRoseChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphRoseChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'grouped_bar':
                 $chartFunction = 'Grouped bar';
-                $data = $this->getRGraphGroupedBarChartData($reportData, $xName,$yName, $mainGroupField);
+                $data = $this->getRGraphGroupedBarChartData($reportData, $xName, $yName, $mainGroupField);
                 $config = $this->getGroupedBarChartConfig();
-                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth, true);
+                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth, true);
                 break;
             case 'stacked_bar':
                 $chartFunction = 'Stacked bar';
-                $data = $this->getRGraphGroupedBarChartData($reportData, $xName,$yName, $mainGroupField);
+                $data = $this->getRGraphGroupedBarChartData($reportData, $xName, $yName, $mainGroupField);
                 $config = $this->getStackedBarChartConfig();
-                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth, false);
+                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth, false);
                 break;
             case 'bar':
             default:
                 $chartFunction = 'Bar';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getBarChartConfig();
-                $chart = $this->getRGraphBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
         }
 
         return $chart;
     }
 
-    private function getRGraphRoseChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphRoseChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -340,14 +340,14 @@ 
     //I have not used a parameter for getRGraphBarChart to say whether to group etc, as the future development could be quite different
     //for both, hence the separate methods.  However, the $grouped parameter allows us to specify whether the chart is grouped (true)
     //or stacked (false)
-    private function getRGraphGroupedBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400, $grouped = false)
+    private function getRGraphGroupedBarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400, $grouped = false)
     {
         //$keys = array_keys($chartTooltips);
 
 
-        $i=0;
-        foreach($chartDataValues as $rowKey => $row) {
-            foreach($row as $key => $value) {
+        $i = 0;
+        foreach ($chartDataValues as $rowKey => $row) {
+            foreach ($row as $key => $value) {
                 $_tooltips[$rowKey][$key] = $chartTooltips[$i];
                 $i++;
             }
@@ -356,9 +356,9 @@ 
 
         $dataArray = json_decode($chartDataValues);
         $grouping = 'grouped'; //$mainGroupField->label; //'grouped';
-        if(!$grouped)
-            $grouping='stacked';
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!$grouped)
+            $grouping = 'stacked';
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -399,10 +399,10 @@ 
 
 
 
-    private function getRGraphBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphBarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -439,10 +439,10 @@ 
         return $html;
     }
 
-    private function getRGraphRadarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphRadarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -472,10 +472,10 @@ 
         return $html;
     }
 
-    private function getRGraphPieChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphPieChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -508,10 +508,10 @@ 
         return $html;
     }
 
-    private function getRGraphLineChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphLineChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -551,45 +551,45 @@ 
         return $html;
     }
 
-    private function buildChartHTMLChartJS(array $reportData, array $fields){
+    private function buildChartHTMLChartJS(array $reportData, array $fields) {
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
-        switch($this->type){
+        switch ($this->type) {
             case 'polar':
                 $chartFunction = 'PolarArea';
-                $data = $this->getPolarChartData($reportData, $xName,$yName);
+                $data = $this->getPolarChartData($reportData, $xName, $yName);
                 $config = $this->getPolarChartConfig();
                 break;
             case 'radar':
                 $chartFunction = 'Radar';
-                $data = $this->getRadarChartData($reportData, $xName,$yName);
+                $data = $this->getRadarChartData($reportData, $xName, $yName);
                 $config = $this->getRadarChartConfig();
                 break;
             case 'pie':
                 $chartFunction = 'Pie';
-                $data = $this->getPieChartData($reportData, $xName,$yName);
+                $data = $this->getPieChartData($reportData, $xName, $yName);
                 $config = $this->getPieChartConfig();
                 break;
             case 'line':
                 $chartFunction = 'Line';
-                $data = $this->getLineChartData($reportData, $xName,$yName);
+                $data = $this->getLineChartData($reportData, $xName, $yName);
                 $config = $this->getLineChartConfig();
                 break;
             case 'bar':
             default:
                 $chartFunction = 'Bar';
-                $data = $this->getBarChartData($reportData, $xName,$yName);
+                $data = $this->getBarChartData($reportData, $xName, $yName);
                 $config = $this->getBarChartConfig();
                 break;
         }
@@ -616,9 +616,9 @@ 
         return $html;
     }
 
-    private function buildChartHTMLPChart(array $reportData, array $fields,$index = 0){
+    private function buildChartHTMLPChart(array $reportData, array $fields, $index = 0) {
         $html = '';
-        $imgUri = $this->buildChartImage($reportData,$fields,true,$index);
+        $imgUri = $this->buildChartImage($reportData, $fields, true, $index);
         $img = "<img id='{$this->id}_img' src='{$imgUri}'>";
         $html .= $img;
         $html .= <<<EOF
@@ -633,24 +633,24 @@ 
 
     private function getShortenedLabel($label, $maxLabelSize = 20)
     {
-        if(strlen($label) > $maxLabelSize)
+        if (strlen($label) > $maxLabelSize)
         {
-            return substr($label,0,$maxLabelSize).'...';
+            return substr($label, 0, $maxLabelSize).'...';
         }
         else
             return $label;
     }
 
 
-    private function getRGraphGroupedBarChartData($reportData, $xName,$yName, AOR_Field $mainGroupField = null){
+    private function getRGraphGroupedBarChartData($reportData, $xName, $yName, AOR_Field $mainGroupField = null) {
 
 
         // get z-axis name
 
         $zName = null;
-        foreach($reportData[0] as $key => $value) {
+        foreach ($reportData[0] as $key => $value) {
             $field = str_replace(' ', '_', is_null($mainGroupField) ? 'no data' : $mainGroupField->label);
-            if (preg_match('/^' . $field . '[0-9]+/', $key)) {
+            if (preg_match('/^'.$field.'[0-9]+/', $key)) {
                 $zName = $key;
                 break;
             }
@@ -664,20 +664,20 @@ 
         $tooltips = array();
 
         $usedKeys = array();
-        foreach($reportData as $key => $row) {
+        foreach ($reportData as $key => $row) {
             $filter = $row[$xName];
-            foreach($reportData as $key2 => $row2) {
-                if($row2[$xName] == $filter && !in_array($key, $usedKeys)) {
-                    $data      [ $row[$xName]  ]   [] = (float) $row[$yName];
-                    $tooltips  [ $row[$xName]  ]   [] = $row[$zName];
+            foreach ($reportData as $key2 => $row2) {
+                if ($row2[$xName] == $filter && !in_array($key, $usedKeys)) {
+                    $data      [$row[$xName]]   [] = (float)$row[$yName];
+                    $tooltips  [$row[$xName]]   [] = $row[$zName];
                     $usedKeys[] = $key;
                 }
             }
         }
 
         $_data = array();
-        foreach($data as $label => $values) {
-            foreach($values as $key => $value) {
+        foreach ($data as $label => $values) {
+            foreach ($values as $key => $value) {
                 $_data[$label][$tooltips[$label][$key]] = $value;
             }
         }
@@ -689,11 +689,11 @@ 
         $_data = array();
         $_labels = array();
         $_tooltips = array();
-        foreach($data as $label => $values) {
+        foreach ($data as $label => $values) {
             $_labels[] = $this->getShortenedLabel($label);
             $_values = array();
-            foreach($values as $tooltip => $value) {
-                $_tooltips[] = $tooltip . " ($value)";
+            foreach ($values as $tooltip => $value) {
+                $_tooltips[] = $tooltip." ($value)";
                 $_values[] = $value;
             }
             $_data[] = $_values;
@@ -711,11 +711,11 @@ 
 
     }
 
-    private function getRGraphBarChartData($reportData, $xName,$yName){
-        $chart['labels']=array();
-        $chart['data']=array();
-        $chart['tooltips']=array();
-        foreach($reportData as $row){
+    private function getRGraphBarChartData($reportData, $xName, $yName) {
+        $chart['labels'] = array();
+        $chart['data'] = array();
+        $chart['tooltips'] = array();
+        foreach ($reportData as $row) {
             $chart['labels'][] = $this->getShortenedLabel($row[$xName]);
             $chart['tooltips'][] = $row[$xName];
             $chart['data'][] = (float)$row[$yName];
@@ -725,11 +725,11 @@ 
     }
 
 
-    private function getBarChartData($reportData, $xName,$yName){
+    private function getBarChartData($reportData, $xName, $yName) {
         $data = array();
         $data['labels'] = array();
         $datasetData = array();
-        foreach($reportData as $row){
+        foreach ($reportData as $row) {
             $data['labels'][] = $row[$xName];
             $datasetData[] = $row[$yName];
         }
@@ -746,14 +746,14 @@ 
         return $data;
     }
 
-    private function getLineChartData($reportData, $xName,$yName){
-        return $this->getBarChartData($reportData, $xName,$yName);
+    private function getLineChartData($reportData, $xName, $yName) {
+        return $this->getBarChartData($reportData, $xName, $yName);
     }
 
-    private function getBarChartConfig(){
+    private function getBarChartConfig() {
         return array();
     }
-    private function getLineChartConfig(){
+    private function getLineChartConfig() {
         return $this->getBarChartConfig();
     }
 
@@ -767,36 +767,36 @@ 
         return $this->getBarChartConfig();
     }
 
-    private function getRoseChartConfig(){
+    private function getRoseChartConfig() {
         return $this->getBarChartConfig();
     }
 
-    private function getRadarChartData($reportData, $xName,$yName){
-        return $this->getBarChartData($reportData, $xName,$yName);
+    private function getRadarChartData($reportData, $xName, $yName) {
+        return $this->getBarChartData($reportData, $xName, $yName);
     }
 
-    private function getPolarChartData($reportData, $xName,$yName){
-        return $this->getPieChartData($reportData, $xName,$yName);
+    private function getPolarChartData($reportData, $xName, $yName) {
+        return $this->getPieChartData($reportData, $xName, $yName);
     }
 
-    private function getRadarChartConfig(){
+    private function getRadarChartConfig() {
         return array();
     }
 
-    private function getPolarChartConfig(){
+    private function getPolarChartConfig() {
         return $this->getPieChartConfig();
     }
-    private function getPieChartConfig(){
+    private function getPieChartConfig() {
         $config = array();
         $config['legendTemplate'] = "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\">&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>";
         return $config;
     }
 
-    private function getPieChartData($reportData, $xName,$yName){
+    private function getPieChartData($reportData, $xName, $yName) {
         $data = array();
 
-        foreach($reportData as $row){
-            if(!$row[$yName]){
+        foreach ($reportData as $row) {
+            if (!$row[$yName]) {
                 continue;
             }
             $colour = $this->getColour($row[$xName]);

modules/AOP_Case_Updates/Case_Updates.php

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 
-function display_updates($focus, $field, $value, $view){
+function display_updates($focus, $field, $value, $view) {
     global $mod_strings;
 
     $hideImage = SugarThemeRegistry::current()->getImageURL('basic_search.gif');
@@ -127,8 +127,8 @@ 
 </script>
 A;
 
-    $updates = $focus->get_linked_beans('aop_case_updates',"AOP_Case_Updates");
-    if(!$updates || is_null($focus->id)){
+    $updates = $focus->get_linked_beans('aop_case_updates', "AOP_Case_Updates");
+    if (!$updates || is_null($focus->id)) {
         $html .= quick_edit_case_updates($focus);
         return $html;
         //return $mod_strings['LBL_NO_CASE_UPDATES'];
@@ -154,18 +154,18 @@ 
 EOD;
 
 
-    usort($updates,function($a,$b){
+    usort($updates, function($a, $b) {
         $aDate = $a->fetched_row['date_entered'];
         $bDate = $b->fetched_row['date_entered'];
-        if($aDate < $bDate){
+        if ($aDate < $bDate) {
             return -1;
-        }elseif($aDate > $bDate){
+        }elseif ($aDate > $bDate) {
             return 1;
         }
         return 0;
     });
 
-    foreach($updates as $update){
+    foreach ($updates as $update) {
         $html .= display_single_update($update, $hideImage);
     }
     $html .= "</div>";
@@ -178,9 +178,9 @@ 
 /**
  * @return mixed|string|void
  */
-function display_update_form(){
+function display_update_form() {
     global $mod_strings, $app_strings;
-    $sugar_smarty	= new Sugar_Smarty();
+    $sugar_smarty = new Sugar_Smarty();
     $sugar_smarty->assign('MOD', $mod_strings);
     $sugar_smarty->assign('APP', $app_strings);
     return $sugar_smarty->fetch('modules/AOP_Case_Updates/tpl/caseUpdateForm.tpl');
@@ -191,23 +191,23 @@ 
  * @param SugarBean $update
  * @return string - html to be displayed
  */
-function getUpdateDisplayHead(SugarBean $update){
+function getUpdateDisplayHead(SugarBean $update) {
     global $mod_strings;
-    if($update->contact_id){
+    if ($update->contact_id) {
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    }elseif ($update->assigned_user_id) {
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else {
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
     $html .= "<img  id='caseUpdate".$update->id."Image' class='caseUpdateImage' src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."'>";
     $html .= "</a>";
-    $html .= "<span>".($update->internal ? "<strong>" . $mod_strings['LBL_INTERNAL'] . "</strong> " : '') .$name . " ".$update->date_entered."</span><br>";
-    $notes = $update->get_linked_beans('notes','Notes');
-    if($notes){
-        $html.= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
-        foreach($notes as $note){
+    $html .= "<span>".($update->internal ? "<strong>".$mod_strings['LBL_INTERNAL']."</strong> " : '').$name." ".$update->date_entered."</span><br>";
+    $notes = $update->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        $html .= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -220,12 +220,12 @@ 
  * @param AOP_Case_Updates $update
  * @return string - the html for the update
  */
-function display_single_update(AOP_Case_Updates $update){
+function display_single_update(AOP_Case_Updates $update) {
 
     /*if assigned user*/
-    if($update->assigned_user_id){
+    if ($update->assigned_user_id) {
         /*if internal update*/
-        if ($update->internal){
+        if ($update->internal) {
             $html = "<div id='caseStyleInternal'>".getUpdateDisplayHead($update);
             $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
             $html .= nl2br(html_entity_decode($update->description));
@@ -243,7 +243,7 @@ 
     }
 
     /*if contact user*/
-    if($update->contact_id){
+    if ($update->contact_id) {
         $html = "<div id='extramargin'><div id='caseStyleContact'>".getUpdateDisplayHead($update);
         $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
         $html .= nl2br(html_entity_decode($update->description));
@@ -259,11 +259,11 @@ 
  * @param $case
  * @return string - html link
  */
-function display_case_attachments($case){
+function display_case_attachments($case) {
     $html = '';
-    $notes = $case->get_linked_beans('notes','Notes');
-    if($notes){
-        foreach($notes as $note){
+    $notes = $case->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -277,11 +277,11 @@ 
  *
  * @return string - the html to be displayed and javascript
  */
-function quick_edit_case_updates($case){
+function quick_edit_case_updates($case) {
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if ($action != 'DetailView') return;
 
     //current record id
     $record = $_GET['record'];
@@ -294,12 +294,12 @@ 
     $roles = $acl->getUserRoles($id);
 
     //Return if user cannot edit cases
-    if(in_array( "no edit cases", $roles) || $roles === "no edit cases"){
+    if (in_array("no edit cases", $roles) || $roles === "no edit cases") {
 
         return;
     }
     $internalChecked = '';
-    if($case->internal){
+    if ($case->internal) {
         $internalChecked = "checked='checked'";
     }
     $html = <<< EOD

modules/AOP_Case_Updates/AOP_Case_Updates.php

Spacing +48 added lines, -48 removed lines

@@ -30,35 +30,35 @@ 
 require_once 'include/clean.php';
 class AOP_Case_Updates extends AOP_Case_Updates_sugar {
 
-    function AOP_Case_Updates(){
+    function AOP_Case_Updates() {
         parent::AOP_Case_Updates_sugar();
     }
 
-    function save($check_notify = false){
+    function save($check_notify = false) {
         $this->name = SugarCleaner::cleanHtml($this->name);
         $this->description = SugarCleaner::cleanHtml($this->description);
         global $current_user, $sugar_config;
         parent::save($check_notify);
         $email_template = new EmailTemplate();
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             //Don't send email on import
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if($this->internal){
+        if ($this->internal) {
             return;
         }
         $signature = array();
         $addDelimiter = true;
         $aop_config = $sugar_config['aop'];
-        if($this->assigned_user_id){
-            if($aop_config['contact_email_template_id']){
+        if ($this->assigned_user_id) {
+            if ($aop_config['contact_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['contact_email_template_id']);
                 $signature = $current_user->getDefaultSignature();
             }
-            if($email_template) {
+            if ($email_template) {
                 foreach ($this->getContacts() as $contact) {
                     $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
                     $emails = array();
@@ -66,15 +66,15 @@ 
                     $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $contact->id);
                 }
             }
-        }else{
+        } else {
             $emails = $this->getEmailForUser();
-            if($aop_config['user_email_template_id']){
+            if ($aop_config['user_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['user_email_template_id']);
             }
             $addDelimiter = false;
-            if($emails && $email_template){
+            if ($emails && $email_template) {
                 $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
-                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter,$this->contact_id);
+                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $this->contact_id);
             }
         }
 
@@ -83,68 +83,68 @@ 
     /**
      * @return aCase
      */
-    public function getCase(){
-        $case = BeanFactory::getBean("Cases",$this->case_id);
+    public function getCase() {
+        $case = BeanFactory::getBean("Cases", $this->case_id);
         return $case;
     }
 
-    public function getContacts(){
+    public function getContacts() {
         $case = $this->getCase();
-        if($case){
-            return $case->get_linked_beans("contacts","Contacts");
+        if ($case) {
+            return $case->get_linked_beans("contacts", "Contacts");
         }
         return null;
     }
 
-    public function getUpdateContact(){
-        if($this->contact_id){
-            return BeanFactory::getBean("Contacts",$this->contact_id);
+    public function getUpdateContact() {
+        if ($this->contact_id) {
+            return BeanFactory::getBean("Contacts", $this->contact_id);
         }
         return null;
     }
-    public function getUser(){
-        $user = BeanFactory::getBean('Users',$this->getCase()->assigned_user_id);
+    public function getUser() {
+        $user = BeanFactory::getBean('Users', $this->getCase()->assigned_user_id);
         return $user;
     }
-    public function getUpdateUser(){
-        $user = BeanFactory::getBean('Users',$this->assigned_user_id);
+    public function getUpdateUser() {
+        $user = BeanFactory::getBean('Users', $this->assigned_user_id);
         return $user;
     }
 
-    private function getEmailForUser(){
+    private function getEmailForUser() {
         $user = $this->getUser();
-        if($user){
+        if ($user) {
             return array($user->emailAddress->getPrimaryAddress($user));
         }
         return array();
     }
 
-    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null){
+    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $userId = '';
         $user = $this->getUpdateUser();
-        if(!$user){
+        if (!$user) {
             $this->getUser();
         }
-        $beans = array("Contacts" => $contactId,"Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
+        $beans = array("Contacts" => $contactId, "Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $body = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans);
-        $bodyAlt = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans);
-        if($addDelimiter){
-            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $body;
-            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $bodyAlt;
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $body = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans);
+        $bodyAlt = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans);
+        if ($addDelimiter) {
+            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$body;
+            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$bodyAlt;
         }
         $ret['body'] = from_html($body);
         $ret['body_alt'] = strip_tags(from_html($bodyAlt));
         return $ret;
     }
 
-    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null){
+    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null) {
         $GLOBALS['log']->info("AOPCaseUpdates: sendEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -152,35 +152,35 @@ 
         $mailer->setMailerForSystem();
 
         $signatureHTML = "";
-        if($signature && array_key_exists("signature_html",$signature)){
+        if ($signature && array_key_exists("signature_html", $signature)) {
             $signatureHTML = from_html($signature['signature_html']);
         }
         $signaturePlain = "";
-        if($signature && array_key_exists("signature",$signature)){
+        if ($signature && array_key_exists("signature", $signature)) {
             $signaturePlain = $signature['signature'];
         }
         $emailSettings = getPortalEmailSettings();
         $text = $this->populateTemplate($template, $addDelimiter, $contactId);
         $mailer->Subject = $text['subject'];
-        $mailer->Body = $text['body'] . $signatureHTML;
+        $mailer->Body = $text['body'].$signatureHTML;
         $mailer->IsHTML(true);
-        $mailer->AltBody = $text['body_alt'] . $signaturePlain;
+        $mailer->AltBody = $text['body_alt'].$signaturePlain;
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
-        foreach($emails as $email){
+        foreach ($emails as $email) {
             $mailer->AddAddress($email);
         }
-        if ($mailer->Send()){
+        if ($mailer->Send()) {
             require_once('modules/Emails/Email.php');
             $emailObj = new Email();
-            $emailObj->to_addrs = implode(",",$emails);
-            $emailObj->type= 'out';
+            $emailObj->to_addrs = implode(",", $emails);
+            $emailObj->type = 'out';
             $emailObj->deleted = '0';
             $emailObj->name = $mailer->Subject;
             $emailObj->description = $mailer->AltBody;
             $emailObj->description_html = $mailer->Body;
             $emailObj->from_addr = $mailer->From;
-            if ( $caseId) {
+            if ($caseId) {
                 $emailObj->parent_type = "Cases";
                 $emailObj->parent_id = $caseId;
             }
@@ -189,8 +189,8 @@ 
             $emailObj->created_by = '1';
             $emailObj->status = 'sent';
             $emailObj->save();
-        }else{
-            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  " . $mailer->ErrorInfo);
+        } else {
+            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  ".$mailer->ErrorInfo);
             return false;
         }
         return true;

modules/AOP_Case_Updates/CaseUpdatesHook.php

Spacing +104 added lines, -104 removed lines

@@ -25,27 +25,27 @@ 
 class CaseUpdatesHook {
     private $slug_size = 50;
 
-    private function getCaseCounts(){
+    private function getCaseCounts() {
         global $db;
         $counts = array();
         $r = $db->query("SELECT users.id,count(cases.id) AS c FROM users LEFT JOIN cases ON (cases.assigned_user_id = users.id AND cases.status != 'Closed' AND cases.status != 'Duplicate' AND cases.status != 'Rejected') WHERE NOT users.deleted GROUP BY users.id");
-        while($a = $db->fetchByAssoc($r)){
+        while ($a = $db->fetchByAssoc($r)) {
             $counts[$a['id']] = $a['c'];
         }
         return $counts;
     }
 
-    private function getAssignToUser(){
+    private function getAssignToUser() {
         require_once 'modules/AOP_Case_Updates/AOPAssignManager.php';
         $assignManager = new AOPAssignManager();
         return $assignManager->getNextAssignedUser();
     }
 
-    private function arrangeFilesArray(){
+    private function arrangeFilesArray() {
         $count = 0;
-        foreach($_FILES['case_update_file'] as $key => $vals){
-            foreach($vals as $index => $val){
-                if(!array_key_exists('case_update_file'.$index,$_FILES)){
+        foreach ($_FILES['case_update_file'] as $key => $vals) {
+            foreach ($vals as $index => $val) {
+                if (!array_key_exists('case_update_file'.$index, $_FILES)) {
                     $_FILES['case_update_file'.$index] = array();
                     $count++;
                 }
@@ -56,34 +56,34 @@ 
     }
 
 
-    public function saveUpdate($bean, $event, $arguments){
-        if(!isAOPEnabled()){
+    public function saveUpdate($bean, $event, $arguments) {
+        if (!isAOPEnabled()) {
             return;
         }
         global $current_user, $app_list_strings;
-        if(empty($bean->fetched_row) || !$bean->id){
+        if (empty($bean->fetched_row) || !$bean->id) {
 
-            if(!$bean->state){
+            if (!$bean->state) {
                 $bean->state = $app_list_strings['case_state_default_key'];
             }
-            if($bean->status == "New"){
+            if ($bean->status == "New") {
                 $bean->status = $app_list_strings['case_status_default_key'];
             }
 
             //New case - assign
-            if(!$bean->assigned_user_id){
+            if (!$bean->assigned_user_id) {
                 $userId = $this->getAssignToUser();
                 $bean->assigned_user_id = $userId;
                 $bean->notify_inworkflow = true;
             }
             return;
         }
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
         //Grab the update field and create a new update with it.
         $text = $bean->update_text;
-        if(!$text && empty($_FILES['case_update_file'])){
+        if (!$text && empty($_FILES['case_update_file'])) {
             //No text or files, so nothing really to save.
             return;
         }
@@ -93,8 +93,8 @@ 
         $case_update->internal = $bean->internal;
         $bean->internal = false;
         $case_update->assigned_user_id = $current_user->id;
-        if(strlen($text) > $this->slug_size){
-            $case_update->name = substr($text,0,$this->slug_size)."...";
+        if (strlen($text) > $this->slug_size) {
+            $case_update->name = substr($text, 0, $this->slug_size)."...";
         }
         $case_update->description = nl2br($text);
         $case_update->case_id = $bean->id;
@@ -102,12 +102,12 @@ 
 
         $fileCount = $this->arrangeFilesArray();
 
-        for($x = 0; $x < $fileCount; $x++){
-            if($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE){
+        for ($x = 0; $x < $fileCount; $x++) {
+            if ($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE) {
                 continue;
             }
             $uploadFile = new UploadFile('case_update_file'.$x);
-            if(!$uploadFile->confirm_upload()){
+            if (!$uploadFile->confirm_upload()) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -118,13 +118,13 @@ 
             $uploadFile->final_move($note->id);
         }
         $postPrefix = 'case_update_id_';
-        foreach($_POST as $key => $val){
-            if(strpos($key, $postPrefix) !== 0 || empty($val)){
+        foreach ($_POST as $key => $val) {
+            if (strpos($key, $postPrefix) !== 0 || empty($val)) {
                 continue;
             }
             //Val is selected doc id
-            $doc = BeanFactory::getBean('Documents',$val);
-            if(!$doc){
+            $doc = BeanFactory::getBean('Documents', $val);
+            if (!$doc) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -134,11 +134,11 @@ 
             $note->save();
             $srcFile = "upload://{$doc->document_revision_id}";
             $destFile = "upload://{$note->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
     }
 
-    private function newNote($caseUpdateId){
+    private function newNote($caseUpdateId) {
         $note = BeanFactory::newBean('Notes');
         $note->parent_type = 'AOP_Case_Updates';
         $note->parent_id = $caseUpdateId;
@@ -146,30 +146,30 @@ 
         return $note;
     }
 
-    private function linkAccountAndCase($case_id,$account_id){
-        if(!$account_id || !$case_id){
+    private function linkAccountAndCase($case_id, $account_id) {
+        if (!$account_id || !$case_id) {
             return;
         }
-        $case = BeanFactory::getBean("Cases",$case_id);
-        if(!$case->account_id){
+        $case = BeanFactory::getBean("Cases", $case_id);
+        if (!$case->account_id) {
             $case->account_id = $account_id;
             $case->save();
         }
     }
 
-    public function assignAccount($bean, $event, $arguments){
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+    public function assignAccount($bean, $event, $arguments) {
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         $contact->load_relationship("accounts");
-        if(!$contact || !$contact->account_id){
+        if (!$contact || !$contact->account_id) {
             return;
         }
-        $this->linkAccountAndCase($bean->id,$contact->account_id);
+        $this->linkAccountAndCase($bean->id, $contact->account_id);
     }
 
     /**
@@ -178,26 +178,26 @@ 
      * @param $event
      * @param $arguments
      */
-    public function saveEmailUpdate($bean, $event, $arguments){
+    public function saveEmailUpdate($bean, $event, $arguments) {
         global $mod_strings;
-        if($bean->intent != "createcase" || $bean->parent_type != "Cases"){
+        if ($bean->intent != "createcase" || $bean->parent_type != "Cases") {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate: Not a create case or wrong parent type");
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if(!$bean->parent_id ){
+        if (!$bean->parent_id) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate No parent id");
             return;
         }
 
-        if($bean->cases){
+        if ($bean->cases) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate cases already set");
             return;
         }
 
-        if($bean->fetched_row['parent_id']){
+        if ($bean->fetched_row['parent_id']) {
             //Will have been processed already
             return;
         }
@@ -206,10 +206,10 @@ 
         $ea = new SugarEmailAddress();
         $beans = $ea->getBeansByEmailAddress($bean->from_addr);
         $contact_id = null;
-        foreach($beans as $emailBean){
-            if($emailBean->module_name == "Contacts" && !empty($emailBean->id)){
+        foreach ($beans as $emailBean) {
+            if ($emailBean->module_name == "Contacts" && !empty($emailBean->id)) {
                 $contact_id = $emailBean->id;
-                $this->linkAccountAndCase($bean->parent_id,$emailBean->account_id);
+                $this->linkAccountAndCase($bean->parent_id, $emailBean->account_id);
             }
         }
         $case_update = new AOP_Case_Updates();
@@ -220,8 +220,8 @@ 
         $case_update->internal = false;
         $case_update->case_id = $bean->parent_id;
         $case_update->save();
-        $notes = $bean->get_linked_beans('notes','Notes');
-        foreach($notes as $note){
+        $notes = $bean->get_linked_beans('notes', 'Notes');
+        foreach ($notes as $note) {
             //Link notes to case update also
             $newNote = BeanFactory::newBean('Notes');
             $newNote->name = $note->name;
@@ -232,7 +232,7 @@ 
             $newNote->save();
             $srcFile = "upload://{$note->id}";
             $destFile = "upload://{$newNote->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
 
         $this->updateCaseStatus($case_update->case_id);
@@ -242,71 +242,71 @@ 
      * Changes the status of the supplied case based on the case_status_changes config values.
      * @param $caseId
      */
-    private function updateCaseStatus($caseId){
+    private function updateCaseStatus($caseId) {
         global $sugar_config;
-        if(empty($caseId)){
+        if (empty($caseId)) {
             return;
         }
-        if(empty($sugar_config['aop']['case_status_changes'])){
+        if (empty($sugar_config['aop']['case_status_changes'])) {
             return;
         }
-        $statusMap = json_decode($sugar_config['aop']['case_status_changes'],1);
-        if(empty($statusMap)){
+        $statusMap = json_decode($sugar_config['aop']['case_status_changes'], 1);
+        if (empty($statusMap)) {
             return;
         }
-        $case = BeanFactory::getBean('Cases',$caseId);
-        if(empty($case)){
+        $case = BeanFactory::getBean('Cases', $caseId);
+        if (empty($case)) {
             return;
         }
-        if(array_key_exists($case->status,$statusMap)){
+        if (array_key_exists($case->status, $statusMap)) {
             $case->status = $statusMap[$case->status];
-            $statusBits = explode('_',$case->status);
+            $statusBits = explode('_', $case->status);
             $case->state = array_shift($statusBits);
             $case->save();
         }
 
     }
 
-    private function unquoteEmail($text){
+    private function unquoteEmail($text) {
         global $app_strings;
         $text = html_entity_decode($text);
-        $text = preg_replace('/(\r\n|\r|\n)/s',"\n",$text);
-        $pos = strpos($text,$app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
-        if($pos !== false){
-            $text = substr($text,0,$pos);
+        $text = preg_replace('/(\r\n|\r|\n)/s', "\n", $text);
+        $pos = strpos($text, $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
+        if ($pos !== false) {
+            $text = substr($text, 0, $pos);
         }
         return $text;
     }
 
-    public function closureNotifyPrep($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotifyPrep($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state!= "Closed" || $bean->fetched_row['state'] == "Closed"){
+        if ($bean->state != "Closed" || $bean->fetched_row['state'] == "Closed") {
             $bean->send_closure_email = false;
-        }else{
+        } else {
             $bean->send_closure_email = true;
         }
 
     }
 
-    public function closureNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state != "Closed" || !$bean->send_closure_email){
+        if ($bean->state != "Closed" || !$bean->send_closure_email) {
             return;
         }
         $this->sendClosureEmail($bean, $arguments['related_bean']);
     }
 
-    private function sendClosureEmail(aCase $bean){
-        if(!isAOPEnabled()){
+    private function sendClosureEmail(aCase $bean) {
+        if (!isAOPEnabled()) {
             return;
         }
         $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -317,15 +317,15 @@ 
         $aop_config = $this->getAOPConfig();
         $email_template = $email_template->retrieve($aop_config['case_closure_email_template_id']);
 
-        if(!$email_template){
+        if (!$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail template is empty");
             return false;
         }
 
-        $contact = $bean->get_linked_beans("contacts","Contact");
-        if($contact){
+        $contact = $bean->get_linked_beans("contacts", "Contact");
+        if ($contact) {
             $contact = $contact[0];
-        }else{
+        } else {
             return false;
         }
 
@@ -342,10 +342,10 @@ 
         $email = $contact->emailAddress->getPrimaryAddress($contact);
 
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
@@ -358,25 +358,25 @@ 
      * @param $event
      * @param $arguments
      */
-    public function creationNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function creationNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!$bean->fetched_row){
+        if (!$bean->fetched_row) {
             return;
         }
-        if(!empty($arguments['related_bean'])){
+        if (!empty($arguments['related_bean'])) {
             $contact = $arguments['related_bean'];
-        }else{
-            $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        } else {
+            $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         }
         $this->sendCreationEmail($bean, $contact);
     }
 
-    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact){
+    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $beans = array(
@@ -385,26 +385,26 @@ 
             "Users" => $bean->assigned_user_id
         );
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans));
-        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans)));
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans));
+        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans)));
         return $ret;
     }
 
-    private function getAOPConfig(){
+    private function getAOPConfig() {
         global $sugar_config;
-        if(!array_key_exists("aop",$sugar_config)){
+        if (!array_key_exists("aop", $sugar_config)) {
             return array();
         }
         return $sugar_config['aop'];
     }
 
-    private function sendCreationEmail(aCase $bean, $contact){
-        if(!isAOPEnabled()){
+    private function sendCreationEmail(aCase $bean, $contact) {
+        if (!isAOPEnabled()) {
             return;
         }
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -415,7 +415,7 @@ 
 
         $aop_config = $this->getAOPConfig();
         $email_template = $email_template->retrieve($aop_config['case_creation_email_template_id']);
-        if(!$aop_config['case_creation_email_template_id'] || !$email_template){
+        if (!$aop_config['case_creation_email_template_id'] || !$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendCreationEmail template is empty");
             return false;
         }
@@ -429,24 +429,24 @@ 
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
         $email = $contact->emailAddress->getPrimaryAddress($contact);
-        if(empty($email) && !empty($contact->email1)){
+        if (empty($email) && !empty($contact->email1)) {
             $email = $contact->email1;
         }
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
     }
 
-    private function logEmail($email, $mailer, $caseId = null){
+    private function logEmail($email, $mailer, $caseId = null) {
         require_once('modules/Emails/Email.php');
         $emailObj = new Email();
         $emailObj->to_addrs = $email;
-        $emailObj->type= 'out';
+        $emailObj->type = 'out';
         $emailObj->deleted = '0';
         $emailObj->name = $mailer->Subject;
         $emailObj->description = $mailer->AltBody;
@@ -463,7 +463,7 @@ 
         $emailObj->save();
     }
 
-    public function filterHTML($bean, $event, $arguments){
-        $bean->description = SugarCleaner::cleanHtml($bean->description,true);
+    public function filterHTML($bean, $event, $arguments) {
+        $bean->description = SugarCleaner::cleanHtml($bean->description, true);
     }
 }

modules/AOR_Fields/AOR_Field.php

Spacing +12 added lines, -12 removed lines

@@ -82,11 +82,11 @@ 
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
-        $line_count = count($post_data[$key . 'field']);
+        $line_count = count($post_data[$key.'field']);
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $field = new AOR_Field();
                 $field->group_display = false;
@@ -102,22 +102,22 @@ 
 
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (is_array($post_data[$key . $field_name])) {
-                        if ($field_name != 'group_display' && isset($post_data[$key . $field_name][$i])) {
-                            if (is_array($post_data[$key . $field_name][$i])) {
-                                $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                    if (is_array($post_data[$key.$field_name])) {
+                        if ($field_name != 'group_display' && isset($post_data[$key.$field_name][$i])) {
+                            if (is_array($post_data[$key.$field_name][$i])) {
+                                $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                             } else if ($field_name == 'value') {
-                                $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $field->field, $post_data[$key . $field_name][$i]);
+                                $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $field->field, $post_data[$key.$field_name][$i]);
                             }
                             if ($field_name == 'module_path') {
-                                $post_data[$key . $field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key . $field_name][$i])));
+                                $post_data[$key.$field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_name][$i])));
                             }
-                            $field->$field_name = $post_data[$key . $field_name][$i];
+                            $field->$field_name = $post_data[$key.$field_name][$i];
                         }
-                    } else if (is_null($post_data[$key . $field_name])) {
+                    } else if (is_null($post_data[$key.$field_name])) {
                         // do nothing
                     } else {
-                        throw new Exception('illegal type in post data at key ' . $key . $field_name . ' ' . gettype($post_data[$key . $field_name]));
+                        throw new Exception('illegal type in post data at key '.$key.$field_name.' '.gettype($post_data[$key.$field_name]));
                     }
 
                 }