adamjakab / SuiteCRM

modules/ACLActions/metadata/subpaneldefs.php

Indentation +23 added lines, -23 removed lines

@@ -42,33 +42,33 @@
 
 
 $layout_defs['ACL'] = array(
-	// sets up which panels to show, in which order, and with what linked_fields
-	'subpanel_setup' => array(
+    // sets up which panels to show, in which order, and with what linked_fields
+    'subpanel_setup' => array(
         'users' => array(
-			'top_buttons' => array(	array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
-			'order' => 20,
-			'module' => 'Users',
-			'subpanel_name' => 'ForSubModules',
-			'get_subpanel_data' => 'users',
-			'add_subpanel_data' => 'user_id',
-			'title_key' => 'LBL_USERS_SUBPANEL_TITLE',
-		),
-	),
+            'top_buttons' => array(	array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
+            'order' => 20,
+            'module' => 'Users',
+            'subpanel_name' => 'ForSubModules',
+            'get_subpanel_data' => 'users',
+            'add_subpanel_data' => 'user_id',
+            'title_key' => 'LBL_USERS_SUBPANEL_TITLE',
+        ),
+    ),
 );
 $layout_defs['UserRoles'] = array(
-	// sets up which panels to show, in which order, and with what linked_fields
-	'subpanel_setup' => array(
+    // sets up which panels to show, in which order, and with what linked_fields
+    'subpanel_setup' => array(
         'acl' => array(
-			'top_buttons' => array(array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'ACL'),),
-			'order' => 20,
-			'module' => 'ACL',
-			'subpanel_def_path'=>'modules/ACL/Roles/subpanels/default.php',
-			'subpanel_name' => 'default',
-			'get_subpanel_data' => 'roles',
-			'add_subpanel_data' => 'role_id',
-			'title_key' => 'LBL_ROLES_SUBPANEL_TITLE',
-		),
-	),
+            'top_buttons' => array(array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'ACL'),),
+            'order' => 20,
+            'module' => 'ACL',
+            'subpanel_def_path'=>'modules/ACL/Roles/subpanels/default.php',
+            'subpanel_name' => 'default',
+            'get_subpanel_data' => 'roles',
+            'add_subpanel_data' => 'role_id',
+            'title_key' => 'LBL_ROLES_SUBPANEL_TITLE',
+        ),
+    ),
 	
 );
 

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.
@@ -45,7 +45,7 @@ 
 	// sets up which panels to show, in which order, and with what linked_fields
 	'subpanel_setup' => array(
         'users' => array(
-			'top_buttons' => array(	array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
+			'top_buttons' => array(array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
 			'order' => 20,
 			'module' => 'Users',
 			'subpanel_name' => 'ForSubModules',

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/ACLActions/actiondefs.php

Indentation +81 added lines, -81 removed lines

@@ -38,96 +38,96 @@
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- if(!defined('ACL_ALLOW_NONE')){   
- 	define('ACL_ALLOW_ADMIN_DEV', 100);
- 	define('ACL_ALLOW_ADMIN', 99);
- 	define('ACL_ALLOW_ALL', 90);                        
- 	define('ACL_ALLOW_ENABLED', 89);
- 	define('ACL_ALLOW_OWNER', 75);
- 	define('ACL_ALLOW_NORMAL', 1);
- 	define('ACL_ALLOW_DEFAULT', 0);
- 	define('ACL_ALLOW_DISABLED', -98);
- 	define('ACL_ALLOW_NONE', -99);
- 	define('ACL_ALLOW_DEV', 95);
- }
- /**
-  * $GLOBALS['ACLActionAccessLevels
-  * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
-  */
- $GLOBALS['ACLActionAccessLevels'] = array(
- 	ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
- 	ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
- 	ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
- 	ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
- 	ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
- 	ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
- 	ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
- 	ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
- 	ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
- 	ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
- 	);
+    if(!defined('ACL_ALLOW_NONE')){   
+        define('ACL_ALLOW_ADMIN_DEV', 100);
+        define('ACL_ALLOW_ADMIN', 99);
+        define('ACL_ALLOW_ALL', 90);                        
+        define('ACL_ALLOW_ENABLED', 89);
+        define('ACL_ALLOW_OWNER', 75);
+        define('ACL_ALLOW_NORMAL', 1);
+        define('ACL_ALLOW_DEFAULT', 0);
+        define('ACL_ALLOW_DISABLED', -98);
+        define('ACL_ALLOW_NONE', -99);
+        define('ACL_ALLOW_DEV', 95);
+    }
+    /**
+     * $GLOBALS['ACLActionAccessLevels
+     * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
+     */
+    $GLOBALS['ACLActionAccessLevels'] = array(
+        ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
+        ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
+        ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
+        ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
+        ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
+        ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
+        ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
+        ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
+        ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
+        ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
+        );
 /**
- * $GLOBALS['ACLActions
- * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
- */
+         * $GLOBALS['ACLActions
+         * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
+         */
 $GLOBALS['ACLActions'] = array(
-	'module'=>array('actions'=>
-						array(
-						'access'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
-									'label'=>'LBL_ACTION_ACCESS',
-									'default'=>ACL_ALLOW_ENABLED,
-								),
+    'module'=>array('actions'=>
+                        array(
+                        'access'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
+                                    'label'=>'LBL_ACTION_ACCESS',
+                                    'default'=>ACL_ALLOW_ENABLED,
+                                ),
 							
-						'view'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_VIEW',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                        'view'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_VIEW',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
 					
-						'list'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_LIST',
-									'default'=>ACL_ALLOW_ALL,
-								),
-						'edit'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_EDIT',
-									'default'=>ACL_ALLOW_ALL,
+                        'list'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_LIST',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'edit'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_EDIT',
+                                    'default'=>ACL_ALLOW_ALL,
 									
-								),
-						'delete'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_DELETE',
-									'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'delete'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_DELETE',
+                                    'default'=>ACL_ALLOW_ALL,
 									
-								),
-						'import'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_IMPORT',
-									'default'=>ACL_ALLOW_ALL,
-								),
-						'export'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_EXPORT',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                                ),
+                        'import'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_IMPORT',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'export'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_EXPORT',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
                         'massupdate'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_MASSUPDATE',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_MASSUPDATE',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
 						
 					
-				),),
+                ),),
 );
 
 

Spacing +10 added lines, -10 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.
@@ -38,7 +38,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- if(!defined('ACL_ALLOW_NONE')){   
+ if (!defined('ACL_ALLOW_NONE')) {   
  	define('ACL_ALLOW_ADMIN_DEV', 100);
  	define('ACL_ALLOW_ADMIN', 99);
  	define('ACL_ALLOW_ALL', 90);                        
@@ -75,53 +75,53 @@ 
 						array(
 						'access'=>
 								array(
-									'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
+									'aclaccess'=>array(ACL_ALLOW_ENABLED, ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
 									'label'=>'LBL_ACTION_ACCESS',
 									'default'=>ACL_ALLOW_ENABLED,
 								),
 							
 						'view'=>
 								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_VIEW',
 									'default'=>ACL_ALLOW_ALL,
 								),
 					
 						'list'=>
 								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_LIST',
 									'default'=>ACL_ALLOW_ALL,
 								),
 						'edit'=>
 								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_EDIT',
 									'default'=>ACL_ALLOW_ALL,
 									
 								),
 						'delete'=>
 							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_DELETE',
 									'default'=>ACL_ALLOW_ALL,
 									
 								),
 						'import'=>
 							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_IMPORT',
 									'default'=>ACL_ALLOW_ALL,
 								),
 						'export'=>
 							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_EXPORT',
 									'default'=>ACL_ALLOW_ALL,
 								),
                         'massupdate'=>
 							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
 									'label'=>'LBL_ACTION_MASSUPDATE',
 									'default'=>ACL_ALLOW_ALL,
 								),

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/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.meta.php

Indentation +4 added lines, -4 removed lines

@@ -44,8 +44,8 @@
 global $app_strings, $current_language;
 
 $dashletMeta['MyPipelineBySalesStageDashlet'] = array('title'       => 'LBL_TITLE',  
-                                                      'description' => 'LBL_TITLE',
-                                                      'icon'		  => 'icon_Charts_Funnel_32.gif',
-                                                      'module'        => 'Opportunities', 
-                                                      'category'    => 'Charts');
+                                                        'description' => 'LBL_TITLE',
+                                                        'icon'		  => 'icon_Charts_Funnel_32.gif',
+                                                        'module'        => 'Opportunities', 
+                                                        'category'    => 'Charts');
 ?>

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php

Spacing +24 added lines, -24 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.
@@ -62,14 +62,14 @@ 
     {
         global $timedate;
 
-        if(empty($options['mypbss_date_start']))
+        if (empty($options['mypbss_date_start']))
             $options['mypbss_date_start'] = $timedate->nowDbDate();
-        if(empty($options['mypbss_date_end']))
+        if (empty($options['mypbss_date_end']))
             $options['mypbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
-        if(empty($options['title']))
+        if (empty($options['title']))
             $options['title'] = translate('LBL_MY_PIPELINE_FORM_TITLE', 'Home');
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -105,11 +105,11 @@ 
         $searchFormTab = 'advanced_search';
         $userId = $current_user->id;
 
-        $url_params = array( 'assigned_user_id' => $current_user->id );
+        $url_params = array('assigned_user_id' => $current_user->id);
         $group_by = $this->constructGroupBy();
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
@@ -118,7 +118,7 @@ 
 
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
-        $subtitle = translate('LBL_OPP_SIZE', 'Charts') . " " . $currency_symbol . "1" . translate('LBL_OPP_THOUSANDS', 'Charts');
+        $subtitle = translate('LBL_OPP_SIZE', 'Charts')." ".$currency_symbol."1".translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $query = $this->constructQuery();
         $data = $this->constructCEChartData($this->getChartData($query));
@@ -147,7 +147,7 @@ 
         $startDate = $timedate->to_display_date($this->mypbss_date_start, false);
         $endDate = $timedate->to_display_date($this->mypbss_date_end, false);
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -325,15 +325,15 @@ 
         $result = $db->query($query);
         $row = $db->fetchByAssoc($result, false);
 
-        while($row != null){
+        while ($row != null) {
             $temp_data[] = $row;
             $row = $db->fetchByAssoc($result, false);
         }
 
         // reorder and set the array based on the order of selected_datax
-        foreach($selected_datax as $sales_stage){
-            foreach($temp_data as $key => $value){
-                if ($value['sales_stage'] == $sales_stage){
+        foreach ($selected_datax as $sales_stage) {
+            foreach ($temp_data as $key => $value) {
+                if ($value['sales_stage'] == $sales_stage) {
                     $value['sales_stage'] = $app_list_strings['sales_stage_dom'][$value['sales_stage']];
                     $value['key'] = $sales_stage;
                     $value['value'] = $value['sales_stage'];
@@ -354,7 +354,7 @@ 
     )
     {
         $total = 0;
-        foreach($dataset as $value){
+        foreach ($dataset as $value) {
             $total += $value;
         }
 
@@ -370,7 +370,7 @@ 
     )
     {
         $newData = array();
-        foreach($dataset as $key=>$value){
+        foreach ($dataset as $key=>$value) {
             $newData[$value['sales_stage']] = $value['total'];
         }
         return $newData;
@@ -387,12 +387,12 @@ 
                         count(*) AS opp_count,
                         sum(amount_usdollar/1000) AS total
                     FROM users,opportunities  ";
-        $query .= " WHERE opportunities.assigned_user_id IN ('{$GLOBALS['current_user']->id}') " .
-            " AND opportunities.date_closed >= ". db_convert("'".$this->mypbss_date_start."'",'date').
-            " AND opportunities.date_closed <= ".db_convert("'".$this->mypbss_date_end."'",'date') .
+        $query .= " WHERE opportunities.assigned_user_id IN ('{$GLOBALS['current_user']->id}') ".
+            " AND opportunities.date_closed >= ".db_convert("'".$this->mypbss_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->mypbss_date_end."'", 'date').
             " AND opportunities.assigned_user_id = users.id  AND opportunities.deleted=0 ";
-        if ( count($this->mypbss_sales_stages) > 0 )
-            $query .= " AND opportunities.sales_stage IN ('" . implode("','",$this->mypbss_sales_stages) . "') ";
+        if (count($this->mypbss_sales_stages) > 0)
+            $query .= " AND opportunities.sales_stage IN ('".implode("','", $this->mypbss_sales_stages)."') ";
         $query .= " GROUP BY opportunities.sales_stage ,users.user_name,opportunities.assigned_user_id";
 
         return $query;
@@ -409,22 +409,22 @@ 
         return $groupBy;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be)
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
         $chart['total'] = 0;
 
-        foreach($data as $key=>$value)
+        foreach ($data as $key=>$value)
         {
             $formattedFloat = (float)number_format((float)$value, 2, '.', '');
             $chart['labels'][] = $key;
             $chart['data'][] = $formattedFloat;
-            $chart['total']+=$formattedFloat;
+            $chart['total'] += $formattedFloat;
             $chart['tooltips'][] = "'$key' amounts to $currency_symbol$formattedFloat$thousands_symbol (click bar to drill-through)";
         }
         return $chart;

Braces +21 added lines, -15 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.
@@ -62,12 +64,15 @@ 
     {
         global $timedate;
 
-        if(empty($options['mypbss_date_start']))
-            $options['mypbss_date_start'] = $timedate->nowDbDate();
-        if(empty($options['mypbss_date_end']))
-            $options['mypbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
-        if(empty($options['title']))
-            $options['title'] = translate('LBL_MY_PIPELINE_FORM_TITLE', 'Home');
+        if(empty($options['mypbss_date_start'])) {
+                    $options['mypbss_date_start'] = $timedate->nowDbDate();
+        }
+        if(empty($options['mypbss_date_end'])) {
+                    $options['mypbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
+        if(empty($options['title'])) {
+                    $options['title'] = translate('LBL_MY_PIPELINE_FORM_TITLE', 'Home');
+        }
 
         parent::__construct($id,$options);
     }
@@ -80,11 +85,12 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (count($this->mypbss_sales_stages) > 0)
-            foreach ($this->mypbss_sales_stages as $key)
+        if (count($this->mypbss_sales_stages) > 0) {
+                    foreach ($this->mypbss_sales_stages as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        }
 
         $this->_searchFields['mypbss_sales_stages']['options'] = $app_list_strings['sales_stage_dom'];
         $this->_searchFields['mypbss_sales_stages']['input_name0'] = $selected_datax;
@@ -316,8 +322,7 @@ 
                 $datax[$key] = $app_list_strings['sales_stage_dom'][$key];
                 array_push($selected_datax, $key);
             }
-        }
-        else {
+        } else {
             $datax = $app_list_strings['sales_stage_dom'];
             $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
         }
@@ -391,8 +396,9 @@ 
             " AND opportunities.date_closed >= ". db_convert("'".$this->mypbss_date_start."'",'date').
             " AND opportunities.date_closed <= ".db_convert("'".$this->mypbss_date_end."'",'date') .
             " AND opportunities.assigned_user_id = users.id  AND opportunities.deleted=0 ";
-        if ( count($this->mypbss_sales_stages) > 0 )
-            $query .= " AND opportunities.sales_stage IN ('" . implode("','",$this->mypbss_sales_stages) . "') ";
+        if ( count($this->mypbss_sales_stages) > 0 ) {
+                    $query .= " AND opportunities.sales_stage IN ('" . implode("','",$this->mypbss_sales_stages) . "') ";
+        }
         $query .= " GROUP BY opportunities.sales_stage ,users.user_name,opportunities.assigned_user_id";
 
         return $query;

modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php

Braces +18 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,11 +68,13 @@ 
     {
         global $timedate;
 
-        if(empty($options['obm_date_start']))
-            $options['obm_date_start'] = $timedate->nowDbDate();
+        if(empty($options['obm_date_start'])) {
+                    $options['obm_date_start'] = $timedate->nowDbDate();
+        }
 
-        if(empty($options['obm_date_end']))
-            $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        if(empty($options['obm_date_end'])) {
+                    $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
 
         parent::__construct($id,$options);
     }
@@ -80,8 +84,9 @@ 
      */
     public function displayOptions()
     {
-        if (!isset($this->obm_ids) || count($this->obm_ids) == 0)
-            $this->_searchFields['obm_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->obm_ids) || count($this->obm_ids) == 0) {
+                    $this->_searchFields['obm_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -247,8 +252,9 @@ 
         $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'",'date') .
             " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'",'date') .
             " AND opportunities.deleted=0";
-        if (count($this->obm_ids) > 0)
-            $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+        if (count($this->obm_ids) > 0) {
+                    $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+        }
         $query .= " GROUP BY sales_stage,".
             db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'")) .
             " ORDER BY m";
@@ -274,8 +280,9 @@ 
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
-                $chart['key'][] = $stage;
+            if(!in_array($stage,$chart['key'])) {
+                            $chart['key'][] = $stage;
+            }
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
             $chart['data'][count($chart['data'])-1][] = $formattedFloat;

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,13 +66,13 @@ 
     {
         global $timedate;
 
-        if(empty($options['obm_date_start']))
+        if (empty($options['obm_date_start']))
             $options['obm_date_start'] = $timedate->nowDbDate();
 
-        if(empty($options['obm_date_end']))
+        if (empty($options['obm_date_end']))
             $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
 
-        parent::__construct($id,$options);
+        parent::__construct($id, $options);
     }
 
     /**
@@ -92,7 +92,7 @@ 
     public function display()
     {
         $currency_symbol = $GLOBALS['sugar_config']['default_currency_symbol'];
-        if ($GLOBALS['current_user']->getPreference('currency')){
+        if ($GLOBALS['current_user']->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($GLOBALS['current_user']->getPreference('currency'));
@@ -103,13 +103,13 @@ 
         $action = 'index';
         $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'm', 'sales_stage', );
+        $groupBy = array('m', 'sales_stage',);
 
 
         $data = $this->getChartData($this->constructQuery());
 
         //I have taken out the sort as this will throw off the labels we have calculated
-        $data = $this->sortData($data,'m', false, 'sales_stage', true, true);
+        $data = $this->sortData($data, 'm', false, 'sales_stage', true, true);
 
         $chartReadyData = $this->prepareChartData($data, $currency_symbol, $thousands_symbol);
         $canvasId = 'rGraphOutcomeByMonth'.uniqid();
@@ -129,7 +129,7 @@ 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -242,45 +242,45 @@ 
     protected function constructQuery()
     {
         $query = "SELECT sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'"))." as m, ".
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, ".
             "sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
-        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'",'date') .
-            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'",'date') .
+        $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'", 'date').
+            " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'", 'date').
             " AND opportunities.deleted=0";
         if (count($this->obm_ids) > 0)
-            $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+            $query .= " AND opportunities.assigned_user_id IN ('".implode("','", $this->obm_ids)."')";
         $query .= " GROUP BY sales_stage,".
-            db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'")) .
+            db_convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'")).
             " ORDER BY m";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be)
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             $key = $i["m"];
             $stage = $i["sales_stage"];
             $stage_dom_option = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stage_dom_option'><input type='hidden' class='date' value='$key'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.meta.php

Indentation +4 added lines, -4 removed lines

@@ -44,8 +44,8 @@
 global $app_strings, $current_language;
 
 $dashletMeta['PipelineBySalesStageDashlet'] = array('title'       => 'LBL_TITLE',  
-                                                      'description' => 'LBL_TITLE', 
-                                                      'module'        => 'Opportunities', 
-	                                                  'icon'		  => 'icon_Charts_Funnel_32.gif',
-                                                      'category'    => 'Charts');
+                                                        'description' => 'LBL_TITLE', 
+                                                        'module'        => 'Opportunities', 
+                                                        'icon'		  => 'icon_Charts_Funnel_32.gif',
+                                                        'category'    => 'Charts');
 ?>

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -85,7 +85,7 @@ 
         global $current_user, $sugar_config;
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
@@ -106,12 +106,12 @@ 
 
         $module = 'Opportunities';
         $action = 'index';
-        $query  ='true';
-        $searchFormTab ='advanced_search';
+        $query  = 'true';
+        $searchFormTab = 'advanced_search';
 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928','#8080ff','#c03f80']";
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -208,28 +208,28 @@ 
 
         $row = $db->fetchByAssoc($result);
 
-        while ($row != null){
+        while ($row != null) {
             $dataSet[] = $row;
             $row = $db->fetchByAssoc($result);
         }
         return $dataSet;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //return $data;
-        $chart['labels']=array();
-        $chart['data']=array();
+        $chart['labels'] = array();
+        $chart['data'] = array();
         $total = 0;
-        foreach($data as $i)
+        foreach ($data as $i)
         {
-            $chart['labelsAndValues'][]=$i['lead_source'].' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
+            $chart['labelsAndValues'][] = $i['lead_source'].' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
             //$chart['labelsAndValues'][]=$currency_symbol.(int)$i['total'].$thousands_symbol;
-            $chart['labels'][]=$i['lead_source'];
-            $chart['data'][]=(int)$i['total'];
-            $total+=(int)$i['total'];
+            $chart['labels'][] = $i['lead_source'];
+            $chart['data'][] = (int)$i['total'];
+            $total += (int)$i['total'];
         }
-        $chart['total']=$total;
+        $chart['total'] = $total;
         return $chart;
     }
 
@@ -241,12 +241,12 @@ 
         $query = "SELECT lead_source,sum(amount_usdollar/1000) as total,count(*) as opp_count ".
             "FROM opportunities ";
         $query .= "WHERE opportunities.deleted=0 ";
-        if ( count($this->pbls_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
-        if ( count($this->pbls_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
+        if (count($this->pbls_ids) > 0)
+            $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->pbls_ids)."') ";
+        if (count($this->pbls_lead_sources) > 0)
+            $query .= "AND opportunities.lead_source IN ('".implode("','", $this->pbls_lead_sources)."') ";
         else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+            $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
         $query .= "GROUP BY lead_source ORDER BY total DESC";
 
         return $query;

Braces +19 added lines, -13 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.
@@ -62,17 +64,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0)
-            foreach ($this->pbls_lead_sources as $key)
+        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0) {
+                    foreach ($this->pbls_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['pbls_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['pbls_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0)
-            $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0) {
+                    $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -241,12 +245,14 @@ 
         $query = "SELECT lead_source,sum(amount_usdollar/1000) as total,count(*) as opp_count ".
             "FROM opportunities ";
         $query .= "WHERE opportunities.deleted=0 ";
-        if ( count($this->pbls_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
-        if ( count($this->pbls_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->pbls_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
+        }
+        if ( count($this->pbls_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= "GROUP BY lead_source ORDER BY total DESC";
 
         return $query;

modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php

Braces +25 added lines, -17 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.
@@ -61,17 +63,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0)
-            foreach ($this->lsbo_lead_sources as $key)
+        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0) {
+                    foreach ($this->lsbo_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['lsbo_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['lsbo_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0)
-            $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0) {
+                    $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -131,8 +135,9 @@ 
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
-            $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        }
 
 
         $data = $this->getChartData($this->constructQuery());
@@ -253,12 +258,14 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
+        }
+        if ( count($this->lsbo_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
@@ -282,8 +289,9 @@ 
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
-                $chart['key'][] = $stage;
+            if(!in_array($stage,$chart['key'])) {
+                            $chart['key'][] = $stage;
+            }
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
             $chart['data'][count($chart['data'])-1][] = $formattedFloat;

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -114,24 +114,24 @@ 
         */
 
         $currency_symbol = $sugar_config['default_currency_symbol'];
-        if ($current_user->getPreference('currency')){
+        if ($current_user->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($current_user->getPreference('currency'));
             $currency_symbol = $currency->symbol;
         }
-        $subtitle = translate('LBL_OPP_SIZE', 'Charts') . " " . $currency_symbol . "1" . translate('LBL_OPP_THOUSANDS', 'Charts');
+        $subtitle = translate('LBL_OPP_SIZE', 'Charts')." ".$currency_symbol."1".translate('LBL_OPP_THOUSANDS', 'Charts');
         $thousands_symbol = translate('LBL_OPP_THOUSANDS', 'Charts');
 
         $module = 'Opportunities';
-        $action =  'index';
-        $query =  'true';
+        $action = 'index';
+        $query = 'true';
         $searchFormTab = 'advanced_search';
-        $groupBy = array( 'lead_source', 'sales_stage' );
+        $groupBy = array('lead_source', 'sales_stage');
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
+        if (count($this->lsbo_ids) > 0)
             $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
 
 
@@ -157,7 +157,7 @@ 
 
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -253,43 +253,43 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        if (count($this->lsbo_ids) > 0)
+            $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->lsbo_ids)."') ";
+        if (count($this->lsbo_lead_sources) > 0)
+            $query .= "AND opportunities.lead_source IN ('".implode("','", $this->lsbo_lead_sources)."') ";
         else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+            $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $i)
+        foreach ($data as $i)
         {
             $key = $i["lead_source"];
             $keyDom = $i["lead_source_dom_option"];
             $stage = $i["sales_stage"];
             $stageDom = $i["sales_stage_dom_option"];
-            if(!in_array($key,$chart['labels']))
+            if (!in_array($key, $chart['labels']))
             {
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
+            if (!in_array($stage, $chart['key']))
                 $chart['key'][] = $stage;
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
-            $chart['data'][count($chart['data'])-1][] = $formattedFloat;
-            $chart['tooltips'][]="<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
+            $chart['data'][count($chart['data']) - 1][] = $formattedFloat;
+            $chart['tooltips'][] = "<div><input type='hidden' class='stage' value='$stageDom'><input type='hidden' class='category' value='$keyDom'></div>".$stage.'('.$currency_symbol.$formattedFloat.$thousands_symbol.') '.$key;
         }
         return $chart;
     }

modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.php

Braces +27 added lines, -19 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.
@@ -60,11 +62,12 @@ 
         $this->getSeedBean()->disable_row_level_security = false;
 
         $campaigns = $this->getSeedBean()->get_full_list("","");
-        if ( $campaigns != null )
-            foreach ($campaigns as $c)
+        if ( $campaigns != null ) {
+                    foreach ($campaigns as $c)
                 $this->_searchFields['campaign_id']['options'][$c->id] = $c->name;
-        else
-            $this->_searchFields['campaign_id']['options'] = array();
+        } else {
+                    $this->_searchFields['campaign_id']['options'] = array();
+        }
 
         return parent::displayOptions();
     }
@@ -234,7 +237,9 @@ 
 
         $opp_result=$focus->db->query($opp_query);
         $opp_data=$focus->db->fetchByAssoc($opp_result);
-        if (empty($opp_data['total_value'])) $opp_data['total_value']=0;
+        if (empty($opp_data['total_value'])) {
+            $opp_data['total_value']=0;
+        }
 
         $chartData['Total Value']= $opp_data['total_value'];
 
@@ -252,7 +257,7 @@ 
         if (empty($opp_data1['revenue'])){
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = 0;
             unset($opp_data1['revenue']);
-        }else{
+        } else{
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = $opp_data1['revenue'];
             unset($opp_data1['revenue']);
             $not_empty = true;
@@ -269,18 +274,21 @@ 
         $camp_data1=$focus->db->fetchByAssoc($camp_result1);
 
 
-        if (empty($camp_data1['investment']))
-            $camp_data1['investment'] = 0;
-        else
-            $not_empty = true;
-        if (empty($camp_data1['budget']))
-            $camp_data1['budget'] = 0;
-        else
-            $not_empty = true;
-        if (empty($camp_data1['expected_revenue']))
-            $camp_data1['expected_revenue'] = 0;
-        else
-            $not_empty = true;
+        if (empty($camp_data1['investment'])) {
+                    $camp_data1['investment'] = 0;
+        } else {
+                    $not_empty = true;
+        }
+        if (empty($camp_data1['budget'])) {
+                    $camp_data1['budget'] = 0;
+        } else {
+                    $not_empty = true;
+        }
+        if (empty($camp_data1['expected_revenue'])) {
+                    $camp_data1['expected_revenue'] = 0;
+        } else {
+                    $not_empty = true;
+        }
 
         $chartData['Investment']= $camp_data1['investment'];
         $chartData['Budget']= $camp_data1['budget'];

Spacing +28 added lines, -28 removed lines

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