adamjakab / SuiteCRM

modules/jjwg_Maps/views/view.geocoded_counts.php

Indentation +17 added lines, -17 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewGeocoded_Counts extends SugarView {
 
-   function Jjwg_MapsViewGeocoded_Counts() {
-     parent::SugarView();
-   }
+    function Jjwg_MapsViewGeocoded_Counts() {
+        parent::SugarView();
+    }
 
-  function display() {
+    function display() {
     
     echo '<div class="moduleTitle"><h2>'.$GLOBALS['mod_strings']['LBL_GEOCODED_COUNTS'].'</h2><div class="clear"></div></div>';
     echo '<div class="clear"></div>';
@@ -17,14 +17,14 @@ 
 
     // Display last status code, if set.
     if (!empty($_REQUEST['last_status']) && preg_match('/[A-Z\_]/', $_REQUEST['last_status'])) {
-      echo '<div><b>'.$GLOBALS['mod_strings']['LBL_MAP_LAST_STATUS'].': '.$_REQUEST['last_status'].'</b></div>';
-      echo '<br /><br />';
+        echo '<div><b>'.$GLOBALS['mod_strings']['LBL_MAP_LAST_STATUS'].': '.$_REQUEST['last_status'].'</b></div>';
+        echo '<br /><br />';
     }
 
     echo '<table cellspacing="0" cellpadding="0" border="0" class="list view" style="width: 50% !important;"><tbody>';
     echo '<tr><th>'.$GLOBALS['mod_strings']['LBL_MODULE_HEADING'].'</th>';
     foreach ($this->bean->geocoded_headings as $heading) {
-      echo '<th>'.$heading.'</th>';
+        echo '<th>'.$heading.'</th>';
     }
     echo '<th>'.$GLOBALS['mod_strings']['LBL_MODULE_TOTAL_HEADING'].'</th>';
     echo '<th>'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</th>';
@@ -32,17 +32,17 @@ 
     
     foreach ($GLOBALS['jjwg_config']['valid_geocode_modules'] as $module) {
         
-      $geocode_url = './index.php?module=jjwg_Maps&action=geocode_addresses&display_module='.$module;
-      $reset_url = './index.php?module=jjwg_Maps&action=reset_geocoding&display_module='.$module;
+        $geocode_url = './index.php?module=jjwg_Maps&action=geocode_addresses&display_module='.$module;
+        $reset_url = './index.php?module=jjwg_Maps&action=reset_geocoding&display_module='.$module;
       
-      echo '<tr>';
-      echo '<td><strong><a href="'.htmlspecialchars($geocode_url).'">'.$GLOBALS['app_list_strings']['moduleList'][$module].'</a></strong></td>';
-      foreach ($this->bean->geocoded_headings as $heading) {
+        echo '<tr>';
+        echo '<td><strong><a href="'.htmlspecialchars($geocode_url).'">'.$GLOBALS['app_list_strings']['moduleList'][$module].'</a></strong></td>';
+        foreach ($this->bean->geocoded_headings as $heading) {
         echo '<td>'.$this->bean->geocoded_counts[$module][$heading].'</td>';
-      }
-      echo '<td><strong>'.$this->bean->geocoded_module_totals[$module].'</strong></td>';
-      echo '<td><strong><a href="'.htmlspecialchars($reset_url).'">'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</a.</strong></td>';
-      echo '</tr>'."\n";
+        }
+        echo '<td><strong>'.$this->bean->geocoded_module_totals[$module].'</strong></td>';
+        echo '<td><strong><a href="'.htmlspecialchars($reset_url).'">'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</a.</strong></td>';
+        echo '</tr>'."\n";
     }
 
     echo '</tbody></table>';
@@ -87,6 +87,6 @@ 
     $delete_url = './index.php?module=jjwg_Maps&action=delete_all_address_cache';
     echo '<a href="'.htmlspecialchars($delete_url).'">'.$GLOBALS['app_strings']['LBL_DELETE'].' - '.$GLOBALS['mod_strings']['LBL_ADDRESS_CACHE'].'</a>';
     
-  }
+    }
 }
 

modules/SecurityGroups/VersionCheck.php

Indentation +23 added lines, -23 removed lines

@@ -4,30 +4,30 @@ 
 
 class VersionCheck {
 
-	function version_check($event, $arguments)
-	{
-		global $current_user;
+    function version_check($event, $arguments)
+    {
+        global $current_user;
 	
-		require_once('include/utils.php');
-		if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
-			//require_once('modules/SecurityGroups/SecurityGroup.php');
+        require_once('include/utils.php');
+        if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
+            //require_once('modules/SecurityGroups/SecurityGroup.php');
 			
-			//check to see if the securitysuite version
-			//matches the sugar version. If not then display an error messag
+            //check to see if the securitysuite version
+            //matches the sugar version. If not then display an error messag
 			
-			global $sugar_config;
-			if(empty($sugar_config['securitysuite_version'])
-				|| $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
-			) {
-				$securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
-					. "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
-					. "Upgrade now to  ";
+            global $sugar_config;
+            if(empty($sugar_config['securitysuite_version'])
+                || $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
+            ) {
+                $securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
+                    . "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
+                    . "Upgrade now to  ";
 					
-				global $sugar_config;
-				$upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
-				$upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
-				$GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
-				//echo $display_warning;
+                global $sugar_config;
+                $upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
+                $upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
+                $GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
+                //echo $display_warning;
 
 
 ?>
@@ -50,10 +50,10 @@ 
 </script>
 <?php
 
-			}
+            }
 		
-		} //end if admin
-	} 
+        } //end if admin
+    } 
 
 
 }

modules/SecurityGroups/SecurityGroup.php

Indentation +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
                     and secr.module = '$module'
                 where secg.deleted = 0
             )";
-        */
+         */
 
             //and secr.record_id = $table_name.id //not needed as the in clause takes care of this check
         }
@@ -376,7 +376,7 @@ 
             //if(empty($parent_type) || empty($parent_id)) {
                 foreach($focus->field_name_map as $name=>$def) {
 
-                   if($def['type']=='relate' && isset($def['id_name'])
+                    if($def['type']=='relate' && isset($def['id_name'])
                         && isset($def['module']) && strtolower($def['module']) != "users" ) {
 
                         if(isset($_REQUEST[$def['id_name']])) {
@@ -390,7 +390,7 @@ 
 
                             SecurityGroup::inherit_parentQuery($focus, $relate_parent_type, $relate_parent_id, $focus_id, $focus_module_dir);
                         }
-                   }
+                    }
                 }
             //}
 

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();

modules/SecurityGroups/SecurityGroupMessage.php

Indentation +124 added lines, -124 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 $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 $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 $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 SecurityGroupMessage(){	
-		parent::Basic();
-	}
+    function SecurityGroupMessage(){	
+        parent::Basic();
+    }
 	
 
-	function get_list_view_data(){
-		$data = parent::get_list_view_data();
-		$delete = '';
+    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;
+        $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($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'])) {
-			$username = "Unknown";
-		} else {
-			require_once('modules/Users/User.php');
-			$user = new User();
-			$user->retrieve($data['CREATED_BY']);
-			$username = $user->user_name;
-		}
+        $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'] = $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 ;
-	}
+        $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;
+    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();
-	}
+        $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) { 
+    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

modules/SecurityGroups/SecurityGroup_sugar.php

Indentation +27 added lines, -27 removed lines

@@ -2,39 +2,39 @@
 
 
 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;
+    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;
 	
 
 
 
 
-	function SecurityGroup_sugar(){	
-		parent::Basic();
-	}
+    function SecurityGroup_sugar(){	
+        parent::Basic();
+    }
 	
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
 }
 		
 }

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;
-	}
+    }
 }
 
 }

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.

modules/Contacts/ContactOpportunityRelationship.php

Indentation +65 added lines, -65 removed lines

@@ -52,74 +52,74 @@
 
 // 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;
+    // 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 ContactOpportunityRelationship() {
-		$this->db = DBManagerFactory::getInstance();
+    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 ContactOpportunityRelationship() {
+        $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'];
+            }
+        }
+
+    }
 }