adamjakab / SuiteCRM

modules/ACLRoles/DetailUserRole.php

Spacing +11 added lines, -11 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.
@@ -47,21 +47,21 @@ 
 
 $focus = new User();
 $focus->retrieve($_REQUEST['record']);
-if ( !is_admin($focus) ) {
+if (!is_admin($focus)) {
     $sugar_smarty = new Sugar_Smarty();
     $sugar_smarty->assign('MOD', $mod_strings);
     $sugar_smarty->assign('APP', $app_strings);
     $sugar_smarty->assign('APP_LIST', $app_list_strings);
     
-    $categories = ACLAction::getUserActions($_REQUEST['record'],true);
+    $categories = ACLAction::getUserActions($_REQUEST['record'], true);
     
     //clear out any removed tabs from user display
-    if(!$GLOBALS['current_user']->isAdminForModule('Users')){
+    if (!$GLOBALS['current_user']->isAdminForModule('Users')) {
         $tabs = $focus->getPreference('display_tabs');
         global $modInvisList;
-        if(!empty($tabs)){
-            foreach($categories as $key=>$value){
-                if(!in_array($key, $tabs) &&  !in_array($key, $modInvisList) ){
+        if (!empty($tabs)) {
+            foreach ($categories as $key=>$value) {
+                if (!in_array($key, $tabs) && !in_array($key, $modInvisList)) {
                     unset($categories[$key]);
                     
                 }
@@ -72,13 +72,13 @@ 
     
     $names = array();
     $names = ACLAction::setupCategoriesMatrix($categories);
-    if(!empty($names))$tdwidth = 100 / sizeof($names);
+    if (!empty($names))$tdwidth = 100 / sizeof($names);
     $sugar_smarty->assign('APP', $app_list_strings);
     $sugar_smarty->assign('CATEGORIES', $categories);
     $sugar_smarty->assign('TDWIDTH', $tdwidth);
     $sugar_smarty->assign('ACTION_NAMES', $names);
     
-    $title = getClassicModuleTitle( '',array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_ROLES_SUBPANEL_TITLE']), '');
+    $title = getClassicModuleTitle('', array($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_ROLES_SUBPANEL_TITLE']), '');
     
     $sugar_smarty->assign('TITLE', $title);
     $sugar_smarty->assign('USER_ID', $focus->id);
@@ -88,8 +88,8 @@ 
     
     //this gets its layout_defs.php file from the user not from ACLRoles so look in modules/Users for the layout defs
     require_once('include/SubPanel/SubPanelTiles.php');
-    $modules_exempt_from_availability_check=array('Users'=>'Users','ACLRoles'=>'ACLRoles',);
+    $modules_exempt_from_availability_check = array('Users'=>'Users', 'ACLRoles'=>'ACLRoles',);
     $subpanel = new SubPanelTiles($focus, 'UserRoles');
     
-    echo $subpanel->display(true,true);
+    echo $subpanel->display(true, true);
 }

Braces +6 added lines, -2 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.
@@ -72,7 +74,9 @@ 
     
     $names = array();
     $names = ACLAction::setupCategoriesMatrix($categories);
-    if(!empty($names))$tdwidth = 100 / sizeof($names);
+    if(!empty($names)) {
+        $tdwidth = 100 / sizeof($names);
+    }
     $sugar_smarty->assign('APP', $app_list_strings);
     $sugar_smarty->assign('CATEGORIES', $categories);
     $sugar_smarty->assign('TDWIDTH', $tdwidth);

modules/ACLRoles/ACLRole.php

Indentation +15 added lines, -15 removed lines

@@ -242,12 +242,12 @@ 
         return ($a < $b) ? -1 : 1;
     }
 /**
- * function mark_relationships_deleted($id)
- *
- * special case to delete acl_roles_actions relationship
- *
- * @param ACLRole GUID $id
- */
+     * function mark_relationships_deleted($id)
+     *
+     * special case to delete acl_roles_actions relationship
+     *
+     * @param ACLRole GUID $id
+     */
 function mark_relationships_deleted($id){
         //we need to delete the actions relationship by hand (special case)
         $date_modified = db_convert("'".TimeDate::getInstance()->nowDb()."'", 'datetime');
@@ -258,10 +258,10 @@ 
 
 /**
  *  toArray()
-    * returns this role as an array
-    *
-    * @return array of fields with id, name, description
-    */
+ * returns this role as an array
+ *
+ * @return array of fields with id, name, description
+ */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false){
         $array_fields = array('id', 'name', 'description');
         $arr = array();
@@ -276,11 +276,11 @@ 
     }
 
     /**
-    * fromArray($arr)
-    * converts an array into an role mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * fromArray($arr)
+     * converts an array into an role mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr){
         foreach($arr as $name=>$value){
             $this->$name = $value;

Spacing +36 added lines, -36 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-class ACLRole extends SugarBean{
+class ACLRole extends SugarBean {
     var $module_dir = 'ACLRoles';
     var $object_name = 'ACLRole';
     var $table_name = 'acl_roles';
@@ -52,16 +52,16 @@ 
 
     var $created_by;
 
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ACLRole(){
+    public function ACLRole() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -87,10 +87,10 @@ 
  * @param GUID $action_id - the ACL Action id
  * @param int $access - the access level ACL_ALLOW_ALL ACL_ALLOW_NONE ACL_ALLOW_OWNER...
  */
-function setAction($role_id, $action_id, $access){
+function setAction($role_id, $action_id, $access) {
     $relationship_data = array('role_id'=>$role_id, 'action_id'=>$action_id,);
     $additional_data = array('access_override'=>$access);
-    $this->set_relationship('acl_roles_actions',$relationship_data,true, true,$additional_data);
+    $this->set_relationship('acl_roles_actions', $relationship_data, true, true, $additional_data);
 }
 
 
@@ -101,7 +101,7 @@ 
  * @param GUID $user_id
  * @return a list of ACLRole objects
  */
-function getUserRoles($user_id, $getAsNameArray = true){
+function getUserRoles($user_id, $getAsNameArray = true) {
 
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
@@ -114,10 +114,10 @@ 
         $result = $GLOBALS['db']->query($query);
         $user_roles = array();
 
-        while($row = $GLOBALS['db']->fetchByAssoc($result) ){
+        while ($row = $GLOBALS['db']->fetchByAssoc($result)) {
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($getAsNameArray)
+            if ($getAsNameArray)
                 $user_roles[] = $role->name;
             else
                 $user_roles[] = $role;
@@ -133,11 +133,11 @@ 
  * @param GUID $user_id
  * @return a list of ACLRole Names
  */
-function getUserRoleNames($user_id){
+function getUserRoleNames($user_id) {
 
         $user_roles = sugar_cache_retrieve("RoleMembershipNames_".$user_id);
 
-        if(!$user_roles){
+        if (!$user_roles) {
             //if we don't have it loaded then lets check against the db
             $additional_where = '';
             $query = "SELECT acl_roles.* ".
@@ -149,7 +149,7 @@ 
             $result = $GLOBALS['db']->query($query);
             $user_roles = array();
 
-            while($row = $GLOBALS['db']->fetchByAssoc($result) ){
+            while ($row = $GLOBALS['db']->fetchByAssoc($result)) {
                 $user_roles[] = $row['name'];
             }
 
@@ -166,7 +166,7 @@ 
  * @param boolean $returnAsArray - should it return the results as an array of arrays or as an array of ACLRoles
  * @return either an array of array representations of acl roles or an array of ACLRoles
  */
-function getAllRoles($returnAsArray = false){
+function getAllRoles($returnAsArray = false) {
         $db = DBManagerFactory::getInstance();
         $query = "SELECT acl_roles.* FROM acl_roles
                     WHERE acl_roles.deleted=0 ORDER BY name";
@@ -174,12 +174,12 @@ 
         $result = $db->query($query);
         $roles = array();
 
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($returnAsArray){
+            if ($returnAsArray) {
                 $roles[] = $role->toArray();
-            }else{
+            } else {
                 $roles[] = $role;
             }
 
@@ -197,41 +197,41 @@ 
  * @param GUID $role_id
  * @return array of actions
  */
-function getRoleActions($role_id, $type='module'){
+function getRoleActions($role_id, $type = 'module') {
         global $beanList;
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
         $db = DBManagerFactory::getInstance();
         $query = "SELECT acl_actions.*";
         //only if we have a role id do we need to join the table otherwise lets use the ones defined in acl_actions as the defaults
-        if(!empty($role_id)){
-                $query .=" ,acl_roles_actions.access_override ";
+        if (!empty($role_id)) {
+                $query .= " ,acl_roles_actions.access_override ";
         }
-        $query .=" FROM acl_actions ";
+        $query .= " FROM acl_actions ";
 
-        if(!empty($role_id)){
-            $query .=		" LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = '$role_id' AND  acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted = 0";
+        if (!empty($role_id)) {
+            $query .= " LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = '$role_id' AND  acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted = 0";
         }
         $query .= " WHERE acl_actions.deleted=0 ORDER BY acl_actions.category, acl_actions.name";
         $result = $db->query($query);
         $role_actions = array();
 
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $action = new ACLAction();
             $action->populateFromRow($row);
-            if(!empty($row['access_override'])){
+            if (!empty($row['access_override'])) {
                 $action->aclaccess = $row['access_override'];
-            }else{
+            } else {
                 $action->aclaccess = ACL_ALLOW_DEFAULT;
 
             }
             //#27877 . If  there is no this module in beanlist , we will not show them in UI, no matter this module was deleted or not in ACL_ACTIONS table.
-            if(empty($beanList[$action->category])){
+            if (empty($beanList[$action->category])) {
                 continue;
             }
             //end
 
-            if(!isset($role_actions[$action->category])){
+            if (!isset($role_actions[$action->category])) {
                 $role_actions[$action->category] = array();
             }
 
@@ -263,10 +263,10 @@ 
  *
  * @param ACLRole GUID $id
  */
-function mark_relationships_deleted($id){
+function mark_relationships_deleted($id) {
         //we need to delete the actions relationship by hand (special case)
         $date_modified = db_convert("'".TimeDate::getInstance()->nowDb()."'", 'datetime');
-        $query =  "UPDATE acl_roles_actions SET deleted=1 , date_modified=$date_modified WHERE role_id = '$id' AND deleted=0";
+        $query = "UPDATE acl_roles_actions SET deleted=1 , date_modified=$date_modified WHERE role_id = '$id' AND deleted=0";
         $this->db->query($query);
         parent::mark_relationships_deleted($id);
 }
@@ -277,13 +277,13 @@ 
     *
     * @return array of fields with id, name, description
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false){
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false) {
         $array_fields = array('id', 'name', 'description');
         $arr = array();
-        foreach($array_fields as $field){
-            if(isset($this->$field)){
+        foreach ($array_fields as $field) {
+            if (isset($this->$field)) {
                 $arr[$field] = $this->$field;
-            }else{
+            } else {
                 $arr[$field] = '';
             }
         }
@@ -296,8 +296,8 @@ 
     *
     * @param Array $arr
     */
-    function fromArray($arr){
-        foreach($arr as $name=>$value){
+    function fromArray($arr) {
+        foreach ($arr as $name=>$value) {
             $this->$name = $value;
         }
     }

Braces +15 added lines, -12 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.
@@ -63,8 +65,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -117,10 +118,11 @@ 
         while($row = $GLOBALS['db']->fetchByAssoc($result) ){
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($getAsNameArray)
-                $user_roles[] = $role->name;
-            else
-                $user_roles[] = $role;
+            if($getAsNameArray) {
+                            $user_roles[] = $role->name;
+            } else {
+                            $user_roles[] = $role;
+            }
         }
 
         return $user_roles;
@@ -179,7 +181,7 @@ 
             $role->populateFromRow($row);
             if($returnAsArray){
                 $roles[] = $role->toArray();
-            }else{
+            } else{
                 $roles[] = $role;
             }
 
@@ -221,7 +223,7 @@ 
             $action->populateFromRow($row);
             if(!empty($row['access_override'])){
                 $action->aclaccess = $row['access_override'];
-            }else{
+            } else{
                 $action->aclaccess = ACL_ALLOW_DEFAULT;
 
             }
@@ -252,8 +254,9 @@ 
         // Fallback to array key if translation is empty
         $a = empty($app_list_strings['moduleList'][$a]) ? $a : $app_list_strings['moduleList'][$a];
         $b = empty($app_list_strings['moduleList'][$b]) ? $b : $app_list_strings['moduleList'][$b];
-        if ($a == $b)
-            return 0;
+        if ($a == $b) {
+                    return 0;
+        }
         return ($a < $b) ? -1 : 1;
     }
 /**
@@ -283,7 +286,7 @@ 
         foreach($array_fields as $field){
             if(isset($this->$field)){
                 $arr[$field] = $this->$field;
-            }else{
+            } else{
                 $arr[$field] = '';
             }
         }

modules/ACLRoles/EditView.php

Indentation +20 added lines, -20 removed lines

@@ -61,29 +61,29 @@ 
 $role_name = '';
 $return= array('module'=>'ACLRoles', 'action'=>'index', 'record'=>'');
 if(!empty($_REQUEST['record'])){
-	$role->retrieve($_REQUEST['record']);
-	$categories = ACLRole::getRoleActions($_REQUEST['record']);
-	$role_name =  $role->name;
-	if(!empty($_REQUEST['isDuplicate'])){
-		//role id is stripped here in duplicate so anything using role id after this will not have it
-		$role->id = '';
-		$sugar_smarty->assign('ISDUPLICATE', $_REQUEST['record']);
-		$duplicateString=translate('LBL_DUPLICATE_OF', 'ACLRoles');
-	}else{
-		$return['record']= $role->id;
-		$return['action']='DetailView';
-	}
+    $role->retrieve($_REQUEST['record']);
+    $categories = ACLRole::getRoleActions($_REQUEST['record']);
+    $role_name =  $role->name;
+    if(!empty($_REQUEST['isDuplicate'])){
+        //role id is stripped here in duplicate so anything using role id after this will not have it
+        $role->id = '';
+        $sugar_smarty->assign('ISDUPLICATE', $_REQUEST['record']);
+        $duplicateString=translate('LBL_DUPLICATE_OF', 'ACLRoles');
+    }else{
+        $return['record']= $role->id;
+        $return['action']='DetailView';
+    }
 
 }else{
-	$categories = ACLRole::getRoleActions('');
+    $categories = ACLRole::getRoleActions('');
 }
 $sugar_smarty->assign('ROLE', $role->toArray());
 $tdwidth = 10;
 
 if(isset($_REQUEST['return_module'])){
-	$return['module']=$_REQUEST['return_module'];
-	if(isset($_REQUEST['return_id']))$return['record']=$_REQUEST['return_id'];
-	if(isset($_REQUEST['return_record'])){$return['record']=$_REQUEST['return_record'];}
+    $return['module']=$_REQUEST['return_module'];
+    if(isset($_REQUEST['return_id']))$return['record']=$_REQUEST['return_id'];
+    if(isset($_REQUEST['return_record'])){$return['record']=$_REQUEST['return_record'];}
     if(isset($_REQUEST['return_action'])){$return['action']=$_REQUEST['return_action'];}
     if ( !empty($return['record']) ) {
         $return['action'] = 'DetailView';
@@ -100,18 +100,18 @@ 
 $params = array();
 $params[] = "<a href='index.php?module=ACLRoles&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
 if(empty($role->id)){
-	$params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
+    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
 }else{
-	$params[] = $role->get_summary_text();
+    $params[] = $role->get_summary_text();
 }
 echo getClassicModuleTitle("ACLRoles", $params, true);
 
 $buttons = array(
-	"<input title=".$app_strings['LBL_SAVE_BUTTON_TITLE']." id='save_button'
+    "<input title=".$app_strings['LBL_SAVE_BUTTON_TITLE']." id='save_button'
 		accessKey=".$app_strings['LBL_SAVE_BUTTON_KEY']." class='button primary'
 		onclick=\"this.form.action.value='Save';return check_form('EditView');\"
 		type='submit' name='button' value=".$app_strings['LBL_SAVE_BUTTON_LABEL']." >",
-	"<input title=".$app_strings['LBL_CANCEL_BUTTON_TITLE']."
+    "<input title=".$app_strings['LBL_CANCEL_BUTTON_TITLE']."
 		class='button cancel_button' accessKey=".$app_strings['LBL_CANCEL_BUTTON_KEY']."
 		type='submit' name='save' value=".$app_strings['LBL_CANCEL_BUTTON_LABEL']."
 		onclick=\"document.EditView.action.value='".$return['action']."';document.EditView.module.value='".$return['module']."';document.EditView.record.value='".$return['record']."';document.EditView.submit();\">",

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.
@@ -41,14 +41,14 @@ 
 
 
 
-global $app_list_strings;// $modInvisList;
+global $app_list_strings; // $modInvisList;
 
 $sugar_smarty = new Sugar_Smarty();
 
 $sugar_smarty->assign('MOD', $mod_strings);
 $sugar_smarty->assign('APP', $app_strings);
 $sugar_smarty->assign('ISDUPLICATE', '');
-$duplicateString='';
+$duplicateString = '';
 //mass localization
 /*foreach($modInvisList as $modinvisname){
 	$app_list_strings['moduleList'][$modinvisname] = $modinvisname;
@@ -59,33 +59,33 @@ 
 }*/
 $role = new ACLRole();
 $role_name = '';
-$return= array('module'=>'ACLRoles', 'action'=>'index', 'record'=>'');
-if(!empty($_REQUEST['record'])){
+$return = array('module'=>'ACLRoles', 'action'=>'index', 'record'=>'');
+if (!empty($_REQUEST['record'])) {
 	$role->retrieve($_REQUEST['record']);
 	$categories = ACLRole::getRoleActions($_REQUEST['record']);
-	$role_name =  $role->name;
-	if(!empty($_REQUEST['isDuplicate'])){
+	$role_name = $role->name;
+	if (!empty($_REQUEST['isDuplicate'])) {
 		//role id is stripped here in duplicate so anything using role id after this will not have it
 		$role->id = '';
 		$sugar_smarty->assign('ISDUPLICATE', $_REQUEST['record']);
-		$duplicateString=translate('LBL_DUPLICATE_OF', 'ACLRoles');
-	}else{
-		$return['record']= $role->id;
-		$return['action']='DetailView';
+		$duplicateString = translate('LBL_DUPLICATE_OF', 'ACLRoles');
+	} else {
+		$return['record'] = $role->id;
+		$return['action'] = 'DetailView';
 	}
 
-}else{
+} else {
 	$categories = ACLRole::getRoleActions('');
 }
 $sugar_smarty->assign('ROLE', $role->toArray());
 $tdwidth = 10;
 
-if(isset($_REQUEST['return_module'])){
-	$return['module']=$_REQUEST['return_module'];
-	if(isset($_REQUEST['return_id']))$return['record']=$_REQUEST['return_id'];
-	if(isset($_REQUEST['return_record'])){$return['record']=$_REQUEST['return_record'];}
-    if(isset($_REQUEST['return_action'])){$return['action']=$_REQUEST['return_action'];}
-    if ( !empty($return['record']) ) {
+if (isset($_REQUEST['return_module'])) {
+	$return['module'] = $_REQUEST['return_module'];
+	if (isset($_REQUEST['return_id']))$return['record'] = $_REQUEST['return_id'];
+	if (isset($_REQUEST['return_record'])) {$return['record'] = $_REQUEST['return_record']; }
+    if (isset($_REQUEST['return_action'])) {$return['action'] = $_REQUEST['return_action']; }
+    if (!empty($return['record'])) {
         $return['action'] = 'DetailView';
     }
 }
@@ -99,9 +99,9 @@ 
 
 $params = array();
 $params[] = "<a href='index.php?module=ACLRoles&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
-if(empty($role->id)){
+if (empty($role->id)) {
 	$params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
-}else{
+} else {
 	$params[] = $role->get_summary_text();
 }
 echo getClassicModuleTitle("ACLRoles", $params, true);

Braces +9 added lines, -5 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.
@@ -69,12 +71,12 @@ 
 		$role->id = '';
 		$sugar_smarty->assign('ISDUPLICATE', $_REQUEST['record']);
 		$duplicateString=translate('LBL_DUPLICATE_OF', 'ACLRoles');
-	}else{
+	} else{
 		$return['record']= $role->id;
 		$return['action']='DetailView';
 	}
 
-}else{
+} else{
 	$categories = ACLRole::getRoleActions('');
 }
 $sugar_smarty->assign('ROLE', $role->toArray());
@@ -82,7 +84,9 @@ 
 
 if(isset($_REQUEST['return_module'])){
 	$return['module']=$_REQUEST['return_module'];
-	if(isset($_REQUEST['return_id']))$return['record']=$_REQUEST['return_id'];
+	if(isset($_REQUEST['return_id'])) {
+	    $return['record']=$_REQUEST['return_id'];
+	}
 	if(isset($_REQUEST['return_record'])){$return['record']=$_REQUEST['return_record'];}
     if(isset($_REQUEST['return_action'])){$return['action']=$_REQUEST['return_action'];}
     if ( !empty($return['record']) ) {
@@ -101,7 +105,7 @@ 
 $params[] = "<a href='index.php?module=ACLRoles&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
 if(empty($role->id)){
 	$params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
-}else{
+} else{
 	$params[] = $role->get_summary_text();
 }
 echo getClassicModuleTitle("ACLRoles", $params, true);

modules/ACLRoles/ListUsers.php

Indentation +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 if(!$GLOBALS['current_user']->isAdminForModule('Users')){
-	sugar_die('No Access');
+    sugar_die('No Access');
 }
 $record = '';
 if(isset($_REQUEST['record'])) $record = $_REQUEST['record'];
@@ -67,7 +67,7 @@ 
 echo "</select></form>";
 if(!empty($record)){
     $hideTeams = true; // to not show the teams subpanel in the following file
-	require_once('modules/ACLRoles/DetailUserRole.php');
+    require_once('modules/ACLRoles/DetailUserRole.php');
 }
 
 

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,11 +38,11 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(!$GLOBALS['current_user']->isAdminForModule('Users')){
+if (!$GLOBALS['current_user']->isAdminForModule('Users')) {
 	sugar_die('No Access');
 }
 $record = '';
-if(isset($_REQUEST['record'])) $record = $_REQUEST['record'];
+if (isset($_REQUEST['record'])) $record = $_REQUEST['record'];
 ?>
 <form action="index.php" method="post" name="DetailView" id="form">
 
@@ -58,14 +58,14 @@ 
 <?php
 
 $users = get_user_array(true, "Active", $record);
-echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'],array($mod_strings['LBL_MODULE_NAME']), true);
+echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME']), true);
 echo "<form name='Users'>
 <input type='hidden' name='action' value='ListRoles'>
 <input type='hidden' name='module' value='Users'>
 <select name='record' onchange='document.Users.submit();'>";
 echo get_select_options_with_id($users, $record);
 echo "</select></form>";
-if(!empty($record)){
+if (!empty($record)) {
     $hideTeams = true; // to not show the teams subpanel in the following file
 	require_once('modules/ACLRoles/DetailUserRole.php');
 }

Braces +6 added lines, -2 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.
@@ -42,7 +44,9 @@ 
 	sugar_die('No Access');
 }
 $record = '';
-if(isset($_REQUEST['record'])) $record = $_REQUEST['record'];
+if(isset($_REQUEST['record'])) {
+    $record = $_REQUEST['record'];
+}
 ?>
 <form action="index.php" method="post" name="DetailView" id="form">
 

modules/ACLRoles/DetailView.php

Spacing +4 added lines, -4 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,13 +59,13 @@ 
 $role->retrieve($_REQUEST['record']);
 $categories = ACLRole::getRoleActions($_REQUEST['record']);
 $names = ACLAction::setupCategoriesMatrix($categories);
-if(!empty($names))$tdwidth = 100 / sizeof($names);
+if (!empty($names))$tdwidth = 100 / sizeof($names);
 $sugar_smarty->assign('ROLE', $role->toArray());
 $sugar_smarty->assign('CATEGORIES', $categories);
 $sugar_smarty->assign('TDWIDTH', $tdwidth);
 $sugar_smarty->assign('ACTION_NAMES', $names);
 
-$return= array('module'=>'ACLRoles', 'action'=>'DetailView', 'record'=>$role->id);
+$return = array('module'=>'ACLRoles', 'action'=>'DetailView', 'record'=>$role->id);
 $sugar_smarty->assign('RETURN', $return);
 $params = array();
 $params[] = "<a href='index.php?module=ACLRoles&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
@@ -76,7 +76,7 @@ 
 
 echo $sugar_smarty->fetch('modules/ACLRoles/DetailView.tpl');
 //for subpanels the variable must be named focus;
-$focus =& $role;
+$focus = & $role;
 $_REQUEST['module'] = 'ACLRoles';
 require_once('include/SubPanel/SubPanelTiles.php');
 

Braces +6 added lines, -2 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.
@@ -59,7 +61,9 @@ 
 $role->retrieve($_REQUEST['record']);
 $categories = ACLRole::getRoleActions($_REQUEST['record']);
 $names = ACLAction::setupCategoriesMatrix($categories);
-if(!empty($names))$tdwidth = 100 / sizeof($names);
+if(!empty($names)) {
+    $tdwidth = 100 / sizeof($names);
+}
 $sugar_smarty->assign('ROLE', $role->toArray());
 $sugar_smarty->assign('CATEGORIES', $categories);
 $sugar_smarty->assign('TDWIDTH', $tdwidth);

modules/ACLRoles/metadata/popupdefs.php

Indentation +6 added lines, -6 removed lines

@@ -41,12 +41,12 @@
 
 global $mod_strings;
 $popupMeta = array('moduleMain' => 'ACLRole',
-	'varName' => 'ROLE',
-	'listTitle' => $mod_strings['LBL_ROLE'],
-	'orderBy' => 'name',
-	'whereClauses' => array('name' => 'acl_roles.name'),
-	'searchInputs' => array('name'),
-	'searchdefs'   => array('name' => array('name' => 'name', 'label' => 'LBL_NAME',),)		
+    'varName' => 'ROLE',
+    'listTitle' => $mod_strings['LBL_ROLE'],
+    'orderBy' => 'name',
+    'whereClauses' => array('name' => 'acl_roles.name'),
+    'searchInputs' => array('name'),
+    'searchdefs'   => array('name' => array('name' => 'name', 'label' => 'LBL_NAME',),)		
 );
 ?>
  

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/ACLRoles/metadata/searchdefs.php

Indentation +11 added lines, -11 removed lines

@@ -43,17 +43,17 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
-  $searchdefs['ACLRoles'] = array(
-					'templateMeta' => array(
-							'maxColumns' => '3', 
-  							'maxColumnsBasic' => '4', 
+    $searchdefs['ACLRoles'] = array(
+                    'templateMeta' => array(
+                            'maxColumns' => '3', 
+                                'maxColumnsBasic' => '4', 
                             'widths' => array('label' => '10', 'field' => '30'),                 
-                           ),
+                            ),
                     'layout' => array(  					
-						'basic_search' => array(
-						    'name' => array('name' => 'name', 'label' => 'LBL_NAME',),
-						 	),
-						'advanced_search' => array(),
-					),
- 			   );
+                        'basic_search' => array(
+                            'name' => array('name' => 'name', 'label' => 'LBL_NAME',),
+                                ),
+                        'advanced_search' => array(),
+                    ),
+                );
 ?>

modules/ACLRoles/metadata/SearchFields.php

Indentation +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@
  ********************************************************************************/
 
 $searchFields['ACLRoles'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		);
+    array (
+        'name' => array( 'query_type'=>'default'),
+        );
 ?>

Spacing +3 added lines, -3 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 $searchFields['ACLRoles'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+	array(
+		'name' => array('query_type'=>'default'),
 		);
 ?>

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/ACLRoles/metadata/detailviewdefs.php

Indentation +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
                             'widths' => array(
                                             ),
                             'includes'=> array(
-                                         ),                                            
-                           ),
+                                            ),                                            
+                            ),
     'panels' => array(
 	      
-     ),
+        ),
     
     
 );