adamjakab / SuiteCRM

modules/Prospects/ProspectsJjwg_MapsLogicHook.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
     /**
      * @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
      */
-    function ProspectsJjwg_MapsLogicHook(){
+    function ProspectsJjwg_MapsLogicHook() {
         $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 {

Braces +3 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry) {
     die('Not A Valid Entry Point');
+}
 
 class OpportunitiesJjwg_MapsLogicHook {
 
@@ -17,8 +18,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();

modules/AM_ProjectTemplates/AM_ProjectTemplates_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
 	var $object_name = 'AM_ProjectTemplates';
 	var $table_name = 'am_projecttemplates';
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -66,16 +66,16 @@ 
 		var $status;
 		var $priority;
 
-		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 AM_ProjectTemplates_sugar(){
+    public function AM_ProjectTemplates_sugar() {
         $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 {
@@ -85,8 +85,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/AM_ProjectTemplates/AM_ProjectTemplates.php

Spacing +3 added lines, -3 removed lines

@@ -40,16 +40,16 @@
 require_once('modules/AM_ProjectTemplates/AM_ProjectTemplates_sugar.php');
 class AM_ProjectTemplates extends AM_ProjectTemplates_sugar {
 
-	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 AM_ProjectTemplates(){
+    public function AM_ProjectTemplates() {
         $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 {

Indentation +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 require_once('modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php');
 class AM_TaskTemplates extends AM_TaskTemplates_sugar {
 
-	public function __construct(){
-		parent::__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

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/AOS_Products_Quotes/AOS_Products_Quotes_sugar.php

Spacing +2 added lines, -2 removed lines

@@ -92,9 +92,9 @@
     /**
      * @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
      */
-    function AOS_Products_Quotes_sugar(){
+    function AOS_Products_Quotes_sugar() {
         $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 {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/AOS_Products_Quotes/AOS_Products_Quotes.php

Spacing +10 added lines, -10 removed lines

@@ -51,9 +51,9 @@ 
     /**
      * @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
      */
-    function AOS_Products_Quotes(){
+    function AOS_Products_Quotes() {
         $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 {
@@ -66,22 +66,22 @@ 
     function save_lines($post_data, $parent, $groups = array(), $key = '')
     {
 
-        $line_count = isset($post_data[$key . 'name']) ? count($post_data[$key . 'name']) : 0;
+        $line_count = isset($post_data[$key.'name']) ? count($post_data[$key.'name']) : 0;
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $product_quote = new AOS_Products_Quotes();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        $product_quote->$field_name = $post_data[$key . $field_name][$i];
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        $product_quote->$field_name = $post_data[$key.$field_name][$i];
                     }
                 }
-                if (isset($post_data[$key . 'group_number'][$i])) {
-                    $product_quote->group_id = $groups[$post_data[$key . 'group_number'][$i]];
+                if (isset($post_data[$key.'group_number'][$i])) {
+                    $product_quote->group_id = $groups[$post_data[$key.'group_number'][$i]];
                 }
                 if (trim($product_quote->product_id) != '' && trim($product_quote->name) != '' && trim($product_quote->product_unit_price) != '') {
                     $product_quote->number = ++$j;
@@ -90,7 +90,7 @@ 
                     $product_quote->currency_id = $parent->currency_id;
                     $product_quote->parent_type = $parent->object_name;
                     $product_quote->save();
-                    $_POST[$key . 'id'][$i] = $product_quote->id;
+                    $_POST[$key.'id'][$i] = $product_quote->id;
                 }
             }
         }

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/SecurityGroups/SecurityGroup.php

Spacing +104 added lines, -104 removed lines

@@ -4,16 +4,16 @@ 
 class SecurityGroup extends SecurityGroup_sugar {
 
 
-    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 SecurityGroup(){
+    public function SecurityGroup() {
         $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 {
@@ -34,12 +34,12 @@ 
      * @param GUID $user_id
      * @return STRING
      */
-    function getGroupWhere($table_name,$module,$user_id)
+    function getGroupWhere($table_name, $module, $user_id)
     {
 
 
         //need a different query if doing a securitygroups check
-        if($module == "SecurityGroups") {
+        if ($module == "SecurityGroups") {
             return " $table_name.id in (
                 select secg.id from securitygroups secg
                 inner join securitygroups_users secu on secg.id = secu.securitygroup_id and secu.deleted = 0
@@ -105,11 +105,11 @@ 
      * @param GUID $user_id
      * @return STRING
      */
-    function getGroupJoin($table_name,$module,$user_id)
+    function getGroupJoin($table_name, $module, $user_id)
     {
 
         //need a different query if doing a securitygroups check
-        if($module == "SecurityGroups") {
+        if ($module == "SecurityGroups") {
             return " LEFT JOIN (select distinct secg.id from securitygroups secg
     inner join securitygroups_users secu on secg.id = secu.securitygroup_id and secu.deleted = 0
             and secu.user_id = '".$user_id."'
@@ -147,9 +147,9 @@ 
     /**
      * @returns true if group is assigned to the record
      */
-    static function groupHasAccess($module,$id, $action = '')
+    static function groupHasAccess($module, $id, $action = '')
     {
-        if(!isset($id) || $id == '[SELECT_ID_LIST]')
+        if (!isset($id) || $id == '[SELECT_ID_LIST]')
         {
             return true; //means that this is a listview and everybody is an owner of the listview
         }
@@ -163,7 +163,7 @@ 
                 ."inner join securitygroups_records on securitygroups.id = securitygroups_records.securitygroup_id and securitygroups_records.deleted = 0 "
                 ."  and securitygroups_records.record_id = '$id' "
                 ."  and securitygroups_records.module = '$module' ";
-        if(!empty($action) && isset($sugar_config['securitysuite_strict_rights']) && $sugar_config['securitysuite_strict_rights'] == true) {
+        if (!empty($action) && isset($sugar_config['securitysuite_strict_rights']) && $sugar_config['securitysuite_strict_rights'] == true) {
             $query .= " inner join securitygroups_acl_roles on securitygroups.id = securitygroups_acl_roles.securitygroup_id and securitygroups_acl_roles.deleted = 0"
             ." inner join acl_roles_actions on securitygroups_acl_roles.role_id = acl_roles_actions.role_id and acl_roles_actions.deleted = 0 "
             ." inner join acl_actions on acl_actions.id = acl_roles_actions.action_id and acl_actions.deleted = 0 "
@@ -172,28 +172,28 @@ 
         }
         $query .= "where securitygroups.deleted = 0 ";
 
-        if(!empty($action) && isset($sugar_config['securitysuite_strict_rights']) && $sugar_config['securitysuite_strict_rights'] == true) {
+        if (!empty($action) && isset($sugar_config['securitysuite_strict_rights']) && $sugar_config['securitysuite_strict_rights'] == true) {
             $query .= " and acl_roles_actions.access_override = 80  ";
         }
         $GLOBALS['log']->debug("SecuritySuite: groupHasAccess $query");
         $result = $db->query($query);
         $row = $db->fetchByAssoc($result);
-        if(isset($row) && $row['results']>0) return true;
+        if (isset($row) && $row['results'] > 0) return true;
 
         return false;
     }
 
-    static function inherit(&$focus,$isUpdate)
+    static function inherit(&$focus, $isUpdate)
     {
         global $sugar_config;
-        SecurityGroup::assign_default_groups($focus,$isUpdate); //this must be first because it does not check for dups
+        SecurityGroup::assign_default_groups($focus, $isUpdate); //this must be first because it does not check for dups
 
-        SecurityGroup::inherit_assigned($focus,$isUpdate);
-        SecurityGroup::inherit_parent($focus,$isUpdate);
+        SecurityGroup::inherit_assigned($focus, $isUpdate);
+        SecurityGroup::inherit_parent($focus, $isUpdate);
 
         //don't do creator inheritance if popup selector method is chosen and a user is making the request...
         //don't if saving from a popup (subpanel_field_name check. Save2 is the action but to be safe use the subpanel check)
-        if(
+        if (
             (isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
              && isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save')
              || (!empty($_REQUEST['subpanel_field_name']))
@@ -202,64 +202,64 @@ 
             //Otherwise, this is taken on the edit view on create now
             $groupFocus = new SecurityGroup();
             $security_modules = $groupFocus->getSecurityModules();
-            if(in_array($focus->module_dir,array_keys($security_modules))) {
+            if (in_array($focus->module_dir, array_keys($security_modules))) {
                 //check if user is in more than 1 group. If so then set the session var otherwise inherit it's only group
                 global $current_user;
 
                 $memberships = $groupFocus->getMembershipCount($current_user->id);
-                if($memberships > 1) {
+                if ($memberships > 1) {
                     return;
                 }
             }
         }
-        SecurityGroup::inherit_creator($focus,$isUpdate);
+        SecurityGroup::inherit_creator($focus, $isUpdate);
 
     }
 
-    static function assign_default_groups(&$focus,$isUpdate)
+    static function assign_default_groups(&$focus, $isUpdate)
     {
         global $sugar_config;
         global $current_user;
-        if(!$isUpdate) {
+        if (!$isUpdate) {
             //inherit only for those that support Security Groups
             $groupFocus = new SecurityGroup();
             $security_modules = $groupFocus->getSecurityModules();
-            if(!in_array($focus->module_dir,array_keys($security_modules))) {
+            if (!in_array($focus->module_dir, array_keys($security_modules))) {
                 return;
             }
 
             $defaultGroups = $groupFocus->retrieveDefaultGroups();
-            foreach($defaultGroups as $default_id => $defaultGroup) {
+            foreach ($defaultGroups as $default_id => $defaultGroup) {
 
-                if($defaultGroup['module'] == "All" || $defaultGroup['module'] == $focus->module_dir) {
-                    if($focus->module_dir == "Users") {
+                if ($defaultGroup['module'] == "All" || $defaultGroup['module'] == $focus->module_dir) {
+                    if ($focus->module_dir == "Users") {
                         $query = "insert into securitygroups_users(id,date_modified,deleted,securitygroup_id,user_id,noninheritable) "
-                            ."select distinct '".create_guid()."',".db_convert('','today').",0,g.id,'$focus->id',1 "
+                            ."select distinct '".create_guid()."',".db_convert('', 'today').",0,g.id,'$focus->id',1 "
                             ."from securitygroups g "
                             ."left join securitygroups_users d on d.securitygroup_id = g.id and d.user_id = '$focus->id' and d.deleted = 0 "
                             ."where d.id is null and g.id = '".$defaultGroup['securitygroup_id']."' and g.deleted = 0 ";
                     } else {
                         $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
-                            ."select distinct '".create_guid()."',g.id,'$focus->id','$focus->module_dir',".db_convert('','today').",0 "
+                            ."select distinct '".create_guid()."',g.id,'$focus->id','$focus->module_dir',".db_convert('', 'today').",0 "
                             ."from securitygroups g "
                             ."left join securitygroups_records d on d.securitygroup_id = g.id and d.record_id = '$focus->id' and d.module = '$focus->module_dir' and d.deleted = 0 "
                             ."where d.id is null and g.id = '".$defaultGroup['securitygroup_id']."' and g.deleted = 0 ";
                     }
                     $GLOBALS['log']->debug("SecuritySuite: Assign Default Groups: $query");
-                    $focus->db->query($query,true);
+                    $focus->db->query($query, true);
                 }
             } //end foreach default group
         }
 
     }
 
-    static function inherit_creator(&$focus,$isUpdate)
+    static function inherit_creator(&$focus, $isUpdate)
     {
         global $sugar_config;
         global $current_user;
-        if(!$isUpdate && isset($sugar_config['securitysuite_inherit_creator']) && $sugar_config['securitysuite_inherit_creator'] == true) {
+        if (!$isUpdate && isset($sugar_config['securitysuite_inherit_creator']) && $sugar_config['securitysuite_inherit_creator'] == true) {
 
-            if(isset($_SESSION['portal_id']) && isset($_SESSION['user_id'])) {
+            if (isset($_SESSION['portal_id']) && isset($_SESSION['user_id'])) {
                 return; //don't inherit if from portal
             }
 
@@ -267,73 +267,73 @@ 
             $groupFocus = new SecurityGroup();
             $security_modules = $groupFocus->getSecurityModules();
             //if(in_array($focus->module_dir,$security_modules)) {
-            if(in_array($focus->module_dir,array_keys($security_modules))) {//rost fix2
+            if (in_array($focus->module_dir, array_keys($security_modules))) {//rost fix2
 
                 //test to see if works for creating a note for a case from the portal...this may need to be handled slightly differently
                 //inherits portal users groups? Could be an interesting twist...
                 $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
                         ."select distinct ";
-                if($focus->db->dbType == 'mysql') {
+                if ($focus->db->dbType == 'mysql') {
                     $query .= " uuid() ";
-                } else if($focus->db->dbType == 'mssql') {
+                } else if ($focus->db->dbType == 'mssql') {
                     $query .= " lower(newid()) ";
                 }
                 $currentUserId = isset($current_user->id) ? $current_user->id : null;
-                $query .= ",u.securitygroup_id,'$focus->id','$focus->module_dir',".db_convert('','today').",0 "
+                $query .= ",u.securitygroup_id,'$focus->id','$focus->module_dir',".db_convert('', 'today').",0 "
                         ."from securitygroups_users u "
                         ."inner join securitygroups g on u.securitygroup_id = g.id and g.deleted = 0 and (g.noninheritable is null or g.noninheritable <> 1) "
                         ."left join securitygroups_records d on d.securitygroup_id = u.securitygroup_id and d.record_id = '$focus->id' and d.module = '$focus->module_dir' and d.deleted = 0 "
                         ."where d.id is null and u.user_id = '$currentUserId' and u.deleted = 0 and (u.noninheritable is null or u.noninheritable <> 1)";
                 $GLOBALS['log']->debug("SecuritySuite: Inherit from Creator: $query");
-                $focus->db->query($query,true);
+                $focus->db->query($query, true);
             }
         }
 
     }
 
-    static function inherit_assigned(&$focus,$isUpdate)
+    static function inherit_assigned(&$focus, $isUpdate)
     {
         global $sugar_config;
         global $current_user;
-        if(isset($sugar_config['securitysuite_inherit_assigned']) && $sugar_config['securitysuite_inherit_assigned'] == true) {
+        if (isset($sugar_config['securitysuite_inherit_assigned']) && $sugar_config['securitysuite_inherit_assigned'] == true) {
 
-            if(!empty($focus->assigned_user_id)) {
+            if (!empty($focus->assigned_user_id)) {
                 $assigned_user_id = $focus->assigned_user_id;
                 //inherit only for those that support Security Groups
                 $groupFocus = new SecurityGroup();
                 $security_modules = $groupFocus->getSecurityModules();
                 //if(in_array($focus->module_dir,$security_modules)) {
-                if(in_array($focus->module_dir,array_keys($security_modules))) {//rost fix2
+                if (in_array($focus->module_dir, array_keys($security_modules))) {//rost fix2
 
                     //test to see if works for creating a note for a case from the portal...this may need to be handled slightly differently
                     //inherits portal users groups? Could be an interesting twist...
                     $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
                             ."select distinct ";
-                    if($focus->db->dbType == 'mysql') {
+                    if ($focus->db->dbType == 'mysql') {
                         $query .= " uuid() ";
-                    } else if($focus->db->dbType == 'mssql') {
+                    } else if ($focus->db->dbType == 'mssql') {
                         $query .= " lower(newid()) ";
                     }
-                    $query .= ",u.securitygroup_id,'$focus->id','$focus->module_dir',".db_convert('','today').",0 "
+                    $query .= ",u.securitygroup_id,'$focus->id','$focus->module_dir',".db_convert('', 'today').",0 "
                             ."from securitygroups_users u "
                             ."inner join securitygroups g on u.securitygroup_id = g.id and g.deleted = 0 and (g.noninheritable is null or g.noninheritable <> 1) "
                             ."left join securitygroups_records d on d.securitygroup_id = u.securitygroup_id and d.record_id = '$focus->id' and d.module = '$focus->module_dir' and d.deleted = 0 "
                             ."where d.id is null and u.user_id = '$assigned_user_id' and u.deleted = 0  and (u.noninheritable is null or u.noninheritable <> 1)";
                     $GLOBALS['log']->debug("SecuritySuite: Inherit from Assigned: $query");
-                    $focus->db->query($query,true);
+                    $focus->db->query($query, true);
                 }
             } //if !empty assigned_user_id
         }
 
     }
 
-    static function inherit_parent(&$focus,$isUpdate)
+    static function inherit_parent(&$focus, $isUpdate)
     {
         global $sugar_config;
         //new record or if update from soap api for cases or bugs
         //TEST FOR PORTAL NOTES
         //if((!$isUpdate || ($isUpdate && !empty($focus->note_id) && ($focus->object_name == "Case" || $focus->object_name == "Bug")))
-        if(!$isUpdate
+        if (!$isUpdate
             && isset($sugar_config['securitysuite_inherit_parent']) && $sugar_config['securitysuite_inherit_parent'] == true) {
 
             $focus_module_dir = $focus->module_dir;
@@ -343,7 +343,7 @@ 
             $groupFocus = new SecurityGroup();
             $security_modules = $groupFocus->getSecurityModules();
             //if(!in_array($focus_module_dir,$security_modules)) {
-            if(!in_array($focus_module_dir,array_keys($security_modules))) {//rost fix2
+            if (!in_array($focus_module_dir, array_keys($security_modules))) {//rost fix2
                 return; //don't inherit for this module
             }
 
@@ -352,14 +352,14 @@ 
             $parent_type = "";
             $parent_id = "";
 
-            if(isset($_REQUEST['relate_to']) && isset($_REQUEST['relate_id'])) {
+            if (isset($_REQUEST['relate_to']) && isset($_REQUEST['relate_id'])) {
                 //relate_to is not guaranteed to be a module name anymore.
                 //if it isn't load the relationship and find the module name that way
-                if(!in_array($_REQUEST['relate_to'],array_keys($security_modules))) {
+                if (!in_array($_REQUEST['relate_to'], array_keys($security_modules))) {
                     //check to see if relate_to is the relationship name
                     require_once('modules/Relationships/Relationship.php');
                     $rel_module = Relationship::get_other_module($_REQUEST['relate_to'], $focus_module_dir, $focus->db);
-                    if(isset($rel)) {
+                    if (isset($rel)) {
                         $parent_type = $rel_module;
                         $parent_id = $_REQUEST['relate_id'];
                     }
@@ -369,19 +369,19 @@ 
                 }
             }
 
-            if(isset($_SESSION['portal_id'])) {
+            if (isset($_SESSION['portal_id'])) {
                 $parent_id = $_SESSION['user_id']; //soap stores contact id in user_id field
                 $parent_type = "Contacts";
             }
 
             //from activity type creation
-            if((empty($parent_type) || empty($parent_id)) && isset($_REQUEST['parent_type']) && isset($_REQUEST['parent_id'])) {
+            if ((empty($parent_type) || empty($parent_id)) && isset($_REQUEST['parent_type']) && isset($_REQUEST['parent_id'])) {
                 $parent_type = $_REQUEST['parent_type'];
                 $parent_id = $_REQUEST['parent_id'];
             }
 
             //full form from subpanel
-            if((empty($parent_type) || empty($parent_id)) && isset($_REQUEST['return_module']) && isset($_REQUEST['return_id'])) {
+            if ((empty($parent_type) || empty($parent_id)) && isset($_REQUEST['return_module']) && isset($_REQUEST['return_id'])) {
                 $parent_type = $_REQUEST['return_module'];
                 $parent_id = $_REQUEST['return_id'];
             }
@@ -389,17 +389,17 @@ 
             /** need to find relate fields...for example for Cases look to see if account_id is set */
             //allow inheritance for all relate field types....iterate through and inherit each related field
             //if(empty($parent_type) || empty($parent_id)) {
-                foreach($focus->field_name_map as $name=>$def) {
+                foreach ($focus->field_name_map as $name=>$def) {
 
-                   if($def['type']=='relate' && isset($def['id_name'])
-                        && isset($def['module']) && strtolower($def['module']) != "users" ) {
+                   if ($def['type'] == 'relate' && isset($def['id_name'])
+                        && isset($def['module']) && strtolower($def['module']) != "users") {
 
-                        if(isset($_REQUEST[$def['id_name']])) {
+                        if (isset($_REQUEST[$def['id_name']])) {
                             $relate_parent_id = $_REQUEST[$def['id_name']];
                             $relate_parent_type = $def['module'];
 
-                            SecurityGroup::inherit_parentQuery($focus,$relate_parent_type, $relate_parent_id, $focus_id, $focus_module_dir);
-                        } else if(isset($_SESSION['portal_id']) && isset($_SESSION[$def['id_name']])) { //catch soap account
+                            SecurityGroup::inherit_parentQuery($focus, $relate_parent_type, $relate_parent_id, $focus_id, $focus_module_dir);
+                        } else if (isset($_SESSION['portal_id']) && isset($_SESSION[$def['id_name']])) { //catch soap account
                             $relate_parent_id = $_SESSION[$def['id_name']];
                             $relate_parent_type = $def['module'];
 
@@ -409,36 +409,36 @@ 
                 }
             //}
 
-            if(!empty($parent_type) && !empty($parent_id)) { // && $parent_type != "Emails" && $parent_type != "Meetings") {
+            if (!empty($parent_type) && !empty($parent_id)) { // && $parent_type != "Emails" && $parent_type != "Meetings") {
                 SecurityGroup::inherit_parentQuery($focus, $parent_type, $parent_id, $focus_id, $focus_module_dir);
             } //end if parent type/id
         } //end if new record
     }
 
     static function inherit_parentQuery(&$focus, $parent_type, $parent_id, $focus_id, $focus_module_dir) {
-        if(empty($parent_type) || empty($parent_id)) return; //no info passed
+        if (empty($parent_type) || empty($parent_id)) return; //no info passed
 
         /** can speed this up by doing one query */
         //should be just one query but need a unique guid for each insert
         //WE NEED A UNIQUE GUID SO USE THE BUILT IN SQL GUID METHOD
         $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
                 ."select distinct ";
-        if($focus->db->dbType == 'mysql') {
+        if ($focus->db->dbType == 'mysql') {
             $query .= " uuid() ";
-        } else if($focus->db->dbType == 'mssql') {
+        } else if ($focus->db->dbType == 'mssql') {
             $query .= " lower(newid()) ";
         }
-        $query .= ",r.securitygroup_id,'$focus_id','$focus_module_dir',".db_convert('','today').",0 "
+        $query .= ",r.securitygroup_id,'$focus_id','$focus_module_dir',".db_convert('', 'today').",0 "
                 ."from securitygroups_records r "
                 ."inner join securitygroups g on r.securitygroup_id = g.id and g.deleted = 0 and (g.noninheritable is null or g.noninheritable <> 1) "
-                ."left join securitygroups_records d on d.securitygroup_id = r.securitygroup_id and d.record_id = '" .$focus->db->quote($focus_id) . "' and d.module = '" .$focus->db->quote($focus_module_dir) . "' and d.deleted = 0 "
-                ."where d.id is null and r.module = '" .$focus->db->quote($parent_type) . "' "
-                ."and r.record_id = '" .$focus->db->quote($parent_id) ."' "
+                ."left join securitygroups_records d on d.securitygroup_id = r.securitygroup_id and d.record_id = '".$focus->db->quote($focus_id)."' and d.module = '".$focus->db->quote($focus_module_dir)."' and d.deleted = 0 "
+                ."where d.id is null and r.module = '".$focus->db->quote($parent_type)."' "
+                ."and r.record_id = '".$focus->db->quote($parent_id)."' "
                 ."and r.deleted = 0 ";
                 //using left join instead
                 //and not exists (select top 1 s.id from securitygroups_records s where s.deleted = 0 and s.record_id = '$focus_id' and s.securitygroup_id = r.securitygroup_id and s.module = '$focus_module_dir') ";
         $GLOBALS['log']->debug("SecuritySuite: Inherit from Parent: $query");
-        $focus->db->query($query,true);
+        $focus->db->query($query, true);
     }
 
     /**
@@ -458,16 +458,16 @@ 
         $GLOBALS['log']->debug("SecuritySuite: Inherit One Pre-Check Qualifier: $query");
         $result = $db->query($query);
         $row = $db->fetchByAssoc($result);
-        if(isset($row) && $row['results'] == 1) {
+        if (isset($row) && $row['results'] == 1) {
 
             $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
-                    ."select distinct '".create_guid()."',u.securitygroup_id,'$record_id','$module',".db_convert('','today').",0 "
+                    ."select distinct '".create_guid()."',u.securitygroup_id,'$record_id','$module',".db_convert('', 'today').",0 "
                     ."from securitygroups_users u "
                     ."inner join securitygroups g on u.securitygroup_id = g.id and g.deleted = 0 and (g.noninheritable is null or g.noninheritable <> 1) "
                     ."left join securitygroups_records d on d.securitygroup_id = u.securitygroup_id and d.record_id = '$record_id' and d.module = '$module' and d.deleted = 0 "
                     ."where d.id is null and u.user_id = '$user_id' and u.deleted = 0 and (u.noninheritable is null or u.noninheritable <> 1)";
             $GLOBALS['log']->debug("SecuritySuite: Inherit One: $query");
-            $db->query($query,true);
+            $db->query($query, true);
             return true;
         }
 
@@ -482,7 +482,7 @@ 
     function getMembershipCount($user_id) {
         global $db;
 
-        if(!isset($_SESSION['securitygroup_count'])) {
+        if (!isset($_SESSION['securitygroup_count'])) {
             $query = "select count(securitygroups.id) as results from securitygroups "
                     ."inner join securitygroups_users on securitygroups.id = securitygroups_users.securitygroup_id "
                     ." and securitygroups_users.deleted = 0 "
@@ -492,7 +492,7 @@ 
             $GLOBALS['log']->debug("SecuritySuite: Inherit One Pre-Check Qualifier: $query");
             $result = $db->query($query);
             $row = $db->fetchByAssoc($result);
-            if(isset($row)) {
+            if (isset($row)) {
                 $_SESSION['securitygroup_count'] = $row['results'];
             }
         }
@@ -510,8 +510,8 @@ 
                 ."where securitygroups_default.deleted = 0 and securitygroups.deleted = 0";
         $GLOBALS['log']->debug("SecuritySuite: Retrieve Default Groups: $query");
         $result = $db->query($query);
-        while(($row=$db->fetchByAssoc($result)) != null) {
-            $default_groups[$row['id']] = array('group'=>$row['name'],'module'=>$row['module'],'securitygroup_id'=>$row['securitygroup_id']);
+        while (($row = $db->fetchByAssoc($result)) != null) {
+            $default_groups[$row['id']] = array('group'=>$row['name'], 'module'=>$row['module'], 'securitygroup_id'=>$row['securitygroup_id']);
         }
 
         return $default_groups;
@@ -520,18 +520,18 @@ 
     function saveDefaultGroup($group_id, $module) {
         $query = "INSERT INTO securitygroups_default (id, securitygroup_id, module, date_modified, deleted) "
                 ."VALUES ( ";
-                if($this->db->dbType == 'mysql') {
+                if ($this->db->dbType == 'mysql') {
                     $query .= " uuid() ";
-                } else if($this->db->dbType == 'mssql') {
+                } else if ($this->db->dbType == 'mssql') {
                     $query .= " lower(newid()) ";
                 }
-        $query .= ",'" . htmlspecialchars($group_id , ENT_QUOTES) ."', '" . htmlspecialchars($group_id , ENT_QUOTES) . "',".db_convert('','today').",0 )";
+        $query .= ",'".htmlspecialchars($group_id, ENT_QUOTES)."', '".htmlspecialchars($group_id, ENT_QUOTES)."',".db_convert('', 'today').",0 )";
         $GLOBALS['log']->debug("SecuritySuite: Save Default Group: $query");
         $this->db->query($query);
     }
 
     function removeDefaultGroup($default_id) {
-        $query = "delete from securitygroups_default where id = '" . htmlspecialchars($default_id) ."' ";
+        $query = "delete from securitygroups_default where id = '".htmlspecialchars($default_id)."' ";
         $this->db->query($query);
     }
 
@@ -548,29 +548,29 @@ 
 
         //https://www.sugaroutfitters.com/support/securitysuite/496
         //There are some modules that shouldn't ever inherit groups...
-        $module_blacklist = array('SchedulersJobs','Schedulers','Trackers');
+        $module_blacklist = array('SchedulersJobs', 'Schedulers', 'Trackers');
 
         require_once('modules/Relationships/Relationship.php');
         $rs = new Relationship();
-        $query =  "SELECT lhs_module, rhs_module FROM $rs->table_name WHERE deleted=0 AND (lhs_module = 'SecurityGroups' OR rhs_module='SecurityGroups')";
+        $query = "SELECT lhs_module, rhs_module FROM $rs->table_name WHERE deleted=0 AND (lhs_module = 'SecurityGroups' OR rhs_module='SecurityGroups')";
         $GLOBALS['log']->debug("SecuritySuite: Get SecuritySuite Enabled Modules: $query");
         $result = $rs->db->query($query);
-        while(($row=$rs->db->fetchByAssoc($result)) != null) {
+        while (($row = $rs->db->fetchByAssoc($result)) != null) {
 
-            if($row['lhs_module'] == 'SecurityGroups') {
-                if(in_array($row['rhs_module'],$module_blacklist)) {
+            if ($row['lhs_module'] == 'SecurityGroups') {
+                if (in_array($row['rhs_module'], $module_blacklist)) {
                     continue;
                 }
 
                 //$security_modules[$row['rhs_module']] = $row['rhs_module'];
-                $security_modules[$row['rhs_module']] = $app_list_strings['moduleList'][$row['rhs_module']];//rost fix
+                $security_modules[$row['rhs_module']] = $app_list_strings['moduleList'][$row['rhs_module']]; //rost fix
             } else {
-                if(in_array($row['lhs_module'],$module_blacklist)) {
+                if (in_array($row['lhs_module'], $module_blacklist)) {
                     continue;
                 }
 
                 //$security_modules[$row['lhs_module']] = $row['lhs_module'];
-                $security_modules[$row['lhs_module']] = $app_list_strings['moduleList'][$row['lhs_module']];//rost fix
+                $security_modules[$row['lhs_module']] = $app_list_strings['moduleList'][$row['lhs_module']]; //rost fix
 
             }
         }
@@ -582,7 +582,7 @@ 
     function getLinkName($this_module, $rel_module) {
         $GLOBALS['log']->debug("SecurityGroup->getLinkName this_module: $this_module rel_module: $rel_module");
         include_once('modules/Relationships/RelationshipHandler.php');
-        $rh = new RelationshipHandler($GLOBALS['db'],$this_module);
+        $rh = new RelationshipHandler($GLOBALS['db'], $this_module);
         $rh->process_by_rel_bean($rel_module);
         $rh->build_info();
         $rh->get_rel1_vardef_field_base($rh->base_bean->field_defs);
@@ -594,28 +594,28 @@ 
      * Add a Security Group to a record
      */
     function addGroupToRecord($module, $record_id, $securitygroup_id) {
-        if(empty($module) || empty($record_id) || empty($securitygroup_id)) {
+        if (empty($module) || empty($record_id) || empty($securitygroup_id)) {
             return; //missing data
         }
         global $db;
         $query = "insert into securitygroups_records(id,securitygroup_id,record_id,module,date_modified,deleted) "
-                ."values( '".create_guid()."','".$securitygroup_id."','$record_id','$module',".db_convert('','today').",0) ";
+                ."values( '".create_guid()."','".$securitygroup_id."','$record_id','$module',".db_convert('', 'today').",0) ";
         $GLOBALS['log']->debug("SecuritySuite: addGroupToRecord: $query");
-        $db->query($query,true);
+        $db->query($query, true);
     }
 
     /**
      * Remove a Security Group from a record
      */
     function removeGroupFromRecord($module, $record_id, $securitygroup_id) {
-        if(empty($module) || empty($record_id) || empty($securitygroup_id)) {
+        if (empty($module) || empty($record_id) || empty($securitygroup_id)) {
             return; //missing data
         }
         global $db;
-        $query = "update securitygroups_records set deleted = 1, date_modified = ".db_convert('','today')." "
+        $query = "update securitygroups_records set deleted = 1, date_modified = ".db_convert('', 'today')." "
                 ."where securitygroup_id = '".$securitygroup_id."' and record_id = '$record_id' and module = '$module'";
         $GLOBALS['log']->debug("SecuritySuite: addGroupToRecord: $query");
-        $db->query($query,true);
+        $db->query($query, true);
     }
 
     /**
@@ -629,11 +629,11 @@ 
                 ."      and securitygroups.deleted = 0 "
                 ."where securitygroups_users.user_id='$user_id' and securitygroups_users.deleted = 0 "
                 ."order by securitygroups.name asc ";
-        $result = $db->query($query,true,"Error finding the full membership list for a user: ");
+        $result = $db->query($query, true, "Error finding the full membership list for a user: ");
 
         $group_array = Array();
         $result = $db->query($query);
-        while(($row=$db->fetchByAssoc($result)) != null) {
+        while (($row = $db->fetchByAssoc($result)) != null) {
             $group_array[$row['id']] = $row;
         }
 
@@ -649,11 +649,11 @@ 
         $query = "select id, name from securitygroups "
                 ."where securitygroups.deleted = 0 "
                 ."order by name";
-        $result = $db->query($query,true,"Error finding the full membership list for a user: ");
+        $result = $db->query($query, true, "Error finding the full membership list for a user: ");
 
         $group_array = Array();
         $result = $db->query($query);
-        while(($row=$db->fetchByAssoc($result)) != null) {
+        while (($row = $db->fetchByAssoc($result)) != null) {
             $group_array[$row['id']] = $row;
         }
 
@@ -678,7 +678,7 @@ 
         $GLOBALS['log']->debug("SecuritySuite: getMembers: $query");
         $user_array = Array();
         $result = $db->query($query);
-        while(($row=$db->fetchByAssoc($result)) != null) {
+        while (($row = $db->fetchByAssoc($result)) != null) {
             $user_array[$row['id']] = $row;
         }
 
@@ -695,7 +695,7 @@ 
         $primary_group_id = null;
         global $db, $current_user;
         $query = "select ";
-        if($db->dbType == 'mssql') {
+        if ($db->dbType == 'mssql') {
             $query .= " top 1 ";
         }
         $query .= "securitygroups.id from securitygroups_users
@@ -703,12 +703,12 @@ 
       and securitygroups.deleted = 0
 where securitygroups_users.user_id='".$current_user->id."' and securitygroups_users.deleted = 0
 order by securitygroups_users.primary_group desc ";
-        if($db->dbType == 'mysql') {
+        if ($db->dbType == 'mysql') {
             $query .= " limit 0,1 ";
         }
 
-        $result = $db->query($query,true,"Error finding the current users primary group: ");
-        if(($row=$db->fetchByAssoc($result)) != null) {
+        $result = $db->query($query, true, "Error finding the current users primary group: ");
+        if (($row = $db->fetchByAssoc($result)) != null) {
             $primary_group_id = $row['id'];
         }
 

Braces +8 added lines, -4 removed lines

@@ -15,8 +15,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();
@@ -178,7 +177,9 @@ 
         $GLOBALS['log']->debug("SecuritySuite: groupHasAccess $query");
         $result = $db->query($query);
         $row = $db->fetchByAssoc($result);
-        if(isset($row) && $row['results']>0) return true;
+        if(isset($row) && $row['results']>0) {
+            return true;
+        }
 
         return false;
     }
@@ -416,7 +417,10 @@ 
     }
 
     static function inherit_parentQuery(&$focus, $parent_type, $parent_id, $focus_id, $focus_module_dir) {
-        if(empty($parent_type) || empty($parent_id)) return; //no info passed
+        if(empty($parent_type) || empty($parent_id)) {
+            return;
+        }
+        //no info passed
 
         /** can speed this up by doing one query */
         //should be just one query but need a unique guid for each insert

modules/SecurityGroups/SecurityGroupMessage.php

Indentation +136 added lines, -136 removed lines

@@ -2,43 +2,43 @@ 
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 class SecurityGroupMessage extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'SecurityGroups';
-	var $object_name = 'SecurityGroupMessage';
-	var $table_name = 'securitygroups_message';
-	var $importable = false;
-
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-
-
-	var $additional_column_fields = Array();
-	var $field_defs = array (
-       'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , 'name'=>array('name' =>'name', 'type' =>'varchar', 'len'=>'255', )
-      , 'date_entered'=>array ('name' => 'date_entered','type' => 'datetime')
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
-      , 'modified_user_id'=>array('name' =>'modified_user_id', 'type' =>'char', 'len'=>'36',)
-      , 'created_by'=>array('name' =>'created_by', 'type' =>'char', 'len'=>'36',)
-      , 'description'=>array('name' =>'description', 'type' =>'text', 'len'=>'',)
-      , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
-      , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36',)
+    var $new_schema = true;
+    var $module_dir = 'SecurityGroups';
+    var $object_name = 'SecurityGroupMessage';
+    var $table_name = 'securitygroups_message';
+    var $importable = false;
+
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+
+
+    var $additional_column_fields = Array();
+    var $field_defs = array (
+        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
+        , 'name'=>array('name' =>'name', 'type' =>'varchar', 'len'=>'255', )
+        , 'date_entered'=>array ('name' => 'date_entered','type' => 'datetime')
+        , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
+        , 'modified_user_id'=>array('name' =>'modified_user_id', 'type' =>'char', 'len'=>'36',)
+        , 'created_by'=>array('name' =>'created_by', 'type' =>'char', 'len'=>'36',)
+        , 'description'=>array('name' =>'description', 'type' =>'text', 'len'=>'',)
+        , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
+        , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36',)
     );
 
 
-	function __construct(){
-		parent::__construct();
-	}
+    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
@@ -56,130 +56,130 @@ 
 
 
 
-	function get_list_view_data(){
-		$data = parent::get_list_view_data();
-		$delete = '';
-
-		$group_owner = false;
-		$securitygroup_name = "";
-		if(empty($data['SECURITYGROUP_ID'])) {
-			$securitygroup_name = "All";
-		} else {
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-			$securitygroup = new SecurityGroup();
-			$securitygroup->retrieve($data['SECURITYGROUP_ID']);
-			$securitygroup_name = $securitygroup->name;
-
-			if($securitygroup->assigned_user_id == $GLOBALS['current_user']->id) {
-				$group_owner = true;
-			}
-		}
-
-		if(is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id || $group_owner) {
-			$delete = SugarThemeRegistry::current()->getImage( 'delete_inline', 'width="12" height="12" border="0" align="absmiddle" style="vertical-align: bottom;" onclick=\'Message.deleteMessage("'. $data['ID'] . '", "{this.id}")\'',null,null,'.gif','');
-		}
-
-		$username = "";
-		if(empty($data['CREATED_BY'])) {
-			$username = "Unknown";
-		} else {
-			require_once('modules/Users/User.php');
-			$user = new User();
-			$user->retrieve($data['CREATED_BY']);
-			$username = $user->user_name;
-		}
-
-		$data['NAME'] = $data['DESCRIPTION'];
-		$data['NAME'] =  '<div class="list view" style="padding:5px;border:none;">' . html_entity_decode($data['NAME']);
+    function get_list_view_data(){
+        $data = parent::get_list_view_data();
+        $delete = '';
+
+        $group_owner = false;
+        $securitygroup_name = "";
+        if(empty($data['SECURITYGROUP_ID'])) {
+            $securitygroup_name = "All";
+        } else {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            $securitygroup = new SecurityGroup();
+            $securitygroup->retrieve($data['SECURITYGROUP_ID']);
+            $securitygroup_name = $securitygroup->name;
+
+            if($securitygroup->assigned_user_id == $GLOBALS['current_user']->id) {
+                $group_owner = true;
+            }
+        }
+
+        if(is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id || $group_owner) {
+            $delete = SugarThemeRegistry::current()->getImage( 'delete_inline', 'width="12" height="12" border="0" align="absmiddle" style="vertical-align: bottom;" onclick=\'Message.deleteMessage("'. $data['ID'] . '", "{this.id}")\'',null,null,'.gif','');
+        }
+
+        $username = "";
+        if(empty($data['CREATED_BY'])) {
+            $username = "Unknown";
+        } else {
+            require_once('modules/Users/User.php');
+            $user = new User();
+            $user->retrieve($data['CREATED_BY']);
+            $username = $user->user_name;
+        }
+
+        $data['NAME'] = $data['DESCRIPTION'];
+        $data['NAME'] =  '<div class="list view" style="padding:5px;border:none;">' . html_entity_decode($data['NAME']);
         $data['NAME'] .= '<div class="byLineBox" style="padding-top: 2px"><span class="byLineLeft">'.$username.' ['.$securitygroup_name.']';
-		$data['NAME'] .= '&nbsp;</span><span style="cursor: pointer;" class="byLineRight"> '.  $this->getTimeLapse($data['DATE_ENTERED']) . ' &nbsp;' .$delete. '</span></div>';
-		return  $data ;
-	}
-
-
-	static function saveMessage($text, $securitygroup_id) {
-		//if no security group id then must be admin. Otherwise, make sure the user is a member of the group
-		global $current_user;
-		if(empty($securitygroup_id) && !is_admin($current_user)) {
-			return;
-		} else if(empty($securitygroup_id)) {
-			$securitygroup_id = null; //6.4.0
-		}
-		$message = new SecurityGroupMessage();
-		if(empty($text)) return; // || !$feed->ACLAccess('save', true) )return;
-
-		$text = strip_tags($text);
-		$message->name = '';
-		$message->description = $text;
-		$message->securitygroup_id = $securitygroup_id;
-		$message->save();
-	}
-
-	function getTimeLapse($startDate)
-	{
-		$startDate = $GLOBALS['timedate']->to_db($startDate);
-		$start = array();
-   		preg_match('/(\d+)\-(\d+)\-(\d+) (\d+)\:(\d+)\:(\d+)/', $startDate, $start);
-		$end = gmdate('Y-m-d H:i:s');
-    	$start_time = gmmktime($start[4],$start[5], $start[6], $start[2], $start[3], $start[1] );
-		$seconds = time()- $start_time;
-		$minutes =   $seconds/60;
-		$seconds = $seconds % 60;
-		$hours = floor( $minutes / 60);
-		$minutes = $minutes % 60;
-		$days = floor( $hours / 24);
-		$hours = $hours % 24;
-		$weeks = floor( $days / 7);
-		$days = $days % 7;
-		$result = '';
-		if($weeks == 1){
-			$result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
-			return $result;
-		}else if($weeks > 1){
-			$result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
-			if($days > 0) {
+        $data['NAME'] .= '&nbsp;</span><span style="cursor: pointer;" class="byLineRight"> '.  $this->getTimeLapse($data['DATE_ENTERED']) . ' &nbsp;' .$delete. '</span></div>';
+        return  $data ;
+    }
+
+
+    static function saveMessage($text, $securitygroup_id) {
+        //if no security group id then must be admin. Otherwise, make sure the user is a member of the group
+        global $current_user;
+        if(empty($securitygroup_id) && !is_admin($current_user)) {
+            return;
+        } else if(empty($securitygroup_id)) {
+            $securitygroup_id = null; //6.4.0
+        }
+        $message = new SecurityGroupMessage();
+        if(empty($text)) return; // || !$feed->ACLAccess('save', true) )return;
+
+        $text = strip_tags($text);
+        $message->name = '';
+        $message->description = $text;
+        $message->securitygroup_id = $securitygroup_id;
+        $message->save();
+    }
+
+    function getTimeLapse($startDate)
+    {
+        $startDate = $GLOBALS['timedate']->to_db($startDate);
+        $start = array();
+            preg_match('/(\d+)\-(\d+)\-(\d+) (\d+)\:(\d+)\:(\d+)/', $startDate, $start);
+        $end = gmdate('Y-m-d H:i:s');
+        $start_time = gmmktime($start[4],$start[5], $start[6], $start[2], $start[3], $start[1] );
+        $seconds = time()- $start_time;
+        $minutes =   $seconds/60;
+        $seconds = $seconds % 60;
+        $hours = floor( $minutes / 60);
+        $minutes = $minutes % 60;
+        $days = floor( $hours / 24);
+        $hours = $hours % 24;
+        $weeks = floor( $days / 7);
+        $days = $days % 7;
+        $result = '';
+        if($weeks == 1){
+            $result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
+            return $result;
+        }else if($weeks > 1){
+            $result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
+            if($days > 0) {
                 $result .= $days . ' '.translate('LBL_TIME_DAYS','SugarFeed').' ';
             }
-		}else{
-			if($days == 1){
-				$result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
-				return $result;
-			}else if($days > 1){
-				$result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
-			}else{
-				if($hours == 1) {
+        }else{
+            if($days == 1){
+                $result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
+                return $result;
+            }else if($days > 1){
+                $result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
+            }else{
+                if($hours == 1) {
                     $result .= $hours . ' '.translate('LBL_TIME_HOUR','SugarFeed').' ';
                 } else {
                     $result .= $hours . ' '.translate('LBL_TIME_HOURS','SugarFeed').' ';
                 }
-				if($hours < 6){
-					if($minutes == 1) {
+                if($hours < 6){
+                    if($minutes == 1) {
                         $result .= $minutes . ' ' . translate('LBL_TIME_MINUTE','SugarFeed'). ' ';
                     } else {
                         $result .= $minutes . ' ' . translate('LBL_TIME_MINUTES','SugarFeed'). ' ';
                     }
-				}
-				if($hours == 0 && $minutes == 0) {
+                }
+                if($hours == 0 && $minutes == 0) {
                     if($seconds == 1 ) {
                         $result = $seconds . ' ' . translate('LBL_TIME_SECOND','SugarFeed');
                     } else {
                         $result = $seconds . ' ' . translate('LBL_TIME_SECONDS','SugarFeed');
                     }
                 }
-			}
-		}
-		return $result . ' ' . translate('LBL_TIME_AGO','SugarFeed');
+            }
+        }
+        return $result . ' ' . translate('LBL_TIME_AGO','SugarFeed');
 
 
 
     }
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return false;
-		}
-		return false;
-	}
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return false;
+        }
+        return false;
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +52 added lines, -52 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');
 
 class SecurityGroupMessage extends Basic {
 	var $new_schema = true;
@@ -23,11 +23,11 @@ 
 
 
 	var $additional_column_fields = Array();
-	var $field_defs = array (
+	var $field_defs = array(
        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , 'name'=>array('name' =>'name', 'type' =>'varchar', 'len'=>'255', )
-      , 'date_entered'=>array ('name' => 'date_entered','type' => 'datetime')
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
+      , 'name'=>array('name' =>'name', 'type' =>'varchar', 'len'=>'255',)
+      , 'date_entered'=>array('name' => 'date_entered', 'type' => 'datetime')
+      , 'date_modified'=>array('name' => 'date_modified', 'type' => 'datetime')
       , 'modified_user_id'=>array('name' =>'modified_user_id', 'type' =>'char', 'len'=>'36',)
       , 'created_by'=>array('name' =>'created_by', 'type' =>'char', 'len'=>'36',)
       , 'description'=>array('name' =>'description', 'type' =>'text', 'len'=>'',)
@@ -36,16 +36,16 @@ 
     );
 
 
-	function __construct(){
+	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
      */
-    function SecurityGroupMessage(){
+    function SecurityGroupMessage() {
         $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 {
@@ -56,13 +56,13 @@ 
 
 
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		$data = parent::get_list_view_data();
 		$delete = '';
 
 		$group_owner = false;
 		$securitygroup_name = "";
-		if(empty($data['SECURITYGROUP_ID'])) {
+		if (empty($data['SECURITYGROUP_ID'])) {
 			$securitygroup_name = "All";
 		} else {
 			require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -70,17 +70,17 @@ 
 			$securitygroup->retrieve($data['SECURITYGROUP_ID']);
 			$securitygroup_name = $securitygroup->name;
 
-			if($securitygroup->assigned_user_id == $GLOBALS['current_user']->id) {
+			if ($securitygroup->assigned_user_id == $GLOBALS['current_user']->id) {
 				$group_owner = true;
 			}
 		}
 
-		if(is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id || $group_owner) {
-			$delete = SugarThemeRegistry::current()->getImage( 'delete_inline', 'width="12" height="12" border="0" align="absmiddle" style="vertical-align: bottom;" onclick=\'Message.deleteMessage("'. $data['ID'] . '", "{this.id}")\'',null,null,'.gif','');
+		if (is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id || $group_owner) {
+			$delete = SugarThemeRegistry::current()->getImage('delete_inline', 'width="12" height="12" border="0" align="absmiddle" style="vertical-align: bottom;" onclick=\'Message.deleteMessage("'.$data['ID'].'", "{this.id}")\'', null, null, '.gif', '');
 		}
 
 		$username = "";
-		if(empty($data['CREATED_BY'])) {
+		if (empty($data['CREATED_BY'])) {
 			$username = "Unknown";
 		} else {
 			require_once('modules/Users/User.php');
@@ -90,23 +90,23 @@ 
 		}
 
 		$data['NAME'] = $data['DESCRIPTION'];
-		$data['NAME'] =  '<div class="list view" style="padding:5px;border:none;">' . html_entity_decode($data['NAME']);
+		$data['NAME'] = '<div class="list view" style="padding:5px;border:none;">'.html_entity_decode($data['NAME']);
         $data['NAME'] .= '<div class="byLineBox" style="padding-top: 2px"><span class="byLineLeft">'.$username.' ['.$securitygroup_name.']';
-		$data['NAME'] .= '&nbsp;</span><span style="cursor: pointer;" class="byLineRight"> '.  $this->getTimeLapse($data['DATE_ENTERED']) . ' &nbsp;' .$delete. '</span></div>';
-		return  $data ;
+		$data['NAME'] .= '&nbsp;</span><span style="cursor: pointer;" class="byLineRight"> '.$this->getTimeLapse($data['DATE_ENTERED']).' &nbsp;'.$delete.'</span></div>';
+		return  $data;
 	}
 
 
 	static function saveMessage($text, $securitygroup_id) {
 		//if no security group id then must be admin. Otherwise, make sure the user is a member of the group
 		global $current_user;
-		if(empty($securitygroup_id) && !is_admin($current_user)) {
+		if (empty($securitygroup_id) && !is_admin($current_user)) {
 			return;
-		} else if(empty($securitygroup_id)) {
+		} else if (empty($securitygroup_id)) {
 			$securitygroup_id = null; //6.4.0
 		}
 		$message = new SecurityGroupMessage();
-		if(empty($text)) return; // || !$feed->ACLAccess('save', true) )return;
+		if (empty($text)) return; // || !$feed->ACLAccess('save', true) )return;
 
 		$text = strip_tags($text);
 		$message->name = '';
@@ -121,61 +121,61 @@ 
 		$start = array();
    		preg_match('/(\d+)\-(\d+)\-(\d+) (\d+)\:(\d+)\:(\d+)/', $startDate, $start);
 		$end = gmdate('Y-m-d H:i:s');
-    	$start_time = gmmktime($start[4],$start[5], $start[6], $start[2], $start[3], $start[1] );
-		$seconds = time()- $start_time;
-		$minutes =   $seconds/60;
+    	$start_time = gmmktime($start[4], $start[5], $start[6], $start[2], $start[3], $start[1]);
+		$seconds = time() - $start_time;
+		$minutes = $seconds / 60;
 		$seconds = $seconds % 60;
-		$hours = floor( $minutes / 60);
+		$hours = floor($minutes / 60);
 		$minutes = $minutes % 60;
-		$days = floor( $hours / 24);
+		$days = floor($hours / 24);
 		$hours = $hours % 24;
-		$weeks = floor( $days / 7);
+		$weeks = floor($days / 7);
 		$days = $days % 7;
 		$result = '';
-		if($weeks == 1){
-			$result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
+		if ($weeks == 1) {
+			$result = translate('LBL_TIME_LAST_WEEK', 'SugarFeed').' ';
 			return $result;
-		}else if($weeks > 1){
-			$result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
-			if($days > 0) {
-                $result .= $days . ' '.translate('LBL_TIME_DAYS','SugarFeed').' ';
+		} else if ($weeks > 1) {
+			$result .= $weeks.' '.translate('LBL_TIME_WEEKS', 'SugarFeed').' ';
+			if ($days > 0) {
+                $result .= $days.' '.translate('LBL_TIME_DAYS', 'SugarFeed').' ';
             }
-		}else{
-			if($days == 1){
-				$result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
+		} else {
+			if ($days == 1) {
+				$result = translate('LBL_TIME_YESTERDAY', 'SugarFeed').' ';
 				return $result;
-			}else if($days > 1){
-				$result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
-			}else{
-				if($hours == 1) {
-                    $result .= $hours . ' '.translate('LBL_TIME_HOUR','SugarFeed').' ';
+			} else if ($days > 1) {
+				$result .= $days.' '.translate('LBL_TIME_DAYS', 'SugarFeed').' ';
+			} else {
+				if ($hours == 1) {
+                    $result .= $hours.' '.translate('LBL_TIME_HOUR', 'SugarFeed').' ';
                 } else {
-                    $result .= $hours . ' '.translate('LBL_TIME_HOURS','SugarFeed').' ';
+                    $result .= $hours.' '.translate('LBL_TIME_HOURS', 'SugarFeed').' ';
                 }
-				if($hours < 6){
-					if($minutes == 1) {
-                        $result .= $minutes . ' ' . translate('LBL_TIME_MINUTE','SugarFeed'). ' ';
+				if ($hours < 6) {
+					if ($minutes == 1) {
+                        $result .= $minutes.' '.translate('LBL_TIME_MINUTE', 'SugarFeed').' ';
                     } else {
-                        $result .= $minutes . ' ' . translate('LBL_TIME_MINUTES','SugarFeed'). ' ';
+                        $result .= $minutes.' '.translate('LBL_TIME_MINUTES', 'SugarFeed').' ';
                     }
 				}
-				if($hours == 0 && $minutes == 0) {
-                    if($seconds == 1 ) {
-                        $result = $seconds . ' ' . translate('LBL_TIME_SECOND','SugarFeed');
+				if ($hours == 0 && $minutes == 0) {
+                    if ($seconds == 1) {
+                        $result = $seconds.' '.translate('LBL_TIME_SECOND', 'SugarFeed');
                     } else {
-                        $result = $seconds . ' ' . translate('LBL_TIME_SECONDS','SugarFeed');
+                        $result = $seconds.' '.translate('LBL_TIME_SECONDS', 'SugarFeed');
                     }
                 }
 			}
 		}
-		return $result . ' ' . translate('LBL_TIME_AGO','SugarFeed');
+		return $result.' '.translate('LBL_TIME_AGO', 'SugarFeed');
 
 
 
     }
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return false;
 		}
 		return false;

Braces +12 added lines, -8 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');
+}
 
 class SecurityGroupMessage extends Basic {
 	var $new_schema = true;
@@ -47,8 +49,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();
@@ -106,7 +107,10 @@ 
 			$securitygroup_id = null; //6.4.0
 		}
 		$message = new SecurityGroupMessage();
-		if(empty($text)) return; // || !$feed->ACLAccess('save', true) )return;
+		if(empty($text)) {
+		    return;
+		}
+		// || !$feed->ACLAccess('save', true) )return;
 
 		$text = strip_tags($text);
 		$message->name = '';
@@ -135,18 +139,18 @@ 
 		if($weeks == 1){
 			$result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
 			return $result;
-		}else if($weeks > 1){
+		} else if($weeks > 1){
 			$result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
 			if($days > 0) {
                 $result .= $days . ' '.translate('LBL_TIME_DAYS','SugarFeed').' ';
             }
-		}else{
+		} else{
 			if($days == 1){
 				$result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
 				return $result;
-			}else if($days > 1){
+			} else if($days > 1){
 				$result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
-			}else{
+			} else{
 				if($hours == 1) {
                     $result .= $hours . ' '.translate('LBL_TIME_HOUR','SugarFeed').' ';
                 } else {

modules/SecurityGroups/SecurityGroup_sugar.php

Indentation +32 added lines, -32 removed lines

@@ -2,33 +2,33 @@ 
 
 
 class SecurityGroup_sugar extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'SecurityGroups';
-	var $object_name = 'SecurityGroup';
-	var $table_name = 'securitygroups';
-		var $id;
-		var $name;
-		var $date_entered;
-		var $date_modified;
-		var $modified_user_id;
-		var $modified_by_name;
-		var $created_by;
-		var $created_by_name;
-		var $description;
-		var $deleted;
-		var $created_by_link;
-		var $modified_user_link;
-		var $assigned_user_id;
-		var $assigned_user_name;
-		var $assigned_user_link;
-
-
-
-
-
-	public function __construct(){
-		parent::__construct();
-	}
+    var $new_schema = true;
+    var $module_dir = 'SecurityGroups';
+    var $object_name = 'SecurityGroup';
+    var $table_name = 'securitygroups';
+        var $id;
+        var $name;
+        var $date_entered;
+        var $date_modified;
+        var $modified_user_id;
+        var $modified_by_name;
+        var $created_by;
+        var $created_by_name;
+        var $description;
+        var $deleted;
+        var $created_by_link;
+        var $modified_user_link;
+        var $assigned_user_id;
+        var $assigned_user_name;
+        var $assigned_user_link;
+
+
+
+
+
+    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
@@ -45,11 +45,11 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
 }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -26,16 +26,16 @@ 
 
 
 
-	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 SecurityGroup_sugar(){
+    public function SecurityGroup_sugar() {
         $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 {
@@ -45,8 +45,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/SecurityGroups/SecurityGroupUserRelationship.php

Spacing +14 added lines, -14 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');
 
 
 require_once('data/SugarBean.php');
@@ -31,29 +31,29 @@ 
     var $new_schema = true;
 
     var $additional_column_fields = Array();
-        var $field_defs = array (
+        var $field_defs = array(
        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36', )
+      , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36',)
       , 'user_id'=>array('name' =>'user_id', 'type' =>'char', 'len'=>'36',)
       , 'noninheritable'=>array('name' =>'noninheritable', 'type' =>'bool', 'len'=>'1')
       , 'primary_group'=>array('name' =>'primary_group', 'type' =>'bool', 'len'=>'1')
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
+      , 'date_modified'=>array('name' => 'date_modified', 'type' => 'datetime')
       , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
       );
     function __construct() {
         $this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();
 
-        $this->disable_row_level_security =true;
+        $this->disable_row_level_security = true;
 
         }
 
     /**
      * @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
      */
-    function SecurityGroupUserRelationship(){
+    function SecurityGroupUserRelationship() {
         $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 {
@@ -65,27 +65,27 @@ 
 
     function fill_in_additional_detail_fields()
     {
-        if(isset($this->securitygroup_id) && $this->securitygroup_id != "")
+        if (isset($this->securitygroup_id) && $this->securitygroup_id != "")
         {
             $query = "SELECT name from securitygroups where id='$this->securitygroup_id' AND deleted=0";
-            $result =$this->db->query($query,true," Error filling in additional detail fields: ");
+            $result = $this->db->query($query, true, " Error filling in additional detail fields: ");
             // Get the id and the name.
             $row = $this->db->fetchByAssoc($result);
 
-            if($row != null)
+            if ($row != null)
             {
                 $this->securitygroup_name = $row['name'];
             }
         }
 
-        if(isset($this->user_id) && $this->user_id != "")
+        if (isset($this->user_id) && $this->user_id != "")
         {
             $query = "SELECT user_name from users where id='$this->user_id' AND deleted=0";
-            $result =$this->db->query($query,true," Error filling in additional detail fields: ");
+            $result = $this->db->query($query, true, " Error filling in additional detail fields: ");
             // Get the id and the name.
             $row = $this->db->fetchByAssoc($result);
 
-            if($row != null)
+            if ($row != null)
             {
                 $this->user_name = $row['user_name'];
             }
@@ -98,7 +98,7 @@ 
         $query = "SELECT id, first_name, last_name, user_name FROM users ";
         $where_auto = "deleted=0";
 
-        if($where != "")
+        if ($where != "")
             $query .= "where $where AND ".$where_auto;
         else
             $query .= "where ".$where_auto;

Braces +9 added lines, -7 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');
+}
 
 
 require_once('data/SugarBean.php');
@@ -55,8 +57,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();
@@ -98,10 +99,11 @@ 
         $query = "SELECT id, first_name, last_name, user_name FROM users ";
         $where_auto = "deleted=0";
 
-        if($where != "")
-            $query .= "where $where AND ".$where_auto;
-        else
-            $query .= "where ".$where_auto;
+        if($where != "") {
+                    $query .= "where $where AND ".$where_auto;
+        } else {
+                    $query .= "where ".$where_auto;
+        }
 
         $query .= " ORDER BY last_name, first_name";