adamjakab / SuiteCRM

include/language/en_us.lang.php

Spacing +3 added lines, -3 removed lines

@@ -760,14 +760,14 @@
     ),
     'dom_switch_bool' => array('on' => 'Yes',
         'off' => 'No',
-        '' => 'No', ),
+        '' => 'No',),
 
     'dom_email_link_type' => array('sugar' => 'SuiteCRM Email Client',
-        'mailto' => 'External Email Client', ),
+        'mailto' => 'External Email Client',),
 
     'dom_email_editor_option' => array('' => 'Default Email Format',
         'html' => 'HTML Email',
-        'plain' => 'Plain Text Email', ),
+        'plain' => 'Plain Text Email',),
 
     'schedulers_times_dom' => array('not run' => 'Past Run Time, Not Executed',
         'ready' => 'Ready',

modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -114,24 +114,24 @@ 
         */
 
         $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'));
             $currency_symbol = $currency->symbol;
         }
-        $subtitle = translate('LBL_OPP_SIZE', 'Charts') . " " . $currency_symbol . "1" . translate('LBL_OPP_THOUSANDS', 'Charts');
+        $subtitle = translate('LBL_OPP_SIZE', 'Charts')." ".$currency_symbol."1".translate('LBL_OPP_THOUSANDS', 'Charts');
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $module = 'Opportunities';
-        $action =  'index';
-        $query =  'true';
+        $action = 'index';
+        $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'lead_source', 'sales_stage' );
+        $groupBy = array('lead_source', 'sales_stage');
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
+        if (count($this->lsbo_ids) > 0)
             $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
 
 
@@ -157,7 +157,7 @@ 
 
         $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>";
         }
@@ -253,43 +253,43 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        if (count($this->lsbo_ids) > 0)
+            $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->lsbo_ids)."') ";
+        if (count($this->lsbo_lead_sources) > 0)
+            $query .= "AND opportunities.lead_source IN ('".implode("','", $this->lsbo_lead_sources)."') ";
         else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+            $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
     }
 
-    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 $i)
+        foreach ($data as $i)
         {
             $key = $i["lead_source"];
             $keyDom = $i["lead_source_dom_option"];
             $stage = $i["sales_stage"];
             $stageDom = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,13 +66,13 @@ 
     {
         global $timedate;
 
-        if(empty($options['obm_date_start']))
+        if (empty($options['obm_date_start']))
             $options['obm_date_start'] = $timedate->nowDbDate();
 
-        if(empty($options['obm_date_end']))
+        if (empty($options['obm_date_end']))
             $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -92,7 +92,7 @@ 
     public function display()
     {
         $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'));
@@ -103,13 +103,13 @@ 
         $action = 'index';
         $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'm', 'sales_stage', );
+        $groupBy = array('m', 'sales_stage',);
 
 
         $data = $this->getChartData($this->constructQuery());
 
         //I have taken out the sort as this will throw off the labels we have calculated
-        $data = $this->sortData($data,'m', false, 'sales_stage', true, true);
+        $data = $this->sortData($data, 'm', false, 'sales_stage', true, true);
 
         $chartReadyData = $this->prepareChartData($data, $currency_symbol, $thousands_symbol);
         $canvasId = 'rGraphOutcomeByMonth'.uniqid();
@@ -129,7 +129,7 @@ 
         $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>";
         }
@@ -242,45 +242,45 @@ 
     protected function constructQuery()
     {
         $query = "SELECT sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'"))." as m, ".
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, ".
             "sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
-        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'",'date') .
-            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'",'date') .
+        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'", 'date').
             " AND opportunities.deleted=0";
         if (count($this->obm_ids) > 0)
-            $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+            $query .= " AND opportunities.assigned_user_id IN ('".implode("','", $this->obm_ids)."')";
         $query .= " GROUP BY sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'")) .
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'")).
             " ORDER BY m";
 
         return $query;
     }
 
-    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 $i)
+        foreach ($data as $i)
         {
             $key = $i["m"];
             $stage = $i["sales_stage"];
             $stage_dom_option = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

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['value']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
-            $chart['labels'][]=$i['value'];
-            $chart['data'][]=(int)$i['total'];
-            $total+=(int)$i['total'];
+            $chart['labelsAndValues'][] = $this->resizeLabel($i['value']).' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
+            $chart['labels'][] = $i['value'];
+            $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/AOR_Reports/aor_utils.php

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
     $fieldDisplay = $currentBean->field_name_map[$field]['vname'];
     $fieldDisplay = translate($fieldDisplay, $currentBean->module_dir);
     $fieldDisplay = trim($fieldDisplay, ':');
-    foreach($modulePathDisplay as &$module) {
+    foreach ($modulePathDisplay as &$module) {
         $module = isset($app_list_strings['aor_moduleList'][$module]) ? $app_list_strings['aor_moduleList'][$module] : (
             isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module
         );
@@ -73,7 +73,7 @@ 
 function requestToUserParameters()
 {
     $params = array();
-    if(isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
+    if (isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
         foreach ($_REQUEST['parameter_id'] as $key => $parameterId) {
             if ($_REQUEST['parameter_type'][$key] === 'Multi') {
                 $_REQUEST['parameter_value'][$key] = encodeMultienumValue(explode(',', $_REQUEST['parameter_value'][$key]));
@@ -163,7 +163,7 @@ 
     } else if ($date_time_period_list_selected == 'this_month') {
         $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m'), 1);
     } else if ($date_time_period_list_selected == 'last_month') {
-        $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m')-1, 1);
+        $datetime_period = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m') - 1, 1);
     } else if ($date_time_period_list_selected == 'this_quarter') {
         $thisMonth = $datetime_period->setDate($datetime_period->format('Y'), $datetime_period->format('m'), 1);
         if ($thisMonth >= $q[1]['start'] && $thisMonth <= $q[1]['end']) {
@@ -228,7 +228,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));