adamjakab / SuiteCRM

modules/AOS_Products/metadata/metafiles.php

Spacing +6 added lines, -6 removed lines

@@ -32,11 +32,11 @@
  */
 $module_name = 'AOS_Products';
  $metafiles[$module_name] = array(
-	'detailviewdefs'  => 	'modules/' . $module_name . '/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/' . $module_name . '/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/' . $module_name . '/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/' . $module_name . '/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/' . $module_name . '/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/' . $module_name . '/metadata/SearchFields.php',
+	'detailviewdefs'  => 	'modules/'.$module_name.'/metadata/detailviewdefs.php', 	
+	'editviewdefs'    => 	'modules/'.$module_name.'/metadata/editviewdefs.php',
+ 	'listviewdefs'    => 	'modules/'.$module_name.'/metadata/listviewdefs.php',
+ 	'searchdefs'      =>    'modules/'.$module_name.'/metadata/searchdefs.php',
+ 	'popupdefs'	      =>    'modules/'.$module_name.'/metadata/popupdefs.php',
+ 	'searchfields'	  =>    'modules/'.$module_name.'/metadata/SearchFields.php',
  );
 ?>

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
 $module_name = 'AOS_Products';
- $metafiles[$module_name] = array(
-	'detailviewdefs'  => 	'modules/' . $module_name . '/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/' . $module_name . '/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/' . $module_name . '/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/' . $module_name . '/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/' . $module_name . '/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/' . $module_name . '/metadata/SearchFields.php',
- );
+    $metafiles[$module_name] = array(
+    'detailviewdefs'  => 	'modules/' . $module_name . '/metadata/detailviewdefs.php', 	
+    'editviewdefs'    => 	'modules/' . $module_name . '/metadata/editviewdefs.php',
+        'listviewdefs'    => 	'modules/' . $module_name . '/metadata/listviewdefs.php',
+        'searchdefs'      =>    'modules/' . $module_name . '/metadata/searchdefs.php',
+        'popupdefs'	      =>    'modules/' . $module_name . '/metadata/popupdefs.php',
+        'searchfields'	  =>    'modules/' . $module_name . '/metadata/SearchFields.php',
+    );
 ?>

modules/AOS_Products/metadata/listviewdefs.php

Indentation +24 added lines, -24 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 $listViewDefs ['AOS_Products'] = 
 array (
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
-  ),
-  'PART_NUMBER' => 
-  array (
+    ),
+    'PART_NUMBER' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PART_NUMBER',
     'default' => true,
-  ),
-  'COST' => 
-  array (
+    ),
+    'COST' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_COST',
     'currency_format' => true,
     'default' => true,
-  ),
-  'PRICE' => 
-  array (
+    ),
+    'PRICE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRICE',
     'currency_format' => true,
     'default' => true,
-  ),
-  'AOS_PRODUCT_CATEGORY_NAME' => 
-  array (
+    ),
+    'AOS_PRODUCT_CATEGORY_NAME' => 
+    array (
     'type' => 'relate',
     'studio' => 'visible',
     'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
@@ -38,24 +38,24 @@ 
     'width' => '10%',
     'default' => true,
     'related_fields' =>
-      array (
-          'aos_product_category_id',
-      ),
-  ),
-  'CREATED_BY_NAME' => 
-  array (
+        array (
+            'aos_product_category_id',
+        ),
+    ),
+    'CREATED_BY_NAME' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_CREATED',
     'default' => true,
     'module' => 'Users',
     'link' => true,
     'id' => 'CREATED_BY',
-  ),
-  'DATE_ENTERED' => 
-  array (
+    ),
+    'DATE_ENTERED' => 
+    array (
     'width' => '5%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,
-  ),
+    ),
 );
 ?>

Spacing +9 added lines, -9 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 $listViewDefs ['AOS_Products'] = 
-array (
+array(
   'NAME' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
   ),
   'PART_NUMBER' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PART_NUMBER',
     'default' => true,
   ),
   'COST' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_COST',
     'currency_format' => true,
     'default' => true,
   ),
   'PRICE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRICE',
     'currency_format' => true,
     'default' => true,
   ),
   'AOS_PRODUCT_CATEGORY_NAME' => 
-  array (
+  array(
     'type' => 'relate',
     'studio' => 'visible',
     'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
@@ -38,12 +38,12 @@ 
     'width' => '10%',
     'default' => true,
     'related_fields' =>
-      array (
+      array(
           'aos_product_category_id',
       ),
   ),
   'CREATED_BY_NAME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_CREATED',
     'default' => true,
@@ -52,7 +52,7 @@ 
     'id' => 'CREATED_BY',
   ),
   'DATE_ENTERED' => 
-  array (
+  array(
     'width' => '5%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,

modules/AOS_Products/metadata/sidecreateviewdefs.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /**
  * Products, Quotations & Invoices modules.
  * Extensions to SugarCRM
@@ -40,16 +40,16 @@ 
                                             array('label' => '10', 'field' => '30'),
                                          ),
                         ),
- 'panels' =>array (
+ 'panels' =>array(
   'DEFAULT' =>
-  array (
+  array(
     array(
-      array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
+      array('name'=>'name', 'displayParams'=>array('required'=>true, 'size'=>20)),
     ),
-    array (
-      array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
+    array(
+      array('name'=>'description', 'displayParams'=>array('rows'=>3, 'cols'=>20)),
     ),
-    array (
+    array(
       array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
     ),
   ),

Indentation +16 added lines, -16 removed lines

@@ -29,32 +29,32 @@
 $module_name = 'AOS_Products';
 $viewdefs[$module_name]['SideQuickCreate'] = array(
     'templateMeta' => array('form'=>array('buttons'=>array('SAVE'),
-    								      'button_location'=>'bottom',
-                                          'headerTpl'=>'include/EditView/header.tpl',
-                                          'footerTpl'=>'include/EditView/footer.tpl',
-                                          ),
-							'maxColumns' => '1',
-							'panelClass'=>'none',
-							'labelsOnTop'=>true,
+                                            'button_location'=>'bottom',
+                                            'headerTpl'=>'include/EditView/header.tpl',
+                                            'footerTpl'=>'include/EditView/footer.tpl',
+                                            ),
+                            'maxColumns' => '1',
+                            'panelClass'=>'none',
+                            'labelsOnTop'=>true,
                             'widths' => array(
                                             array('label' => '10', 'field' => '30'),
-                                         ),
+                                            ),
                         ),
- 'panels' =>array (
-  'DEFAULT' =>
-  array (
+    'panels' =>array (
+    'DEFAULT' =>
+    array (
     array(
-      array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
+        array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
     ),
     array (
-      array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
+        array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
     ),
     array (
-      array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
+        array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
+    ),
     ),
-  ),
 
- )
+    )
 
 
 );

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/TableDictionary.php

Indentation +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
 include('metadata/securitygroups_usersMetaData.php');
 
 if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
-	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
+    include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
 }
 ?>

Spacing +2 added lines, -2 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.
@@ -124,7 +124,7 @@ 
 include('metadata/securitygroups_recordsMetaData.php');
 include('metadata/securitygroups_usersMetaData.php');
 
-if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
+if (file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')) {
 	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
 }
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/AOR_Charts/AOR_Chart.php

Braces +6 added lines, -5 removed lines

@@ -211,7 +211,7 @@ 
         $img = ob_get_clean();
         if($asDataURI){
             return 'data:image/png;base64,'.base64_encode($img);
-        }else{
+        } else{
             return $img;
         }
     }
@@ -356,8 +356,9 @@ 
 
         $dataArray = json_decode($chartDataValues);
         $grouping = 'grouped'; //$mainGroupField->label; //'grouped';
-        if(!$grouped)
-            $grouping='stacked';
+        if(!$grouped) {
+                    $grouping='stacked';
+        }
         if(!is_array($dataArray)||count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
@@ -631,9 +632,9 @@ 
         if(strlen($label) > $maxLabelSize)
         {
             return substr($label,0,$maxLabelSize).'...';
+        } else {
+                    return $label;
         }
-        else
-            return $label;
     }
 
 

Doc Comments +73 added lines

@@ -56,6 +56,9 @@ 
 		parent::Basic();
 	}
 
+    /**
+     * @param string $postKey
+     */
     function save_lines(array $post,AOR_Report $bean,$postKey){
         $seenIds = array();
         if(isset($post[$postKey.'id'])) {
@@ -105,12 +108,23 @@ 
         return array('main'=>$main,'highlight'=>$highlight);
     }
 
+    /**
+     * @param pImage $chartPicture
+     */
     function buildChartImageBar($chartPicture,$recordImageMap = false){
         $scaleSettings = array("DrawSubTicks" => false, "LabelRotation" => 30, 'MinDivHeight' => 50);
         $chartPicture->drawScale($scaleSettings);
         $chartPicture->drawBarChart(array("RecordImageMap"=>$recordImageMap));
     }
 
+    /**
+     * @param pImage $chartPicture
+     * @param pData $chartData
+     * @param integer $imageHeight
+     * @param integer $imageWidth
+     * @param string $xName
+     * @param boolean $recordImageMap
+     */
     function buildChartImagePie($chartPicture,$chartData, $reportData,$imageHeight, $imageWidth, $xName,$recordImageMap){
         $PieChart = new pPie($chartPicture,$chartData);
         $x = 0;
@@ -122,12 +136,20 @@ 
         $PieChart->drawPieLegend($imageWidth*0.7,$imageHeight/3, array('FontSize'=>10,"FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf",'BoxSize'=>14));
     }
 
+    /**
+     * @param pImage $chartPicture
+     */
     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));
     }
 
+    /**
+     * @param pImage $chartPicture
+     * @param pData $chartData
+     * @param boolean $recordImageMap
+     */
     function buildChartImageRadar($chartPicture, $chartData,$recordImageMap){
         $SplitChart = new pRadar();
         $Options = array("LabelPos"=>RADAR_LABELS_HORIZONTAL,"RecordImageMap"=>$recordImageMap);
@@ -303,6 +325,11 @@ 
         return $chart;
     }
 
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphRoseChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
@@ -340,6 +367,12 @@ 
     //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)
+
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphGroupedBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400, $grouped = false)
     {
         //$keys = array_keys($chartTooltips);
@@ -398,6 +431,11 @@ 
 
 
 
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
@@ -437,6 +475,11 @@ 
         return $html;
     }
 
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphRadarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
@@ -469,6 +512,11 @@ 
         return $html;
     }
 
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphPieChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
@@ -505,6 +553,11 @@ 
         return $html;
     }
 
+    /**
+     * @param string $chartDataValues
+     * @param string $chartLabelValues
+     * @param string $chartTooltips
+     */
     private function getRGraphLineChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName= '', $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
@@ -637,6 +690,10 @@ 
     }
 
 
+    /**
+     * @param string $xName
+     * @param string $yName
+     */
     private function getRGraphGroupedBarChartData($reportData, $xName,$yName, AOR_Field $mainGroupField){
 
 
@@ -706,6 +763,10 @@ 
 
     }
 
+    /**
+     * @param string $xName
+     * @param string $yName
+     */
     private function getRGraphBarChartData($reportData, $xName,$yName){
         $chart['labels']=array();
         $chart['data']=array();
@@ -753,6 +814,10 @@ 
         return '';
     }
 
+    /**
+     * @param string $xName
+     * @param string $yName
+     */
     private function getLineChartData($reportData, $xName,$yName){
         return $this->getBarChartData($reportData, $xName,$yName);
     }
@@ -778,10 +843,18 @@ 
         return $this->getBarChartConfig();
     }
 
+    /**
+     * @param string $xName
+     * @param string $yName
+     */
     private function getRadarChartData($reportData, $xName,$yName){
         return $this->getBarChartData($reportData, $xName,$yName);
     }
 
+    /**
+     * @param string $xName
+     * @param string $yName
+     */
     private function getPolarChartData($reportData, $xName,$yName){
         return $this->getPieChartData($reportData, $xName,$yName);
     }

Indentation +22 added lines, -22 removed lines

@@ -25,25 +25,25 @@ 
 class AOR_Chart extends Basic {
 
     var $colours = "['#1f78b4','#a6cee3','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928','#144c73','#6caed1','#8acf4e','#20641c','#f8514f','#9e1214','#fc9d24','#b35900','#a880bb','#442763','#ffff4d','#733a1a']";
-	var $new_schema = true;
-	var $module_dir = 'AOR_Charts';
-	var $object_name = 'AOR_Chart';
-	var $table_name = 'aor_charts';
-	var $importable = true;
-	var $disable_row_level_security = true ;
-
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
+    var $new_schema = true;
+    var $module_dir = 'AOR_Charts';
+    var $object_name = 'AOR_Chart';
+    var $table_name = 'aor_charts';
+    var $importable = true;
+    var $disable_row_level_security = true ;
+
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
 
     var $type;
     var $x_field;
@@ -52,9 +52,9 @@ 
 
 
 
-	public function __construct(){
-		parent::__construct();
-	}
+    public function __construct(){
+        parent::__construct();
+    }
 
     function save_lines(array $post,AOR_Report $bean,$postKey){
         $seenIds = array();

Spacing +144 added lines, -144 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 @@ 
 
 
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 	}
 
-    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,13 +340,13 @@ 
     //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)
     {
         $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>";
         }
@@ -387,10 +387,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>";
         }
@@ -427,10 +427,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>";
         }
@@ -460,10 +460,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>";
         }
@@ -496,10 +496,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>";
         }
@@ -539,45 +539,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;
         }
@@ -604,9 +604,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
@@ -621,24 +621,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;
             }
@@ -652,20 +652,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]  ]   [] = isset($row[$zName]) ? $row[$zName] : null;
+            foreach ($reportData as $key2 => $row2) {
+                if ($row2[$xName] == $filter && !in_array($key, $usedKeys)) {
+                    $data      [$row[$xName]]   [] = (float)$row[$yName];
+                    $tooltips  [$row[$xName]]   [] = isset($row[$zName]) ? $row[$zName] : null;
                     $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;
             }
         }
@@ -677,11 +677,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;
@@ -699,11 +699,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];
@@ -713,11 +713,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];
         }
@@ -734,14 +734,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();
     }
 
@@ -755,36 +755,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/AOS_Products_Quotes/Line_Items.php

Braces +9 added lines, -8 removed lines

@@ -84,8 +84,7 @@ 
             $html .= '<script>insertGroup();</script>';
         }
 
-    }
-    else if($view == 'DetailView'){
+    } else if($view == 'DetailView'){
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -111,7 +110,9 @@ 
 
             if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if($i != 0) {
+                    $html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                }
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -229,15 +230,13 @@ 
         if($type == 'Amount')
         {
             return currency_format_number($amount,$params )."</td>";
-        }
-        else if($locale->getPrecision())
+        } else if($locale->getPrecision())
         {
             return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
         } else{
             return format_number($amount)."%";
         }
-    }
-    else
+    } else
     {
         return "-";
     }
@@ -248,7 +247,9 @@ 
     if($view == 'EditView'){
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if($value != '') {
+            $value = format_number($value);
+        }
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  * @author SalesAgility <info@salesagility.com>
  */
 
-function display_lines($focus, $field, $value, $view){
+function display_lines($focus, $field, $value, $view) {
 
     global $sugar_config, $locale, $app_list_strings, $mod_strings;
 
@@ -31,10 +31,10 @@ 
 
     $html = '';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOS_Products_Quotes/line_items.js"></script>';
-        if(file_exists('custom/modules/AOS_Products_Quotes/line_items.js')){
+        if (file_exists('custom/modules/AOS_Products_Quotes/line_items.js')) {
             $html .= '<script src="custom/modules/AOS_Products_Quotes/line_items.js"></script>';
         }
         $html .= '<script language="javascript">var sig_digits = '.$locale->getPrecision().';';
@@ -45,18 +45,18 @@ 
 
         $html .= "<table border='0' cellspacing='4' width='37.5%' id='lineItems'></table>";
 
-        if($enable_groups){
+        if ($enable_groups) {
             $html .= "<div style='padding-top: 10px; padding-bottom:10px;'>";
             $html .= "<input type=\"button\" tabindex=\"116\" class=\"button\" value=\"".$mod_strings['LBL_ADD_GROUP']."\" id=\"addGroup\" onclick=\"insertGroup(0)\" />";
             $html .= "</div>";
         }
         $html .= '<input type="hidden" name="vathidden" id="vathidden" value="'.get_select_options_with_id($app_list_strings['vat_list'], '').'">
 				  <input type="hidden" name="discounthidden" id="discounthidden" value="'.get_select_options_with_id($app_list_strings['discount_list'], '').'">';
-        if($focus->id != '') {
+        if ($focus->id != '') {
             require_once('modules/AOS_Products_Quotes/AOS_Products_Quotes.php');
             require_once('modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php');
 
-            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '" . $focus->object_name . "' AND pg.parent_id = '" . $focus->id . "' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
+            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
 
             $result = $focus->db->query($sql);
             $html .= "<script>
@@ -75,17 +75,17 @@ 
                     $group_item = json_encode($group_item->toArray());
                 }
                 $html .= "<script>
-                        insertLineItems(" . $line_item . "," . $group_item . ");
+                        insertLineItems(" . $line_item.",".$group_item.");
                     </script>";
 
             }
         }
-        if(!$enable_groups){
+        if (!$enable_groups) {
             $html .= '<script>insertGroup();</script>';
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -109,9 +109,9 @@ 
             $line_item->retrieve($row['id']);
 
 
-            if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
+            if ($enable_groups && ($group_id != $row['group_id'] || $i == 0)) {
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if ($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -152,8 +152,8 @@ 
                 $groupEnd .= "<td class='tabDetailViewDL' style='text-align: right;padding:2px;'>".currency_format_number($group_item->total_amount, $params)."</td>";
                 $groupEnd .= "</tr>";
             }
-            if($line_item->product_id != '0' && $line_item->product_id != null){
-                if($productCount == 0)
+            if ($line_item->product_id != '0' && $line_item->product_id != null) {
+                if ($productCount == 0)
                 {
                     $product .= "<tr>";
                     $product .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -169,26 +169,26 @@ 
                 }
 
                 $product .= "<tr>";
-                $product_note = wordwrap($line_item->description,40,"<br />\n");
+                $product_note = wordwrap($line_item->description, 40, "<br />\n");
                 $product .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$productCount."</td>";
-                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty),$sep[1])."</td>";
+                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty), $sep[1])."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='padding:2px;'><a href='index.php?module=AOS_Products&action=DetailView&record=".$line_item->product_id."' class='tabDetailViewDFLink'>".$line_item->name."</a><br />".$product_note."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params )."</td>";
-                if($locale->getPrecision()){
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'),$sep[1])."%</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
+                if ($locale->getPrecision()) {
+                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
                 } else {
                     $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".format_number($line_item->vat)."%</td>";
                 }
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $product .= "</tr>";
             } else {
-                if($serviceCount == 0)
+                if ($serviceCount == 0)
                 {
                     $service .= "<tr>";
                     $service .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -205,15 +205,15 @@ 
                 $service .= "<tr>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$serviceCount."</td>";
                 $service .= "<td class='tabDetailViewDF' style='padding:2px;' colspan='2'>".$line_item->name."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
 
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $service .= "</tr>";
 
             }
@@ -230,22 +230,22 @@ 
 //field was 0.
 //The approach below will strip off the fractional part if it is only zeroes (and in this case the decimal separator
 //will also be stripped off) The custom decimal separator is passed in to the function from the locale settings
-function stripDecimalPointsAndTrailingZeroes($inputString,$decimalSeparator)
+function stripDecimalPointsAndTrailingZeroes($inputString, $decimalSeparator)
 {
-    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/','',$inputString);
+    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/', '', $inputString);
 }
 
-function get_discount_string($type, $amount, $params, $locale, $sep){
-    if($amount != '' && $amount != '0.00')
+function get_discount_string($type, $amount, $params, $locale, $sep) {
+    if ($amount != '' && $amount != '0.00')
     {
-        if($type == 'Amount')
+        if ($type == 'Amount')
         {
-            return currency_format_number($amount,$params )."</td>";
+            return currency_format_number($amount, $params)."</td>";
         }
-        else if($locale->getPrecision())
+        else if ($locale->getPrecision())
         {
-            return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
-        } else{
+            return rtrim(rtrim(format_number($amount), '0'), $sep[1])."%";
+        } else {
             return format_number($amount)."%";
         }
     }
@@ -255,12 +255,12 @@ 
     }
 }
 
-function display_shipping_vat($focus, $field, $value, $view){
+function display_shipping_vat($focus, $field, $value, $view) {
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if ($value != '') $value = format_number($value);
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

Doc Comments +3 added lines

@@ -230,6 +230,9 @@
 //field was 0.
 //The approach below will strip off the fractional part if it is only zeroes (and in this case the decimal separator
 //will also be stripped off) The custom decimal separator is passed in to the function from the locale settings
+/**
+ * @param string $inputString
+ */
 function stripDecimalPointsAndTrailingZeroes($inputString,$decimalSeparator)
 {
     return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/','',$inputString);

modules/AOS_Products_Quotes/vardefs.php

Indentation +98 added lines, -98 removed lines

@@ -23,43 +23,43 @@ 
  */
 
 $dictionary['AOS_Products_Quotes'] = array(
-	'table'=>'aos_products_quotes',
-	'audited'=>true,
-	'fields'=>array (
-  'name' => 
+    'table'=>'aos_products_quotes',
+    'audited'=>true,
+    'fields'=>array (
+    'name' => 
     array (
-      'name' => 'name',
-      'vname' => 'LBL_NAME',
-      'type' => 'text',
-      'link' => true,
-      'unified_search' => true,
-      'required' => true,
-      'importable' => 'required',
+        'name' => 'name',
+        'vname' => 'LBL_NAME',
+        'type' => 'text',
+        'link' => true,
+        'unified_search' => true,
+        'required' => true,
+        'importable' => 'required',
     ),
     'currency_id' =>
-     array (
-      'required' => false,
-      'name' => 'currency_id',
-      'vname' => 'LBL_CURRENCY',
-      'type' => 'id',
-      'massupdate' => 0,
-      'comments' => '',
-      'help' => '',
-      'importable' => 'true',
-      'duplicate_merge' => 'disabled',
-      'duplicate_merge_dom_value' => 0,
-      'audited' => false,
-      'reportable' => false,
-      'len' => 36,
-      'size' => '20',
-      'studio' => 'visible',
-      'function' =>
+        array (
+        'required' => false,
+        'name' => 'currency_id',
+        'vname' => 'LBL_CURRENCY',
+        'type' => 'id',
+        'massupdate' => 0,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => 0,
+        'audited' => false,
+        'reportable' => false,
+        'len' => 36,
+        'size' => '20',
+        'studio' => 'visible',
+        'function' =>
         array (
             'name' => 'getCurrencyDropDown',
             'returns' => 'html',
         ),
     ),
-  'part_number' =>
+    'part_number' =>
     array (
         'required' => false,
         'name' => 'part_number',
@@ -90,8 +90,8 @@ 
             'rows' => 6,
             'cols' => 80,
         ),
-  'number' => 
-  array (
+    'number' => 
+    array (
     'required' => false,
     'name' => 'number',
     'vname' => 'LBL_LIST_NUM',
@@ -106,9 +106,9 @@ 
     'reportable' => true,
     'len' => '11',
     'disable_num_format' => '',
-  ),
-  'product_qty' => 
-  array (
+    ),
+    'product_qty' => 
+    array (
     'required' => false,
     'name' => 'product_qty',
     'vname' => 'LBL_PRODUCT_QTY',
@@ -125,9 +125,9 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'precision' => '4',
-  ),
-  'product_cost_price' => 
-  array (
+    ),
+    'product_cost_price' => 
+    array (
     'required' => false,
     'name' => 'product_cost_price',
     'vname' => 'LBL_PRODUCT_COST_PRICE',
@@ -141,7 +141,7 @@ 
     'audited' => 0,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_cost_price_usdollar' =>
             array (
                 'name' => 'product_cost_price_usdollar',
@@ -159,8 +159,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_list_price' => 
-  array (
+    'product_list_price' => 
+    array (
     'required' => false,
     'name' => 'product_list_price',
     'vname' => 'LBL_PRODUCT_LIST_PRICE',
@@ -174,7 +174,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_list_price_usdollar' =>
             array (
                 'name' => 'product_list_price_usdollar',
@@ -192,8 +192,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_discount' => 
-  array (
+    'product_discount' => 
+    array (
     'required' => false,
     'name' => 'product_discount',
     'vname' => 'LBL_PRODUCT_DISCOUNT',
@@ -207,7 +207,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_discount_usdollar' =>
             array (
                 'name' => 'product_discount_usdollar',
@@ -225,8 +225,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_discount_amount' => 
-  array (
+    'product_discount_amount' => 
+    array (
     'required' => false,
     'name' => 'product_discount_amount',
     'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT',
@@ -240,7 +240,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_discount_amount_usdollar' =>
             array (
                 'name' => 'product_discount_amount_usdollar',
@@ -258,8 +258,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'discount' => 
-  array (
+    'discount' => 
+    array (
     'required' => false,
     'name' => 'discount',
     'vname' => 'LBL_DISCOUNT',
@@ -276,10 +276,10 @@ 
     'len' => 255,
     'options' => 'discount_list',
     'studio' => 'visible',
-  ),
+    ),
 
-  'product_unit_price' => 
-  array (
+    'product_unit_price' => 
+    array (
     'required' => '1',
     'name' => 'product_unit_price',
     'vname' => 'LBL_PRODUCT_UNIT_PRICE',
@@ -293,7 +293,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_unit_price_usdollar' =>
             array (
                 'name' => 'product_unit_price_usdollar',
@@ -311,8 +311,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'vat_amt' => 
-  array (
+    'vat_amt' => 
+    array (
     'required' => '1',
     'name' => 'vat_amt',
     'vname' => 'LBL_VAT_AMT',
@@ -326,7 +326,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'vat_amt_usdollar' =>
             array (
                 'name' => 'vat_amt_usdollar',
@@ -344,8 +344,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_total_price' => 
-  array (
+    'product_total_price' => 
+    array (
     'required' => '1',
     'name' => 'product_total_price',
     'vname' => 'LBL_PRODUCT_TOTAL_PRICE',
@@ -359,7 +359,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_total_price_usdollar' =>
             array (
                 'name' => 'product_total_price_usdollar',
@@ -377,8 +377,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'vat' => 
-  array (
+    'vat' => 
+    array (
     'required' => false,
     'name' => 'vat',
     'vname' => 'LBL_VAT',
@@ -395,9 +395,9 @@ 
     'len' => 100,
     'options' => 'vat_list',
     'studio' => 'visible',
-  ),
-  'parent_name' => 
-  array (
+    ),
+    'parent_name' => 
+    array (
     'required' => false,
     'source' => 'non-db',
     'name' => 'parent_name',
@@ -417,9 +417,9 @@ 
     'type_name' => 'parent_type',
     'id_name' => 'parent_id',
     'parent_type' => 'record_type_display',
-  ),
-  'parent_type' => 
-  array (
+    ),
+    'parent_type' => 
+    array (
     'required' => false,
     'name' => 'parent_type',
     'vname' => 'LBL_PARENT_TYPE',
@@ -435,9 +435,9 @@ 
     'len' => 100,
     'dbType' => 'varchar',
     'studio' => 'hidden',
-  ),
-  'parent_id' => 
-  array (
+    ),
+    'parent_id' => 
+    array (
     'required' => false,
     'name' => 'parent_id',
     'vname' => 'LBL_PARENT_ID',
@@ -451,9 +451,9 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-  'product_id' => 
-  array (
+    ),
+    'product_id' => 
+    array (
     'required' => false,
     'name' => 'product_id',
     'vname' => '',
@@ -467,9 +467,9 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-  'group_name' =>
-  array(
+    ),
+    'group_name' =>
+    array(
     'name'=>'group_name',
     'rname'=>'name',
     'vname' => 'LBL_GROUP_NAME',
@@ -480,9 +480,9 @@ 
     'id_name' => 'group_id',
     'module'=>'AOS_Line_Item_Groups',
     'duplicate_merge'=>'disabled',
-  ),
-  'group_id' => 
-  array (
+    ),
+    'group_id' => 
+    array (
     'required' => false,
     'name' => 'group_id',
     'vname' => '',
@@ -496,37 +496,37 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-   'aos_products' =>
-  array (
-  'name' => 'aos_products',
+    ),
+    'aos_products' =>
+    array (
+    'name' => 'aos_products',
     'type' => 'link',
     'relationship' => 'aos_product_quotes_aos_products',
     'module'=>'AOS_Products',
     'bean_name'=>'AOS_Products',
     'source'=>'non-db',
- ),
+    ),
 ),
 'indices' => array (
     array (
-    	'name' => 'idx_aospq_par_del',
-    	'type' => 'index',
-    	'fields' => array('parent_id','parent_type','deleted')
+        'name' => 'idx_aospq_par_del',
+        'type' => 'index',
+        'fields' => array('parent_id','parent_type','deleted')
     )
 ),
 'relationships'=>array (
-	'aos_product_quotes_aos_products' =>
-	array (
-	'lhs_module'=> 'AOS_Products', 
-	'lhs_table'=> 'aos_products', 
-	'lhs_key' => 'id',
-	'rhs_module'=> 'AOS_Products_Quotes', 
-	'rhs_table'=> 'aos_products_quotes', 
-	'rhs_key' => 'product_id',
-	'relationship_type'=>'one-to-many',
-	),
+    'aos_product_quotes_aos_products' =>
+    array (
+    'lhs_module'=> 'AOS_Products', 
+    'lhs_table'=> 'aos_products', 
+    'lhs_key' => 'id',
+    'rhs_module'=> 'AOS_Products_Quotes', 
+    'rhs_table'=> 'aos_products_quotes', 
+    'rhs_key' => 'product_id',
+    'relationship_type'=>'one-to-many',
+    ),
 ),
-	'optimistic_lock'=>true,
+    'optimistic_lock'=>true,
 );
 require_once('include/SugarObjects/VardefManager.php');
 VardefManager::createVardef('AOS_Products_Quotes','AOS_Products_Quotes', array('basic','assignable'));

Spacing +36 added lines, -36 removed lines

@@ -25,9 +25,9 @@ 
 $dictionary['AOS_Products_Quotes'] = array(
 	'table'=>'aos_products_quotes',
 	'audited'=>true,
-	'fields'=>array (
+	'fields'=>array(
   'name' => 
-    array (
+    array(
       'name' => 'name',
       'vname' => 'LBL_NAME',
       'type' => 'text',
@@ -37,7 +37,7 @@ 
       'importable' => 'required',
     ),
     'currency_id' =>
-     array (
+     array(
       'required' => false,
       'name' => 'currency_id',
       'vname' => 'LBL_CURRENCY',
@@ -54,13 +54,13 @@ 
       'size' => '20',
       'studio' => 'visible',
       'function' =>
-        array (
+        array(
             'name' => 'getCurrencyDropDown',
             'returns' => 'html',
         ),
     ),
   'part_number' =>
-    array (
+    array(
         'required' => false,
         'name' => 'part_number',
         'vname' => 'LBL_PART_NUMBER',
@@ -82,7 +82,7 @@ 
         'id' => 'AOS_Products_Quotespart_number',
     ),
     'item_description' =>
-        array (
+        array(
             'name' => 'item_description',
             'vname' => 'LBL_PRODUCT_DESCRIPTION',
             'type' => 'text',
@@ -91,7 +91,7 @@ 
             'cols' => 80,
         ),
   'number' => 
-  array (
+  array(
     'required' => false,
     'name' => 'number',
     'vname' => 'LBL_LIST_NUM',
@@ -108,7 +108,7 @@ 
     'disable_num_format' => '',
   ),
   'product_qty' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_qty',
     'vname' => 'LBL_PRODUCT_QTY',
@@ -127,7 +127,7 @@ 
     'precision' => '4',
   ),
   'product_cost_price' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_cost_price',
     'vname' => 'LBL_PRODUCT_COST_PRICE',
@@ -143,7 +143,7 @@ 
     'len' => '26,6',
   ),
         'product_cost_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_cost_price_usdollar',
                 'vname' => 'LBL_PRODUCT_COST_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -160,7 +160,7 @@ 
                 'len' => '26,6',
             ),
   'product_list_price' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_list_price',
     'vname' => 'LBL_PRODUCT_LIST_PRICE',
@@ -176,7 +176,7 @@ 
     'len' => '26,6',
   ),
         'product_list_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_list_price_usdollar',
                 'vname' => 'LBL_PRODUCT_LIST_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -193,7 +193,7 @@ 
                 'len' => '26,6',
             ),
   'product_discount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_discount',
     'vname' => 'LBL_PRODUCT_DISCOUNT',
@@ -209,7 +209,7 @@ 
     'len' => '26,6',
   ),
         'product_discount_usdollar' =>
-            array (
+            array(
                 'name' => 'product_discount_usdollar',
                 'vname' => 'LBL_PRODUCT_DISCOUNT_USDOLLAR',
                 'type' => 'currency',
@@ -226,7 +226,7 @@ 
                 'len' => '26,6',
             ),
   'product_discount_amount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_discount_amount',
     'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT',
@@ -242,7 +242,7 @@ 
     'len' => '26,6',
   ),
         'product_discount_amount_usdollar' =>
-            array (
+            array(
                 'name' => 'product_discount_amount_usdollar',
                 'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT_USDOLLAR',
                 'type' => 'currency',
@@ -259,7 +259,7 @@ 
                 'len' => '26,6',
             ),
   'discount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'discount',
     'vname' => 'LBL_DISCOUNT',
@@ -279,7 +279,7 @@ 
   ),
 
   'product_unit_price' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'product_unit_price',
     'vname' => 'LBL_PRODUCT_UNIT_PRICE',
@@ -295,7 +295,7 @@ 
     'len' => '26,6',
   ),
         'product_unit_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_unit_price_usdollar',
                 'vname' => 'LBL_PRODUCT_UNIT_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -312,7 +312,7 @@ 
                 'len' => '26,6',
             ),
   'vat_amt' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'vat_amt',
     'vname' => 'LBL_VAT_AMT',
@@ -328,7 +328,7 @@ 
     'len' => '26,6',
   ),
         'vat_amt_usdollar' =>
-            array (
+            array(
                 'name' => 'vat_amt_usdollar',
                 'vname' => 'LBL_VAT_AMT_USDOLLAR',
                 'type' => 'currency',
@@ -345,7 +345,7 @@ 
                 'len' => '26,6',
             ),
   'product_total_price' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'product_total_price',
     'vname' => 'LBL_PRODUCT_TOTAL_PRICE',
@@ -361,7 +361,7 @@ 
     'len' => '26,6',
   ),
         'product_total_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_total_price_usdollar',
                 'vname' => 'LBL_PRODUCT_TOTAL_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -378,7 +378,7 @@ 
                 'len' => '26,6',
             ),
   'vat' => 
-  array (
+  array(
     'required' => false,
     'name' => 'vat',
     'vname' => 'LBL_VAT',
@@ -397,7 +397,7 @@ 
     'studio' => 'visible',
   ),
   'parent_name' => 
-  array (
+  array(
     'required' => false,
     'source' => 'non-db',
     'name' => 'parent_name',
@@ -419,7 +419,7 @@ 
     'parent_type' => 'record_type_display',
   ),
   'parent_type' => 
-  array (
+  array(
     'required' => false,
     'name' => 'parent_type',
     'vname' => 'LBL_PARENT_TYPE',
@@ -437,7 +437,7 @@ 
     'studio' => 'hidden',
   ),
   'parent_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'parent_id',
     'vname' => 'LBL_PARENT_ID',
@@ -453,7 +453,7 @@ 
     'len' => 36,
   ),
   'product_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_id',
     'vname' => '',
@@ -482,7 +482,7 @@ 
     'duplicate_merge'=>'disabled',
   ),
   'group_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'group_id',
     'vname' => '',
@@ -498,7 +498,7 @@ 
     'len' => 36,
   ),
    'aos_products' =>
-  array (
+  array(
   'name' => 'aos_products',
     'type' => 'link',
     'relationship' => 'aos_product_quotes_aos_products',
@@ -507,16 +507,16 @@ 
     'source'=>'non-db',
  ),
 ),
-'indices' => array (
-    array (
+'indices' => array(
+    array(
     	'name' => 'idx_aospq_par_del',
     	'type' => 'index',
-    	'fields' => array('parent_id','parent_type','deleted')
+    	'fields' => array('parent_id', 'parent_type', 'deleted')
     )
 ),
-'relationships'=>array (
+'relationships'=>array(
 	'aos_product_quotes_aos_products' =>
-	array (
+	array(
 	'lhs_module'=> 'AOS_Products', 
 	'lhs_table'=> 'aos_products', 
 	'lhs_key' => 'id',
@@ -529,4 +529,4 @@ 
 	'optimistic_lock'=>true,
 );
 require_once('include/SugarObjects/VardefManager.php');
-VardefManager::createVardef('AOS_Products_Quotes','AOS_Products_Quotes', array('basic','assignable'));
+VardefManager::createVardef('AOS_Products_Quotes', 'AOS_Products_Quotes', array('basic', 'assignable'));

modules/Home/About.php

Spacing +5 added lines, -5 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.
@@ -52,12 +52,12 @@ 
 <br>
 <b>
     <?php echo $mod_strings['LBL_VERSION']." ".$suitecrm_version;
-    if( is_file( "custom_version.php" ) ){
-        include( "custom_version.php" );
-        print( "&nbsp;&nbsp;&nbsp;" . $custom_version );
+    if (is_file("custom_version.php")) {
+        include("custom_version.php");
+        print("&nbsp;&nbsp;&nbsp;".$custom_version);
     }?>
 </b>
-<p>Sugar <?php echo $mod_strings['LBL_VERSION']." ".$sugar_version." (".$mod_strings['LBL_BUILD']." ".$sugar_build.")";?></p>
+<p>Sugar <?php echo $mod_strings['LBL_VERSION']." ".$sugar_version." (".$mod_strings['LBL_BUILD']." ".$sugar_build.")"; ?></p>
 <br>
 <h1><?php echo $mod_strings['LBL_CONTRIBUTOR_SUITECRM']; ?></h1>
 <table id="about_table" class="contentBox">

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Home/language/en_us.lang.php

Indentation +133 added lines, -133 removed lines

@@ -55,7 +55,7 @@ 
     'LBL_EMAIL_ADDRESS' => 'Email Address:',
     'LBL_MY_PIPELINE_FORM_TITLE' => 'My Pipeline',
     'LBL_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
-		'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
+        'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
     'LBL_CAMPAIGN_ROI_FORM_TITLE' => 'Campaign ROI',
     'LBL_MY_CLOSED_OPPORTUNITIES_GAUGE' => 'My Closed Won Opportunities Gauge',
     'LNK_NEW_CONTACT' => 'Create Contact',
@@ -80,35 +80,35 @@ 
     'LBL_NO_RESULTS' => '<h2>There were no results found. Please search again.</h2><br>',
     'LBL_NO_RESULTS_TIPS' => '<h3>Search Tips:</h3><ul><li>Make sure you have the proper categories selected above.</li><li>Broaden your search criteria.</li><li>If you still cannot find any results try the advanced search option.</li></ul>',
 
-  'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
-  'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
-  'LBL_ADD_PAGE' => 'Add Page',
-  'LBL_DEL_PAGE' => 'Delete Page',
-  'LBL_WEBSITE_TITLE' => 'Website',
-  'LBL_RSS_TITLE' => 'News Feed',
-  'LBL_DELETE_PAGE' => 'Delete Page',
-  'LBL_CHANGE_LAYOUT' => 'Change Layout',
-  'LBL_RENAME_PAGE' => 'Rename Page',
-  'LBL_CLOSE_DASHLETS' => 'Close',
-  'LBL_OPTIONS' => 'Options',
-  // dashlet search fields
-  'LBL_TODAY'=>'Today',
-  'LBL_YESTERDAY' => 'Yesterday',
-  'LBL_TOMORROW'=>'Tomorrow',
-  'LBL_LAST_WEEK'=>'Last Week',
-  'LBL_NEXT_WEEK'=>'Next Week',
-  'LBL_LAST_7_DAYS'=>'Last 7 Days',
-  'LBL_NEXT_7_DAYS'=>'Next 7 Days',
-  'LBL_LAST_MONTH'=>'Last Month',
-  'LBL_NEXT_MONTH'=>'Next Month',
-  'LBL_LAST_QUARTER'=>'Last Quarter',
-  'LBL_THIS_QUARTER'=>'This Quarter',
-  'LBL_LAST_YEAR'=>'Last Year',
-  'LBL_NEXT_YEAR'=>'Next Year',
-  'LBL_LAST_30_DAYS' => 'Last 30 Days',
-  'LBL_NEXT_30_DAYS' => 'Next 30 Days',
-  'LBL_THIS_MONTH' => 'This Month',
-  'LBL_THIS_YEAR' => 'This Year',
+    'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
+    'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
+    'LBL_ADD_PAGE' => 'Add Page',
+    'LBL_DEL_PAGE' => 'Delete Page',
+    'LBL_WEBSITE_TITLE' => 'Website',
+    'LBL_RSS_TITLE' => 'News Feed',
+    'LBL_DELETE_PAGE' => 'Delete Page',
+    'LBL_CHANGE_LAYOUT' => 'Change Layout',
+    'LBL_RENAME_PAGE' => 'Rename Page',
+    'LBL_CLOSE_DASHLETS' => 'Close',
+    'LBL_OPTIONS' => 'Options',
+    // dashlet search fields
+    'LBL_TODAY'=>'Today',
+    'LBL_YESTERDAY' => 'Yesterday',
+    'LBL_TOMORROW'=>'Tomorrow',
+    'LBL_LAST_WEEK'=>'Last Week',
+    'LBL_NEXT_WEEK'=>'Next Week',
+    'LBL_LAST_7_DAYS'=>'Last 7 Days',
+    'LBL_NEXT_7_DAYS'=>'Next 7 Days',
+    'LBL_LAST_MONTH'=>'Last Month',
+    'LBL_NEXT_MONTH'=>'Next Month',
+    'LBL_LAST_QUARTER'=>'Last Quarter',
+    'LBL_THIS_QUARTER'=>'This Quarter',
+    'LBL_LAST_YEAR'=>'Last Year',
+    'LBL_NEXT_YEAR'=>'Next Year',
+    'LBL_LAST_30_DAYS' => 'Last 30 Days',
+    'LBL_NEXT_30_DAYS' => 'Next 30 Days',
+    'LBL_THIS_MONTH' => 'This Month',
+    'LBL_THIS_YEAR' => 'This Year',
 
     'LBL_MODULES' => 'Modules',
     'LBL_CHARTS' => 'Charts',
@@ -116,44 +116,44 @@ 
     'LBL_WEB' => 'Web',
     'LBL_SEARCH_RESULTS' => 'Search Result',
 
-  // Dashlet Categories
-  'dashlet_categories_dom' => array(
-      'Module Views' => 'Module Views',
-      'Portal' => 'Portal',
-      'Charts' => 'Charts',
-      'Tools' => 'Tools',
-      'Miscellaneous' => 'Miscellaneous'),
-  'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
-  'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
-  'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
-  'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
-  'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
-  'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
-  'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
-  'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
-  'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
-  'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
-  'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
+    // Dashlet Categories
+    'dashlet_categories_dom' => array(
+        'Module Views' => 'Module Views',
+        'Portal' => 'Portal',
+        'Charts' => 'Charts',
+        'Tools' => 'Tools',
+        'Miscellaneous' => 'Miscellaneous'),
+    'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
+    'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
+    'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
+    'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
+    'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
+    'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
+    'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
+    'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
+    'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
+    'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
+    'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
 
-  'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
-  'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
-  'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
+    'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
+    'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
+    'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
 
     'LBL_TRAINING_TITLE' => 'Training',
 
-  'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
-  'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
-  'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
-  'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
-  'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
+    'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
+    'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
+    'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
+    'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
+    'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
 
-  // Default out-of-box names for tabs
-  'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
-  'LBL_HOME_PAGE_2_NAME' => 'Sales',
-  'LBL_HOME_PAGE_3_NAME' => 'Support',
-  'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
-  'LBL_HOME_PAGE_4_NAME' => 'Tracker',
-  'LBL_CLOSE_SITEMAP' => 'Close',
+    // Default out-of-box names for tabs
+    'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
+    'LBL_HOME_PAGE_2_NAME' => 'Sales',
+    'LBL_HOME_PAGE_3_NAME' => 'Support',
+    'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
+    'LBL_HOME_PAGE_4_NAME' => 'Tracker',
+    'LBL_CLOSE_SITEMAP' => 'Close',
 
     'LBL_SEARCH' => 'Search',
     'LBL_CLEAR' => 'Clear',
@@ -166,7 +166,7 @@ 
     'LBL_MY_TEAM_REPORT_CHARTS' => 'My Team Reports',
     'LBL_MY_SAVED_REPORT_CHARTS' => 'My Saved Reports',
 
-  'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
+    'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
 
 //ABOUT page
     'LBL_VERSION' => 'Version',
@@ -177,77 +177,77 @@ 
     'LBL_ADD_TERM_COM' => '<P>The interactive user interfaces in modified source and object code versions of this program must display Appropriate Legal Notices, as required under Section 5 of the GNU Affero General Public License version 3. In accordance with Section 7(b) of the GNU General Public License version 3, these Appropriate Legal Notices must retain the display of the &quot;Powered by SugarCRM&quot; logo. If the display of the logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices must display the words &quot;Powered by SugarCRM&quot;.</P>',
 
 
-  'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
-  'LBL_AND' => "and",
-  'LBL_ARE' => "are",
-  'LBL_TRADEMARKS' => 'trademarks',
-  'LBL_OF' => 'of',
-  'LBL_FOUNDERS' => 'Founders',
-  'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
-  'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
-  'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
-  'LBL_TRAINING' => 'Training',
-  'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
-  'LBL_FORUMS' => 'Forums',
-  'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
-  'LBL_WIKI' => 'Wiki',
-  'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
-  'LBL_DEVSITE' => 'Developer Site',
-  'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
- 'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
-  'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
-  'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
-  'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
-  'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
-  'LBL_ALL_NEWS' => 'All News',
-  'LBL_SOURCE_CODE' => 'Source Code',
+    'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
+    'LBL_AND' => "and",
+    'LBL_ARE' => "are",
+    'LBL_TRADEMARKS' => 'trademarks',
+    'LBL_OF' => 'of',
+    'LBL_FOUNDERS' => 'Founders',
+    'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
+    'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
+    'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
+    'LBL_TRAINING' => 'Training',
+    'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
+    'LBL_FORUMS' => 'Forums',
+    'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
+    'LBL_WIKI' => 'Wiki',
+    'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
+    'LBL_DEVSITE' => 'Developer Site',
+    'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
+    'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
+    'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
+    'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
+    'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
+    'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
+    'LBL_ALL_NEWS' => 'All News',
+    'LBL_SOURCE_CODE' => 'Source Code',
     'LBL_SOURCE_SUGAR' => 'SugarCRM Inc - providers of CE framework',
-  'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
-  'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
-  'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
-  'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
-  'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
-  'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
-  'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
-  'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
-  'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
-  'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
-  'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
-  'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
-  'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
-  'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
-  'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
-  'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
-  'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
-  'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
-  'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
-  'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
-  'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
-  'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
-  'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
-  'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
-  'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
-  'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
-  'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
-  'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
-  'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
-  'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
-  'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
-  'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
-  'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
-  'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
+    'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
+    'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
+    'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
+    'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
+    'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
+    'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
+    'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
+    'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
+    'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
+    'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
+    'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
+    'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
+    'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
+    'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
+    'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
+    'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
+    'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
+    'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
+    'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
+    'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
+    'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
+    'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
+    'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
+    'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
+    'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
+    'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
+    'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
+    'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
+    'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
+    'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
+    'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
+    'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
+    'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
+    'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
 
-  'LBL_DASHLET_TITLE' => 'My Sites',
-  'LBL_DASHLET_OPT_TITLE' => 'Title',
-  'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
-  'LBL_DASHLET_OPT_URL' => 'Website Location',
-  'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
-  'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
-  'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
-	'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
-	'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
-	'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
-	'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_DASHLET_TITLE' => 'My Sites',
+    'LBL_DASHLET_OPT_TITLE' => 'Title',
+    'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
+    'LBL_DASHLET_OPT_URL' => 'Website Location',
+    'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
+    'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
+    'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
+    'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
+    'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
+    'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
     'LBL_TOUR_HOME' => 'Home Icon',
     'LBL_TOUR_HOME_DESCRIPTION' => 'Quickly get back to your Home Page dashboard in one click.',
     'LBL_TOUR_MODULES' => 'Modules',

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-$mod_strings  = array(
+$mod_strings = array(
     'LBL_MODULE_NAME' => 'Home',
     'LBL_MODULES_TO_SEARCH' => 'Modules to Search',
     'LBL_NEW_FORM_TITLE' => 'New Contact',
@@ -151,7 +151,7 @@ 
   'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
   'LBL_HOME_PAGE_2_NAME' => 'Sales',
   'LBL_HOME_PAGE_3_NAME' => 'Support',
-  'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
+  'LBL_HOME_PAGE_6_NAME' => 'Marketing', //bug 16510, separate the support and marketing page from each other
   'LBL_HOME_PAGE_4_NAME' => 'Tracker',
   'LBL_CLOSE_SITEMAP' => 'Close',
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.