adamjakab / SuiteCRM

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/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/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

modules/Contacts/metadata/popupdefsEmail.php

Indentation +17 added lines, -17 removed lines

@@ -42,21 +42,21 @@
 global $mod_strings;
 
 $popupMeta = array('moduleMain' => 'Contact',
-						'varName' => 'CONTACT',
-						'orderBy' => 'contacts.first_name, contacts.last_name',
-						'whereClauses' => 
-							array('first_name' => 'contacts.first_name', 
-									'last_name' => 'contacts.last_name',
-									'account_name' => 'accounts.name',
-									'account_id' => 'accounts.id'),
-						'searchInputs' =>
-							array('first_name', 'last_name', 'account_name'),
-						'create' =>
-							array('formBase' => 'ContactFormBase.php',
-									'formBaseClass' => 'ContactFormBase',
-									'getFormBodyParams' => array('','','ContactSave'),
-									'createButton' => 'LNK_NEW_CONTACT'
-								  ),
-						'templateForm' => 'modules/Contacts/Email_picker.html',
-						);
+                        'varName' => 'CONTACT',
+                        'orderBy' => 'contacts.first_name, contacts.last_name',
+                        'whereClauses' => 
+                            array('first_name' => 'contacts.first_name', 
+                                    'last_name' => 'contacts.last_name',
+                                    'account_name' => 'accounts.name',
+                                    'account_id' => 'accounts.id'),
+                        'searchInputs' =>
+                            array('first_name', 'last_name', 'account_name'),
+                        'create' =>
+                            array('formBase' => 'ContactFormBase.php',
+                                    'formBaseClass' => 'ContactFormBase',
+                                    'getFormBodyParams' => array('','','ContactSave'),
+                                    'createButton' => 'LNK_NEW_CONTACT'
+                                    ),
+                        'templateForm' => 'modules/Contacts/Email_picker.html',
+                        );
 ?>

modules/Contacts/metadata/editviewdefs.php

Indentation +93 added lines, -93 removed lines

@@ -39,193 +39,193 @@
 
 $viewdefs ['Contacts'] = 
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
-          1 => '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
-          2 => '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
-          3 => '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
-          4 => '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">',
+            0 => '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
+            1 => '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
+            2 => '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
+            3 => '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
+            4 => '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">',
+        ),
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'LBL_CONTACT_INFORMATION' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ADVANCED' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_contact_information' => 
-      array (
+        'lbl_contact_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'first_name',
             'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="first_name"  id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'last_name',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'phone_work',
             'comment' => 'Work phone number of the contact',
             'label' => 'LBL_OFFICE_PHONE',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'phone_mobile',
             'comment' => 'Mobile phone number of the contact',
             'label' => 'LBL_MOBILE_PHONE',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'title',
             'comment' => 'The title of the contact',
             'label' => 'LBL_TITLE',
-          ),
-          1 => 'department',
+            ),
+            1 => 'department',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'account_name',
             'displayParams' => 
             array (
-              'key' => 'billing',
-              'copy' => 'primary',
-              'billingKey' => 'primary',
-              'additionalFields' => 
-              array (
+                'key' => 'billing',
+                'copy' => 'primary',
+                'billingKey' => 'primary',
+                'additionalFields' => 
+                array (
                 'phone_office' => 'phone_work',
-              ),
+                ),
             ),
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'phone_fax',
             'comment' => 'Contact fax number',
             'label' => 'LBL_FAX_PHONE',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'email1',
             'studio' => 'false',
             'label' => 'LBL_EMAIL_ADDRESS',
-          ),
+            ),
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'primary_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'primary',
-              'rows' => 2,
-              'cols' => 30,
-              'maxlength' => 150,
+                'key' => 'primary',
+                'rows' => 2,
+                'cols' => 30,
+                'maxlength' => 150,
+            ),
             ),
-          ),
-          1 => 
-          array (
+            1 => 
+            array (
             'name' => 'alt_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'alt',
-              'copy' => 'primary',
-              'rows' => 2,
-              'cols' => 30,
-              'maxlength' => 150,
+                'key' => 'alt',
+                'copy' => 'primary',
+                'rows' => 2,
+                'cols' => 30,
+                'maxlength' => 150,
+            ),
             ),
-          ),
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'label' => 'LBL_DESCRIPTION',
-          ),
-          1 => '',
+            ),
+            1 => '',
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_PANEL_ADVANCED' => 
-      array (
+        'LBL_PANEL_ADVANCED' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'lead_source',
             'comment' => 'How did the contact come about',
             'label' => 'LBL_LEAD_SOURCE',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'report_to_name',
             'label' => 'LBL_REPORTS_TO',
-          ),
-          1 => 'campaign_name',
+            ),
+            1 => 'campaign_name',
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Contacts/metadata/popupdefs.php

Indentation +52 added lines, -52 removed lines

@@ -42,56 +42,56 @@
 global $mod_strings;
 
 $popupMeta = array(
-	'moduleMain' => 'Contact',
-	'varName' => 'CONTACT',
-	'orderBy' => 'contacts.first_name, contacts.last_name',
-	'whereClauses' => 
-		array('first_name' => 'contacts.first_name', 
-				'last_name' => 'contacts.last_name',
-				'account_name' => 'accounts.name',
-				'account_id' => 'accounts.id'),
-	'searchInputs' =>
-		array('first_name', 'last_name', 'account_name', 'email'),
-	'create' =>
-		array('formBase' => 'ContactFormBase.php',
-				'formBaseClass' => 'ContactFormBase',
-				'getFormBodyParams' => array('','','ContactSave'),
-				'createButton' => 'LNK_NEW_CONTACT'
-			  ),
-	'listviewdefs' => array(
-		'NAME' => array(
-			'width' => '20%', 
-			'label' => 'LBL_LIST_NAME',
-  			'link' => true,
-	        'default' => true,
-  			'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id')), 
-		'ACCOUNT_NAME' => array(
-			'width' => '25', 
-			'label' => 'LBL_LIST_ACCOUNT_NAME', 
-			'module' => 'Accounts',
-			'id' => 'ACCOUNT_ID',
-  			'default' => true,
-	        'sortable'=> true,
-	        'ACLTag' => 'ACCOUNT',
-	        'related_fields' => array('account_id')),
-  		'TITLE' => array(
-			'width' => '15%', 
-			'label' => 'LBL_LIST_TITLE',
-	        'default' => true), 
-  		'LEAD_SOURCE' => array(
-			'width' => '15%', 
-			'label' => 'LBL_LEAD_SOURCE',
-	        'default' => true), 
-		),
-	'searchdefs'   => array(
-	 	'first_name', 
-		'last_name', 
-		array('name' => 'account_name', 'type' => 'varchar',),
-		'title',
-		'lead_source',
-		'email',
-		array('name' => 'campaign_name', 'displayParams' => array('hideButtons'=>'true', 'size'=>30, 'class'=>'sqsEnabled sqsNoAutofill')),
-		array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
-	  )
-	);
+    'moduleMain' => 'Contact',
+    'varName' => 'CONTACT',
+    'orderBy' => 'contacts.first_name, contacts.last_name',
+    'whereClauses' => 
+        array('first_name' => 'contacts.first_name', 
+                'last_name' => 'contacts.last_name',
+                'account_name' => 'accounts.name',
+                'account_id' => 'accounts.id'),
+    'searchInputs' =>
+        array('first_name', 'last_name', 'account_name', 'email'),
+    'create' =>
+        array('formBase' => 'ContactFormBase.php',
+                'formBaseClass' => 'ContactFormBase',
+                'getFormBodyParams' => array('','','ContactSave'),
+                'createButton' => 'LNK_NEW_CONTACT'
+                ),
+    'listviewdefs' => array(
+        'NAME' => array(
+            'width' => '20%', 
+            'label' => 'LBL_LIST_NAME',
+                'link' => true,
+            'default' => true,
+                'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id')), 
+        'ACCOUNT_NAME' => array(
+            'width' => '25', 
+            'label' => 'LBL_LIST_ACCOUNT_NAME', 
+            'module' => 'Accounts',
+            'id' => 'ACCOUNT_ID',
+                'default' => true,
+            'sortable'=> true,
+            'ACLTag' => 'ACCOUNT',
+            'related_fields' => array('account_id')),
+            'TITLE' => array(
+            'width' => '15%', 
+            'label' => 'LBL_LIST_TITLE',
+            'default' => true), 
+            'LEAD_SOURCE' => array(
+            'width' => '15%', 
+            'label' => 'LBL_LEAD_SOURCE',
+            'default' => true), 
+        ),
+    'searchdefs'   => array(
+            'first_name', 
+        'last_name', 
+        array('name' => 'account_name', 'type' => 'varchar',),
+        'title',
+        'lead_source',
+        'email',
+        array('name' => 'campaign_name', 'displayParams' => array('hideButtons'=>'true', 'size'=>30, 'class'=>'sqsEnabled sqsNoAutofill')),
+        array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
+        )
+    );
 ?>