Inspection of "Merge branch 'develop' into console-installer" - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — console-installer ( 3d54e5...e2b50d )

by Adam

created 2016-05-10 07:51 UTC

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -40,8 +40,8 @@
 block discarded – undo
 
 global $mod_strings;
 $module_menu = Array(
-	Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
-	Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
+    Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
+    Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
 	
-	);
+    );
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

modules/ACLActions/metadata/subpaneldefs.php 1 patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -42,33 +42,33 @@
 block discarded – undo
 
 
 $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',
+        ),
+    ),
 	
 );
 

Please login to merge, or discard this patch.

modules/ACLActions/actiondefs.php 1 patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -38,96 +38,96 @@
 block discarded – undo
  * 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,
+                                ),
 						
 					
-				),),
+                ),),
 );
 
 

Please login to merge, or discard this patch.

MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.meta.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -44,8 +44,8 @@
 block discarded – undo
 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');
 ?>

Please login to merge, or discard this patch.

MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,6 +43,6 @@
 block discarded – undo
 
 
 $dashletStrings['MyPipelineBySalesStageDashlet'] = array('LBL_TITLE'       => 'My Pipeline By Sales Stage',
-                                                         'LBL_DESCRIPTION' => 'Vertical Bar Chart of My Sales Stage Pipeline',
-                                                         'LBL_REFRESH'     => 'Refresh Chart');
+                                                            'LBL_DESCRIPTION' => 'Vertical Bar Chart of My Sales Stage Pipeline',
+                                                            'LBL_REFRESH'     => 'Refresh Chart');
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,6 +43,6 @@
 block discarded – undo
 
 
 $dashletStrings['OutcomeByMonthDashlet'] = array('LBL_TITLE'       => 'Outcome by Month',
-                                                 'LBL_DESCRIPTION' => 'Chart of the Monthly Outcomes',
-                                                 'LBL_REFRESH'     => 'Refresh Chart');
+                                                    'LBL_DESCRIPTION' => 'Chart of the Monthly Outcomes',
+                                                    'LBL_REFRESH'     => 'Refresh Chart');
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,6 +43,6 @@
 block discarded – undo
 
 
 $dashletStrings['PipelineBySalesStageDashlet'] = array('LBL_TITLE'       => 'Pipeline By Sales Stage',
-                                                         'LBL_DESCRIPTION' => 'Vertical Bar Chart of Sales Stage Pipeline',
-                                                         'LBL_REFRESH'     => 'Refresh Chart');
+                                                            'LBL_DESCRIPTION' => 'Vertical Bar Chart of Sales Stage Pipeline',
+                                                            'LBL_REFRESH'     => 'Refresh Chart');
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.meta.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -44,8 +44,8 @@
 block discarded – undo
 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');
 ?>

Please login to merge, or discard this patch.

OpportunitiesByLeadSourceDashlet.en_us.lang.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,6 +43,6 @@
 block discarded – undo
 
 
 $dashletStrings['OpportunitiesByLeadSourceDashlet'] = array('LBL_TITLE'       => 'All Opportunities by Lead Source',
-                                                       'LBL_DESCRIPTION' => 'Pie Chart of Opportunities by Lead Source',
-                                                       'LBL_REFRESH'     => 'Refresh Chart');
+                                                        'LBL_DESCRIPTION' => 'Pie Chart of Opportunities by Lead Source',
+                                                        'LBL_REFRESH'     => 'Refresh Chart');
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -40,8 +40,8 @@
		block discarded – undo
40	40
41	41	global $mod_strings;
42	42	$module_menu = Array(
43		- Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
44		- Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
	43	+ Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
	44	+ Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
45	45
46		- );
	46	+ );
47	47	?>
48	48	\ No newline at end of file

		@@ -42,33 +42,33 @@
		block discarded – undo
42	42
43	43
44	44	$layout_defs['ACL'] = array(
45		- // sets up which panels to show, in which order, and with what linked_fields
46		- 'subpanel_setup' => array(
	45	+ // sets up which panels to show, in which order, and with what linked_fields
	46	+ 'subpanel_setup' => array(
47	47	'users' => array(
48		- 'top_buttons' => array( array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
49		- 'order' => 20,
50		- 'module' => 'Users',
51		- 'subpanel_name' => 'ForSubModules',
52		- 'get_subpanel_data' => 'users',
53		- 'add_subpanel_data' => 'user_id',
54		- 'title_key' => 'LBL_USERS_SUBPANEL_TITLE',
55		- ),
56		- ),
	48	+ 'top_buttons' => array( array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'Users'),),
	49	+ 'order' => 20,
	50	+ 'module' => 'Users',
	51	+ 'subpanel_name' => 'ForSubModules',
	52	+ 'get_subpanel_data' => 'users',
	53	+ 'add_subpanel_data' => 'user_id',
	54	+ 'title_key' => 'LBL_USERS_SUBPANEL_TITLE',
	55	+ ),
	56	+ ),
57	57	);
58	58	$layout_defs['UserRoles'] = array(
59		- // sets up which panels to show, in which order, and with what linked_fields
60		- 'subpanel_setup' => array(
	59	+ // sets up which panels to show, in which order, and with what linked_fields
	60	+ 'subpanel_setup' => array(
61	61	'acl' => array(
62		- 'top_buttons' => array(array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'ACL'),),
63		- 'order' => 20,
64		- 'module' => 'ACL',
65		- 'subpanel_def_path'=>'modules/ACL/Roles/subpanels/default.php',
66		- 'subpanel_name' => 'default',
67		- 'get_subpanel_data' => 'roles',
68		- 'add_subpanel_data' => 'role_id',
69		- 'title_key' => 'LBL_ROLES_SUBPANEL_TITLE',
70		- ),
71		- ),
	62	+ 'top_buttons' => array(array('widget_class' => 'SubPanelTopSubModuleSelectButton', 'popup_module' => 'ACL'),),
	63	+ 'order' => 20,
	64	+ 'module' => 'ACL',
	65	+ 'subpanel_def_path'=>'modules/ACL/Roles/subpanels/default.php',
	66	+ 'subpanel_name' => 'default',
	67	+ 'get_subpanel_data' => 'roles',
	68	+ 'add_subpanel_data' => 'role_id',
	69	+ 'title_key' => 'LBL_ROLES_SUBPANEL_TITLE',
	70	+ ),
	71	+ ),
72	72
73	73	);
74	74

		@@ -38,96 +38,96 @@
		block discarded – undo
38	38	* display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM".
39	39	********************************************************************************/
40	40
41		- if(!defined('ACL_ALLOW_NONE')){
42		- define('ACL_ALLOW_ADMIN_DEV', 100);
43		- define('ACL_ALLOW_ADMIN', 99);
44		- define('ACL_ALLOW_ALL', 90);
45		- define('ACL_ALLOW_ENABLED', 89);
46		- define('ACL_ALLOW_OWNER', 75);
47		- define('ACL_ALLOW_NORMAL', 1);
48		- define('ACL_ALLOW_DEFAULT', 0);
49		- define('ACL_ALLOW_DISABLED', -98);
50		- define('ACL_ALLOW_NONE', -99);
51		- define('ACL_ALLOW_DEV', 95);
52		- }
53		- /**
54		- * $GLOBALS['ACLActionAccessLevels
55		- * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
56		- */
57		- $GLOBALS['ACLActionAccessLevels'] = array(
58		- ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
59		- ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
60		- ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
61		- ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
62		- ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
63		- ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
64		- ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
65		- ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
66		- ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
67		- ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
68		- );
	41	+ if(!defined('ACL_ALLOW_NONE')){
	42	+ define('ACL_ALLOW_ADMIN_DEV', 100);
	43	+ define('ACL_ALLOW_ADMIN', 99);
	44	+ define('ACL_ALLOW_ALL', 90);
	45	+ define('ACL_ALLOW_ENABLED', 89);
	46	+ define('ACL_ALLOW_OWNER', 75);
	47	+ define('ACL_ALLOW_NORMAL', 1);
	48	+ define('ACL_ALLOW_DEFAULT', 0);
	49	+ define('ACL_ALLOW_DISABLED', -98);
	50	+ define('ACL_ALLOW_NONE', -99);
	51	+ define('ACL_ALLOW_DEV', 95);
	52	+ }
	53	+ /**
	54	+ * $GLOBALS['ACLActionAccessLevels
	55	+ * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
	56	+ */
	57	+ $GLOBALS['ACLActionAccessLevels'] = array(
	58	+ ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
	59	+ ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
	60	+ ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
	61	+ ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
	62	+ ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
	63	+ ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
	64	+ ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
	65	+ ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
	66	+ ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
	67	+ ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
	68	+ );
69	69	/**
70		- * $GLOBALS['ACLActions
71		- * 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
72		- */
	70	+ * $GLOBALS['ACLActions
	71	+ * 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
	72	+ */
73	73	$GLOBALS['ACLActions'] = array(
74		- 'module'=>array('actions'=>
75		- array(
76		- 'access'=>
77		- array(
78		- 'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
79		- 'label'=>'LBL_ACTION_ACCESS',
80		- 'default'=>ACL_ALLOW_ENABLED,
81		- ),
	74	+ 'module'=>array('actions'=>
	75	+ array(
	76	+ 'access'=>
	77	+ array(
	78	+ 'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
	79	+ 'label'=>'LBL_ACTION_ACCESS',
	80	+ 'default'=>ACL_ALLOW_ENABLED,
	81	+ ),
82	82
83		- 'view'=>
84		- array(
85		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
86		- 'label'=>'LBL_ACTION_VIEW',
87		- 'default'=>ACL_ALLOW_ALL,
88		- ),
	83	+ 'view'=>
	84	+ array(
	85	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	86	+ 'label'=>'LBL_ACTION_VIEW',
	87	+ 'default'=>ACL_ALLOW_ALL,
	88	+ ),
89	89
90		- 'list'=>
91		- array(
92		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
93		- 'label'=>'LBL_ACTION_LIST',
94		- 'default'=>ACL_ALLOW_ALL,
95		- ),
96		- 'edit'=>
97		- array(
98		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
99		- 'label'=>'LBL_ACTION_EDIT',
100		- 'default'=>ACL_ALLOW_ALL,
	90	+ 'list'=>
	91	+ array(
	92	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	93	+ 'label'=>'LBL_ACTION_LIST',
	94	+ 'default'=>ACL_ALLOW_ALL,
	95	+ ),
	96	+ 'edit'=>
	97	+ array(
	98	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	99	+ 'label'=>'LBL_ACTION_EDIT',
	100	+ 'default'=>ACL_ALLOW_ALL,
101	101
102		- ),
103		- 'delete'=>
104		- array(
105		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
106		- 'label'=>'LBL_ACTION_DELETE',
107		- 'default'=>ACL_ALLOW_ALL,
	102	+ ),
	103	+ 'delete'=>
	104	+ array(
	105	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	106	+ 'label'=>'LBL_ACTION_DELETE',
	107	+ 'default'=>ACL_ALLOW_ALL,
108	108
109		- ),
110		- 'import'=>
111		- array(
112		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
113		- 'label'=>'LBL_ACTION_IMPORT',
114		- 'default'=>ACL_ALLOW_ALL,
115		- ),
116		- 'export'=>
117		- array(
118		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
119		- 'label'=>'LBL_ACTION_EXPORT',
120		- 'default'=>ACL_ALLOW_ALL,
121		- ),
	109	+ ),
	110	+ 'import'=>
	111	+ array(
	112	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	113	+ 'label'=>'LBL_ACTION_IMPORT',
	114	+ 'default'=>ACL_ALLOW_ALL,
	115	+ ),
	116	+ 'export'=>
	117	+ array(
	118	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	119	+ 'label'=>'LBL_ACTION_EXPORT',
	120	+ 'default'=>ACL_ALLOW_ALL,
	121	+ ),
122	122	'massupdate'=>
123		- array(
124		- 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
125		- 'label'=>'LBL_ACTION_MASSUPDATE',
126		- 'default'=>ACL_ALLOW_ALL,
127		- ),
	123	+ array(
	124	+ 'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
	125	+ 'label'=>'LBL_ACTION_MASSUPDATE',
	126	+ 'default'=>ACL_ALLOW_ALL,
	127	+ ),
128	128
129	129
130		- ),),
	130	+ ),),
131	131	);
132	132
133	133

		@@ -44,8 +44,8 @@
		block discarded – undo
44	44	global $app_strings, $current_language;
45	45
46	46	$dashletMeta['MyPipelineBySalesStageDashlet'] = array('title' => 'LBL_TITLE',
47		- 'description' => 'LBL_TITLE',
48		- 'icon' => 'icon_Charts_Funnel_32.gif',
49		- 'module' => 'Opportunities',
50		- 'category' => 'Charts');
	47	+ 'description' => 'LBL_TITLE',
	48	+ 'icon' => 'icon_Charts_Funnel_32.gif',
	49	+ 'module' => 'Opportunities',
	50	+ 'category' => 'Charts');
51	51	?>

		@@ -43,6 +43,6 @@
		block discarded – undo
43	43
44	44
45	45	$dashletStrings['MyPipelineBySalesStageDashlet'] = array('LBL_TITLE' => 'My Pipeline By Sales Stage',
46		- 'LBL_DESCRIPTION' => 'Vertical Bar Chart of My Sales Stage Pipeline',
47		- 'LBL_REFRESH' => 'Refresh Chart');
	46	+ 'LBL_DESCRIPTION' => 'Vertical Bar Chart of My Sales Stage Pipeline',
	47	+ 'LBL_REFRESH' => 'Refresh Chart');
48	48	?>
49	49	\ No newline at end of file

		@@ -43,6 +43,6 @@
		block discarded – undo
43	43
44	44
45	45	$dashletStrings['OutcomeByMonthDashlet'] = array('LBL_TITLE' => 'Outcome by Month',
46		- 'LBL_DESCRIPTION' => 'Chart of the Monthly Outcomes',
47		- 'LBL_REFRESH' => 'Refresh Chart');
	46	+ 'LBL_DESCRIPTION' => 'Chart of the Monthly Outcomes',
	47	+ 'LBL_REFRESH' => 'Refresh Chart');
48	48	?>
49	49	\ No newline at end of file

		@@ -43,6 +43,6 @@
		block discarded – undo
43	43
44	44
45	45	$dashletStrings['PipelineBySalesStageDashlet'] = array('LBL_TITLE' => 'Pipeline By Sales Stage',
46		- 'LBL_DESCRIPTION' => 'Vertical Bar Chart of Sales Stage Pipeline',
47		- 'LBL_REFRESH' => 'Refresh Chart');
	46	+ 'LBL_DESCRIPTION' => 'Vertical Bar Chart of Sales Stage Pipeline',
	47	+ 'LBL_REFRESH' => 'Refresh Chart');
48	48	?>
49	49	\ No newline at end of file

		@@ -43,6 +43,6 @@
		block discarded – undo
43	43
44	44
45	45	$dashletStrings['OpportunitiesByLeadSourceDashlet'] = array('LBL_TITLE' => 'All Opportunities by Lead Source',
46		- 'LBL_DESCRIPTION' => 'Pie Chart of Opportunities by Lead Source',
47		- 'LBL_REFRESH' => 'Refresh Chart');
	46	+ 'LBL_DESCRIPTION' => 'Pie Chart of Opportunities by Lead Source',
	47	+ 'LBL_REFRESH' => 'Refresh Chart');
48	48	?>
49	49	\ No newline at end of file

adamjakab / SuiteCRM

Push — console-installer ( 3d54e5...e2b50d )

Category

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch