adamjakab / SuiteCRM

modules/ACLActions/actiondefs.override.php

Indentation +87 added lines, -87 removed lines

@@ -35,103 +35,103 @@
  * "Powered by SugarCRM".
  ********************************************************************************/
 
- 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);
- 	/* BEGIN - SECURITY GROUPS */ 
- 	define('ACL_ALLOW_GROUP', 80); //securitygroup
- 	/* END - SECURITY GROUPS */ 
- 	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'),
- 	/* BEGIN - SECURITY GROUPS */ 
- 	ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
- 	/* END - SECURITY GROUPS */ 
- 	);
+    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);
+        /* BEGIN - SECURITY GROUPS */ 
+        define('ACL_ALLOW_GROUP', 80); //securitygroup
+        /* END - SECURITY GROUPS */ 
+        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'),
+        /* BEGIN - SECURITY GROUPS */ 
+        ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
+        /* END - SECURITY GROUPS */ 
+        );
 /**
- * $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
+         */
 /* BEGIN - SECURITY GROUPS */ 
 $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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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_GROUP,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,
+                                ),
 						
 					
-				),),
+                ),),
 );
 /* END - SECURITY GROUPS */ 
 

modules/ACLActions/vardefs.php

Indentation +38 added lines, -38 removed lines

@@ -42,34 +42,34 @@ 
 
 
 $dictionary['ACLAction'] = array('table' => 'acl_actions', 'comment' => 'Determine the allowable actions available to users'
-                               ,'fields' => array (
-  'id' =>
-  array (
+                                ,'fields' => array (
+    'id' =>
+    array (
     'name' => 'id',
     'vname' => 'LBL_ID',
     'required'=>true,
     'type' => 'id',
     'reportable'=>false,
     'comment' => 'Unique identifier'
-  ),
-   'date_entered' =>
-  array (
+    ),
+    'date_entered' =>
+    array (
     'name' => 'date_entered',
     'vname' => 'LBL_DATE_ENTERED',
     'type' => 'datetime',
     'required'=>true,
     'comment' => 'Date record created'
-  ),
-  'date_modified' =>
-  array (
+    ),
+    'date_modified' =>
+    array (
     'name' => 'date_modified',
     'vname' => 'LBL_DATE_MODIFIED',
     'type' => 'datetime',
     'required'=>true,
     'comment' => 'Date record last modified'
-  ),
+    ),
     'modified_user_id' =>
-  array (
+    array (
     'name' => 'modified_user_id',
     'rname' => 'user_name',
     'id_name' => 'modified_user_id',
@@ -82,9 +82,9 @@ 
     'len' => 36,
     'reportable'=>true,
     'comment' => 'User who last modified record'
-  ),
+    ),
     'created_by' =>
-  array (
+    array (
     'name' => 'created_by',
     'rname' => 'user_name',
     'id_name' => 'created_by',
@@ -95,63 +95,63 @@ 
     'dbType' => 'id',
     'len' => 36,
     'comment' => 'User ID who created record'
-  ),
-   'name' =>
-  array (
+    ),
+    'name' =>
+    array (
     'name' => 'name',
     'type' => 'varchar',
     'vname' => 'LBL_NAME',
     'len' => 150,
     'comment' => 'Name of the allowable action (view, list, delete, edit)'
-  ),
-   'category' =>
-  array (
+    ),
+    'category' =>
+    array (
     'name' => 'category',
     'vname' => 'LBL_CATEGORY',
     'type' => 'varchar',
-	'len' =>100,
+    'len' =>100,
     'reportable'=>true,
     'comment' => 'Category of the allowable action (usually the name of a module)'
-  ),
+    ),
     'acltype' =>
-  array (
+    array (
     'name' => 'acltype',
     'vname' => 'LBL_TYPE',
     'type' => 'varchar',
-	'len' =>100,
+    'len' =>100,
     'reportable'=>true,
     'comment' => 'Specifier for Category, usually "module"'
-  ),
-  'aclaccess' =>
-  array (
+    ),
+    'aclaccess' =>
+    array (
     'name' => 'aclaccess',
     'vname' => 'LBL_ACCESS',
     'type' => 'int',
     'len'=>3,
     'reportable'=>true,
     'comment' => 'Number specifying access priority; highest access "wins"'
-  ),
-  'deleted' =>
-  array (
+    ),
+    'deleted' =>
+    array (
     'name' => 'deleted',
     'vname' => 'LBL_DELETED',
     'type' => 'bool',
     'reportable'=>false,
     'comment' => 'Record deletion indicator'
-  ),
-  'roles' =>
-  array (
-  	'name' => 'roles',
+    ),
+    'roles' =>
+    array (
+        'name' => 'roles',
     'type' => 'link',
     'relationship' => 'acl_roles_actions',
     'source'=>'non-db',
-	'vname'=>'LBL_USERS',
-  ),
+    'vname'=>'LBL_USERS',
+    ),
 ),
 'indices' => array (
-       array('name' =>'aclactionid', 'type' =>'primary', 'fields'=>array('id')),
-       array('name' =>'idx_aclaction_id_del', 'type' =>'index', 'fields'=>array('id', 'deleted')),
-       array('name' =>'idx_category_name', 'type' =>'index', 'fields'=>array('category', 'name')),                                                   )
+        array('name' =>'aclactionid', 'type' =>'primary', 'fields'=>array('id')),
+        array('name' =>'idx_aclaction_id_del', 'type' =>'index', 'fields'=>array('id', 'deleted')),
+        array('name' =>'idx_category_name', 'type' =>'index', 'fields'=>array('category', 'name')),                                                   )
 
                             );
 ?>
\ No newline at end of file

modules/ACLActions/ACLAction.php

Indentation +185 added lines, -185 removed lines

@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
 if(file_exists("modules/ACLActions/actiondefs.override.php")){
-	require_once("modules/ACLActions/actiondefs.override.php");
+    require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
@@ -55,12 +55,12 @@ 
     }
 
     /**
-    * static addActions($category, $type='module')
-    * Adds all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static addActions($category, $type='module')
+     * Adds all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     static function addActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -91,12 +91,12 @@ 
     }
 
     /**
-    * static removeActions($category, $type='module')
-    * Removes all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static removeActions($category, $type='module')
+     * Removes all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     public static function removeActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -118,13 +118,13 @@ 
     }
 
     /**
-    * static AccessColor($access)
-    *
-    * returns the color associated with an access level
-    * these colors exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the color either name or hex representation or false if the level does not exist
-    */
+     * static AccessColor($access)
+     *
+     * returns the color associated with an access level
+     * these colors exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the color either name or hex representation or false if the level does not exist
+     */
     protected static function AccessColor($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -136,13 +136,13 @@ 
     }
 
     /**
-    * static AccessName($access)
-    *
-    * returns the translated name  associated with an access level
-    * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the translated access level name or false if the level does not exist
-    */
+     * static AccessName($access)
+     *
+     * returns the translated name  associated with an access level
+     * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the translated access level name or false if the level does not exist
+     */
     static function AccessName($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -172,10 +172,10 @@ 
     }
 
     /**
-    * static getAccessOptions()
-    * this is used for building select boxes
-    * @return array containg access levels (ints) as keys and access names as values
-    */
+     * static getAccessOptions()
+     * this is used for building select boxes
+     * @return array containg access levels (ints) as keys and access names as values
+     */
     protected static function getAccessOptions( $action, $type='module'){
         global $ACLActions;
         $options = array();
@@ -189,11 +189,11 @@ 
     }
 
     /**
-    * function static getDefaultActions()
-    * This function will return a list of acl actions with their default access levels
-    *
-    *
-    */
+     * function static getDefaultActions()
+     * This function will return a list of acl actions with their default access levels
+     *
+     *
+     */
     public static function getDefaultActions($type='module', $action=''){
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
         if(!empty($type)){
@@ -217,14 +217,14 @@ 
 
 
     /**
-    * static getUserActions($user_id,$refresh=false, $category='', $action='')
-    * returns a list of user actions
-    * @param GUID $user_id
-    * @param BOOLEAN $refresh
-    * @param STRING $category
-    * @param STRING $action
-    * @return ARRAY of ACLActionsArray
-    */
+     * static getUserActions($user_id,$refresh=false, $category='', $action='')
+     * returns a list of user actions
+     * @param GUID $user_id
+     * @param BOOLEAN $refresh
+     * @param STRING $category
+     * @param STRING $action
+     * @return ARRAY of ACLActionsArray
+     */
 
     static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
         //check in the session if we already have it loaded
@@ -256,15 +256,15 @@ 
         if(!empty($type)){
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $query = "SELECT acl_actions .*, acl_roles_actions.access_override
                     FROM acl_actions
                     LEFT JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
                     LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
                     WHERE acl_actions.deleted=0 $additional_where ORDER BY category,name";
-		*/
-		$query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
+         */
+        $query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
 				FROM acl_actions
 				INNER JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
 				LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
@@ -286,34 +286,34 @@ 
 				WHERE acl_actions.deleted = 0 )
 
 				ORDER BY user_role desc, category,name,access_override desc"; //want non-null to show first
-		 /* END - SECURITY GROUPS */
+            /* END - SECURITY GROUPS */
         $result = $db->query($query);
         $selected_actions = array();
-		/* BEGIN - SECURITY GROUPS */ 
-		global $sugar_config;
-		$has_user_role = false; //used for user_role_precedence
-		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
-		/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */ 
+        global $sugar_config;
+        $has_user_role = false; //used for user_role_precedence
+        $has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
+        /* END - SECURITY GROUPS */
         while($row = $db->fetchByAssoc($result, FALSE) ){
-			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
-				$has_user_role = true;
-			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
-				$has_role = true;
-			}
-			//if user roles should take precedence over group roles and we have a user role 
-			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
-					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
-			{
-				break; 
-			}
-			if($row['user_role'] == -1 && $has_role == true) {
-				break; //no need for default actions when a role is assigned to the user or user's group already
-			}
-			/* END - SECURITY GROUPS */
+            /* BEGIN - SECURITY GROUPS */ 
+            if($has_user_role == false && $row['user_role'] == 1) {
+                $has_user_role = true;
+            }
+            if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+                $has_role = true;
+            }
+            //if user roles should take precedence over group roles and we have a user role 
+            //break when we get to processing the group roles
+            if($has_user_role == true && $row['user_role'] == 0 
+                    && isset($sugar_config['securitysuite_user_role_precedence'])
+                    && $sugar_config['securitysuite_user_role_precedence'] == true ) 
+            {
+                break; 
+            }
+            if($row['user_role'] == -1 && $has_role == true) {
+                break; //no need for default actions when a role is assigned to the user or user's group already
+            }
+            /* END - SECURITY GROUPS */
             $acl = new ACLAction();
             $isOverride  = false;
             $acl->populateFromRow($row);
@@ -326,16 +326,16 @@ 
 
             }
             if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
-				|| (
-					/* BEGIN - SECURITY GROUPS - additive security*/
-					(
-						(isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
-					||
-						((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
-					)
-					/* END - SECURITY GROUPS */
+                || (
+                    /* BEGIN - SECURITY GROUPS - additive security*/
+                    (
+                        (isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
+                    ||
+                        ((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
+                    )
+                    /* END - SECURITY GROUPS */
                     && $isOverride
                     )
                 ||
@@ -388,70 +388,70 @@ 
     }
     
     /**
-    * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
-    * checks if a user has access to this acl if the user is an owner it will check if owners have access
-    *
-    * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
-    * @param boolean $is_owner
-    * @param int $access
-    * @return true or false
-    */
-	/* BEGIN - SECURITY GROUPS */
-	/**
+     * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
+     * checks if a user has access to this acl if the user is an owner it will check if owners have access
+     *
+     * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
+     * @param boolean $is_owner
+     * @param int $access
+     * @return true or false
+     */
+    /* BEGIN - SECURITY GROUPS */
+    /**
     static function hasAccess($is_owner=false, $access = 0){
-	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0){	
-		/**
+     */
+    static function hasAccess($is_owner=false, $in_group=false, $access = 0){	
+        /**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
         if(isset($this) && isset($this->aclaccess)){
             if($this->aclaccess == ACL_ALLOW_ALL || ($is_owner && $this->aclaccess == ACL_ALLOW_OWNER))
             return true;
         }
-		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
-			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-		)) {
-			return true;
-		}
+         */
+        if($access != 0 && ($access == ACL_ALLOW_ALL 
+            || ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+            || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+        )) {
+            return true;
+        }
         if(isset($this) && isset($this->aclaccess)){
-			if($this->aclaccess == ACL_ALLOW_ALL 
-				|| ($is_owner && $this->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
-				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-			) {
-            	return true;
-        	}
-		}
+            if($this->aclaccess == ACL_ALLOW_ALL 
+                || ($is_owner && $this->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
+                || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+            ) {
+                return true;
+            }
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */
-
-	/* BEGIN - SECURITY GROUPS */
-	/**
-	 * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
-	 * checks if a user should have ownership to do an action
-	 *
-	 * @param GUID $user_id
-	 * @param STRING $category
-	 * @param STRING $action
-	 * @param STRING $type
-	 * @return boolean
-	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
-		//check if we don't have it set in the cache if not lets reload the cache
+    /* END - SECURITY GROUPS */
+
+    /* BEGIN - SECURITY GROUPS */
+    /**
+     * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
+    static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+        //check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			ACLAction::getUserActions($user_id, false);
+        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            ACLAction::getUserActions($user_id, false);
 			
-		}
+        }
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
-		}
+        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */	
+    /* END - SECURITY GROUPS */	
 
 
 
@@ -461,20 +461,20 @@ 
 
 
     /**
-    * static function userHasAccess($user_id, $category, $action, $is_owner = false)
-    *
-    * @param GUID $user_id the user id who you want to check access for
-    * @param STRING $category the category you would like to check access for
-    * @param STRING $action the action of that category you would like to check access for
-    * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
-    */
-	/* BEGIN - SECURITY GROUPS - added $in_group */
-	/**
+     * static function userHasAccess($user_id, $category, $action, $is_owner = false)
+     *
+     * @param GUID $user_id the user id who you want to check access for
+     * @param STRING $category the category you would like to check access for
+     * @param STRING $action the action of that category you would like to check access for
+     * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
+     */
+    /* BEGIN - SECURITY GROUPS - added $in_group */
+    /**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
-	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
-       global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+     */
+    public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+        global $current_user;
+        if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
@@ -488,22 +488,22 @@ 
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
-			return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
+            return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
         }
         return false;
 
     }
-	/* END - SECURITY GROUPS */
+    /* END - SECURITY GROUPS */
     /**
-    * function getUserAccessLevel($user_id, $category, $action,$type='module')
-    * returns the access level for a given category and action
-    *
-    * @param GUID  $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return INT (ACCESS LEVEL)
-    */
+     * function getUserAccessLevel($user_id, $category, $action,$type='module')
+     * returns the access level for a given category and action
+     *
+     * @param GUID  $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return INT (ACCESS LEVEL)
+     */
     public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
         if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
             ACLAction::getUserActions($user_id, false);
@@ -520,15 +520,15 @@ 
     }
 
     /**
-    * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
-    * checks if a user should have ownership to do an action
-    *
-    * @param GUID $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return boolean
-    */
+     * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
     public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
         //check if we don't have it set in the cache if not lets reload the cache
 
@@ -545,12 +545,12 @@ 
 
     }
     /**
-    *
-    * static pass by ref setupCategoriesMatrix(&$categories)
-    * takes in an array of categories and modifes them adding display information
-    *
-    * @param unknown_type $categories
-    */
+     *
+     * static pass by ref setupCategoriesMatrix(&$categories)
+     * takes in an array of categories and modifes them adding display information
+     *
+     * @param unknown_type $categories
+     */
     public static function setupCategoriesMatrix(&$categories){
         global $ACLActions, $current_user;
         $names = array();
@@ -593,11 +593,11 @@ 
 
 
     /**
-    * function toArray()
-    * returns this acl as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * function toArray()
+     * returns this acl as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
         $array_fields = array('id', 'aclaccess');
         $arr = array();
@@ -608,11 +608,11 @@ 
     }
 
     /**
-    * function fromArray($arr)
-    * converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * function fromArray($arr)
+     * converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr){
         foreach($arr as $name=>$value){
             $this->$name = $value;
@@ -620,10 +620,10 @@ 
     }
 
     /**
-    * function clearSessionCache()
-    * clears the session variable storing the cache information for acls
-    *
-    */
+     * function clearSessionCache()
+     * clears the session variable storing the cache information for acls
+     *
+     */
     function clearSessionCache(){
         unset($_SESSION['ACL']);
     }

modules/ACLActions/Menu.php

Indentation +3 added lines, -3 removed lines

@@ -40,8 +40,8 @@
 
 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

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',
+        ),
+    ),
 	
 );
 

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,
+                                ),
 						
 					
-				),),
+                ),),
 );
 
 

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');
 ?>

modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php

Indentation +2 added lines, -2 removed lines

@@ -43,6 +43,6 @@
 
 
 $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

modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php

Indentation +2 added lines, -2 removed lines

@@ -43,6 +43,6 @@
 
 
 $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