adamjakab / SuiteCRM

modules/SecurityGroups/SecurityGroupUserRelationship.php

Indentation +8 added lines, -8 removed lines

@@ -32,14 +32,14 @@
     
     var $additional_column_fields = Array();
         var $field_defs = array (
-       'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , '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')
-      , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
-      );
+        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
+        , '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')
+        , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
+        );
     function SecurityGroupUserRelationship() {
         $this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();

Spacing +12 added lines, -12 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,46 +31,46 @@ 
     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 SecurityGroupUserRelationship() {
         $this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();
 
-        $this->disable_row_level_security =true;
+        $this->disable_row_level_security = true;
 
         }
 
     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'];
             }
@@ -83,7 +83,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 +8 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');
+}
 
 
 require_once('data/SugarBean.php');
@@ -83,10 +85,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";
 

modules/SecurityGroups/SecurityGroupMessage.php

Braces +11 added lines, -6 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;
@@ -91,7 +93,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 = '';
@@ -120,18 +125,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 {

Indentation +138 added lines, -138 removed lines

@@ -2,169 +2,169 @@
 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 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 __construct(){
+        parent::__construct();
+    }
+
+
+    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 +50 added lines, -50 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,18 +36,18 @@ 
     );
 
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 
 
-	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');
@@ -55,17 +55,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');
@@ -75,23 +75,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 = '';
@@ -106,61 +106,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;

modules/SecurityGroups/SecurityGroupUserRelationshipEdit.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('XTemplate/xtpl.php');
 require_once('modules/SecurityGroups/SecurityGroupUserRelationship.php');
@@ -13,11 +13,11 @@ 
 
 $focus = new SecurityGroupUserRelationship();
 
-if(isset($_REQUEST['record'])) {
+if (isset($_REQUEST['record'])) {
     $focus->retrieve($_REQUEST['record']);
 }
 
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
     $focus->id = "";
 }
 
@@ -30,8 +30,8 @@ 
 safe_map('primary_group', $focus);
 
 
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
+$theme_path = "themes/".$theme."/";
+$image_path = $theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $GLOBALS['log']->info("SecurityGroup User relationship");
@@ -42,10 +42,10 @@ 
 $sqs_objects = array('user_name' => $qsd->getQSParent());
 $sqs_objects['user_name']['populate_list'] = array('user_name', 'user_id');
 $quicksearch_js = $qsd->getQSScripts();
-$quicksearch_js .= '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
+$quicksearch_js .= '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
 echo $quicksearch_js;
 
-$xtpl=new XTemplate ('modules/SecurityGroups/SecurityGroupUserRelationshipEdit.html');
+$xtpl = new XTemplate('modules/SecurityGroups/SecurityGroupUserRelationshipEdit.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 
@@ -54,25 +54,25 @@ 
 $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
 $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
 $xtpl->assign("THEME", $theme);
-$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
+$xtpl->assign("IMAGE_PATH", $image_path); $xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
 $xtpl->assign("ID", $focus->id);
-$xtpl->assign("SECURITYGROUP",$securityGroup = Array("NAME" => $focus->securitygroup_name, "ID" => $focus->securitygroup_id));
-$xtpl->assign("USER",$user = Array("NAME" => $focus->user_name, "ID" => $focus->user_id));
+$xtpl->assign("SECURITYGROUP", $securityGroup = Array("NAME" => $focus->securitygroup_name, "ID" => $focus->securitygroup_id));
+$xtpl->assign("USER", $user = Array("NAME" => $focus->user_name, "ID" => $focus->user_id));
 
 echo "\n<p>\n";
-echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SECURITYGROUP_USER_FORM_TITLE'].": ".$securityGroup['NAME'] . " - ". $user['NAME'], true);
+echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SECURITYGROUP_USER_FORM_TITLE'].": ".$securityGroup['NAME']." - ".$user['NAME'], true);
 echo "\n</p>\n";
 
 // noninheritable
 $noninheritable = '';
-if(isset($focus->noninheritable) && $focus->noninheritable == true) {
+if (isset($focus->noninheritable) && $focus->noninheritable == true) {
     $noninheritable = 'CHECKED';
 } 
 $xtpl->assign('noninheritable', $noninheritable);
 
 // primary_group
 $primary_group = '';
-if(isset($focus->primary_group) && $focus->primary_group == true) {
+if (isset($focus->primary_group) && $focus->primary_group == true) {
     $primary_group = 'CHECKED';
 } 
 $xtpl->assign('primary_group', $primary_group);
@@ -85,7 +85,7 @@ 
 $javascript = new javascript();
 $javascript->setFormName('EditView');
 $javascript->setSugarBean($focus);
-$javascript->addToValidateBinaryDependency('user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'] . $mod_strings['LBL_USER_NAME'], 'false', '', 'user_id');
+$javascript->addToValidateBinaryDependency('user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'].$mod_strings['LBL_USER_NAME'], 'false', '', 'user_id');
 echo $javascript->getScript();
 
 

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/SecurityGroups/AssignGroups.php

Indentation +112 added lines, -112 removed lines

@@ -6,113 +6,113 @@ 
 
 function popup_select(&$bean, $event, $arguments)
 {
-	global $sugar_config;
-
-	//only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
-	if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
-		&& isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
-		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
-		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
-		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
-
-		if(!empty($_REQUEST['securitygroup_list'])) {
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-			$groupFocus = new SecurityGroup();
-			$security_modules = $groupFocus->getSecurityModules();
-			//sanity check
-			if(in_array($bean->module_dir,array_keys($security_modules))) {
-				//add each group in securitygroup_list to new record
-				$rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
-
-				$bean->load_relationship($rel_name);
-				foreach($_REQUEST['securitygroup_list'] as $group_id) {
-					$bean->$rel_name->add($group_id);
-				}
-			}
-		} else if(!empty($_REQUEST['dup_checked'])) {
-			//well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
-			//so we are screwed here...
-			global $current_language;
-			$ss_mod_strings = return_module_language($current_language, 'SecurityGroups');	
-			unset($_SESSION['securitysuite_error']); //to be safe
-			$_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
-		}
-	}
+    global $sugar_config;
+
+    //only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
+    if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
+        && isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
+        && empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
+        //Upload an attachment to an Email Template and save. If user with multi groups - popup select option
+        //it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
+        if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
+
+        if(!empty($_REQUEST['securitygroup_list'])) {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            $groupFocus = new SecurityGroup();
+            $security_modules = $groupFocus->getSecurityModules();
+            //sanity check
+            if(in_array($bean->module_dir,array_keys($security_modules))) {
+                //add each group in securitygroup_list to new record
+                $rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
+
+                $bean->load_relationship($rel_name);
+                foreach($_REQUEST['securitygroup_list'] as $group_id) {
+                    $bean->$rel_name->add($group_id);
+                }
+            }
+        } else if(!empty($_REQUEST['dup_checked'])) {
+            //well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
+            //so we are screwed here...
+            global $current_language;
+            $ss_mod_strings = return_module_language($current_language, 'SecurityGroups');	
+            unset($_SESSION['securitysuite_error']); //to be safe
+            $_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
+        }
+    }
 
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
-		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
-		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
+    else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
+        && empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
+        && isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
 
-		//$_REQUEST['return_module'] = $bean->module_dir;
-		//$_REQUEST['return_action'] = "DetailView";
-		//$_REQUEST['return_id'] = $bean->id;
+        //$_REQUEST['return_module'] = $bean->module_dir;
+        //$_REQUEST['return_action'] = "DetailView";
+        //$_REQUEST['return_id'] = $bean->id;
 		
-		//$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
+        //$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
 		
-		if(!isset($_SESSION['securitygroups_popup'])) {
-			$_SESSION['securitygroups_popup'] = array();
-		}
-		$_SESSION['securitygroups_popup'][] = array(
-			'module' => $bean->module_dir,
-			'id' => $bean->id
-		);
-	}
+        if(!isset($_SESSION['securitygroups_popup'])) {
+            $_SESSION['securitygroups_popup'] = array();
+        }
+        $_SESSION['securitygroups_popup'][] = array(
+            'module' => $bean->module_dir,
+            'id' => $bean->id
+        );
+    }
 } 
 
 
 function popup_onload($event, $arguments)
 {
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
+    if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
 
 /** //test user popup
 	//always have this loaded
 	echo '<script type="text/javascript" src="modules/SecurityGroups/javascript/popup_relate.js"></script>';
 */
-	global $sugar_config;
+    global $sugar_config;
 
-	$module = $_REQUEST['module'];
-	$action = $_REQUEST['action'];
+    $module = $_REQUEST['module'];
+    $action = $_REQUEST['action'];
 
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
+    if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
 
-	if( (
-			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
-			//|| 
-			($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
-		)
+    if( (
+            //(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
+            //|| 
+            ($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
+        )
 	
-		//&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module])
-		&& !empty($_SESSION['securitygroups_popup'])
-	) {	
-
-		foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
-			$record_id = $popup['id'];
-			$module = $popup['module'];
-			unset($_SESSION['securitygroups_popup'][$popup_index]);
+        //&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module])
+        && !empty($_SESSION['securitygroups_popup'])
+    ) {	
+
+        foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
+            $record_id = $popup['id'];
+            $module = $popup['module'];
+            unset($_SESSION['securitygroups_popup'][$popup_index]);
 			
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-			$groupFocus = new SecurityGroup();
-			if($module == 'Users') {
-				$rel_name = "SecurityGroups";
-			} else {
-				$rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
-			}
-
-				//this only works if on the detail view of the record actually saved...
-				//so ajaxui breaks this as it stays on the parent
-				$auto_popup = <<<EOQ
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            $groupFocus = new SecurityGroup();
+            if($module == 'Users') {
+                $rel_name = "SecurityGroups";
+            } else {
+                $rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
+            }
+
+                //this only works if on the detail view of the record actually saved...
+                //so ajaxui breaks this as it stays on the parent
+                $auto_popup = <<<EOQ
 <script type="text/javascript" language="javascript">
 	open_popup("SecurityGroups",600,400,"",true,true,{"call_back_function":"securitysuite_set_return_and_save_background","form_name":"DetailView","field_to_name_array":{"id":"subpanel_id"},"passthru_data":{"module":"$module","record":"$record_id","child_field":"$rel_name","return_url":"","link_field_name":"$rel_name","module_name":"$rel_name","refresh_page":"1"}},"MultiSelect",true);
 </script>
 EOQ;
 
-			echo $auto_popup;
+            echo $auto_popup;
 
-		}
-		unset($_SESSION['securitygroups_popup']);
+        }
+        unset($_SESSION['securitygroups_popup']);
 		
-	}
+    }
 
 }
 
@@ -121,37 +121,37 @@ 
     $action = $_REQUEST['action'];
     $module = $_REQUEST['module'];
   
-  	$no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
+        $no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
     //check if security suite enabled
     $action = strtolower($action);
     if(isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
-    	&& (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
-    	&& !array_key_exists($module,$no_mass_assign_list)
-    	) {
-   		global $current_user;
-   		if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
+        && (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
+        && !array_key_exists($module,$no_mass_assign_list)
+        ) {
+            global $current_user;
+            if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
 
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-			$groupFocus = new SecurityGroup();
-			$security_modules = $groupFocus->getSecurityModules();
-			//if(in_array($module,$security_modules)) {
-			if(in_array($module,array_keys($security_modules))) {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            $groupFocus = new SecurityGroup();
+            $security_modules = $groupFocus->getSecurityModules();
+            //if(in_array($module,$security_modules)) {
+            if(in_array($module,array_keys($security_modules))) {
 
-				global $app_strings;
+                global $app_strings;
 
-				global $current_language;
-				$current_module_strings = return_module_language($current_language, 'SecurityGroups');
+                global $current_language;
+                $current_module_strings = return_module_language($current_language, 'SecurityGroups');
 
-				$form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
+                $form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
 
-				$groups = $groupFocus->get_list("name","",0,-99,-99);
-				$options = array(""=>"");
-				foreach($groups['list'] as $group) {
-					$options[$group->id] = $group->name;
-				}
-				$group_options =  get_select_options_with_id($options, "");
+                $groups = $groupFocus->get_list("name","",0,-99,-99);
+                $options = array(""=>"");
+                foreach($groups['list'] as $group) {
+                    $options[$group->id] = $group->name;
+                }
+                $group_options =  get_select_options_with_id($options, "");
 
-				$mass_assign = <<<EOQ
+                $mass_assign = <<<EOQ
 
 <script type="text/javascript" language="javascript">
 function confirm_massassign(del,start_string, end_string) {
@@ -264,16 +264,16 @@ 
 EOQ;
 
 
-				echo $mass_assign;
-			}
-		}
+                echo $mass_assign;
+            }
+        }
     }
 
-	//if after a save...
-	if(!empty($_SESSION['securitysuite_error'])) {
-		$lbl_securitysuite_error = $_SESSION['securitysuite_error'];
-		unset($_SESSION['securitysuite_error']);
-		echo <<<EOQ
+    //if after a save...
+    if(!empty($_SESSION['securitysuite_error'])) {
+        $lbl_securitysuite_error = $_SESSION['securitysuite_error'];
+        unset($_SESSION['securitysuite_error']);
+        echo <<<EOQ
 <script>
 				
 
@@ -287,7 +287,7 @@ 
 document.body.insertBefore(oNewP, beforeMe);
 </script>
 EOQ;
-	}
+    }
 }
 
 }

Spacing +26 added lines, -26 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 AssignGroups {
@@ -9,28 +9,28 @@ 
 	global $sugar_config;
 
 	//only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
-	if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
 		&& isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
 		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
 		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
 		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
+		if (!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
 
-		if(!empty($_REQUEST['securitygroup_list'])) {
+		if (!empty($_REQUEST['securitygroup_list'])) {
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
 			$security_modules = $groupFocus->getSecurityModules();
 			//sanity check
-			if(in_array($bean->module_dir,array_keys($security_modules))) {
+			if (in_array($bean->module_dir, array_keys($security_modules))) {
 				//add each group in securitygroup_list to new record
-				$rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
+				$rel_name = $groupFocus->getLinkName($bean->module_dir, "SecurityGroups");
 
 				$bean->load_relationship($rel_name);
-				foreach($_REQUEST['securitygroup_list'] as $group_id) {
+				foreach ($_REQUEST['securitygroup_list'] as $group_id) {
 					$bean->$rel_name->add($group_id);
 				}
 			}
-		} else if(!empty($_REQUEST['dup_checked'])) {
+		} else if (!empty($_REQUEST['dup_checked'])) {
 			//well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
 			//so we are screwed here...
 			global $current_language;
@@ -40,9 +40,9 @@ 
 		}
 	}
 
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
+	else if (isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
 		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
-		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
+		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature') { //Bug: 589
 
 		//$_REQUEST['return_module'] = $bean->module_dir;
 		//$_REQUEST['return_action'] = "DetailView";
@@ -50,7 +50,7 @@ 
 		
 		//$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
 		
-		if(!isset($_SESSION['securitygroups_popup'])) {
+		if (!isset($_SESSION['securitygroups_popup'])) {
 			$_SESSION['securitygroups_popup'] = array();
 		}
 		$_SESSION['securitygroups_popup'][] = array(
@@ -63,7 +63,7 @@ 
 
 function popup_onload($event, $arguments)
 {
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
+	if (!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
 
 /** //test user popup
 	//always have this loaded
@@ -74,9 +74,9 @@ 
 	$module = $_REQUEST['module'];
 	$action = $_REQUEST['action'];
 
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
+	if (isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
 
-	if( (
+	if ((
 			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
 			//|| 
 			($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
@@ -86,17 +86,17 @@ 
 		&& !empty($_SESSION['securitygroups_popup'])
 	) {	
 
-		foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
+		foreach ($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
 			$record_id = $popup['id'];
 			$module = $popup['module'];
 			unset($_SESSION['securitygroups_popup'][$popup_index]);
 			
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
-			if($module == 'Users') {
+			if ($module == 'Users') {
 				$rel_name = "SecurityGroups";
 			} else {
-				$rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
+				$rel_name = $groupFocus->getLinkName($module, "SecurityGroups");
 			}
 
 				//this only works if on the detail view of the record actually saved...
@@ -121,21 +121,21 @@ 
     $action = $_REQUEST['action'];
     $module = $_REQUEST['module'];
   
-  	$no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
+  	$no_mass_assign_list = array("Emails"=>"Emails", "ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
     //check if security suite enabled
     $action = strtolower($action);
-    if(isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
+    if (isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
     	&& (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
-    	&& !array_key_exists($module,$no_mass_assign_list)
+    	&& !array_key_exists($module, $no_mass_assign_list)
     	) {
    		global $current_user;
-   		if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
+   		if (is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id, "SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
 
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
 			$security_modules = $groupFocus->getSecurityModules();
 			//if(in_array($module,$security_modules)) {
-			if(in_array($module,array_keys($security_modules))) {
+			if (in_array($module, array_keys($security_modules))) {
 
 				global $app_strings;
 
@@ -144,12 +144,12 @@ 
 
 				$form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
 
-				$groups = $groupFocus->get_list("name","",0,-99,-99);
+				$groups = $groupFocus->get_list("name", "", 0, -99, -99);
 				$options = array(""=>"");
-				foreach($groups['list'] as $group) {
+				foreach ($groups['list'] as $group) {
 					$options[$group->id] = $group->name;
 				}
-				$group_options =  get_select_options_with_id($options, "");
+				$group_options = get_select_options_with_id($options, "");
 
 				$mass_assign = <<<EOQ
 
@@ -270,7 +270,7 @@ 
     }
 
 	//if after a save...
-	if(!empty($_SESSION['securitysuite_error'])) {
+	if (!empty($_SESSION['securitysuite_error'])) {
 		$lbl_securitysuite_error = $_SESSION['securitysuite_error'];
 		unset($_SESSION['securitysuite_error']);
 		echo <<<EOQ

Braces +13 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');
+}
 
 
 class AssignGroups {
@@ -14,7 +16,9 @@ 
 		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
 		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
 		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
+		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) {
+		    return;
+		}
 
 		if(!empty($_REQUEST['securitygroup_list'])) {
 			require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -38,9 +42,7 @@ 
 			unset($_SESSION['securitysuite_error']); //to be safe
 			$_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
 		}
-	}
-
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
+	} else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
 		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
 		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
 
@@ -63,7 +65,9 @@ 
 
 function popup_onload($event, $arguments)
 {
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
+	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) {
+	    return;
+	}
 
 /** //test user popup
 	//always have this loaded
@@ -74,7 +78,9 @@ 
 	$module = $_REQUEST['module'];
 	$action = $_REQUEST['action'];
 
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
+	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) {
+	    return;
+	}
 
 	if( (
 			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)

modules/Contacts/ContactsQuickCreate.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +55,7 @@ 
   
         $this->ss->assign("SALUTATION_OPTIONS", get_select_options_with_id($app_list_strings['salutation_dom'], ''));
 
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"contactsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"contacts\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_contacts\")';");
         }

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/Contacts/SaveContactOpportunityRelationship.php

Indentation +2 added lines, -2 removed lines

@@ -57,12 +57,12 @@
 
 foreach($focus->column_fields as $field)
 {
-	safe_map($field, $focus, true);
+    safe_map($field, $focus, true);
 }
 
 foreach($focus->additional_column_fields as $field)
 {
-	safe_map($field, $focus, true);
+    safe_map($field, $focus, true);
 }
 
 // send them to the edit screen.

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.
@@ -55,18 +55,18 @@ 
 
 $focus->retrieve($_REQUEST['record']);
 
-foreach($focus->column_fields as $field)
+foreach ($focus->column_fields as $field)
 {
 	safe_map($field, $focus, true);
 }
 
-foreach($focus->additional_column_fields as $field)
+foreach ($focus->additional_column_fields as $field)
 {
 	safe_map($field, $focus, true);
 }
 
 // send them to the edit screen.
-if(isset($_REQUEST['record']) && $_REQUEST['record'] != "")
+if (isset($_REQUEST['record']) && $_REQUEST['record'] != "")
 {
     $recordID = $_REQUEST['record'];
 }

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/Contacts/disablePortalUser.php

Spacing +6 added lines, -6 removed lines

@@ -21,9 +21,9 @@ 
  *
  * @author Salesagility Ltd <support@salesagility.com>
  */
-if(!defined('sugarEntry'))define('sugarEntry', true);
+if (!defined('sugarEntry'))define('sugarEntry', true);
 require_once 'modules/AOP_Case_Updates/util.php';
-if(!isAOPEnabled()){
+if (!isAOPEnabled()) {
     return;
 }
 global $sugar_config, $mod_strings;
@@ -33,19 +33,19 @@ 
 $bean = new Contact();
 $bean->retrieve($_REQUEST['record']);
 
-if(array_key_exists("aop",$sugar_config) && array_key_exists("joomla_url",$sugar_config['aop'])){
+if (array_key_exists("aop", $sugar_config) && array_key_exists("joomla_url", $sugar_config['aop'])) {
     $portalURL = $sugar_config['aop']['joomla_url'];
     $wbsv = file_get_contents($portalURL.'/index.php?option=com_advancedopenportal&task=disable_user&sug='.$_REQUEST['record'].'&uid='.$bean->joomla_account_id);
     $res = json_decode($wbsv);
-    if(!$res->success){
+    if (!$res->success) {
         $msg = $res->error ? $res->error : $mod_strings['LBL_DISABLE_PORTAL_USER_FAILED'];
         SugarApplication::appendErrorMessage($msg);
-    }else{
+    } else {
         $bean->portal_account_disabled = 1;
         $bean->save(false);
         SugarApplication::appendErrorMessage($mod_strings['LBL_DISABLE_PORTAL_USER_SUCCESS']);
     }
-}else{
+} else {
     SugarApplication::appendErrorMessage($mod_strings['LBL_NO_JOOMLA_URL']);
 }
 

Braces +5 added lines, -3 removed lines

@@ -21,7 +21,9 @@ 
  *
  * @author Salesagility Ltd <support@salesagility.com>
  */
-if(!defined('sugarEntry'))define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 require_once 'modules/AOP_Case_Updates/util.php';
 if(!isAOPEnabled()){
     return;
@@ -40,12 +42,12 @@ 
     if(!$res->success){
         $msg = $res->error ? $res->error : $mod_strings['LBL_DISABLE_PORTAL_USER_FAILED'];
         SugarApplication::appendErrorMessage($msg);
-    }else{
+    } else{
         $bean->portal_account_disabled = 1;
         $bean->save(false);
         SugarApplication::appendErrorMessage($mod_strings['LBL_DISABLE_PORTAL_USER_SUCCESS']);
     }
-}else{
+} else{
     SugarApplication::appendErrorMessage($mod_strings['LBL_NO_JOOMLA_URL']);
 }
 

modules/Contacts/ContactOpportunityRelationship.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.
@@ -74,46 +74,46 @@ 
 	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'=>'')
-      , 'contact_id'=>array('name' =>'contact_id', 'type' =>'char', 'len'=>'36', )
+      , 'contact_id'=>array('name' =>'contact_id', 'type' =>'char', 'len'=>'36',)
       , 'opportunity_id'=>array('name' =>'opportunity_id', 'type' =>'char', 'len'=>'36',)
       , 'contact_role'=>array('name' =>'contact_role', 'type' =>'char', 'len'=>'50')
-      , '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 ContactOpportunityRelationship() {
 		$this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();
 
-		$this->disable_row_level_security =true;
+		$this->disable_row_level_security = true;
 
 		}
 
 	function fill_in_additional_detail_fields()
 	{
 		global $locale;
-		if(isset($this->contact_id) && $this->contact_id != "")
+		if (isset($this->contact_id) && $this->contact_id != "")
 		{
 			$query = "SELECT first_name, last_name from contacts where id='$this->contact_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->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
 			}
 		}
 
-		if(isset($this->opportunity_id) && $this->opportunity_id != "")
+		if (isset($this->opportunity_id) && $this->opportunity_id != "")
 		{
 			$query = "SELECT name from opportunities where id='$this->opportunity_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->opportunity_name = $row['name'];
 			}

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.

Indentation +66 added lines, -66 removed lines

@@ -52,75 +52,75 @@
 
 // Contact is used to store customer information.
 class ContactOpportunityRelationship extends SugarBean {
-	// Stored fields
-	var $id;
-	var $contact_id;
-	var $contact_role;
-	var $opportunity_id;
-
-	// Related fields
-	var $contact_name;
-	var $opportunity_name;
-
-	var $table_name = "opportunities_contacts";
-	var $object_name = "ContactOpportunityRelationship";
-	var $column_fields = Array("id"
-		,"contact_id"
-		,"opportunity_id"
-		,"contact_role"
-		,'date_modified'
-		);
-
-	var $new_schema = true;
-
-	var $additional_column_fields = Array();
-		var $field_defs = array (
-       'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , 'contact_id'=>array('name' =>'contact_id', 'type' =>'char', 'len'=>'36', )
-      , 'opportunity_id'=>array('name' =>'opportunity_id', 'type' =>'char', 'len'=>'36',)
-      , 'contact_role'=>array('name' =>'contact_role', 'type' =>'char', 'len'=>'50')
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
-      , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
-      );
-	function __construct() {
+    // Stored fields
+    var $id;
+    var $contact_id;
+    var $contact_role;
+    var $opportunity_id;
+
+    // Related fields
+    var $contact_name;
+    var $opportunity_name;
+
+    var $table_name = "opportunities_contacts";
+    var $object_name = "ContactOpportunityRelationship";
+    var $column_fields = Array("id"
+        ,"contact_id"
+        ,"opportunity_id"
+        ,"contact_role"
+        ,'date_modified'
+        );
+
+    var $new_schema = true;
+
+    var $additional_column_fields = Array();
+        var $field_defs = array (
+        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
+        , 'contact_id'=>array('name' =>'contact_id', 'type' =>'char', 'len'=>'36', )
+        , 'opportunity_id'=>array('name' =>'opportunity_id', 'type' =>'char', 'len'=>'36',)
+        , 'contact_role'=>array('name' =>'contact_role', 'type' =>'char', 'len'=>'50')
+        , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
+        , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
+        );
+    function __construct() {
         parent::__construct();
-		$this->db = DBManagerFactory::getInstance();
+        $this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();
 
-		$this->disable_row_level_security =true;
-
-		}
-
-	function fill_in_additional_detail_fields()
-	{
-		global $locale;
-		if(isset($this->contact_id) && $this->contact_id != "")
-		{
-			$query = "SELECT first_name, last_name from contacts where id='$this->contact_id' AND deleted=0";
-			$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)
-			{
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
-			}
-		}
-
-		if(isset($this->opportunity_id) && $this->opportunity_id != "")
-		{
-			$query = "SELECT name from opportunities where id='$this->opportunity_id' AND deleted=0";
-			$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)
-			{
-				$this->opportunity_name = $row['name'];
-			}
-		}
-
-	}
+        $this->disable_row_level_security =true;
+
+        }
+
+    function fill_in_additional_detail_fields()
+    {
+        global $locale;
+        if(isset($this->contact_id) && $this->contact_id != "")
+        {
+            $query = "SELECT first_name, last_name from contacts where id='$this->contact_id' AND deleted=0";
+            $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)
+            {
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
+            }
+        }
+
+        if(isset($this->opportunity_id) && $this->opportunity_id != "")
+        {
+            $query = "SELECT name from opportunities where id='$this->opportunity_id' AND deleted=0";
+            $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)
+            {
+                $this->opportunity_name = $row['name'];
+            }
+        }
+
+    }
 }
 
 

modules/Contacts/metadata/additionalDetails.php

Indentation +31 added lines, -31 removed lines

@@ -40,13 +40,13 @@ 
 
 
 function additionalDetailsContact($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Contacts');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Contacts');
+    }
 	 
-	$overlib_string = '';
+    $overlib_string = '';
     if(!empty($fields['ID'])) {
         $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
         $overlib_string .= '">';
@@ -55,35 +55,35 @@ 
     $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Contacts.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
-		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+        !empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
+        !empty($fields['PRIMARY_ADDRESS_COUNTRY']))
+            $overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+    if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+    if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+        $overlib_string .= '<br>';  
+    if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+    if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+    if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
 
-	if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
+    if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-	}	
+    if(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 	
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Contacts&return_module=Contacts&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Contacts&return_module=Contacts&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Contacts&return_module=Contacts&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Contacts&return_module=Contacts&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  
  
\ No newline at end of file

Spacing +22 added lines, -22 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,41 +41,41 @@ 
 
 function additionalDetailsContact($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Contacts');
 	}
 	 
 	$overlib_string = '';
-    if(!empty($fields['ID'])) {
-        $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
+    if (!empty($fields['ID'])) {
+        $overlib_string .= '<input type="hidden" value="'.$fields['ID'];
         $overlib_string .= '">';
     }
 
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Contacts.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Contacts.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
-    if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+    if (!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
 		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+			$overlib_string .= '<b>'.$mod_strings['LBL_PRIMARY_ADDRESS'].'</b><br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'].', ';
+	if (!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'].'<br>';
+	if (strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
 		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	if (!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'.$mod_strings['LBL_MOBILE_PHONE'].'</b> <span class="phone">'.$fields['PHONE_MOBILE'].'</span><br>';
+	if (!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'.$mod_strings['LBL_HOME_PHONE'].'</b> <span class="phone">'.$fields['PHONE_HOME'].'</span><br>';
+	if (!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'.$mod_strings['LBL_OTHER_PHONE'].'</b> <span class="phone">'.$fields['PHONE_OTHER'].'</span><br>';
 
-	if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
+	if (!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'.$mod_strings['LBL_DATE_MODIFIED'].'</b> '.$fields['DATE_MODIFIED'].'<br>';
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

Braces +45 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,26 +58,52 @@ 
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+    			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    }
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+	}
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
+			$overlib_string .= '<br>';
+	}
+	if(!empty($fields['PHONE_MOBILE'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_HOME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_OTHER'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	}
 
-	if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
+	if(!empty($fields['DATE_MODIFIED'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
+	}
 	
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'NAME',