adamjakab / SuiteCRM

include/InlineEditing/InlineEditing.php

Spacing +32 added lines, -32 removed lines

@@ -42,9 +42,9 @@ 
 
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
-    $bean = BeanFactory::getBean($module,$id);
+    $bean = BeanFactory::getBean($module, $id);
 
-    if(!checkAccess($bean)){
+    if (!checkAccess($bean)) {
         return false;
     }
 
@@ -54,7 +54,7 @@ 
     $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('include/InlineEditing/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('include/InlineEditing/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     if (!is_file($file)
         || inDeveloperMode()
@@ -99,7 +99,7 @@ 
         if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
-            $vardef['id_name'] = $vardef['name'] . '_id';
+            $vardef['id_name'] = $vardef['name'].'_id';
             if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $vardef['module'] = $focus->$vardef['name']->getRelatedModuleName();
             }
@@ -135,15 +135,15 @@ 
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
         // remove extra wrong javascript which breaks auto complete on flexi relationship parent fields
-        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/","",$contents);
+        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/", "", $contents);
 
 
         if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
 
-            $contents = str_replace('"' . $vardef['id_name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.id_name}"{literal}', $contents);
-            $contents = str_replace('"' . $vardef['name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
             // regex below fixes button javascript for flexi relationship
-            if($vardef['type'] == 'parent') {
+            if ($vardef['type'] == 'parent') {
                $contents = str_replace("onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"{\$fields.parent_name.id_name}", "onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"parent_id", $contents);
             }
         }
@@ -177,10 +177,10 @@ 
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if (!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
@@ -222,14 +222,14 @@ 
     }
 
     if ($fieldlist[$fieldname]['type'] == 'link') {
-        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'] . '_id';
+        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
         if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $fieldlist[$fieldname]['module'] = $focus->$fieldlist[$fieldname]['name']->getRelatedModuleName();
         }
     }
 
-    if($fieldlist[$fieldname]['type'] == 'parent'){
+    if ($fieldlist[$fieldname]['type'] == 'parent') {
         $fieldlist['parent_id']['name'] = 'parent_id';
     }
 
@@ -240,14 +240,14 @@ 
     }
 
     if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
-        if($value){
-            $rel_value =  $bean->$fieldlist[$fieldname]['id_name'];
+        if ($value) {
+            $rel_value = $bean->$fieldlist[$fieldname]['id_name'];
 
         }
         $fieldlist[$fieldlist[$fieldname]['id_name']]['value'] = $rel_value;
         $fieldlist[$fieldname]['value'] = $value;
         $fieldlist[$fieldname]['id_name'] = $aow_field;
-        $fieldlist[$fieldname]['name'] = $aow_field . '_display';
+        $fieldlist[$fieldname]['name'] = $aow_field.'_display';
     } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if (!$value) {
@@ -311,14 +311,14 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent') {
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else{
+        } else {
             $bean->$field = $value;
         }
 
@@ -343,7 +343,7 @@ 
 
     $fieldlist[$field] = $bean->getFieldDefinition($field);
 
-    if(is_array($listViewDefs)){
+    if (is_array($listViewDefs)) {
         $fieldlist[$field] = array_merge($fieldlist[$field], $listViewDefs);
     }
 
@@ -381,7 +381,7 @@ 
         $vardef['module'] = $bean->module_dir;
 
         $SugarWidgetSubPanelDetailViewLink = new SugarWidgetSubPanelDetailViewLink($vardef);
-        $value = "<b>" . $SugarWidgetSubPanelDetailViewLink->displayList($vardef) . "</b>";
+        $value = "<b>".$SugarWidgetSubPanelDetailViewLink->displayList($vardef)."</b>";
 
     }
 
@@ -394,7 +394,7 @@ 
         }
         $datetime_format = $timedate->get_date_time_format();
         // create utc date (as it's utc in db)
-        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value,new DateTimeZone('UTC'));
+        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value, new DateTimeZone('UTC'));
         // convert it to timezone the user uses
         $datetime = $timedate->tzUser($datetime);
 
@@ -428,17 +428,17 @@ 
     }
 
     //if field is of type relate.
-    if ($vardef['type'] == "relate" || $vardef['type'] == "parent")  {
+    if ($vardef['type'] == "relate" || $vardef['type'] == "parent") {
 
-        if($vardef['source'] == "non-db"){
+        if ($vardef['source'] == "non-db") {
 
-            if($vardef['module'] == "Employees"){
+            if ($vardef['module'] == "Employees") {
                 $vardef['ext2'] = "Users";
                 $vardef['rname'] = "full_name";
             }
 
         }
-        if($vardef['type'] == "parent") {
+        if ($vardef['type'] == "parent") {
             $vardef['module'] = $bean->parent_type;
             $name = $bean->parent_name;
         }
@@ -446,14 +446,14 @@ 
 
         $value = "<a class=\"listViewTdLinkS1\" href=\"index.php?action=DetailView&module=".$vardef['module']."&record=$record\">";
 
-        if($vardef['ext2']){
-            $value .= getFieldValueFromModule($vardef['rname'],$vardef['ext2'],$record) . "</a>";
+        if ($vardef['ext2']) {
+            $value .= getFieldValueFromModule($vardef['rname'], $vardef['ext2'], $record)."</a>";
 
-        }else if(!empty($vardef['rname'])){
-            $value .= getFieldValueFromModule($vardef['rname'],$vardef['module'],$record) . "</a>";
+        } else if (!empty($vardef['rname'])) {
+            $value .= getFieldValueFromModule($vardef['rname'], $vardef['module'], $record)."</a>";
 
         } else {
-            $value .= $name . "</a>";
+            $value .= $name."</a>";
         }
     }
 
@@ -482,11 +482,11 @@ 
     return $value;
 }
 
-function checkAccess($bean){
+function checkAccess($bean) {
 
-    if($bean->ACLAccess('EditView')) {
+    if ($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

include/phpmailer/language/phpmailer.lang-ar.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية '.
                                           'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';

include/formbase.php

Spacing +69 added lines, -69 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.
@@ -54,9 +54,9 @@ 
  */
 function checkRequired($prefix, $required)
 {
-	foreach($required as $key)
+	foreach ($required as $key)
 	{
-		if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
+		if (!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
 		{
 			return false;
 		}
@@ -77,15 +77,15 @@ 
 {
 	global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
+	if (!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
 		$focus->retrieve($_REQUEST[$prefix.'record']);
 
-	if(!empty($_POST['assigned_user_id']) && 
+	if (!empty($_POST['assigned_user_id']) && 
 	    ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
 	    ($_POST['assigned_user_id'] != $current_user->id)) {
 		$GLOBALS['check_notify'] = true;
 	}
-    if(isset($_POST['dup_checked']) && $_POST['dup_checked'] && isset($_POST['id']) && $_POST['id'] != '' ){
+    if (isset($_POST['dup_checked']) && $_POST['dup_checked'] && isset($_POST['id']) && $_POST['id'] != '') {
         $focus->new_with_id = true;
     }
     require_once('include/SugarFields/SugarFieldHandler.php');
@@ -106,8 +106,8 @@ 
         $relatedFields[$def['id_name']] = $field;
     }
 
-	foreach($focus->field_defs as $field=>$def) {
-        if ( $field == 'id' && !empty($focus->id) ) {
+	foreach ($focus->field_defs as $field=>$def) {
+        if ($field == 'id' && !empty($focus->id)) {
             // Don't try and overwrite the ID
             continue;
         }
@@ -115,7 +115,7 @@ 
 
 	    $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
 		$sf = $sfh->getSugarField($type);
-        if($sf != null){
+        if ($sf != null) {
             $sf->save($focus, $_POST, $field, $def, $prefix);
         } else {
             $GLOBALS['log']->fatal("Field '$field' does not have a SugarField handler");
@@ -154,8 +154,8 @@ 
 */
 	}
 
-	foreach($focus->additional_column_fields as $field) {
-		if(isset($_POST[$prefix.$field])) {
+	foreach ($focus->additional_column_fields as $field) {
+		if (isset($_POST[$prefix.$field])) {
 			$value = $_POST[$prefix.$field];
 			$focus->$field = $value;
 		}
@@ -180,18 +180,18 @@ 
 }
 
 
-function getPostToForm($ignore='', $isRegularExpression=false)
+function getPostToForm($ignore = '', $isRegularExpression = false)
 {
 	$fields = '';
-	if(!empty($ignore) && $isRegularExpression) {
-		foreach ($_POST as $key=>$value){
-			if(!preg_match($ignore, $key)) {
+	if (!empty($ignore) && $isRegularExpression) {
+		foreach ($_POST as $key=>$value) {
+			if (!preg_match($ignore, $key)) {
                                 $fields .= add_hidden_elements($key, $value);
 			}
 		}	
 	} else {
-		foreach ($_POST as $key=>$value){
-			if($key != $ignore) {
+		foreach ($_POST as $key=>$value) {
+			if ($key != $ignore) {
                                 $fields .= add_hidden_elements($key, $value);
 			}
 		}
@@ -199,21 +199,21 @@ 
 	return $fields;
 }
 
-function getGetToForm($ignore='', $usePostAsAuthority = false)
+function getGetToForm($ignore = '', $usePostAsAuthority = false)
 {
 	$fields = '';
 	foreach ($_GET as $key=>$value)
 	{
-		if($key != $ignore){
-			if(!$usePostAsAuthority || !isset($_POST[$key])){
-				$fields.= "<input type='hidden' name='$key' value='$value'>";
+		if ($key != $ignore) {
+			if (!$usePostAsAuthority || !isset($_POST[$key])) {
+				$fields .= "<input type='hidden' name='$key' value='$value'>";
 			}
 		}
 	}
 	return $fields;
 
 }
-function getAnyToForm($ignore='', $usePostAsAuthority = false)
+function getAnyToForm($ignore = '', $usePostAsAuthority = false)
 {
 	$fields = getPostToForm($ignore);
 	$fields .= getGetToForm($ignore, $usePostAsAuthority);
@@ -221,11 +221,11 @@ 
 
 }
 
-function handleRedirect($return_id='', $return_module='', $additionalFlags = false)
+function handleRedirect($return_id = '', $return_module = '', $additionalFlags = false)
 {
-	if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
+	if (isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
 	{
-		header("Location: ". $_REQUEST['return_url']);
+		header("Location: ".$_REQUEST['return_url']);
 		exit;
 	}
 
@@ -235,9 +235,9 @@ 
 }
 
 //eggsurplus: abstract to simplify unit testing
-function buildRedirectURL($return_id='', $return_module='') 
+function buildRedirectURL($return_id = '', $return_module = '') 
 {
-    if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
+    if (isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
 	{
 		$return_module = $_REQUEST['return_module'];
 	}
@@ -245,24 +245,24 @@ 
 	{
 		$return_module = $return_module;
 	}
-	if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
+	if (isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
 	{
 	    
 	   //if we are doing a "Close and Create New"
-        if(isCloseAndCreateNewPressed())
+        if (isCloseAndCreateNewPressed())
         {
             $return_action = "EditView";    
             $isDuplicate = "true";        
             $status = "";
             
             // Meeting Integration
-            if(isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
+            if (isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
             	$additionalFlags = array('meetingIntegrationShowForm' => '1');
             }
             // END Meeting Integration
         } 
 		// if we create a new record "Save", we want to redirect to the DetailView
-		else if(isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
+		else if (isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
 			&& $_REQUEST['return_module'] != 'Activities'
 			&& $_REQUEST['return_module'] != 'Home' 
 			&& $_REQUEST['return_module'] != 'Forecasts' 
@@ -271,7 +271,7 @@ 
 			) 
 			{
 			    $return_action = 'DetailView';
-			} elseif($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
+			} elseif ($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
 			$return_module = $_REQUEST['module'];
 			$return_action = $_REQUEST['return_action']; 
 			// wp: return action needs to be set for one-click close in task list
@@ -287,25 +287,25 @@ 
 		$return_action = "DetailView";
 	}
 	
-	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	if (isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
 	{
 		$return_id = $_REQUEST['return_id'];
 	}
 
     $add = "";
-    if(isset($additionalFlags) && !empty($additionalFlags)) {
-        foreach($additionalFlags as $k => $v) {
+    if (isset($additionalFlags) && !empty($additionalFlags)) {
+        foreach ($additionalFlags as $k => $v) {
             $add .= "&{$k}={$v}";
         }
     }
     
     if (!isset($isDuplicate) || !$isDuplicate)
     {
-        $url="index.php?action=$return_action&module=$return_module&record=$return_id&return_module=$return_module&return_action=$return_action{$add}";
-        if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
+        $url = "index.php?action=$return_action&module=$return_module&record=$return_id&return_module=$return_module&return_action=$return_action{$add}";
+        if (isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
             $url .= "&offset=".$_REQUEST['offset'];
         }
-        if(!empty($_REQUEST['ajax_load']))
+        if (!empty($_REQUEST['ajax_load']))
         {
             $ajax_ret = array(
                 'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
@@ -321,8 +321,8 @@ 
         }
     } else {
     	$standard = "action=$return_action&module=$return_module&record=$return_id&isDuplicate=true&return_module=$return_module&return_action=$return_action&status=$status";
-        $url="index.php?{$standard}{$add}";
-        if(!empty($_REQUEST['ajax_load']))
+        $url = "index.php?{$standard}{$add}";
+        if (!empty($_REQUEST['ajax_load']))
         {
             $ajax_ret = array(
                  'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
@@ -339,20 +339,20 @@ 
     }
 }
 
-function getLikeForEachWord($fieldname, $value, $minsize=4)
+function getLikeForEachWord($fieldname, $value, $minsize = 4)
 {
 	$value = trim($value);
-	$values = explode(' ',$value);
+	$values = explode(' ', $value);
 	$ret = '';
-	foreach($values as $val)
+	foreach ($values as $val)
 	{
-		if(strlen($val) >= $minsize)
+		if (strlen($val) >= $minsize)
 		{
-			if(!empty($ret))
+			if (!empty($ret))
 			{
 				$ret .= ' or';
 			}
-			$ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
+			$ret .= ' '.$fieldname.' LIKE %'.$val.'%';
 		}
 
 	}
@@ -373,36 +373,36 @@ 
  * @see include/generic/Save2.php
  */
 
-function add_prospects_to_prospect_list($parent_id,$child_id)
+function add_prospects_to_prospect_list($parent_id, $child_id)
 {
-    $focus=BeanFactory::getBean('Prospects');
-    if(is_array($child_id)){
+    $focus = BeanFactory::getBean('Prospects');
+    if (is_array($child_id)) {
         $uids = $child_id;
     }
-    else{
+    else {
         $uids = array($child_id);
     }
 
     $relationship = '';
-    foreach($focus->get_linked_fields() as $field => $def) {
+    foreach ($focus->get_linked_fields() as $field => $def) {
         if ($focus->load_relationship($field)) {
-            if ( $focus->$field->getRelatedModuleName() == 'ProspectLists' ) {
+            if ($focus->$field->getRelatedModuleName() == 'ProspectLists') {
                 $relationship = $field;
                 break;
             }
         }
     }
 
-    if ( $relationship != '' ) {
-        foreach ( $uids as $id) {
+    if ($relationship != '') {
+        foreach ($uids as $id) {
             $focus->retrieve($id);
             $focus->load_relationship($relationship);
-            $focus->prospect_lists->add( $parent_id );
+            $focus->prospect_lists->add($parent_id);
         }
     }
 }
 
-function add_to_prospect_list($query_panel,$parent_module,$parent_type,$parent_id,$child_id,$link_attribute,$link_type,$parent)
+function add_to_prospect_list($query_panel, $parent_module, $parent_type, $parent_id, $child_id, $link_attribute, $link_type, $parent)
 {
     $GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$query_panel);
     $GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$parent_module);
@@ -419,21 +419,21 @@ 
     }
     $focus = new $parent_type();
     $focus->retrieve($parent_id);
-    if(empty($focus->id)) {
+    if (empty($focus->id)) {
         return false;
     }
-    if(empty($parent)) {
+    if (empty($parent)) {
         return false;
     }
 
     //if link_type is default then load relationship once and add all the child ids.
-    $relationship_attribute=$link_attribute;
+    $relationship_attribute = $link_attribute;
 
     //find all prospects based on the query
 
     $subpanel = new SubPanelTiles($parent, $parent->module_dir);
-    $thisPanel=$subpanel->subpanel_definitions->load_subpanel($query_panel);
-    if(empty($thisPanel)) {
+    $thisPanel = $subpanel->subpanel_definitions->load_subpanel($query_panel);
+    if (empty($thisPanel)) {
         return false;
     }
 
@@ -443,12 +443,12 @@ 
         $thisPanel->_instance_properties['function_parameters']['EMAIL_MARKETING_ID_VALUE'] = $_REQUEST['marketing_id'];
     }
 
-    $result = SugarBean::get_union_related_list($parent, '', '', '', 0, -99,-99,'', $thisPanel);
+    $result = SugarBean::get_union_related_list($parent, '', '', '', 0, -99, -99, '', $thisPanel);
 
-    if(!empty($result['list'])) {
-        foreach($result['list'] as $object) {
+    if (!empty($result['list'])) {
+        foreach ($result['list'] as $object) {
             if ($link_type != 'default') {
-                $relationship_attribute=strtolower($object->$link_attribute);
+                $relationship_attribute = strtolower($object->$link_attribute);
             }
             $GLOBALS['log']->debug('add_prospects_to_prospect_list:relationship_attribute:'.$relationship_attribute);
             // load relationship for the first time or on change of relationship atribute.
@@ -462,7 +462,7 @@ 
 }
 
 //Link rows returned by a report to parent record.
-function save_from_report($report_id,$parent_id, $module_name, $relationship_attr_name) {
+function save_from_report($report_id, $parent_id, $module_name, $relationship_attr_name) {
     global $beanFiles;
     global $beanList;
 
@@ -472,7 +472,7 @@ 
     $GLOBALS['log']->debug("Save2:Module Name=".$module_name);
     $GLOBALS['log']->debug("Save2:Relationship Attribute Name=".$relationship_attr_name);
 
-    $GLOBALS['log']->debug("Save2:Bean Name=" . $module_name);
+    $GLOBALS['log']->debug("Save2:Bean Name=".$module_name);
     $focus = BeanFactory::newBean($module_name);
 
     $focus->retrieve($parent_id);
@@ -481,7 +481,7 @@ 
     //fetch report definition.
     global $current_language, $report_modules, $modules_report;
 
-    $mod_strings = return_module_language($current_language,"Reports");
+    $mod_strings = return_module_language($current_language, "Reports");
 
 
     $saved = new SavedReport();
@@ -498,7 +498,7 @@ 
     $result = $report->db->query($sql);
 
     $reportBean = BeanFactory::newBean($saved->module);
-    while($row = $report->db->fetchByAssoc($result))
+    while ($row = $report->db->fetchByAssoc($result))
     {
         $reportBean->id = $row['primaryid'];
         $focus->$relationship_attr_name->add($reportBean);

include/utils.php

Spacing +688 added lines, -688 removed lines

@@ -105,7 +105,7 @@ 
 	// assumes the following variables must be set:
 	// $dbconfig, $dbconfigoption, $cache_dir,  $session_dir, $site_URL, $upload_dir
 
-	$sugar_config = array (
+	$sugar_config = array(
 	'admin_export_only' => empty($admin_export_only) ? false : $admin_export_only,
 	'export_delimiter' => empty($export_delimiter) ? ',' : $export_delimiter,
 	'cache_dir' => empty($cache_dir) ? 'cache/' : $cache_dir,
@@ -123,8 +123,8 @@ 
 	'd.m.Y' => '23.12.2010',
 	'm.d.Y' => '12.23.2010'
 		) : $dateFormats,
-	'dbconfig' => $dbconfig,  // this must be set!!
-	'dbconfigoption' => $dbconfigoption,  // this must be set!!
+	'dbconfig' => $dbconfig, // this must be set!!
+	'dbconfigoption' => $dbconfigoption, // this must be set!!
 	'default_action' => empty($default_action) ? 'index' : $default_action,
 	'default_charset' => empty($default_charset) ? 'UTF-8' : $default_charset,
 	'default_currency_name' => empty($default_currency_name) ? 'US Dollar' : $default_currency_name,
@@ -136,7 +136,7 @@ 
 	'default_language' => empty($default_language) ? 'en_us' : $default_language,
 	'default_module' => empty($default_module) ? 'Home' : $default_module,
 	'default_password' => empty($default_password) ? '' : $default_password,
-	'default_permissions' => array (
+	'default_permissions' => array(
 		'dir_mode' => 02770,
 		'file_mode' => 0755,
 		'chown' => '',
@@ -152,7 +152,7 @@ 
 	'display_inbound_email_buttons' => empty($display_inbound_email_buttons) ? false : $display_inbound_email_buttons,
 	'history_max_viewed' => empty($history_max_viewed) ? 50 : $history_max_viewed,
 	'host_name' => empty($host_name) ? 'localhost' : $host_name,
-	'import_dir' => $import_dir,  // this must be set!!
+	'import_dir' => $import_dir, // this must be set!!
 	'import_max_records_per_file' => 100,
     'import_max_records_total_limit' => '',
 	'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
@@ -165,34 +165,34 @@ 
         'l, f' => 'l, f', 's l, f' => 's l, f', 'l s f' => 'l s f', 'l f s' => 'l f s'
     ) : $nameFormats,
     'portal_view' => 'single_user',
-	'resource_management' => array (
+	'resource_management' => array(
 	    'special_query_limit' => 50000,
 	    'special_query_modules' => array('Reports', 'Export', 'Import', 'Administration', 'Sync'),
 	    'default_limit' => 1000,
     ),
 	'require_accounts' => empty($requireAccounts) ? true : $requireAccounts,
 	'rss_cache_time' => empty($RSS_CACHE_TIME) ? '10800' : $RSS_CACHE_TIME,
-	'session_dir' => $session_dir,  // this must be set!!
-	'site_url' => empty($site_URL) ? $site_url : $site_URL,  // this must be set!!
+	'session_dir' => $session_dir, // this must be set!!
+	'site_url' => empty($site_URL) ? $site_url : $site_URL, // this must be set!!
 	'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
 	'showThemePicker' => true,
 	'sugar_version' => empty($sugar_version) ? 'unknown' : $sugar_version,
-	'time_formats' => empty($timeFormats) ? array (
+	'time_formats' => empty($timeFormats) ? array(
 	'H:i'=>'23:00', 'h:ia'=>'11:00 pm', 'h:iA'=>'11:00PM',
 	'H.i'=>'23.00', 'h.ia'=>'11.00 pm', 'h.iA'=>'11.00PM' ) : $timeFormats,
-	'tmp_dir' => $tmp_dir,  // this must be set!!
+	'tmp_dir' => $tmp_dir, // this must be set!!
 	'translation_string_prefix' => empty($translation_string_prefix) ? false : $translation_string_prefix,
 	'unique_key' => empty($unique_key) ? md5(create_guid()) : $unique_key,
-	'upload_badext' => empty($upload_badext) ? array (
+	'upload_badext' => empty($upload_badext) ? array(
 	'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
 	'asp', 'cfm', 'js', 'vbs', 'html', 'htm' ) : $upload_badext,
-	'upload_dir' => $upload_dir,  // this must be set!!
+	'upload_dir' => $upload_dir, // this must be set!!
 	'upload_maxsize' => empty($upload_maxsize) ? 30000000 : $upload_maxsize,
 	'import_max_execution_time' => empty($import_max_execution_time) ? 3600 : $import_max_execution_time,
 	'lock_homepage' => false,
 	'lock_subpanels' => false,
 	'max_dashlets_homepage' => 15,
-	'dashlet_display_row_options' => array('1','3','5','10'),
+	'dashlet_display_row_options' => array('1', '3', '5', '10'),
 	'default_max_tabs' => empty($max_tabs) ? '7' : $max_tabs,
 	'default_subpanel_tabs' =>  empty($subpanel_tabs) ? true : $subpanel_tabs,
 	'default_subpanel_links' => empty($subpanel_links) ? false : $subpanel_links,
@@ -201,7 +201,7 @@ 
 	'default_navigation_paradigm' => empty($navigation_paradigm) ? 'gm' : $navigation_paradigm,
     'default_call_status' => 'Planned',
 	'js_lang_version' => 1,
-	'passwordsetting' => empty($passwordsetting) ? array (
+	'passwordsetting' => empty($passwordsetting) ? array(
 	    'SystemGeneratedPasswordON' => '',
 	    'generatepasswordtmpl' => '',
 	    'lostpasswordtmpl' => '',
@@ -240,7 +240,7 @@ 
 	 * sugar_config_union
 	 */
 
-	$sugar_config_defaults = array (
+	$sugar_config_defaults = array(
 	'admin_export_only' => false,
 	'export_delimiter' => ',',
 	'export_excel_compatible' => false,
@@ -248,15 +248,15 @@ 
 	'calculate_response_time' => true,
 	'create_default_user' => false,
  	'chartEngine' => 'Jit',
-	'date_formats' => array (
+	'date_formats' => array(
 	'Y-m-d' => '2010-12-23', 'm-d-Y' => '12-23-2010', 'd-m-Y' => '23-12-2010',
 	'Y/m/d' => '2010/12/23', 'm/d/Y' => '12/23/2010', 'd/m/Y' => '23/12/2010',
 	'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010',),
-    'name_formats' => array (
+    'name_formats' => array(
         's f l' => 's f l', 'f l' => 'f l', 's l' => 's l', 'l, s f' => 'l, s f',
         'l, f' => 'l, f', 's l, f' => 's l, f', 'l s f' => 'l s f', 'l f s' => 'l f s'
     ),
-	'dbconfigoption' => array (
+	'dbconfigoption' => array(
 	'persistent' => true,
 	'autofree' => false,
 	'debug' => 0,
@@ -277,7 +277,7 @@ 
 	'en_us'),
 	'default_module' => 'Home',
 	'default_password' => '',
-	'default_permissions' => array (
+	'default_permissions' => array(
 		'dir_mode' => 02770,
 		'file_mode' => 0755,
 		'user' => '',
@@ -309,7 +309,7 @@ 
 	'lock_default_user_name' => false,
 	'log_memory_usage' => false,
 	'portal_view' => 'single_user',
-    'resource_management' => array (
+    'resource_management' => array(
 	    'special_query_limit' => 50000,
 	    'special_query_modules' => array('Reports', 'Export', 'Import', 'Administration', 'Sync'),
 	    'default_limit' => 1000,
@@ -322,13 +322,13 @@ 
 	'showThemePicker' => true,
 	'slow_query_time_msec' => '100',
     'sugarbeet' => true,
-    'time_formats' => array (
+    'time_formats' => array(
         'H:i'=>'23:00', 'h:ia'=>'11:00pm', 'h:iA'=>'11:00PM', 'h:i a'=>'11:00 pm', 'h:i A'=>'11:00 PM',
         'H.i'=>'23.00', 'h.ia'=>'11.00pm', 'h.iA'=>'11.00PM', 'h.i a'=>'11.00 pm', 'h.i A'=>'11.00 PM' ),
     'tracker_max_display_length' => 15,
 	'translation_string_prefix' =>
 	return_session_value_or_default('translation_string_prefix', false),
-	'upload_badext' => array (
+	'upload_badext' => array(
 	'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
 	'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml' ),
 	'upload_maxsize' => 30000000,
@@ -344,7 +344,7 @@ 
 	'lock_subpanels' => false,
 	'max_dashlets_homepage' => '15',
 	'default_max_tabs' => '7',
-	'dashlet_display_row_options' => array('1','3','5','10'),
+	'dashlet_display_row_options' => array('1', '3', '5', '10'),
 	'default_subpanel_tabs' =>  true,
 	'default_subpanel_links' => false,
 	'default_swap_last_viewed' => false,
@@ -368,7 +368,7 @@ 
 	  'enable_repeat' => true,
 	  'max_repeat_count' => 1000,
 	),
-	'passwordsetting' => empty($passwordsetting) ? array (
+	'passwordsetting' => empty($passwordsetting) ? array(
 	    'SystemGeneratedPasswordON' => '',
 	    'generatepasswordtmpl' => '',
 	    'lostpasswordtmpl' => '',
@@ -397,31 +397,31 @@ 
 		),
     );
 
-	if(!is_object($locale)) {
+	if (!is_object($locale)) {
 		$locale = new Localization();
 	}
 
 	$sugar_config_defaults['default_currencies'] = $locale->getDefaultCurrencies();
 
 	$sugar_config_defaults = sugarArrayMerge($locale->getLocaleConfigDefaults(), $sugar_config_defaults);
-	return( $sugar_config_defaults );
+	return($sugar_config_defaults);
 }
 
 /**
  * @deprecated use SugarView::getMenu() instead
  */
-function load_menu($path){
+function load_menu($path) {
 	global $module_menu;
 
-	if(file_exists($path . 'Menu.php'))
+	if (file_exists($path.'Menu.php'))
 	{
-		require($path . 'Menu.php');
+		require($path.'Menu.php');
 	}
-	if(file_exists('custom/' . $path . 'Ext/Menus/menu.ext.php'))
+	if (file_exists('custom/'.$path.'Ext/Menus/menu.ext.php'))
 	{
-		require('custom/' . $path . 'Ext/Menus/menu.ext.php');
+		require('custom/'.$path.'Ext/Menus/menu.ext.php');
 	}
-	if(file_exists('custom/application/Ext/Menus/menu.ext.php'))
+	if (file_exists('custom/application/Ext/Menus/menu.ext.php'))
 	{
 		require('custom/application/Ext/Menus/menu.ext.php');
 	}
@@ -434,7 +434,7 @@ 
  *
  * @return string relative file path to email notifications template file
  */
-function get_notify_template_file($language){
+function get_notify_template_file($language) {
 	/*
 	 * Order of operation:
 	 * 1) custom version of specified language
@@ -446,43 +446,43 @@ 
 	// set $file to the base code template so it's set if none of the conditions pass
 	$file = "include/language/en_us.notify_template.html";
 
-	if(file_exists("custom/include/language/{$language}.notify_template.html")){
+	if (file_exists("custom/include/language/{$language}.notify_template.html")) {
 		$file = "custom/include/language/{$language}.notify_template.html";
 	}
-	else if(file_exists("include/language/{$language}.notify_template.html")){
+	else if (file_exists("include/language/{$language}.notify_template.html")) {
 		$file = "include/language/{$language}.notify_template.html";
 	}
-	else if(file_exists("custom/include/language/en_us.notify_template.html")){
+	else if (file_exists("custom/include/language/en_us.notify_template.html")) {
 		$file = "custom/include/language/en_us.notify_template.html";
 	}
 
 	return $file;
 }
 
-function sugar_config_union( $default, $override ){
+function sugar_config_union($default, $override) {
 	// a little different then array_merge and array_merge_recursive.  we want
 	// the second array to override the first array if the same value exists,
 	// otherwise merge the unique keys.  it handles arrays of arrays recursively
 	// might be suitable for a generic array_union
-	if( !is_array( $override ) ){
+	if (!is_array($override)) {
 		$override = array();
 	}
-	foreach( $default as $key => $value ){
-		if( !array_key_exists($key, $override) ){
+	foreach ($default as $key => $value) {
+		if (!array_key_exists($key, $override)) {
 			$override[$key] = $value;
 		}
-		else if( is_array( $key ) ){
-			$override[$key] = sugar_config_union( $value, $override[$key] );
+		else if (is_array($key)) {
+			$override[$key] = sugar_config_union($value, $override[$key]);
 		}
 	}
-	return( $override );
+	return($override);
 }
 
-function make_not_writable( $file ){
+function make_not_writable($file) {
 	// Returns true if the given file/dir has been made not writable
 	$ret_val = false;
-	if( is_file($file) || is_dir($file) ){
-		if( !is_writable($file) ){
+	if (is_file($file) || is_dir($file)) {
+		if (!is_writable($file)) {
 			$ret_val = true;
 		}
 		else {
@@ -492,7 +492,7 @@ 
 			$new_fileperms = $original_fileperms & ~0x0092;
 			@sugar_chmod($file, $new_fileperms);
 
-			if( !is_writable($file) ){
+			if (!is_writable($file)) {
 				$ret_val = true;
 			}
 		}
@@ -515,12 +515,12 @@ 
 	$last_name = "";
 	$full_name = "";
 
-	if(isset($row[$first_column]))
+	if (isset($row[$first_column]))
 	{
 		$first_name = stripslashes($row[$first_column]);
 	}
 
-	if(isset($row[$last_column]))
+	if (isset($row[$last_column]))
 	{
 		$last_name = stripslashes($row[$last_column]);
 	}
@@ -528,13 +528,13 @@ 
 	$full_name = $first_name;
 
 	// If we have a first name and we have a last name
-	if($full_name != "" && $last_name != "")
+	if ($full_name != "" && $last_name != "")
 	{
 		// append a space, then the last name
 		$full_name .= " ".$last_name;
 	}
 	// If we have no first name, but we have a last name
-	else if($last_name != "")
+	else if ($last_name != "")
 	{
 		// append the last name without the space.
 		$full_name .= $last_name;
@@ -548,8 +548,8 @@ 
 {
 	global $sugar_config;
 	$lang = $sugar_config['languages'];
-    if(!empty($sugar_config['disabled_languages'])){
-        foreach(explode(',', $sugar_config['disabled_languages']) as $disable) {
+    if (!empty($sugar_config['disabled_languages'])) {
+        foreach (explode(',', $sugar_config['disabled_languages']) as $disable) {
             unset($lang[$disable]);
         }
     }
@@ -572,11 +572,11 @@ 
 function get_assigned_user_name($assigned_user_id, $is_group = '') {
 	static $saved_user_list = null;
 
-	if(empty($saved_user_list)) {
+	if (empty($saved_user_list)) {
 		$saved_user_list = get_user_array(false, '', '', false, null, $is_group);
 	}
 
-	if(isset($saved_user_list[$assigned_user_id])) {
+	if (isset($saved_user_list[$assigned_user_id])) {
 		return $saved_user_list[$assigned_user_id];
 	}
 
@@ -591,7 +591,7 @@ 
 function get_user_name($id) {
 	global $db;
 
-	if(empty($db))
+	if (empty($db))
 	$db = DBManagerFactory::getInstance();
 
 	$q = "SELECT user_name FROM users WHERE id='{$id}'";
@@ -619,19 +619,19 @@ 
  * @param bool $from_cache Boolean value indicating whether or not to use the get_register_value function for caching, true by default
  * @return array Array of users matching the filter criteria that may be from cache (if similar search was previously run)
  */
-function get_user_array($add_blank=true, $status="Active", $user_id='', $use_real_name=false, $user_name_filter='', $portal_filter=' AND portal_only=0 ', $from_cache = true) {
+function get_user_array($add_blank = true, $status = "Active", $user_id = '', $use_real_name = false, $user_name_filter = '', $portal_filter = ' AND portal_only=0 ', $from_cache = true) {
 	global $locale, $sugar_config, $current_user;
 
-	if(empty($locale)) {
+	if (empty($locale)) {
 		$locale = new Localization();
 	}
 
-	if($from_cache) {
-        $key_name = $add_blank. $status . $user_id . $use_real_name . $user_name_filter . $portal_filter;
+	if ($from_cache) {
+        $key_name = $add_blank.$status.$user_id.$use_real_name.$user_name_filter.$portal_filter;
 		$user_array = get_register_value('user_array', $key_name);
     }
 
-	if(empty($user_array)) {
+	if (empty($user_array)) {
 		$db = DBManagerFactory::getInstance();
 		$temp_result = Array();
 		// Including deleted users for now.
@@ -643,7 +643,7 @@ 
 		}
         /* BEGIN - SECURITY GROUPS */
         global $current_user, $sugar_config;
-        if(!is_admin($current_user)
+        if (!is_admin($current_user)
             && isset($sugar_config['securitysuite_filter_user_list'])
             && $sugar_config['securitysuite_filter_user_list'] == true
             && (empty($_REQUEST['module']) || $_REQUEST['module'] != 'Home')
@@ -664,21 +664,21 @@ 
 		}
 
         //get the user preference for name formatting, to be used in order by
-        $order_by_string =' user_name ASC ';
-        if(!empty($current_user) && !empty($current_user->id))
+        $order_by_string = ' user_name ASC ';
+        if (!empty($current_user) && !empty($current_user->id))
         {
             $formatString = $current_user->getPreference('default_locale_name_format');
 
             //create the order by string based on position of first and last name in format string
-            $order_by_string =' user_name ASC ';
-            $firstNamePos = strpos( $formatString, 'f');
-            $lastNamePos = strpos( $formatString, 'l');
-            if($firstNamePos !== false || $lastNamePos !== false){
+            $order_by_string = ' user_name ASC ';
+            $firstNamePos = strpos($formatString, 'f');
+            $lastNamePos = strpos($formatString, 'l');
+            if ($firstNamePos !== false || $lastNamePos !== false) {
                 //its possible for first name to be skipped, check for this
-                if($firstNamePos===false){
-                    $order_by_string =  'last_name ASC';
-                }else{
-                    $order_by_string =  ($lastNamePos < $firstNamePos) ? "last_name, first_name ASC" : "first_name, last_name ASC";
+                if ($firstNamePos === false) {
+                    $order_by_string = 'last_name ASC';
+                } else {
+                    $order_by_string = ($lastNamePos < $firstNamePos) ? "last_name, first_name ASC" : "first_name, last_name ASC";
                 }
             }
         }
@@ -687,16 +687,16 @@ 
 		$GLOBALS['log']->debug("get_user_array query: $query");
 		$result = $db->query($query, true, "Error filling in user array: ");
 
-		if ($add_blank==true) {
+		if ($add_blank == true) {
 			// Add in a blank row
 			$temp_result[''] = '';
 		}
 
 		// Get the id and the name.
-		while($row = $db->fetchByAssoc($result)) {
-			if($use_real_name == true || showFullName()) {
-				if(isset($row['last_name'])) { // cn: we will ALWAYS have both first_name and last_name (empty value if blank in db)
-					$temp_result[$row['id']] = $locale->getLocaleFormattedName($row['first_name'],$row['last_name']);
+		while ($row = $db->fetchByAssoc($result)) {
+			if ($use_real_name == true || showFullName()) {
+				if (isset($row['last_name'])) { // cn: we will ALWAYS have both first_name and last_name (empty value if blank in db)
+					$temp_result[$row['id']] = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
 				} else {
 					$temp_result[$row['id']] = $row['user_name'];
 				}
@@ -706,7 +706,7 @@ 
 		}
 
 		$user_array = $temp_result;
-		if($from_cache)
+		if ($from_cache)
         {
 			set_register_value('user_array', $key_name, $temp_result);
         }
@@ -746,7 +746,7 @@ 
             $inClauses[] = "(first_name LIKE '{$arg}%' OR last_name LIKE '{$arg}%')";
         }
 
-        $inClause = '(' . implode('OR ', $inClauses) . ')';
+        $inClause = '('.implode('OR ', $inClauses).')';
 
     } else {
         $args = $db->quote($args);
@@ -754,14 +754,14 @@ 
     }
     // ~jmorais@dri
 
-	$query  = "SELECT id, first_name, last_name, user_name FROM users WHERE status='Active' AND deleted=0 AND ";
-	if ( $hide_portal_users ) {
+	$query = "SELECT id, first_name, last_name, user_name FROM users WHERE status='Active' AND deleted=0 AND ";
+	if ($hide_portal_users) {
 	    $query .= " portal_only=0 AND ";
 	}
 	$query .= $inClause;
     /* BEGIN - SECURITY GROUPS */
     global $current_user, $sugar_config;
-    if(!is_admin($current_user)
+    if (!is_admin($current_user)
         && isset($sugar_config['securitysuite_filter_user_list'])
         && $sugar_config['securitysuite_filter_user_list'] == true
     ) {
@@ -775,7 +775,7 @@ 
 
 	$r = $db->query($query);
 	$ret = array();
-	while($a = $db->fetchByAssoc($r)) {
+	while ($a = $db->fetchByAssoc($r)) {
 		$ret[$a['id']] = $locale->getLocaleFormattedName($a['first_name'], $a['last_name']);
 	}
 
@@ -795,7 +795,7 @@ 
 		$sysPref = !empty($sugar_config['use_real_names']);
 		$userPref = (is_object($current_user)) ? $current_user->getPreference('use_real_names') : null;
 
-		if($userPref != null) {
+		if ($userPref != null) {
 			$showFullName = ($userPref == 'on');
 		} else {
 			$showFullName = $sysPref;
@@ -853,7 +853,7 @@ 
 
 	// Check for cached value
 	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
+	if (!empty($cache_entry))
 	{
 		return $cache_entry;
 	}
@@ -872,17 +872,17 @@ 
 
 	$app_list_strings_array = array();
 
-	foreach ( $langs as $lang ) {
+	foreach ($langs as $lang) {
 	    $app_list_strings = array();
-	    if(file_exists("include/language/$lang.lang.php")) {
+	    if (file_exists("include/language/$lang.lang.php")) {
             include("include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found language file: $lang.lang.php");
         }
-        if(file_exists("include/language/$lang.lang.override.php")) {
+        if (file_exists("include/language/$lang.lang.override.php")) {
             include("include/language/$lang.lang.override.php");
             $GLOBALS['log']->info("Found override language file: $lang.lang.override.php");
         }
-        if(file_exists("include/language/$lang.lang.php.override")) {
+        if (file_exists("include/language/$lang.lang.php.override")) {
             include("include/language/$lang.lang.php.override");
             $GLOBALS['log']->info("Found override language file: $lang.lang.php.override");
         }
@@ -891,22 +891,22 @@ 
     }
 
     $app_list_strings = array();
-    foreach ( $app_list_strings_array as $app_list_strings_item ) {
+    foreach ($app_list_strings_array as $app_list_strings_item) {
         $app_list_strings = sugarLangArrayMerge($app_list_strings, $app_list_strings_item);
     }
 
-    foreach ( $langs as $lang ) {
-        if(file_exists("custom/application/Ext/Language/$lang.lang.ext.php")) {
-            $app_list_strings = _mergeCustomAppListStrings("custom/application/Ext/Language/$lang.lang.ext.php" , $app_list_strings);
+    foreach ($langs as $lang) {
+        if (file_exists("custom/application/Ext/Language/$lang.lang.ext.php")) {
+            $app_list_strings = _mergeCustomAppListStrings("custom/application/Ext/Language/$lang.lang.ext.php", $app_list_strings);
             $GLOBALS['log']->info("Found extended language file: $lang.lang.ext.php");
         }
-        if(file_exists("custom/include/language/$lang.lang.php")) {
+        if (file_exists("custom/include/language/$lang.lang.php")) {
             include("custom/include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found custom language file: $lang.lang.php");
         }
     }
 
-	if(!isset($app_list_strings)) {
+	if (!isset($app_list_strings)) {
 		$GLOBALS['log']->fatal("Unable to load the application language file for the selected language ($language) or the default language ($default_language) or the en_us language");
 		return null;
 	}
@@ -927,14 +927,14 @@ 
  * @return array
  */
  //jchi 25347
-function _mergeCustomAppListStrings($file , $app_list_strings){
+function _mergeCustomAppListStrings($file, $app_list_strings) {
 	$app_list_strings_original = $app_list_strings;
 	unset($app_list_strings);
         // FG - bug 45525 - $exemptDropdown array is defined (once) here, not inside the foreach
         //                  This way, language file can add items to save specific standard codelist from being overwritten
         $exemptDropdowns = array();
 	include($file);
-	if(!isset($app_list_strings) || !is_array($app_list_strings)){
+	if (!isset($app_list_strings) || !is_array($app_list_strings)) {
 		return $app_list_strings_original;
 	}
 	//Bug 25347: We should not merge custom dropdown fields unless they relate to parent fields or the module list.
@@ -944,14 +944,14 @@ 
 	$exemptDropdowns[] = "moduleListSingular";
         $exemptDropdowns = array_merge($exemptDropdowns, getTypeDisplayList());
 
-	foreach($app_list_strings as $key=>$value)
+	foreach ($app_list_strings as $key=>$value)
 	{
 		if (!in_array($key, $exemptDropdowns) && array_key_exists($key, $app_list_strings_original))
 		{
 	   		unset($app_list_strings_original["$key"]);
 		}
    }
-   $app_list_strings = sugarArrayMergeRecursive($app_list_strings_original , $app_list_strings);
+   $app_list_strings = sugarArrayMergeRecursive($app_list_strings_original, $app_list_strings);
    return $app_list_strings;
 }
 
@@ -969,7 +969,7 @@ 
 
 	// Check for cached value
 	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
+	if (!empty($cache_entry))
 	{
 		return $cache_entry;
 	}
@@ -989,25 +989,25 @@ 
 
 	$app_strings_array = array();
 
-	foreach ( $langs as $lang ) {
+	foreach ($langs as $lang) {
 	    $app_strings = array();
-	    if(file_exists("include/language/$lang.lang.php")) {
+	    if (file_exists("include/language/$lang.lang.php")) {
             include("include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found language file: $lang.lang.php");
         }
-        if(file_exists("include/language/$lang.lang.override.php")) {
+        if (file_exists("include/language/$lang.lang.override.php")) {
             include("include/language/$lang.lang.override.php");
             $GLOBALS['log']->info("Found override language file: $lang.lang.override.php");
         }
-        if(file_exists("include/language/$lang.lang.php.override")) {
+        if (file_exists("include/language/$lang.lang.php.override")) {
             include("include/language/$lang.lang.php.override");
             $GLOBALS['log']->info("Found override language file: $lang.lang.php.override");
         }
-        if(file_exists("custom/application/Ext/Language/$lang.lang.ext.php")) {
+        if (file_exists("custom/application/Ext/Language/$lang.lang.ext.php")) {
             include("custom/application/Ext/Language/$lang.lang.ext.php");
             $GLOBALS['log']->info("Found extended language file: $lang.lang.ext.php");
         }
-        if(file_exists("custom/include/language/$lang.lang.php")) {
+        if (file_exists("custom/include/language/$lang.lang.php")) {
             include("custom/include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found custom language file: $lang.lang.php");
         }
@@ -1015,23 +1015,23 @@ 
 	}
 
 	$app_strings = array();
-    foreach ( $app_strings_array as $app_strings_item ) {
+    foreach ($app_strings_array as $app_strings_item) {
         $app_strings = sugarLangArrayMerge($app_strings, $app_strings_item);
     }
 
-	if(!isset($app_strings)) {
+	if (!isset($app_strings)) {
 		$GLOBALS['log']->fatal("Unable to load the application language strings");
 		return null;
 	}
 
 	// If we are in debug mode for translating, turn on the prefix now!
-    if(!empty($sugar_config['translation_string_prefix']))
+    if (!empty($sugar_config['translation_string_prefix']))
     {
-		foreach($app_strings as $entry_key=>$entry_value) {
+		foreach ($app_strings as $entry_key=>$entry_value) {
 			$app_strings[$entry_key] = $language.' '.$entry_value;
 		}
 	}
-	if(isset($_SESSION['show_deleted'])) {
+	if (isset($_SESSION['show_deleted'])) {
 		$app_strings['LBL_DELETE_BUTTON'] = $app_strings['LBL_UNDELETE_BUTTON'];
 		$app_strings['LBL_DELETE_BUTTON_LABEL'] = $app_strings['LBL_UNDELETE_BUTTON_LABEL'];
 		$app_strings['LBL_DELETE_BUTTON_TITLE'] = $app_strings['LBL_UNDELETE_BUTTON_TITLE'];
@@ -1056,7 +1056,7 @@ 
  * @param bool $refresh optional, true if you want to rebuild the language strings
  * @return array lang strings
  */
-function return_module_language($language, $module, $refresh=false)
+function return_module_language($language, $module, $refresh = false)
 {
 	global $mod_strings;
 	global $sugar_config;
@@ -1064,17 +1064,17 @@ 
 
 	// Jenny - Bug 8119: Need to check if $module is not empty
 	if (empty($module)) {
-		$stack  = debug_backtrace();
-		$GLOBALS['log']->warn("Variable module is not in return_module_language ". var_export($stack, true));
+		$stack = debug_backtrace();
+		$GLOBALS['log']->warn("Variable module is not in return_module_language ".var_export($stack, true));
 		return array();
 	}
 
-    if( !$refresh )
+    if (!$refresh)
     {
         $cache_key = LanguageManager::getLanguageCacheKey($module, $language);
         // Check for cached value
         $cache_entry = sugar_cache_retrieve($cache_key);
-        if(!empty($cache_entry) && is_array($cache_entry))
+        if (!empty($cache_entry) && is_array($cache_entry))
         {
             return $cache_entry;
         }
@@ -1085,43 +1085,43 @@ 
 	$language_used = $language;
 	$default_language = $sugar_config['default_language'];
 
-	if(empty($language)) {
+	if (empty($language)) {
 		$language = $default_language;
 	}
 
 	// Bug 21559 - So we can get all the strings defined in the template, refresh
 	// the vardefs file if the cached language file doesn't exist.
-    if(!file_exists(sugar_cached('modules/'). $module . '/language/'.$language.'.lang.php')
-			&& !empty($GLOBALS['beanList'][$module])){
+    if (!file_exists(sugar_cached('modules/').$module.'/language/'.$language.'.lang.php')
+			&& !empty($GLOBALS['beanList'][$module])) {
 		$object = BeanFactory::getObjectName($module);
-		VardefManager::refreshVardefs($module,$object);
+		VardefManager::refreshVardefs($module, $object);
 	}
 
-	$loaded_mod_strings = LanguageManager::loadModuleLanguage($module, $language,$refresh);
+	$loaded_mod_strings = LanguageManager::loadModuleLanguage($module, $language, $refresh);
 
 	// cn: bug 6048 - merge en_us with requested language
-	if($language != $sugar_config['default_language'])
+	if ($language != $sugar_config['default_language'])
         $loaded_mod_strings = sugarLangArrayMerge(
-            LanguageManager::loadModuleLanguage($module, $sugar_config['default_language'],$refresh),
+            LanguageManager::loadModuleLanguage($module, $sugar_config['default_language'], $refresh),
                 $loaded_mod_strings
             );
 
     // Load in en_us strings by default
-    if($language != 'en_us' && $sugar_config['default_language'] != 'en_us')
+    if ($language != 'en_us' && $sugar_config['default_language'] != 'en_us')
         $loaded_mod_strings = sugarLangArrayMerge(
             LanguageManager::loadModuleLanguage($module, 'en_us', $refresh),
                 $loaded_mod_strings
             );
 
 	// If we are in debug mode for translating, turn on the prefix now!
-	if($sugar_config['translation_string_prefix']) {
-		foreach($loaded_mod_strings as $entry_key=>$entry_value) {
+	if ($sugar_config['translation_string_prefix']) {
+		foreach ($loaded_mod_strings as $entry_key=>$entry_value) {
 			$loaded_mod_strings[$entry_key] = $language_used.' '.$entry_value;
 		}
 	}
 
 	$return_value = $loaded_mod_strings;
-	if(!isset($mod_strings)){
+	if (!isset($mod_strings)) {
 		$mod_strings = $return_value;
 	}
 	else
@@ -1138,7 +1138,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  * If you are using the current language, do not call this function unless you are loading it for the first time */
-function return_mod_list_strings_language($language,$module) {
+function return_mod_list_strings_language($language, $module) {
 	global $mod_list_strings;
 	global $sugar_config;
 	global $currentModule;
@@ -1147,7 +1147,7 @@ 
 
 	// Check for cached value
 	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
+	if (!empty($cache_entry))
 	{
 		return $cache_entry;
 	}
@@ -1156,7 +1156,7 @@ 
 	$temp_mod_list_strings = $mod_list_strings;
 	$default_language = $sugar_config['default_language'];
 
-	if($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) {
+	if ($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) {
 		return $mod_list_strings;
 	}
 
@@ -1164,19 +1164,19 @@ 
 	// cn: bug 6048 - merge en_us with requested language
 	include("modules/$module/language/en_us.lang.php");
 	$en_mod_list_strings = array();
-	if($language_used != $default_language)
+	if ($language_used != $default_language)
 	$en_mod_list_strings = $mod_list_strings;
 
-	if(file_exists("modules/$module/language/$language.lang.php")) {
+	if (file_exists("modules/$module/language/$language.lang.php")) {
 		include("modules/$module/language/$language.lang.php");
 	}
 
-	if(file_exists("modules/$module/language/$language.lang.override.php")){
+	if (file_exists("modules/$module/language/$language.lang.override.php")) {
 		include("modules/$module/language/$language.lang.override.php");
 	}
 
-	if(file_exists("modules/$module/language/$language.lang.php.override")){
-		echo 'Please Change:<br>' . "modules/$module/language/$language.lang.php.override" . '<br>to<br>' . 'Please Change:<br>' . "modules/$module/language/$language.lang.override.php";
+	if (file_exists("modules/$module/language/$language.lang.php.override")) {
+		echo 'Please Change:<br>'."modules/$module/language/$language.lang.php.override".'<br>to<br>'.'Please Change:<br>'."modules/$module/language/$language.lang.override.php";
 		include("modules/$module/language/$language.lang.php.override");
 	}
 
@@ -1184,7 +1184,7 @@ 
 	$mod_list_strings = sugarLangArrayMerge($en_mod_list_strings, $mod_list_strings);
 
 	// if we still don't have a language pack, then log an error
-	if(!isset($mod_list_strings)) {
+	if (!isset($mod_list_strings)) {
 		$GLOBALS['log']->fatal("Unable to load the application list language file for the selected language($language) or the default language($default_language) for module({$module})");
 		return null;
 	}
@@ -1210,30 +1210,30 @@ 
 	$default_language = $sugar_config['default_language'];
 
 	include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php");
-	if(file_exists(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.override.php")){
+	if (file_exists(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.override.php")) {
 		include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.override.php");
 	}
-	if(file_exists(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override")){
-		echo 'Please Change:<br>' . SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override" . '<br>to<br>' . 'Please Change:<br>' . SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.override.php";
+	if (file_exists(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override")) {
+		echo 'Please Change:<br>'.SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override".'<br>to<br>'.'Please Change:<br>'.SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.override.php";
 		include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override");
 	}
-	if(!isset($theme_strings))
+	if (!isset($theme_strings))
 	{
 		$GLOBALS['log']->warn("Unable to find the theme file for language: ".$language." and theme: ".$theme);
 		require(SugarThemeRegistry::get($theme)->getFilePath()."/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
-	if(!isset($theme_strings))
+	if (!isset($theme_strings))
 	{
 		$GLOBALS['log']->fatal("Unable to load the theme($theme) language file for the selected language($language) or the default language($default_language)");
 		return null;
 	}
 
 	// If we are in debug mode for translating, turn on the prefix now!
-	if($sugar_config['translation_string_prefix'])
+	if ($sugar_config['translation_string_prefix'])
 	{
-		foreach($theme_strings as $entry_key=>$entry_value)
+		foreach ($theme_strings as $entry_key=>$entry_value)
 		{
 			$theme_strings[$entry_key] = $language_used.' '.$entry_value;
 		}
@@ -1251,7 +1251,7 @@ 
  */
 function return_session_value_or_default($varname, $default)
 {
-	if(isset($_SESSION[$varname]) && $_SESSION[$varname] != "")
+	if (isset($_SESSION[$varname]) && $_SESSION[$varname] != "")
 	{
 		return $_SESSION[$varname];
 	}
@@ -1271,12 +1271,12 @@ 
  */
 function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null)
 {
-	if($SQL_name == null)
+	if ($SQL_name == null)
 	{
 		$SQL_name = $variable_name;
 	}
 
-	if(isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "")
+	if (isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "")
 	{
 		array_push($where_clauses, "$SQL_name like '".$GLOBALS['db']->quote($_REQUEST[$variable_name])."%'");
 	}
@@ -1293,9 +1293,9 @@ 
 function generate_where_statement($where_clauses)
 {
 	$where = "";
-	foreach($where_clauses as $clause)
+	foreach ($where_clauses as $clause)
 	{
-		if($where != "")
+		if ($where != "")
 		$where .= " and ";
 		$where .= $clause;
 	}
@@ -1310,15 +1310,15 @@ 
  * @return bool False on failure
  */
 function is_guid($guid) {
-	if(strlen($guid) != 36) {
+	if (strlen($guid) != 36) {
 		return false;
 	}
 
-	if(preg_match("/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/i", $guid)) {
+	if (preg_match("/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/i", $guid)) {
 		return true;
 	}
 
-	return true;;
+	return true; ;
 }
 
 
@@ -1335,7 +1335,7 @@ 
 	$microTime = microtime();
 	list($a_dec, $a_sec) = explode(" ", $microTime);
 
-	$dec_hex = dechex($a_dec* 1000000);
+	$dec_hex = dechex($a_dec * 1000000);
 	$sec_hex = dechex($a_sec);
 
 	ensure_length($dec_hex, 5);
@@ -1361,9 +1361,9 @@ 
 function create_guid_section($characters)
 {
 	$return = "";
-	for($i=0; $i<$characters; $i++)
+	for ($i = 0; $i < $characters; $i++)
 	{
-		$return .= dechex(mt_rand(0,15));
+		$return .= dechex(mt_rand(0, 15));
 	}
 	return $return;
 }
@@ -1371,11 +1371,11 @@ 
 function ensure_length(&$string, $length)
 {
 	$strlen = strlen($string);
-	if($strlen < $length)
+	if ($strlen < $length)
 	{
-		$string = str_pad($string,$length,"0");
+		$string = str_pad($string, $length, "0");
 	}
-	else if($strlen > $length)
+	else if ($strlen > $length)
 	{
 		$string = substr($string, 0, $length);
 	}
@@ -1391,7 +1391,7 @@ 
 function displayStudioForCurrentUser()
 {
     global $current_user;
-    if ( $current_user->isAdmin() ) {
+    if ($current_user->isAdmin()) {
         return true;
     }
 
@@ -1411,7 +1411,7 @@ 
 function get_admin_modules_for_user($user) {
     $GLOBALS['log']->deprecated("get_admin_modules_for_user() is deprecated as of 6.2.2 and may disappear in the future, use Users->getDeveloperModules() instead");
 
-    if(!isset($user)){
+    if (!isset($user)) {
         $modules = array();
         return $modules;
     }
@@ -1420,14 +1420,14 @@ 
 
 }
 
- function get_workflow_admin_modules_for_user($user){
+ function get_workflow_admin_modules_for_user($user) {
     if (isset($_SESSION['get_workflow_admin_modules_for_user'])) {
         return $_SESSION['get_workflow_admin_modules_for_user'];
     }
 
     global $moduleList;
     $workflow_mod_list = array();
-    foreach($moduleList as $module){
+    foreach ($moduleList as $module) {
 		$workflow_mod_list[$module] = $module;
 	}
 
@@ -1442,18 +1442,18 @@ 
 	// End of list
 
     $workflow_admin_modules = array();
-    if(empty($user)) {
+    if (empty($user)) {
     	return $workflow_admin_modules;
     }
     $actions = ACLAction::getUserActions($user->id);
     //check for ForecastSchedule because it doesn't exist in $workflow_mod_list
-    if (isset($actions['ForecastSchedule']['module']['admin']['aclaccess']) && ($actions['ForecastSchedule']['module']['admin']['aclaccess']==ACL_ALLOW_DEV ||
-        $actions['ForecastSchedule']['module']['admin']['aclaccess']==ACL_ALLOW_ADMIN_DEV)) {
+    if (isset($actions['ForecastSchedule']['module']['admin']['aclaccess']) && ($actions['ForecastSchedule']['module']['admin']['aclaccess'] == ACL_ALLOW_DEV ||
+        $actions['ForecastSchedule']['module']['admin']['aclaccess'] == ACL_ALLOW_ADMIN_DEV)) {
         $workflow_admin_modules['Forecasts'] = 'Forecasts';
     }
     foreach ($workflow_mod_list as $key=>$val) {
-        if(!in_array($val, $workflow_admin_modules) && ($val!='iFrames' && $val!='Feeds' && $val!='Home' && $val!='Dashboard'
-            && $val!='Calendar' && $val!='Activities' && $val!='Reports') &&
+        if (!in_array($val, $workflow_admin_modules) && ($val != 'iFrames' && $val != 'Feeds' && $val != 'Home' && $val != 'Dashboard'
+            && $val != 'Calendar' && $val != 'Activities' && $val != 'Reports') &&
            ($user->isDeveloperForModule($key))) {
                 $workflow_admin_modules[$key] = $val;
         }
@@ -1464,10 +1464,10 @@ 
 
 // Check if user is admin for at least one module.
 function is_admin_for_any_module($user) {
-    if (!isset($user)){
+    if (!isset($user)) {
         return false;
     }
-    if($user->isAdmin()) {
+    if ($user->isAdmin()) {
         return true;
     }
     return false;
@@ -1475,7 +1475,7 @@ 
 
 
 // Check if user is admin for a specific module.
-function is_admin_for_module($user,$module) {
+function is_admin_for_module($user, $module) {
     if (!isset($user)) {
         return false;
     }
@@ -1493,7 +1493,7 @@ 
  * Contributor(s): ______________________________________..
  */
 function is_admin($user) {
-    if(empty($user)) {
+    if (empty($user)) {
         return false;
     }
 
@@ -1536,7 +1536,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  */
-function get_select_options ($option_list, $selected) {
+function get_select_options($option_list, $selected) {
 	return get_select_options_with_id($option_list, $selected);
 }
 
@@ -1549,7 +1549,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  */
-function get_select_options_with_id ($option_list, $selected_key) {
+function get_select_options_with_id($option_list, $selected_key) {
 	return get_select_options_with_id_separate_key($option_list, $option_list, $selected_key);
 }
 
@@ -1564,14 +1564,14 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  */
-function get_select_options_with_id_separate_key ($label_list, $key_list, $selected_key, $massupdate=false) {
+function get_select_options_with_id_separate_key($label_list, $key_list, $selected_key, $massupdate = false) {
 	global $app_strings;
 	$select_options = "";
 
 	//for setting null selection values to human readable --None--
 	$pattern = "/'0?'></";
 	$replacement = "''>".$app_strings['LBL_NONE']."<";
-    if($massupdate){
+    if ($massupdate) {
         $replacement .= "/OPTION>\n<OPTION value='__SugarMassUpdateClearField__'><"; // Giving the user the option to unset a drop down list. I.e. none means that it won't get updated
     }
 
@@ -1588,7 +1588,7 @@ 
                 $option_key == ''
                 && (($selected_key == '' && !$massupdate) || $selected_key == '__SugarMassUpdateClearField__')
             )
-            || (is_array($selected_key) &&  in_array($option_key, $selected_key))
+            || (is_array($selected_key) && in_array($option_key, $selected_key))
         ) {
 			$selected_string = 'selected ';
 		}
@@ -1622,7 +1622,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  */
-function get_clear_form_js () {
+function get_clear_form_js() {
 	$the_script = <<<EOQ
 <script type="text/javascript" language="JavaScript">
 function clear_form(form) {
@@ -1646,7 +1646,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  */
-function get_set_focus_js () {
+function get_set_focus_js() {
 	//TODO Clint 5/20 - Make this function more generic so that it can take in the target form and field names as variables
 	$the_script = <<<EOQ
 <script type="text/javascript" language="JavaScript">
@@ -1719,7 +1719,7 @@ 
  */
 function parse_calendardate($local_format) {
 	preg_match('/\(?([^-]{1})[^-]*-([^-]{1})[^-]*-([^-]{1})[^-]*\)/', $local_format, $matches);
-	$calendar_format = "%" . $matches[1] . "-%" . $matches[2] . "-%" . $matches[3];
+	$calendar_format = "%".$matches[1]."-%".$matches[2]."-%".$matches[3];
 	return str_replace(array("y", "ￄ1�7", "a", "j"), array("Y", "Y", "Y", "d"), $calendar_format);
 }
 
@@ -1727,20 +1727,20 @@ 
 
 
 
-function translate($string, $mod='', $selectedValue=''){
+function translate($string, $mod = '', $selectedValue = '') {
 	//$test_start = microtime();
 	//static $mod_strings_results = array();
-	if(!empty($mod)){
+	if (!empty($mod)) {
 		global $current_language;
 		//Bug 31275
-		if(isset($_REQUEST['login_language'])){
-		    $current_language = ($_REQUEST['login_language'] == $current_language)? $current_language : $_REQUEST['login_language'];
+		if (isset($_REQUEST['login_language'])) {
+		    $current_language = ($_REQUEST['login_language'] == $current_language) ? $current_language : $_REQUEST['login_language'];
 		}
 		$mod_strings = return_module_language($current_language, $mod);
         if ($mod == "")
-        echo "Language is <pre>" . $mod_strings . "</pre>";
+        echo "Language is <pre>".$mod_strings."</pre>";
 
-	}else{
+	} else {
 		global $mod_strings;
 	}
 
@@ -1774,13 +1774,13 @@ 
 
 
 
-	if(empty($returnValue)){
+	if (empty($returnValue)) {
 		return $string;
 	}
 
     // Bug 48996 - Custom enums with '0' value were not returning because of empty check
     // Added a numeric 0 checker to the conditional to allow 0 value indexed to pass
-	if(is_array($returnValue) && (!empty($selectedValue) || (is_numeric($selectedValue) && $selectedValue == 0))  && isset($returnValue[$selectedValue]) ){
+	if (is_array($returnValue) && (!empty($selectedValue) || (is_numeric($selectedValue) && $selectedValue == 0)) && isset($returnValue[$selectedValue])) {
 		return $returnValue[$selectedValue];
 	}
 
@@ -1792,25 +1792,25 @@ 
         static $num_grp_sep;
         global $current_user, $sugar_config;
 
-        if($dec_sep == null) {
+        if ($dec_sep == null) {
             $user_dec_sep = $current_user->getPreference('dec_sep');
             $dec_sep = (empty($user_dec_sep) ? $sugar_config['default_decimal_seperator'] : $user_dec_sep);
         }
-        if($num_grp_sep == null) {
+        if ($num_grp_sep == null) {
             $user_num_grp_sep = $current_user->getPreference('num_grp_sep');
             $num_grp_sep = (empty($user_num_grp_sep) ? $sugar_config['default_number_grouping_seperator'] : $user_num_grp_sep);
         }
 
-        $num = preg_replace("'" . preg_quote($num_grp_sep) . "'", '', $num);
-        $num = preg_replace("'" . preg_quote($dec_sep) . "'", '.', $num);
+        $num = preg_replace("'".preg_quote($num_grp_sep)."'", '', $num);
+        $num = preg_replace("'".preg_quote($dec_sep)."'", '.', $num);
         return $num;
 
 }
 
 function add_http($url) {
-	if(!preg_match("@://@i", $url)) {
+	if (!preg_match("@://@i", $url)) {
 		$scheme = "http";
-		if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+		if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
 			$scheme = 'https';
 		}
 
@@ -1864,10 +1864,10 @@ 
  * @param bool cleanImg Flag to allow <img> tags to survive - only used by InboundEmail for inline images.
  * @return array Array of matches, empty on clean string
  */
-function clean_xss($str, $cleanImg=true) {
+function clean_xss($str, $cleanImg = true) {
 	global $sugar_config;
 
-	if(empty($sugar_config['email_xss']))
+	if (empty($sugar_config['email_xss']))
 	$sugar_config['email_xss'] = getDefaultXssTags();
 
 	$xsstags = unserialize(base64_decode($sugar_config['email_xss']));
@@ -1877,32 +1877,32 @@ 
 	$jsEvents .= "onmouseup|onmouseover|onmousedown|onmouseenter|onmouseleave|onmousemove|onload|onchange|";
 	$jsEvents .= "onreset|onselect|onsubmit|onkeydown|onkeypress|onkeyup|onabort|onerror|ondragdrop";
 
-	$attribute_regex	= "#\b({$jsEvents})\s*=\s*(?|(?!['\"])\S+|['\"].+?['\"])#sim";
-	$javascript_regex	= '@<[^/>][^>]+(expression\(|j\W*a\W*v\W*a|v\W*b\W*s\W*c\W*r|&#|/\*|\*/)[^>]*>@sim';
-	$imgsrc_regex		= '#<[^>]+src[^=]*=([^>]*?http(s)?://[^>]*)>#sim';
-	$css_url			= '#url\(.*\.\w+\)#';
+	$attribute_regex = "#\b({$jsEvents})\s*=\s*(?|(?!['\"])\S+|['\"].+?['\"])#sim";
+	$javascript_regex = '@<[^/>][^>]+(expression\(|j\W*a\W*v\W*a|v\W*b\W*s\W*c\W*r|&#|/\*|\*/)[^>]*>@sim';
+	$imgsrc_regex = '#<[^>]+src[^=]*=([^>]*?http(s)?://[^>]*)>#sim';
+	$css_url = '#url\(.*\.\w+\)#';
 
 	$tagsrex = '#<\/?(\w+)((?:\s+(?:\w|\w[\w-]*\w)(?:\s*=\s*(?:\".*?\"|\'.*?\'|[^\'\">\s]+))?)+\s*|\s*)\/?>#im';
 
 	$tagmatches = array();
 	$matches = array();
 	preg_match_all($tagsrex, $str, $tagmatches, PREG_PATTERN_ORDER);
-    foreach($tagmatches[1] as $no => $tag) {
-        if(in_array($tag, $xsstags)) {
+    foreach ($tagmatches[1] as $no => $tag) {
+        if (in_array($tag, $xsstags)) {
             // dangerous tag - take out whole
             $matches[] = $tagmatches[0][$no];
             continue;
         }
         $attrmatch = array();
         preg_match_all($attribute_regex, $tagmatches[2][$no], $attrmatch, PREG_PATTERN_ORDER);
-        if(!empty($attrmatch[0])) {
+        if (!empty($attrmatch[0])) {
             $matches = array_merge($matches, $attrmatch[0]);
         }
     }
 
 	$matches = array_merge($matches, xss_check_pattern($javascript_regex, $str));
 
-	if($cleanImg) {
+	if ($cleanImg) {
 		$matches = array_merge($matches,
 		xss_check_pattern($imgsrc_regex, $str)
 		);
@@ -1911,18 +1911,18 @@ 
 	// cn: bug 13498 - custom white-list of allowed domains that vet remote images
 	preg_match_all($css_url, $str, $cssUrlMatches, PREG_PATTERN_ORDER);
 
-	if(isset($sugar_config['security_trusted_domains']) && !empty($sugar_config['security_trusted_domains']) && is_array($sugar_config['security_trusted_domains'])) {
-		if(is_array($cssUrlMatches) && count($cssUrlMatches) > 0) {
+	if (isset($sugar_config['security_trusted_domains']) && !empty($sugar_config['security_trusted_domains']) && is_array($sugar_config['security_trusted_domains'])) {
+		if (is_array($cssUrlMatches) && count($cssUrlMatches) > 0) {
 			// normalize whitelist
-			foreach($sugar_config['security_trusted_domains'] as $k => $v) {
+			foreach ($sugar_config['security_trusted_domains'] as $k => $v) {
 				$sugar_config['security_trusted_domains'][$k] = strtolower($v);
 			}
 
-			foreach($cssUrlMatches[0] as $match) {
+			foreach ($cssUrlMatches[0] as $match) {
 				$domain = strtolower(substr(strstr($match, "://"), 3));
 				$baseUrl = substr($domain, 0, strpos($domain, "/"));
 
-				if(!in_array($baseUrl, $sugar_config['security_trusted_domains'])) {
+				if (!in_array($baseUrl, $sugar_config['security_trusted_domains'])) {
 					$matches[] = $match;
 				}
 			}
@@ -1983,7 +1983,7 @@ 
 		if (isset($GLOBALS['log']) && is_object($GLOBALS['log'])) {
 			$GLOBALS['log']->fatal("SECURITY[$filter]: bad data passed in; string: {$str}");
 		}
-		if ( $dieOnBadData ) {
+		if ($dieOnBadData) {
 			die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
 		}
 		return false;
@@ -1994,7 +1994,7 @@ 
 }
 
 function clean_special_arguments() {
-	if(isset($_SERVER['PHP_SELF'])) {
+	if (isset($_SERVER['PHP_SELF'])) {
 		if (!empty($_SERVER['PHP_SELF'])) clean_string($_SERVER['PHP_SELF'], 'SAFED_GET');
 	}
 	if (!empty($_REQUEST) && !empty($_REQUEST['login_theme'])) clean_string($_REQUEST['login_theme'], "STANDARD");
@@ -2024,12 +2024,12 @@ 
  * cleans the given key in superglobals $_GET, $_POST, $_REQUEST
  */
 function clean_superglobals($key, $filter = 'STANDARD') {
-	if(isset($_GET[$key])) clean_string($_GET[$key], $filter);
-	if(isset($_POST[$key])) clean_string($_POST[$key], $filter);
-	if(isset($_REQUEST[$key])) clean_string($_REQUEST[$key], $filter);
+	if (isset($_GET[$key])) clean_string($_GET[$key], $filter);
+	if (isset($_POST[$key])) clean_string($_POST[$key], $filter);
+	if (isset($_REQUEST[$key])) clean_string($_REQUEST[$key], $filter);
 }
 
-function set_superglobals($key, $val){
+function set_superglobals($key, $val) {
 	$_GET[$key] = $val;
 	$_POST[$key] = $val;
 	$_REQUEST[$key] = $val;
@@ -2040,7 +2040,7 @@ 
 	global $sugar_config;
     global $RAW_REQUEST;
 
-    if(get_magic_quotes_gpc()) {
+    if (get_magic_quotes_gpc()) {
         // magic quotes screw up data, we'd have to clean up
         $RAW_REQUEST = array_map("cleanup_slashes", $_REQUEST);
     } else {
@@ -2059,17 +2059,17 @@ 
 	}
 
 	// PHP cannot stomp out superglobals reliably
-	foreach($post as $k => $v) { $_POST[$k] = $v; }
-	foreach($get  as $k => $v) { $_GET[$k] = $v; }
-	foreach($req  as $k => $v) {
+	foreach ($post as $k => $v) { $_POST[$k] = $v; }
+	foreach ($get  as $k => $v) { $_GET[$k] = $v; }
+	foreach ($req  as $k => $v) {
 		 $_REQUEST[$k] = $v;
 
 	    //ensure the keys are safe as well.  If mbstring encoding translation is on, the post keys don't
         //get translated, so scrub the data but don't die
-	    if(ini_get('mbstring.encoding_translation')==='1'){
-            securexsskey($k,false);
-        }else{
-		    securexsskey($k,true);
+	    if (ini_get('mbstring.encoding_translation') === '1') {
+            securexsskey($k, false);
+        } else {
+		    securexsskey($k, true);
         }
 
 	}
@@ -2088,8 +2088,8 @@ 
 	if (isset($_REQUEST['offset'])) clean_string($_REQUEST['offset']);
 	if (isset($_REQUEST['stamp'])) clean_string($_REQUEST['stamp']);
 
-	if(isset($_REQUEST['lvso'])){
-			set_superglobals('lvso', (strtolower($_REQUEST['lvso']) === 'desc')?'desc':'asc');
+	if (isset($_REQUEST['lvso'])) {
+			set_superglobals('lvso', (strtolower($_REQUEST['lvso']) === 'desc') ? 'desc' : 'asc');
 	}
 	// Clean "offset" and "order_by" parameters in URL
 	foreach ($_REQUEST as $key => $val) {
@@ -2118,27 +2118,27 @@ 
 }
 
 function securexss($value) {
-	if(is_array($value)){
+	if (is_array($value)) {
     	$new = array();
-        foreach($value as $key=>$val){
+        foreach ($value as $key=>$val) {
        		$new[$key] = securexss($val);
         }
         return $new;
     }
-	static $xss_cleanup=  array("&quot;" => "&#38;", '"' =>'&quot;', "'" =>  '&#039;' , '<' =>'&lt;' , '>'=>'&gt;');
+	static $xss_cleanup = array("&quot;" => "&#38;", '"' =>'&quot;', "'" =>  '&#039;', '<' =>'&lt;', '>'=>'&gt;');
 	$value = preg_replace(array('/javascript:/i', '/\0/'), array('java script:', ''), $value);
 	$value = preg_replace('/javascript:/i', 'java script:', $value);
 	return str_replace(array_keys($xss_cleanup), array_values($xss_cleanup), $value);
 }
 
-function securexsskey($value, $die=true){
+function securexsskey($value, $die = true) {
 	global $sugar_config;
 	$matches = array();
 	preg_match('/[\'"<>]/', $value, $matches);
-	if(!empty($matches)){
-		if($die){
+	if (!empty($matches)) {
+		if ($die) {
 			die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
-		}else{
+		} else {
 			unset($_REQUEST[$value]);
 			unset($_POST[$value]);
 			unset($_GET[$value]);
@@ -2146,15 +2146,15 @@ 
 	}
 }
 
-function preprocess_param($value){
-	if(is_string($value)){
-		if(get_magic_quotes_gpc() == 1){
+function preprocess_param($value) {
+	if (is_string($value)) {
+		if (get_magic_quotes_gpc() == 1) {
 			$value = stripslashes($value);
 		}
 
 		$value = securexss($value);
 	}
-	else if (is_array($value)){
+	else if (is_array($value)) {
 	    foreach ($value as $key => $element) {
 	        $value[$key] = preprocess_param($element);
 	    }
@@ -2165,40 +2165,40 @@ 
 
 function cleanup_slashes($value)
 {
-    if(is_string($value)) return stripslashes($value);
+    if (is_string($value)) return stripslashes($value);
     return $value;
 }
 
 
-function set_register_value($category, $name, $value){
+function set_register_value($category, $name, $value) {
     return sugar_cache_put("{$category}:{$name}", $value);
 }
 
-function get_register_value($category,$name){
+function get_register_value($category, $name) {
     return sugar_cache_retrieve("{$category}:{$name}");
 }
 
-function clear_register_value($category,$name){
+function clear_register_value($category, $name) {
     return sugar_cache_clear("{$category}:{$name}");
 }
 // this function cleans id's when being imported
 function convert_id($string)
 {
-	return preg_replace_callback( '|[^A-Za-z0-9\-]|',
+	return preg_replace_callback('|[^A-Za-z0-9\-]|',
 	create_function(
 	// single quotes are essential here,
 	// or alternative escape all $ as \$
 	'$matches',
 	'return ord($matches[0]);'
-         ) ,$string);
+         ), $string);
 }
 
 /**
  * @deprecated use SugarTheme::getImage()
  */
-function get_image($image,$other_attributes,$width="",$height="",$ext='.gif',$alt="")
+function get_image($image, $other_attributes, $width = "", $height = "", $ext = '.gif', $alt = "")
 {
-    return SugarThemeRegistry::current()->getImage(basename($image), $other_attributes, empty($width) ? null : $width, empty($height) ? null : $height, $ext, $alt );
+    return SugarThemeRegistry::current()->getImage(basename($image), $other_attributes, empty($width) ? null : $width, empty($height) ? null : $height, $ext, $alt);
 }
 /**
  * @deprecated use SugarTheme::getImageURL()
@@ -2208,54 +2208,54 @@ 
     return SugarThemeRegistry::current()->getImageURL($image_name);
 }
 
-function getWebPath($relative_path){
+function getWebPath($relative_path) {
 	//if it has  a :// then it isn't a relative path
-	if(substr_count($relative_path, '://') > 0) return $relative_path;
-	if(defined('TEMPLATE_URL'))$relative_path = SugarTemplateUtilities::getWebPath($relative_path);
+	if (substr_count($relative_path, '://') > 0) return $relative_path;
+	if (defined('TEMPLATE_URL'))$relative_path = SugarTemplateUtilities::getWebPath($relative_path);
 	return $relative_path;
 }
 
-function getVersionedPath($path, $additional_attrs='')
+function getVersionedPath($path, $additional_attrs = '')
 {
-	if(empty($GLOBALS['sugar_config']['js_custom_version'])) $GLOBALS['sugar_config']['js_custom_version'] = 1;
-	$js_version_key = isset($GLOBALS['js_version_key'])?$GLOBALS['js_version_key']:'';
-	if(inDeveloperMode()) {
+	if (empty($GLOBALS['sugar_config']['js_custom_version'])) $GLOBALS['sugar_config']['js_custom_version'] = 1;
+	$js_version_key = isset($GLOBALS['js_version_key']) ? $GLOBALS['js_version_key'] : '';
+	if (inDeveloperMode()) {
 	    static $rand;
-	    if(empty($rand)) $rand = mt_rand();
+	    if (empty($rand)) $rand = mt_rand();
 	    $dev = $rand;
 	} else {
 	    $dev = '';
 	}
-	if(is_array($additional_attrs)) {
-	    $additional_attrs = join("|",$additional_attrs);
+	if (is_array($additional_attrs)) {
+	    $additional_attrs = join("|", $additional_attrs);
 	}
 	// cutting 2 last chars here because since md5 is 32 chars, it's always ==
 	$str = substr(base64_encode(md5("$js_version_key|{$GLOBALS['sugar_config']['js_custom_version']}|$dev|$additional_attrs", true)), 0, -2);
 	// remove / - it confuses some parsers
 	$str = strtr($str, '/+', '-_');
-	if(empty($path)) return $str;
+	if (empty($path)) return $str;
 
-	return $path . "?v=$str";
+	return $path."?v=$str";
 }
 
-function getVersionedScript($path, $additional_attrs='')
+function getVersionedScript($path, $additional_attrs = '')
 {
     return '<script type="text/javascript" src="'.getVersionedPath($path, $additional_attrs).'"></script>';
 }
 
-function getJSPath($relative_path, $additional_attrs='')
+function getJSPath($relative_path, $additional_attrs = '')
 {
-	if(defined('TEMPLATE_URL'))$relative_path = SugarTemplateUtilities::getWebPath($relative_path);
-	return getVersionedPath($relative_path).(!empty($additional_attrs)?"&$additional_attrs":"");
+	if (defined('TEMPLATE_URL'))$relative_path = SugarTemplateUtilities::getWebPath($relative_path);
+	return getVersionedPath($relative_path).(!empty($additional_attrs) ? "&$additional_attrs" : "");
 }
 
-function getSWFPath($relative_path, $additional_params=''){
+function getSWFPath($relative_path, $additional_params = '') {
 	$path = $relative_path;
-	if (!empty($additional_params)){
-		$path .= '?' . $additional_params;
+	if (!empty($additional_params)) {
+		$path .= '?'.$additional_params;
 	}
-	if (defined('TEMPLATE_URL')){
-		$path = TEMPLATE_URL . '/' . $path;
+	if (defined('TEMPLATE_URL')) {
+		$path = TEMPLATE_URL.'/'.$path;
 	}
 	return $path;
 }
@@ -2266,25 +2266,25 @@ 
 
 function getSQLDate($date_str)
 {
-	if (preg_match('/^(\d{1,2})-(\d{1,2})-(\d{4})$/',$date_str,$match))
+	if (preg_match('/^(\d{1,2})-(\d{1,2})-(\d{4})$/', $date_str, $match))
 	{
-		if ( strlen($match[2]) == 1)
+		if (strlen($match[2]) == 1)
 		{
 			$match[2] = "0".$match[2];
 		}
-		if ( strlen($match[1]) == 1)
+		if (strlen($match[1]) == 1)
 		{
 			$match[1] = "0".$match[1];
 		}
 		return "{$match[3]}-{$match[1]}-{$match[2]}";
 	}
-	else if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/',$date_str,$match))
+	else if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/', $date_str, $match))
 	{
-		if ( strlen($match[2]) == 1)
+		if (strlen($match[2]) == 1)
 		{
 			$match[2] = "0".$match[2];
 		}
-		if ( strlen($match[1]) == 1)
+		if (strlen($match[1]) == 1)
 		{
 			$match[1] = "0".$match[1];
 		}
@@ -2296,15 +2296,15 @@ 
 	}
 }
 
-function clone_history(&$db, $from_id,$to_id, $to_type)
+function clone_history(&$db, $from_id, $to_id, $to_type)
 {
 	global $timedate;
-	$old_note_id=null;
-	$old_filename=null;
+	$old_note_id = null;
+	$old_filename = null;
 	require_once('include/upload_file.php');
 	$tables = array('calls'=>'Call', 'meetings'=>'Meeting', 'notes'=>'Note', 'tasks'=>'Task');
 
-	$location=array('Email'=>"modules/Emails/Email.php",
+	$location = array('Email'=>"modules/Emails/Email.php",
 	'Call'=>"modules/Calls/Call.php",
 	'Meeting'=>"modules/Meetings/Meeting.php",
 	'Note'=>"modules/Notes/Note.php",
@@ -2312,7 +2312,7 @@ 
 	);
 
 
-	foreach($tables as $table=>$bean_class)
+	foreach ($tables as $table=>$bean_class)
 	{
 
 		if (!class_exists($bean_class))
@@ -2320,48 +2320,48 @@ 
 			require_once($location[$bean_class]);
 		}
 
-		$bProcessingNotes=false;
-		if ($table=='notes')
+		$bProcessingNotes = false;
+		if ($table == 'notes')
 		{
-			$bProcessingNotes=true;
+			$bProcessingNotes = true;
 		}
 		$query = "SELECT id FROM $table WHERE parent_id='$from_id'";
 		$results = $db->query($query);
-		while($row = $db->fetchByAssoc($results))
+		while ($row = $db->fetchByAssoc($results))
 		{
 			//retrieve existing record.
-			$bean= new $bean_class();
+			$bean = new $bean_class();
 			$bean->retrieve($row['id']);
 			//process for new instance.
 			if ($bProcessingNotes)
 			{
-				$old_note_id=$row['id'];
-				$old_filename=$bean->filename;
+				$old_note_id = $row['id'];
+				$old_filename = $bean->filename;
 			}
-			$bean->id=null;
-			$bean->parent_id=$to_id;
-			$bean->parent_type=$to_type;
-			if ($to_type=='Contacts' and in_array('contact_id',$bean->column_fields))
+			$bean->id = null;
+			$bean->parent_id = $to_id;
+			$bean->parent_type = $to_type;
+			if ($to_type == 'Contacts' and in_array('contact_id', $bean->column_fields))
 			{
-				$bean->contact_id=$to_id;
+				$bean->contact_id = $to_id;
 			}
 			$bean->update_date_modified = false;
             $bean->update_modified_by = false;
-            if(isset($bean->date_modified))
+            if (isset($bean->date_modified))
                 $bean->date_modified = $timedate->to_db($bean->date_modified);
-            if(isset($bean->date_entered))
+            if (isset($bean->date_entered))
                 $bean->date_entered = $timedate->to_db($bean->date_entered);
 			//save
-			$new_id=$bean->save();
+			$new_id = $bean->save();
 
 			//duplicate the file now. for notes.
 			if ($bProcessingNotes && !empty($old_filename))
 			{
-				UploadFile::duplicate_file($old_note_id,$new_id,$old_filename);
+				UploadFile::duplicate_file($old_note_id, $new_id, $old_filename);
 			}
 			//reset the values needed for attachment duplication.
-			$old_note_id=null;
-			$old_filename=null;
+			$old_note_id = null;
+			$old_filename = null;
 		}
 	}
 }
@@ -2369,11 +2369,11 @@ 
 function values_to_keys($array)
 {
 	$new_array = array();
-	if(!is_array($array))
+	if (!is_array($array))
 	{
 		return $new_array;
 	}
-	foreach($array as $arr){
+	foreach ($array as $arr) {
 		$new_array[$arr] = $arr;
 	}
 	return $new_array;
@@ -2381,7 +2381,7 @@ 
 
 function clone_relationship(&$db, $tables = array(), $from_column, $from_id, $to_id)
 {
-	foreach($tables as $table)
+	foreach ($tables as $table)
 	{
 
 		if ($table == 'emails_beans') {
@@ -2390,27 +2390,27 @@ 
 			$query = "SELECT * FROM $table WHERE $from_column='$from_id'";
 		}
 		$results = $db->query($query);
-		while($row = $db->fetchByAssoc($results))
+		while ($row = $db->fetchByAssoc($results))
 		{
 			$query = "INSERT INTO $table ";
 			$names = '';
 			$values = '';
 			$row[$from_column] = $to_id;
 			$row['id'] = create_guid();
-			if ($table=='emails_beans') {
-				$row['bean_module'] =='Contacts';
+			if ($table == 'emails_beans') {
+				$row['bean_module'] == 'Contacts';
 			}
 
-			foreach($row as $name=>$value)
+			foreach ($row as $name=>$value)
 			{
 
-				if(empty($names))
+				if (empty($names))
 				{
 					$names .= $name;
 					$values .= "'$value'";
 				} else
 				{
-					$names .= ', '. $name;
+					$names .= ', '.$name;
 					$values .= ", '$value'";
 				}
 			}
@@ -2423,9 +2423,9 @@ 
 function get_unlinked_email_query($type, $bean) {
     global $current_user;
 
-    $return_array['select']='SELECT emails.id ';
-    $return_array['from']='FROM emails ';
-    $return_array['where']="";
+    $return_array['select'] = 'SELECT emails.id ';
+    $return_array['from'] = 'FROM emails ';
+    $return_array['where'] = "";
 	$return_array['join'] = " JOIN (select DISTINCT email_id from emails_email_addr_rel eear
 
 	join email_addr_bean_rel eabr on eabr.bean_id ='$bean->id' and eabr.bean_module = '$bean->module_dir' and
@@ -2439,17 +2439,17 @@ 
 		return $return_array;
 	}
 
-	return $return_array['select'] . $return_array['from'] . $return_array['where'] . $return_array['join'] ;
+	return $return_array['select'].$return_array['from'].$return_array['where'].$return_array['join'];
 } // fn
 
 function get_emails_by_assign_or_link($params)
 {
     $relation = $params['link'];
 	$bean = $GLOBALS['app']->controller->bean;
-    if(empty($bean->$relation)) {
+    if (empty($bean->$relation)) {
         $bean->load_relationship($relation);
     }
-    if(empty($bean->$relation)) {
+    if (empty($bean->$relation)) {
         $GLOBALS['log']->error("Bad relation '$relation' for bean '{$bean->object_name}' id '{$bean->id}'");
         return array();
     }
@@ -2459,7 +2459,7 @@ 
     	'join_table_link_alias' => 'linkt',
     ));
     $rel_join = str_replace("{$bean->table_name}.id", "'{$bean->id}'", $rel_join);
-    $return_array['select']='SELECT DISTINCT emails.id ';
+    $return_array['select'] = 'SELECT DISTINCT emails.id ';
     $return_array['from'] = "FROM emails ";
 
     $return_array['join'] = array();
@@ -2531,15 +2531,15 @@ 
         ";
     }
 
-    $return_array['join'] = " INNER JOIN (" . implode(" UNION ", $return_array['join']). ") email_ids ON emails.id=email_ids.email_id ";
+    $return_array['join'] = " INNER JOIN (".implode(" UNION ", $return_array['join']).") email_ids ON emails.id=email_ids.email_id ";
 
-    $return_array['where']=" WHERE emails.deleted=0 ";
+    $return_array['where'] = " WHERE emails.deleted=0 ";
 
     	//$return_array['join'] = '';
         $return_array['join_tables'][0] = '';
 
-        if($bean->object_name == "Case" && !empty($bean->case_number)) {
-            $where = str_replace("%1", $bean->case_number, 	$bean->getEmailSubjectMacro());
+        if ($bean->object_name == "Case" && !empty($bean->case_number)) {
+            $where = str_replace("%1", $bean->case_number, $bean->getEmailSubjectMacro());
     	    $return_array["where"] .= "\n AND (email_ids.source = 'direct' OR emails.name LIKE '%$where%')";
         }
 
@@ -2556,16 +2556,16 @@ 
 	return empty($value) && $value != '0';
 }
 
-function get_bean_select_array($add_blank=true, $bean_name, $display_columns, $where='', $order_by='', $blank_is_none=false)
+function get_bean_select_array($add_blank = true, $bean_name, $display_columns, $where = '', $order_by = '', $blank_is_none = false)
 {
 	global $beanFiles;
 	require_once($beanFiles[$bean_name]);
 	$focus = new $bean_name();
 	$user_array = array();
 
-    $key = ($bean_name == 'EmailTemplate') ?  $bean_name : $bean_name . $display_columns. $where . $order_by;
-	$user_array = get_register_value('select_array', $key );
-	if(!$user_array)
+    $key = ($bean_name == 'EmailTemplate') ? $bean_name : $bean_name.$display_columns.$where.$order_by;
+	$user_array = get_register_value('select_array', $key);
+	if (!$user_array)
 	{
 
 		$db = DBManagerFactory::getInstance();
@@ -2573,16 +2573,16 @@ 
 		$temp_result = Array();
 		$query = "SELECT {$focus->table_name}.id, {$display_columns} as display from {$focus->table_name} ";
 		$query .= "where ";
-		if ( $where != '')
+		if ($where != '')
 		{
 			$query .= $where." AND ";
 		}
 
-		$query .=  " {$focus->table_name}.deleted=0";
+		$query .= " {$focus->table_name}.deleted=0";
 
         /* BEGIN - SECURITY GROUPS */
         global $current_user, $sugar_config;
-        if($focus->module_dir == 'Users' && !is_admin($current_user)
+        if ($focus->module_dir == 'Users' && !is_admin($current_user)
                 && isset($sugar_config['securitysuite_filter_user_list'])
                 && $sugar_config['securitysuite_filter_user_list'] == true
         ) {
@@ -2590,20 +2590,20 @@ 
             $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
             $query .= " AND (".$group_where.") ";
         } else
-        if($focus->bean_implements('ACL') && ACLController::requireSecurityGroup($focus->module_dir, 'list') )
+        if ($focus->bean_implements('ACL') && ACLController::requireSecurityGroup($focus->module_dir, 'list'))
         {
             require_once('modules/SecurityGroups/SecurityGroup.php');
             $owner_where = $focus->getOwnerWhere($current_user->id);
-            $group_where = SecurityGroup::getGroupWhere($focus->table_name,$focus->module_dir,$current_user->id);
-            if(!empty($owner_where)){
-                $query .= " AND (".  $owner_where." or ".$group_where.") ";
+            $group_where = SecurityGroup::getGroupWhere($focus->table_name, $focus->module_dir, $current_user->id);
+            if (!empty($owner_where)) {
+                $query .= " AND (".$owner_where." or ".$group_where.") ";
             } else {
-                $query .= ' AND '.  $group_where;
+                $query .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
 
-		if ( $order_by != '')
+		if ($order_by != '')
 		{
 			$query .= " order by {$focus->table_name}.{$order_by}";
 		}
@@ -2611,9 +2611,9 @@ 
 		$GLOBALS['log']->debug("get_user_array query: $query");
 		$result = $db->query($query, true, "Error filling in user array: ");
 
-		if ($add_blank==true){
+		if ($add_blank == true) {
 			// Add in a blank row
-			if($blank_is_none == true) { // set 'blank row' to "--None--"
+			if ($blank_is_none == true) { // set 'blank row' to "--None--"
 				global $app_strings;
 				$temp_result[''] = $app_strings['LBL_NONE'];
 			} else {
@@ -2622,13 +2622,13 @@ 
 		}
 
 		// Get the id and the name.
-		while($row = $db->fetchByAssoc($result))
+		while ($row = $db->fetchByAssoc($result))
 		{
 			$temp_result[$row['id']] = $row['display'];
 		}
 
 		$user_array = $temp_result;
-		set_register_value('select_array', $key ,$temp_result);
+		set_register_value('select_array', $key, $temp_result);
 	}
 
 	return $user_array;
@@ -2646,21 +2646,21 @@ 
 	global $modListHeader;
 	$returnArray = array();
 
-	foreach($listArray as $optionName => $optionVal)
+	foreach ($listArray as $optionName => $optionVal)
 	{
-		if(array_key_exists($optionName, $modListHeader))
+		if (array_key_exists($optionName, $modListHeader))
 		{
 			$returnArray[$optionName] = $optionVal;
 		}
 
 		// special case for projects
-		if(array_key_exists('Project', $modListHeader))
+		if (array_key_exists('Project', $modListHeader))
 		{
 			$returnArray['ProjectTask'] = $listArray['ProjectTask'];
 		}
 	}
-	$acldenied = ACLController::disabledModuleList($listArray,false);
-	foreach($acldenied as $denied){
+	$acldenied = ACLController::disabledModuleList($listArray, false);
+	foreach ($acldenied as $denied) {
 		unset($returnArray[$denied]);
 	}
 	asort($returnArray);
@@ -2668,21 +2668,21 @@ 
 	return $returnArray;
 }
 
-function display_notice($msg = false){
+function display_notice($msg = false) {
 	global $error_notice;
 	//no error notice - lets just display the error to the user
-	if(!isset($error_notice)){
-		echo '<br>'.$msg . '<br>';
-	}else{
-		$error_notice .= $msg . '<br>';
+	if (!isset($error_notice)) {
+		echo '<br>'.$msg.'<br>';
+	} else {
+		$error_notice .= $msg.'<br>';
 	}
 }
 
 /* checks if it is a number that at least has the plus at the beginning.
  */
-function skype_formatted($number){
+function skype_formatted($number) {
 	//kbrill - BUG #15375
-	if(isset($_REQUEST['action']) && $_REQUEST['action']=="Popup") {
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == "Popup") {
 		return false;
 	} else {
 		return substr($number, 0, 1) == '+' || substr($number, 0, 2) == '00' || substr($number, 0, 3) == '011';
@@ -2691,7 +2691,7 @@ 
 }
 
 function format_skype($number) {
-    return preg_replace('/[^\+0-9]/','',$number);
+    return preg_replace('/[^\+0-9]/', '', $number);
 }
 
 function insert_charset_header() {
@@ -2701,23 +2701,23 @@ 
 function getCurrentURL()
 {
 	$href = "http:";
-	if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
+	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
 	{
 		$href = 'https:';
 	}
 
-	$href.= "//".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];
+	$href .= "//".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];
 	return $href;
 }
 
 function javascript_escape($str) {
 	$new_str = '';
 
-	for($i = 0; $i < strlen($str); $i++) {
+	for ($i = 0; $i < strlen($str); $i++) {
 
-		if(ord(substr($str, $i, 1))==10){
+		if (ord(substr($str, $i, 1)) == 10) {
 			$new_str .= '\n';
-		}elseif(ord(substr($str, $i, 1))==13){
+		}elseif (ord(substr($str, $i, 1)) == 13) {
 			$new_str .= '\r';
 		}
 		else {
@@ -2730,10 +2730,10 @@ 
 	return $new_str;
 }
 
-function js_escape($str, $keep=true){
+function js_escape($str, $keep = true) {
 	$str = html_entity_decode(str_replace("\\", "", $str), ENT_QUOTES);
 
-	if($keep){
+	if ($keep) {
 		$str = javascript_escape($str);
 	}
 	else {
@@ -2750,11 +2750,11 @@ 
 	$regex = "#<[^>]+br.+?>#i";
 	preg_match_all($regex, $str, $matches);
 
-	foreach($matches[0] as $match) {
+	foreach ($matches[0] as $match) {
 		$str = str_replace($match, "<br>", $str);
 	}
 
-	$brs = array('<br>','<br/>', '<br />');
+	$brs = array('<br>', '<br/>', '<br />');
 	$str = str_replace("\r\n", "\n", $str); // make from windows-returns, *nix-returns
 	$str = str_replace("\n\r", "\n", $str); // make from windows-returns, *nix-returns
 	$str = str_replace("\r", "\n", $str); // make from windows-returns, *nix-returns
@@ -2781,20 +2781,20 @@ 
  * @param $die boolean end script flow
  * @param $displayStackTrace also show stack trace
  */
-function _ppl($mixed, $die=false, $displayStackTrace=false, $loglevel="fatal") {
-	if(!isset($GLOBALS['log']) || empty($GLOBALS['log'])) {
+function _ppl($mixed, $die = false, $displayStackTrace = false, $loglevel = "fatal") {
+	if (!isset($GLOBALS['log']) || empty($GLOBALS['log'])) {
 
 		$GLOBALS['log'] = LoggerManager :: getLogger('SugarCRM');
 	}
 
 
-	$mix	= print_r($mixed, true); // send print_r() output to $mix
-	$stack	= debug_backtrace();
+	$mix = print_r($mixed, true); // send print_r() output to $mix
+	$stack = debug_backtrace();
 
 	$GLOBALS['log']->$loglevel('------------------------------ _ppLogger() output start -----------------------------');
 	$GLOBALS['log']->$loglevel($mix);
-	if($displayStackTrace) {
-		foreach($stack as $position) {
+	if ($displayStackTrace) {
+		foreach ($stack as $position) {
 			$GLOBALS['log']->$loglevel($position['file']."({$position['line']})");
 		}
 	}
@@ -2802,7 +2802,7 @@ 
 	$GLOBALS['log']->$loglevel('------------------------------ _ppLogger() output end -----------------------------');
 	$GLOBALS['log']->$loglevel('------------------------------ _ppLogger() file: '.$stack[0]['file'].' line#: '.$stack[0]['line'].'-----------------------------');
 
-	if($die) {
+	if ($die) {
 		die();
 	}
 }
@@ -2812,7 +2812,7 @@ 
  * The ppf stands for Pre[formatted] Print Focus [object]
  * @param object bean The focus bean
  */
-function _ppf($bean, $die=false) {
+function _ppf($bean, $die = false) {
 }
 
 
@@ -2831,7 +2831,7 @@ 
  * This function is only intended to be used for SugarCRM internal development.
  * The pp stands for Pre Print.
  */
-function _pstack_trace($mixed=NULL)
+function _pstack_trace($mixed = NULL)
 {
 }
 
@@ -2840,7 +2840,7 @@ 
  * This function is only intended to be used for SugarCRM internal development.
  * The pp stands for Pre Print Trace.
  */
-function _ppt($mixed, $textOnly=false)
+function _ppt($mixed, $textOnly = false)
 {
 }
 
@@ -2877,7 +2877,7 @@ 
 
 	// only the supported versions,
 	// should be mutually exclusive with $invalid_php_versions
-	$supported_php_versions = array (
+	$supported_php_versions = array(
     	'5.3.0'
 	);
 
@@ -2891,21 +2891,21 @@ 
 	$retval = 0;
 
 	// versions below $min_considered_php_version are invalid
-	if(1 == version_compare($sys_php_version, $min_considered_php_version, '<')) {
+	if (1 == version_compare($sys_php_version, $min_considered_php_version, '<')) {
 		$retval = -1;
 	}
 
 	// supported version check overrides default unsupported
-	foreach($supported_php_versions as $ver) {
-		if(1 == version_compare($sys_php_version, $ver, 'eq') || strpos($sys_php_version,$ver) !== false) {
+	foreach ($supported_php_versions as $ver) {
+		if (1 == version_compare($sys_php_version, $ver, 'eq') || strpos($sys_php_version, $ver) !== false) {
 			$retval = 1;
 			break;
 		}
 	}
 
 	// invalid version check overrides default unsupported
-	foreach($invalid_php_versions as $ver) {
-		if(1 == version_compare($sys_php_version, $ver, 'eq') && strpos($sys_php_version,$ver) !== false) {
+	foreach ($invalid_php_versions as $ver) {
+		if (1 == version_compare($sys_php_version, $ver, 'eq') && strpos($sys_php_version, $ver) !== false) {
 			$retval = -1;
 			break;
 		}
@@ -2913,7 +2913,7 @@ 
 
     //allow a redhat distro to install, regardless of version.  We are assuming the redhat naming convention is followed
     //and the php version contains 'rh' characters
-    if(strpos($sys_php_version, 'rh') !== false) {
+    if (strpos($sys_php_version, 'rh') !== false) {
         $retval = 1;
     }
 
@@ -2931,7 +2931,7 @@ 
 
 	$server_software = $_SERVER["SERVER_SOFTWARE"];
 	$iis_version = '';
-	if(strpos($server_software,'Microsoft-IIS') !== false && preg_match_all("/^.*\/(\d+\.?\d*)$/",  $server_software, $out))
+	if (strpos($server_software, 'Microsoft-IIS') !== false && preg_match_all("/^.*\/(\d+\.?\d*)$/", $server_software, $out))
 	    $iis_version = $out[1][0];
 
     $sys_iis_version = empty($sys_iis_version) ? $iis_version : $sys_iis_version;
@@ -2943,7 +2943,7 @@ 
 
     // only the supported versions,
     // should be mutually exclusive with $invalid_iis_versions
-    $supported_iis_versions = array ('6.0', '7.0',);
+    $supported_iis_versions = array('6.0', '7.0',);
     $unsupported_iis_versions = array();
     $invalid_iis_versions = array('5.0',);
 
@@ -2951,29 +2951,29 @@ 
     $retval = 0;
 
     // versions below $min_considered_iis_version are invalid
-    if(1 == version_compare($sys_iis_version, $min_considered_iis_version, '<')) {
+    if (1 == version_compare($sys_iis_version, $min_considered_iis_version, '<')) {
         $retval = -1;
     }
 
     // supported version check overrides default unsupported
-    foreach($supported_iis_versions as $ver) {
-        if(1 == version_compare($sys_iis_version, $ver, 'eq') || strpos($sys_iis_version,$ver) !== false) {
+    foreach ($supported_iis_versions as $ver) {
+        if (1 == version_compare($sys_iis_version, $ver, 'eq') || strpos($sys_iis_version, $ver) !== false) {
             $retval = 1;
             break;
         }
     }
 
     // unsupported version check overrides default unsupported
-    foreach($unsupported_iis_versions as $ver) {
-        if(1 == version_compare($sys_iis_version, $ver, 'eq') && strpos($sys_iis_version,$ver) !== false) {
+    foreach ($unsupported_iis_versions as $ver) {
+        if (1 == version_compare($sys_iis_version, $ver, 'eq') && strpos($sys_iis_version, $ver) !== false) {
             $retval = 0;
             break;
         }
     }
 
     // invalid version check overrides default unsupported
-    foreach($invalid_iis_versions as $ver) {
-        if(1 == version_compare($sys_iis_version, $ver, 'eq') && strpos($sys_iis_version,$ver) !== false) {
+    foreach ($invalid_iis_versions as $ver) {
+        if (1 == version_compare($sys_iis_version, $ver, 'eq') && strpos($sys_iis_version, $ver) !== false) {
             $retval = -1;
             break;
         }
@@ -2982,18 +2982,18 @@ 
     return $retval;
 }
 
-function pre_login_check(){
+function pre_login_check() {
 	global $action, $login_error;
-	if(!empty($action)&& $action == 'Login'){
+	if (!empty($action) && $action == 'Login') {
 
-		if(!empty($login_error)){
+		if (!empty($login_error)) {
 			$login_error = htmlentities($login_error);
-			$login_error = str_replace(array("&lt;pre&gt;","&lt;/pre&gt;","\r\n", "\n"), "<br>", $login_error);
+			$login_error = str_replace(array("&lt;pre&gt;", "&lt;/pre&gt;", "\r\n", "\n"), "<br>", $login_error);
 			$_SESSION['login_error'] = $login_error;
 			echo '<script>
 						function set_focus() {}
 						if(document.getElementById("post_error")) {
-							document.getElementById("post_error").innerHTML="'. $login_error. '";
+							document.getElementById("post_error").innerHTML="'. $login_error.'";
 							document.getElementById("cant_login").value=1;
 							document.getElementById("login_button").disabled = true;
 							document.getElementById("user_name").disabled = true;
@@ -3008,10 +3008,10 @@ 
 
 function sugar_cleanup($exit = false) {
 	static $called = false;
-	if($called)return;
+	if ($called)return;
 	$called = true;
-	set_include_path(realpath(dirname(__FILE__) . '/..') . PATH_SEPARATOR . get_include_path());
-	chdir(realpath(dirname(__FILE__) . '/..'));
+	set_include_path(realpath(dirname(__FILE__).'/..').PATH_SEPARATOR.get_include_path());
+	chdir(realpath(dirname(__FILE__).'/..'));
 	global $sugar_config;
 	require_once('include/utils/LogicHook.php');
 	LogicHook::initialize();
@@ -3027,20 +3027,20 @@ 
 	}
 	Tracker::logPage();
 	// Now write the cached tracker_queries
-	if(!empty($GLOBALS['savePreferencesToDB']) && $GLOBALS['savePreferencesToDB']) {
-	    if ( isset($GLOBALS['current_user']) && $GLOBALS['current_user'] instanceOf User )
+	if (!empty($GLOBALS['savePreferencesToDB']) && $GLOBALS['savePreferencesToDB']) {
+	    if (isset($GLOBALS['current_user']) && $GLOBALS['current_user'] instanceOf User)
 	        $GLOBALS['current_user']->savePreferencesToDB();
 	}
 
 	//check to see if this is not an `ajax call AND the user preference error flag is set
-	if(
+	if (
 		(isset($_SESSION['USER_PREFRENCE_ERRORS']) && $_SESSION['USER_PREFRENCE_ERRORS'])
-		&& ($_REQUEST['action']!='modulelistmenu' && $_REQUEST['action']!='DynamicAction')
-		&& ($_REQUEST['action']!='favorites' && $_REQUEST['action']!='DynamicAction')
-		&& (empty($_REQUEST['to_pdf']) || !$_REQUEST['to_pdf'] )
-		&& (empty($_REQUEST['sugar_body_only']) || !$_REQUEST['sugar_body_only'] )
+		&& ($_REQUEST['action'] != 'modulelistmenu' && $_REQUEST['action'] != 'DynamicAction')
+		&& ($_REQUEST['action'] != 'favorites' && $_REQUEST['action'] != 'DynamicAction')
+		&& (empty($_REQUEST['to_pdf']) || !$_REQUEST['to_pdf'])
+		&& (empty($_REQUEST['sugar_body_only']) || !$_REQUEST['sugar_body_only'])
 
-	){
+	) {
 		global $app_strings;
 		//this is not an ajax call and the user preference error flag is set, so reset the flag and print js to flash message
 		$err_mess = $app_strings['ERROR_USER_PREFS'];
@@ -3053,10 +3053,10 @@ 
 	}
 
 	pre_login_check();
-	if(class_exists('DBManagerFactory')) {
+	if (class_exists('DBManagerFactory')) {
 		$db = DBManagerFactory::getInstance();
 		$db->disconnect();
-		if($exit) {
+		if ($exit) {
 			exit;
 		}
 	}
@@ -3070,27 +3070,27 @@ 
  if not, it will add it. If the file isn't built yet, it will create the file
 
  */
-function check_logic_hook_file($module_name, $event, $action_array){
+function check_logic_hook_file($module_name, $event, $action_array) {
 	require_once('include/utils/logic_utils.php');
 	$add_logic = false;
 
-	if(file_exists("custom/modules/$module_name/logic_hooks.php")){
+	if (file_exists("custom/modules/$module_name/logic_hooks.php")) {
 
 		$hook_array = get_hook_array($module_name);
 
-		if(check_existing_element($hook_array, $event, $action_array)==true){
+		if (check_existing_element($hook_array, $event, $action_array) == true) {
 			//the hook at hand is present, so do nothing
 		} else {
 			$add_logic = true;
 
             $logic_count = 0;
-            if(!empty($hook_array[$event]))
+            if (!empty($hook_array[$event]))
             {
 			    $logic_count = count($hook_array[$event]);
             }
 
-			if($action_array[0]==""){
-				$action_array[0] = $logic_count  + 1;
+			if ($action_array[0] == "") {
+				$action_array[0] = $logic_count + 1;
 			}
 			$hook_array[$event][] = $action_array;
 
@@ -3098,14 +3098,14 @@ 
 		//end if the file exists already
 	} else {
 		$add_logic = true;
-		if($action_array[0]==""){
+		if ($action_array[0] == "") {
 			$action_array[0] = 1;
 		}
 		$hook_array = array();
 		$hook_array[$event][] = $action_array;
 		//end if else file exists already
 	}
-	if($add_logic == true){
+	if ($add_logic == true) {
 
 		//reorder array by element[0]
 		//$hook_array = reorder_array($hook_array, $event);
@@ -3124,19 +3124,19 @@ 
     require_once('include/utils/logic_utils.php');
 	$add_logic = false;
 
-	if(file_exists("custom/modules/".$module_name."/logic_hooks.php")){
+	if (file_exists("custom/modules/".$module_name."/logic_hooks.php")) {
         // The file exists, let's make sure the hook is there
 		$hook_array = get_hook_array($module_name);
 
-		if(check_existing_element($hook_array, $event, $action_array)==true){
+		if (check_existing_element($hook_array, $event, $action_array) == true) {
             // The hook is there, time to take it out.
 
-            foreach ( $hook_array[$event] as $i => $hook ) {
+            foreach ($hook_array[$event] as $i => $hook) {
                 // We don't do a full comparison below just in case the filename changes
-                if ( $hook[0] == $action_array[0]
+                if ($hook[0] == $action_array[0]
                      && $hook[1] == $action_array[1]
                      && $hook[3] == $action_array[3]
-                     && $hook[4] == $action_array[4] ) {
+                     && $hook[4] == $action_array[4]) {
                     unset($hook_array[$event][$i]);
                 }
             }
@@ -3148,53 +3148,53 @@ 
     }
 }
 
-function display_stack_trace($textOnly=false){
+function display_stack_trace($textOnly = false) {
 
-	$stack  = debug_backtrace();
+	$stack = debug_backtrace();
 
-	echo "\n\n display_stack_trace caller, file: " . $stack[0]['file']. ' line#: ' .$stack[0]['line'];
+	echo "\n\n display_stack_trace caller, file: ".$stack[0]['file'].' line#: '.$stack[0]['line'];
 
-	if(!$textOnly)
+	if (!$textOnly)
 	echo '<br>';
 
 	$first = true;
 	$out = '';
 
-	foreach($stack as $item) {
+	foreach ($stack as $item) {
 		$file  = '';
 		$class = '';
 		$line  = '';
-		$function  = '';
+		$function = '';
 
-		if(isset($item['file']))
+		if (isset($item['file']))
 		$file = $item['file'];
-		if(isset($item['class']))
+		if (isset($item['class']))
 		$class = $item['class'];
-		if(isset($item['line']))
+		if (isset($item['line']))
 		$line = $item['line'];
-		if(isset($item['function']))
+		if (isset($item['function']))
 		$function = $item['function'];
 
-		if(!$first) {
-			if(!$textOnly) {
+		if (!$first) {
+			if (!$textOnly) {
 				$out .= '<font color="black"><b>';
 			}
 
 			$out .= $file;
 
-			if(!$textOnly) {
+			if (!$textOnly) {
 				$out .= '</b></font><font color="blue">';
 			}
 
 			$out .= "[L:{$line}]";
 
-			if(!$textOnly) {
+			if (!$textOnly) {
 				$out .= '</font><font color="red">';
 			}
 
 			$out .= "({$class}:{$function})";
 
-			if(!$textOnly) {
+			if (!$textOnly) {
 				$out .= '</font><br>';
 			} else {
 				$out .= "\n";
@@ -3207,14 +3207,14 @@ 
 	echo $out;
 }
 
-function StackTraceErrorHandler($errno, $errstr, $errfile,$errline, $errcontext) {
-	$error_msg = " $errstr occurred in <b>$errfile</b> on line $errline [" . date("Y-m-d H:i:s") . ']';
+function StackTraceErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
+	$error_msg = " $errstr occurred in <b>$errfile</b> on line $errline [".date("Y-m-d H:i:s").']';
 	$halt_script = true;
-	switch($errno){
+	switch ($errno) {
 		case 2048: return; //depricated we have lots of these ignore them
 		case E_USER_NOTICE:
 		case E_NOTICE:
-		    if ( error_reporting() & E_NOTICE ) {
+		    if (error_reporting() & E_NOTICE) {
 		        $halt_script = false;
 		        $type = 'Notice';
 		    }
@@ -3249,10 +3249,10 @@ 
 			$type = "Unknown Error ($errno)";
 			break;
 	}
-	$error_msg = '<b>'.$type.'</b>:' . $error_msg;
+	$error_msg = '<b>'.$type.'</b>:'.$error_msg;
 	echo $error_msg;
 	display_stack_trace();
-	if($halt_script){
+	if ($halt_script) {
 		exit -1;
 	}
 
@@ -3261,16 +3261,16 @@ 
 }
 
 
-if(isset($sugar_config['stack_trace_errors']) && $sugar_config['stack_trace_errors']){
+if (isset($sugar_config['stack_trace_errors']) && $sugar_config['stack_trace_errors']) {
 
 	set_error_handler('StackTraceErrorHandler');
 }
-function get_sub_cookies($name){
+function get_sub_cookies($name) {
 	$cookies = array();
-	if(isset($_COOKIE[$name])){
+	if (isset($_COOKIE[$name])) {
 		$subs = explode('#', $_COOKIE[$name]);
-		foreach($subs as $cookie){
-			if(!empty($cookie)){
+		foreach ($subs as $cookie) {
+			if (!empty($cookie)) {
 				$cookie = explode('=', $cookie);
 
 				$cookies[$cookie[0]] = $cookie[1];
@@ -3282,16 +3282,16 @@ 
 }
 
 
-function mark_delete_components($sub_object_array, $run_second_level=false, $sub_sub_array=""){
+function mark_delete_components($sub_object_array, $run_second_level = false, $sub_sub_array = "") {
 
-	if(!empty($sub_object_array)){
+	if (!empty($sub_object_array)) {
 
-		foreach($sub_object_array as $sub_object){
+		foreach ($sub_object_array as $sub_object) {
 
 			//run_second level is set to true if you need to remove sub-sub components
-			if($run_second_level==true){
+			if ($run_second_level == true) {
 
-				mark_delete_components($sub_object->get_linked_beans($sub_sub_array['rel_field'],$sub_sub_array['rel_module']));
+				mark_delete_components($sub_object->get_linked_beans($sub_sub_array['rel_field'], $sub_sub_array['rel_module']));
 
 				//end if run_second_level is true
 			}
@@ -3310,9 +3310,9 @@ 
 function return_bytes($val)
 {
 	$val = trim($val);
-	$last = strtolower($val{strlen($val)-1});
+	$last = strtolower($val{strlen($val) - 1});
 
-	switch($last)
+	switch ($last)
 	{
 		// The 'G' modifier is available since PHP 5.1.0
 		case 'g':
@@ -3353,27 +3353,27 @@ 
  * @return bool true if writable
  */
 function is_writable_windows($file) {
-	if($file{strlen($file)-1}=='/') {
+	if ($file{strlen($file) - 1} == '/') {
 		return is_writable_windows($file.uniqid(mt_rand()).'.tmp');
 	}
 
 	// the assumption here is that Windows has an inherited permissions scheme
 	// any file that is a descendant of an unwritable directory will inherit
 	// that property and will trigger a failure below.
-	if(is_dir($file)) {
+	if (is_dir($file)) {
 		return true;
 	}
 
 	$file = str_replace("/", '\\', $file);
 
-	if(file_exists($file)) {
+	if (file_exists($file)) {
 		if (!($f = @sugar_fopen($file, 'r+')))
 		return false;
 		fclose($f);
 		return true;
 	}
 
-	if(!($f = @sugar_fopen($file, 'w')))
+	if (!($f = @sugar_fopen($file, 'w')))
 	return false;
 	fclose($f);
 	unlink($file);
@@ -3389,16 +3389,16 @@ 
     return TimeDate::guessTimezone($userOffset);
 }
 
-function convert_module_to_singular($module_array){
+function convert_module_to_singular($module_array) {
 	global $beanList;
 
-	foreach($module_array as $key => $value){
-		if(!empty($beanList[$value])) $module_array[$key] = $beanList[$value];
+	foreach ($module_array as $key => $value) {
+		if (!empty($beanList[$value])) $module_array[$key] = $beanList[$value];
 
-		if($value=="Cases") {
+		if ($value == "Cases") {
 			$module_array[$key] = "Case";
 		}
-		if($key=="projecttask"){
+		if ($key == "projecttask") {
 			$module_array['ProjectTask'] = "Project Task";
 			unset($module_array[$key]);
 		}
@@ -3413,12 +3413,12 @@ 
  * Given the bean_name which may be plural or singular return the singular
  * bean_name. This is important when you need to include files.
  */
-function get_singular_bean_name($bean_name){
+function get_singular_bean_name($bean_name) {
 	global $beanFiles, $beanList;
-	if(array_key_exists($bean_name, $beanList)){
+	if (array_key_exists($bean_name, $beanList)) {
 		return $beanList[$bean_name];
 	}
-	else{
+	else {
 		return $bean_name;
 	}
 }
@@ -3457,13 +3457,13 @@ 
     return $singular;
 }
 
-function get_label($label_tag, $temp_module_strings){
+function get_label($label_tag, $temp_module_strings) {
 	global $app_strings;
-	if(!empty($temp_module_strings[$label_tag])){
+	if (!empty($temp_module_strings[$label_tag])) {
 
 		$label_name = $temp_module_strings[$label_tag];
 	} else {
-		if(!empty($app_strings[$label_tag])){
+		if (!empty($app_strings[$label_tag])) {
 			$label_name = $app_strings[$label_tag];
 		} else {
 			$label_name = $label_tag;
@@ -3475,16 +3475,16 @@ 
 }
 
 
-function search_filter_rel_info(& $focus, $tar_rel_module, $relationship_name){
+function search_filter_rel_info(& $focus, $tar_rel_module, $relationship_name) {
 
 	$rel_list = array();
 
-	foreach($focus->relationship_fields as $rel_key => $rel_value){
-		if($rel_value == $relationship_name){
+	foreach ($focus->relationship_fields as $rel_key => $rel_value) {
+		if ($rel_value == $relationship_name) {
 			$temp_bean = get_module_info($tar_rel_module);
 	//		echo $focus->$rel_key;
 			$temp_bean->retrieve($focus->$rel_key);
-			if($temp_bean->id!=""){
+			if ($temp_bean->id != "") {
 
 				$rel_list[] = $temp_bean;
 				return $rel_list;
@@ -3492,9 +3492,9 @@ 
 		}
 	}
 
-	foreach($focus->field_defs as $field_name => $field_def){
+	foreach ($focus->field_defs as $field_name => $field_def) {
 		//Check if the relationship_name matches a "relate" field
-		if(!empty($field_def['type']) && $field_def['type'] == 'relate'
+		if (!empty($field_def['type']) && $field_def['type'] == 'relate'
 		&& !empty($field_def['id_name']) && !empty($focus->field_defs[$field_def['id_name']])
 		&& !empty($focus->field_defs[$field_def['id_name']]['relationship'])
 		&& $focus->field_defs[$field_def['id_name']]['relationship'] == $relationship_name)
@@ -3502,17 +3502,17 @@ 
 			$temp_bean = get_module_info($tar_rel_module);
 		//	echo $focus->$field_def['id_name'];
 			$temp_bean->retrieve($focus->$field_def['id_name']);
-			if($temp_bean->id!=""){
+			if ($temp_bean->id != "") {
 
 				$rel_list[] = $temp_bean;
 				return $rel_list;
 			}
 		//Check if the relationship_name matches a "link" in a relate field
-		} else if(!empty($rel_value['link']) && !empty($rel_value['id_name']) && $rel_value['link'] == $relationship_name){
+		} else if (!empty($rel_value['link']) && !empty($rel_value['id_name']) && $rel_value['link'] == $relationship_name) {
 			$temp_bean = get_module_info($tar_rel_module);
 		//	echo $focus->$rel_value['id_name'];
 			$temp_bean->retrieve($focus->$rel_value['id_name']);
-			if($temp_bean->id!=""){
+			if ($temp_bean->id != "") {
 
 				$rel_list[] = $temp_bean;
 				return $rel_list;
@@ -3521,10 +3521,10 @@ 
 	}
 
 	// special case for unlisted parent-type relationships
-	if( !empty($focus->parent_type) && $focus->parent_type == $tar_rel_module && !empty($focus->parent_id)) {
+	if (!empty($focus->parent_type) && $focus->parent_type == $tar_rel_module && !empty($focus->parent_id)) {
 		$temp_bean = get_module_info($tar_rel_module);
 		$temp_bean->retrieve($focus->parent_id);
-		if($temp_bean->id!=""){
+		if ($temp_bean->id != "") {
 			$rel_list[] = $temp_bean;
 			return $rel_list;
 		}
@@ -3535,24 +3535,24 @@ 
 	//end function search_filter_rel_info
 }
 
-function get_module_info($module_name){
+function get_module_info($module_name) {
 	global $beanList;
 	global $dictionary;
 
 	//Get dictionary and focus data for module
 	$vardef_name = $beanList[$module_name];
 
-	if($vardef_name=="aCase"){
+	if ($vardef_name == "aCase") {
 		$class_name = "Case";
 	} else {
 		$class_name = $vardef_name;
 	}
 
-	if(!file_exists('modules/'. $module_name . '/'.$class_name.'.php')){
+	if (!file_exists('modules/'.$module_name.'/'.$class_name.'.php')) {
 		return;
 	}
 
-	include_once('modules/'. $module_name . '/'.$class_name.'.php');
+	include_once('modules/'.$module_name.'/'.$class_name.'.php');
 
 	$module_bean = new $vardef_name();
 	return $module_bean;
@@ -3564,11 +3564,11 @@ 
  *
  * @param string $moduleName
  */
-function get_valid_bean_name($module_name){
+function get_valid_bean_name($module_name) {
 	global $beanList;
 
 	$vardef_name = $beanList[$module_name];
-	if($vardef_name=="aCase"){
+	if ($vardef_name == "aCase") {
 		$bean_name = "Case";
 	} else {
 		$bean_name = $vardef_name;
@@ -3578,7 +3578,7 @@ 
 
 
 
-function  checkAuthUserStatus(){
+function  checkAuthUserStatus() {
 
 	//authUserStatus();
 }
@@ -3592,7 +3592,7 @@ 
  * @author	original by "code at adspeed dot com" Fron php.net
  * @author	customized for Sugar by Chris N.
  */
-function getPhpInfo($level=-1) {
+function getPhpInfo($level = -1) {
 	/**	Name (constant)		Value	Description
 		INFO_GENERAL		1		The configuration line, php.ini location, build date, Web Server, System and more.
 		INFO_CREDITS		2		PHP Credits. See also phpcredits().
@@ -3608,36 +3608,36 @@ 
 	$phpinfo = ob_get_contents();
 	ob_end_clean();
 
-	$phpinfo	= strip_tags($phpinfo,'<h1><h2><th><td>');
-	$phpinfo	= preg_replace('/<th[^>]*>([^<]+)<\/th>/',"<info>\\1</info>",$phpinfo);
-	$phpinfo	= preg_replace('/<td[^>]*>([^<]+)<\/td>/',"<info>\\1</info>",$phpinfo);
+	$phpinfo	= strip_tags($phpinfo, '<h1><h2><th><td>');
+	$phpinfo	= preg_replace('/<th[^>]*>([^<]+)<\/th>/', "<info>\\1</info>", $phpinfo);
+	$phpinfo	= preg_replace('/<td[^>]*>([^<]+)<\/td>/', "<info>\\1</info>", $phpinfo);
 	$parsedInfo	= preg_split('/(<h.?>[^<]+<\/h.>)/', $phpinfo, -1, PREG_SPLIT_DELIM_CAPTURE);
-	$match		= '';
+	$match = '';
 	$version	= '';
 	$returnInfo	= array();
 
-	if(preg_match('/<h1 class\=\"p\">PHP Version ([^<]+)<\/h1>/', $phpinfo, $version)) {
+	if (preg_match('/<h1 class\=\"p\">PHP Version ([^<]+)<\/h1>/', $phpinfo, $version)) {
 		$returnInfo['PHP Version'] = $version[1];
 	}
 
 
-	for ($i=1; $i<count($parsedInfo); $i++) {
+	for ($i = 1; $i < count($parsedInfo); $i++) {
 		if (preg_match('/<h.>([^<]+)<\/h.>/', $parsedInfo[$i], $match)) {
 			$vName = trim($match[1]);
-			$parsedInfo2 = explode("\n",$parsedInfo[$i+1]);
+			$parsedInfo2 = explode("\n", $parsedInfo[$i + 1]);
 
 			foreach ($parsedInfo2 AS $vOne) {
-				$vPat	= '<info>([^<]+)<\/info>';
+				$vPat = '<info>([^<]+)<\/info>';
 				$vPat3	= "/$vPat\s*$vPat\s*$vPat/";
 				$vPat2	= "/$vPat\s*$vPat/";
 
-				if (preg_match($vPat3,$vOne,$match)) { // 3cols
-					$returnInfo[$vName][trim($match[1])] = array(trim($match[2]),trim($match[3]));
-				} elseif (preg_match($vPat2,$vOne,$match)) { // 2cols
+				if (preg_match($vPat3, $vOne, $match)) { // 3cols
+					$returnInfo[$vName][trim($match[1])] = array(trim($match[2]), trim($match[3]));
+				} elseif (preg_match($vPat2, $vOne, $match)) { // 2cols
 					$returnInfo[$vName][trim($match[1])] = trim($match[2]);
 				}
 			}
-		} elseif(true) {
+		} elseif (true) {
 
 		}
 	}
@@ -3652,7 +3652,7 @@ 
  * @param	$args args to replace
  * @return	$result a formatted string
  */
-function string_format($format, $args){
+function string_format($format, $args) {
 	$result = $format;
 
     /** Bug47277 fix.
@@ -3670,7 +3670,7 @@ 
     }
     /* End of fix */
 
-	for($i = 0; $i < count($args); $i++){
+	for ($i = 0; $i < count($args); $i++) {
 		$result = str_replace('{'.$i.'}', $args[$i], $result);
 	}
 	return $result;
@@ -3686,19 +3686,19 @@ 
  * @param	$system_id from system
  * @return	$result a formatted string
  */
-function format_number_display($num, $system_id){
+function format_number_display($num, $system_id) {
 	global $sugar_config;
-	if(isset($num) && !empty($num)){
-		$num=unformat_number($num);
-		if(isset($system_id) && $system_id == 1){
+	if (isset($num) && !empty($num)) {
+		$num = unformat_number($num);
+		if (isset($system_id) && $system_id == 1) {
 			return sprintf("%d", $num);
 		}
-		else{
+		else {
 			return sprintf("%d-%d", $num, $system_id);
 		}
 	}
 }
-function checkLoginUserStatus(){
+function checkLoginUserStatus() {
 }
 
 /**
@@ -3712,11 +3712,11 @@ 
 	$resulturl = $url;
 
 	// if no port, don't change the url
-	if($port != '')
+	if ($port != '')
 	{
 		$split = explode("/", $url);
 		//check if it starts with http, in case they didn't include that in url
-		if(str_begin($url, 'http'))
+		if (str_begin($url, 'http'))
 		{
 			//third index ($split[2]) will be the host
 			$split[2] .= ":".$port;
@@ -3739,7 +3739,7 @@ 
  */
 function getJSONobj() {
 	static $json = null;
-	if(!isset($json)) {
+	if (!isset($json)) {
 		require_once('include/JSON.php');
 		$json = new JSON(JSON_LOOSE_TYPE);
 	}
@@ -3771,7 +3771,7 @@ 
 	// http://us3.php.net/manual/en/ref.pcre.php#ini.pcre.backtrack-limit
 	// starting with 5.2.0, backtrack_limit breaks JSON decoding
 	$backtrack_limit = ini_get('pcre.backtrack_limit');
-	if(!empty($backtrack_limit)) {
+	if (!empty($backtrack_limit)) {
 		ini_set('pcre.backtrack_limit', '-1');
 	}
 }
@@ -3788,19 +3788,19 @@ 
  */
 function sugarLangArrayMerge($gimp, $dom)
 {
-	if(is_array($gimp) && is_array($dom))
+	if (is_array($gimp) && is_array($dom))
     {
-		foreach($dom as $domKey => $domVal)
+		foreach ($dom as $domKey => $domVal)
         {
-			if(isset($gimp[$domKey]))
+			if (isset($gimp[$domKey]))
             {
-				if(is_array($domVal))
+				if (is_array($domVal))
                 {
 					$tempArr = array();
-                    foreach ( $domVal as $domArrKey => $domArrVal )
+                    foreach ($domVal as $domArrKey => $domArrVal)
                         $tempArr[$domArrKey] = $domArrVal;
-                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
-                        if ( !isset($tempArr[$gimpArrKey]) )
+                    foreach ($gimp[$domKey] as $gimpArrKey => $gimpArrVal)
+                        if (!isset($tempArr[$gimpArrKey]))
                             $tempArr[$gimpArrKey] = $gimpArrVal;
                     $gimp[$domKey] = $tempArr;
 				}
@@ -3816,7 +3816,7 @@ 
 		}
 	}
     // if the passed value for gimp isn't an array, then return the $dom
-    elseif(is_array($dom))
+    elseif (is_array($dom))
     {
         return $dom;
     }
@@ -3838,15 +3838,15 @@ 
  * @return array beaten gimp
  */
 function sugarArrayMerge($gimp, $dom) {
-	if(is_array($gimp) && is_array($dom)) {
-		foreach($dom as $domKey => $domVal) {
-			if(array_key_exists($domKey, $gimp)) {
-				if(is_array($domVal)) {
+	if (is_array($gimp) && is_array($dom)) {
+		foreach ($dom as $domKey => $domVal) {
+			if (array_key_exists($domKey, $gimp)) {
+				if (is_array($domVal)) {
 					$tempArr = array();
-                    foreach ( $domVal as $domArrKey => $domArrVal )
+                    foreach ($domVal as $domArrKey => $domArrVal)
                         $tempArr[$domArrKey] = $domArrVal;
-                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
-                        if ( !array_key_exists($gimpArrKey, $tempArr) )
+                    foreach ($gimp[$domKey] as $gimpArrKey => $gimpArrVal)
+                        if (!array_key_exists($gimpArrKey, $tempArr))
                             $tempArr[$gimpArrKey] = $gimpArrVal;
                     $gimp[$domKey] = $tempArr;
 				} else {
@@ -3858,7 +3858,7 @@ 
 		}
 	}
     // if the passed value for gimp isn't an array, then return the $dom
-    elseif(is_array($dom))
+    elseif (is_array($dom))
         return $dom;
 
 	return $gimp;
@@ -3872,10 +3872,10 @@ 
  * @return array beaten gimp
  */
 function sugarArrayMergeRecursive($gimp, $dom) {
-	if(is_array($gimp) && is_array($dom)) {
-		foreach($dom as $domKey => $domVal) {
-			if(array_key_exists($domKey, $gimp)) {
-				if(is_array($domVal) && is_array($gimp[$domKey])) {
+	if (is_array($gimp) && is_array($dom)) {
+		foreach ($dom as $domKey => $domVal) {
+			if (array_key_exists($domKey, $gimp)) {
+				if (is_array($domVal) && is_array($gimp[$domKey])) {
 					$gimp[$domKey] = sugarArrayMergeRecursive($gimp[$domKey], $domVal);
 				} else {
 					$gimp[$domKey] = $domVal;
@@ -3886,7 +3886,7 @@ 
 		}
 	}
     // if the passed value for gimp isn't an array, then return the $dom
-    elseif(is_array($dom))
+    elseif (is_array($dom))
         return $dom;
 
 	return $gimp;
@@ -3897,7 +3897,7 @@ 
  * @return bool True if NOT found or WRONG version
  */
 function returnPhpJsonStatus() {
-	if(function_exists('json_encode')) {
+	if (function_exists('json_encode')) {
 		$phpInfo = getPhpInfo(8);
         return version_compare($phpInfo['json']['json version'], '1.1.1', '<');
 	}
@@ -3924,16 +3924,16 @@ 
 
 	global $sugar_config;
 
-	if(!isset($max_tracker_item_length)) {
-		if(isset($sugar_config['tracker_max_display_length'])) {
+	if (!isset($max_tracker_item_length)) {
+		if (isset($sugar_config['tracker_max_display_length'])) {
 	      $max_tracker_item_length = (is_int($sugar_config['tracker_max_display_length']) && $sugar_config['tracker_max_display_length'] > 0 && $sugar_config['tracker_max_display_length'] < 50) ? $sugar_config['tracker_max_display_length'] : 15;
 		} else {
 	      $max_tracker_item_length = 15;
 		}
 	}
 
-	if($strlen > $max_tracker_item_length) {
-		$chopped = function_exists('mb_substr') ? mb_substr($name, 0, $max_tracker_item_length-3, "UTF-8") : substr($name, 0, $max_tracker_item_length-3);
+	if ($strlen > $max_tracker_item_length) {
+		$chopped = function_exists('mb_substr') ? mb_substr($name, 0, $max_tracker_item_length - 3, "UTF-8") : substr($name, 0, $max_tracker_item_length - 3);
 		$chopped .= "...";
 	} else {
 		$chopped = $name;
@@ -3941,51 +3941,51 @@ 
 
 	return $chopped;
 }
-function generate_search_where ($field_list=array(),$values=array(),&$bean,$add_custom_fields=false,$module='') {
-	$where_clauses= array();
-	$like_char='%';
-	$table_name=$bean->object_name;
+function generate_search_where($field_list = array(), $values = array(), &$bean, $add_custom_fields = false, $module = '') {
+	$where_clauses = array();
+	$like_char = '%';
+	$table_name = $bean->object_name;
 	foreach ($field_list[$module] as $field=>$parms) {
-		if(isset($values[$field]) && $values[$field] != "") {
-			$operator='like';
+		if (isset($values[$field]) && $values[$field] != "") {
+			$operator = 'like';
 			if (!empty($parms['operator'])) {
-				$operator=$parms['operator'];
+				$operator = $parms['operator'];
 			}
 			if (is_array($values[$field])) {
-				$operator='in';
-				$field_value='';
+				$operator = 'in';
+				$field_value = '';
 				foreach ($values[$field] as $key => $val) {
 					if ($val != ' ' and $val != '') {
 						if (!empty($field_value)) {
-							$field_value.=',';
+							$field_value .= ',';
 						}
 						$field_value .= "'".$GLOBALS['db']->quote($val)."'";
 					}
 				}
 			} else {
-				$field_value=$GLOBALS['db']->quote($values[$field]);
+				$field_value = $GLOBALS['db']->quote($values[$field]);
 			}
 			//set db_fields array.
-			if (!isset($parms['db_field']) )  {
+			if (!isset($parms['db_field'])) {
 				$parms['db_field'] = array($field);
 			}
 			if (isset($parms['my_items']) and $parms['my_items'] == true) {
 				global $current_user;
 				$field_value = $GLOBALS['db']->quote($current_user->id);
-				$operator='=';
+				$operator = '=';
 			}
 
-			$where='';
-			$itr=0;
+			$where = '';
+			$itr = 0;
 			if ($field_value != '') {
 
 				foreach ($parms['db_field'] as $db_field) {
-					if (strstr($db_field,'.')===false) {
-						$db_field=$bean->table_name.".".$db_field;
+					if (strstr($db_field, '.') === false) {
+						$db_field = $bean->table_name.".".$db_field;
 					}
-					if ($GLOBALS['db']->supports('case_sensitive') &&  isset($parms['query_type']) && $parms['query_type']=='case_insensitive') {
-						$db_field='upper('.$db_field.")";
-						$field_value=strtoupper($field_value);
+					if ($GLOBALS['db']->supports('case_sensitive') && isset($parms['query_type']) && $parms['query_type'] == 'case_insensitive') {
+						$db_field = 'upper('.$db_field.")";
+						$field_value = strtoupper($field_value);
 					}
 
 					$itr++;
@@ -3994,19 +3994,19 @@ 
 					}
 					switch (strtolower($operator)) {
 						case 'like' :
-							$where .=  $db_field . " like '".$field_value.$like_char."'";
+							$where .= $db_field." like '".$field_value.$like_char."'";
 							break;
 						case 'in':
-							$where .=  $db_field . " in (".$field_value.')';
+							$where .= $db_field." in (".$field_value.')';
 							break;
 						case '=':
-							$where .=  $db_field . " = '".$field_value ."'";
+							$where .= $db_field." = '".$field_value."'";
 							break;
 					}
 				}
 			}
 			if (!empty($where)) {
-				if ($itr>1) {
+				if ($itr > 1) {
 					array_push($where_clauses, '( '.$where.' )');
 				} else {
 					array_push($where_clauses, $where);
@@ -4034,13 +4034,13 @@ 
  */
 function rebuildConfigFile($sugar_config, $sugar_version) {
 	// add defaults to missing values of in-memory sugar_config
-	$sugar_config = sugarArrayMerge(get_sugar_config_defaults(), $sugar_config );
+	$sugar_config = sugarArrayMerge(get_sugar_config_defaults(), $sugar_config);
 	// need to override version with default no matter what
 	$sugar_config['sugar_version'] = $sugar_version;
 
-	ksort( $sugar_config );
+	ksort($sugar_config);
 
-	if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+	if (write_array_to_file("sugar_config", $sugar_config, "config.php")) {
 		return true;
 	}
 	else {
@@ -4073,40 +4073,40 @@ 
  */
 function getJavascriptSiteURL() {
 	global $sugar_config;
-	if(!empty($_SERVER['HTTP_REFERER'])) {
+	if (!empty($_SERVER['HTTP_REFERER'])) {
 		$url = parse_url($_SERVER['HTTP_REFERER']);
 		$replacement_url = $url['scheme']."://".$url['host'];
-		if(!empty($url['port']))
+		if (!empty($url['port']))
 		$replacement_url .= ':'.$url['port'];
-		$site_url = preg_replace('/^http[s]?\:\/\/[^\/]+/',$replacement_url,$sugar_config['site_url']);
+		$site_url = preg_replace('/^http[s]?\:\/\/[^\/]+/', $replacement_url, $sugar_config['site_url']);
 	} else {
-		$site_url = preg_replace('/^http(s)?\:\/\/[^\/]+/',"http$1://".$_SERVER['HTTP_HOST'],$sugar_config['site_url']);
-		if(!empty($_SERVER['SERVER_PORT']) &&$_SERVER['SERVER_PORT'] == '443') {
-			$site_url = preg_replace('/^http\:/','https:',$site_url);
+		$site_url = preg_replace('/^http(s)?\:\/\/[^\/]+/', "http$1://".$_SERVER['HTTP_HOST'], $sugar_config['site_url']);
+		if (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443') {
+			$site_url = preg_replace('/^http\:/', 'https:', $site_url);
 		}
 	}
-	$GLOBALS['log']->debug("getJavascriptSiteURL(), site_url=".  $site_url);
+	$GLOBALS['log']->debug("getJavascriptSiteURL(), site_url=".$site_url);
 	return $site_url;
 }
 
 // works nicely with array_map() -- can be used to wrap single quotes around each element in an array
 function add_squotes($str) {
-	return "'" . $str . "'";
+	return "'".$str."'";
 }
 
 
 // recursive function to count the number of levels within an array
-function array_depth($array, $depth_count=-1, $depth_array=array()){
+function array_depth($array, $depth_count = -1, $depth_array = array()) {
 	$depth_count++;
-	if (is_array($array)){
-		foreach ($array as $key => $value){
+	if (is_array($array)) {
+		foreach ($array as $key => $value) {
 			$depth_array[] = array_depth($value, $depth_count);
 		}
 	}
-	else{
+	else {
 		return $depth_count;
 	}
-	foreach ($depth_array as $value){
+	foreach ($depth_array as $value) {
 		$depth_count = $value > $depth_count ? $value : $depth_count;
 	}
 	return $depth_count;
@@ -4125,7 +4125,7 @@ 
 	$group->last_name	= $name;
 	$group->is_group	= 1;
 	$group->deleted		= 0;
-	$group->status		= 'Active'; // cn: bug 6711
+	$group->status = 'Active'; // cn: bug 6711
 	$group->setPreference('timezone', TimeDate::userTimezone());
 	$group->save();
 
@@ -4143,19 +4143,19 @@ 
 {
 
 	$iconName = "icon_{$iconFileName}.gif";
-    $iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
+    $iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
 
     //First try un-ucfirst-ing the icon name
-    if ( empty($iconFound) )
-		$iconName = "icon_" . strtolower(substr($iconFileName,0,1)).substr($iconFileName,1) . ".gif";
-        $iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
+    if (empty($iconFound))
+		$iconName = "icon_".strtolower(substr($iconFileName, 0, 1)).substr($iconFileName, 1).".gif";
+        $iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
 
 	//Next try removing the icon prefix
-    if ( empty($iconFound) )
+    if (empty($iconFound))
 		$iconName = "{$iconFileName}.gif";
-		$iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
+		$iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
 
-	if ( empty($iconFound) )
+	if (empty($iconFound))
 		$iconName = '';
 
   	return $iconName;
@@ -4171,12 +4171,12 @@ 
  * @return string $string <img> tag with corresponding image
  */
 
-function getStudioIcon($iconFileName='', $altFileName='', $width='48', $height='48', $align='baseline', $alt='' )
+function getStudioIcon($iconFileName = '', $altFileName = '', $width = '48', $height = '48', $align = 'baseline', $alt = '')
 {
 	global $app_strings, $theme;
 
     $iconName = _getIcon($iconFileName);
- 	if(empty($iconName)){
+ 	if (empty($iconName)) {
  	    $iconName = _getIcon($altFileName);
  	    if (empty($iconName))
  	    {
@@ -4197,14 +4197,14 @@ 
  * @return string $string <img> tag with corresponding image
  */
 
-function get_dashlets_dialog_icon($module='', $width='32', $height='32', $align='absmiddle',$alt=''){
+function get_dashlets_dialog_icon($module = '', $width = '32', $height = '32', $align = 'absmiddle', $alt = '') {
 	global $app_strings, $theme;
- 	$iconName = _getIcon($module . "_32");
+ 	$iconName = _getIcon($module."_32");
  	if (empty($iconName))
  	{
  		$iconName = _getIcon($module);
  	}
- 	if(empty($iconName)){
+ 	if (empty($iconName)) {
  		return $app_strings['LBL_NO_IMAGE'];
  	}
 	return SugarThemeRegistry::current()->getImage($iconName, "align=\"$align\" border=\"0\"", $width, $height);
@@ -4232,9 +4232,9 @@ 
 function code2utf($num)
 {
     if ($num < 128) return chr($num);
-    if ($num < 2048) return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
-    if ($num < 65536) return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-    if ($num < 2097152) return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+    if ($num < 2048) return chr(($num >> 6) + 192).chr(($num & 63) + 128);
+    if ($num < 65536) return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
+    if ($num < 2097152) return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
     return '';
 }
 
@@ -4287,7 +4287,7 @@ 
  */
 function chartColors()
 {
-	if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml')=='')
+	if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml') == '')
 	return SugarThemeRegistry::current()->getImageURL('sugarColors.xml');
     return SugarThemeRegistry::current()->getCSSURL('sugarColors.xml');
 }
@@ -4316,10 +4316,10 @@ 
     $path = trim($path);
 
     // try to match absolute paths like \\server\share, /directory or c:\
-    if ( ( substr($path,0,2) == '\\\\' )
-            || ( $path[0] == '/' )
-            || preg_match('/^[A-z]:/i',$path)
-            || $currentServer )
+    if ((substr($path, 0, 2) == '\\\\')
+            || ($path[0] == '/')
+            || preg_match('/^[A-z]:/i', $path)
+            || $currentServer)
         return $path;
 
     return getcwd().'/'.$path;
@@ -4348,12 +4348,12 @@ 
     $ua = empty($_SERVER['HTTP_USER_AGENT']) ? "undefined" : strtolower($_SERVER['HTTP_USER_AGENT']);
 
     // first check if we have forced use of the touch enhanced interface
-    if ( isset($_COOKIE['touchscreen']) && $_COOKIE['touchscreen'] == '1' ) {
+    if (isset($_COOKIE['touchscreen']) && $_COOKIE['touchscreen'] == '1') {
         return true;
     }
 
     // next check if we should use the touch interface with our device
-    if ( strpos($ua, 'ipad') !== false ) {
+    if (strpos($ua, 'ipad') !== false) {
         return true;
     }
 
@@ -4367,30 +4367,30 @@ 
  */
 function get_alt_hot_key() {
 	$ua = '';
-    if ( isset($_SERVER['HTTP_USER_AGENT']) )
+    if (isset($_SERVER['HTTP_USER_AGENT']))
         $ua = strtolower($_SERVER['HTTP_USER_AGENT']);
 	$isMac = strpos($ua, 'mac') !== false;
 	$isLinux = strpos($ua, 'linux') !== false;
 
-	if(!$isMac && !$isLinux && strpos($ua, 'mozilla') !== false) {
-	   if(preg_match('/firefox\/(\d)?\./', $ua, $matches)) {
+	if (!$isMac && !$isLinux && strpos($ua, 'mozilla') !== false) {
+	   if (preg_match('/firefox\/(\d)?\./', $ua, $matches)) {
 	   	  return $matches[1] < 2 ? 'Alt+' : 'Alt+Shift+';
 	   }
 	}
 	return $isMac ? 'Ctrl+' : 'Alt+';
 }
 
-function can_start_session(){
-	if(!empty($_GET['PHPSESSID'])) {
+function can_start_session() {
+	if (!empty($_GET['PHPSESSID'])) {
 	   return true;
 	}
 	$session_id = session_id();
 	return empty($session_id) ? true : false;
 }
 
-function load_link_class($properties){
+function load_link_class($properties) {
 	$class = 'Link2';
-	if(!empty($properties['link_class']) && !empty($properties['link_file'])){
+	if (!empty($properties['link_class']) && !empty($properties['link_file'])) {
     	require_once($properties['link_file']);
     	$class = $properties['link_class'];
     }
@@ -4410,9 +4410,9 @@ 
  */
 function filterInboundEmailPopSelection($protocol)
 {
-    if ( !isset($GLOBALS['sugar_config']['allow_pop_inbound']) || ! $GLOBALS['sugar_config']['allow_pop_inbound'] )
+    if (!isset($GLOBALS['sugar_config']['allow_pop_inbound']) || !$GLOBALS['sugar_config']['allow_pop_inbound'])
     {
-        if( isset($protocol['pop3']) )
+        if (isset($protocol['pop3']))
 			unset($protocol['pop3']);
     }
     else
@@ -4427,10 +4427,10 @@ 
  * The varchar in MySQL, Orcale, and nvarchar in FreeTDS, we can store $length mutilbyte charaters in it. we need mb_substr to keep more info.
 * @returns the substred strings.
  */
-function sugar_substr($string, $length, $charset='UTF-8')
+function sugar_substr($string, $length, $charset = 'UTF-8')
 {
-    if(mb_strlen($string,$charset) > $length) {
-        $string = trim(mb_substr(trim($string),0,$length,$charset));
+    if (mb_strlen($string, $charset) > $length) {
+        $string = trim(mb_substr(trim($string), 0, $length, $charset));
     }
     return $string;
 }
@@ -4439,8 +4439,8 @@ 
  * The function is used because on FastCGI enviroment, the ucfirst(Chinese Characters) will produce bad charcters.
  * This will work even without setting the mbstring.*encoding
  */
-function sugar_ucfirst($string, $charset='UTF-8') {
-    return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset) . mb_substr($string, 1, mb_strlen($string), $charset);
+function sugar_ucfirst($string, $charset = 'UTF-8') {
+    return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_substr($string, 1, mb_strlen($string), $charset);
 }
 
 
@@ -4452,8 +4452,8 @@ 
 	{
 	   return $string;
 	}
-	if (substr($string, 0 ,1) == "^" && substr($string, -1) == "^") {
-          $string = substr(substr($string, 1), 0, strlen($string) -2);
+	if (substr($string, 0, 1) == "^" && substr($string, -1) == "^") {
+          $string = substr(substr($string, 1), 0, strlen($string) - 2);
 	}
 
 	return explode('^,^', $string);
@@ -4466,7 +4466,7 @@ 
     if (empty($arr))
         return "";
 
-	$string = "^" . implode('^,^', $arr) . "^";
+	$string = "^".implode('^,^', $arr)."^";
 
     return $string;
 }
@@ -4481,19 +4481,19 @@ 
  * @return $ret_array['where']: corrected where clause
  * @return $ret_array['join']: extra join condition
  */
-function create_export_query_relate_link_patch($module, $searchFields, $where){
-	if(file_exists('modules/'.$module.'/SearchForm.html')){
+function create_export_query_relate_link_patch($module, $searchFields, $where) {
+	if (file_exists('modules/'.$module.'/SearchForm.html')) {
 		$ret_array['where'] = $where;
 		return $ret_array;
 	}
 	$seed = loadBean($module);
-    foreach($seed->field_defs as $name=>$field)
+    foreach ($seed->field_defs as $name=>$field)
 	{
 
-		if( $field['type'] == 'relate' && isset($field['link']) && !empty($searchFields[$name]['value']) ){
+		if ($field['type'] == 'relate' && isset($field['link']) && !empty($searchFields[$name]['value'])) {
 			$seed->load_relationship($field['link']);
 			$params = array();
-			if(empty($join_type))
+			if (empty($join_type))
 			{
 				$params['join_type'] = ' LEFT JOIN ';
 			}
@@ -4501,16 +4501,16 @@ 
 			{
 				$params['join_type'] = $join_type;
 			}
-			if(isset($data['join_name']))
+			if (isset($data['join_name']))
 			{
 				$params['join_table_alias'] = $field['join_name'];
 			}
 			else
 			{
-				$params['join_table_alias']	= 'join_'.$field['name'];
+				$params['join_table_alias'] = 'join_'.$field['name'];
 
 			}
-			if(isset($data['join_link_name']))
+			if (isset($data['join_link_name']))
 			{
 				$params['join_table_link_alias'] = $field['join_link_name'];
 			}
@@ -4520,11 +4520,11 @@ 
 			}
 			$join = $seed->$field['link']->getJoin($params, true);
 			$join_table_alias = 'join_'.$field['name'];
-			if(isset($field['db_concat_fields'])){
+			if (isset($field['db_concat_fields'])) {
 				$db_field = db_concat($join_table_alias, $field['db_concat_fields']);
 				$where = preg_replace('/'.$field['name'].'/', $db_field, $where);
-			}else{
-				$where = preg_replace('/(^|[\s(])' . $field['name'] . '/', '${1}' . $join_table_alias . '.'.$field['rname'], $where);
+			} else {
+				$where = preg_replace('/(^|[\s(])'.$field['name'].'/', '${1}'.$join_table_alias.'.'.$field['rname'], $where);
 			}
 		}
 	}
@@ -4537,11 +4537,11 @@ 
   * @Depends on QuickRepairAndRebuild.php
   * @Relate bug 30642  ,23177
   */
-function clearAllJsAndJsLangFilesWithoutOutput(){
-		global $current_language , $mod_strings;
+function clearAllJsAndJsLangFilesWithoutOutput() {
+		global $current_language, $mod_strings;
 		$MBmodStrings = $mod_strings;
-        $mod_strings = return_module_language ( $current_language, 'Administration' ) ;
-        include_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+        $mod_strings = return_module_language($current_language, 'Administration');
+        include_once ('modules/Administration/QuickRepairAndRebuild.php');
         $repair = new RepairAndClear();
         $repair->module_list = array();
 		$repair->show_output = false;
@@ -4553,13 +4553,13 @@ 
 /**
  * This function will allow you to get a variable value from query string
  */
-function getVariableFromQueryString($variable, $string){
+function getVariableFromQueryString($variable, $string) {
 	$matches = array();
 	$number = preg_match("/{$variable}=([a-zA-Z0-9_-]+)[&]?/", $string, $matches);
-	if($number){
+	if ($number) {
 		return $matches[1];
 	}
-	else{
+	else {
 		return false;
 	}
 }
@@ -4573,8 +4573,8 @@ 
  */
 function should_hide_iframes() {
    //Remove the MySites module
-   if(file_exists('modules/iFrames/iFrame.php')) {
-        if(!class_exists("iFrame")) {
+   if (file_exists('modules/iFrames/iFrame.php')) {
+        if (!class_exists("iFrame")) {
                 require_once('modules/iFrames/iFrame.php');
         }
         return false;
@@ -4588,10 +4588,10 @@ 
  * @param string $version
  * @return string RC, BETA, GA
  */
-function getVersionStatus($version){
-	if(preg_match('/^[\d\.]+?([a-zA-Z]+?)[\d]*?$/si', $version, $matches)) {
+function getVersionStatus($version) {
+	if (preg_match('/^[\d\.]+?([a-zA-Z]+?)[\d]*?$/si', $version, $matches)) {
 		return strtoupper($matches[1]);
-	}else{
+	} else {
 		return 'GA';
 	}
 }
@@ -4603,12 +4603,12 @@ 
  * @param string $version
  * @return version
  */
-function getMajorMinorVersion($version){
-	if(preg_match('/^([\d\.]+).*$/si', $version, $matches2)){
+function getMajorMinorVersion($version) {
+	if (preg_match('/^([\d\.]+).*$/si', $version, $matches2)) {
 		$version = $matches2[1];
 		$arr = explode('.', $version);
-		if(count($arr) > 2){
-			if($arr[2] == '0'){
+		if (count($arr) > 2) {
+			if ($arr[2] == '0') {
 				$version = substr($version, 0, 3);
 			}
 		}
@@ -4636,10 +4636,10 @@ 
 {
 	$lines = explode("<br>", trim($string));
 	$urls = array();
-	foreach($lines as $line){
+	foreach ($lines as $line) {
     	$regex = '/http?\:\/\/[^\" ]+/i';
     	preg_match_all($regex, $line, $matches);
-    	foreach($matches[0] as $match){
+    	foreach ($matches[0] as $match) {
     		$urls[] = $match;
     	}
 	}
@@ -4654,20 +4654,20 @@ 
  */
 function verify_image_file($path, $jpeg = false)
 {
-	if(function_exists('imagepng') && function_exists('imagejpeg') && function_exists('imagecreatefromstring')) {
+	if (function_exists('imagepng') && function_exists('imagejpeg') && function_exists('imagecreatefromstring')) {
         $img = imagecreatefromstring(file_get_contents($path));
-    	if(!$img) {
+    	if (!$img) {
     	    return false;
     	}
     	$img_size = getimagesize($path);
 		$filetype = $img_size['mime'];
 		//if filetype is jpeg or if we are only allowing jpegs, create jpg image
-        if($filetype == "image/jpeg" || $jpeg) {
+        if ($filetype == "image/jpeg" || $jpeg) {
             ob_start();
             imagejpeg($img);
             $image = ob_get_clean();
             // not writing directly because imagejpeg does not work with streams
-            if(file_put_contents($path, $image)) {
+            if (file_put_contents($path, $image)) {
                 return true;
             }
         } elseif ($filetype == "image/png") {
@@ -4677,7 +4677,7 @@ 
         	ob_start();
             imagepng($img);
             $image = ob_get_clean();
-    	    if(file_put_contents($path, $image)) {
+    	    if (file_put_contents($path, $image)) {
                 return true;
     	    }
         } else {
@@ -4686,15 +4686,15 @@ 
 	} else {
 	    // check image manually
         $fp = fopen($path, "rb");
-        if(!$fp) return false;
+        if (!$fp) return false;
         $data = '';
         // read the whole file in chunks
-        while(!feof($fp)) {
-            $data .= fread($fp,8192);
+        while (!feof($fp)) {
+            $data .= fread($fp, 8192);
         }
 
 	    fclose($fp);
-	    if(preg_match("/<(\?php|html|!doctype|script|body|head|plaintext|table|img |pre(>| )|frameset|iframe|object|link|base|style|font|applet|meta|center|form|isindex)/i",
+	    if (preg_match("/<(\?php|html|!doctype|script|body|head|plaintext|table|img |pre(>| )|frameset|iframe|object|link|base|style|font|applet|meta|center|form|isindex)/i",
 	         $data, $m)) {
 	        $GLOBALS['log']->fatal("Found {$m[0]} in $path, not allowing upload");
 	        return false;
@@ -4713,18 +4713,18 @@ 
 function verify_uploaded_image($path, $jpeg_only = false)
 {
     $supportedExtensions = array('jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg');
-    if(!$jpeg_only) {
+    if (!$jpeg_only) {
         $supportedExtensions['png'] = 'image/png';
     }
 
-    if(!file_exists($path) || !is_file($path)) {
+    if (!file_exists($path) || !is_file($path)) {
 	    return false;
 	}
 
 	$img_size = getimagesize($path);
 	$filetype = $img_size['mime'];
 	$ext = end(explode(".", $path));
-	if(substr_count('..', $path) > 0 || ($ext !== $path && !isset($supportedExtensions[strtolower($ext)])) ||
+	if (substr_count('..', $path) > 0 || ($ext !== $path && !isset($supportedExtensions[strtolower($ext)])) ||
 	    !in_array($filetype, array_values($supportedExtensions))) {
 	        return false;
 	}
@@ -4735,7 +4735,7 @@ 
 {
     global $sugar_web_service_order_by;
     //If the order_by field is not valid, return 0;
-    if (empty($sugar_web_service_order_by) || !isset($a->$sugar_web_service_order_by) || !isset($b->$sugar_web_service_order_by)){
+    if (empty($sugar_web_service_order_by) || !isset($a->$sugar_web_service_order_by) || !isset($b->$sugar_web_service_order_by)) {
         return 0;
     }
     if (is_object($a->$sugar_web_service_order_by) || is_object($b->$sugar_web_service_order_by)
@@ -4778,13 +4778,13 @@ 
     // add wildcard at the beginning of the search string
     if (isset($GLOBALS['sugar_config']['search_wildcard_infront']) &&
         $GLOBALS['sugar_config']['search_wildcard_infront'] == true) {
-        if (substr($str,0,1) <> $wildcard)
+        if (substr($str, 0, 1) <> $wildcard)
           $str = $wildcard.$str;
     }
 
     // add wildcard at the end of search string (default)
     if ($appendWildcard) {
-        if(substr($str,-1) <> $wildcard) {
+        if (substr($str, -1) <> $wildcard) {
             $str .= $wildcard;
         }
     }
@@ -4793,12 +4793,12 @@ 
 }
 
 //check to see if custom utils exists
-if(file_exists('custom/include/custom_utils.php')){
+if (file_exists('custom/include/custom_utils.php')) {
 	include_once('custom/include/custom_utils.php');
 }
 
 //check to see if custom utils exists in Extension framework
-if(file_exists('custom/application/Ext/Utils/custom_utils.ext.php')) {
+if (file_exists('custom/application/Ext/Utils/custom_utils.ext.php')) {
     include_once('custom/application/Ext/Utils/custom_utils.ext.php');
 }
 /**
@@ -4852,8 +4852,8 @@ 
 function utf8_recursive_encode($data)
 {
     $result = array();
-    foreach($data as $key=>$val) {
-        if(is_array($val)) {
+    foreach ($data as $key=>$val) {
+        if (is_array($val)) {
            $result[$key] = utf8_recursive_encode($val);
         } else {
            $result[$key] = utf8_encode($val);
@@ -4917,12 +4917,12 @@ 
         $sendUrl = $sugar_config['custom_help_url'];
     } else {
         if (!empty($sugar_config['custom_help_base_url'])) {
-            $baseUrl= $sugar_config['custom_help_base_url'];
+            $baseUrl = $sugar_config['custom_help_base_url'];
         } else {
             $baseUrl = "http://www.sugarcrm.com/crm/product_doc.php";
         }
-        $sendUrl = $baseUrl . "?edition={$send_edition}&version={$send_version}&lang={$send_lang}&module={$send_module}&help_action={$send_action}&status={$dev_status}&key={$send_key}";
-        if(!empty($send_anchor)) {
+        $sendUrl = $baseUrl."?edition={$send_edition}&version={$send_version}&lang={$send_lang}&module={$send_module}&help_action={$send_action}&status={$dev_status}&key={$send_key}";
+        if (!empty($send_anchor)) {
             $sendUrl .= "&anchor=".$send_anchor;
         }
     }
@@ -4937,13 +4937,13 @@ 
  *
  * @param string $etag ETag to use for this content.
  */
-function generateETagHeader($etag){
+function generateETagHeader($etag) {
 	header("cache-control:");
 	header('Expires: ');
-	header("ETag: " . $etag);
+	header("ETag: ".$etag);
 	header("Pragma:");
-	if(isset($_SERVER["HTTP_IF_NONE_MATCH"])){
-		if($etag == $_SERVER["HTTP_IF_NONE_MATCH"]){
+	if (isset($_SERVER["HTTP_IF_NONE_MATCH"])) {
+		if ($etag == $_SERVER["HTTP_IF_NONE_MATCH"]) {
 			ob_clean();
 			header("Status: 304 Not Modified");
 			header("HTTP/1.0 304 Not Modified");
@@ -4988,12 +4988,12 @@ 
  */
 function clean_sensitive_data($defs, $data)
 {
-    foreach($defs as $field => $def) {
-        if(!empty($def['sensitive'])) {
-            if(is_array($data)) {
+    foreach ($defs as $field => $def) {
+        if (!empty($def['sensitive'])) {
+            if (is_array($data)) {
                 $data[$field] = '';
             }
-            if($data instanceof SugarBean) {
+            if ($data instanceof SugarBean) {
                 $data->$field = '';
             }
         }
@@ -5027,7 +5027,7 @@ 
         // Add the relationship name for easier recognition
         foreach ($select_array as $key => $value)
         {
-            $select_array[$key] .= ' (' . $key . ')';
+            $select_array[$key] .= ' ('.$key.')';
         }
     }
     asort($select_array);
@@ -5056,7 +5056,7 @@ 
  */
 function assignConcatenatedValue(SugarBean $bean, $fieldDef, $value)
 {
-    $valueParts = explode(' ',$value);
+    $valueParts = explode(' ', $value);
     $valueParts = array_filter($valueParts);
     $fieldNum   = count($fieldDef['db_concat_fields']);
 
@@ -5076,56 +5076,56 @@ 
 
         if (!empty($valueParts))
         {
-            $bean->$fieldName .= ' ' . implode(' ', $valueParts);
+            $bean->$fieldName .= ' '.implode(' ', $valueParts);
         }
     }
 }
 
-define("DEFAULT_UTIL_SUITE_ENCODING","UTF-8");
+define("DEFAULT_UTIL_SUITE_ENCODING", "UTF-8");
 
 function suite_strlen($input, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strlen'))
-		return mb_strlen($input,$encoding);
+	if (function_exists('mb_strlen'))
+		return mb_strlen($input, $encoding);
 	else
 		return strlen($input);
 }
 
-function suite_substr($input, $start, $length = null,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
+function suite_substr($input, $start, $length = null, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_substr'))
-		return mb_substr($input,$start,$length,$encoding);
+	if (function_exists('mb_substr'))
+		return mb_substr($input, $start, $length, $encoding);
 	else
-		return substr($input,$start,$length);
+		return substr($input, $start, $length);
 }
 
-function suite_strtoupper($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
+function suite_strtoupper($input, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtoupper'))
-		return mb_strtoupper($input,$encoding);
+	if (function_exists('mb_strtoupper'))
+		return mb_strtoupper($input, $encoding);
 	else
 		return strtoupper($input);
 }
-function suite_strtolower($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
+function suite_strtolower($input, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtolower'))
-		return mb_strtolower($input,$encoding);
+	if (function_exists('mb_strtolower'))
+		return mb_strtolower($input, $encoding);
 	else
 		return strtolower($input);
 }
 
-function suite_strpos($haystack,$needle,$offset=0,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
+function suite_strpos($haystack, $needle, $offset = 0, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strpos'))
-		return mb_strpos($haystack,$needle,$offset,$encoding);
+	if (function_exists('mb_strpos'))
+		return mb_strpos($haystack, $needle, $offset, $encoding);
 	else
-		return strpos($haystack,$needle,$offset);
+		return strpos($haystack, $needle, $offset);
 }
 
-function suite_strrpos($haystack,$needle,$offset=0,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
+function suite_strrpos($haystack, $needle, $offset = 0, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strrpos'))
-		return mb_strrpos($haystack,$needle,$offset,$encoding);
+	if (function_exists('mb_strrpos'))
+		return mb_strrpos($haystack, $needle, $offset, $encoding);
 	else
-		return strrpos($haystack,$needle,$offset);
+		return strrpos($haystack, $needle, $offset);
 }
\ No newline at end of file

include/Popups/PopupSmarty.php

Spacing +77 added lines, -77 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.
@@ -43,7 +43,7 @@ 
 require_once('include/TemplateHandler/TemplateHandler.php');
 require_once('include/SearchForm/SearchForm2.php');
 define("NUM_COLS", 2);
-class PopupSmarty extends ListViewSmarty{
+class PopupSmarty extends ListViewSmarty {
 
 	var $contextMenus = false;
 	var $export = false;
@@ -70,7 +70,7 @@ 
     var $module;
     var $massUpdateData = '';
 
-	function PopupSmarty($seed, $module){
+	function PopupSmarty($seed, $module) {
 		parent::ListViewSmarty();
 		$this->th = new TemplateHandler();
 		$this->th->loadSmarty();
@@ -91,9 +91,9 @@ 
      */
     function processArrowVars()
     {
-        $pathParts = pathinfo(SugarThemeRegistry::current()->getImageURL('arrow.gif',false));
+        $pathParts = pathinfo(SugarThemeRegistry::current()->getImageURL('arrow.gif', false));
 
-        list($width,$height) = getimagesize($pathParts['dirname'].'/'.$pathParts['basename']);
+        list($width, $height) = getimagesize($pathParts['dirname'].'/'.$pathParts['basename']);
 
         $this->th->ss->assign('arrowExt', $pathParts['extension']);
         $this->th->ss->assign('arrowWidth', $width);
@@ -119,16 +119,16 @@ 
 		$this->data = $data;
 
         $totalWidth = 0;
-        foreach($this->displayColumns as $name => $params) {
+        foreach ($this->displayColumns as $name => $params) {
             $totalWidth += $params['width'];
         }
         $adjustment = $totalWidth / 100;
 
         $contextMenuObjectsTypes = array();
-        foreach($this->displayColumns as $name => $params) {
+        foreach ($this->displayColumns as $name => $params) {
             $this->displayColumns[$name]['width'] = round($this->displayColumns[$name]['width'] / $adjustment, 2);
             // figure out which contextMenu objectsTypes are required
-            if(!empty($params['contextMenu']['objectType']))
+            if (!empty($params['contextMenu']['objectType']))
                 $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true;
         }
 		$this->th->ss->assign('displayColumns', $this->displayColumns);
@@ -147,22 +147,22 @@ 
 		$this->th->ss->assign('searchForm', $this->searchForm->display(false));
         //rrs
 
-		if($this->export) $this->th->ss->assign('exportLink', $this->buildExportLink());
+		if ($this->export) $this->th->ss->assign('exportLink', $this->buildExportLink());
 		$this->th->ss->assign('quickViewLinks', $this->quickViewLinks);
-		if($this->mailMerge) $this->th->ss->assign('mergeLink', $this->buildMergeLink()); // still check for mailmerge access
-		if($this->mergeduplicates) $this->th->ss->assign('mergedupLink', $this->buildMergeDuplicatesLink());
+		if ($this->mailMerge) $this->th->ss->assign('mergeLink', $this->buildMergeLink()); // still check for mailmerge access
+		if ($this->mergeduplicates) $this->th->ss->assign('mergedupLink', $this->buildMergeDuplicatesLink());
 
 
 		if (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
 			$this->multiSelect = true;
 		}
 		// handle save checks and stuff
-		if($this->multiSelect) {
+		if ($this->multiSelect) {
 			$this->th->ss->assign('selectedObjectsSpan', $this->buildSelectedObjectsSpan());
 			$this->th->ss->assign('multiSelectData', $this->getMultiSelectData());
 			$this->th->ss->assign('MODE', "<input type='hidden' name='mode' value='MultiSelect'>");
             $pageTotal = $this->data['pageData']['offsets']['next'] - $this->data['pageData']['offsets']['current'];
-            if($this->data['pageData']['offsets']['next'] < 0){ // If we are on the last page, 'next' is -1, which means we have to have a custom calculation
+            if ($this->data['pageData']['offsets']['next'] < 0) { // If we are on the last page, 'next' is -1, which means we have to have a custom calculation
                 $pageTotal = $this->data['pageData']['offsets']['total'] - $this->data['pageData']['offsets']['current'];
             }
     		$this->th->ss->assign('selectLink', $this->buildSelectLink('select_link', $this->data['pageData']['offsets']['total'], $pageTotal));
@@ -175,10 +175,10 @@ 
         $this->th->ss->assign('contextMenus', $this->contextMenus);
 
 
-        if($this->contextMenus && !empty($contextMenuObjectsTypes)) {
+        if ($this->contextMenus && !empty($contextMenuObjectsTypes)) {
             $script = '';
             $cm = new contextMenu();
-            foreach($contextMenuObjectsTypes as $type => $value) {
+            foreach ($contextMenuObjectsTypes as $type => $value) {
                 $cm->loadFromFile($type);
                 $script .= $cm->getScript();
                 $cm->menuItems = array(); // clear menuItems out
@@ -199,11 +199,11 @@ 
 	function display($end = true) {
         global $app_strings;
 
-        if(!is_file(sugar_cached("jsLanguage/{$GLOBALS['current_language']}.js"))) {
+        if (!is_file(sugar_cached("jsLanguage/{$GLOBALS['current_language']}.js"))) {
             require_once('include/language/jsLanguage.php');
             jsLanguage::createAppStringsCache($GLOBALS['current_language']);
         }
-        $jsLang = getVersionedScript("cache/jsLanguage/{$GLOBALS['current_language']}.js",  $GLOBALS['sugar_config']['js_lang_version']);
+        $jsLang = getVersionedScript("cache/jsLanguage/{$GLOBALS['current_language']}.js", $GLOBALS['sugar_config']['js_lang_version']);
 
         $this->th->ss->assign('data', $this->data['data']);
 		$this->data['pageData']['offsets']['lastOffsetOnPage'] = $this->data['pageData']['offsets']['current'] + count($this->data['data']);
@@ -223,10 +223,10 @@ 
 		$searchNameOverride = !empty($this->seed) && $this->seed instanceof Person && (isset($this->data['data'][0]['FIRST_NAME']) && isset($this->data['data'][0]['LAST_NAME'])) ? true : false;
 		
 		global $locale;
-		foreach($this->data['data'] as $val)
+		foreach ($this->data['data'] as $val)
 		{
 			$associated_row_data[$val['ID']] = $val;
-			if($searchNameOverride)
+			if ($searchNameOverride)
 			{
 			   $associated_row_data[$val['ID']]['NAME'] = $locale->getLocaleFormattedName($val['FIRST_NAME'], $val['LAST_NAME']);
 			}
@@ -237,7 +237,7 @@ 
 		$this->th->ss->assign('lang', substr($GLOBALS['current_language'], 0, 2));
         $this->th->ss->assign('headerTpl', $this->headerTpl);
         $this->th->ss->assign('footerTpl', $this->footerTpl);
-        $this->th->ss->assign('ASSOCIATED_JAVASCRIPT_DATA', 'var associated_javascript_data = '.$json->encode($associated_row_data). '; var is_show_fullname = '.$is_show_fullname.';');
+        $this->th->ss->assign('ASSOCIATED_JAVASCRIPT_DATA', 'var associated_javascript_data = '.$json->encode($associated_row_data).'; var is_show_fullname = '.$is_show_fullname.';');
 		$this->th->ss->assign('module', $this->seed->module_dir);
 		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
 
@@ -258,8 +258,8 @@ 
 		$this->th->ss->assign('sugarVersion', $GLOBALS['sugar_version']);
         $this->th->ss->assign('should_process', $this->should_process);
 
-		if($this->_create){
-			$this->th->ss->assign('ADDFORM', $this->getQuickCreate());//$this->_getAddForm());
+		if ($this->_create) {
+			$this->th->ss->assign('ADDFORM', $this->getQuickCreate()); //$this->_getAddForm());
 			$this->th->ss->assign('ADDFORMHEADER', $this->_getAddFormHeader());
 			$this->th->ss->assign('object_name', $this->seed->object_name);
 		}
@@ -278,15 +278,15 @@ 
 	}
 	function _setup($file) {
 
-	    if(isset($this->_popupMeta)){
-			if(isset($this->_popupMeta['create']['formBase'])) {
-				require_once('modules/' . $this->seed->module_dir . '/' . $this->_popupMeta['create']['formBase']);
+	    if (isset($this->_popupMeta)) {
+			if (isset($this->_popupMeta['create']['formBase'])) {
+				require_once('modules/'.$this->seed->module_dir.'/'.$this->_popupMeta['create']['formBase']);
 				$this->_create = true;
 			}
 		}
-	    if(!empty($this->_popupMeta['create'])){
+	    if (!empty($this->_popupMeta['create'])) {
 			$formBase = new $this->_popupMeta['create']['formBaseClass']();
-			if(isset($_REQUEST['doAction']) && $_REQUEST['doAction'] == 'save')
+			if (isset($_REQUEST['doAction']) && $_REQUEST['doAction'] == 'save')
 			{
 				//If it's a new record, set useRequired to false
 				$useRequired = empty($_REQUEST['id']) ? false : true;
@@ -295,19 +295,19 @@ 
 		}
 
 		$params = array();
-		if(!empty($this->_popupMeta['orderBy'])){
+		if (!empty($this->_popupMeta['orderBy'])) {
 			$params['orderBy'] = $this->_popupMeta['orderBy'];
 		}
 
-		if(file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')){
+		if (file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')) {
 			require('custom/modules/'.$this->module.'/metadata/metafiles.php');
-		}elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
+		}elseif (file_exists('modules/'.$this->module.'/metadata/metafiles.php')) {
 			require('modules/'.$this->module.'/metadata/metafiles.php');
 		}
 
-		if(!empty($metafiles[$this->module]['searchfields'])) {
+		if (!empty($metafiles[$this->module]['searchfields'])) {
 			require($metafiles[$this->module]['searchfields']);
-		} elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php')) {
+		} elseif (file_exists('modules/'.$this->module.'/metadata/SearchFields.php')) {
 			require('modules/'.$this->module.'/metadata/SearchFields.php');
 	    }
         $this->searchdefs[$this->module]['templateMeta']['maxColumns'] = 2;
@@ -319,23 +319,23 @@ 
 
 		$lv = new ListViewSmarty();
 		$displayColumns = array();
-		if(!empty($_REQUEST['displayColumns'])) {
-		    foreach(explode('|', $_REQUEST['displayColumns']) as $num => $col) {
-		        if(!empty($listViewDefs[$this->module][$col]))
+		if (!empty($_REQUEST['displayColumns'])) {
+		    foreach (explode('|', $_REQUEST['displayColumns']) as $num => $col) {
+		        if (!empty($listViewDefs[$this->module][$col]))
 		            $displayColumns[$col] = $this->listviewdefs[$this->module][$col];
 		    }
 		}
 		else {
-		    foreach($this->listviewdefs[$this->module] as $col => $para) {
-		        if(!empty($para['default']) && $para['default'])
+		    foreach ($this->listviewdefs[$this->module] as $col => $para) {
+		        if (!empty($para['default']) && $para['default'])
 		            $displayColumns[$col] = $para;
 		    }
 		}
 		$params['massupdate'] = true;
-		if(!empty($_REQUEST['orderBy'])) {
+		if (!empty($_REQUEST['orderBy'])) {
 		    $params['orderBy'] = $_REQUEST['orderBy'];
 		    $params['overrideOrder'] = true;
-		    if(!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
+		    if (!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
 		}
 
 		$lv->displayColumns = $displayColumns;
@@ -350,27 +350,27 @@ 
 
         $this->should_process = true;
 
-        if(isset($params['export'])) {
+        if (isset($params['export'])) {
           $this->export = $params['export'];
         }
-        if(!empty($params['multiSelectPopup'])) {
+        if (!empty($params['multiSelectPopup'])) {
 		  $this->multi_select_popup = $params['multiSelectPopup'];
         }
-		if(!empty($params['massupdate']) && $params['massupdate'] != false) {
+		if (!empty($params['massupdate']) && $params['massupdate'] != false) {
 			$this->show_mass_update_form = true;
 			$this->mass = new MassUpdate();
 			$this->mass->setSugarBean($this->seed);
-			if(!empty($params['handleMassupdate']) || !isset($params['handleMassupdate'])) {
+			if (!empty($params['handleMassupdate']) || !isset($params['handleMassupdate'])) {
                 $this->mass->handleMassUpdate();
             }
 		}
 
         // create filter fields based off of display columns
-        if(empty($this->filter_fields) || $this->mergeDisplayColumns) {
-            foreach($this->displayColumns as $columnName => $def) {
+        if (empty($this->filter_fields) || $this->mergeDisplayColumns) {
+            foreach ($this->displayColumns as $columnName => $def) {
                $this->filter_fields[strtolower($columnName)] = true;
-               if(!empty($def['related_fields'])) {
-                    foreach($def['related_fields'] as $field) {
+               if (!empty($def['related_fields'])) {
+                    foreach ($def['related_fields'] as $field) {
                         //id column is added by query construction function. This addition creates duplicates
                         //and causes issues in oracle. #10165
                         if ($field != 'id') {
@@ -379,15 +379,15 @@ 
                     }
                 }
                 if (!empty($this->seed->field_defs[strtolower($columnName)]['db_concat_fields'])) {
-	                foreach($this->seed->field_defs[strtolower($columnName)]['db_concat_fields'] as $index=>$field){
-	                    if(!isset($this->filter_fields[strtolower($field)]) || !$this->filter_fields[strtolower($field)])
+	                foreach ($this->seed->field_defs[strtolower($columnName)]['db_concat_fields'] as $index=>$field) {
+	                    if (!isset($this->filter_fields[strtolower($field)]) || !$this->filter_fields[strtolower($field)])
 	                    {
 	                        $this->filter_fields[strtolower($field)] = true;
 	                    }
 	                }
                 }
             }
-            foreach ($this->searchColumns as $columnName => $def )
+            foreach ($this->searchColumns as $columnName => $def)
             {
                 $this->filter_fields[strtolower($columnName)] = true;
             }
@@ -403,13 +403,13 @@ 
          * By default bean's create_new_list_query function loads fields displayed on the page or used in the search
          * add fields used to populate forms from _viewdefs :: field_to_name_array to retrive from db
          */
-        if ( isset($_REQUEST['field_to_name']) && $_REQUEST['field_to_name'] )
+        if (isset($_REQUEST['field_to_name']) && $_REQUEST['field_to_name'])
         {
             $_REQUEST['field_to_name'] = is_array($_REQUEST['field_to_name']) ? $_REQUEST['field_to_name'] : array($_REQUEST['field_to_name']);
-            foreach ( $_REQUEST['field_to_name'] as $add_field )
+            foreach ($_REQUEST['field_to_name'] as $add_field)
             {
                 $add_field = strtolower($add_field);
-                if ( $add_field != 'id' && !isset($this->filter_fields[$add_field]) && isset($this->seed->field_defs[$add_field]) )
+                if ($add_field != 'id' && !isset($this->filter_fields[$add_field]) && isset($this->seed->field_defs[$add_field]))
                 {
                     $this->filter_fields[$add_field] = true;
                 }
@@ -427,7 +427,7 @@ 
 			    'pageData'=>array(
 			    	'bean'=>array('moduleDir'=>$this->seed->module_dir),
 					'ordering'=>'',
-					'offsets'=>array('total'=>0,'next'=>0,'current'=>0),
+					'offsets'=>array('total'=>0, 'next'=>0, 'current'=>0),
 				),
 			);
 		}
@@ -447,13 +447,13 @@ 
 
 		// Bug 43452 - FG - Changed the way generated Where array is imploded into the string.
 		//                  Now it's imploding in the same way view.list.php do.
-		if (count($where_clauses) > 0 ) {
-		    $where = '( ' . implode(' and ', $where_clauses) . ' )';
+		if (count($where_clauses) > 0) {
+		    $where = '( '.implode(' and ', $where_clauses).' )';
         }
 
         // Need to include the default whereStatement
-		if(!empty($this->_popupMeta['whereStatement'])){
-            if(!empty($where))$where .= ' AND ';
+		if (!empty($this->_popupMeta['whereStatement'])) {
+            if (!empty($where))$where .= ' AND ';
             $where .= $this->_popupMeta['whereStatement'];
 		}
 
@@ -463,48 +463,48 @@ 
 	/*
 	 * Generate the data for the search form on the header of the Popup.
 	 */
-		function _build_field_defs(){
+		function _build_field_defs() {
 		$this->formData = array();
 		$this->customFieldDefs = array();
-		foreach($this->searchdefs[$this->module]['layout']['advanced_search'] as $data){
-			if(is_array($data)){
+		foreach ($this->searchdefs[$this->module]['layout']['advanced_search'] as $data) {
+			if (is_array($data)) {
 
 				$this->formData[] = array('field' => $data);
 				$value = '';
-				$this->customFieldDefs[$data['name']]= $data;
-				if(!empty($_REQUEST[$data['name']]))
+				$this->customFieldDefs[$data['name']] = $data;
+				if (!empty($_REQUEST[$data['name']]))
 	            	$value = $_REQUEST[$data['name']];
 	            $this->customFieldDefs[$data['name']]['value'] = $value;
-			}else
+			} else
 				$this->formData[] = array('field' => array('name'=>$data));
 		}
 		$this->fieldDefs = array();
-		if($this->seed){
+		if ($this->seed) {
 			$this->seed->fill_in_additional_detail_fields();
 
-	        foreach($this->seed->toArray() as $name => $value) {
+	        foreach ($this->seed->toArray() as $name => $value) {
 	            $this->fieldDefs[$name] = $this->seed->field_defs[$name];
 	            //if we have a relate type then reset to name so that we end up with a textbox
 	            //rather than a select button
 	            $this->fieldDefs[$name]['name'] = $this->fieldDefs[$name]['name'];
-	            if($this->fieldDefs[$name]['type'] == 'relate')
+	            if ($this->fieldDefs[$name]['type'] == 'relate')
 	            	$this->fieldDefs[$name]['type'] = 'name';
-	            if(isset($this->fieldDefs[$name]['options']) && isset($GLOBALS['app_list_strings'][$this->fieldDefs[$name]['options']])) {
+	            if (isset($this->fieldDefs[$name]['options']) && isset($GLOBALS['app_list_strings'][$this->fieldDefs[$name]['options']])) {
 	                $this->fieldDefs[$name]['options'] = $GLOBALS['app_list_strings'][$this->fieldDefs[$name]['options']]; // fill in enums
 	            }
-	            if(!empty($_REQUEST[$name]))
+	            if (!empty($_REQUEST[$name]))
 	            	$value = $_REQUEST[$name];
 	            $this->fieldDefs[$name]['value'] = $value;
 	        }
 		}
 	}
 
-	function _getAddForm(){
+	function _getAddForm() {
 		$addform = '';
-        if(!$this->seed->ACLAccess('save')){
+        if (!$this->seed->ACLAccess('save')) {
             return;
         }
-		if(!empty($this->_popupMeta['create'])){
+		if (!empty($this->_popupMeta['create'])) {
 			$formBase = new $this->_popupMeta['create']['formBaseClass']();
 
 
@@ -526,7 +526,7 @@ 
 		}
 	}
 
-	function _getAddFormHeader(){
+	function _getAddFormHeader() {
 		$lbl_save_button_title = $GLOBALS['app_strings']['LBL_SAVE_BUTTON_TITLE'];
 		$lbl_save_button_key = $GLOBALS['app_strings']['LBL_SAVE_BUTTON_KEY'];
 		$lbl_save_button_label = $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL'];
@@ -539,9 +539,9 @@ 
 			<input type="hidden" name="return_action" value="Popup">
 EOQ;
 		// if metadata contains custom inputs for the quickcreate
-		if(!empty($this->_popupMeta['customInput']) && is_array($this->_popupMeta['customInput'])) {
-			foreach($this->_popupMeta['customInput'] as $key => $value)
-				$formSave .= '<input type="hidden" name="' . $key . '" value="'. $value .'">\n';
+		if (!empty($this->_popupMeta['customInput']) && is_array($this->_popupMeta['customInput'])) {
+			foreach ($this->_popupMeta['customInput'] as $key => $value)
+				$formSave .= '<input type="hidden" name="'.$key.'" value="'.$value.'">\n';
 		}
 
 
@@ -549,7 +549,7 @@ 
 		return $addformheader;
 	}
 
-	function getQuickCreate(){
+	function getQuickCreate() {
 		require_once("include/EditView/PopupQuickCreate.php");
 		$qc = new PopupQuickCreate($this->module);
 		return $qc->process($this->module);

include/language/getJSLanguage.php

Spacing +4 added lines, -4 removed lines

@@ -35,14 +35,14 @@ 
         if (!preg_match("/^\w\w_\w\w$/", $lang)) {
             echo "did not match regex<br/>";
         } else {
-            echo  "$lang was not in list . <pre>" . print_r($languages, true) . "</pre>";
+            echo  "$lang was not in list . <pre>".print_r($languages, true)."</pre>";
         }
         echo "Invalid language specified";
 
         return;
     }
     if (empty($_REQUEST['module']) || $_REQUEST['module'] === 'app_strings') {
-        $file = sugar_cached('jsLanguage/') . $lang . '.js';
+        $file = sugar_cached('jsLanguage/').$lang.'.js';
         if (!sugar_is_file($file)) {
             jsLanguage::createAppStringsCache($lang);
         }
@@ -54,7 +54,7 @@ 
 
             return;
         }
-        $file = sugar_cached('jsLanguage/') . $module . "/" . $lang . '.js';
+        $file = sugar_cached('jsLanguage/').$module."/".$lang.'.js';
         if (!sugar_is_file($file)) {
             jsLanguage::createModuleStringsCache($module, $lang);
         }
@@ -64,7 +64,7 @@ 
     header("Content-Type: application/javascript");
     header("Cache-Control: max-age=31556940, private");
     header("Pragma: ");
-    header("Expires: " . gmdate('D, d M Y H:i:s \G\M\T', time() + 31556940));
+    header("Expires: ".gmdate('D, d M Y H:i:s \G\M\T', time() + 31556940));
 
     readfile($file);
 }

include/language/jsLanguage.php

Spacing +6 added lines, -6 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.
@@ -62,7 +62,7 @@ 
 EOQ;
         
         $cacheDir = create_cache_directory('jsLanguage/');
-        if($fh = @sugar_fopen($cacheDir . $lang . '.js', "w")){
+        if ($fh = @sugar_fopen($cacheDir.$lang.'.js', "w")) {
             fputs($fh, $str);
             fclose($fh);
         }
@@ -74,16 +74,16 @@ 
         // cn: bug 8242 - non-US langpack chokes
         $mod_strings = return_module_language($lang, $moduleDir);
         $mod_strings_encoded = $json->encode($mod_strings);
-        $str = "SUGAR.language.setLanguage('" . $moduleDir . "', " . $mod_strings_encoded . ");";
+        $str = "SUGAR.language.setLanguage('".$moduleDir."', ".$mod_strings_encoded.");";
         
-        $cacheDir = create_cache_directory('jsLanguage/' . $moduleDir . '/');
+        $cacheDir = create_cache_directory('jsLanguage/'.$moduleDir.'/');
         
-        if($fh = @fopen($cacheDir . $lang . '.js', "w")){
+        if ($fh = @fopen($cacheDir.$lang.'.js', "w")) {
             fputs($fh, $str);
             fclose($fh);
         }
 
-        if($return) {
+        if ($return) {
             return $str;
         }
     }

include/language/en_us.lang.php

Spacing +135 added lines, -135 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.
@@ -48,11 +48,11 @@ 
 
 //the left value is the key stored in the db and the right value is ie display value
 //to translate, only modify the right value in each key/value pair
-$app_list_strings = array (
+$app_list_strings = array(
 //e.g. auf Deutsch 'Contacts'=>'Contakten',
   'language_pack_name' => 'US English',
   'moduleList' =>
-  array (
+  array(
     'Home' => 'Home',
     'Contacts' => 'Contacts',
     'Accounts' => 'Accounts',
@@ -113,7 +113,7 @@ 
   ),
 
   'moduleListSingular' =>
-  array (
+  array(
     'Home' => 'Home',
     'Dashboard' => 'Dashboard',
     'Contacts' => 'Contact',
@@ -153,7 +153,7 @@ 
 
   //e.g. en fran�ais 'Analyst'=>'Analyste',
   'account_type_dom' =>
-  array (
+  array(
     '' => '',
     'Analyst' => 'Analyst',
     'Competitor' => 'Competitor',
@@ -168,7 +168,7 @@ 
   ),
   //e.g. en espa�ol 'Apparel'=>'Ropa',
   'industry_dom' =>
-  array (
+  array(
     '' => '',
     'Apparel' => 'Apparel',
     'Banking' => 'Banking',
@@ -203,7 +203,7 @@ 
   ),
   'lead_source_default_key' => 'Self Generated',
   'lead_source_dom' =>
-  array (
+  array(
     '' => '',
     'Cold Call' => 'Cold Call',
     'Existing Customer' => 'Existing Customer',
@@ -221,13 +221,13 @@ 
     'Other' => 'Other',
   ),
   'opportunity_type_dom' =>
-  array (
+  array(
     '' => '',
     'Existing Business' => 'Existing Business',
     'New Business' => 'New Business',
   ),
   'roi_type_dom' =>
-    array (
+    array(
     'Revenue' => 'Revenue',
     'Investment'=>'Investment',
     'Expected_Revenue'=>'Expected Revenue',
@@ -238,7 +238,7 @@ 
 //       it is the key for the default opportunity_relationship_type_dom value
   'opportunity_relationship_type_default_key' => 'Primary Decision Maker',
   'opportunity_relationship_type_dom' =>
-  array (
+  array(
     '' => '',
     'Primary Decision Maker' => 'Primary Decision Maker',
     'Business Decision Maker' => 'Business Decision Maker',
@@ -253,24 +253,24 @@ 
 //       it is the key for the default case_relationship_type_dom value
   'case_relationship_type_default_key' => 'Primary Contact',
   'case_relationship_type_dom' =>
-  array (
+  array(
     '' => '',
     'Primary Contact' => 'Primary Contact',
     'Alternate Contact' => 'Alternate Contact',
   ),
   'payment_terms' =>
-  array (
+  array(
     '' => '',
     'Net 15' => 'Net 15',
     'Net 30' => 'Net 30',
   ),
   'sales_stage_default_key' => 'Prospecting',
-  'fts_type' => array (
+  'fts_type' => array(
       '' => '',
       'Elastic' => 'elasticsearch'
   ),
   'sales_stage_dom' =>
-  array (
+  array(
     'Prospecting' => 'Prospecting',
     'Qualification' => 'Qualification',
     'Needs Analysis' => 'Needs Analysis',
@@ -282,7 +282,7 @@ 
     'Closed Won' => 'Closed Won',
     'Closed Lost' => 'Closed Lost',
   ),
-  'in_total_group_stages' => array (
+  'in_total_group_stages' => array(
     'Draft' => 'Draft',
     'Negotiation' => 'Negotiation',
     'Delivered' => 'Delivered',
@@ -293,7 +293,7 @@ 
     'Closed Dead' => 'Closed Dead',
   ),
   'sales_probability_dom' => // keys must be the same as sales_stage_dom
-  array (
+  array(
     'Prospecting' => '10',
     'Qualification' => '20',
     'Needs Analysis' => '25',
@@ -306,7 +306,7 @@ 
     'Closed Lost' => '0',
   ),
   'activity_dom' =>
-  array (
+  array(
     'Call' => 'Call',
     'Meeting' => 'Meeting',
     'Task' => 'Task',
@@ -314,7 +314,7 @@ 
     'Note' => 'Note',
   ),
   'salutation_dom' =>
-      array (
+      array(
         '' => '',
         'Mr.' => 'Mr.',
         'Ms.' => 'Ms.',
@@ -324,7 +324,7 @@ 
       ),
   //time is in seconds; the greater the time the longer it takes;
   'reminder_max_time' => 90000,
-  'reminder_time_options' => array( 60=> '1 minute prior',
+  'reminder_time_options' => array(60=> '1 minute prior',
                                   300=> '5 minutes prior',
                                   600=> '10 minutes prior',
                                   900=> '15 minutes prior',
@@ -338,14 +338,14 @@ 
 
   'task_priority_default' => 'Medium',
   'task_priority_dom' =>
-  array (
+  array(
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
   ),
   'task_status_default' => 'Not Started',
   'task_status_dom' =>
-  array (
+  array(
     'Not Started' => 'Not Started',
     'In Progress' => 'In Progress',
     'Completed' => 'Completed',
@@ -354,35 +354,35 @@ 
   ),
   'meeting_status_default' => 'Planned',
   'meeting_status_dom' =>
-  array (
+  array(
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
   ),
   'extapi_meeting_password' =>
-  array (
+  array(
       'WebEx' => 'WebEx',
   ),
   'meeting_type_dom' =>
-   array (
+   array(
       'Other' => 'Other',
       'Sugar' => 'SuiteCRM',
    ),
   'call_status_default' => 'Planned',
   'call_status_dom' =>
-  array (
+  array(
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
   ),
   'call_direction_default' => 'Outbound',
   'call_direction_dom' =>
-  array (
+  array(
     'Inbound' => 'Inbound',
     'Outbound' => 'Outbound',
   ),
   'lead_status_dom' =>
-  array (
+  array(
     '' => '',
     'New' => 'New',
     'Assigned' => 'Assigned',
@@ -392,7 +392,7 @@ 
     'Dead' => 'Dead',
   ),
    'gender_list' =>
-  array (
+  array(
     'male' => 'Male',
     'female' => 'Female',
   ),
@@ -400,7 +400,7 @@ 
 //       it is the key for the default case_status_dom value
   'case_status_default_key' => 'New',
   'case_status_dom' =>
-  array (
+  array(
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
@@ -410,49 +410,49 @@ 
   ),
   'case_priority_default_key' => 'P2',
   'case_priority_dom' =>
-  array (
+  array(
     'P1' => 'High',
     'P2' => 'Medium',
     'P3' => 'Low',
   ),
   'user_type_dom' =>
-  array (
+  array(
     'RegularUser' => 'Regular User',
     'Administrator' => 'Administrator',
   ),
   'user_status_dom' =>
-  array (
+  array(
     'Active' => 'Active',
     'Inactive' => 'Inactive',
   ),
   'employee_status_dom' =>
-  array (
+  array(
     'Active' => 'Active',
     'Terminated' => 'Terminated',
     'Leave of Absence' => 'Leave of Absence',
   ),
   'messenger_type_dom' =>
-  array (
+  array(
     '' => '',
     'MSN' => 'MSN',
     'Yahoo!' => 'Yahoo!',
     'AOL' => 'AOL',
   ),
-    'project_task_priority_options' => array (
+    'project_task_priority_options' => array(
         'High' => 'High',
         'Medium' => 'Medium',
         'Low' => 'Low',
     ),
     'project_task_priority_default' => 'Medium',
 
-    'project_task_status_options' => array (
+    'project_task_status_options' => array(
         'Not Started' => 'Not Started',
         'In Progress' => 'In Progress',
         'Completed' => 'Completed',
         'Pending Input' => 'Pending Input',
         'Deferred' => 'Deferred',
     ),
-    'project_task_utilization_options' => array (
+    'project_task_utilization_options' => array(
         '0' => 'none',
         '25' => '25',
         '50' => '50',
@@ -460,7 +460,7 @@ 
         '100' => '100',
     ),
 
-    'project_status_dom' => array (
+    'project_status_dom' => array(
         'Draft' => 'Draft',
         'In Review' => 'In Review',
         'Underway' => 'Underway',
@@ -469,12 +469,12 @@ 
     ),
     'project_status_default' => 'Draft',
 
-    'project_duration_units_dom' => array (
+    'project_duration_units_dom' => array(
         'Days' => 'Days',
         'Hours' => 'Hours',
     ),
 
-    'project_priority_options' => array (
+    'project_priority_options' => array(
         'High' => 'High',
         'Medium' => 'Medium',
         'Low' => 'Low',
@@ -484,7 +484,7 @@ 
 //       it is the key for the default record_type_module value
   'record_type_default_key' => 'Accounts',
   'record_type_display' =>
-  array (
+  array(
     '' => '',
     'Accounts' => 'Account',
     'Opportunities' => 'Opportunity',
@@ -505,7 +505,7 @@ 
   ),
 
   'record_type_display_notes' =>
-  array (
+  array(
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Opportunities' => 'Opportunity',
@@ -524,7 +524,7 @@ 
   ),
 
   'parent_type_display' =>
-  array (
+  array(
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Tasks' => 'Task',
@@ -545,7 +545,7 @@ 
 
   'issue_priority_default_key' => 'Medium',
   'issue_priority_dom' =>
-  array (
+  array(
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
@@ -553,7 +553,7 @@ 
   ),
   'issue_resolution_default_key' => '',
   'issue_resolution_dom' =>
-  array (
+  array(
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
@@ -564,7 +564,7 @@ 
 
   'issue_status_default_key' => 'New',
   'issue_status_dom' =>
-  array (
+  array(
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
@@ -574,7 +574,7 @@ 
 
   'bug_priority_default_key' => 'Medium',
   'bug_priority_dom' =>
-  array (
+  array(
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
@@ -582,7 +582,7 @@ 
   ),
    'bug_resolution_default_key' => '',
   'bug_resolution_dom' =>
-  array (
+  array(
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
@@ -593,7 +593,7 @@ 
   ),
   'bug_status_default_key' => 'New',
   'bug_status_dom' =>
-  array (
+  array(
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
@@ -602,12 +602,12 @@ 
   ),
    'bug_type_default_key' => 'Bug',
   'bug_type_dom' =>
-  array (
+  array(
     'Defect' => 'Defect',
     'Feature' => 'Feature',
   ),
  'case_type_dom' =>
-  array (
+  array(
     'Administration' => 'Administration',
     'Product' => 'Product',
     'User' => 'User',
@@ -615,7 +615,7 @@ 
 
   'source_default_key' => '',
   'source_dom' =>
-  array (
+  array(
     '' => '',
     'Internal' => 'Internal',
     'Forum' => 'Forum',
@@ -625,7 +625,7 @@ 
 
   'product_category_default_key' => '',
   'product_category_dom' =>
-  array (
+  array(
     '' => '',
     'Accounts' => 'Accounts',
     'Activities' => 'Activities',
@@ -658,7 +658,7 @@ 
   ),
   /*Added entries 'Queued' and 'Sending' for 4.0 release..*/
   'campaign_status_dom' =>
-  array (
+  array(
         '' => '',
         'Planning' => 'Planning',
         'Active' => 'Active',
@@ -668,7 +668,7 @@ 
         'Sending'=> 'Sending',
   ),
   'campaign_type_dom' =>
-  array (
+  array(
         '' => '',
         'Telesales' => 'Telesales',
         'Mail' => 'Mail',
@@ -681,7 +681,7 @@ 
         ),
 
   'newsletter_frequency_dom' =>
-  array (
+  array(
         '' => '',
         'Weekly' => 'Weekly',
         'Monthly' => 'Monthly',
@@ -690,7 +690,7 @@ 
         ),
 
   'notifymail_sendtype' =>
-  array (
+  array(
     'SMTP' => 'SMTP',
   ),
       'dom_cal_month_long'=>array(
@@ -767,7 +767,7 @@ 
         'inbound'   => 'Inbound',
         'campaign'  => 'Campaign'
     ),
-    'dom_email_status' => array (
+    'dom_email_status' => array(
         'archived'  => 'Archived',
         'closed'    => 'Closed',
         'draft'     => 'In Draft',
@@ -777,11 +777,11 @@ 
         'send_error'=> 'Send Error',
         'unread'    => 'Unread',
     ),
-    'dom_email_archived_status' => array (
+    'dom_email_archived_status' => array(
         'archived'  => 'Archived',
     ),
 
-    'dom_email_server_type' => array(   ''          => '--None--',
+    'dom_email_server_type' => array(''          => '--None--',
                                         'imap'      => 'IMAP',
     ),
     'dom_mailbox_type'      => array(/*''           => '--None Specified--',*/
@@ -806,19 +806,19 @@ 
     'dom_int_bool'          => array(1 => 'Yes',
                                      0 => 'No',
     ),
-    'dom_switch_bool'       => array ('on' => 'Yes',
+    'dom_switch_bool'       => array('on' => 'Yes',
                                         'off' => 'No',
-                                        '' => 'No', ),
+                                        '' => 'No',),
 
-    'dom_email_link_type'   => array(   'sugar'     => 'SuiteCRM Email Client',
+    'dom_email_link_type'   => array('sugar'     => 'SuiteCRM Email Client',
                                         'mailto'    => 'External Email Client'),
 
 
-    'dom_email_editor_option'=> array(  ''          => 'Default Email Format',
+    'dom_email_editor_option'=> array(''          => 'Default Email Format',
                                         'html'      => 'HTML Email',
                                         'plain'     => 'Plain Text Email'),
 
-    'schedulers_times_dom'  => array(   'not run'       => 'Past Run Time, Not Executed',
+    'schedulers_times_dom'  => array('not run'       => 'Past Run Time, Not Executed',
                                         'ready'         => 'Ready',
                                         'in progress'   => 'In Progress',
                                         'failed'        => 'Failed',
@@ -827,28 +827,28 @@ 
     ),
 
     'scheduler_status_dom' =>
-        array (
+        array(
         'Active' => 'Active',
         'Inactive' => 'Inactive',
         ),
 
     'scheduler_period_dom' =>
-        array (
+        array(
         'min' => 'Minutes',
         'hour' => 'Hours',
         ),
     'forecast_schedule_status_dom' =>
-    array (
+    array(
     'Active' => 'Active',
     'Inactive' => 'Inactive',
   ),
     'forecast_type_dom' =>
-    array (
+    array(
     'Direct' => 'Direct',
     'Rollup' => 'Rollup',
   ),
     'document_category_dom' =>
-    array (
+    array(
     '' => '',
     'Marketing' => 'Marketing',
     'Knowledege Base' => 'Knowledge Base',
@@ -856,7 +856,7 @@ 
   ),
 
     'document_subcategory_dom' =>
-    array (
+    array(
     '' => '',
     'Marketing Collateral' => 'Marketing Collateral',
     'Product Brochures' => 'Product Brochures',
@@ -864,7 +864,7 @@ 
   ),
 
     'document_status_dom' =>
-    array (
+    array(
     'Active' => 'Active',
     'Draft' => 'Draft',
     'FAQ' => 'FAQ',
@@ -881,13 +881,13 @@ 
     'license'=>'License Agreement',
   ),
     'dom_meeting_accept_options' =>
-    array (
+    array(
     'accept' => 'Accept',
     'decline' => 'Decline',
     'tentative' => 'Tentative',
   ),
     'dom_meeting_accept_status' =>
-    array (
+    array(
     'accept' => 'Accepted',
     'decline' => 'Declined',
     'tentative' => 'Tentative',
@@ -939,7 +939,7 @@ 
 */
 //prospect list type dom
   'prospect_list_type_dom' =>
-  array (
+  array(
     'default' => 'Default',
     'seed' => 'Seed',
     'exempt_domain' => 'Suppression List - By Domain',
@@ -955,14 +955,14 @@ 
         '50'    => '50'
     ),
   'email_marketing_status_dom' =>
-  array (
+  array(
     '' => '',
     'active'=>'Active',
     'inactive'=>'Inactive'
   ),
 
   'campainglog_activity_type_dom' =>
-  array (
+  array(
     ''=>'',
     'targeted' => 'Message Sent/Attempted',
     'send error'=>'Bounced Messages,Other',
@@ -976,33 +976,33 @@ 
   ),
 
   'campainglog_target_type_dom' =>
-  array (
+  array(
     'Contacts' => 'Contacts',
     'Users'=>'Users',
     'Prospects'=>'Targets',
     'Leads'=>'Leads',
     'Accounts'=>'Accounts',
   ),
-  'merge_operators_dom' => array (
+  'merge_operators_dom' => array(
     'like'=>'Contains',
     'exact'=>'Exactly',
     'start'=>'Starts With',
   ),
 
-  'custom_fields_importable_dom' => array (
+  'custom_fields_importable_dom' => array(
     'true'=>'Yes',
     'false'=>'No',
     'required'=>'Required',
   ),
 
-    'Elastic_boost_options' => array (
+    'Elastic_boost_options' => array(
         '0' =>'Disabled',
         '1'=>'Low Boost',
         '2'=>'Medium Boost',
         '3'=>'High Boost',
     ),
 
-  'custom_fields_merge_dup_dom'=> array (
+  'custom_fields_merge_dup_dom'=> array(
         0=>'Disabled',
         1=>'Enabled',
   ),
@@ -1013,19 +1013,19 @@ 
   ),
 
 
-    'projects_priority_options' => array (
+    'projects_priority_options' => array(
         'high'      => 'High',
         'medium'    => 'Medium',
         'low'       => 'Low',
     ),
 
-    'projects_status_options' => array (
+    'projects_status_options' => array(
         'notstarted'    => 'Not Started',
         'inprogress'    => 'In Progress',
         'completed'     => 'Completed',
     ),
     // strings to pass to Flash charts
-    'chart_strings' => array (
+    'chart_strings' => array(
         'expandlegend'      => 'Expand Legend',
         'collapselegend'    => 'Collapse Legend',
         'clickfordrilldown' => 'Click for Drilldown',
@@ -1042,25 +1042,25 @@ 
         'pieWedgeName'      => 'sections',
     ),
     'release_status_dom' =>
-    array (
+    array(
         'Active' => 'Active',
         'Inactive' => 'Inactive',
     ),
     'email_settings_for_ssl' =>
-    array (
+    array(
         '0' => '',
         '1' => 'SSL',
         '2' => 'TLS',
     ),
     'import_enclosure_options' =>
-    array (
+    array(
         '\'' => 'Single Quote (\')',
         '"' => 'Double Quote (")',
         '' => 'None',
         'other' => 'Other:',
     ),
     'import_delimeter_options' =>
-    array (
+    array(
         ',' => ',',
         ';' => ';',
         '\t' => '\t',
@@ -1070,12 +1070,12 @@ 
         'other' => 'Other:',
     ),
     'link_target_dom' =>
-    array (
+    array(
         '_blank' => 'New Window',
         '_self' => 'Same Window',
     ),
     'dashlet_auto_refresh_options' =>
-    array (
+    array(
         '-1'  => 'Do not auto-refresh',
         '30'  => 'Every 30 seconds',
         '60'  => 'Every 1 minute',
@@ -1084,7 +1084,7 @@ 
         '600'   => 'Every 10 minutes',
     ),
   'dashlet_auto_refresh_options_admin' =>
-    array (
+    array(
         '-1'  => 'Never',
         '30'  => 'Every 30 seconds',
         '60'  => 'Every 1 minute',
@@ -1128,7 +1128,7 @@ 
   ),
 );
 
-$app_strings = array (
+$app_strings = array(
   'LBL_TOUR_NEXT' => 'Next',
   'LBL_TOUR_SKIP' => 'Skip',
   'LBL_TOUR_BACK' => 'Back',
@@ -2255,7 +2255,7 @@ 
     'LBL_COPY_ADDRESS_FROM_LEFT' => 'Copy address from left:',
     'LBL_SAVE_AND_CONTINUE' => 'Save and Continue',
 
-    'LBL_SEARCH_HELP_TEXT' => '<p><br /><strong>Multiselect controls</strong></p><ul><li>Click on the values to select an attribute.</li><li>Ctrl-click&nbsp;to&nbsp;select multiple. Mac users use CMD-click.</li><li>To select all values between two attributes,&nbsp; click first value&nbsp;and then shift-click last value.</li></ul><p><strong>Advanced Search & Layout Options</strong><br><br>Using the <b>Saved Search & Layout</b> option, you can save a set of search parameters and/or a custom List View layout in order to quickly obtain the desired search results in the future. You can save an unlimited number of custom searches and layouts. All saved searches appear by name in the Saved Searches list, with the last loaded saved search appearing at the top of the list.<br><br>To customize the List View layout, use the Hide Columns and Display Columns boxes to select which fields to display in the search results. For example, you can view or hide details such as the record name, and assigned user, and assigned team in the search results. To add a column to List View, select the field from the Hide Columns list and use the left arrow to move it to the Display Columns list. To remove a column from List View, select it from the Display Columns list and use the right arrow to move it to the Hide Columns list.<br><br>If you save layout settings, you will be able to load them at any time to view the search results in the custom layout.<br><br>To save and update a search and/or layout:<ol><li>Enter a name for the search results in the <b>Save this search as</b> field and click <b>Save</b>.The name now displays in the Saved Searches list adjacent to the <b>Clear</b> button.</li><li>To view a saved search, select it from the Saved Searches list. The search results are displayed in the List View.</li><li>To update the properties of a saved search, select the saved search from the list, enter the new search criteria and/or layout options in the Advanced Search area, and click <b>Update</b> next to <b>Modify Current Search</b>.</li><li>To delete a saved search, select it in the Saved Searches list, click <b>Delete</b> next to <b>Modify Current Search</b>, and then click <b>OK</b> to confirm the deletion.</li></ol><p><strong>Tips</strong><br><br>By using the % as a wildcard operator you can make your search more broad.  For example instead of just searching for results that equal "Apples" you could change your search to "Apples%" which would match all results that start with the word Apples but could contain other characters as well.</p>' ,
+    'LBL_SEARCH_HELP_TEXT' => '<p><br /><strong>Multiselect controls</strong></p><ul><li>Click on the values to select an attribute.</li><li>Ctrl-click&nbsp;to&nbsp;select multiple. Mac users use CMD-click.</li><li>To select all values between two attributes,&nbsp; click first value&nbsp;and then shift-click last value.</li></ul><p><strong>Advanced Search & Layout Options</strong><br><br>Using the <b>Saved Search & Layout</b> option, you can save a set of search parameters and/or a custom List View layout in order to quickly obtain the desired search results in the future. You can save an unlimited number of custom searches and layouts. All saved searches appear by name in the Saved Searches list, with the last loaded saved search appearing at the top of the list.<br><br>To customize the List View layout, use the Hide Columns and Display Columns boxes to select which fields to display in the search results. For example, you can view or hide details such as the record name, and assigned user, and assigned team in the search results. To add a column to List View, select the field from the Hide Columns list and use the left arrow to move it to the Display Columns list. To remove a column from List View, select it from the Display Columns list and use the right arrow to move it to the Hide Columns list.<br><br>If you save layout settings, you will be able to load them at any time to view the search results in the custom layout.<br><br>To save and update a search and/or layout:<ol><li>Enter a name for the search results in the <b>Save this search as</b> field and click <b>Save</b>.The name now displays in the Saved Searches list adjacent to the <b>Clear</b> button.</li><li>To view a saved search, select it from the Saved Searches list. The search results are displayed in the List View.</li><li>To update the properties of a saved search, select the saved search from the list, enter the new search criteria and/or layout options in the Advanced Search area, and click <b>Update</b> next to <b>Modify Current Search</b>.</li><li>To delete a saved search, select it in the Saved Searches list, click <b>Delete</b> next to <b>Modify Current Search</b>, and then click <b>OK</b> to confirm the deletion.</li></ol><p><strong>Tips</strong><br><br>By using the % as a wildcard operator you can make your search more broad.  For example instead of just searching for results that equal "Apples" you could change your search to "Apples%" which would match all results that start with the word Apples but could contain other characters as well.</p>',
 
     //resource management
     'ERR_QUERY_LIMIT' => 'Error: Query limit of $limit reached for $module module.',
@@ -2496,7 +2496,7 @@ 
     'LBL_FIRST_INPUT_SEARCH_KEY' => '9',
     'LBL_GLOBAL_SEARCH_LNK_KEY' => '0',
     'LBL_KEYBOARD_SHORTCUTS_HELP_TITLE' => 'Keyboard Shortcuts',
-    'LBL_KEYBOARD_SHORTCUTS_HELP' => '<p><strong>Form Functionality - Alt+</strong><br/> I = ed<b>I</b>t (detailview)<br/> U = d<b>U</b>plicate (detailview)<br/> D = <b>D</b>elete (detailview)<br/> A = s<b>A</b>ve (editview)<br/> L = cance<b>L</b> (editview) <br/><br/></p><p><strong>Search and Navigation  - Alt+</strong><br/> 7 = first input on Edit form<br/> 8 = Advanced Search link<br/> 9 = First Search Form input<br/> 0 = Unified search input<br></p>' ,
+    'LBL_KEYBOARD_SHORTCUTS_HELP' => '<p><strong>Form Functionality - Alt+</strong><br/> I = ed<b>I</b>t (detailview)<br/> U = d<b>U</b>plicate (detailview)<br/> D = <b>D</b>elete (detailview)<br/> A = s<b>A</b>ve (editview)<br/> L = cance<b>L</b> (editview) <br/><br/></p><p><strong>Search and Navigation  - Alt+</strong><br/> 7 = first input on Edit form<br/> 8 = Advanced Search link<br/> 9 = First Search Form input<br/> 0 = Unified search input<br></p>',
 
     'ERR_CONNECTOR_NOT_ARRAY' => 'connector array in {0} been defined incorrectly or is empty and could not be used.',
     'ERR_SUHOSIN' => 'Upload stream is blocked by Suhosin, please add &quot;upload&quot; to suhosin.executor.include.whitelist (See suitecrm.log for more information)',
@@ -2521,13 +2521,13 @@ 
 $app_list_strings['library_type'] = array('Books'=>'Book', 'Music'=>'Music', 'DVD'=>'DVD', 'Magazines'=>'Magazines');
 $app_list_strings['moduleList']['EmailAddresses'] = 'Email Address';
 $app_list_strings['project_priority_default'] = 'Medium';
-$app_list_strings['project_priority_options'] = array (
+$app_list_strings['project_priority_options'] = array(
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
 );
 
-$app_list_strings['kbdocument_status_dom'] = array (
+$app_list_strings['kbdocument_status_dom'] = array(
     'Draft' => 'Draft',
     'Expired' => 'Expired',
     'In Review' => 'In Review',
@@ -2535,7 +2535,7 @@ 
   );
 
    $app_list_strings['kbadmin_actions_dom'] =
-    array (
+    array(
     ''          => '--Admin Actions--',
     'Create New Tag' => 'Create New Tag',
     'Delete Tag'=>'Delete Tag',
@@ -3106,26 +3106,26 @@ 
   'Asia/Magadan' => 'Asia/Magadan',
   'Asia/Kamchatka' => 'Asia/Kamchatka',
   'Asia/Anadyr' => 'Asia/Anadyr',
-  'Europe/Belgrade' => 'Europe/Belgrade' ,
-  'Europe/Madrid' =>'Europe/Madrid' ,
+  'Europe/Belgrade' => 'Europe/Belgrade',
+  'Europe/Madrid' =>'Europe/Madrid',
   'Africa/Ceuta' => 'Africa/Ceuta',
   'Atlantic/Canary' => 'Atlantic/Canary',
   'Europe/Stockholm' => 'Europe/Stockholm',
-  'Europe/Zurich' => 'Europe/Zurich' ,
+  'Europe/Zurich' => 'Europe/Zurich',
   'Europe/Istanbul' => 'Europe/Istanbul',
   'Europe/Kiev' => 'Europe/Kiev',
   'Europe/Uzhgorod' => 'Europe/Uzhgorod',
   'Europe/Zaporozhye' => 'Europe/Zaporozhye',
   'Europe/Simferopol' => 'Europe/Simferopol',
   'America/New_York' => 'America/New_York',
-  'America/Chicago' =>'America/Chicago' ,
+  'America/Chicago' =>'America/Chicago',
   'America/North_Dakota/Center' => 'America/North_Dakota/Center',
   'America/Denver' => 'America/Denver',
   'America/Los_Angeles' => 'America/Los_Angeles',
   'America/Juneau' => 'America/Juneau',
   'America/Yakutat' => 'America/Yakutat',
   'America/Anchorage' => 'America/Anchorage',
-  'America/Nome' =>'America/Nome' ,
+  'America/Nome' =>'America/Nome',
   'America/Adak' => 'America/Adak',
   'Pacific/Honolulu' => 'Pacific/Honolulu',
   'America/Phoenix' => 'America/Phoenix',
@@ -3134,17 +3134,17 @@ 
   'America/Indiana/Marengo' => 'America/Indiana/Marengo',
   'America/Indiana/Knox' =>  'America/Indiana/Knox',
   'America/Indiana/Vevay' => 'America/Indiana/Vevay',
-  'America/Kentucky/Louisville' =>'America/Kentucky/Louisville'  ,
-  'America/Kentucky/Monticello' =>  'America/Kentucky/Monticello' ,
+  'America/Kentucky/Louisville' =>'America/Kentucky/Louisville',
+  'America/Kentucky/Monticello' =>  'America/Kentucky/Monticello',
   'America/Detroit' => 'America/Detroit',
   'America/Menominee' => 'America/Menominee',
   'America/St_Johns' => 'America/St_Johns',
-  'America/Goose_Bay' => 'America/Goose_Bay' ,
+  'America/Goose_Bay' => 'America/Goose_Bay',
   'America/Halifax' => 'America/Halifax',
-  'America/Glace_Bay' =>'America/Glace_Bay' ,
+  'America/Glace_Bay' =>'America/Glace_Bay',
   'America/Montreal' => 'America/Montreal',
   'America/Toronto' => 'America/Toronto',
-  'America/Thunder_Bay' => 'America/Thunder_Bay' ,
+  'America/Thunder_Bay' => 'America/Thunder_Bay',
   'America/Nipigon' => 'America/Nipigon',
   'America/Rainy_River' => 'America/Rainy_River',
   'America/Winnipeg' => 'America/Winnipeg',
@@ -3153,14 +3153,14 @@ 
   'America/Edmonton' =>  'America/Edmonton',
   'America/Vancouver' => 'America/Vancouver',
   'America/Dawson_Creek' => 'America/Dawson_Creek',
-  'America/Pangnirtung' => 'America/Pangnirtung'  ,
-  'America/Iqaluit' => 'America/Iqaluit' ,
-  'America/Coral_Harbour' => 'America/Coral_Harbour' ,
+  'America/Pangnirtung' => 'America/Pangnirtung',
+  'America/Iqaluit' => 'America/Iqaluit',
+  'America/Coral_Harbour' => 'America/Coral_Harbour',
   'America/Rankin_Inlet' => 'America/Rankin_Inlet',
   'America/Cambridge_Bay' => 'America/Cambridge_Bay',
   'America/Yellowknife' => 'America/Yellowknife',
-  'America/Inuvik' =>'America/Inuvik' ,
-  'America/Whitehorse' => 'America/Whitehorse' ,
+  'America/Inuvik' =>'America/Inuvik',
+  'America/Whitehorse' => 'America/Whitehorse',
   'America/Dawson' => 'America/Dawson',
   'America/Cancun' => 'America/Cancun',
   'America/Merida' => 'America/Merida',
@@ -3172,7 +3172,7 @@ 
   'America/Tijuana' => 'America/Tijuana',
   'America/Anguilla' => 'America/Anguilla',
   'America/Antigua' => 'America/Antigua',
-  'America/Nassau' =>'America/Nassau' ,
+  'America/Nassau' =>'America/Nassau',
   'America/Barbados' => 'America/Barbados',
   'America/Belize' => 'America/Belize',
   'Atlantic/Bermuda' => 'Atlantic/Bermuda',
@@ -3192,7 +3192,7 @@ 
   'America/Montserrat' => 'America/Montserrat',
   'America/Managua' => 'America/Managua',
   'America/Panama' => 'America/Panama',
-  'America/Puerto_Rico' =>'America/Puerto_Rico' ,
+  'America/Puerto_Rico' =>'America/Puerto_Rico',
   'America/St_Kitts' => 'America/St_Kitts',
   'America/St_Lucia' => 'America/St_Lucia',
   'America/Miquelon' => 'America/Miquelon',
@@ -3228,11 +3228,11 @@ 
   'America/Eirunepe' => 'America/Eirunepe',
   'America/Rio_Branco' => 'America/Rio_Branco',
   'America/Santiago' => 'America/Santiago',
-  'Pacific/Easter' => 'Pacific/Easter' ,
+  'Pacific/Easter' => 'Pacific/Easter',
   'America/Bogota' => 'America/Bogota',
   'America/Curacao' => 'America/Curacao',
   'America/Guayaquil' => 'America/Guayaquil',
-  'Pacific/Galapagos' => 'Pacific/Galapagos' ,
+  'Pacific/Galapagos' => 'Pacific/Galapagos',
   'Atlantic/Stanley' => 'Atlantic/Stanley',
   'America/Cayenne' => 'America/Cayenne',
   'America/Guyana' => 'America/Guyana',
@@ -3246,7 +3246,7 @@ 
   );
 
   $app_list_strings['moduleList']['Sugar_Favorites'] = 'Favorites';
-  $app_list_strings['eapm_list']= array(
+  $app_list_strings['eapm_list'] = array(
     'Sugar'=>'SuiteCRM',
     'WebEx'=>'WebEx',
     'GoToMeeting'=>'GoToMeeting',
@@ -3256,10 +3256,10 @@ 
     'Facebook'=>'Facebook',
     'Twitter'=>'Twitter',
   );
-  $app_list_strings['eapm_list_import']= array(
+  $app_list_strings['eapm_list_import'] = array(
   	'Google' => 'Google Contacts',
   );
-$app_list_strings['eapm_list_documents']= array(
+$app_list_strings['eapm_list_documents'] = array(
   	'Google' => 'Google Docs',
   );
 	$app_list_strings['token_status'] = array(
@@ -3268,23 +3268,23 @@ 
         3 => 'Invalid',
     );
 
-$app_list_strings ['emailTemplates_type_list'] = array (
-    '' => '' ,
-    'campaign' => 'Campaign' ,
+$app_list_strings ['emailTemplates_type_list'] = array(
+    '' => '',
+    'campaign' => 'Campaign',
     'email' => 'Email',
   );
 
-$app_list_strings ['emailTemplates_type_list_campaigns'] = array (
-    '' => '' ,
-    'campaign' => 'Campaign' ,
+$app_list_strings ['emailTemplates_type_list_campaigns'] = array(
+    '' => '',
+    'campaign' => 'Campaign',
   );
 
-$app_list_strings ['emailTemplates_type_list_no_workflow'] = array (
-    '' => '' ,
-    'campaign' => 'Campaign' ,
+$app_list_strings ['emailTemplates_type_list_no_workflow'] = array(
+    '' => '',
+    'campaign' => 'Campaign',
     'email' => 'Email',
   );
-$app_strings ['documentation'] = array (
+$app_strings ['documentation'] = array(
     'LBL_DOCS' => 'Documentation',
     'ULT' => '02_Sugar_Ultimate',
 	'ENT' => '02_Sugar_Enterprise',
@@ -3342,14 +3342,14 @@ 
 
 //aop
 $app_list_strings['case_state_dom'] =
-    array (
+    array(
         'Open' => 'Open',
         'Closed' => 'Closed',
     );
 $app_list_strings['case_state_default_key'] = 'Open';
 $app_list_strings['case_status_default_key'] = 'Open_New';
 $app_list_strings['case_status_dom'] =
-    array (
+    array(
         'Open_New' => 'New',
         'Open_Assigned' => 'Assigned',
         'Closed_Closed' => 'Closed',
@@ -3358,11 +3358,11 @@ 
         'Closed_Duplicate' => 'Duplicate',
     );
 $app_list_strings['contact_portal_user_type_dom'] =
-    array (
+    array(
         'Single' => 'Single user',
         'Account' => 'Account user',
     );
-$app_list_strings['dom_email_distribution_for_auto_create']=array (
+$app_list_strings['dom_email_distribution_for_auto_create'] = array(
     'AOPDefault' => 'Use AOP Default',
     'singleUser' => 'Single User',
     'roundRobin' => 'Round-Robin',
@@ -3989,6 +3989,6 @@ 
 
 $app_strings['LBL_DISCOVER_SUITECRM'] = 'Discover SuiteCRM';
 
-$app_list_strings['collection_temp_list'] = array ( 'Tasks' => 'Tasks', 'Meetings' => 'Meetings', 'Calls' => 'Calls', 'Notes' => 'Notes', 'Emails' => 'Emails' );
+$app_list_strings['collection_temp_list'] = array('Tasks' => 'Tasks', 'Meetings' => 'Meetings', 'Calls' => 'Calls', 'Notes' => 'Notes', 'Emails' => 'Emails');
 
 ?>

include/SubPanel/SubPanelSearchDisplay.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,18 +38,18 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-ini_set('display_errors',1);
+ini_set('display_errors', 1);
 
 global $beanList;
 global $beanFiles;
 
 
-if(empty($_REQUEST['module']))
+if (empty($_REQUEST['module']))
 {
 	die("'module' was not defined");
 }
 
-if(!isset($beanList[$_REQUEST['module']]))
+if (!isset($beanList[$_REQUEST['module']]))
 {
 	die("'".$_REQUEST['module']."' is not defined in \$beanList");
 }
@@ -66,11 +66,11 @@ 
 
 include('include/SubPanel/SubPanel.php');
 $layout_def_key = '';
-if(!empty($_REQUEST['layout_def_key'])){
+if (!empty($_REQUEST['layout_def_key'])) {
 	$layout_def_key = $_REQUEST['layout_def_key'];
 }
 
-$subpanel_object = new CustomSubPanel($module, $record, $subpanel,null, $layout_def_key, $collection);
+$subpanel_object = new CustomSubPanel($module, $record, $subpanel, null, $layout_def_key, $collection);
 
 echo $subpanel_object->getSearchForm();