adamjakab / SuiteCRM

include/InlineEditing/InlineEditing.php

Indentation +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
             $contents = str_replace('"' . $vardef['name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.name}"{literal}', $contents);
             // regex below fixes button javascript for flexi relationship
             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);
+                $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);
             }
         }
 

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

Braces +28 added lines, -19 removed lines

@@ -75,7 +75,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if (isset($vardef['precision'])) unset($vardef['precision']);
+        if (isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -115,8 +117,9 @@ 
         if (isset($vardef['function'])
             && ($vardef['function'] == 'getEmailAddressWidget'
                 || $vardef['function']['name'] == 'getEmailAddressWidget')
-        )
-            unset($vardef['function']);
+        ) {
+                    unset($vardef['function']);
+        }
 
         if (isset($vardef['name']) && ($vardef['name'] == 'date_modified')) {
             $vardef['name'] = 'aow_temp_date';
@@ -149,8 +152,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown'))
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown')) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
 
 
@@ -186,8 +190,9 @@ 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
 
     $fieldlist = array();
-    if (!isset($focus) || !($focus instanceof SugarBean))
-        require_once($beanFiles[$beanList[$module]]);
+    if (!isset($focus) || !($focus instanceof SugarBean)) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields[$fieldname] = $focus->field_defs[$fieldname];
@@ -197,14 +202,17 @@ 
     foreach ($vardefFields as $name => $properties) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if (!isset($fieldlist[$name]['options']['']))
-            $fieldlist[$name]['options'][''] = '';
+        if (!isset($fieldlist[$name]['options'][''])) {
+                    $fieldlist[$name]['options'][''] = '';
+        }
     }
 
     // fill in function return values
@@ -212,8 +220,9 @@ 
         if (!empty($fieldlist[$fieldname]['function']['returns']) && $fieldlist[$fieldname]['function']['returns'] == 'html') {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -311,14 +320,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;
         }
 
@@ -449,7 +458,7 @@ 
         if($vardef['ext2']){
             $value .= getFieldValueFromModule($vardef['rname'],$vardef['ext2'],$record) . "</a>";
 
-        }else if(!empty($vardef['rname'])){
+        } else if(!empty($vardef['rname'])){
             $value .= getFieldValueFromModule($vardef['rname'],$vardef['module'],$record) . "</a>";
 
         } else {
@@ -486,7 +495,7 @@ 
 
     if($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

Doc Comments +9 added lines

@@ -330,6 +330,9 @@ 
 
 }
 
+/**
+ * @param SugarBean $bean
+ */
 function getDisplayValue($bean, $field, $method = "save")
 {
 
@@ -471,6 +474,9 @@ 
 
 }
 
+/**
+ * @return string
+ */
 function convertDateUserToDB($value)
 {
     global $timedate;
@@ -482,6 +488,9 @@ 
     return $value;
 }
 
+/**
+ * @param SugarBean $bean
+ */
 function checkAccess($bean){
 
     if($bean->ACLAccess('EditView')) {

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

Indentation +1 added lines, -1 removed lines

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

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

Indentation +122 added lines, -122 removed lines

@@ -54,14 +54,14 @@ 
  */
 function checkRequired($prefix, $required)
 {
-	foreach($required as $key)
-	{
-		if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
-		{
-			return false;
-		}
-	}
-	return true;
+    foreach($required as $key)
+    {
+        if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
+        {
+            return false;
+        }
+    }
+    return true;
 }
 
 /**
@@ -75,16 +75,16 @@ 
  */
 function populateFromPost($prefix, &$focus, $skipRetrieve = false, $checkACL = false)
 {
-	global $current_user;
+    global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
-		$focus->retrieve($_REQUEST[$prefix.'record']);
+    if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
+        $focus->retrieve($_REQUEST[$prefix.'record']);
 
-	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(!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'] != '' ){
         $focus->new_with_id = true;
     }
@@ -106,15 +106,15 @@ 
         $relatedFields[$def['id_name']] = $field;
     }
 
-	foreach($focus->field_defs as $field=>$def) {
+    foreach($focus->field_defs as $field=>$def) {
         if ( $field == 'id' && !empty($focus->id) ) {
             // Don't try and overwrite the ID
             continue;
         }
 
 
-	    $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
-		$sf = $sfh->getSugarField($type);
+        $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
+        $sf = $sfh->getSugarField($type);
         if($sf != null){
             $sf->save($focus, $_POST, $field, $def, $prefix);
         } else {
@@ -152,15 +152,15 @@ 
 			$focus->$field = '';
 		}
 */
-	}
+    }
 
-	foreach($focus->additional_column_fields as $field) {
-		if(isset($_POST[$prefix.$field])) {
-			$value = $_POST[$prefix.$field];
-			$focus->$field = $value;
-		}
-	}
-	return $focus;
+    foreach($focus->additional_column_fields as $field) {
+        if(isset($_POST[$prefix.$field])) {
+            $value = $_POST[$prefix.$field];
+            $focus->$field = $value;
+        }
+    }
+    return $focus;
 }
 
 function add_hidden_elements($key, $value) {
@@ -182,73 +182,73 @@ 
 
 function getPostToForm($ignore='', $isRegularExpression=false)
 {
-	$fields = '';
-	if(!empty($ignore) && $isRegularExpression) {
-		foreach ($_POST as $key=>$value){
-			if(!preg_match($ignore, $key)) {
+    $fields = '';
+    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) {
+            }
+        }	
+    } else {
+        foreach ($_POST as $key=>$value){
+            if($key != $ignore) {
                                 $fields .= add_hidden_elements($key, $value);
-			}
-		}
-	}
-	return $fields;
+            }
+        }
+    }
+    return $fields;
 }
 
 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'>";
-			}
-		}
-	}
-	return $fields;
+    $fields = '';
+    foreach ($_GET as $key=>$value)
+    {
+        if($key != $ignore){
+            if(!$usePostAsAuthority || !isset($_POST[$key])){
+                $fields.= "<input type='hidden' name='$key' value='$value'>";
+            }
+        }
+    }
+    return $fields;
 
 }
 function getAnyToForm($ignore='', $usePostAsAuthority = false)
 {
-	$fields = getPostToForm($ignore);
-	$fields .= getGetToForm($ignore, $usePostAsAuthority);
-	return $fields;
+    $fields = getPostToForm($ignore);
+    $fields .= getGetToForm($ignore, $usePostAsAuthority);
+    return $fields;
 
 }
 
 function handleRedirect($return_id='', $return_module='', $additionalFlags = false)
 {
-	if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
-	{
-		header("Location: ". $_REQUEST['return_url']);
-		exit;
-	}
-
-	$url = buildRedirectURL($return_id, $return_module);
-	header($url);
-	exit;	
+    if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
+    {
+        header("Location: ". $_REQUEST['return_url']);
+        exit;
+    }
+
+    $url = buildRedirectURL($return_id, $return_module);
+    header($url);
+    exit;	
 }
 
 //eggsurplus: abstract to simplify unit testing
 function buildRedirectURL($return_id='', $return_module='') 
 {
     if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
-	{
-		$return_module = $_REQUEST['return_module'];
-	}
-	else
-	{
-		$return_module = $return_module;
-	}
-	if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
-	{
+    {
+        $return_module = $_REQUEST['return_module'];
+    }
+    else
+    {
+        $return_module = $return_module;
+    }
+    if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
+    {
 	    
-	   //if we are doing a "Close and Create New"
+        //if we are doing a "Close and Create New"
         if(isCloseAndCreateNewPressed())
         {
             $return_action = "EditView";    
@@ -257,40 +257,40 @@ 
             
             // Meeting Integration
             if(isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
-            	$additionalFlags = array('meetingIntegrationShowForm' => '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" 
-			&& $_REQUEST['return_module'] != 'Activities'
-			&& $_REQUEST['return_module'] != 'Home' 
-			&& $_REQUEST['return_module'] != 'Forecasts' 
-			&& $_REQUEST['return_module'] != 'Calendar'
-			&& $_REQUEST['return_module'] != 'MailMerge'
-			) 
-			{
-			    $return_action = 'DetailView';
-			} 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
-		} 
-		else 
-		{
-			// if we "Cancel", we go back to the list view.
-			$return_action = $_REQUEST['return_action'];
-		}
-	}
-	else
-	{
-		$return_action = "DetailView";
-	}
+        // if we create a new record "Save", we want to redirect to the DetailView
+        else if(isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
+            && $_REQUEST['return_module'] != 'Activities'
+            && $_REQUEST['return_module'] != 'Home' 
+            && $_REQUEST['return_module'] != 'Forecasts' 
+            && $_REQUEST['return_module'] != 'Calendar'
+            && $_REQUEST['return_module'] != 'MailMerge'
+            ) 
+            {
+                $return_action = 'DetailView';
+            } 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
+        } 
+        else 
+        {
+            // if we "Cancel", we go back to the list view.
+            $return_action = $_REQUEST['return_action'];
+        }
+    }
+    else
+    {
+        $return_action = "DetailView";
+    }
 	
-	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
-	{
-		$return_id = $_REQUEST['return_id'];
-	}
+    if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+    {
+        $return_id = $_REQUEST['return_id'];
+    }
 
     $add = "";
     if(isset($additionalFlags) && !empty($additionalFlags)) {
@@ -320,16 +320,16 @@ 
             return "Location: $url";
         }
     } else {
-    	$standard = "action=$return_action&module=$return_module&record=$return_id&isDuplicate=true&return_module=$return_module&return_action=$return_action&status=$status";
+        $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']))
         {
             $ajax_ret = array(
-                 'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
-                 'menu' => array(
-                     'module' => $return_module,
-                     'label' => translate($return_module),
-                 ),
+                    'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
+                    'menu' => array(
+                        'module' => $return_module,
+                        'label' => translate($return_module),
+                    ),
             );
             $json = getJSONobj();
             echo $json->encode($ajax_ret);
@@ -341,21 +341,21 @@ 
 
 function getLikeForEachWord($fieldname, $value, $minsize=4)
 {
-	$value = trim($value);
-	$values = explode(' ',$value);
-	$ret = '';
-	foreach($values as $val)
-	{
-		if(strlen($val) >= $minsize)
-		{
-			if(!empty($ret))
-			{
-				$ret .= ' or';
-			}
-			$ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
-		}
+    $value = trim($value);
+    $values = explode(' ',$value);
+    $ret = '';
+    foreach($values as $val)
+    {
+        if(strlen($val) >= $minsize)
+        {
+            if(!empty($ret))
+            {
+                $ret .= ' or';
+            }
+            $ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
+        }
 
-	}
+    }
 
 
 }

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

Braces +10 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -77,8 +79,9 @@ 
 {
 	global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
-		$focus->retrieve($_REQUEST[$prefix.'record']);
+	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve) {
+			$focus->retrieve($_REQUEST[$prefix.'record']);
+	}
 
 	if(!empty($_POST['assigned_user_id']) && 
 	    ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
@@ -240,8 +243,7 @@ 
     if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
 	{
 		$return_module = $_REQUEST['return_module'];
-	}
-	else
+	} else
 	{
 		$return_module = $return_module;
 	}
@@ -275,14 +277,12 @@ 
 			$return_module = $_REQUEST['module'];
 			$return_action = $_REQUEST['return_action']; 
 			// wp: return action needs to be set for one-click close in task list
-		} 
-		else 
+		} else 
 		{
 			// if we "Cancel", we go back to the list view.
 			$return_action = $_REQUEST['return_action'];
 		}
-	}
-	else
+	} else
 	{
 		$return_action = "DetailView";
 	}
@@ -378,8 +378,7 @@ 
     $focus=BeanFactory::getBean('Prospects');
     if(is_array($child_id)){
         $uids = $child_id;
-    }
-    else{
+    } else{
         $uids = array($child_id);
     }
 

Doc Comments +6 added lines

@@ -235,6 +235,9 @@ 
 }
 
 //eggsurplus: abstract to simplify unit testing
+/**
+ * @return string
+ */
 function buildRedirectURL($return_id='', $return_module='') 
 {
     if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
@@ -339,6 +342,9 @@ 
     }
 }
 
+/**
+ * @param string $fieldname
+ */
 function getLikeForEachWord($fieldname, $value, $minsize=4)
 {
 	$value = trim($value);

include/utils.php

Indentation +2374 added lines, -2374 removed lines

@@ -51,381 +51,381 @@ 
 
 function make_sugar_config(&$sugar_config)
 {
-	/* used to convert non-array config.php file to array format */
-	global $admin_export_only;
-	global $cache_dir;
-	global $calculate_response_time;
-	global $create_default_user;
-	global $dateFormats;
-	global $dbconfig;
-	global $dbconfigoption;
-	global $default_action;
-	global $default_charset;
-	global $default_currency_name;
-	global $default_currency_symbol;
+    /* used to convert non-array config.php file to array format */
+    global $admin_export_only;
+    global $cache_dir;
+    global $calculate_response_time;
+    global $create_default_user;
+    global $dateFormats;
+    global $dbconfig;
+    global $dbconfigoption;
+    global $default_action;
+    global $default_charset;
+    global $default_currency_name;
+    global $default_currency_symbol;
     global $default_currency_iso4217;
-	global $defaultDateFormat;
-	global $default_language;
-	global $default_module;
-	global $default_password;
-	global $default_permission_mode;
-	global $default_theme;
-	global $defaultTimeFormat;
-	global $default_user_is_admin;
-	global $default_user_name;
-	global $disable_export;
-	global $disable_persistent_connections;
-	global $display_email_template_variable_chooser;
-	global $display_inbound_email_buttons;
-	global $history_max_viewed;
-	global $host_name;
-	global $import_dir;
-	global $languages;
-	global $list_max_entries_per_page;
-	global $lock_default_user_name;
-	global $log_memory_usage;
+    global $defaultDateFormat;
+    global $default_language;
+    global $default_module;
+    global $default_password;
+    global $default_permission_mode;
+    global $default_theme;
+    global $defaultTimeFormat;
+    global $default_user_is_admin;
+    global $default_user_name;
+    global $disable_export;
+    global $disable_persistent_connections;
+    global $display_email_template_variable_chooser;
+    global $display_inbound_email_buttons;
+    global $history_max_viewed;
+    global $host_name;
+    global $import_dir;
+    global $languages;
+    global $list_max_entries_per_page;
+    global $lock_default_user_name;
+    global $log_memory_usage;
     global $nameFormats;
-	global $requireAccounts;
-	global $RSS_CACHE_TIME;
-	global $session_dir;
-	global $site_URL;
-	global $site_url;
-	global $sugar_version;
-	global $timeFormats;
-	global $tmp_dir;
-	global $translation_string_prefix;
-	global $unique_key;
-	global $upload_badext;
-	global $upload_dir;
-	global $upload_maxsize;
-	global $import_max_execution_time;
-	global $list_max_entries_per_subpanel;
-	global $passwordsetting;
-
-	// assumes the following variables must be set:
-	// $dbconfig, $dbconfigoption, $cache_dir,  $session_dir, $site_URL, $upload_dir
-
-	$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,
-	'calculate_response_time' => empty($calculate_response_time) ? true : $calculate_response_time,
-	'create_default_user' => empty($create_default_user) ? false : $create_default_user,
-	'chartEngine' => 'Jit',
-	'date_formats' => empty($dateFormats) ? array(
-	'Y-m-d'=>'2010-12-23',
-	'd-m-Y' => '23-12-2010',
-	'm-d-Y'=>'12-23-2010',
-	'Y/m/d'=>'2010/12/23',
-	'd/m/Y' => '23/12/2010',
-	'm/d/Y'=>'12/23/2010',
-	'Y.m.d' => '2010.12.23',
-	'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!!
-	'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,
-	'default_currency_symbol' => empty($default_currency_symbol) ? '$' : $default_currency_symbol,
-	'default_currency_iso4217' => empty($default_currency_iso4217) ? '$' : $default_currency_iso4217,
-	'default_date_format' => empty($defaultDateFormat) ? 'm/d/Y' : $defaultDateFormat,
+    global $requireAccounts;
+    global $RSS_CACHE_TIME;
+    global $session_dir;
+    global $site_URL;
+    global $site_url;
+    global $sugar_version;
+    global $timeFormats;
+    global $tmp_dir;
+    global $translation_string_prefix;
+    global $unique_key;
+    global $upload_badext;
+    global $upload_dir;
+    global $upload_maxsize;
+    global $import_max_execution_time;
+    global $list_max_entries_per_subpanel;
+    global $passwordsetting;
+
+    // assumes the following variables must be set:
+    // $dbconfig, $dbconfigoption, $cache_dir,  $session_dir, $site_URL, $upload_dir
+
+    $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,
+    'calculate_response_time' => empty($calculate_response_time) ? true : $calculate_response_time,
+    'create_default_user' => empty($create_default_user) ? false : $create_default_user,
+    'chartEngine' => 'Jit',
+    'date_formats' => empty($dateFormats) ? array(
+    'Y-m-d'=>'2010-12-23',
+    'd-m-Y' => '23-12-2010',
+    'm-d-Y'=>'12-23-2010',
+    'Y/m/d'=>'2010/12/23',
+    'd/m/Y' => '23/12/2010',
+    'm/d/Y'=>'12/23/2010',
+    'Y.m.d' => '2010.12.23',
+    '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!!
+    '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,
+    'default_currency_symbol' => empty($default_currency_symbol) ? '$' : $default_currency_symbol,
+    'default_currency_iso4217' => empty($default_currency_iso4217) ? '$' : $default_currency_iso4217,
+    'default_date_format' => empty($defaultDateFormat) ? 'm/d/Y' : $defaultDateFormat,
     'default_locale_name_format' => empty($defaultNameFormat) ? 's f l' : $defaultNameFormat,
-	'default_export_charset' => 'UTF-8',
-	'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 (
-		'dir_mode' => 02770,
-		'file_mode' => 0755,
-		'chown' => '',
-		'chgrp' => '',
-	),
+    'default_export_charset' => 'UTF-8',
+    '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 (
+        'dir_mode' => 02770,
+        'file_mode' => 0755,
+        'chown' => '',
+        'chgrp' => '',
+    ),
     'default_theme' => empty($default_theme) ? 'Sugar5' : $default_theme,
     'default_time_format' => empty($defaultTimeFormat) ? 'h:ia' : $defaultTimeFormat,
-	'default_user_is_admin' => empty($default_user_is_admin) ? false : $default_user_is_admin,
-	'default_user_name' => empty($default_user_name) ? '' : $default_user_name,
-	'disable_export' => empty($disable_export) ? false : $disable_export,
+    'default_user_is_admin' => empty($default_user_is_admin) ? false : $default_user_is_admin,
+    'default_user_name' => empty($default_user_name) ? '' : $default_user_name,
+    'disable_export' => empty($disable_export) ? false : $disable_export,
     'disable_persistent_connections' => empty($disable_persistent_connections) ? false : $disable_persistent_connections,
     'display_email_template_variable_chooser' => empty($display_email_template_variable_chooser) ? false : $display_email_template_variable_chooser,
-	'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_max_records_per_file' => 100,
+    '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_max_records_per_file' => 100,
     'import_max_records_total_limit' => '',
-	'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
-	'list_max_entries_per_page' => empty($list_max_entries_per_page) ? 20 : $list_max_entries_per_page,
-	'list_max_entries_per_subpanel' => empty($list_max_entries_per_subpanel) ? 10 : $list_max_entries_per_subpanel,
-	'lock_default_user_name' => empty($lock_default_user_name) ? false : $lock_default_user_name,
-	'log_memory_usage' => empty($log_memory_usage) ? false : $log_memory_usage,
+    'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
+    'list_max_entries_per_page' => empty($list_max_entries_per_page) ? 20 : $list_max_entries_per_page,
+    'list_max_entries_per_subpanel' => empty($list_max_entries_per_subpanel) ? 10 : $list_max_entries_per_subpanel,
+    'lock_default_user_name' => empty($lock_default_user_name) ? false : $lock_default_user_name,
+    'log_memory_usage' => empty($log_memory_usage) ? false : $log_memory_usage,
     'name_formats' => empty($nameFormats) ? 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'
     ) : $nameFormats,
     'portal_view' => 'single_user',
-	'resource_management' => array (
-	    'special_query_limit' => 50000,
-	    'special_query_modules' => array('Reports', 'Export', 'Import', 'Administration', 'Sync'),
-	    'default_limit' => 1000,
+    '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!!
-	'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 (
-	'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!!
-	'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 (
-	'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-	'asp', 'cfm', 'js', 'vbs', 'html', 'htm' ) : $upload_badext,
-	'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'),
-	'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,
-	'default_swap_last_viewed' => empty($swap_last_viewed) ? false : $swap_last_viewed,
-	'default_swap_shortcuts' => empty($swap_shortcuts) ? false : $swap_shortcuts,
-	'default_navigation_paradigm' => empty($navigation_paradigm) ? 'gm' : $navigation_paradigm,
+    '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!!
+    '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 (
+    '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!!
+    '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 (
+    'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
+    'asp', 'cfm', 'js', 'vbs', 'html', 'htm' ) : $upload_badext,
+    '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'),
+    '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,
+    'default_swap_last_viewed' => empty($swap_last_viewed) ? false : $swap_last_viewed,
+    'default_swap_shortcuts' => empty($swap_shortcuts) ? false : $swap_shortcuts,
+    'default_navigation_paradigm' => empty($navigation_paradigm) ? 'gm' : $navigation_paradigm,
     'default_call_status' => 'Planned',
-	'js_lang_version' => 1,
-	'passwordsetting' => empty($passwordsetting) ? array (
-	    'SystemGeneratedPasswordON' => '',
-	    'generatepasswordtmpl' => '',
-	    'lostpasswordtmpl' => '',
-	    'forgotpasswordON' => true,
-    	'linkexpiration' => '1',
-    	'linkexpirationtime' => '30',
-    	'linkexpirationtype' => '1',
-	    'systexpiration' => '0',
-	    'systexpirationtime' => '',
-	    'systexpirationtype' => '0',
-	    'systexpirationlogin' => '',
-		) : $passwordsetting,
-		'use_sprites' => function_exists('imagecreatetruecolor'),
-    	'search_wildcard_infront' => false,
+    'js_lang_version' => 1,
+    'passwordsetting' => empty($passwordsetting) ? array (
+        'SystemGeneratedPasswordON' => '',
+        'generatepasswordtmpl' => '',
+        'lostpasswordtmpl' => '',
+        'forgotpasswordON' => true,
+        'linkexpiration' => '1',
+        'linkexpirationtime' => '30',
+        'linkexpirationtype' => '1',
+        'systexpiration' => '0',
+        'systexpirationtime' => '',
+        'systexpirationtype' => '0',
+        'systexpirationlogin' => '',
+        ) : $passwordsetting,
+        'use_sprites' => function_exists('imagecreatetruecolor'),
+        'search_wildcard_infront' => false,
         'search_wildcard_char' => '%',
-		'jobs' => array(
-		    'min_retry_interval' => 60, // minimal job retry delay
-		    'max_retries' => 5, // how many times to retry the job
-		    'timeout' => 86400, // how long a job may spend as running before being force-failed
-		    'soft_lifetime' => 7, // how many days until job record will be soft deleted after completion
-		    'hard_lifetime' => 21, // how many days until job record will be purged from DB
-		),
-		"cron" => array(
-			'max_cron_jobs' => 10, // max jobs per cron schedule run
-		    'max_cron_runtime' => 60, // max runtime for cron jobs
-		    'min_cron_interval' => 30, // minimal interval between cron jobs
-		),
-	);
+        'jobs' => array(
+            'min_retry_interval' => 60, // minimal job retry delay
+            'max_retries' => 5, // how many times to retry the job
+            'timeout' => 86400, // how long a job may spend as running before being force-failed
+            'soft_lifetime' => 7, // how many days until job record will be soft deleted after completion
+            'hard_lifetime' => 21, // how many days until job record will be purged from DB
+        ),
+        "cron" => array(
+            'max_cron_jobs' => 10, // max jobs per cron schedule run
+            'max_cron_runtime' => 60, // max runtime for cron jobs
+            'min_cron_interval' => 30, // minimal interval between cron jobs
+        ),
+    );
 }
 
 function get_sugar_config_defaults() {
-	global $locale;
-	/**
-	 * used for getting base values for array style config.php.  used by the
-	 * installer and to fill in new entries on upgrades.  see also:
-	 * sugar_config_union
-	 */
+    global $locale;
+    /**
+     * used for getting base values for array style config.php.  used by the
+     * installer and to fill in new entries on upgrades.  see also:
+     * sugar_config_union
+     */
 
-	$sugar_config_defaults = array (
-	'admin_export_only' => false,
-	'export_delimiter' => ',',
-	'export_excel_compatible' => false,
-	'cache_dir' => 'cache/',
-	'calculate_response_time' => true,
-	'create_default_user' => false,
- 	'chartEngine' => 'Jit',
-	'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',),
+    $sugar_config_defaults = array (
+    'admin_export_only' => false,
+    'export_delimiter' => ',',
+    'export_excel_compatible' => false,
+    'cache_dir' => 'cache/',
+    'calculate_response_time' => true,
+    'create_default_user' => false,
+        'chartEngine' => 'Jit',
+    '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 (
         '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 (
-	'persistent' => true,
-	'autofree' => false,
-	'debug' => 0,
-	'ssl' => false ),
-	'default_action' => 'index',
-	'default_charset' => return_session_value_or_default('default_charset',
-	'UTF-8'),
-	'default_currency_name' => return_session_value_or_default('default_currency_name', 'US Dollar'),
-	'default_currency_symbol' => return_session_value_or_default('default_currency_symbol', '$'),
-	'default_currency_iso4217' => return_session_value_or_default('default_currency_iso4217', 'USD'),
-	'default_currency_significant_digits' => return_session_value_or_default('default_currency_significant_digits', 2),
-	'default_number_grouping_seperator' => return_session_value_or_default('default_number_grouping_seperator', ','),
-	'default_decimal_seperator' => return_session_value_or_default('default_decimal_seperator', '.'),
-	'default_date_format' => 'm/d/Y',
+    'dbconfigoption' => array (
+    'persistent' => true,
+    'autofree' => false,
+    'debug' => 0,
+    'ssl' => false ),
+    'default_action' => 'index',
+    'default_charset' => return_session_value_or_default('default_charset',
+    'UTF-8'),
+    'default_currency_name' => return_session_value_or_default('default_currency_name', 'US Dollar'),
+    'default_currency_symbol' => return_session_value_or_default('default_currency_symbol', '$'),
+    'default_currency_iso4217' => return_session_value_or_default('default_currency_iso4217', 'USD'),
+    'default_currency_significant_digits' => return_session_value_or_default('default_currency_significant_digits', 2),
+    'default_number_grouping_seperator' => return_session_value_or_default('default_number_grouping_seperator', ','),
+    'default_decimal_seperator' => return_session_value_or_default('default_decimal_seperator', '.'),
+    'default_date_format' => 'm/d/Y',
     'default_locale_name_format' => 's f l',
-	'default_export_charset' => 'UTF-8',
-	'default_language' => return_session_value_or_default('default_language',
-	'en_us'),
-	'default_module' => 'Home',
-	'default_password' => '',
-	'default_permissions' => array (
-		'dir_mode' => 02770,
-		'file_mode' => 0755,
-		'user' => '',
-		'group' => '',
-	),
-	'default_theme' => return_session_value_or_default('site_default_theme', 'Sugar5'),
-	'default_time_format' => 'h:ia',
-	'default_user_is_admin' => false,
-	'default_user_name' => '',
-	'disable_export' => false,
-	'disable_persistent_connections' =>
-	return_session_value_or_default('disable_persistent_connections',
-	'false'),
+    'default_export_charset' => 'UTF-8',
+    'default_language' => return_session_value_or_default('default_language',
+    'en_us'),
+    'default_module' => 'Home',
+    'default_password' => '',
+    'default_permissions' => array (
+        'dir_mode' => 02770,
+        'file_mode' => 0755,
+        'user' => '',
+        'group' => '',
+    ),
+    'default_theme' => return_session_value_or_default('site_default_theme', 'Sugar5'),
+    'default_time_format' => 'h:ia',
+    'default_user_is_admin' => false,
+    'default_user_name' => '',
+    'disable_export' => false,
+    'disable_persistent_connections' =>
+    return_session_value_or_default('disable_persistent_connections',
+    'false'),
     'display_email_template_variable_chooser' => false,
-	'display_inbound_email_buttons' => false,
-	'dump_slow_queries' => false,
-	'email_address_separator' => ',', // use RFC2368 spec unless we have a noncompliant email client
+    'display_inbound_email_buttons' => false,
+    'dump_slow_queries' => false,
+    'email_address_separator' => ',', // use RFC2368 spec unless we have a noncompliant email client
     'email_default_editor' => 'html',
-	'email_default_client' => 'sugar',
-	'email_default_delete_attachments' => true,
-	'history_max_viewed' => 50,
-	'installer_locked' => true,
-	'import_max_records_per_file' => 100,
+    'email_default_client' => 'sugar',
+    'email_default_delete_attachments' => true,
+    'history_max_viewed' => 50,
+    'installer_locked' => true,
+    'import_max_records_per_file' => 100,
     'import_max_records_total_limit' => '',
-	'languages' => array('en_us' => 'English (US)'),
-	'large_scale_test' => false,
-	'list_max_entries_per_page' => 20,
-	'list_max_entries_per_subpanel' => 10,
-	'lock_default_user_name' => false,
-	'log_memory_usage' => false,
-	'portal_view' => 'single_user',
+    'languages' => array('en_us' => 'English (US)'),
+    'large_scale_test' => false,
+    'list_max_entries_per_page' => 20,
+    'list_max_entries_per_subpanel' => 10,
+    'lock_default_user_name' => false,
+    'log_memory_usage' => false,
+    'portal_view' => 'single_user',
     'resource_management' => array (
-	    'special_query_limit' => 50000,
-	    'special_query_modules' => array('Reports', 'Export', 'Import', 'Administration', 'Sync'),
-	    'default_limit' => 1000,
+        'special_query_limit' => 50000,
+        'special_query_modules' => array('Reports', 'Export', 'Import', 'Administration', 'Sync'),
+        'default_limit' => 1000,
     ),
-	'require_accounts' => true,
-	'rss_cache_time' => return_session_value_or_default('rss_cache_time',
-	'10800'),
-	'save_query' => 'all',
-	'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
-	'showThemePicker' => true,
-	'slow_query_time_msec' => '100',
+    'require_accounts' => true,
+    'rss_cache_time' => return_session_value_or_default('rss_cache_time',
+    '10800'),
+    'save_query' => 'all',
+    'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
+    'showThemePicker' => true,
+    'slow_query_time_msec' => '100',
     'sugarbeet' => true,
     '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 (
-	'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-	'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml' ),
-	'upload_maxsize' => 30000000,
-	'import_max_execution_time' => 3600,
+    'translation_string_prefix' =>
+    return_session_value_or_default('translation_string_prefix', false),
+    'upload_badext' => array (
+    'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
+    'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml' ),
+    'upload_maxsize' => 30000000,
+    'import_max_execution_time' => 3600,
 //	'use_php_code_json' => returnPhpJsonStatus(),
-	'verify_client_ip' => true,
-	'js_custom_version' => '',
-	'js_lang_version' => 1,
+    'verify_client_ip' => true,
+    'js_custom_version' => '',
+    'js_lang_version' => 1,
         'lead_conv_activity_opt' => 'donothing',
-	'default_number_grouping_seperator' => ',',
-	'default_decimal_seperator' => '.',
-	'lock_homepage' => false,
-	'lock_subpanels' => false,
-	'max_dashlets_homepage' => '15',
-	'default_max_tabs' => '7',
-	'dashlet_display_row_options' => array('1','3','5','10'),
-	'default_subpanel_tabs' =>  true,
-	'default_subpanel_links' => false,
-	'default_swap_last_viewed' => false,
-	'default_swap_shortcuts' => false,
-	'default_navigation_paradigm' => 'gm',
-	'admin_access_control' => false,
-  	'use_common_ml_dir'	=> false,
-  	'common_ml_dir' => '',
-	'vcal_time' => '2',
-	'calendar' => array(
-	  'default_view' => 'week',
-	  'show_calls_by_default' => true,
-	  'show_tasks_by_default' => true,
-	  'show_completed_by_default' => true,
-	  'editview_width' => 990,
-	  'editview_height' => 485,
-	  'day_timestep' => 15,
-	  'week_timestep' => 30,
-	  'items_draggable' => true,
-	  'items_resizable' => true,
-	  'enable_repeat' => true,
-	  'max_repeat_count' => 1000,
-	),
-	'passwordsetting' => empty($passwordsetting) ? array (
-	    'SystemGeneratedPasswordON' => '',
-	    'generatepasswordtmpl' => '',
-	    'lostpasswordtmpl' => '',
-	    'forgotpasswordON' => false,
-    	'linkexpiration' => '1',
-    	'linkexpirationtime' => '30',
-    	'linkexpirationtype' => '1',
-	    'systexpiration' => '0',
-	    'systexpirationtime' => '',
-	    'systexpirationtype' => '0',
-	    'systexpirationlogin' => '',
-		) : $passwordsetting,
-		'use_real_names' => true,
-
-		'search_wildcard_infront' => false,
+    'default_number_grouping_seperator' => ',',
+    'default_decimal_seperator' => '.',
+    'lock_homepage' => false,
+    'lock_subpanels' => false,
+    'max_dashlets_homepage' => '15',
+    'default_max_tabs' => '7',
+    'dashlet_display_row_options' => array('1','3','5','10'),
+    'default_subpanel_tabs' =>  true,
+    'default_subpanel_links' => false,
+    'default_swap_last_viewed' => false,
+    'default_swap_shortcuts' => false,
+    'default_navigation_paradigm' => 'gm',
+    'admin_access_control' => false,
+        'use_common_ml_dir'	=> false,
+        'common_ml_dir' => '',
+    'vcal_time' => '2',
+    'calendar' => array(
+        'default_view' => 'week',
+        'show_calls_by_default' => true,
+        'show_tasks_by_default' => true,
+        'show_completed_by_default' => true,
+        'editview_width' => 990,
+        'editview_height' => 485,
+        'day_timestep' => 15,
+        'week_timestep' => 30,
+        'items_draggable' => true,
+        'items_resizable' => true,
+        'enable_repeat' => true,
+        'max_repeat_count' => 1000,
+    ),
+    'passwordsetting' => empty($passwordsetting) ? array (
+        'SystemGeneratedPasswordON' => '',
+        'generatepasswordtmpl' => '',
+        'lostpasswordtmpl' => '',
+        'forgotpasswordON' => false,
+        'linkexpiration' => '1',
+        'linkexpirationtime' => '30',
+        'linkexpirationtype' => '1',
+        'systexpiration' => '0',
+        'systexpirationtime' => '',
+        'systexpirationtype' => '0',
+        'systexpirationlogin' => '',
+        ) : $passwordsetting,
+        'use_real_names' => true,
+
+        'search_wildcard_infront' => false,
         'search_wildcard_char' => '%',
-		'jobs' => array(
-		    'min_retry_interval' => 30, // 30 seconds minimal job retry
-		    'max_retries' => 5, // how many times to retry the job
-		    'timeout' => 86400, // how long a job may spend as running before being force-failed
-		),
-		"cron" => array(
-			'max_cron_jobs' => 10, // max jobs per cron schedule run
-		    'max_cron_runtime' => 30, // max runtime for cron jobs
-		    'min_cron_interval' => 30, // minimal interval between cron jobs
-		),
+        'jobs' => array(
+            'min_retry_interval' => 30, // 30 seconds minimal job retry
+            'max_retries' => 5, // how many times to retry the job
+            'timeout' => 86400, // how long a job may spend as running before being force-failed
+        ),
+        "cron" => array(
+            'max_cron_jobs' => 10, // max jobs per cron schedule run
+            'max_cron_runtime' => 30, // max runtime for cron jobs
+            'min_cron_interval' => 30, // minimal interval between cron jobs
+        ),
     );
 
-	if(!is_object($locale)) {
-		$locale = new Localization();
-	}
+    if(!is_object($locale)) {
+        $locale = new Localization();
+    }
 
-	$sugar_config_defaults['default_currencies'] = $locale->getDefaultCurrencies();
+    $sugar_config_defaults['default_currencies'] = $locale->getDefaultCurrencies();
 
-	$sugar_config_defaults = sugarArrayMerge($locale->getLocaleConfigDefaults(), $sugar_config_defaults);
-	return( $sugar_config_defaults );
+    $sugar_config_defaults = sugarArrayMerge($locale->getLocaleConfigDefaults(), $sugar_config_defaults);
+    return( $sugar_config_defaults );
 }
 
 /**
  * @deprecated use SugarView::getMenu() instead
  */
 function load_menu($path){
-	global $module_menu;
+    global $module_menu;
 
-	if(file_exists($path . 'Menu.php'))
-	{
-		require($path . 'Menu.php');
-	}
-	if(file_exists('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'))
-	{
-		require('custom/application/Ext/Menus/menu.ext.php');
-	}
-	return $module_menu;
+    if(file_exists($path . 'Menu.php'))
+    {
+        require($path . 'Menu.php');
+    }
+    if(file_exists('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'))
+    {
+        require('custom/application/Ext/Menus/menu.ext.php');
+    }
+    return $module_menu;
 }
 
 /**
@@ -435,7 +435,7 @@ 
  * @return string relative file path to email notifications template file
  */
 function get_notify_template_file($language){
-	/*
+    /*
 	 * Order of operation:
 	 * 1) custom version of specified language
 	 * 2) stock version of specified language
@@ -443,61 +443,61 @@ 
 	 * 4) stock en_us template
 	 */
 
-	// 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";
+    // 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")){
-		$file = "custom/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")){
-		$file = "custom/include/language/en_us.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")){
+        $file = "include/language/{$language}.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;
+    return $file;
 }
 
 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 ) ){
-		$override = array();
-	}
-	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] );
-		}
-	}
-	return( $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 ) ){
+        $override = array();
+    }
+    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] );
+        }
+    }
+    return( $override );
 }
 
 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) ){
-			$ret_val = true;
-		}
-		else {
-			$original_fileperms = fileperms($file);
-
-			// take away writable permissions
-			$new_fileperms = $original_fileperms & ~0x0092;
-			@sugar_chmod($file, $new_fileperms);
-
-			if( !is_writable($file) ){
-				$ret_val = true;
-			}
-		}
-	}
-	return $ret_val;
+    // 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) ){
+            $ret_val = true;
+        }
+        else {
+            $original_fileperms = fileperms($file);
+
+            // take away writable permissions
+            $new_fileperms = $original_fileperms & ~0x0092;
+            @sugar_chmod($file, $new_fileperms);
+
+            if( !is_writable($file) ){
+                $ret_val = true;
+            }
+        }
+    }
+    return $ret_val;
 }
 
 
@@ -511,76 +511,76 @@ 
  */
 function return_name($row, $first_column, $last_column)
 {
-	$first_name = "";
-	$last_name = "";
-	$full_name = "";
+    $first_name = "";
+    $last_name = "";
+    $full_name = "";
 
-	if(isset($row[$first_column]))
-	{
-		$first_name = stripslashes($row[$first_column]);
-	}
+    if(isset($row[$first_column]))
+    {
+        $first_name = stripslashes($row[$first_column]);
+    }
 
-	if(isset($row[$last_column]))
-	{
-		$last_name = stripslashes($row[$last_column]);
-	}
+    if(isset($row[$last_column]))
+    {
+        $last_name = stripslashes($row[$last_column]);
+    }
 
-	$full_name = $first_name;
+    $full_name = $first_name;
 
-	// If we have a first name and we have a 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 != "")
-	{
-		// append the last name without the space.
-		$full_name .= $last_name;
-	}
+    // If we have a first name and we have a 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 != "")
+    {
+        // append the last name without the space.
+        $full_name .= $last_name;
+    }
 
-	return $full_name;
+    return $full_name;
 }
 
 
 function get_languages()
 {
-	global $sugar_config;
-	$lang = $sugar_config['languages'];
+    global $sugar_config;
+    $lang = $sugar_config['languages'];
     if(!empty($sugar_config['disabled_languages'])){
         foreach(explode(',', $sugar_config['disabled_languages']) as $disable) {
             unset($lang[$disable]);
         }
     }
-	return $lang;
+    return $lang;
 }
 
 function get_all_languages()
 {
-	global $sugar_config;
-	return $sugar_config['languages'];
+    global $sugar_config;
+    return $sugar_config['languages'];
 }
 
 
 function get_language_display($key)
 {
-	global $sugar_config;
-	return $sugar_config['languages'][$key];
+    global $sugar_config;
+    return $sugar_config['languages'][$key];
 }
 
 function get_assigned_user_name($assigned_user_id, $is_group = '') {
-	static $saved_user_list = null;
+    static $saved_user_list = null;
 
-	if(empty($saved_user_list)) {
-		$saved_user_list = get_user_array(false, '', '', false, null, $is_group);
-	}
+    if(empty($saved_user_list)) {
+        $saved_user_list = get_user_array(false, '', '', false, null, $is_group);
+    }
 
-	if(isset($saved_user_list[$assigned_user_id])) {
-		return $saved_user_list[$assigned_user_id];
-	}
+    if(isset($saved_user_list[$assigned_user_id])) {
+        return $saved_user_list[$assigned_user_id];
+    }
 
-	return '';
+    return '';
 }
 
 /**
@@ -589,16 +589,16 @@ 
  * @return string
  */
 function get_user_name($id) {
-	global $db;
+    global $db;
 
-	if(empty($db))
-	$db = DBManagerFactory::getInstance();
+    if(empty($db))
+    $db = DBManagerFactory::getInstance();
 
-	$q = "SELECT user_name FROM users WHERE id='{$id}'";
-	$r = $db->query($q);
-	$a = $db->fetchByAssoc($r);
+    $q = "SELECT user_name FROM users WHERE id='{$id}'";
+    $r = $db->query($q);
+    $a = $db->fetchByAssoc($r);
 
-	return (empty($a)) ? '' : $a['user_name'];
+    return (empty($a)) ? '' : $a['user_name'];
 }
 
 
@@ -620,27 +620,27 @@ 
  * @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) {
-	global $locale, $sugar_config, $current_user;
+    global $locale, $sugar_config, $current_user;
 
-	if(empty($locale)) {
-		$locale = new Localization();
-	}
+    if(empty($locale)) {
+        $locale = new Localization();
+    }
 
-	if($from_cache) {
+    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)) {
-		$db = DBManagerFactory::getInstance();
-		$temp_result = Array();
-		// Including deleted users for now.
-		if (empty($status)) {
-			$query = "SELECT id, first_name, last_name, user_name from users WHERE 1=1".$portal_filter;
-		}
-		else {
-			$query = "SELECT id, first_name, last_name, user_name from users WHERE status='$status'".$portal_filter;
-		}
+        $user_array = get_register_value('user_array', $key_name);
+    }
+
+    if(empty($user_array)) {
+        $db = DBManagerFactory::getInstance();
+        $temp_result = Array();
+        // Including deleted users for now.
+        if (empty($status)) {
+            $query = "SELECT id, first_name, last_name, user_name from users WHERE 1=1".$portal_filter;
+        }
+        else {
+            $query = "SELECT id, first_name, last_name, user_name from users WHERE status='$status'".$portal_filter;
+        }
         /* BEGIN - SECURITY GROUPS */
         global $current_user, $sugar_config;
         if(!is_admin($current_user)
@@ -655,13 +655,13 @@ 
             $query .= " AND (".$group_where.") ";
         }
         /* END - SECURITY GROUPS */
-		if (!empty($user_name_filter)) {
-		    $user_name_filter = $db->quote($user_name_filter);
-			$query .= " AND user_name LIKE '$user_name_filter%' ";
-		}
-		if (!empty($user_id)) {
-			$query .= " OR id='{$user_id}'";
-		}
+        if (!empty($user_name_filter)) {
+            $user_name_filter = $db->quote($user_name_filter);
+            $query .= " AND user_name LIKE '$user_name_filter%' ";
+        }
+        if (!empty($user_id)) {
+            $query .= " OR id='{$user_id}'";
+        }
 
         //get the user preference for name formatting, to be used in order by
         $order_by_string =' user_name ASC ';
@@ -683,37 +683,37 @@ 
             }
         }
 
-		$query = $query.' ORDER BY '.$order_by_string;
-		$GLOBALS['log']->debug("get_user_array query: $query");
-		$result = $db->query($query, true, "Error filling in user array: ");
-
-		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']);
-				} else {
-					$temp_result[$row['id']] = $row['user_name'];
-				}
-			} else {
-				$temp_result[$row['id']] = $row['user_name'];
-			}
-		}
+        $query = $query.' ORDER BY '.$order_by_string;
+        $GLOBALS['log']->debug("get_user_array query: $query");
+        $result = $db->query($query, true, "Error filling in user array: ");
+
+        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']);
+                } else {
+                    $temp_result[$row['id']] = $row['user_name'];
+                }
+            } else {
+                $temp_result[$row['id']] = $row['user_name'];
+            }
+        }
 
-		$user_array = $temp_result;
-		if($from_cache)
+        $user_array = $temp_result;
+        if($from_cache)
         {
-			set_register_value('user_array', $key_name, $temp_result);
+            set_register_value('user_array', $key_name, $temp_result);
         }
-	}
+    }
 
 
-	return $user_array;
+    return $user_array;
 }
 
 
@@ -724,11 +724,11 @@ 
  * @return array Array of Users' details that match passed criteria
  */
 function getUserArrayFromFullName($args, $hide_portal_users = false) {
-	global $locale;
-	$db = DBManagerFactory::getInstance();
+    global $locale;
+    $db = DBManagerFactory::getInstance();
 
-	// jmorais@dri - Bug #51411
-	//
+    // jmorais@dri - Bug #51411
+    //
     // Refactor the code responsible for parsing supplied $args, this way we
     // ensure that if $args has at least one space (after trim), the $inClause
     // will be composed by several clauses ($inClauses) inside parenthesis.
@@ -754,11 +754,11 @@ 
     }
     // ~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 .= " portal_only=0 AND ";
-	}
-	$query .= $inClause;
+    $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)
@@ -771,15 +771,15 @@ 
         $query .= " AND (".$group_where.") ";
     }
     /* END - SECURITY GROUPS */
-	$query .= " ORDER BY last_name ASC";
+    $query .= " ORDER BY last_name ASC";
 
-	$r = $db->query($query);
-	$ret = array();
-	while($a = $db->fetchByAssoc($r)) {
-		$ret[$a['id']] = $locale->getLocaleFormattedName($a['first_name'], $a['last_name']);
-	}
+    $r = $db->query($query);
+    $ret = array();
+    while($a = $db->fetchByAssoc($r)) {
+        $ret[$a['id']] = $locale->getLocaleFormattedName($a['first_name'], $a['last_name']);
+    }
 
-	return $ret;
+    return $ret;
 }
 
 /**
@@ -787,28 +787,28 @@ 
  * based on user pref then system pref
  */
 function showFullName() {
-	global $sugar_config;
-	global $current_user;
-	static $showFullName = null;
-
-	if (is_null($showFullName)) {
-		$sysPref = !empty($sugar_config['use_real_names']);
-		$userPref = (is_object($current_user)) ? $current_user->getPreference('use_real_names') : null;
-
-		if($userPref != null) {
-			$showFullName = ($userPref == 'on');
-		} else {
-			$showFullName = $sysPref;
-		}
-	}
+    global $sugar_config;
+    global $current_user;
+    static $showFullName = null;
+
+    if (is_null($showFullName)) {
+        $sysPref = !empty($sugar_config['use_real_names']);
+        $userPref = (is_object($current_user)) ? $current_user->getPreference('use_real_names') : null;
+
+        if($userPref != null) {
+            $showFullName = ($userPref == 'on');
+        } else {
+            $showFullName = $sysPref;
+        }
+    }
 
-	return $showFullName;
+    return $showFullName;
 }
 
 function clean($string, $maxLength)
 {
-	$string = substr($string, 0, $maxLength);
-	return escapeshellcmd($string);
+    $string = substr($string, 0, $maxLength);
+    return escapeshellcmd($string);
 }
 
 /**
@@ -820,7 +820,7 @@ 
  */
 function safe_map($request_var, & $focus, $always_copy = false)
 {
-	safe_map_named($request_var, $focus, $request_var, $always_copy);
+    safe_map_named($request_var, $focus, $request_var, $always_copy);
 }
 
 /**
@@ -832,10 +832,10 @@ 
  */
 function safe_map_named($request_var, & $focus, $member_var, $always_copy)
 {
-	if (isset($_REQUEST[$request_var]) && ($always_copy || is_null($focus->$member_var))) {
-		$GLOBALS['log']->debug("safe map named called assigning '{$_REQUEST[$request_var]}' to $member_var");
-		$focus->$member_var = $_REQUEST[$request_var];
-	}
+    if (isset($_REQUEST[$request_var]) && ($always_copy || is_null($focus->$member_var))) {
+        $GLOBALS['log']->debug("safe map named called assigning '{$_REQUEST[$request_var]}' to $member_var");
+        $focus->$member_var = $_REQUEST[$request_var];
+    }
 }
 
 /**
@@ -846,35 +846,35 @@ 
  */
 function return_app_list_strings_language($language)
 {
-	global $app_list_strings;
-	global $sugar_config;
+    global $app_list_strings;
+    global $sugar_config;
 
-	$cache_key = 'app_list_strings.'.$language;
+    $cache_key = 'app_list_strings.'.$language;
 
-	// Check for cached value
-	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
-	{
-		return $cache_entry;
-	}
+    // Check for cached value
+    $cache_entry = sugar_cache_retrieve($cache_key);
+    if(!empty($cache_entry))
+    {
+        return $cache_entry;
+    }
 
-	$default_language = isset($sugar_config['default_language']) ? $sugar_config['default_language'] : 'en_us';
-	$temp_app_list_strings = $app_list_strings;
+    $default_language = isset($sugar_config['default_language']) ? $sugar_config['default_language'] : 'en_us';
+    $temp_app_list_strings = $app_list_strings;
 
-	$langs = array();
-	if ($language != 'en_us') {
-	    $langs[] = 'en_us';
-	}
-	if ($default_language != 'en_us' && $language != $default_language) {
-	    $langs[] = $default_language;
-	}
-	$langs[] = $language;
+    $langs = array();
+    if ($language != 'en_us') {
+        $langs[] = 'en_us';
+    }
+    if ($default_language != 'en_us' && $language != $default_language) {
+        $langs[] = $default_language;
+    }
+    $langs[] = $language;
 
-	$app_list_strings_array = array();
+    $app_list_strings_array = array();
 
-	foreach ( $langs as $lang ) {
-	    $app_list_strings = array();
-	    if(file_exists("include/language/$lang.lang.php")) {
+    foreach ( $langs as $lang ) {
+        $app_list_strings = array();
+        if(file_exists("include/language/$lang.lang.php")) {
             include("include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found language file: $lang.lang.php");
         }
@@ -906,17 +906,17 @@ 
         }
     }
 
-	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;
-	}
+    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;
+    }
 
-	$return_value = $app_list_strings;
-	$app_list_strings = $temp_app_list_strings;
+    $return_value = $app_list_strings;
+    $app_list_strings = $temp_app_list_strings;
 
-	sugar_cache_put($cache_key, $return_value);
+    sugar_cache_put($cache_key, $return_value);
 
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -926,33 +926,33 @@ 
  * @param app_list_strings array the golbal strings
  * @return array
  */
- //jchi 25347
+    //jchi 25347
 function _mergeCustomAppListStrings($file , $app_list_strings){
-	$app_list_strings_original = $app_list_strings;
-	unset($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)){
-		return $app_list_strings_original;
-	}
-	//Bug 25347: We should not merge custom dropdown fields unless they relate to parent fields or the module list.
+    include($file);
+    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.
 
         // FG - bug 45525 - Specific codelists must NOT be overwritten
-	$exemptDropdowns[] = "moduleList";
-	$exemptDropdowns[] = "moduleListSingular";
+    $exemptDropdowns[] = "moduleList";
+    $exemptDropdowns[] = "moduleListSingular";
         $exemptDropdowns = array_merge($exemptDropdowns, getTypeDisplayList());
 
-	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);
-   return $app_list_strings;
+    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);
+    return $app_list_strings;
 }
 
 /**
@@ -963,35 +963,35 @@ 
  */
 function return_application_language($language)
 {
-	global $app_strings, $sugar_config;
+    global $app_strings, $sugar_config;
 
-	$cache_key = 'app_strings.'.$language;
+    $cache_key = 'app_strings.'.$language;
 
-	// Check for cached value
-	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
-	{
-		return $cache_entry;
-	}
+    // Check for cached value
+    $cache_entry = sugar_cache_retrieve($cache_key);
+    if(!empty($cache_entry))
+    {
+        return $cache_entry;
+    }
 
-	$temp_app_strings = $app_strings;
-	$default_language = $sugar_config['default_language'];
+    $temp_app_strings = $app_strings;
+    $default_language = $sugar_config['default_language'];
 
-	$langs = array();
-	if ($language != 'en_us') {
-	    $langs[] = 'en_us';
-	}
-	if ($default_language != 'en_us' && $language != $default_language) {
-	    $langs[] = $default_language;
-	}
+    $langs = array();
+    if ($language != 'en_us') {
+        $langs[] = 'en_us';
+    }
+    if ($default_language != 'en_us' && $language != $default_language) {
+        $langs[] = $default_language;
+    }
 
-	$langs[] = $language;
+    $langs[] = $language;
 
-	$app_strings_array = array();
+    $app_strings_array = array();
 
-	foreach ( $langs as $lang ) {
-	    $app_strings = array();
-	    if(file_exists("include/language/$lang.lang.php")) {
+    foreach ( $langs as $lang ) {
+        $app_strings = array();
+        if(file_exists("include/language/$lang.lang.php")) {
             include("include/language/$lang.lang.php");
             $GLOBALS['log']->info("Found language file: $lang.lang.php");
         }
@@ -1012,40 +1012,40 @@ 
             $GLOBALS['log']->info("Found custom language file: $lang.lang.php");
         }
         $app_strings_array[] = $app_strings;
-	}
+    }
 
-	$app_strings = array();
+    $app_strings = array();
     foreach ( $app_strings_array as $app_strings_item ) {
         $app_strings = sugarLangArrayMerge($app_strings, $app_strings_item);
     }
 
-	if(!isset($app_strings)) {
-		$GLOBALS['log']->fatal("Unable to load the application language strings");
-		return null;
-	}
+    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 we are in debug mode for translating, turn on the prefix now!
     if(!empty($sugar_config['translation_string_prefix']))
     {
-		foreach($app_strings as $entry_key=>$entry_value) {
-			$app_strings[$entry_key] = $language.' '.$entry_value;
-		}
-	}
-	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'];
-		$app_strings['LBL_DELETE'] = $app_strings['LBL_UNDELETE'];
-	}
+        foreach($app_strings as $entry_key=>$entry_value) {
+            $app_strings[$entry_key] = $language.' '.$entry_value;
+        }
+    }
+    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'];
+        $app_strings['LBL_DELETE'] = $app_strings['LBL_UNDELETE'];
+    }
 
-	$app_strings['LBL_ALT_HOT_KEY'] = get_alt_hot_key();
+    $app_strings['LBL_ALT_HOT_KEY'] = get_alt_hot_key();
 
-	$return_value = $app_strings;
-	$app_strings = $temp_app_strings;
+    $return_value = $app_strings;
+    $app_strings = $temp_app_strings;
 
-	sugar_cache_put($cache_key, $return_value);
+    sugar_cache_put($cache_key, $return_value);
 
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -1058,16 +1058,16 @@ 
  */
 function return_module_language($language, $module, $refresh=false)
 {
-	global $mod_strings;
-	global $sugar_config;
-	global $currentModule;
-
-	// 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));
-		return array();
-	}
+    global $mod_strings;
+    global $sugar_config;
+    global $currentModule;
+
+    // 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));
+        return array();
+    }
 
     if( !$refresh )
     {
@@ -1079,28 +1079,28 @@ 
             return $cache_entry;
         }
     }
-	// Store the current mod strings for later
-	$temp_mod_strings = $mod_strings;
-	$loaded_mod_strings = array();
-	$language_used = $language;
-	$default_language = $sugar_config['default_language'];
-
-	if(empty($language)) {
-		$language = $default_language;
-	}
+    // Store the current mod strings for later
+    $temp_mod_strings = $mod_strings;
+    $loaded_mod_strings = array();
+    $language_used = $language;
+    $default_language = $sugar_config['default_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.
+    // 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])){
-		$object = BeanFactory::getObjectName($module);
-		VardefManager::refreshVardefs($module,$object);
-	}
+            && !empty($GLOBALS['beanList'][$module])){
+        $object = BeanFactory::getObjectName($module);
+        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'])
+    // cn: bug 6048 - merge en_us with requested language
+    if($language != $sugar_config['default_language'])
         $loaded_mod_strings = sugarLangArrayMerge(
             LanguageManager::loadModuleLanguage($module, $sugar_config['default_language'],$refresh),
                 $loaded_mod_strings
@@ -1113,23 +1113,23 @@ 
                 $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) {
-			$loaded_mod_strings[$entry_key] = $language_used.' '.$entry_value;
-		}
-	}
+    // 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) {
+            $loaded_mod_strings[$entry_key] = $language_used.' '.$entry_value;
+        }
+    }
 
-	$return_value = $loaded_mod_strings;
-	if(!isset($mod_strings)){
-		$mod_strings = $return_value;
-	}
-	else
-		$mod_strings = $temp_mod_strings;
+    $return_value = $loaded_mod_strings;
+    if(!isset($mod_strings)){
+        $mod_strings = $return_value;
+    }
+    else
+        $mod_strings = $temp_mod_strings;
 
     $cache_key = LanguageManager::getLanguageCacheKey($module, $language);
     sugar_cache_put($cache_key, $return_value);
-	return $return_value;
+    return $return_value;
 }
 
 
@@ -1139,61 +1139,61 @@ 
  * 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) {
-	global $mod_list_strings;
-	global $sugar_config;
-	global $currentModule;
+    global $mod_list_strings;
+    global $sugar_config;
+    global $currentModule;
 
-	$cache_key = "mod_list_str_lang.".$language.$module;
+    $cache_key = "mod_list_str_lang.".$language.$module;
 
-	// Check for cached value
-	$cache_entry = sugar_cache_retrieve($cache_key);
-	if(!empty($cache_entry))
-	{
-		return $cache_entry;
-	}
+    // Check for cached value
+    $cache_entry = sugar_cache_retrieve($cache_key);
+    if(!empty($cache_entry))
+    {
+        return $cache_entry;
+    }
 
-	$language_used = $language;
-	$temp_mod_list_strings = $mod_list_strings;
-	$default_language = $sugar_config['default_language'];
+    $language_used = $language;
+    $temp_mod_list_strings = $mod_list_strings;
+    $default_language = $sugar_config['default_language'];
 
-	if($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) {
-		return $mod_list_strings;
-	}
+    if($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) {
+        return $mod_list_strings;
+    }
 
-	// cn: bug 6351 - include en_us if file langpack not available
-	// 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)
-	$en_mod_list_strings = $mod_list_strings;
+    // cn: bug 6351 - include en_us if file langpack not available
+    // 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)
+    $en_mod_list_strings = $mod_list_strings;
 
-	if(file_exists("modules/$module/language/$language.lang.php")) {
-		include("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")){
-		include("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";
-		include("modules/$module/language/$language.lang.php.override");
-	}
+    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");
+    }
 
-	// cn: bug 6048 - merge en_us with requested language
-	$mod_list_strings = sugarLangArrayMerge($en_mod_list_strings, $mod_list_strings);
+    // cn: bug 6048 - merge en_us with requested language
+    $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)) {
-		$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;
-	}
+    // if we still don't have a language pack, then log an error
+    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;
+    }
 
-	$return_value = $mod_list_strings;
-	$mod_list_strings = $temp_mod_list_strings;
+    $return_value = $mod_list_strings;
+    $mod_list_strings = $temp_mod_list_strings;
 
-	sugar_cache_put($cache_key, $return_value);
-	return $return_value;
+    sugar_cache_put($cache_key, $return_value);
+    return $return_value;
 }
 
 
@@ -1204,42 +1204,42 @@ 
  */
 function return_theme_language($language, $theme)
 {
-	global $mod_strings, $sugar_config, $current_language;
+    global $mod_strings, $sugar_config, $current_language;
 
-	$language_used = $language;
-	$default_language = $sugar_config['default_language'];
+    $language_used = $language;
+    $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")){
-		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";
-		include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override");
-	}
-	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;
-	}
+    include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.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";
+        include(SugarThemeRegistry::get($theme)->getFilePath()."/language/$current_language.lang.php.override");
+    }
+    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))
-	{
-		$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(!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'])
-	{
-		foreach($theme_strings as $entry_key=>$entry_value)
-		{
-			$theme_strings[$entry_key] = $language_used.' '.$entry_value;
-		}
-	}
+    // If we are in debug mode for translating, turn on the prefix now!
+    if($sugar_config['translation_string_prefix'])
+    {
+        foreach($theme_strings as $entry_key=>$entry_value)
+        {
+            $theme_strings[$entry_key] = $language_used.' '.$entry_value;
+        }
+    }
 
-	return $theme_strings;
+    return $theme_strings;
 }
 
 
@@ -1251,12 +1251,12 @@ 
  */
 function return_session_value_or_default($varname, $default)
 {
-	if(isset($_SESSION[$varname]) && $_SESSION[$varname] != "")
-	{
-		return $_SESSION[$varname];
-	}
+    if(isset($_SESSION[$varname]) && $_SESSION[$varname] != "")
+    {
+        return $_SESSION[$varname];
+    }
 
-	return $default;
+    return $default;
 }
 
 /**
@@ -1271,15 +1271,15 @@ 
  */
 function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null)
 {
-	if($SQL_name == null)
-	{
-		$SQL_name = $variable_name;
-	}
+    if($SQL_name == null)
+    {
+        $SQL_name = $variable_name;
+    }
 
-	if(isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "")
-	{
-		array_push($where_clauses, "$SQL_name like '".$GLOBALS['db']->quote($_REQUEST[$variable_name])."%'");
-	}
+    if(isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "")
+    {
+        array_push($where_clauses, "$SQL_name like '".$GLOBALS['db']->quote($_REQUEST[$variable_name])."%'");
+    }
 }
 
 /**
@@ -1292,16 +1292,16 @@ 
  */
 function generate_where_statement($where_clauses)
 {
-	$where = "";
-	foreach($where_clauses as $clause)
-	{
-		if($where != "")
-		$where .= " and ";
-		$where .= $clause;
-	}
+    $where = "";
+    foreach($where_clauses as $clause)
+    {
+        if($where != "")
+        $where .= " and ";
+        $where .= $clause;
+    }
 
-	$GLOBALS['log']->info("Here is the where clause for the list view: $where");
-	return $where;
+    $GLOBALS['log']->info("Here is the where clause for the list view: $where");
+    return $where;
 }
 
 /**
@@ -1310,15 +1310,15 @@ 
  * @return bool False on failure
  */
 function is_guid($guid) {
-	if(strlen($guid) != 36) {
-		return false;
-	}
+    if(strlen($guid) != 36) {
+        return false;
+    }
 
-	if(preg_match("/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/i", $guid)) {
-		return true;
-	}
+    if(preg_match("/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/i", $guid)) {
+        return true;
+    }
 
-	return true;;
+    return true;;
 }
 
 
@@ -1332,59 +1332,59 @@ 
  */
 function create_guid()
 {
-	$microTime = microtime();
-	list($a_dec, $a_sec) = explode(" ", $microTime);
+    $microTime = microtime();
+    list($a_dec, $a_sec) = explode(" ", $microTime);
 
-	$dec_hex = dechex($a_dec* 1000000);
-	$sec_hex = dechex($a_sec);
+    $dec_hex = dechex($a_dec* 1000000);
+    $sec_hex = dechex($a_sec);
 
-	ensure_length($dec_hex, 5);
-	ensure_length($sec_hex, 6);
+    ensure_length($dec_hex, 5);
+    ensure_length($sec_hex, 6);
 
-	$guid = "";
-	$guid .= $dec_hex;
-	$guid .= create_guid_section(3);
-	$guid .= '-';
-	$guid .= create_guid_section(4);
-	$guid .= '-';
-	$guid .= create_guid_section(4);
-	$guid .= '-';
-	$guid .= create_guid_section(4);
-	$guid .= '-';
-	$guid .= $sec_hex;
-	$guid .= create_guid_section(6);
+    $guid = "";
+    $guid .= $dec_hex;
+    $guid .= create_guid_section(3);
+    $guid .= '-';
+    $guid .= create_guid_section(4);
+    $guid .= '-';
+    $guid .= create_guid_section(4);
+    $guid .= '-';
+    $guid .= create_guid_section(4);
+    $guid .= '-';
+    $guid .= $sec_hex;
+    $guid .= create_guid_section(6);
 
-	return $guid;
+    return $guid;
 
 }
 
 function create_guid_section($characters)
 {
-	$return = "";
-	for($i=0; $i<$characters; $i++)
-	{
-		$return .= dechex(mt_rand(0,15));
-	}
-	return $return;
+    $return = "";
+    for($i=0; $i<$characters; $i++)
+    {
+        $return .= dechex(mt_rand(0,15));
+    }
+    return $return;
 }
 
 function ensure_length(&$string, $length)
 {
-	$strlen = strlen($string);
-	if($strlen < $length)
-	{
-		$string = str_pad($string,$length,"0");
-	}
-	else if($strlen > $length)
-	{
-		$string = substr($string, 0, $length);
-	}
+    $strlen = strlen($string);
+    if($strlen < $length)
+    {
+        $string = str_pad($string,$length,"0");
+    }
+    else if($strlen > $length)
+    {
+        $string = substr($string, 0, $length);
+    }
 }
 
 function microtime_diff($a, $b) {
-	list($a_dec, $a_sec) = explode(" ", $a);
-	list($b_dec, $b_sec) = explode(" ", $b);
-	return $b_sec - $a_sec + $b_dec - $a_dec;
+    list($a_dec, $a_sec) = explode(" ", $a);
+    list($b_dec, $b_sec) = explode(" ", $b);
+    return $b_sec - $a_sec + $b_dec - $a_dec;
 }
 
 // check if Studio is displayed.
@@ -1397,7 +1397,7 @@ 
 
 
 
-	return true;
+    return true;
 
 }
 
@@ -1420,7 +1420,7 @@ 
 
 }
 
- 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'];
     }
@@ -1428,22 +1428,22 @@ 
     global $moduleList;
     $workflow_mod_list = array();
     foreach($moduleList as $module){
-		$workflow_mod_list[$module] = $module;
-	}
+        $workflow_mod_list[$module] = $module;
+    }
 
-	// This list is taken from teh previous version of workflow_utils.php
+    // This list is taken from teh previous version of workflow_utils.php
     $workflow_mod_list['Tasks'] = "Tasks";
     $workflow_mod_list['Calls'] = "Calls";
     $workflow_mod_list['Meetings'] = "Meetings";
     $workflow_mod_list['Notes'] = "Notes";
     $workflow_mod_list['ProjectTask'] = "Project Tasks";
-	$workflow_mod_list['Leads'] = "Leads";
-	$workflow_mod_list['Opportunities'] = "Opportunities";
-	// End of list
+    $workflow_mod_list['Leads'] = "Leads";
+    $workflow_mod_list['Opportunities'] = "Opportunities";
+    // End of list
 
     $workflow_admin_modules = array();
     if(empty($user)) {
-    	return $workflow_admin_modules;
+        return $workflow_admin_modules;
     }
     $actions = ACLAction::getUserActions($user->id);
     //check for ForecastSchedule because it doesn't exist in $workflow_mod_list
@@ -1497,7 +1497,7 @@ 
         return false;
     }
 
-	return $user->isAdmin();
+    return $user->isAdmin();
 }
 
 /**
@@ -1510,7 +1510,7 @@ 
  */
 function get_theme_display($theme)
 {
-	return SugarThemeRegistry::get($theme)->name;
+    return SugarThemeRegistry::get($theme)->name;
 }
 
 /**
@@ -1537,7 +1537,7 @@ 
  * Contributor(s): ______________________________________..
  */
 function get_select_options ($option_list, $selected) {
-	return get_select_options_with_id($option_list, $selected);
+    return get_select_options_with_id($option_list, $selected);
 }
 
 /**
@@ -1550,7 +1550,7 @@ 
  * Contributor(s): ______________________________________..
  */
 function get_select_options_with_id ($option_list, $selected_key) {
-	return get_select_options_with_id_separate_key($option_list, $option_list, $selected_key);
+    return get_select_options_with_id_separate_key($option_list, $option_list, $selected_key);
 }
 
 
@@ -1565,23 +1565,23 @@ 
  * Contributor(s): ______________________________________..
  */
 function get_select_options_with_id_separate_key ($label_list, $key_list, $selected_key, $massupdate=false) {
-	global $app_strings;
-	$select_options = "";
+    global $app_strings;
+    $select_options = "";
 
-	//for setting null selection values to human readable --None--
-	$pattern = "/'0?'></";
-	$replacement = "''>".$app_strings['LBL_NONE']."<";
+    //for setting null selection values to human readable --None--
+    $pattern = "/'0?'></";
+    $replacement = "''>".$app_strings['LBL_NONE']."<";
     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
     }
 
-	if (empty($key_list)) $key_list = array();
-	//create the type dropdown domain and set the selected value if $opp value already exists
-	foreach ($key_list as $option_key=>$option_value) {
+    if (empty($key_list)) $key_list = array();
+    //create the type dropdown domain and set the selected value if $opp value already exists
+    foreach ($key_list as $option_key=>$option_value) {
 
-		$selected_string = '';
-		// the system is evaluating $selected_key == 0 || '' to true.  Be very careful when changing this.  Test all cases.
-		// The bug was only happening with one of the users in the drop down.  It was being replaced by none.
+        $selected_string = '';
+        // the system is evaluating $selected_key == 0 || '' to true.  Be very careful when changing this.  Test all cases.
+        // The bug was only happening with one of the users in the drop down.  It was being replaced by none.
         if (
             ($option_key != '' && $selected_key == $option_key)
             || (
@@ -1590,15 +1590,15 @@ 
             )
             || (is_array($selected_key) &&  in_array($option_key, $selected_key))
         ) {
-			$selected_string = 'selected ';
-		}
+            $selected_string = 'selected ';
+        }
 
-		$html_value = $option_key;
+        $html_value = $option_key;
 
-		$select_options .= "\n<OPTION ".$selected_string."value='$html_value'>$label_list[$option_key]</OPTION>";
-	}
-	$select_options = preg_replace($pattern, $replacement, $select_options);
-	return $select_options;
+        $select_options .= "\n<OPTION ".$selected_string."value='$html_value'>$label_list[$option_key]</OPTION>";
+    }
+    $select_options = preg_replace($pattern, $replacement, $select_options);
+    return $select_options;
 }
 
 
@@ -1609,10 +1609,10 @@ 
  */
 function sugar_die($error_message, $exit_code = 1)
 {
-	global $focus;
-	sugar_cleanup();
-	echo $error_message;
-	die($exit_code);
+    global $focus;
+    sugar_cleanup();
+    echo $error_message;
+    die($exit_code);
 }
 
 
@@ -1623,7 +1623,7 @@ 
  * Contributor(s): ______________________________________..
  */
 function get_clear_form_js () {
-	$the_script = <<<EOQ
+    $the_script = <<<EOQ
 <script type="text/javascript" language="JavaScript">
 function clear_form(form) {
 	var newLoc = 'index.php?action=' + form.action.value + '&module=' + form.module.value + '&query=true&clear_query=true';
@@ -1635,7 +1635,7 @@ 
 </script>
 EOQ;
 
-	return $the_script;
+    return $the_script;
 }
 
 /**
@@ -1647,8 +1647,8 @@ 
  * Contributor(s): ______________________________________..
  */
 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
+    //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">
 <!--
 function set_focus() {
@@ -1672,7 +1672,7 @@ 
 </script>
 EOQ;
 
-	return $the_script;
+    return $the_script;
 }
 
 /**
@@ -1688,26 +1688,26 @@ 
  * Contributor(s): ______________________________________..
  */
 function array_csort() {
-	$args = func_get_args();
-	$marray = array_shift($args);
-	$i = 0;
-
-	$msortline = "return(array_multisort(";
-	foreach ($args as $arg) {
-		$i++;
-		if (is_string($arg)) {
-			foreach ($marray as $row) {
-				$sortarr[$i][] = $row[$arg];
-			}
-		} else {
-			$sortarr[$i] = $arg;
-		}
-		$msortline .= "\$sortarr[".$i."],";
-	}
-	$msortline .= "\$marray));";
+    $args = func_get_args();
+    $marray = array_shift($args);
+    $i = 0;
+
+    $msortline = "return(array_multisort(";
+    foreach ($args as $arg) {
+        $i++;
+        if (is_string($arg)) {
+            foreach ($marray as $row) {
+                $sortarr[$i][] = $row[$arg];
+            }
+        } else {
+            $sortarr[$i] = $arg;
+        }
+        $msortline .= "\$sortarr[".$i."],";
+    }
+    $msortline .= "\$marray));";
 
-	eval($msortline);
-	return $marray;
+    eval($msortline);
+    return $marray;
 }
 
 /**
@@ -1718,9 +1718,9 @@ 
  * Contributor(s): ______________________________________..
  */
 function parse_calendardate($local_format) {
-	preg_match('/\(?([^-]{1})[^-]*-([^-]{1})[^-]*-([^-]{1})[^-]*\)/', $local_format, $matches);
-	$calendar_format = "%" . $matches[1] . "-%" . $matches[2] . "-%" . $matches[3];
-	return str_replace(array("y", "ￄ1�7", "a", "j"), array("Y", "Y", "Y", "d"), $calendar_format);
+    preg_match('/\(?([^-]{1})[^-]*-([^-]{1})[^-]*-([^-]{1})[^-]*\)/', $local_format, $matches);
+    $calendar_format = "%" . $matches[1] . "-%" . $matches[2] . "-%" . $matches[3];
+    return str_replace(array("y", "ￄ1�7", "a", "j"), array("Y", "Y", "Y", "d"), $calendar_format);
 }
 
 
@@ -1728,24 +1728,24 @@ 
 
 
 function translate($string, $mod='', $selectedValue=''){
-	//$test_start = microtime();
-	//static $mod_strings_results = array();
-	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'];
-		}
-		$mod_strings = return_module_language($current_language, $mod);
+    //$test_start = microtime();
+    //static $mod_strings_results = array();
+    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'];
+        }
+        $mod_strings = return_module_language($current_language, $mod);
         if ($mod == "")
         echo "Language is <pre>" . $mod_strings . "</pre>";
 
-	}else{
-		global $mod_strings;
-	}
+    }else{
+        global $mod_strings;
+    }
 
-	$returnValue = '';
-	global $app_strings, $app_list_strings;
+    $returnValue = '';
+    global $app_strings, $app_list_strings;
 
     if (isset($mod_strings[$string]))
         $returnValue = $mod_strings[$string];
@@ -1757,34 +1757,34 @@ 
         $returnValue = $app_list_strings['moduleList'][$string];
 
 
-	//$test_end = microtime();
-	//
-	//    $mod_strings_results[$mod] = microtime_diff($test_start,$test_end);
-	//
-	//    echo("translate results:");
-	//    $total_time = 0;
-	//    $total_strings = 0;
-	//    foreach($mod_strings_results as $key=>$value)
-	//    {
-	//        echo("Module $key \t\t time $value \t\t<br>");
-	//        $total_time += $value;
-	//    }
-	//
-	//    echo("Total time: $total_time<br>");
+    //$test_end = microtime();
+    //
+    //    $mod_strings_results[$mod] = microtime_diff($test_start,$test_end);
+    //
+    //    echo("translate results:");
+    //    $total_time = 0;
+    //    $total_strings = 0;
+    //    foreach($mod_strings_results as $key=>$value)
+    //    {
+    //        echo("Module $key \t\t time $value \t\t<br>");
+    //        $total_time += $value;
+    //    }
+    //
+    //    echo("Total time: $total_time<br>");
 
 
 
-	if(empty($returnValue)){
-		return $string;
-	}
+    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]) ){
-		return $returnValue[$selectedValue];
-	}
+    if(is_array($returnValue) && (!empty($selectedValue) || (is_numeric($selectedValue) && $selectedValue == 0))  && isset($returnValue[$selectedValue]) ){
+        return $returnValue[$selectedValue];
+    }
 
-	return $returnValue;
+    return $returnValue;
 }
 
 function unTranslateNum($num) {
@@ -1808,16 +1808,16 @@ 
 }
 
 function add_http($url) {
-	if(!preg_match("@://@i", $url)) {
-		$scheme = "http";
-		if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
-			$scheme = 'https';
-		}
+    if(!preg_match("@://@i", $url)) {
+        $scheme = "http";
+        if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+            $scheme = 'https';
+        }
 
-		return "{$scheme}://{$url}";
-	}
+        return "{$scheme}://{$url}";
+    }
 
-	return $url;
+    return $url;
 }
 
 /**
@@ -1825,25 +1825,25 @@ 
  * @return array
  */
 function getDefaultXssTags() {
-	$tmp = array(
-	"applet" => "applet",
-	"base" => "base",
-	"embed" => "embed",
-	"form" => "form",
-	"frame" => "frame",
-	"frameset" => "frameset",
-	"iframe" => "iframe",
-	"import" => "\?import",
-	"layer" => "layer",
-	"link" => "link",
-	"object" => "object",
-	"script" => "script",
-	"xmp" => "xmp",
-	);
-
-	$ret = base64_encode(serialize($tmp));
-
-	return $ret;
+    $tmp = array(
+    "applet" => "applet",
+    "base" => "base",
+    "embed" => "embed",
+    "form" => "form",
+    "frame" => "frame",
+    "frameset" => "frameset",
+    "iframe" => "iframe",
+    "import" => "\?import",
+    "layer" => "layer",
+    "link" => "link",
+    "object" => "object",
+    "script" => "script",
+    "xmp" => "xmp",
+    );
+
+    $ret = base64_encode(serialize($tmp));
+
+    return $ret;
 }
 
 /**
@@ -1865,28 +1865,28 @@ 
  * @return array Array of matches, empty on clean string
  */
 function clean_xss($str, $cleanImg=true) {
-	global $sugar_config;
+    global $sugar_config;
 
-	if(empty($sugar_config['email_xss']))
-	$sugar_config['email_xss'] = getDefaultXssTags();
+    if(empty($sugar_config['email_xss']))
+    $sugar_config['email_xss'] = getDefaultXssTags();
 
-	$xsstags = unserialize(base64_decode($sugar_config['email_xss']));
+    $xsstags = unserialize(base64_decode($sugar_config['email_xss']));
 
-	// cn: bug 13079 - "on\w" matched too many non-events (cONTact, strONG, etc.)
-	$jsEvents  = "onblur|onfocus|oncontextmenu|onresize|onscroll|onunload|ondblclick|onclick|";
-	$jsEvents .= "onmouseup|onmouseover|onmousedown|onmouseenter|onmouseleave|onmousemove|onload|onchange|";
-	$jsEvents .= "onreset|onselect|onsubmit|onkeydown|onkeypress|onkeyup|onabort|onerror|ondragdrop";
+    // cn: bug 13079 - "on\w" matched too many non-events (cONTact, strONG, etc.)
+    $jsEvents  = "onblur|onfocus|oncontextmenu|onresize|onscroll|onunload|ondblclick|onclick|";
+    $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';
+    $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);
+    $tagmatches = array();
+    $matches = array();
+    preg_match_all($tagsrex, $str, $tagmatches, PREG_PATTERN_ORDER);
     foreach($tagmatches[1] as $no => $tag) {
         if(in_array($tag, $xsstags)) {
             // dangerous tag - take out whole
@@ -1900,38 +1900,38 @@ 
         }
     }
 
-	$matches = array_merge($matches, xss_check_pattern($javascript_regex, $str));
+    $matches = array_merge($matches, xss_check_pattern($javascript_regex, $str));
 
-	if($cleanImg) {
-		$matches = array_merge($matches,
-		xss_check_pattern($imgsrc_regex, $str)
-		);
-	}
+    if($cleanImg) {
+        $matches = array_merge($matches,
+        xss_check_pattern($imgsrc_regex, $str)
+        );
+    }
 
-	// cn: bug 13498 - custom white-list of allowed domains that vet remote images
-	preg_match_all($css_url, $str, $cssUrlMatches, PREG_PATTERN_ORDER);
+    // 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) {
-			// normalize whitelist
-			foreach($sugar_config['security_trusted_domains'] as $k => $v) {
-				$sugar_config['security_trusted_domains'][$k] = strtolower($v);
-			}
+    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) {
+                $sugar_config['security_trusted_domains'][$k] = strtolower($v);
+            }
 
-			foreach($cssUrlMatches[0] as $match) {
-				$domain = strtolower(substr(strstr($match, "://"), 3));
-				$baseUrl = substr($domain, 0, strpos($domain, "/"));
+            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'])) {
-					$matches[] = $match;
-				}
-			}
-		}
-	} else {
-		$matches = array_merge($matches, $cssUrlMatches[0]);
-	}
+                if(!in_array($baseUrl, $sugar_config['security_trusted_domains'])) {
+                    $matches[] = $match;
+                }
+            }
+        }
+    } else {
+        $matches = array_merge($matches, $cssUrlMatches[0]);
+    }
 
-	return $matches;
+    return $matches;
 }
 
 /**
@@ -1941,8 +1941,8 @@ 
  * @return array
  */
 function xss_check_pattern($pattern, $str) {
-	preg_match_all($pattern, $str, $matches, PREG_PATTERN_ORDER);
-	return $matches[1];
+    preg_match_all($pattern, $str, $matches, PREG_PATTERN_ORDER);
+    return $matches[1];
 }
 
 /**
@@ -1964,80 +1964,80 @@ 
  */
 function clean_string($str, $filter = "STANDARD", $dieOnBadData = true)
 {
-	global  $sugar_config;
-
-	$filters = Array(
-	"STANDARD"        => '#[^A-Z0-9\-_\.\@]#i',
-	"STANDARDSPACE"   => '#[^A-Z0-9\-_\.\@\ ]#i',
-	"FILE"            => '#[^A-Z0-9\-_\.]#i',
-	"NUMBER"          => '#[^0-9\-]#i',
-	"SQL_COLUMN_LIST" => '#[^A-Z0-9\(\),_\.]#i',
-	"PATH_NO_URL"     => '#://#i',
-	"SAFED_GET"		  => '#[^A-Z0-9\@\=\&\?\.\/\-_~+]#i', /* range of allowed characters in a GET string */
-	"UNIFIED_SEARCH"	=> "#[\\x00]#", /* cn: bug 3356 & 9236 - MBCS search strings */
-	"AUTO_INCREMENT"	=> '#[^0-9\-,\ ]#i',
-	"ALPHANUM"        => '#[^A-Z0-9\-]#i',
-	);
-
-	if (preg_match($filters[$filter], $str)) {
-		if (isset($GLOBALS['log']) && is_object($GLOBALS['log'])) {
-			$GLOBALS['log']->fatal("SECURITY[$filter]: bad data passed in; string: {$str}");
-		}
-		if ( $dieOnBadData ) {
-			die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
-		}
-		return false;
-	}
-	else {
-		return $str;
-	}
+    global  $sugar_config;
+
+    $filters = Array(
+    "STANDARD"        => '#[^A-Z0-9\-_\.\@]#i',
+    "STANDARDSPACE"   => '#[^A-Z0-9\-_\.\@\ ]#i',
+    "FILE"            => '#[^A-Z0-9\-_\.]#i',
+    "NUMBER"          => '#[^0-9\-]#i',
+    "SQL_COLUMN_LIST" => '#[^A-Z0-9\(\),_\.]#i',
+    "PATH_NO_URL"     => '#://#i',
+    "SAFED_GET"		  => '#[^A-Z0-9\@\=\&\?\.\/\-_~+]#i', /* range of allowed characters in a GET string */
+    "UNIFIED_SEARCH"	=> "#[\\x00]#", /* cn: bug 3356 & 9236 - MBCS search strings */
+    "AUTO_INCREMENT"	=> '#[^0-9\-,\ ]#i',
+    "ALPHANUM"        => '#[^A-Z0-9\-]#i',
+    );
+
+    if (preg_match($filters[$filter], $str)) {
+        if (isset($GLOBALS['log']) && is_object($GLOBALS['log'])) {
+            $GLOBALS['log']->fatal("SECURITY[$filter]: bad data passed in; string: {$str}");
+        }
+        if ( $dieOnBadData ) {
+            die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
+        }
+        return false;
+    }
+    else {
+        return $str;
+    }
 }
 
 function clean_special_arguments() {
-	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");
-	if (!empty($_REQUEST) && !empty($_REQUEST['login_module'])) clean_string($_REQUEST['login_module'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['login_action'])) clean_string($_REQUEST['login_action'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['ck_login_theme_20'])) clean_string($_REQUEST['ck_login_theme_20'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['module_name'])) clean_string($_REQUEST['module_name'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['module'])) clean_string($_REQUEST['module'], "STANDARD");
-	if (!empty($_POST) && !empty($_POST['parent_type'])) clean_string($_POST['parent_type'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['mod_lang'])) clean_string($_REQUEST['mod_lang'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['dyn_layout_file'])) clean_string($_SESSION['dyn_layout_file'], "PATH_NO_URL");
-	if (!empty($_GET) && !empty($_GET['from'])) clean_string($_GET['from']);
-	if (!empty($_GET) && !empty($_GET['gmto'])) clean_string($_GET['gmto'], "NUMBER");
-	if (!empty($_GET) && !empty($_GET['case_number'])) clean_string($_GET['case_number'], "AUTO_INCREMENT");
-	if (!empty($_GET) && !empty($_GET['bug_number'])) clean_string($_GET['bug_number'], "AUTO_INCREMENT");
-	if (!empty($_GET) && !empty($_GET['quote_num'])) clean_string($_GET['quote_num'], "AUTO_INCREMENT");
-	clean_superglobals('stamp', 'ALPHANUM'); // for vcr controls
-	clean_superglobals('offset', 'ALPHANUM');
-	clean_superglobals('return_action');
-	clean_superglobals('return_module');
-	return TRUE;
+    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");
+    if (!empty($_REQUEST) && !empty($_REQUEST['login_module'])) clean_string($_REQUEST['login_module'], "STANDARD");
+    if (!empty($_REQUEST) && !empty($_REQUEST['login_action'])) clean_string($_REQUEST['login_action'], "STANDARD");
+    if (!empty($_REQUEST) && !empty($_REQUEST['ck_login_theme_20'])) clean_string($_REQUEST['ck_login_theme_20'], "STANDARD");
+    if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme'], "STANDARD");
+    if (!empty($_REQUEST) && !empty($_REQUEST['module_name'])) clean_string($_REQUEST['module_name'], "STANDARD");
+    if (!empty($_REQUEST) && !empty($_REQUEST['module'])) clean_string($_REQUEST['module'], "STANDARD");
+    if (!empty($_POST) && !empty($_POST['parent_type'])) clean_string($_POST['parent_type'], "STANDARD");
+    if (!empty($_REQUEST) && !empty($_REQUEST['mod_lang'])) clean_string($_REQUEST['mod_lang'], "STANDARD");
+    if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language'], "STANDARD");
+    if (!empty($_SESSION) && !empty($_SESSION['dyn_layout_file'])) clean_string($_SESSION['dyn_layout_file'], "PATH_NO_URL");
+    if (!empty($_GET) && !empty($_GET['from'])) clean_string($_GET['from']);
+    if (!empty($_GET) && !empty($_GET['gmto'])) clean_string($_GET['gmto'], "NUMBER");
+    if (!empty($_GET) && !empty($_GET['case_number'])) clean_string($_GET['case_number'], "AUTO_INCREMENT");
+    if (!empty($_GET) && !empty($_GET['bug_number'])) clean_string($_GET['bug_number'], "AUTO_INCREMENT");
+    if (!empty($_GET) && !empty($_GET['quote_num'])) clean_string($_GET['quote_num'], "AUTO_INCREMENT");
+    clean_superglobals('stamp', 'ALPHANUM'); // for vcr controls
+    clean_superglobals('offset', 'ALPHANUM');
+    clean_superglobals('return_action');
+    clean_superglobals('return_module');
+    return TRUE;
 }
 
 /**
  * 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){
-	$_GET[$key] = $val;
-	$_POST[$key] = $val;
-	$_REQUEST[$key] = $val;
+    $_GET[$key] = $val;
+    $_POST[$key] = $val;
+    $_REQUEST[$key] = $val;
 }
 
 // Works in conjunction with clean_string() to defeat SQL injection, file inclusion attacks, and XSS
 function clean_incoming_data() {
-	global $sugar_config;
+    global $sugar_config;
     global $RAW_REQUEST;
 
     if(get_magic_quotes_gpc()) {
@@ -2047,120 +2047,120 @@ 
         $RAW_REQUEST = $_REQUEST;
     }
 
-	if (get_magic_quotes_gpc() == 1) {
-		$req  = array_map("preprocess_param", $_REQUEST);
-		$post = array_map("preprocess_param", $_POST);
-		$get  = array_map("preprocess_param", $_GET);
-	} else {
+    if (get_magic_quotes_gpc() == 1) {
+        $req  = array_map("preprocess_param", $_REQUEST);
+        $post = array_map("preprocess_param", $_POST);
+        $get  = array_map("preprocess_param", $_GET);
+    } else {
 
-		$req  = array_map("securexss", $_REQUEST);
-		$post = array_map("securexss", $_POST);
-		$get  = array_map("securexss", $_GET);
-	}
+        $req  = array_map("securexss", $_REQUEST);
+        $post = array_map("securexss", $_POST);
+        $get  = array_map("securexss", $_GET);
+    }
 
-	// 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) {
-		 $_REQUEST[$k] = $v;
+    // 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) {
+            $_REQUEST[$k] = $v;
 
-	    //ensure the keys are safe as well.  If mbstring encoding translation is on, the post keys don't
+        //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'){
+        if(ini_get('mbstring.encoding_translation')==='1'){
             securexsskey($k,false);
         }else{
-		    securexsskey($k,true);
+            securexsskey($k,true);
         }
 
-	}
-	// Any additional variables that need to be cleaned should be added here
-	if (isset($_REQUEST['login_theme'])) clean_string($_REQUEST['login_theme']);
-	if (isset($_REQUEST['login_module'])) clean_string($_REQUEST['login_module']);
-	if (isset($_REQUEST['login_action'])) clean_string($_REQUEST['login_action']);
-	if (isset($_REQUEST['login_language'])) clean_string($_REQUEST['login_language']);
-	if (isset($_REQUEST['action'])) clean_string($_REQUEST['action']);
-	if (isset($_REQUEST['module'])) clean_string($_REQUEST['module']);
-	if (isset($_REQUEST['record'])) clean_string($_REQUEST['record'], 'STANDARDSPACE');
-	if (isset($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme']);
-	if (isset($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language']);
-	if (isset($_REQUEST['language'])) clean_string($_REQUEST['language']);
-	if (isset($sugar_config['default_theme'])) clean_string($sugar_config['default_theme']);
-	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');
-	}
-	// Clean "offset" and "order_by" parameters in URL
-	foreach ($_REQUEST as $key => $val) {
-		if (str_end($key, "_offset")) {
-			clean_string($_REQUEST[$key], "ALPHANUM"); // keep this ALPHANUM for disable_count_query
-			set_superglobals($key, $_REQUEST[$key]);
-		}
-		elseif (str_end($key, "_ORDER_BY")) {
-			clean_string($_REQUEST[$key], "SQL_COLUMN_LIST");
-			set_superglobals($key, $_REQUEST[$key]);
-		}
-	}
+    }
+    // Any additional variables that need to be cleaned should be added here
+    if (isset($_REQUEST['login_theme'])) clean_string($_REQUEST['login_theme']);
+    if (isset($_REQUEST['login_module'])) clean_string($_REQUEST['login_module']);
+    if (isset($_REQUEST['login_action'])) clean_string($_REQUEST['login_action']);
+    if (isset($_REQUEST['login_language'])) clean_string($_REQUEST['login_language']);
+    if (isset($_REQUEST['action'])) clean_string($_REQUEST['action']);
+    if (isset($_REQUEST['module'])) clean_string($_REQUEST['module']);
+    if (isset($_REQUEST['record'])) clean_string($_REQUEST['record'], 'STANDARDSPACE');
+    if (isset($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme']);
+    if (isset($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language']);
+    if (isset($_REQUEST['language'])) clean_string($_REQUEST['language']);
+    if (isset($sugar_config['default_theme'])) clean_string($sugar_config['default_theme']);
+    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');
+    }
+    // Clean "offset" and "order_by" parameters in URL
+    foreach ($_REQUEST as $key => $val) {
+        if (str_end($key, "_offset")) {
+            clean_string($_REQUEST[$key], "ALPHANUM"); // keep this ALPHANUM for disable_count_query
+            set_superglobals($key, $_REQUEST[$key]);
+        }
+        elseif (str_end($key, "_ORDER_BY")) {
+            clean_string($_REQUEST[$key], "SQL_COLUMN_LIST");
+            set_superglobals($key, $_REQUEST[$key]);
+        }
+    }
 
 
-	return 0;
+    return 0;
 }
 
 // Returns TRUE if $str begins with $begin
 function str_begin($str, $begin) {
-	return (substr($str, 0, strlen($begin)) == $begin);
+    return (substr($str, 0, strlen($begin)) == $begin);
 }
 
 // Returns TRUE if $str ends with $end
 function str_end($str, $end) {
-	return (substr($str, strlen($str) - strlen($end)) == $end);
+    return (substr($str, strlen($str) - strlen($end)) == $end);
 }
 
 function securexss($value) {
-	if(is_array($value)){
-    	$new = array();
+    if(is_array($value)){
+        $new = array();
         foreach($value as $key=>$val){
-       		$new[$key] = securexss($val);
+                $new[$key] = securexss($val);
         }
         return $new;
     }
-	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);
+    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){
-	global $sugar_config;
-	$matches = array();
-	preg_match('/[\'"<>]/', $value, $matches);
-	if(!empty($matches)){
-		if($die){
-			die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
-		}else{
-			unset($_REQUEST[$value]);
-			unset($_POST[$value]);
-			unset($_GET[$value]);
-		}
-	}
+    global $sugar_config;
+    $matches = array();
+    preg_match('/[\'"<>]/', $value, $matches);
+    if(!empty($matches)){
+        if($die){
+            die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
+        }else{
+            unset($_REQUEST[$value]);
+            unset($_POST[$value]);
+            unset($_GET[$value]);
+        }
+    }
 }
 
 function preprocess_param($value){
-	if(is_string($value)){
-		if(get_magic_quotes_gpc() == 1){
-			$value = stripslashes($value);
-		}
+    if(is_string($value)){
+        if(get_magic_quotes_gpc() == 1){
+            $value = stripslashes($value);
+        }
 
-		$value = securexss($value);
-	}
-	else if (is_array($value)){
-	    foreach ($value as $key => $element) {
-	        $value[$key] = preprocess_param($element);
-	    }
-	}
+        $value = securexss($value);
+    }
+    else if (is_array($value)){
+        foreach ($value as $key => $element) {
+            $value[$key] = preprocess_param($element);
+        }
+    }
 
-	return $value;
+    return $value;
 }
 
 function cleanup_slashes($value)
@@ -2184,13 +2184,13 @@ 
 // this function cleans id's when being imported
 function convert_id($string)
 {
-	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);
+    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);
 }
 
 /**
@@ -2201,41 +2201,41 @@ 
     return SugarThemeRegistry::current()->getImage(basename($image), $other_attributes, empty($width) ? null : $width, empty($height) ? null : $height, $ext, $alt );
 }
 /**
- * @deprecated use SugarTheme::getImageURL()
- */
+     * @deprecated use SugarTheme::getImageURL()
+     */
 function getImagePath($image_name)
 {
     return SugarThemeRegistry::current()->getImageURL($image_name);
 }
 
 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);
-	return $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);
+    return $relative_path;
 }
 
 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()) {
-	    static $rand;
-	    if(empty($rand)) $rand = mt_rand();
-	    $dev = $rand;
-	} else {
-	    $dev = '';
-	}
-	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($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();
+        $dev = $rand;
+    } else {
+        $dev = '';
+    }
+    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;
 
-	return $path . "?v=$str";
+    return $path . "?v=$str";
 }
 
 function getVersionedScript($path, $additional_attrs='')
@@ -2245,19 +2245,19 @@ 
 
 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=''){
-	$path = $relative_path;
-	if (!empty($additional_params)){
-		$path .= '?' . $additional_params;
-	}
-	if (defined('TEMPLATE_URL')){
-		$path = TEMPLATE_URL . '/' . $path;
-	}
-	return $path;
+    $path = $relative_path;
+    if (!empty($additional_params)){
+        $path .= '?' . $additional_params;
+    }
+    if (defined('TEMPLATE_URL')){
+        $path = TEMPLATE_URL . '/' . $path;
+    }
+    return $path;
 }
 
 
@@ -2266,158 +2266,158 @@ 
 
 function getSQLDate($date_str)
 {
-	if (preg_match('/^(\d{1,2})-(\d{1,2})-(\d{4})$/',$date_str,$match))
-	{
-		if ( strlen($match[2]) == 1)
-		{
-			$match[2] = "0".$match[2];
-		}
-		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))
-	{
-		if ( strlen($match[2]) == 1)
-		{
-			$match[2] = "0".$match[2];
-		}
-		if ( strlen($match[1]) == 1)
-		{
-			$match[1] = "0".$match[1];
-		}
-		return "{$match[3]}-{$match[1]}-{$match[2]}";
-	}
-	else
-	{
-		return "";
-	}
+    if (preg_match('/^(\d{1,2})-(\d{1,2})-(\d{4})$/',$date_str,$match))
+    {
+        if ( strlen($match[2]) == 1)
+        {
+            $match[2] = "0".$match[2];
+        }
+        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))
+    {
+        if ( strlen($match[2]) == 1)
+        {
+            $match[2] = "0".$match[2];
+        }
+        if ( strlen($match[1]) == 1)
+        {
+            $match[1] = "0".$match[1];
+        }
+        return "{$match[3]}-{$match[1]}-{$match[2]}";
+    }
+    else
+    {
+        return "";
+    }
 }
 
 function clone_history(&$db, $from_id,$to_id, $to_type)
 {
-	global $timedate;
-	$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",
-	'Call'=>"modules/Calls/Call.php",
-	'Meeting'=>"modules/Meetings/Meeting.php",
-	'Note'=>"modules/Notes/Note.php",
-	'Tasks'=>"modules/Tasks/Task.php",
-	);
-
-
-	foreach($tables as $table=>$bean_class)
-	{
-
-		if (!class_exists($bean_class))
-		{
-			require_once($location[$bean_class]);
-		}
-
-		$bProcessingNotes=false;
-		if ($table=='notes')
-		{
-			$bProcessingNotes=true;
-		}
-		$query = "SELECT id FROM $table WHERE parent_id='$from_id'";
-		$results = $db->query($query);
-		while($row = $db->fetchByAssoc($results))
-		{
-			//retrieve existing record.
-			$bean= new $bean_class();
-			$bean->retrieve($row['id']);
-			//process for new instance.
-			if ($bProcessingNotes)
-			{
-				$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->contact_id=$to_id;
-			}
-			$bean->update_date_modified = false;
+    global $timedate;
+    $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",
+    'Call'=>"modules/Calls/Call.php",
+    'Meeting'=>"modules/Meetings/Meeting.php",
+    'Note'=>"modules/Notes/Note.php",
+    'Tasks'=>"modules/Tasks/Task.php",
+    );
+
+
+    foreach($tables as $table=>$bean_class)
+    {
+
+        if (!class_exists($bean_class))
+        {
+            require_once($location[$bean_class]);
+        }
+
+        $bProcessingNotes=false;
+        if ($table=='notes')
+        {
+            $bProcessingNotes=true;
+        }
+        $query = "SELECT id FROM $table WHERE parent_id='$from_id'";
+        $results = $db->query($query);
+        while($row = $db->fetchByAssoc($results))
+        {
+            //retrieve existing record.
+            $bean= new $bean_class();
+            $bean->retrieve($row['id']);
+            //process for new instance.
+            if ($bProcessingNotes)
+            {
+                $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->contact_id=$to_id;
+            }
+            $bean->update_date_modified = false;
             $bean->update_modified_by = false;
             if(isset($bean->date_modified))
                 $bean->date_modified = $timedate->to_db($bean->date_modified);
             if(isset($bean->date_entered))
                 $bean->date_entered = $timedate->to_db($bean->date_entered);
-			//save
-			$new_id=$bean->save();
+            //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);
-			}
-			//reset the values needed for attachment duplication.
-			$old_note_id=null;
-			$old_filename=null;
-		}
-	}
+            //duplicate the file now. for notes.
+            if ($bProcessingNotes && !empty($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;
+        }
+    }
 }
 
 function values_to_keys($array)
 {
-	$new_array = array();
-	if(!is_array($array))
-	{
-		return $new_array;
-	}
-	foreach($array as $arr){
-		$new_array[$arr] = $arr;
-	}
-	return $new_array;
+    $new_array = array();
+    if(!is_array($array))
+    {
+        return $new_array;
+    }
+    foreach($array as $arr){
+        $new_array[$arr] = $arr;
+    }
+    return $new_array;
 }
 
 function clone_relationship(&$db, $tables = array(), $from_column, $from_id, $to_id)
 {
-	foreach($tables as $table)
-	{
-
-		if ($table == 'emails_beans') {
-			$query = "SELECT * FROM $table WHERE $from_column='$from_id' and bean_module='Leads'";
-		} else {
-			$query = "SELECT * FROM $table WHERE $from_column='$from_id'";
-		}
-		$results = $db->query($query);
-		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';
-			}
+    foreach($tables as $table)
+    {
 
-			foreach($row as $name=>$value)
-			{
-
-				if(empty($names))
-				{
-					$names .= $name;
-					$values .= "'$value'";
-				} else
-				{
-					$names .= ', '. $name;
-					$values .= ", '$value'";
-				}
-			}
-			$query .= "($names)	VALUES ($values)";
-			$db->query($query);
-		}
-	}
+        if ($table == 'emails_beans') {
+            $query = "SELECT * FROM $table WHERE $from_column='$from_id' and bean_module='Leads'";
+        } else {
+            $query = "SELECT * FROM $table WHERE $from_column='$from_id'";
+        }
+        $results = $db->query($query);
+        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';
+            }
+
+            foreach($row as $name=>$value)
+            {
+
+                if(empty($names))
+                {
+                    $names .= $name;
+                    $values .= "'$value'";
+                } else
+                {
+                    $names .= ', '. $name;
+                    $values .= ", '$value'";
+                }
+            }
+            $query .= "($names)	VALUES ($values)";
+            $db->query($query);
+        }
+    }
 }
 
 function get_unlinked_email_query($type, $bean) {
@@ -2426,7 +2426,7 @@ 
     $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
+    $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
 	eabr.email_address_id = eear.email_address_id and eabr.deleted=0
@@ -2435,17 +2435,17 @@ 
 	) derivedemails on derivedemails.email_id = emails.id";
     $return_array['join_tables'][0] = '';
 
-	if (isset($type) and !empty($type['return_as_array'])) {
-		return $return_array;
-	}
+    if (isset($type) and !empty($type['return_as_array'])) {
+        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;
+    $bean = $GLOBALS['app']->controller->bean;
     if(empty($bean->$relation)) {
         $bean->load_relationship($relation);
     }
@@ -2455,8 +2455,8 @@ 
     }
     $rel_module = $bean->$relation->getRelatedModuleName();
     $rel_join = $bean->$relation->getJoin(array(
-    	'join_table_alias' => 'link_bean',
-    	'join_table_link_alias' => 'linkt',
+        'join_table_alias' => 'link_bean',
+        'join_table_link_alias' => 'linkt',
     ));
     $rel_join = str_replace("{$bean->table_name}.id", "'{$bean->id}'", $rel_join);
     $return_array['select']='SELECT DISTINCT emails.id ';
@@ -2535,12 +2535,12 @@ 
 
     $return_array['where']=" WHERE emails.deleted=0 ";
 
-    	//$return_array['join'] = '';
+        //$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());
-    	    $return_array["where"] .= "\n AND (email_ids.source = 'direct' OR emails.name LIKE '%$where%')";
+            $return_array["where"] .= "\n AND (email_ids.source = 'direct' OR emails.name LIKE '%$where%')";
         }
 
         return $return_array;
@@ -2553,32 +2553,32 @@ 
  **/
 function number_empty($value)
 {
-	return empty($value) && $value != '0';
+    return empty($value) && $value != '0';
 }
 
 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();
+    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)
-	{
+    $user_array = get_register_value('select_array', $key );
+    if(!$user_array)
+    {
 
-		$db = DBManagerFactory::getInstance();
+        $db = DBManagerFactory::getInstance();
 
-		$temp_result = Array();
-		$query = "SELECT {$focus->table_name}.id, {$display_columns} as display from {$focus->table_name} ";
-		$query .= "where ";
-		if ( $where != '')
-		{
-			$query .= $where." AND ";
-		}
+        $temp_result = Array();
+        $query = "SELECT {$focus->table_name}.id, {$display_columns} as display from {$focus->table_name} ";
+        $query .= "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;
@@ -2603,35 +2603,35 @@ 
         }
         /* END - SECURITY GROUPS */
 
-		if ( $order_by != '')
-		{
-			$query .= " order by {$focus->table_name}.{$order_by}";
-		}
-
-		$GLOBALS['log']->debug("get_user_array query: $query");
-		$result = $db->query($query, true, "Error filling in user array: ");
-
-		if ($add_blank==true){
-			// Add in a blank row
-			if($blank_is_none == true) { // set 'blank row' to "--None--"
-				global $app_strings;
-				$temp_result[''] = $app_strings['LBL_NONE'];
-			} else {
-				$temp_result[''] = '';
-			}
-		}
+        if ( $order_by != '')
+        {
+            $query .= " order by {$focus->table_name}.{$order_by}";
+        }
 
-		// Get the id and the name.
-		while($row = $db->fetchByAssoc($result))
-		{
-			$temp_result[$row['id']] = $row['display'];
-		}
+        $GLOBALS['log']->debug("get_user_array query: $query");
+        $result = $db->query($query, true, "Error filling in user array: ");
 
-		$user_array = $temp_result;
-		set_register_value('select_array', $key ,$temp_result);
-	}
+        if ($add_blank==true){
+            // Add in a blank row
+            if($blank_is_none == true) { // set 'blank row' to "--None--"
+                global $app_strings;
+                $temp_result[''] = $app_strings['LBL_NONE'];
+            } else {
+                $temp_result[''] = '';
+            }
+        }
+
+        // Get the id and the name.
+        while($row = $db->fetchByAssoc($result))
+        {
+            $temp_result[$row['id']] = $row['display'];
+        }
+
+        $user_array = $temp_result;
+        set_register_value('select_array', $key ,$temp_result);
+    }
 
-	return $user_array;
+    return $user_array;
 
 }
 /**
@@ -2643,50 +2643,50 @@ 
 // searches a list for items in a user's allowed tabs and returns an array that removes unallowed tabs from list
 function parse_list_modules(&$listArray)
 {
-	global $modListHeader;
-	$returnArray = array();
-
-	foreach($listArray as $optionName => $optionVal)
-	{
-		if(array_key_exists($optionName, $modListHeader))
-		{
-			$returnArray[$optionName] = $optionVal;
-		}
-
-		// special case for projects
-		if(array_key_exists('Project', $modListHeader))
-		{
-			$returnArray['ProjectTask'] = $listArray['ProjectTask'];
-		}
-	}
-	$acldenied = ACLController::disabledModuleList($listArray,false);
-	foreach($acldenied as $denied){
-		unset($returnArray[$denied]);
-	}
-	asort($returnArray);
+    global $modListHeader;
+    $returnArray = array();
+
+    foreach($listArray as $optionName => $optionVal)
+    {
+        if(array_key_exists($optionName, $modListHeader))
+        {
+            $returnArray[$optionName] = $optionVal;
+        }
+
+        // special case for projects
+        if(array_key_exists('Project', $modListHeader))
+        {
+            $returnArray['ProjectTask'] = $listArray['ProjectTask'];
+        }
+    }
+    $acldenied = ACLController::disabledModuleList($listArray,false);
+    foreach($acldenied as $denied){
+        unset($returnArray[$denied]);
+    }
+    asort($returnArray);
 
-	return $returnArray;
+    return $returnArray;
 }
 
 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>';
-	}
+    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>';
+    }
 }
 
 /* checks if it is a number that at least has the plus at the beginning.
  */
 function skype_formatted($number){
-	//kbrill - BUG #15375
-	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';
-	}
+    //kbrill - BUG #15375
+    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';
+    }
 //	return substr($number, 0, 1) == '+' || substr($number, 0, 2) == '00' || substr($number, 0, 2) == '011';
 }
 
@@ -2695,72 +2695,72 @@ 
 }
 
 function insert_charset_header() {
-	header('Content-Type: text/html; charset=UTF-8');
+    header('Content-Type: text/html; charset=UTF-8');
 }
 
 function getCurrentURL()
 {
-	$href = "http:";
-	if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
-	{
-		$href = 'https:';
-	}
+    $href = "http:";
+    if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
+    {
+        $href = 'https:';
+    }
 
-	$href.= "//".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];
-	return $href;
+    $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++) {
-
-		if(ord(substr($str, $i, 1))==10){
-			$new_str .= '\n';
-		}elseif(ord(substr($str, $i, 1))==13){
-			$new_str .= '\r';
-		}
-		else {
-			$new_str .= $str{$i};
-		}
-	}
+    $new_str = '';
+
+    for($i = 0; $i < strlen($str); $i++) {
+
+        if(ord(substr($str, $i, 1))==10){
+            $new_str .= '\n';
+        }elseif(ord(substr($str, $i, 1))==13){
+            $new_str .= '\r';
+        }
+        else {
+            $new_str .= $str{$i};
+        }
+    }
 
-	$new_str = str_replace("'", "\\'", $new_str);
+    $new_str = str_replace("'", "\\'", $new_str);
 
-	return $new_str;
+    return $new_str;
 }
 
 function js_escape($str, $keep=true){
-	$str = html_entity_decode(str_replace("\\", "", $str), ENT_QUOTES);
+    $str = html_entity_decode(str_replace("\\", "", $str), ENT_QUOTES);
 
-	if($keep){
-		$str = javascript_escape($str);
-	}
-	else {
-		$str = str_replace("'", " ", $str);
-		$str = str_replace('"', " ", $str);
-	}
+    if($keep){
+        $str = javascript_escape($str);
+    }
+    else {
+        $str = str_replace("'", " ", $str);
+        $str = str_replace('"', " ", $str);
+    }
 
-	return $str;
+    return $str;
 
-	//end function js_escape
+    //end function js_escape
 }
 
 function br2nl($str) {
-	$regex = "#<[^>]+br.+?>#i";
-	preg_match_all($regex, $str, $matches);
+    $regex = "#<[^>]+br.+?>#i";
+    preg_match_all($regex, $str, $matches);
 
-	foreach($matches[0] as $match) {
-		$str = str_replace($match, "<br>", $str);
-	}
+    foreach($matches[0] as $match) {
+        $str = str_replace($match, "<br>", $str);
+    }
 
-	$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
-	$str = str_ireplace($brs, "\n", $str); // to retrieve it
+    $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
+    $str = str_ireplace($brs, "\n", $str); // to retrieve it
 
-	return $str;
+    return $str;
 }
 
 /**
@@ -2782,29 +2782,29 @@ 
  * @param $displayStackTrace also show stack trace
  */
 function _ppl($mixed, $die=false, $displayStackTrace=false, $loglevel="fatal") {
-	if(!isset($GLOBALS['log']) || empty($GLOBALS['log'])) {
+    if(!isset($GLOBALS['log']) || empty($GLOBALS['log'])) {
 
-		$GLOBALS['log'] = LoggerManager :: getLogger('SugarCRM');
-	}
+        $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) {
-			$GLOBALS['log']->$loglevel($position['file']."({$position['line']})");
-		}
-	}
+    $GLOBALS['log']->$loglevel('------------------------------ _ppLogger() output start -----------------------------');
+    $GLOBALS['log']->$loglevel($mix);
+    if($displayStackTrace) {
+        foreach($stack as $position) {
+            $GLOBALS['log']->$loglevel($position['file']."({$position['line']})");
+        }
+    }
 
-	$GLOBALS['log']->$loglevel('------------------------------ _ppLogger() output end -----------------------------');
-	$GLOBALS['log']->$loglevel('------------------------------ _ppLogger() file: '.$stack[0]['file'].' line#: '.$stack[0]['line'].'-----------------------------');
+    $GLOBALS['log']->$loglevel('------------------------------ _ppLogger() output end -----------------------------');
+    $GLOBALS['log']->$loglevel('------------------------------ _ppLogger() file: '.$stack[0]['file'].' line#: '.$stack[0]['line'].'-----------------------------');
 
-	if($die) {
-		die();
-	}
+    if($die) {
+        die();
+    }
 }
 
 /**
@@ -2869,47 +2869,47 @@ 
  * @return 1 implies supported, 0 implies unsupported, -1 implies invalid
  */
 function check_php_version($sys_php_version = '') {
-	$sys_php_version = empty($sys_php_version) ? constant('PHP_VERSION') : $sys_php_version;
-	// versions below $min_considered_php_version considered invalid by default,
-	// versions equal to or above this ver will be considered depending
-	// on the rules that follow
-	$min_considered_php_version = '5.3.0';
-
-	// only the supported versions,
-	// should be mutually exclusive with $invalid_php_versions
-	$supported_php_versions = array (
-    	'5.3.0'
-	);
-
-	// invalid versions above the $min_considered_php_version,
-	// should be mutually exclusive with $supported_php_versions
-
-	// SugarCRM prohibits install on PHP 5.2.7 on all platforms
-	$invalid_php_versions = array('5.2.7');
-
-	// default unsupported
-	$retval = 0;
-
-	// versions below $min_considered_php_version are invalid
-	if(1 == version_compare($sys_php_version, $min_considered_php_version, '<')) {
-		$retval = -1;
-	}
+    $sys_php_version = empty($sys_php_version) ? constant('PHP_VERSION') : $sys_php_version;
+    // versions below $min_considered_php_version considered invalid by default,
+    // versions equal to or above this ver will be considered depending
+    // on the rules that follow
+    $min_considered_php_version = '5.3.0';
 
-	// 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) {
-			$retval = 1;
-			break;
-		}
-	}
+    // only the supported versions,
+    // should be mutually exclusive with $invalid_php_versions
+    $supported_php_versions = array (
+        '5.3.0'
+    );
 
-	// 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) {
-			$retval = -1;
-			break;
-		}
-	}
+    // invalid versions above the $min_considered_php_version,
+    // should be mutually exclusive with $supported_php_versions
+
+    // SugarCRM prohibits install on PHP 5.2.7 on all platforms
+    $invalid_php_versions = array('5.2.7');
+
+    // default unsupported
+    $retval = 0;
+
+    // versions below $min_considered_php_version are invalid
+    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) {
+            $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) {
+            $retval = -1;
+            break;
+        }
+    }
 
     //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
@@ -2917,7 +2917,7 @@ 
         $retval = 1;
     }
 
-	return $retval;
+    return $retval;
 }
 
 /**
@@ -2929,10 +2929,10 @@ 
  */
 function check_iis_version($sys_iis_version = '') {
 
-	$server_software = $_SERVER["SERVER_SOFTWARE"];
-	$iis_version = '';
-	if(strpos($server_software,'Microsoft-IIS') !== false && preg_match_all("/^.*\/(\d+\.?\d*)$/",  $server_software, $out))
-	    $iis_version = $out[1][0];
+    $server_software = $_SERVER["SERVER_SOFTWARE"];
+    $iis_version = '';
+    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;
 
@@ -2983,14 +2983,14 @@ 
 }
 
 function pre_login_check(){
-	global $action, $login_error;
-	if(!empty($action)&& $action == 'Login'){
-
-		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);
-			$_SESSION['login_error'] = $login_error;
-			echo '<script>
+    global $action, $login_error;
+    if(!empty($action)&& $action == 'Login'){
+
+        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);
+            $_SESSION['login_error'] = $login_error;
+            echo '<script>
 						function set_focus() {}
 						if(document.getElementById("post_error")) {
 							document.getElementById("post_error").innerHTML="'. $login_error. '";
@@ -3000,66 +3000,66 @@ 
 							//document.getElementById("user_password").disabled = true;
 						}
 						</script>';
-		}
-	}
+        }
+    }
 }
 
 
 
 function sugar_cleanup($exit = false) {
-	static $called = false;
-	if($called)return;
-	$called = true;
-	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();
-	$GLOBALS['logic_hook']->call_custom_logic('', 'server_round_trip');
-
-	//added this check to avoid errors during install.
-	if (empty($sugar_config['dbconfig'])) {
-		if ($exit) exit; else return;
-	}
+    static $called = false;
+    if($called)return;
+    $called = true;
+    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();
+    $GLOBALS['logic_hook']->call_custom_logic('', 'server_round_trip');
+
+    //added this check to avoid errors during install.
+    if (empty($sugar_config['dbconfig'])) {
+        if ($exit) exit; else return;
+    }
 
     if (!class_exists('Tracker', true)) {
-		require_once 'modules/Trackers/Tracker.php';
-	}
-	Tracker::logPage();
-	// Now write the cached tracker_queries
-	if(!empty($GLOBALS['savePreferencesToDB']) && $GLOBALS['savePreferencesToDB']) {
-	    if ( isset($GLOBALS['current_user']) && $GLOBALS['current_user'] instanceOf User )
-	        $GLOBALS['current_user']->savePreferencesToDB();
-	}
+        require_once 'modules/Trackers/Tracker.php';
+    }
+    Tracker::logPage();
+    // Now write the cached tracker_queries
+    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(
-		(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'] )
-
-	){
-		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'];
-		$_SESSION['USER_PREFRENCE_ERRORS'] = false;
-		echo "
+    //check to see if this is not an `ajax call AND the user preference error flag is set
+    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'] )
+
+    ){
+        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'];
+        $_SESSION['USER_PREFRENCE_ERRORS'] = false;
+        echo "
 		<script>
 			ajaxStatus.flashStatus('$err_mess',7000);
 		</script>";
 
-	}
+    }
 
-	pre_login_check();
-	if(class_exists('DBManagerFactory')) {
-		$db = DBManagerFactory::getInstance();
-		$db->disconnect();
-		if($exit) {
-			exit;
-		}
-	}
+    pre_login_check();
+    if(class_exists('DBManagerFactory')) {
+        $db = DBManagerFactory::getInstance();
+        $db->disconnect();
+        if($exit) {
+            exit;
+        }
+    }
 }
 
 register_shutdown_function('sugar_cleanup');
@@ -3071,64 +3071,64 @@ 
 
  */
 function check_logic_hook_file($module_name, $event, $action_array){
-	require_once('include/utils/logic_utils.php');
-	$add_logic = false;
+    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);
+        $hook_array = get_hook_array($module_name);
 
-		if(check_existing_element($hook_array, $event, $action_array)==true){
-			//the hook at hand is present, so do nothing
-		} else {
-			$add_logic = 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]))
             {
-			    $logic_count = count($hook_array[$event]);
+                $logic_count = count($hook_array[$event]);
             }
 
-			if($action_array[0]==""){
-				$action_array[0] = $logic_count  + 1;
-			}
-			$hook_array[$event][] = $action_array;
-
-		}
-		//end if the file exists already
-	} else {
-		$add_logic = true;
-		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($action_array[0]==""){
+                $action_array[0] = $logic_count  + 1;
+            }
+            $hook_array[$event][] = $action_array;
+
+        }
+        //end if the file exists already
+    } else {
+        $add_logic = true;
+        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){
 
-		//reorder array by element[0]
-		//$hook_array = reorder_array($hook_array, $event);
-		//!!!Finish this above TODO
+        //reorder array by element[0]
+        //$hook_array = reorder_array($hook_array, $event);
+        //!!!Finish this above TODO
 
-		$new_contents = replace_or_add_logic_type($hook_array);
-		write_logic_file($module_name, $new_contents);
+        $new_contents = replace_or_add_logic_type($hook_array);
+        write_logic_file($module_name, $new_contents);
 
-		//end if add_element is true
-	}
+        //end if add_element is true
+    }
 
-	//end function check_logic_hook_file
+    //end function check_logic_hook_file
 }
 
 function remove_logic_hook($module_name, $event, $action_array) {
     require_once('include/utils/logic_utils.php');
-	$add_logic = false;
+    $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);
+        $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 ) {
@@ -3150,111 +3150,111 @@ 
 
 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)
-	echo '<br>';
+    if(!$textOnly)
+    echo '<br>';
 
-	$first = true;
-	$out = '';
+    $first = true;
+    $out = '';
 
-	foreach($stack as $item) {
-		$file  = '';
-		$class = '';
-		$line  = '';
-		$function  = '';
+    foreach($stack as $item) {
+        $file  = '';
+        $class = '';
+        $line  = '';
+        $function  = '';
 
-		if(isset($item['file']))
-		$file = $item['file'];
-		if(isset($item['class']))
-		$class = $item['class'];
-		if(isset($item['line']))
-		$line = $item['line'];
-		if(isset($item['function']))
-		$function = $item['function'];
+        if(isset($item['file']))
+        $file = $item['file'];
+        if(isset($item['class']))
+        $class = $item['class'];
+        if(isset($item['line']))
+        $line = $item['line'];
+        if(isset($item['function']))
+        $function = $item['function'];
 
-		if(!$first) {
-			if(!$textOnly) {
-				$out .= '<font color="black"><b>';
-			}
+        if(!$first) {
+            if(!$textOnly) {
+                $out .= '<font color="black"><b>';
+            }
 
-			$out .= $file;
+            $out .= $file;
 
-			if(!$textOnly) {
-				$out .= '</b></font><font color="blue">';
-			}
+            if(!$textOnly) {
+                $out .= '</b></font><font color="blue">';
+            }
 
-			$out .= "[L:{$line}]";
+            $out .= "[L:{$line}]";
 
-			if(!$textOnly) {
-				$out .= '</font><font color="red">';
-			}
+            if(!$textOnly) {
+                $out .= '</font><font color="red">';
+            }
 
-			$out .= "({$class}:{$function})";
+            $out .= "({$class}:{$function})";
 
-			if(!$textOnly) {
-				$out .= '</font><br>';
-			} else {
-				$out .= "\n";
-			}
-		} else {
-			$first = false;
-		}
-	}
+            if(!$textOnly) {
+                $out .= '</font><br>';
+            } else {
+                $out .= "\n";
+            }
+        } else {
+            $first = false;
+        }
+    }
 
-	echo $out;
+    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") . ']';
-	$halt_script = true;
-	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 ) {
-		        $halt_script = false;
-		        $type = 'Notice';
-		    }
-		    else
-		        return;
-			break;
-		case E_USER_WARNING:
-		case E_COMPILE_WARNING:
-		case E_CORE_WARNING:
-		case E_WARNING:
-
-			$halt_script = false;
-			$type = "Warning";
-			break;
-
-		case E_USER_ERROR:
-		case E_COMPILE_ERROR:
-		case E_CORE_ERROR:
-		case E_ERROR:
-
-			$type = "Fatal Error";
-			break;
-
-		case E_PARSE:
-
-			$type = "Parse Error";
-			break;
-
-		default:
-			//don't know what it is might not be so bad
-			$halt_script = false;
-			$type = "Unknown Error ($errno)";
-			break;
-	}
-	$error_msg = '<b>'.$type.'</b>:' . $error_msg;
-	echo $error_msg;
-	display_stack_trace();
-	if($halt_script){
-		exit -1;
-	}
+    $error_msg = " $errstr occurred in <b>$errfile</b> on line $errline [" . date("Y-m-d H:i:s") . ']';
+    $halt_script = true;
+    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 ) {
+                $halt_script = false;
+                $type = 'Notice';
+            }
+            else
+                return;
+            break;
+        case E_USER_WARNING:
+        case E_COMPILE_WARNING:
+        case E_CORE_WARNING:
+        case E_WARNING:
+
+            $halt_script = false;
+            $type = "Warning";
+            break;
+
+        case E_USER_ERROR:
+        case E_COMPILE_ERROR:
+        case E_CORE_ERROR:
+        case E_ERROR:
+
+            $type = "Fatal Error";
+            break;
+
+        case E_PARSE:
+
+            $type = "Parse Error";
+            break;
+
+        default:
+            //don't know what it is might not be so bad
+            $halt_script = false;
+            $type = "Unknown Error ($errno)";
+            break;
+    }
+    $error_msg = '<b>'.$type.'</b>:' . $error_msg;
+    echo $error_msg;
+    display_stack_trace();
+    if($halt_script){
+        exit -1;
+    }
 
 
 
@@ -3263,45 +3263,45 @@ 
 
 if(isset($sugar_config['stack_trace_errors']) && $sugar_config['stack_trace_errors']){
 
-	set_error_handler('StackTraceErrorHandler');
+    set_error_handler('StackTraceErrorHandler');
 }
 function get_sub_cookies($name){
-	$cookies = array();
-	if(isset($_COOKIE[$name])){
-		$subs = explode('#', $_COOKIE[$name]);
-		foreach($subs as $cookie){
-			if(!empty($cookie)){
-				$cookie = explode('=', $cookie);
-
-				$cookies[$cookie[0]] = $cookie[1];
-			}
-		}
-	}
-	return $cookies;
+    $cookies = array();
+    if(isset($_COOKIE[$name])){
+        $subs = explode('#', $_COOKIE[$name]);
+        foreach($subs as $cookie){
+            if(!empty($cookie)){
+                $cookie = explode('=', $cookie);
+
+                $cookies[$cookie[0]] = $cookie[1];
+            }
+        }
+    }
+    return $cookies;
 
 }
 
 
 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){
+            //run_second level is set to true if you need to remove sub-sub components
+            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
-			}
-			$sub_object->mark_deleted($sub_object->id);
-			//end foreach sub component
-		}
-		//end if this is not empty
-	}
+                //end if run_second_level is true
+            }
+            $sub_object->mark_deleted($sub_object->id);
+            //end foreach sub component
+        }
+        //end if this is not empty
+    }
 
-	//end function mark_delete_components
+    //end function mark_delete_components
 }
 
 /**
@@ -3309,30 +3309,30 @@ 
  */
 function return_bytes($val)
 {
-	$val = trim($val);
-	$last = strtolower($val{strlen($val)-1});
-
-	switch($last)
-	{
-		// The 'G' modifier is available since PHP 5.1.0
-		case 'g':
-			$val *= 1024;
-		case 'm':
-			$val *= 1024;
-		case 'k':
-			$val *= 1024;
-	}
+    $val = trim($val);
+    $last = strtolower($val{strlen($val)-1});
 
-	return $val;
+    switch($last)
+    {
+        // The 'G' modifier is available since PHP 5.1.0
+        case 'g':
+            $val *= 1024;
+        case 'm':
+            $val *= 1024;
+        case 'k':
+            $val *= 1024;
+    }
+
+    return $val;
 }
 
 /**
  * Adds the href HTML tags around any URL in the $string
  */
 function url2html($string) {
-	//
-	$return_string = preg_replace('/(\w+:\/\/)(\S+)/', ' <a href="\\1\\2" target="_new"  style="font-weight: normal;">\\1\\2</a>', $string);
-	return $return_string;
+    //
+    $return_string = preg_replace('/(\w+:\/\/)(\S+)/', ' <a href="\\1\\2" target="_new"  style="font-weight: normal;">\\1\\2</a>', $string);
+    return $return_string;
 }
 // End customization by Julian
 
@@ -3353,31 +3353,31 @@ 
  * @return bool true if writable
  */
 function is_writable_windows($file) {
-	if($file{strlen($file)-1}=='/') {
-		return is_writable_windows($file.uniqid(mt_rand()).'.tmp');
-	}
+    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)) {
-		return true;
-	}
+    // 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)) {
+        return true;
+    }
 
-	$file = str_replace("/", '\\', $file);
+    $file = str_replace("/", '\\', $file);
 
-	if(file_exists($file)) {
-		if (!($f = @sugar_fopen($file, 'r+')))
-		return false;
-		fclose($f);
-		return true;
-	}
+    if(file_exists($file)) {
+        if (!($f = @sugar_fopen($file, 'r+')))
+        return false;
+        fclose($f);
+        return true;
+    }
 
-	if(!($f = @sugar_fopen($file, 'w')))
-	return false;
-	fclose($f);
-	unlink($file);
-	return true;
+    if(!($f = @sugar_fopen($file, 'w')))
+    return false;
+    fclose($f);
+    unlink($file);
+    return true;
 }
 
 
@@ -3390,23 +3390,23 @@ 
 }
 
 function convert_module_to_singular($module_array){
-	global $beanList;
-
-	foreach($module_array as $key => $value){
-		if(!empty($beanList[$value])) $module_array[$key] = $beanList[$value];
-
-		if($value=="Cases") {
-			$module_array[$key] = "Case";
-		}
-		if($key=="projecttask"){
-			$module_array['ProjectTask'] = "Project Task";
-			unset($module_array[$key]);
-		}
-	}
+    global $beanList;
 
-	return $module_array;
+    foreach($module_array as $key => $value){
+        if(!empty($beanList[$value])) $module_array[$key] = $beanList[$value];
+
+        if($value=="Cases") {
+            $module_array[$key] = "Case";
+        }
+        if($key=="projecttask"){
+            $module_array['ProjectTask'] = "Project Task";
+            unset($module_array[$key]);
+        }
+    }
 
-	//end function convert_module_to_singular
+    return $module_array;
+
+    //end function convert_module_to_singular
 }
 
 /*
@@ -3414,13 +3414,13 @@ 
  * bean_name. This is important when you need to include files.
  */
 function get_singular_bean_name($bean_name){
-	global $beanFiles, $beanList;
-	if(array_key_exists($bean_name, $beanList)){
-		return $beanList[$bean_name];
-	}
-	else{
-		return $bean_name;
-	}
+    global $beanFiles, $beanList;
+    if(array_key_exists($bean_name, $beanList)){
+        return $beanList[$bean_name];
+    }
+    else{
+        return $bean_name;
+    }
 }
 
 /*
@@ -3458,105 +3458,105 @@ 
 }
 
 function get_label($label_tag, $temp_module_strings){
-	global $app_strings;
-	if(!empty($temp_module_strings[$label_tag])){
-
-		$label_name = $temp_module_strings[$label_tag];
-	} else {
-		if(!empty($app_strings[$label_tag])){
-			$label_name = $app_strings[$label_tag];
-		} else {
-			$label_name = $label_tag;
-		}
-	}
-	return $label_name;
+    global $app_strings;
+    if(!empty($temp_module_strings[$label_tag])){
+
+        $label_name = $temp_module_strings[$label_tag];
+    } else {
+        if(!empty($app_strings[$label_tag])){
+            $label_name = $app_strings[$label_tag];
+        } else {
+            $label_name = $label_tag;
+        }
+    }
+    return $label_name;
 
-	//end function get_label
+    //end function get_label
 }
 
 
 function search_filter_rel_info(& $focus, $tar_rel_module, $relationship_name){
 
-	$rel_list = array();
+    $rel_list = array();
 
-	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!=""){
+    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!=""){
 
-				$rel_list[] = $temp_bean;
-				return $rel_list;
-			}
-		}
-	}
+                $rel_list[] = $temp_bean;
+                return $rel_list;
+            }
+        }
+    }
 
-	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'
-		&& !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)
-		{
-			$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!=""){
-
-				$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){
-			$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!=""){
-
-				$rel_list[] = $temp_bean;
-				return $rel_list;
-			}
-		}
-	}
+    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'
+        && !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)
+        {
+            $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!=""){
 
-	// special case for unlisted parent-type relationships
-	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!=""){
-			$rel_list[] = $temp_bean;
-			return $rel_list;
-		}
-	}
+                $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){
+            $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!=""){
+
+                $rel_list[] = $temp_bean;
+                return $rel_list;
+            }
+        }
+    }
+
+    // special case for unlisted parent-type relationships
+    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!=""){
+            $rel_list[] = $temp_bean;
+            return $rel_list;
+        }
+    }
 
-	return $rel_list;
+    return $rel_list;
 
-	//end function search_filter_rel_info
+    //end function search_filter_rel_info
 }
 
 function get_module_info($module_name){
-	global $beanList;
-	global $dictionary;
+    global $beanList;
+    global $dictionary;
 
-	//Get dictionary and focus data for module
-	$vardef_name = $beanList[$module_name];
+    //Get dictionary and focus data for module
+    $vardef_name = $beanList[$module_name];
 
-	if($vardef_name=="aCase"){
-		$class_name = "Case";
-	} else {
-		$class_name = $vardef_name;
-	}
+    if($vardef_name=="aCase"){
+        $class_name = "Case";
+    } else {
+        $class_name = $vardef_name;
+    }
 
-	if(!file_exists('modules/'. $module_name . '/'.$class_name.'.php')){
-		return;
-	}
+    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;
-	//end function get_module_table
+    $module_bean = new $vardef_name();
+    return $module_bean;
+    //end function get_module_table
 }
 
 /**
@@ -3565,22 +3565,22 @@ 
  * @param string $moduleName
  */
 function get_valid_bean_name($module_name){
-	global $beanList;
+    global $beanList;
 
-	$vardef_name = $beanList[$module_name];
-	if($vardef_name=="aCase"){
-		$bean_name = "Case";
-	} else {
-		$bean_name = $vardef_name;
-	}
-	return $bean_name;
+    $vardef_name = $beanList[$module_name];
+    if($vardef_name=="aCase"){
+        $bean_name = "Case";
+    } else {
+        $bean_name = $vardef_name;
+    }
+    return $bean_name;
 }
 
 
 
 function  checkAuthUserStatus(){
 
-	//authUserStatus();
+    //authUserStatus();
 }
 
 
@@ -3593,7 +3593,7 @@ 
  * @author	customized for Sugar by Chris N.
  */
 function getPhpInfo($level=-1) {
-	/**	Name (constant)		Value	Description
+    /**	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().
 		INFO_CONFIGURATION	4		Current Local and Master values for PHP directives. See also ini_get().
@@ -3602,47 +3602,47 @@ 
 		INFO_VARIABLES		32		Shows all predefined variables from EGPCS (Environment, GET, POST, Cookie, Server).
 		INFO_LICENSE		64		PHP License information. See also the license FAQ.
 		INFO_ALL			-1		Shows all of the above. This is the default value.
-	 */
-	ob_start();
-	phpinfo($level);
-	$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);
-	$parsedInfo	= preg_split('/(<h.?>[^<]+<\/h.>)/', $phpinfo, -1, PREG_SPLIT_DELIM_CAPTURE);
-	$match		= '';
-	$version	= '';
-	$returnInfo	= array();
-
-	if(preg_match('/<h1 class\=\"p\">PHP Version ([^<]+)<\/h1>/', $phpinfo, $version)) {
-		$returnInfo['PHP Version'] = $version[1];
-	}
+     */
+    ob_start();
+    phpinfo($level);
+    $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);
+    $parsedInfo	= preg_split('/(<h.?>[^<]+<\/h.>)/', $phpinfo, -1, PREG_SPLIT_DELIM_CAPTURE);
+    $match		= '';
+    $version	= '';
+    $returnInfo	= array();
+
+    if(preg_match('/<h1 class\=\"p\">PHP Version ([^<]+)<\/h1>/', $phpinfo, $version)) {
+        $returnInfo['PHP Version'] = $version[1];
+    }
 
 
-	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]);
+    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]);
 
-			foreach ($parsedInfo2 AS $vOne) {
-				$vPat	= '<info>([^<]+)<\/info>';
-				$vPat3	= "/$vPat\s*$vPat\s*$vPat/";
-				$vPat2	= "/$vPat\s*$vPat/";
+            foreach ($parsedInfo2 AS $vOne) {
+                $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
-					$returnInfo[$vName][trim($match[1])] = trim($match[2]);
-				}
-			}
-		} elseif(true) {
+                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) {
 
-		}
-	}
+        }
+    }
 
-	return $returnInfo;
+    return $returnInfo;
 }
 
 /**
@@ -3653,7 +3653,7 @@ 
  * @return	$result a formatted string
  */
 function string_format($format, $args){
-	$result = $format;
+    $result = $format;
 
     /** Bug47277 fix.
      * If args array has only one argument, and it's empty, so empty single quotes are used '' . That's because
@@ -3670,10 +3670,10 @@ 
     }
     /* End of fix */
 
-	for($i = 0; $i < count($args); $i++){
-		$result = str_replace('{'.$i.'}', $args[$i], $result);
-	}
-	return $result;
+    for($i = 0; $i < count($args); $i++){
+        $result = str_replace('{'.$i.'}', $args[$i], $result);
+    }
+    return $result;
 }
 
 /**
@@ -3687,16 +3687,16 @@ 
  * @return	$result a formatted string
  */
 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){
-			return sprintf("%d", $num);
-		}
-		else{
-			return sprintf("%d-%d", $num, $system_id);
-		}
-	}
+    global $sugar_config;
+    if(isset($num) && !empty($num)){
+        $num=unformat_number($num);
+        if(isset($system_id) && $system_id == 1){
+            return sprintf("%d", $num);
+        }
+        else{
+            return sprintf("%d-%d", $num, $system_id);
+        }
+    }
 }
 function checkLoginUserStatus(){
 }
@@ -3709,28 +3709,28 @@ 
  */
 function appendPortToHost($url, $port)
 {
-	$resulturl = $url;
-
-	// if no port, don't change the url
-	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'))
-		{
-			//third index ($split[2]) will be the host
-			$split[2] .= ":".$port;
-		}
-		else // otherwise assumed to start with host name
-		{
-			//first index ($split[0]) will be the host
-			$split[0] .= ":".$port;
-		}
-
-		$resulturl = implode("/", $split);
-	}
+    $resulturl = $url;
+
+    // if no port, don't change the url
+    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'))
+        {
+            //third index ($split[2]) will be the host
+            $split[2] .= ":".$port;
+        }
+        else // otherwise assumed to start with host name
+        {
+            //first index ($split[0]) will be the host
+            $split[0] .= ":".$port;
+        }
+
+        $resulturl = implode("/", $split);
+    }
 
-	return $resulturl;
+    return $resulturl;
 }
 
 /**
@@ -3738,12 +3738,12 @@ 
  * @return	JSON object
  */
 function getJSONobj() {
-	static $json = null;
-	if(!isset($json)) {
-		require_once('include/JSON.php');
-		$json = new JSON(JSON_LOOSE_TYPE);
-	}
-	return $json;
+    static $json = null;
+    if(!isset($json)) {
+        require_once('include/JSON.php');
+        $json = new JSON(JSON_LOOSE_TYPE);
+    }
+    return $json;
 }
 
 require_once('include/utils/db_utils.php');
@@ -3752,28 +3752,28 @@ 
  * Set default php.ini settings for entry points
  */
 function setPhpIniSettings() {
-	// zlib module
-	// Bug 37579 - Comment out force enabling zlib.output_compression, since it can cause problems on certain hosts
-	/*
+    // zlib module
+    // Bug 37579 - Comment out force enabling zlib.output_compression, since it can cause problems on certain hosts
+    /*
     if(function_exists('gzclose') && headers_sent() == false) {
 		ini_set('zlib.output_compression', 1);
 	}
 	*/
-	// mbstring module
-	//nsingh: breaks zip/unzip functionality. Commenting out 4/23/08
+    // mbstring module
+    //nsingh: breaks zip/unzip functionality. Commenting out 4/23/08
 
-	/*if(function_exists('mb_strlen')) {
+    /*if(function_exists('mb_strlen')) {
 		ini_set('mbstring.func_overload', 7);
 		ini_set('mbstring.internal_encoding', 'UTF-8');
 	}*/
 
 
-	// 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)) {
-		ini_set('pcre.backtrack_limit', '-1');
-	}
+    // 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)) {
+        ini_set('pcre.backtrack_limit', '-1');
+    }
 }
 
 /**
@@ -3788,80 +3788,80 @@ 
  */
 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();
+                    $tempArr = array();
                     foreach ( $domVal as $domArrKey => $domArrVal )
                         $tempArr[$domArrKey] = $domArrVal;
                     foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
                         if ( !isset($tempArr[$gimpArrKey]) )
                             $tempArr[$gimpArrKey] = $gimpArrVal;
                     $gimp[$domKey] = $tempArr;
-				}
+                }
                 else
                 {
-					$gimp[$domKey] = $domVal;
-				}
-			}
+                    $gimp[$domKey] = $domVal;
+                }
+            }
             else
             {
-				$gimp[$domKey] = $domVal;
-			}
-		}
-	}
+                $gimp[$domKey] = $domVal;
+            }
+        }
+    }
     // if the passed value for gimp isn't an array, then return the $dom
     elseif(is_array($dom))
     {
         return $dom;
     }
 
-	return $gimp;
+    return $gimp;
 }
 /**
- * like array_merge() but will handle array elements that are themselves arrays;
- * PHP's version just overwrites the element with the new one.
- *
- * @internal Note that this function deviates from the internal array_merge()
- *           functions in that it does does not treat numeric keys differently
- *           than string keys.  Additionally, it deviates from
- *           array_merge_recursive() by not creating an array when like values
- *           found.
- *
- * @param array gimp the array whose values will be overloaded
- * @param array dom the array whose values will pwn the gimp's
- * @return array beaten gimp
- */
+     * like array_merge() but will handle array elements that are themselves arrays;
+     * PHP's version just overwrites the element with the new one.
+     *
+     * @internal Note that this function deviates from the internal array_merge()
+     *           functions in that it does does not treat numeric keys differently
+     *           than string keys.  Additionally, it deviates from
+     *           array_merge_recursive() by not creating an array when like values
+     *           found.
+     *
+     * @param array gimp the array whose values will be overloaded
+     * @param array dom the array whose values will pwn the gimp's
+     * @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)) {
-					$tempArr = array();
+    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 )
                         $tempArr[$domArrKey] = $domArrVal;
                     foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
                         if ( !array_key_exists($gimpArrKey, $tempArr) )
                             $tempArr[$gimpArrKey] = $gimpArrVal;
                     $gimp[$domKey] = $tempArr;
-				} else {
-					$gimp[$domKey] = $domVal;
-				}
-			} else {
-				$gimp[$domKey] = $domVal;
-			}
-		}
-	}
+                } else {
+                    $gimp[$domKey] = $domVal;
+                }
+            } else {
+                $gimp[$domKey] = $domVal;
+            }
+        }
+    }
     // if the passed value for gimp isn't an array, then return the $dom
     elseif(is_array($dom))
         return $dom;
 
-	return $gimp;
+    return $gimp;
 }
 
 /**
@@ -3872,24 +3872,24 @@ 
  * @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])) {
-					$gimp[$domKey] = sugarArrayMergeRecursive($gimp[$domKey], $domVal);
-				} else {
-					$gimp[$domKey] = $domVal;
-				}
-			} else {
-				$gimp[$domKey] = $domVal;
-			}
-		}
-	}
+    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;
+                }
+            } else {
+                $gimp[$domKey] = $domVal;
+            }
+        }
+    }
     // if the passed value for gimp isn't an array, then return the $dom
     elseif(is_array($dom))
         return $dom;
 
-	return $gimp;
+    return $gimp;
 }
 
 /**
@@ -3897,11 +3897,11 @@ 
  * @return bool True if NOT found or WRONG version
  */
 function returnPhpJsonStatus() {
-	if(function_exists('json_encode')) {
-		$phpInfo = getPhpInfo(8);
+    if(function_exists('json_encode')) {
+        $phpInfo = getPhpInfo(8);
         return version_compare($phpInfo['json']['json version'], '1.1.1', '<');
-	}
-	return true; // not found
+    }
+    return true; // not found
 }
 
 
@@ -3916,114 +3916,114 @@ 
  * @return string [number]-char formatted string if length of string exceeds the max allowed
  */
 function getTrackerSubstring($name) {
-	static $max_tracker_item_length;
+    static $max_tracker_item_length;
 
-	//Trim the name
-	$name = html_entity_decode($name, ENT_QUOTES, 'UTF-8');
-	$strlen = function_exists('mb_strlen') ? mb_strlen($name) : strlen($name);
+    //Trim the name
+    $name = html_entity_decode($name, ENT_QUOTES, 'UTF-8');
+    $strlen = function_exists('mb_strlen') ? mb_strlen($name) : strlen($name);
 
-	global $sugar_config;
+    global $sugar_config;
 
-	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(!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);
-		$chopped .= "...";
-	} else {
-		$chopped = $name;
-	}
+    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;
+    }
 
-	return $chopped;
+    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;
-	foreach ($field_list[$module] as $field=>$parms) {
-		if(isset($values[$field]) && $values[$field] != "") {
-			$operator='like';
-			if (!empty($parms['operator'])) {
-				$operator=$parms['operator'];
-			}
-			if (is_array($values[$field])) {
-				$operator='in';
-				$field_value='';
-				foreach ($values[$field] as $key => $val) {
-					if ($val != ' ' and $val != '') {
-						if (!empty($field_value)) {
-							$field_value.=',';
-						}
-						$field_value .= "'".$GLOBALS['db']->quote($val)."'";
-					}
-				}
-			} else {
-				$field_value=$GLOBALS['db']->quote($values[$field]);
-			}
-			//set db_fields array.
-			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='=';
-			}
+    $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 (!empty($parms['operator'])) {
+                $operator=$parms['operator'];
+            }
+            if (is_array($values[$field])) {
+                $operator='in';
+                $field_value='';
+                foreach ($values[$field] as $key => $val) {
+                    if ($val != ' ' and $val != '') {
+                        if (!empty($field_value)) {
+                            $field_value.=',';
+                        }
+                        $field_value .= "'".$GLOBALS['db']->quote($val)."'";
+                    }
+                }
+            } else {
+                $field_value=$GLOBALS['db']->quote($values[$field]);
+            }
+            //set db_fields array.
+            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='=';
+            }
 
-			$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 ($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++;
-					if (!empty($where)) {
-						$where .= " OR ";
-					}
-					switch (strtolower($operator)) {
-						case 'like' :
-							$where .=  $db_field . " like '".$field_value.$like_char."'";
-							break;
-						case 'in':
-							$where .=  $db_field . " in (".$field_value.')';
-							break;
-						case '=':
-							$where .=  $db_field . " = '".$field_value ."'";
-							break;
-					}
-				}
-			}
-			if (!empty($where)) {
-				if ($itr>1) {
-					array_push($where_clauses, '( '.$where.' )');
-				} else {
-					array_push($where_clauses, $where);
-				}
-			}
-		}
-	}
-	if ($add_custom_fields) {
-		require_once('modules/DynamicFields/DynamicField.php');
-		$bean->setupCustomFields($module);
-		$bean->custom_fields->setWhereClauses($where_clauses);
-	}
-	return $where_clauses;
+            $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 ($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++;
+                    if (!empty($where)) {
+                        $where .= " OR ";
+                    }
+                    switch (strtolower($operator)) {
+                        case 'like' :
+                            $where .=  $db_field . " like '".$field_value.$like_char."'";
+                            break;
+                        case 'in':
+                            $where .=  $db_field . " in (".$field_value.')';
+                            break;
+                        case '=':
+                            $where .=  $db_field . " = '".$field_value ."'";
+                            break;
+                    }
+                }
+            }
+            if (!empty($where)) {
+                if ($itr>1) {
+                    array_push($where_clauses, '( '.$where.' )');
+                } else {
+                    array_push($where_clauses, $where);
+                }
+            }
+        }
+    }
+    if ($add_custom_fields) {
+        require_once('modules/DynamicFields/DynamicField.php');
+        $bean->setupCustomFields($module);
+        $bean->custom_fields->setWhereClauses($where_clauses);
+    }
+    return $where_clauses;
 }
 
 function add_quotes($str) {
-	return "'{$str}'";
+    return "'{$str}'";
 }
 
 /**
@@ -4033,19 +4033,19 @@ 
  * @return	bool true if successful
  */
 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 );
-	// need to override version with default no matter what
-	$sugar_config['sugar_version'] = $sugar_version;
+    // add defaults to missing values of in-memory 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" ) ){
-		return true;
-	}
-	else {
-		return false;
-	}
+    if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+        return true;
+    }
+    else {
+        return false;
+    }
 }
 
 /**
@@ -4072,44 +4072,44 @@ 
  * @return $site_url The url used to refer to the website
  */
 function getJavascriptSiteURL() {
-	global $sugar_config;
-	if(!empty($_SERVER['HTTP_REFERER'])) {
-		$url = parse_url($_SERVER['HTTP_REFERER']);
-		$replacement_url = $url['scheme']."://".$url['host'];
-		if(!empty($url['port']))
-		$replacement_url .= ':'.$url['port'];
-		$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);
-		}
-	}
-	$GLOBALS['log']->debug("getJavascriptSiteURL(), site_url=".  $site_url);
-	return $site_url;
+    global $sugar_config;
+    if(!empty($_SERVER['HTTP_REFERER'])) {
+        $url = parse_url($_SERVER['HTTP_REFERER']);
+        $replacement_url = $url['scheme']."://".$url['host'];
+        if(!empty($url['port']))
+        $replacement_url .= ':'.$url['port'];
+        $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);
+        }
+    }
+    $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()){
-	$depth_count++;
-	if (is_array($array)){
-		foreach ($array as $key => $value){
-			$depth_array[] = array_depth($value, $depth_count);
-		}
-	}
-	else{
-		return $depth_count;
-	}
-	foreach ($depth_array as $value){
-		$depth_count = $value > $depth_count ? $value : $depth_count;
-	}
-	return $depth_count;
+    $depth_count++;
+    if (is_array($array)){
+        foreach ($array as $key => $value){
+            $depth_array[] = array_depth($value, $depth_count);
+        }
+    }
+    else{
+        return $depth_count;
+    }
+    foreach ($depth_array as $value){
+        $depth_count = $value > $depth_count ? $value : $depth_count;
+    }
+    return $depth_count;
 }
 
 /**
@@ -4120,16 +4120,16 @@ 
 function createGroupUser($name) {
 
 
-	$group = new User();
-	$group->user_name	= $name;
-	$group->last_name	= $name;
-	$group->is_group	= 1;
-	$group->deleted		= 0;
-	$group->status		= 'Active'; // cn: bug 6711
-	$group->setPreference('timezone', TimeDate::userTimezone());
-	$group->save();
+    $group = new User();
+    $group->user_name	= $name;
+    $group->last_name	= $name;
+    $group->is_group	= 1;
+    $group->deleted		= 0;
+    $group->status		= 'Active'; // cn: bug 6711
+    $group->setPreference('timezone', TimeDate::userTimezone());
+    $group->save();
 
-	return $group->id;
+    return $group->id;
 }
 
 /*
@@ -4142,48 +4142,48 @@ 
 function _getIcon($iconFileName)
 {
 
-	$iconName = "icon_{$iconFileName}.gif";
+    $iconName = "icon_{$iconFileName}.gif";
     $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";
+        $iconName = "icon_" . strtolower(substr($iconFileName,0,1)).substr($iconFileName,1) . ".gif";
         $iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
 
-	//Next try removing the icon prefix
+    //Next try removing the icon prefix
     if ( empty($iconFound) )
-		$iconName = "{$iconFileName}.gif";
-		$iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
+        $iconName = "{$iconFileName}.gif";
+        $iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
 
-	if ( empty($iconFound) )
-		$iconName = '';
+    if ( empty($iconFound) )
+        $iconName = '';
 
-  	return $iconName;
+        return $iconName;
 }
 /**
- * Function to grab the correct icon image for Studio
- * @param string $iconFileName Name of the icon file
- * @param string $altfilename Name of a fallback icon file (displayed if the imagefilename doesn't exist)
- * @param string $width Width of image
- * @param string $height Height of image
- * @param string $align Alignment of image
- * @param string $alt Alt tag of image
- * @return string $string <img> tag with corresponding image
- */
+         * Function to grab the correct icon image for Studio
+         * @param string $iconFileName Name of the icon file
+         * @param string $altfilename Name of a fallback icon file (displayed if the imagefilename doesn't exist)
+         * @param string $width Width of image
+         * @param string $height Height of image
+         * @param string $align Alignment of image
+         * @param string $alt Alt tag of image
+         * @return string $string <img> tag with corresponding image
+         */
 
 function getStudioIcon($iconFileName='', $altFileName='', $width='48', $height='48', $align='baseline', $alt='' )
 {
-	global $app_strings, $theme;
+    global $app_strings, $theme;
 
     $iconName = _getIcon($iconFileName);
- 	if(empty($iconName)){
- 	    $iconName = _getIcon($altFileName);
- 	    if (empty($iconName))
- 	    {
+        if(empty($iconName)){
+            $iconName = _getIcon($altFileName);
+            if (empty($iconName))
+            {
             return $app_strings['LBL_NO_IMAGE'];
- 	    }
- 	}
-	return SugarThemeRegistry::current()->getImage($iconName, "align=\"$align\" border=\"0\"", $width, $height);
+            }
+        }
+    return SugarThemeRegistry::current()->getImage($iconName, "align=\"$align\" border=\"0\"", $width, $height);
 }
 
 /**
@@ -4198,16 +4198,16 @@ 
  */
 
 function get_dashlets_dialog_icon($module='', $width='32', $height='32', $align='absmiddle',$alt=''){
-	global $app_strings, $theme;
- 	$iconName = _getIcon($module . "_32");
- 	if (empty($iconName))
- 	{
- 		$iconName = _getIcon($module);
- 	}
- 	if(empty($iconName)){
- 		return $app_strings['LBL_NO_IMAGE'];
- 	}
-	return SugarThemeRegistry::current()->getImage($iconName, "align=\"$align\" border=\"0\"", $width, $height);
+    global $app_strings, $theme;
+        $iconName = _getIcon($module . "_32");
+        if (empty($iconName))
+        {
+            $iconName = _getIcon($module);
+        }
+        if(empty($iconName)){
+            return $app_strings['LBL_NO_IMAGE'];
+        }
+    return SugarThemeRegistry::current()->getImage($iconName, "align=\"$align\" border=\"0\"", $width, $height);
 }
 
 // works nicely to change UTF8 strings that are html entities - good for PDF conversions
@@ -4239,23 +4239,23 @@ 
 }
 
 function str_split_php4($string, $length = 1) {
-	$string_length = strlen($string);
-	$return = array();
-	$cursor = 0;
-	if ($length > $string_length) {
-		// use the string_length as the string is shorter than the length
-		$length = $string_length;
-	}
-	for ($cursor = 0; $cursor < $string_length; $cursor = $cursor + $length) {
-		$return[] = substr($string, $cursor, $length);
-	}
-	return $return;
+    $string_length = strlen($string);
+    $return = array();
+    $cursor = 0;
+    if ($length > $string_length) {
+        // use the string_length as the string is shorter than the length
+        $length = $string_length;
+    }
+    for ($cursor = 0; $cursor < $string_length; $cursor = $cursor + $length) {
+        $return[] = substr($string, $cursor, $length);
+    }
+    return $return;
 }
 
 if (version_compare(phpversion(), '5.0.0', '<')) {
-	function str_split($string, $length = 1) {
-		return str_split_php4($string, $length);
-	}
+    function str_split($string, $length = 1) {
+        return str_split_php4($string, $length);
+    }
 }
 
 /*
@@ -4287,8 +4287,8 @@ 
  */
 function chartColors()
 {
-	if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml')=='')
-	return SugarThemeRegistry::current()->getImageURL('sugarColors.xml');
+    if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml')=='')
+    return SugarThemeRegistry::current()->getImageURL('sugarColors.xml');
     return SugarThemeRegistry::current()->getCSSURL('sugarColors.xml');
 }
 /* End Chart Dashlet helper functions */
@@ -4299,7 +4299,7 @@ 
  */
 
 function ajaxInit() {
-	ini_set('display_errors', 'false');
+    ini_set('display_errors', 'false');
 }
 
 /**
@@ -4366,33 +4366,33 @@ 
  * @return String value of the shortcut keys
  */
 function get_alt_hot_key() {
-	$ua = '';
+    $ua = '';
     if ( isset($_SERVER['HTTP_USER_AGENT']) )
         $ua = strtolower($_SERVER['HTTP_USER_AGENT']);
-	$isMac = strpos($ua, 'mac') !== false;
-	$isLinux = strpos($ua, 'linux') !== false;
+    $isMac = strpos($ua, 'mac') !== false;
+    $isLinux = strpos($ua, 'linux') !== false;
 
-	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+';
+    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'])) {
-	   return true;
-	}
-	$session_id = session_id();
-	return empty($session_id) ? true : false;
+    if(!empty($_GET['PHPSESSID'])) {
+        return true;
+    }
+    $session_id = session_id();
+    return empty($session_id) ? true : false;
 }
 
 function load_link_class($properties){
-	$class = 'Link2';
-	if(!empty($properties['link_class']) && !empty($properties['link_file'])){
-    	require_once($properties['link_file']);
-    	$class = $properties['link_class'];
+    $class = 'Link2';
+    if(!empty($properties['link_class']) && !empty($properties['link_file'])){
+        require_once($properties['link_file']);
+        $class = $properties['link_class'];
     }
     return $class;
 }
@@ -4413,7 +4413,7 @@ 
     if ( !isset($GLOBALS['sugar_config']['allow_pop_inbound']) || ! $GLOBALS['sugar_config']['allow_pop_inbound'] )
     {
         if( isset($protocol['pop3']) )
-			unset($protocol['pop3']);
+            unset($protocol['pop3']);
     }
     else
         $protocol['pop3'] = 'POP3';
@@ -4448,15 +4448,15 @@ 
  *
  */
 function unencodeMultienum($string) {
-	if (is_array($string))
-	{
-	   return $string;
-	}
-	if (substr($string, 0 ,1) == "^" && substr($string, -1) == "^") {
-          $string = substr(substr($string, 1), 0, strlen($string) -2);
-	}
+    if (is_array($string))
+    {
+        return $string;
+    }
+    if (substr($string, 0 ,1) == "^" && substr($string, -1) == "^") {
+            $string = substr(substr($string, 1), 0, strlen($string) -2);
+    }
 
-	return explode('^,^', $string);
+    return explode('^,^', $string);
 }
 
 function encodeMultienumValue($arr) {
@@ -4466,7 +4466,7 @@ 
     if (empty($arr))
         return "";
 
-	$string = "^" . implode('^,^', $arr) . "^";
+    $string = "^" . implode('^,^', $arr) . "^";
 
     return $string;
 }
@@ -4482,86 +4482,86 @@ 
  * @return $ret_array['join']: extra join condition
  */
 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);
+    if(file_exists('modules/'.$module.'/SearchForm.html')){
+        $ret_array['where'] = $where;
+        return $ret_array;
+    }
+    $seed = loadBean($module);
     foreach($seed->field_defs as $name=>$field)
-	{
-
-		if( $field['type'] == 'relate' && isset($field['link']) && !empty($searchFields[$name]['value']) ){
-			$seed->load_relationship($field['link']);
-			$params = array();
-			if(empty($join_type))
-			{
-				$params['join_type'] = ' LEFT JOIN ';
-			}
-			else
-			{
-				$params['join_type'] = $join_type;
-			}
-			if(isset($data['join_name']))
-			{
-				$params['join_table_alias'] = $field['join_name'];
-			}
-			else
-			{
-				$params['join_table_alias']	= 'join_'.$field['name'];
+    {
 
-			}
-			if(isset($data['join_link_name']))
-			{
-				$params['join_table_link_alias'] = $field['join_link_name'];
-			}
-			else
-			{
-				$params['join_table_link_alias'] = 'join_link_'.$field['name'];
-			}
-			$join = $seed->$field['link']->getJoin($params, true);
-			$join_table_alias = 'join_'.$field['name'];
-			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);
-			}
-		}
-	}
+        if( $field['type'] == 'relate' && isset($field['link']) && !empty($searchFields[$name]['value']) ){
+            $seed->load_relationship($field['link']);
+            $params = array();
+            if(empty($join_type))
+            {
+                $params['join_type'] = ' LEFT JOIN ';
+            }
+            else
+            {
+                $params['join_type'] = $join_type;
+            }
+            if(isset($data['join_name']))
+            {
+                $params['join_table_alias'] = $field['join_name'];
+            }
+            else
+            {
+                $params['join_table_alias']	= 'join_'.$field['name'];
+
+            }
+            if(isset($data['join_link_name']))
+            {
+                $params['join_table_link_alias'] = $field['join_link_name'];
+            }
+            else
+            {
+                $params['join_table_link_alias'] = 'join_link_'.$field['name'];
+            }
+            $join = $seed->$field['link']->getJoin($params, true);
+            $join_table_alias = 'join_'.$field['name'];
+            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);
+            }
+        }
+    }
     $ret_array = array('where'=>$where, 'join'=> isset($join['join']) ? $join['join'] : '');
-	return $ret_array;
+    return $ret_array;
 }
 
 /**
-  * We need to clear all the js cache files, including the js language files  in serval places in MB. So I extract them into a util function here.
-  * @Depends on QuickRepairAndRebuild.php
-  * @Relate bug 30642  ,23177
-  */
+ * We need to clear all the js cache files, including the js language files  in serval places in MB. So I extract them into a util function here.
+ * @Depends on QuickRepairAndRebuild.php
+ * @Relate bug 30642  ,23177
+ */
 function clearAllJsAndJsLangFilesWithoutOutput(){
-		global $current_language , $mod_strings;
-		$MBmodStrings = $mod_strings;
+        global $current_language , $mod_strings;
+        $MBmodStrings = $mod_strings;
         $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;
-		$repair->clearJsLangFiles();
-		$repair->clearJsFiles();
-		$mod_strings = $MBmodStrings;
+        $repair->show_output = false;
+        $repair->clearJsLangFiles();
+        $repair->clearJsFiles();
+        $mod_strings = $MBmodStrings;
 }
 
 /**
  * This function will allow you to get a variable value from query string
  */
 function getVariableFromQueryString($variable, $string){
-	$matches = array();
-	$number = preg_match("/{$variable}=([a-zA-Z0-9_-]+)[&]?/", $string, $matches);
-	if($number){
-		return $matches[1];
-	}
-	else{
-		return false;
-	}
+    $matches = array();
+    $number = preg_match("/{$variable}=([a-zA-Z0-9_-]+)[&]?/", $string, $matches);
+    if($number){
+        return $matches[1];
+    }
+    else{
+        return false;
+    }
 }
 
 /**
@@ -4572,14 +4572,14 @@ 
  * @return boolean flag indicating whether or not iframes module should be hidden
  */
 function should_hide_iframes() {
-   //Remove the MySites module
-   if(file_exists('modules/iFrames/iFrame.php')) {
+    //Remove the MySites module
+    if(file_exists('modules/iFrames/iFrame.php')) {
         if(!class_exists("iFrame")) {
                 require_once('modules/iFrames/iFrame.php');
         }
         return false;
-   }
-   return true;
+    }
+    return true;
 }
 
 /**
@@ -4589,11 +4589,11 @@ 
  * @return string RC, BETA, GA
  */
 function getVersionStatus($version){
-	if(preg_match('/^[\d\.]+?([a-zA-Z]+?)[\d]*?$/si', $version, $matches)) {
-		return strtoupper($matches[1]);
-	}else{
-		return 'GA';
-	}
+    if(preg_match('/^[\d\.]+?([a-zA-Z]+?)[\d]*?$/si', $version, $matches)) {
+        return strtoupper($matches[1]);
+    }else{
+        return 'GA';
+    }
 }
 
 /**
@@ -4604,16 +4604,16 @@ 
  * @return version
  */
 function getMajorMinorVersion($version){
-	if(preg_match('/^([\d\.]+).*$/si', $version, $matches2)){
-		$version = $matches2[1];
-		$arr = explode('.', $version);
-		if(count($arr) > 2){
-			if($arr[2] == '0'){
-				$version = substr($version, 0, 3);
-			}
-		}
-	}
-	return $version;
+    if(preg_match('/^([\d\.]+).*$/si', $version, $matches2)){
+        $version = $matches2[1];
+        $arr = explode('.', $version);
+        if(count($arr) > 2){
+            if($arr[2] == '0'){
+                $version = substr($version, 0, 3);
+            }
+        }
+    }
+    return $version;
 }
 
 /**
@@ -4622,9 +4622,9 @@ 
  */
 function sugar_microtime()
 {
-	$now = explode(' ', microtime());
-	$unique_id = $now[1].str_replace('.', '', $now[0]);
-	return $unique_id;
+    $now = explode(' ', microtime());
+    $unique_id = $now[1].str_replace('.', '', $now[0]);
+    return $unique_id;
 }
 
 /**
@@ -4634,15 +4634,15 @@ 
  */
 function getUrls($string)
 {
-	$lines = explode("<br>", trim($string));
-	$urls = array();
-	foreach($lines as $line){
-    	$regex = '/http?\:\/\/[^\" ]+/i';
-    	preg_match_all($regex, $line, $matches);
-    	foreach($matches[0] as $match){
-    		$urls[] = $match;
-    	}
-	}
+    $lines = explode("<br>", trim($string));
+    $urls = array();
+    foreach($lines as $line){
+        $regex = '/http?\:\/\/[^\" ]+/i';
+        preg_match_all($regex, $line, $matches);
+        foreach($matches[0] as $match){
+            $urls[] = $match;
+        }
+    }
     return $urls;
 }
 
@@ -4654,14 +4654,14 @@ 
  */
 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) {
-    	    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(!$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) {
             ob_start();
             imagejpeg($img);
@@ -4672,19 +4672,19 @@ 
             }
         } elseif ($filetype == "image/png") {
             // else if the filetype is png, create png
-        	imagealphablending($img, true);
-        	imagesavealpha($img, true);
-        	ob_start();
+            imagealphablending($img, true);
+            imagesavealpha($img, true);
+            ob_start();
             imagepng($img);
             $image = ob_get_clean();
-    	    if(file_put_contents($path, $image)) {
+            if(file_put_contents($path, $image)) {
                 return true;
-    	    }
+            }
         } else {
-        	return false;
+            return false;
         }
-	} else {
-	    // check image manually
+    } else {
+        // check image manually
         $fp = fopen($path, "rb");
         if(!$fp) return false;
         $data = '';
@@ -4693,15 +4693,15 @@ 
             $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",
-	         $data, $m)) {
-	        $GLOBALS['log']->fatal("Found {$m[0]} in $path, not allowing upload");
-	        return false;
-	    }
-	    return true;
-	}
-	return false;
+        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",
+                $data, $m)) {
+            $GLOBALS['log']->fatal("Found {$m[0]} in $path, not allowing upload");
+            return false;
+        }
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -4718,16 +4718,16 @@ 
     }
 
     if(!file_exists($path) || !is_file($path)) {
-	    return false;
-	}
+        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)])) ||
-	    !in_array($filetype, array_values($supportedExtensions))) {
-	        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)])) ||
+        !in_array($filetype, array_values($supportedExtensions))) {
+            return false;
+    }
     return verify_image_file($path, $jpeg_only);
 }
 
@@ -4779,7 +4779,7 @@ 
     if (isset($GLOBALS['sugar_config']['search_wildcard_infront']) &&
         $GLOBALS['sugar_config']['search_wildcard_infront'] == true) {
         if (substr($str,0,1) <> $wildcard)
-          $str = $wildcard.$str;
+            $str = $wildcard.$str;
     }
 
     // add wildcard at the end of search string (default)
@@ -4794,7 +4794,7 @@ 
 
 //check to see if custom utils exists
 if(file_exists('custom/include/custom_utils.php')){
-	include_once('custom/include/custom_utils.php');
+    include_once('custom/include/custom_utils.php');
 }
 
 //check to see if custom utils exists in Extension framework
@@ -4802,12 +4802,12 @@ 
     include_once('custom/application/Ext/Utils/custom_utils.ext.php');
 }
 /**
- * @param $input - the input string to sanitize
- * @param int $quotes - use quotes
- * @param string $charset - the default charset
- * @param bool $remove - strip tags or not
- * @return string - the sanitized string
- */
+     * @param $input - the input string to sanitize
+     * @param int $quotes - use quotes
+     * @param string $charset - the default charset
+     * @param bool $remove - strip tags or not
+     * @return string - the sanitized string
+     */
 function sanitize($input, $quotes = ENT_QUOTES, $charset = 'UTF-8', $remove = false)
 {
     return htmlentities($input, $quotes, $charset);
@@ -4854,9 +4854,9 @@ 
     $result = array();
     foreach($data as $key=>$val) {
         if(is_array($val)) {
-           $result[$key] = utf8_recursive_encode($val);
+            $result[$key] = utf8_recursive_encode($val);
         } else {
-           $result[$key] = utf8_encode($val);
+            $result[$key] = utf8_encode($val);
         }
     }
     return $result;
@@ -4938,18 +4938,18 @@ 
  * @param string $etag ETag to use for this content.
  */
 function generateETagHeader($etag){
-	header("cache-control:");
-	header('Expires: ');
-	header("ETag: " . $etag);
-	header("Pragma:");
-	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");
-			die();
-		}
-	}
+    header("cache-control:");
+    header('Expires: ');
+    header("ETag: " . $etag);
+    header("Pragma:");
+    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");
+            die();
+        }
+    }
 }
 
 /**
@@ -4962,22 +4962,22 @@ 
  * @return string translated report name
  */
 function getReportNameTranslation($reportName) {
-	global $current_language;
+    global $current_language;
 
-	// Used for translating reports
+    // Used for translating reports
     $mod_strings = return_module_language($current_language, 'Reports');
 
-	// Search for the report name in the default language and get the key
-	$key = array_search($reportName, return_module_language("", "Reports"));
+    // Search for the report name in the default language and get the key
+    $key = array_search($reportName, return_module_language("", "Reports"));
 
-	// If the key was found, use it to get a translation, otherwise just use report name
-	if (!empty($key)) {
-		$title = $mod_strings[$key];
-	} else {
-		$title = $reportName;
-	}
+    // If the key was found, use it to get a translation, otherwise just use report name
+    if (!empty($key)) {
+        $title = $mod_strings[$key];
+    } else {
+        $title = $reportName;
+    }
 
-	return $title;
+    return $title;
 }
 
 /**
@@ -5085,47 +5085,47 @@ 
 
 function suite_strlen($input, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strlen'))
-		return mb_strlen($input,$encoding);
-	else
-		return strlen($input);
+    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)
 {
-	if(function_exists('mb_substr'))
-		return mb_substr($input,$start,$length,$encoding);
-	else
-		return substr($input,$start,$length);
+    if(function_exists('mb_substr'))
+        return mb_substr($input,$start,$length,$encoding);
+    else
+        return substr($input,$start,$length);
 }
 
 function suite_strtoupper($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtoupper'))
-		return mb_strtoupper($input,$encoding);
-	else
-		return strtoupper($input);
+    if(function_exists('mb_strtoupper'))
+        return mb_strtoupper($input,$encoding);
+    else
+        return strtoupper($input);
 }
 function suite_strtolower($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtolower'))
-		return mb_strtolower($input,$encoding);
-	else
-		return strtolower($input);
+    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)
 {
-	if(function_exists('mb_strpos'))
-		return mb_strpos($haystack,$needle,$offset,$encoding);
-	else
-		return strpos($haystack,$needle,$offset);
+    if(function_exists('mb_strpos'))
+        return mb_strpos($haystack,$needle,$offset,$encoding);
+    else
+        return strpos($haystack,$needle,$offset);
 }
 
 function suite_strrpos($haystack,$needle,$offset=0,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strrpos'))
-		return mb_strrpos($haystack,$needle,$offset,$encoding);
-	else
-		return strrpos($haystack,$needle,$offset);
+    if(function_exists('mb_strrpos'))
+        return mb_strrpos($haystack,$needle,$offset,$encoding);
+    else
+        return strrpos($haystack,$needle,$offset);
 }
\ No newline at end of file

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

Braces +343 added lines, -225 removed lines

@@ -448,11 +448,9 @@ 
 
 	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";
 	}
 
@@ -470,8 +468,7 @@ 
 	foreach( $default as $key => $value ){
 		if( !array_key_exists($key, $override) ){
 			$override[$key] = $value;
-		}
-		else if( is_array( $key ) ){
+		} else if( is_array( $key ) ){
 			$override[$key] = sugar_config_union( $value, $override[$key] );
 		}
 	}
@@ -484,8 +481,7 @@ 
 	if( is_file($file) || is_dir($file) ){
 		if( !is_writable($file) ){
 			$ret_val = true;
-		}
-		else {
+		} else {
 			$original_fileperms = fileperms($file);
 
 			// take away writable permissions
@@ -591,8 +587,9 @@ 
 function get_user_name($id) {
 	global $db;
 
-	if(empty($db))
-	$db = DBManagerFactory::getInstance();
+	if(empty($db)) {
+		$db = DBManagerFactory::getInstance();
+	}
 
 	$q = "SELECT user_name FROM users WHERE id='{$id}'";
 	$r = $db->query($q);
@@ -637,8 +634,7 @@ 
 		// Including deleted users for now.
 		if (empty($status)) {
 			$query = "SELECT id, first_name, last_name, user_name from users WHERE 1=1".$portal_filter;
-		}
-		else {
+		} else {
 			$query = "SELECT id, first_name, last_name, user_name from users WHERE status='$status'".$portal_filter;
 		}
         /* BEGIN - SECURITY GROUPS */
@@ -677,7 +673,7 @@ 
                 //its possible for first name to be skipped, check for this
                 if($firstNamePos===false){
                     $order_by_string =  'last_name ASC';
-                }else{
+                } else{
                     $order_by_string =  ($lastNamePos < $firstNamePos) ? "last_name, first_name ASC" : "first_name, last_name ASC";
                 }
             }
@@ -1100,18 +1096,20 @@ 
 	$loaded_mod_strings = LanguageManager::loadModuleLanguage($module, $language,$refresh);
 
 	// cn: bug 6048 - merge en_us with requested language
-	if($language != $sugar_config['default_language'])
-        $loaded_mod_strings = sugarLangArrayMerge(
+	if($language != $sugar_config['default_language']) {
+	        $loaded_mod_strings = sugarLangArrayMerge(
             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')
-        $loaded_mod_strings = sugarLangArrayMerge(
+    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']) {
@@ -1123,9 +1121,9 @@ 
 	$return_value = $loaded_mod_strings;
 	if(!isset($mod_strings)){
 		$mod_strings = $return_value;
+	} else {
+			$mod_strings = $temp_mod_strings;
 	}
-	else
-		$mod_strings = $temp_mod_strings;
 
     $cache_key = LanguageManager::getLanguageCacheKey($module, $language);
     sugar_cache_put($cache_key, $return_value);
@@ -1164,8 +1162,9 @@ 
 	// 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)
-	$en_mod_list_strings = $mod_list_strings;
+	if($language_used != $default_language) {
+		$en_mod_list_strings = $mod_list_strings;
+	}
 
 	if(file_exists("modules/$module/language/$language.lang.php")) {
 		include("modules/$module/language/$language.lang.php");
@@ -1295,8 +1294,9 @@ 
 	$where = "";
 	foreach($where_clauses as $clause)
 	{
-		if($where != "")
-		$where .= " and ";
+		if($where != "") {
+				$where .= " and ";
+		}
 		$where .= $clause;
 	}
 
@@ -1374,8 +1374,7 @@ 
 	if($strlen < $length)
 	{
 		$string = str_pad($string,$length,"0");
-	}
-	else if($strlen > $length)
+	} else if($strlen > $length)
 	{
 		$string = substr($string, 0, $length);
 	}
@@ -1575,7 +1574,9 @@ 
         $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
     }
 
-	if (empty($key_list)) $key_list = array();
+	if (empty($key_list)) {
+	    $key_list = array();
+	}
 	//create the type dropdown domain and set the selected value if $opp value already exists
 	foreach ($key_list as $option_key=>$option_value) {
 
@@ -1737,24 +1738,26 @@ 
 		    $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>";
+        if ($mod == "") {
+                echo "Language is <pre>" . $mod_strings . "</pre>";
+        }
 
-	}else{
+	} else{
 		global $mod_strings;
 	}
 
 	$returnValue = '';
 	global $app_strings, $app_list_strings;
 
-    if (isset($mod_strings[$string]))
-        $returnValue = $mod_strings[$string];
-    else if (isset($app_strings[$string]))
-        $returnValue = $app_strings[$string];
-    else if (isset($app_list_strings[$string]))
-        $returnValue = $app_list_strings[$string];
-    else if (isset($app_list_strings['moduleList']) && isset($app_list_strings['moduleList'][$string]))
-        $returnValue = $app_list_strings['moduleList'][$string];
+    if (isset($mod_strings[$string])) {
+            $returnValue = $mod_strings[$string];
+    } else if (isset($app_strings[$string])) {
+            $returnValue = $app_strings[$string];
+    } else if (isset($app_list_strings[$string])) {
+            $returnValue = $app_list_strings[$string];
+    } else if (isset($app_list_strings['moduleList']) && isset($app_list_strings['moduleList'][$string])) {
+            $returnValue = $app_list_strings['moduleList'][$string];
+    }
 
 
 	//$test_end = microtime();
@@ -1867,8 +1870,9 @@ 
 function clean_xss($str, $cleanImg=true) {
 	global $sugar_config;
 
-	if(empty($sugar_config['email_xss']))
-	$sugar_config['email_xss'] = getDefaultXssTags();
+	if(empty($sugar_config['email_xss'])) {
+		$sugar_config['email_xss'] = getDefaultXssTags();
+	}
 
 	$xsstags = unserialize(base64_decode($sugar_config['email_xss']));
 
@@ -1987,32 +1991,65 @@ 
 			die("Bad data passed in; <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
 		}
 		return false;
-	}
-	else {
+	} else {
 		return $str;
 	}
 }
 
 function clean_special_arguments() {
 	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");
-	if (!empty($_REQUEST) && !empty($_REQUEST['login_module'])) clean_string($_REQUEST['login_module'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['login_action'])) clean_string($_REQUEST['login_action'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['ck_login_theme_20'])) clean_string($_REQUEST['ck_login_theme_20'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['module_name'])) clean_string($_REQUEST['module_name'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['module'])) clean_string($_REQUEST['module'], "STANDARD");
-	if (!empty($_POST) && !empty($_POST['parent_type'])) clean_string($_POST['parent_type'], "STANDARD");
-	if (!empty($_REQUEST) && !empty($_REQUEST['mod_lang'])) clean_string($_REQUEST['mod_lang'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language'], "STANDARD");
-	if (!empty($_SESSION) && !empty($_SESSION['dyn_layout_file'])) clean_string($_SESSION['dyn_layout_file'], "PATH_NO_URL");
-	if (!empty($_GET) && !empty($_GET['from'])) clean_string($_GET['from']);
-	if (!empty($_GET) && !empty($_GET['gmto'])) clean_string($_GET['gmto'], "NUMBER");
-	if (!empty($_GET) && !empty($_GET['case_number'])) clean_string($_GET['case_number'], "AUTO_INCREMENT");
-	if (!empty($_GET) && !empty($_GET['bug_number'])) clean_string($_GET['bug_number'], "AUTO_INCREMENT");
-	if (!empty($_GET) && !empty($_GET['quote_num'])) clean_string($_GET['quote_num'], "AUTO_INCREMENT");
+		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");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['login_module'])) {
+	    clean_string($_REQUEST['login_module'], "STANDARD");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['login_action'])) {
+	    clean_string($_REQUEST['login_action'], "STANDARD");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['ck_login_theme_20'])) {
+	    clean_string($_REQUEST['ck_login_theme_20'], "STANDARD");
+	}
+	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_theme'])) {
+	    clean_string($_SESSION['authenticated_user_theme'], "STANDARD");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['module_name'])) {
+	    clean_string($_REQUEST['module_name'], "STANDARD");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['module'])) {
+	    clean_string($_REQUEST['module'], "STANDARD");
+	}
+	if (!empty($_POST) && !empty($_POST['parent_type'])) {
+	    clean_string($_POST['parent_type'], "STANDARD");
+	}
+	if (!empty($_REQUEST) && !empty($_REQUEST['mod_lang'])) {
+	    clean_string($_REQUEST['mod_lang'], "STANDARD");
+	}
+	if (!empty($_SESSION) && !empty($_SESSION['authenticated_user_language'])) {
+	    clean_string($_SESSION['authenticated_user_language'], "STANDARD");
+	}
+	if (!empty($_SESSION) && !empty($_SESSION['dyn_layout_file'])) {
+	    clean_string($_SESSION['dyn_layout_file'], "PATH_NO_URL");
+	}
+	if (!empty($_GET) && !empty($_GET['from'])) {
+	    clean_string($_GET['from']);
+	}
+	if (!empty($_GET) && !empty($_GET['gmto'])) {
+	    clean_string($_GET['gmto'], "NUMBER");
+	}
+	if (!empty($_GET) && !empty($_GET['case_number'])) {
+	    clean_string($_GET['case_number'], "AUTO_INCREMENT");
+	}
+	if (!empty($_GET) && !empty($_GET['bug_number'])) {
+	    clean_string($_GET['bug_number'], "AUTO_INCREMENT");
+	}
+	if (!empty($_GET) && !empty($_GET['quote_num'])) {
+	    clean_string($_GET['quote_num'], "AUTO_INCREMENT");
+	}
 	clean_superglobals('stamp', 'ALPHANUM'); // for vcr controls
 	clean_superglobals('offset', 'ALPHANUM');
 	clean_superglobals('return_action');
@@ -2024,10 +2061,16 @@ 
  * 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){
 	$_GET[$key] = $val;
@@ -2068,25 +2111,51 @@ 
         //get translated, so scrub the data but don't die
 	    if(ini_get('mbstring.encoding_translation')==='1'){
             securexsskey($k,false);
-        }else{
+        } else{
 		    securexsskey($k,true);
         }
 
 	}
 	// Any additional variables that need to be cleaned should be added here
-	if (isset($_REQUEST['login_theme'])) clean_string($_REQUEST['login_theme']);
-	if (isset($_REQUEST['login_module'])) clean_string($_REQUEST['login_module']);
-	if (isset($_REQUEST['login_action'])) clean_string($_REQUEST['login_action']);
-	if (isset($_REQUEST['login_language'])) clean_string($_REQUEST['login_language']);
-	if (isset($_REQUEST['action'])) clean_string($_REQUEST['action']);
-	if (isset($_REQUEST['module'])) clean_string($_REQUEST['module']);
-	if (isset($_REQUEST['record'])) clean_string($_REQUEST['record'], 'STANDARDSPACE');
-	if (isset($_SESSION['authenticated_user_theme'])) clean_string($_SESSION['authenticated_user_theme']);
-	if (isset($_SESSION['authenticated_user_language'])) clean_string($_SESSION['authenticated_user_language']);
-	if (isset($_REQUEST['language'])) clean_string($_REQUEST['language']);
-	if (isset($sugar_config['default_theme'])) clean_string($sugar_config['default_theme']);
-	if (isset($_REQUEST['offset'])) clean_string($_REQUEST['offset']);
-	if (isset($_REQUEST['stamp'])) clean_string($_REQUEST['stamp']);
+	if (isset($_REQUEST['login_theme'])) {
+	    clean_string($_REQUEST['login_theme']);
+	}
+	if (isset($_REQUEST['login_module'])) {
+	    clean_string($_REQUEST['login_module']);
+	}
+	if (isset($_REQUEST['login_action'])) {
+	    clean_string($_REQUEST['login_action']);
+	}
+	if (isset($_REQUEST['login_language'])) {
+	    clean_string($_REQUEST['login_language']);
+	}
+	if (isset($_REQUEST['action'])) {
+	    clean_string($_REQUEST['action']);
+	}
+	if (isset($_REQUEST['module'])) {
+	    clean_string($_REQUEST['module']);
+	}
+	if (isset($_REQUEST['record'])) {
+	    clean_string($_REQUEST['record'], 'STANDARDSPACE');
+	}
+	if (isset($_SESSION['authenticated_user_theme'])) {
+	    clean_string($_SESSION['authenticated_user_theme']);
+	}
+	if (isset($_SESSION['authenticated_user_language'])) {
+	    clean_string($_SESSION['authenticated_user_language']);
+	}
+	if (isset($_REQUEST['language'])) {
+	    clean_string($_REQUEST['language']);
+	}
+	if (isset($sugar_config['default_theme'])) {
+	    clean_string($sugar_config['default_theme']);
+	}
+	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');
@@ -2096,8 +2165,7 @@ 
 		if (str_end($key, "_offset")) {
 			clean_string($_REQUEST[$key], "ALPHANUM"); // keep this ALPHANUM for disable_count_query
 			set_superglobals($key, $_REQUEST[$key]);
-		}
-		elseif (str_end($key, "_ORDER_BY")) {
+		} elseif (str_end($key, "_ORDER_BY")) {
 			clean_string($_REQUEST[$key], "SQL_COLUMN_LIST");
 			set_superglobals($key, $_REQUEST[$key]);
 		}
@@ -2138,7 +2206,7 @@ 
 	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]);
@@ -2153,8 +2221,7 @@ 
 		}
 
 		$value = securexss($value);
-	}
-	else if (is_array($value)){
+	} else if (is_array($value)){
 	    foreach ($value as $key => $element) {
 	        $value[$key] = preprocess_param($element);
 	    }
@@ -2165,7 +2232,9 @@ 
 
 function cleanup_slashes($value)
 {
-    if(is_string($value)) return stripslashes($value);
+    if(is_string($value)) {
+        return stripslashes($value);
+    }
     return $value;
 }
 
@@ -2210,18 +2279,26 @@ 
 
 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='')
 {
-	if(empty($GLOBALS['sugar_config']['js_custom_version'])) $GLOBALS['sugar_config']['js_custom_version'] = 1;
+	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 = '';
@@ -2233,7 +2310,9 @@ 
 	$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";
 }
@@ -2245,7 +2324,9 @@ 
 
 function getJSPath($relative_path, $additional_attrs='')
 {
-	if(defined('TEMPLATE_URL'))$relative_path = SugarTemplateUtilities::getWebPath($relative_path);
+	if(defined('TEMPLATE_URL')) {
+	    $relative_path = SugarTemplateUtilities::getWebPath($relative_path);
+	}
 	return getVersionedPath($relative_path).(!empty($additional_attrs)?"&$additional_attrs":"");
 }
 
@@ -2277,8 +2358,7 @@ 
 			$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)
 		{
@@ -2289,8 +2369,7 @@ 
 			$match[1] = "0".$match[1];
 		}
 		return "{$match[3]}-{$match[1]}-{$match[2]}";
-	}
-	else
+	} else
 	{
 		return "";
 	}
@@ -2347,10 +2426,12 @@ 
 			}
 			$bean->update_date_modified = false;
             $bean->update_modified_by = false;
-            if(isset($bean->date_modified))
-                $bean->date_modified = $timedate->to_db($bean->date_modified);
-            if(isset($bean->date_entered))
-                $bean->date_entered = $timedate->to_db($bean->date_entered);
+            if(isset($bean->date_modified)) {
+                            $bean->date_modified = $timedate->to_db($bean->date_modified);
+            }
+            if(isset($bean->date_entered)) {
+                            $bean->date_entered = $timedate->to_db($bean->date_entered);
+            }
 			//save
 			$new_id=$bean->save();
 
@@ -2673,7 +2754,7 @@ 
 	//no error notice - lets just display the error to the user
 	if(!isset($error_notice)){
 		echo '<br>'.$msg . '<br>';
-	}else{
+	} else{
 		$error_notice .= $msg . '<br>';
 	}
 }
@@ -2717,10 +2798,9 @@ 
 
 		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 {
+		} else {
 			$new_str .= $str{$i};
 		}
 	}
@@ -2735,8 +2815,7 @@ 
 
 	if($keep){
 		$str = javascript_escape($str);
-	}
-	else {
+	} else {
 		$str = str_replace("'", " ", $str);
 		$str = str_replace('"', " ", $str);
 	}
@@ -2931,8 +3010,9 @@ 
 
 	$server_software = $_SERVER["SERVER_SOFTWARE"];
 	$iis_version = '';
-	if(strpos($server_software,'Microsoft-IIS') !== false && preg_match_all("/^.*\/(\d+\.?\d*)$/",  $server_software, $out))
-	    $iis_version = $out[1][0];
+	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;
 
@@ -3008,7 +3088,9 @@ 
 
 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__) . '/..'));
@@ -3019,7 +3101,11 @@ 
 
 	//added this check to avoid errors during install.
 	if (empty($sugar_config['dbconfig'])) {
-		if ($exit) exit; else return;
+		if ($exit) {
+		    exit;
+		} else {
+		    return;
+		}
 	}
 
     if (!class_exists('Tracker', true)) {
@@ -3028,8 +3114,9 @@ 
 	Tracker::logPage();
 	// Now write the cached tracker_queries
 	if(!empty($GLOBALS['savePreferencesToDB']) && $GLOBALS['savePreferencesToDB']) {
-	    if ( isset($GLOBALS['current_user']) && $GLOBALS['current_user'] instanceOf User )
-	        $GLOBALS['current_user']->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
@@ -3154,8 +3241,9 @@ 
 
 	echo "\n\n display_stack_trace caller, file: " . $stack[0]['file']. ' line#: ' .$stack[0]['line'];
 
-	if(!$textOnly)
-	echo '<br>';
+	if(!$textOnly) {
+		echo '<br>';
+	}
 
 	$first = true;
 	$out = '';
@@ -3166,14 +3254,18 @@ 
 		$line  = '';
 		$function  = '';
 
-		if(isset($item['file']))
-		$file = $item['file'];
-		if(isset($item['class']))
-		$class = $item['class'];
-		if(isset($item['line']))
-		$line = $item['line'];
-		if(isset($item['function']))
-		$function = $item['function'];
+		if(isset($item['file'])) {
+				$file = $item['file'];
+		}
+		if(isset($item['class'])) {
+				$class = $item['class'];
+		}
+		if(isset($item['line'])) {
+				$line = $item['line'];
+		}
+		if(isset($item['function'])) {
+				$function = $item['function'];
+		}
 
 		if(!$first) {
 			if(!$textOnly) {
@@ -3217,9 +3309,9 @@ 
 		    if ( error_reporting() & E_NOTICE ) {
 		        $halt_script = false;
 		        $type = 'Notice';
+		    } else {
+		    		        return;
 		    }
-		    else
-		        return;
 			break;
 		case E_USER_WARNING:
 		case E_COMPILE_WARNING:
@@ -3367,14 +3459,16 @@ 
 	$file = str_replace("/", '\\', $file);
 
 	if(file_exists($file)) {
-		if (!($f = @sugar_fopen($file, 'r+')))
-		return false;
+		if (!($f = @sugar_fopen($file, 'r+'))) {
+				return false;
+		}
 		fclose($f);
 		return true;
 	}
 
-	if(!($f = @sugar_fopen($file, 'w')))
-	return false;
+	if(!($f = @sugar_fopen($file, 'w'))) {
+		return false;
+	}
 	fclose($f);
 	unlink($file);
 	return true;
@@ -3393,7 +3487,9 @@ 
 	global $beanList;
 
 	foreach($module_array as $key => $value){
-		if(!empty($beanList[$value])) $module_array[$key] = $beanList[$value];
+		if(!empty($beanList[$value])) {
+		    $module_array[$key] = $beanList[$value];
+		}
 
 		if($value=="Cases") {
 			$module_array[$key] = "Case";
@@ -3417,8 +3513,7 @@ 
 	global $beanFiles, $beanList;
 	if(array_key_exists($bean_name, $beanList)){
 		return $beanList[$bean_name];
-	}
-	else{
+	} else{
 		return $bean_name;
 	}
 }
@@ -3692,8 +3787,7 @@ 
 		$num=unformat_number($num);
 		if(isset($system_id) && $system_id == 1){
 			return sprintf("%d", $num);
-		}
-		else{
+		} else{
 			return sprintf("%d-%d", $num, $system_id);
 		}
 	}
@@ -3720,8 +3814,7 @@ 
 		{
 			//third index ($split[2]) will be the host
 			$split[2] .= ":".$port;
-		}
-		else // otherwise assumed to start with host name
+		} else // otherwise assumed to start with host name
 		{
 			//first index ($split[0]) will be the host
 			$split[0] .= ":".$port;
@@ -3797,19 +3890,19 @@ 
 				if(is_array($domVal))
                 {
 					$tempArr = array();
-                    foreach ( $domVal as $domArrKey => $domArrVal )
-                        $tempArr[$domArrKey] = $domArrVal;
-                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
-                        if ( !isset($tempArr[$gimpArrKey]) )
+                    foreach ( $domVal as $domArrKey => $domArrVal ) {
+                                            $tempArr[$domArrKey] = $domArrVal;
+                    }
+                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal ) {
+                                            if ( !isset($tempArr[$gimpArrKey]) )
                             $tempArr[$gimpArrKey] = $gimpArrVal;
+                    }
                     $gimp[$domKey] = $tempArr;
-				}
-                else
+				} else
                 {
 					$gimp[$domKey] = $domVal;
 				}
-			}
-            else
+			} else
             {
 				$gimp[$domKey] = $domVal;
 			}
@@ -3843,11 +3936,13 @@ 
 			if(array_key_exists($domKey, $gimp)) {
 				if(is_array($domVal)) {
 					$tempArr = array();
-                    foreach ( $domVal as $domArrKey => $domArrVal )
-                        $tempArr[$domArrKey] = $domArrVal;
-                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal )
-                        if ( !array_key_exists($gimpArrKey, $tempArr) )
+                    foreach ( $domVal as $domArrKey => $domArrVal ) {
+                                            $tempArr[$domArrKey] = $domArrVal;
+                    }
+                    foreach ( $gimp[$domKey] as $gimpArrKey => $gimpArrVal ) {
+                                            if ( !array_key_exists($gimpArrKey, $tempArr) )
                             $tempArr[$gimpArrKey] = $gimpArrVal;
+                    }
                     $gimp[$domKey] = $tempArr;
 				} else {
 					$gimp[$domKey] = $domVal;
@@ -3858,8 +3953,9 @@ 
 		}
 	}
     // if the passed value for gimp isn't an array, then return the $dom
-    elseif(is_array($dom))
-        return $dom;
+    elseif(is_array($dom)) {
+            return $dom;
+    }
 
 	return $gimp;
 }
@@ -3886,8 +3982,9 @@ 
 		}
 	}
     // if the passed value for gimp isn't an array, then return the $dom
-    elseif(is_array($dom))
-        return $dom;
+    elseif(is_array($dom)) {
+            return $dom;
+    }
 
 	return $gimp;
 }
@@ -4042,8 +4139,7 @@ 
 
 	if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
 		return true;
-	}
-	else {
+	} else {
 		return false;
 	}
 }
@@ -4076,8 +4172,9 @@ 
 	if(!empty($_SERVER['HTTP_REFERER'])) {
 		$url = parse_url($_SERVER['HTTP_REFERER']);
 		$replacement_url = $url['scheme']."://".$url['host'];
-		if(!empty($url['port']))
-		$replacement_url .= ':'.$url['port'];
+		if(!empty($url['port'])) {
+				$replacement_url .= ':'.$url['port'];
+		}
 		$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']);
@@ -4102,8 +4199,7 @@ 
 		foreach ($array as $key => $value){
 			$depth_array[] = array_depth($value, $depth_count);
 		}
-	}
-	else{
+	} else{
 		return $depth_count;
 	}
 	foreach ($depth_array as $value){
@@ -4146,17 +4242,20 @@ 
     $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";
+    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) )
-		$iconName = "{$iconFileName}.gif";
+    if ( empty($iconFound) ) {
+    		$iconName = "{$iconFileName}.gif";
+    }
 		$iconFound = SugarThemeRegistry::current()->getImageURL($iconName,false);
 
-	if ( empty($iconFound) )
-		$iconName = '';
+	if ( empty($iconFound) ) {
+			$iconName = '';
+	}
 
   	return $iconName;
 }
@@ -4222,8 +4321,9 @@ 
     if (!isset($trans_tbl))
     {
         $trans_tbl = array();
-        foreach (get_html_translation_table(HTML_ENTITIES) as $val=>$key)
-            $trans_tbl[$key] = utf8_encode($val);
+        foreach (get_html_translation_table(HTML_ENTITIES) as $val=>$key) {
+                    $trans_tbl[$key] = utf8_encode($val);
+        }
     }
     return strtr($string, $trans_tbl);
 }
@@ -4231,10 +4331,18 @@ 
 // Returns the utf string corresponding to the unicode value
 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 < 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);
+    }
     return '';
 }
 
@@ -4287,8 +4395,9 @@ 
  */
 function chartColors()
 {
-	if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml')=='')
-	return SugarThemeRegistry::current()->getImageURL('sugarColors.xml');
+	if (SugarThemeRegistry::current()->getCSSURL('sugarColors.xml')=='') {
+		return SugarThemeRegistry::current()->getImageURL('sugarColors.xml');
+	}
     return SugarThemeRegistry::current()->getCSSURL('sugarColors.xml');
 }
 /* End Chart Dashlet helper functions */
@@ -4319,8 +4428,9 @@ 
     if ( ( substr($path,0,2) == '\\\\' )
             || ( $path[0] == '/' )
             || preg_match('/^[A-z]:/i',$path)
-            || $currentServer )
-        return $path;
+            || $currentServer ) {
+            return $path;
+    }
 
     return getcwd().'/'.$path;
 }
@@ -4367,8 +4477,9 @@ 
  */
 function get_alt_hot_key() {
 	$ua = '';
-    if ( isset($_SERVER['HTTP_USER_AGENT']) )
-        $ua = strtolower($_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;
 
@@ -4412,11 +4523,12 @@ 
 {
     if ( !isset($GLOBALS['sugar_config']['allow_pop_inbound']) || ! $GLOBALS['sugar_config']['allow_pop_inbound'] )
     {
-        if( isset($protocol['pop3']) )
-			unset($protocol['pop3']);
+        if( isset($protocol['pop3']) ) {
+        			unset($protocol['pop3']);
+        }
+    } else {
+            $protocol['pop3'] = 'POP3';
     }
-    else
-        $protocol['pop3'] = 'POP3';
 
     return $protocol;
 }
@@ -4460,11 +4572,13 @@ 
 }
 
 function encodeMultienumValue($arr) {
-    if (!is_array($arr))
-        return $arr;
+    if (!is_array($arr)) {
+            return $arr;
+    }
 
-    if (empty($arr))
-        return "";
+    if (empty($arr)) {
+            return "";
+    }
 
 	$string = "^" . implode('^,^', $arr) . "^";
 
@@ -4496,16 +4610,14 @@ 
 			if(empty($join_type))
 			{
 				$params['join_type'] = ' LEFT JOIN ';
-			}
-			else
+			} else
 			{
 				$params['join_type'] = $join_type;
 			}
 			if(isset($data['join_name']))
 			{
 				$params['join_table_alias'] = $field['join_name'];
-			}
-			else
+			} else
 			{
 				$params['join_table_alias']	= 'join_'.$field['name'];
 
@@ -4513,8 +4625,7 @@ 
 			if(isset($data['join_link_name']))
 			{
 				$params['join_table_link_alias'] = $field['join_link_name'];
-			}
-			else
+			} else
 			{
 				$params['join_table_link_alias'] = 'join_link_'.$field['name'];
 			}
@@ -4523,7 +4634,7 @@ 
 			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{
+			} else{
 				$where = preg_replace('/(^|[\s(])' . $field['name'] . '/', '${1}' . $join_table_alias . '.'.$field['rname'], $where);
 			}
 		}
@@ -4558,8 +4669,7 @@ 
 	$number = preg_match("/{$variable}=([a-zA-Z0-9_-]+)[&]?/", $string, $matches);
 	if($number){
 		return $matches[1];
-	}
-	else{
+	} else{
 		return false;
 	}
 }
@@ -4591,7 +4701,7 @@ 
 function getVersionStatus($version){
 	if(preg_match('/^[\d\.]+?([a-zA-Z]+?)[\d]*?$/si', $version, $matches)) {
 		return strtoupper($matches[1]);
-	}else{
+	} else{
 		return 'GA';
 	}
 }
@@ -4686,7 +4796,9 @@ 
 	} 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)) {
@@ -4778,8 +4890,9 @@ 
     // 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)
-          $str = $wildcard.$str;
+        if (substr($str,0,1) <> $wildcard) {
+                  $str = $wildcard.$str;
+        }
     }
 
     // add wildcard at the end of search string (default)
@@ -4834,8 +4947,7 @@ 
 {
     if (isset($GLOBALS['app_list_strings'][$optionName])) {
         return $GLOBALS['app_list_strings'][$optionName];
-    }
-    else {
+    } else {
         return array();
     }
 }
@@ -5085,47 +5197,53 @@ 
 
 function suite_strlen($input, $encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strlen'))
-		return mb_strlen($input,$encoding);
-	else
-		return strlen($input);
-}
+	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)
 {
-	if(function_exists('mb_substr'))
-		return mb_substr($input,$start,$length,$encoding);
-	else
-		return substr($input,$start,$length);
-}
+	if(function_exists('mb_substr')) {
+			return mb_substr($input,$start,$length,$encoding);
+	} else {
+			return substr($input,$start,$length);
+	}
+	}
 
 function suite_strtoupper($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtoupper'))
-		return mb_strtoupper($input,$encoding);
-	else
-		return strtoupper($input);
-}
+	if(function_exists('mb_strtoupper')) {
+			return mb_strtoupper($input,$encoding);
+	} else {
+			return strtoupper($input);
+	}
+	}
 function suite_strtolower($input,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strtolower'))
-		return mb_strtolower($input,$encoding);
-	else
-		return strtolower($input);
-}
+	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)
 {
-	if(function_exists('mb_strpos'))
-		return mb_strpos($haystack,$needle,$offset,$encoding);
-	else
-		return strpos($haystack,$needle,$offset);
-}
+	if(function_exists('mb_strpos')) {
+			return mb_strpos($haystack,$needle,$offset,$encoding);
+	} else {
+			return strpos($haystack,$needle,$offset);
+	}
+	}
 
 function suite_strrpos($haystack,$needle,$offset=0,$encoding = DEFAULT_UTIL_SUITE_ENCODING)
 {
-	if(function_exists('mb_strrpos'))
-		return mb_strrpos($haystack,$needle,$offset,$encoding);
-	else
-		return strrpos($haystack,$needle,$offset);
-}
\ No newline at end of file
+	if(function_exists('mb_strrpos')) {
+			return mb_strrpos($haystack,$needle,$offset,$encoding);
+	} else {
+			return strrpos($haystack,$needle,$offset);
+	}
+	}
\ No newline at end of file

Doc Comments +73 added lines, -7 removed lines

@@ -829,6 +829,7 @@ 
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
+ * @param boolean $always_copy
  */
 function safe_map_named($request_var, & $focus, $member_var, $always_copy)
 {
@@ -1248,6 +1249,7 @@ 
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
+ * @param string $varname
  */
 function return_session_value_or_default($varname, $default)
 {
@@ -1358,6 +1360,9 @@ 
 
 }
 
+/**
+ * @param integer $characters
+ */
 function create_guid_section($characters)
 {
 	$return = "";
@@ -1368,6 +1373,10 @@ 
 	return $return;
 }
 
+/**
+ * @param string $string
+ * @param integer $length
+ */
 function ensure_length(&$string, $length)
 {
 	$strlen = strlen($string);
@@ -1475,6 +1484,9 @@ 
 
 
 // Check if user is admin for a specific module.
+/**
+ * @param string $module
+ */
 function is_admin_for_module($user,$module) {
     if (!isset($user)) {
         return false;
@@ -1535,6 +1547,7 @@ 
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
+ * @param string $selected
  */
 function get_select_options ($option_list, $selected) {
 	return get_select_options_with_id($option_list, $selected);
@@ -1822,7 +1835,7 @@ 
 
 /**
  * returns a default array of XSS tags to clean
- * @return array
+ * @return string
  */
 function getDefaultXssTags() {
 	$tmp = array(
@@ -1849,6 +1862,7 @@ 
 /**
  * Remove potential xss vectors from strings
  * @param string str String to search for XSS attack vectors
+ * @param string $str
  * @deprecated
  * @return string
  */
@@ -1862,6 +1876,7 @@ 
  * @deprecated
  * @param string str String to search for XSS attack vectors
  * @param bool cleanImg Flag to allow <img> tags to survive - only used by InboundEmail for inline images.
+ * @param string $str
  * @return array Array of matches, empty on clean string
  */
 function clean_xss($str, $cleanImg=true) {
@@ -1938,6 +1953,7 @@ 
  * Helper function used by clean_xss() to parse for known-bad vectors
  * @param string pattern Regex pattern to use
  * @param string str String to parse for badness
+ * @param string $pattern
  * @return array
  */
 function xss_check_pattern($pattern, $str) {
@@ -2022,6 +2038,7 @@ 
 
 /**
  * cleans the given key in superglobals $_GET, $_POST, $_REQUEST
+ * @param string $key
  */
 function clean_superglobals($key, $filter = 'STANDARD') {
 	if(isset($_GET[$key])) clean_string($_GET[$key], $filter);
@@ -2029,6 +2046,9 @@ 
 	if(isset($_REQUEST[$key])) clean_string($_REQUEST[$key], $filter);
 }
 
+/**
+ * @param string $key
+ */
 function set_superglobals($key, $val){
 	$_GET[$key] = $val;
 	$_POST[$key] = $val;
@@ -2108,11 +2128,18 @@ 
 }
 
 // Returns TRUE if $str begins with $begin
+/**
+ * @param string $begin
+ */
 function str_begin($str, $begin) {
 	return (substr($str, 0, strlen($begin)) == $begin);
 }
 
 // Returns TRUE if $str ends with $end
+/**
+ * @param string $str
+ * @param string $end
+ */
 function str_end($str, $end) {
 	return (substr($str, strlen($str) - strlen($end)) == $end);
 }
@@ -2170,14 +2197,24 @@ 
 }
 
 
+/**
+ * @param string $category
+ */
 function set_register_value($category, $name, $value){
     return sugar_cache_put("{$category}:{$name}", $value);
 }
 
+/**
+ * @param string $category
+ */
 function get_register_value($category,$name){
     return sugar_cache_retrieve("{$category}:{$name}");
 }
 
+/**
+ * @param string $category
+ * @param string $name
+ */
 function clear_register_value($category,$name){
     return sugar_cache_clear("{$category}:{$name}");
 }
@@ -2379,6 +2416,11 @@ 
 	return $new_array;
 }
 
+/**
+ * @param DBManager $db
+ * @param string $from_column
+ * @param string $to_id
+ */
 function clone_relationship(&$db, $tables = array(), $from_column, $from_id, $to_id)
 {
 	foreach($tables as $table)
@@ -2556,6 +2598,10 @@ 
 	return empty($value) && $value != '0';
 }
 
+/**
+ * @param string $bean_name
+ * @param string $display_columns
+ */
 function get_bean_select_array($add_blank=true, $bean_name, $display_columns, $where='', $order_by='', $blank_is_none=false)
 {
 	global $beanFiles;
@@ -2746,6 +2792,11 @@ 
 	//end function js_escape
 }
 
+/**
+ * @param string $str
+ *
+ * @return string
+ */
 function br2nl($str) {
 	$regex = "#<[^>]+br.+?>#i";
 	preg_match_all($regex, $str, $matches);
@@ -3265,6 +3316,9 @@ 
 
 	set_error_handler('StackTraceErrorHandler');
 }
+/**
+ * @param string $name
+ */
 function get_sub_cookies($name){
 	$cookies = array();
 	if(isset($_COOKIE[$name])){
@@ -3306,6 +3360,7 @@ 
 
 /**
  * For translating the php.ini memory values into bytes.  e.g. input value of '8M' will return 8388608.
+ * @param string $val
  */
 function return_bytes($val)
 {
@@ -3413,6 +3468,9 @@ 
  * Given the bean_name which may be plural or singular return the singular
  * bean_name. This is important when you need to include files.
  */
+/**
+ * @return string
+ */
 function get_singular_bean_name($bean_name){
 	global $beanFiles, $beanList;
 	if(array_key_exists($bean_name, $beanList)){
@@ -3457,6 +3515,9 @@ 
     return $singular;
 }
 
+/**
+ * @return string
+ */
 function get_label($label_tag, $temp_module_strings){
 	global $app_strings;
 	if(!empty($temp_module_strings[$label_tag])){
@@ -3562,7 +3623,7 @@ 
 /**
  * In order to have one place to obtain the proper object name. aCase for example causes issues throughout the application.
  *
- * @param string $moduleName
+ * @param string $module_name
  */
 function get_valid_bean_name($module_name){
 	global $beanList;
@@ -4139,6 +4200,9 @@ 
  * @return string Relative pathname of the located icon, or '' if not found
  */
 
+/**
+ * @param string $iconFileName
+ */
 function _getIcon($iconFileName)
 {
 
@@ -4163,7 +4227,7 @@ 
 /**
  * Function to grab the correct icon image for Studio
  * @param string $iconFileName Name of the icon file
- * @param string $altfilename Name of a fallback icon file (displayed if the imagefilename doesn't exist)
+ * @param string $altFileName Name of a fallback icon file (displayed if the imagefilename doesn't exist)
  * @param string $width Width of image
  * @param string $height Height of image
  * @param string $align Alignment of image
@@ -4188,7 +4252,6 @@ 
 
 /**
  * Function to grab the correct icon image for Dashlets Dialog
- * @param string $filename Location of the icon file
  * @param string $module Name of the module to fall back onto if file does not exist
  * @param string $width Width of image
  * @param string $height Height of image
@@ -4601,7 +4664,7 @@ 
  * 5.5.1RC1 then return 5.5.1
  *
  * @param string $version
- * @return version
+ * @return string
  */
 function getMajorMinorVersion($version){
 	if(preg_match('/^([\d\.]+).*$/si', $version, $matches2)){
@@ -4751,6 +4814,9 @@ 
     }
 }
 
+/**
+ * @param string $field_name
+ */
 function order_beans($beans, $field_name)
 {
     //Since php 5.2 doesn't include closures, we must use a global to pass the order field to cmp_beans.
@@ -4885,7 +4951,7 @@ 
  * otherwise it return $file
  *
  * @param $file String of filename to check
- * @return $file String of filename including custom directory if found
+ * @return string String of filename including custom directory if found
  */
 function get_custom_file_if_exists($file)
 {
@@ -5037,7 +5103,7 @@ 
 /**
  * Gets the list of "*type_display*".
  * 
- * @return array
+ * @return string[]
  */
 function getTypeDisplayList()
 {

include/Popups/PopupSmarty.php

Indentation +277 added lines, -277 removed lines

@@ -45,13 +45,13 @@ 
 define("NUM_COLS", 2);
 class PopupSmarty extends ListViewSmarty{
 
-	var $contextMenus = false;
-	var $export = false;
-	var $mailmerge = false;
-	var $mergeduplicates = false;
-	var $quickViewLinks = false;
-	var $multiSelect = false;
-	var $headerTpl;
+    var $contextMenus = false;
+    var $export = false;
+    var $mailmerge = false;
+    var $mergeduplicates = false;
+    var $quickViewLinks = false;
+    var $multiSelect = false;
+    var $headerTpl;
     var $footerTpl;
     var $th;
     var $tpl;
@@ -70,19 +70,19 @@ 
     var $module;
     var $massUpdateData = '';
 
-	function PopupSmarty($seed, $module){
-		parent::ListViewSmarty();
-		$this->th = new TemplateHandler();
-		$this->th->loadSmarty();
-		$this->seed = $seed;
-		$this->view = 'Popup';
-		$this->module = $module;
-		$this->searchForm = new SearchForm($this->seed, $this->module);
-		$this->th->deleteTemplate($module, $this->view);
+    function PopupSmarty($seed, $module){
+        parent::ListViewSmarty();
+        $this->th = new TemplateHandler();
+        $this->th->loadSmarty();
+        $this->seed = $seed;
+        $this->view = 'Popup';
+        $this->module = $module;
+        $this->searchForm = new SearchForm($this->seed, $this->module);
+        $this->th->deleteTemplate($module, $this->view);
         $this->headerTpl = 'include/Popups/tpls/header.tpl';
         $this->footerTpl = 'include/Popups/tpls/footer.tpl';
 
-	}
+    }
 
     /**
      * Assign several arrow image attributes to TemplateHandler smarty. Such as width, height, etc.
@@ -101,7 +101,7 @@ 
         $this->th->ss->assign('arrowAlt', translate('LBL_SORT'));
     }
 
-	/**
+    /**
      * Processes the request. Calls ListViewData process. Also assigns all lang strings, export links,
      * This is called from ListViewDisplay
      *
@@ -110,13 +110,13 @@ 
      * @param html_var string the corresponding html var in xtpl per row
      *
      */
-	function process($file, $data, $htmlVar) {
+    function process($file, $data, $htmlVar) {
 
-		global $odd_bg, $even_bg, $hilite_bg, $click_bg, $app_strings;
-		parent::process($file, $data, $htmlVar);
+        global $odd_bg, $even_bg, $hilite_bg, $click_bg, $app_strings;
+        parent::process($file, $data, $htmlVar);
 
-		$this->tpl = $file;
-		$this->data = $data;
+        $this->tpl = $file;
+        $this->data = $data;
 
         $totalWidth = 0;
         foreach($this->displayColumns as $name => $params) {
@@ -131,47 +131,47 @@ 
             if(!empty($params['contextMenu']['objectType']))
                 $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true;
         }
-		$this->th->ss->assign('displayColumns', $this->displayColumns);
+        $this->th->ss->assign('displayColumns', $this->displayColumns);
 
 
-		$this->th->ss->assign('bgHilite', $hilite_bg);
-		$this->th->ss->assign('colCount', count($this->displayColumns) + 1);
-		$this->th->ss->assign('htmlVar', strtoupper($htmlVar));
-		$this->th->ss->assign('moduleString', $this->moduleString);
+        $this->th->ss->assign('bgHilite', $hilite_bg);
+        $this->th->ss->assign('colCount', count($this->displayColumns) + 1);
+        $this->th->ss->assign('htmlVar', strtoupper($htmlVar));
+        $this->th->ss->assign('moduleString', $this->moduleString);
         $this->th->ss->assign('editLinkString', $GLOBALS['app_strings']['LBL_EDIT_BUTTON']);
         $this->th->ss->assign('viewLinkString', $GLOBALS['app_strings']['LBL_VIEW_BUTTON']);
 
         //rrs
         $this->searchForm->parsedView = 'popup_query_form';
         $this->searchForm->displayType = 'popupView';
-		$this->th->ss->assign('searchForm', $this->searchForm->display(false));
+        $this->th->ss->assign('searchForm', $this->searchForm->display(false));
         //rrs
 
-		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->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 (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
-			$this->multiSelect = true;
-		}
-		// handle save checks and stuff
-		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'>");
+        if (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
+            $this->multiSelect = true;
+        }
+        // handle save checks and stuff
+        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
                 $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));
-		}
+            $this->th->ss->assign('selectLink', $this->buildSelectLink('select_link', $this->data['pageData']['offsets']['total'], $pageTotal));
+        }
 
-		$this->processArrows($data['pageData']['ordering']);
-		$this->th->ss->assign('prerow', $this->multiSelect);
-		$this->th->ss->assign('rowColor', array('oddListRow', 'evenListRow'));
-		$this->th->ss->assign('bgColor', array($odd_bg, $even_bg));
+        $this->processArrows($data['pageData']['ordering']);
+        $this->th->ss->assign('prerow', $this->multiSelect);
+        $this->th->ss->assign('rowColor', array('oddListRow', 'evenListRow'));
+        $this->th->ss->assign('bgColor', array($odd_bg, $even_bg));
         $this->th->ss->assign('contextMenus', $this->contextMenus);
 
 
@@ -191,12 +191,12 @@ 
 
             // arrow image attributes
             $this->processArrowVars();
-	}
+    }
 
-	/*
+    /*
 	 * Display the Smarty template.  Here we are using the TemplateHandler for caching per the module.
 	 */
-	function display($end = true) {
+    function display($end = true) {
         global $app_strings;
 
         if(!is_file(sugar_cached("jsLanguage/{$GLOBALS['current_language']}.js"))) {
@@ -206,8 +206,8 @@ 
         $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']);
-		$this->th->ss->assign('pageData', $this->data['pageData']);
+        $this->data['pageData']['offsets']['lastOffsetOnPage'] = $this->data['pageData']['offsets']['current'] + count($this->data['data']);
+        $this->th->ss->assign('pageData', $this->data['pageData']);
 
         $navStrings = array('next' => $GLOBALS['app_strings']['LNK_LIST_NEXT'],
                             'previous' => $GLOBALS['app_strings']['LNK_LIST_PREVIOUS'],
@@ -217,128 +217,128 @@ 
         $this->th->ss->assign('navStrings', $navStrings);
 
 
-		$associated_row_data = array();
+        $associated_row_data = array();
 		
-		//C.L. - Bug 44324 - Override the NAME entry to not display salutation so that the data returned from the popup can be searched on correctly
-		$searchNameOverride = !empty($this->seed) && $this->seed instanceof Person && (isset($this->data['data'][0]['FIRST_NAME']) && isset($this->data['data'][0]['LAST_NAME'])) ? true : false;
+        //C.L. - Bug 44324 - Override the NAME entry to not display salutation so that the data returned from the popup can be searched on correctly
+        $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)
-		{
-			$associated_row_data[$val['ID']] = $val;
-			if($searchNameOverride)
-			{
-			   $associated_row_data[$val['ID']]['NAME'] = $locale->getLocaleFormattedName($val['FIRST_NAME'], $val['LAST_NAME']);
-			}
-		}
-		$is_show_fullname = showFullName() ? 1 : 0;
-		$json = getJSONobj();
-		$this->th->ss->assign('jsLang', $jsLang);
-		$this->th->ss->assign('lang', substr($GLOBALS['current_language'], 0, 2));
+        global $locale;
+        foreach($this->data['data'] as $val)
+        {
+            $associated_row_data[$val['ID']] = $val;
+            if($searchNameOverride)
+            {
+                $associated_row_data[$val['ID']]['NAME'] = $locale->getLocaleFormattedName($val['FIRST_NAME'], $val['LAST_NAME']);
+            }
+        }
+        $is_show_fullname = showFullName() ? 1 : 0;
+        $json = getJSONobj();
+        $this->th->ss->assign('jsLang', $jsLang);
+        $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('module', $this->seed->module_dir);
-		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
-
-		$this->th->ss->assign('request_data', $request_data);
-		$this->th->ss->assign('fields', $this->fieldDefs);
-		$this->th->ss->assign('formData', $this->formData);
-		$this->th->ss->assign('APP', $GLOBALS['app_strings']);
-		$this->th->ss->assign('MOD', $GLOBALS['mod_strings']);
+        $this->th->ss->assign('module', $this->seed->module_dir);
+        $request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
+
+        $this->th->ss->assign('request_data', $request_data);
+        $this->th->ss->assign('fields', $this->fieldDefs);
+        $this->th->ss->assign('formData', $this->formData);
+        $this->th->ss->assign('APP', $GLOBALS['app_strings']);
+        $this->th->ss->assign('MOD', $GLOBALS['mod_strings']);
         if (isset($this->_popupMeta['create']['createButton'])) 
-		{
-           $this->_popupMeta['create']['createButton'] = translate($this->_popupMeta['create']['createButton']);
+        {
+            $this->_popupMeta['create']['createButton'] = translate($this->_popupMeta['create']['createButton']);
         }
-		$this->th->ss->assign('popupMeta', $this->_popupMeta);
+        $this->th->ss->assign('popupMeta', $this->_popupMeta);
         $this->th->ss->assign('current_query', base64_encode(serialize($_REQUEST)));
-		$this->th->ss->assign('customFields', $this->customFieldDefs);
-		$this->th->ss->assign('numCols', NUM_COLS);
-		$this->th->ss->assign('massUpdateData', $this->massUpdateData);
-		$this->th->ss->assign('sugarVersion', $GLOBALS['sugar_version']);
+        $this->th->ss->assign('customFields', $this->customFieldDefs);
+        $this->th->ss->assign('numCols', NUM_COLS);
+        $this->th->ss->assign('massUpdateData', $this->massUpdateData);
+        $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());
-			$this->th->ss->assign('ADDFORMHEADER', $this->_getAddFormHeader());
-			$this->th->ss->assign('object_name', $this->seed->object_name);
-		}
-		$this->th->ss->assign('LIST_HEADER', get_form_header($GLOBALS['mod_strings']['LBL_LIST_FORM_TITLE'], '', false));
-		$this->th->ss->assign('SEARCH_FORM_HEADER', get_form_header($GLOBALS['mod_strings']['LBL_SEARCH_FORM_TITLE'], '', false));
-		$str = $this->th->displayTemplate($this->seed->module_dir, $this->view, $this->tpl);
-		return $str;
-	}
-
-	/*
+        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);
+        }
+        $this->th->ss->assign('LIST_HEADER', get_form_header($GLOBALS['mod_strings']['LBL_LIST_FORM_TITLE'], '', false));
+        $this->th->ss->assign('SEARCH_FORM_HEADER', get_form_header($GLOBALS['mod_strings']['LBL_SEARCH_FORM_TITLE'], '', false));
+        $str = $this->th->displayTemplate($this->seed->module_dir, $this->view, $this->tpl);
+        return $str;
+    }
+
+    /*
 	 * Setup up the smarty template. we added an extra step here to add the order by from the popupdefs.
 	 */
-	function setup($seed, $file = null, $where = null, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id') {
-		$args = func_get_args();
-		return call_user_func_array(array($this, '_setup'), $args);
-	}
-	function _setup($file) {
-
-	    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'])){
-			$formBase = new $this->_popupMeta['create']['formBaseClass']();
-			if(isset($_REQUEST['doAction']) && $_REQUEST['doAction'] == 'save')
-			{
-				//If it's a new record, set useRequired to false
-				$useRequired = empty($_REQUEST['id']) ? false : true;
-				$formBase->handleSave('', false, $useRequired);
-			}
-		}
-
-		$params = array();
-		if(!empty($this->_popupMeta['orderBy'])){
-			$params['orderBy'] = $this->_popupMeta['orderBy'];
-		}
-
-		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')){
-			require('modules/'.$this->module.'/metadata/metafiles.php');
-		}
-
-		if(!empty($metafiles[$this->module]['searchfields'])) {
-			require($metafiles[$this->module]['searchfields']);
-		} elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php')) {
-			require('modules/'.$this->module.'/metadata/SearchFields.php');
-	    }
+    function setup($seed, $file = null, $where = null, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id') {
+        $args = func_get_args();
+        return call_user_func_array(array($this, '_setup'), $args);
+    }
+    function _setup($file) {
+
+        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'])){
+            $formBase = new $this->_popupMeta['create']['formBaseClass']();
+            if(isset($_REQUEST['doAction']) && $_REQUEST['doAction'] == 'save')
+            {
+                //If it's a new record, set useRequired to false
+                $useRequired = empty($_REQUEST['id']) ? false : true;
+                $formBase->handleSave('', false, $useRequired);
+            }
+        }
+
+        $params = array();
+        if(!empty($this->_popupMeta['orderBy'])){
+            $params['orderBy'] = $this->_popupMeta['orderBy'];
+        }
+
+        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')){
+            require('modules/'.$this->module.'/metadata/metafiles.php');
+        }
+
+        if(!empty($metafiles[$this->module]['searchfields'])) {
+            require($metafiles[$this->module]['searchfields']);
+        } elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php')) {
+            require('modules/'.$this->module.'/metadata/SearchFields.php');
+        }
         $this->searchdefs[$this->module]['templateMeta']['maxColumns'] = 2;
         $this->searchdefs[$this->module]['templateMeta']['widths']['label'] = 10;
         $this->searchdefs[$this->module]['templateMeta']['widths']['field'] = 30;
 
         $this->searchForm->view = 'PopupSearchForm';
-		$this->searchForm->setup($this->searchdefs, $searchFields, 'SearchFormGenericAdvanced.tpl', 'advanced_search', $this->listviewdefs);
-
-		$lv = new ListViewSmarty();
-		$displayColumns = array();
-		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'])
-		            $displayColumns[$col] = $para;
-		    }
-		}
-		$params['massupdate'] = true;
-		if(!empty($_REQUEST['orderBy'])) {
-		    $params['orderBy'] = $_REQUEST['orderBy'];
-		    $params['overrideOrder'] = true;
-		    if(!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
-		}
-
-		$lv->displayColumns = $displayColumns;
+        $this->searchForm->setup($this->searchdefs, $searchFields, 'SearchFormGenericAdvanced.tpl', 'advanced_search', $this->listviewdefs);
+
+        $lv = new ListViewSmarty();
+        $displayColumns = array();
+        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'])
+                    $displayColumns[$col] = $para;
+            }
+        }
+        $params['massupdate'] = true;
+        if(!empty($_REQUEST['orderBy'])) {
+            $params['orderBy'] = $_REQUEST['orderBy'];
+            $params['overrideOrder'] = true;
+            if(!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
+        }
+
+        $lv->displayColumns = $displayColumns;
         $this->searchForm->lv = $lv;
         $this->searchForm->displaySavedSearch = false;
 
@@ -351,25 +351,25 @@ 
         $this->should_process = true;
 
         if(isset($params['export'])) {
-          $this->export = $params['export'];
+            $this->export = $params['export'];
         }
         if(!empty($params['multiSelectPopup'])) {
-		  $this->multi_select_popup = $params['multiSelectPopup'];
+            $this->multi_select_popup = $params['multiSelectPopup'];
         }
-		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['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'])) {
                 $this->mass->handleMassUpdate();
             }
-		}
+        }
 
         // create filter fields based off of display columns
         if(empty($this->filter_fields) || $this->mergeDisplayColumns) {
             foreach($this->displayColumns as $columnName => $def) {
-               $this->filter_fields[strtolower($columnName)] = true;
-               if(!empty($def['related_fields'])) {
+                $this->filter_fields[strtolower($columnName)] = true;
+                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
@@ -379,12 +379,12 @@ 
                     }
                 }
                 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)])
-	                    {
-	                        $this->filter_fields[strtolower($field)] = true;
-	                    }
-	                }
+                    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 )
@@ -418,119 +418,119 @@ 
         }
 
 
-		if (!empty($_REQUEST['query']) || (!empty($GLOBALS['sugar_config']['save_query']) && $GLOBALS['sugar_config']['save_query'] != 'populate_only')) {
-			$data = $this->lvd->getListViewData($this->seed, $searchWhere, 0, -1, $this->filter_fields, $params, 'id');
-		} else {
-			$this->should_process = false;
-			$data = array(
-				'data'=>array(),
-			    'pageData'=>array(
-			    	'bean'=>array('moduleDir'=>$this->seed->module_dir),
-					'ordering'=>'',
-					'offsets'=>array('total'=>0,'next'=>0,'current'=>0),
-				),
-			);
-		}
+        if (!empty($_REQUEST['query']) || (!empty($GLOBALS['sugar_config']['save_query']) && $GLOBALS['sugar_config']['save_query'] != 'populate_only')) {
+            $data = $this->lvd->getListViewData($this->seed, $searchWhere, 0, -1, $this->filter_fields, $params, 'id');
+        } else {
+            $this->should_process = false;
+            $data = array(
+                'data'=>array(),
+                'pageData'=>array(
+                    'bean'=>array('moduleDir'=>$this->seed->module_dir),
+                    'ordering'=>'',
+                    'offsets'=>array('total'=>0,'next'=>0,'current'=>0),
+                ),
+            );
+        }
 
         $this->fillDisplayColumnsWithVardefs();
 
-		$this->process($file, $data, $this->seed->object_name);
-	}
+        $this->process($file, $data, $this->seed->object_name);
+    }
 
-	/*
+    /*
 	 * Return the where clause as per the REQUEST.
 	 */
-	function _get_where_clause()
-	{
-		$where = '';
-		$where_clauses = $this->searchForm->generateSearchWhere(true, $this->seed->module_dir);
-
-		// 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) . ' )';
+    function _get_where_clause()
+    {
+        $where = '';
+        $where_clauses = $this->searchForm->generateSearchWhere(true, $this->seed->module_dir);
+
+        // 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) . ' )';
         }
 
         // Need to include the default whereStatement
-		if(!empty($this->_popupMeta['whereStatement'])){
+        if(!empty($this->_popupMeta['whereStatement'])){
             if(!empty($where))$where .= ' AND ';
             $where .= $this->_popupMeta['whereStatement'];
-		}
+        }
 
-		return $where;
-	}
+        return $where;
+    }
 
-	/*
+    /*
 	 * Generate the data for the search form on the header of the Popup.
 	 */
-		function _build_field_defs(){
-		$this->formData = array();
-		$this->customFieldDefs = array();
-		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']]))
-	            	$value = $_REQUEST[$data['name']];
-	            $this->customFieldDefs[$data['name']]['value'] = $value;
-			}else
-				$this->formData[] = array('field' => array('name'=>$data));
-		}
-		$this->fieldDefs = array();
-		if($this->seed){
-			$this->seed->fill_in_additional_detail_fields();
-
-	        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')
-	            	$this->fieldDefs[$name]['type'] = 'name';
-	            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]))
-	            	$value = $_REQUEST[$name];
-	            $this->fieldDefs[$name]['value'] = $value;
-	        }
-		}
-	}
-
-	function _getAddForm(){
-		$addform = '';
+        function _build_field_defs(){
+        $this->formData = array();
+        $this->customFieldDefs = array();
+        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']]))
+                    $value = $_REQUEST[$data['name']];
+                $this->customFieldDefs[$data['name']]['value'] = $value;
+            }else
+                $this->formData[] = array('field' => array('name'=>$data));
+        }
+        $this->fieldDefs = array();
+        if($this->seed){
+            $this->seed->fill_in_additional_detail_fields();
+
+            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')
+                    $this->fieldDefs[$name]['type'] = 'name';
+                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]))
+                    $value = $_REQUEST[$name];
+                $this->fieldDefs[$name]['value'] = $value;
+            }
+        }
+    }
+
+    function _getAddForm(){
+        $addform = '';
         if(!$this->seed->ACLAccess('save')){
             return;
         }
-		if(!empty($this->_popupMeta['create'])){
-			$formBase = new $this->_popupMeta['create']['formBaseClass']();
+        if(!empty($this->_popupMeta['create'])){
+            $formBase = new $this->_popupMeta['create']['formBaseClass']();
 
 
 
-				// TODO: cleanup the construction of $addform
-				$prefix = empty($this->_popupMeta['create']['getFormBodyParams'][0]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][0];
-				$mod = empty($this->_popupMeta['create']['getFormBodyParams'][1]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][1];
-				$formBody = empty($this->_popupMeta['create']['getFormBodyParams'][2]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][2];
+                // TODO: cleanup the construction of $addform
+                $prefix = empty($this->_popupMeta['create']['getFormBodyParams'][0]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][0];
+                $mod = empty($this->_popupMeta['create']['getFormBodyParams'][1]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][1];
+                $formBody = empty($this->_popupMeta['create']['getFormBodyParams'][2]) ? '' : $this->_popupMeta['create']['getFormBodyParams'][2];
 
-				$getFormMethod = (empty($this->_popupMeta['create']['getFormMethod']) ? 'getFormBody' : $this->_popupMeta['create']['getFormMethod']);
-				$formbody = $formBase->$getFormMethod($prefix, $mod, $formBody);
+                $getFormMethod = (empty($this->_popupMeta['create']['getFormMethod']) ? 'getFormBody' : $this->_popupMeta['create']['getFormMethod']);
+                $formbody = $formBase->$getFormMethod($prefix, $mod, $formBody);
 
-				$addform = '<table><tr><td nowrap="nowrap" valign="top">'
-					. str_replace('<br>', '</td><td nowrap="nowrap" valign="top">&nbsp;', $formbody)
-					. '</td></tr></table>'
-					. '<input type="hidden" name="action" value="Popup" />';
+                $addform = '<table><tr><td nowrap="nowrap" valign="top">'
+                    . str_replace('<br>', '</td><td nowrap="nowrap" valign="top">&nbsp;', $formbody)
+                    . '</td></tr></table>'
+                    . '<input type="hidden" name="action" value="Popup" />';
 
-			return $addform;
-		}
-	}
+            return $addform;
+        }
+    }
 
-	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'];
-		$module_dir = $this->seed->module_dir;
+    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'];
+        $module_dir = $this->seed->module_dir;
 $formSave = <<<EOQ
 			<input type="hidden" name="create" value="true">
 			<input type="hidden" name="popup" value="true">
@@ -538,21 +538,21 @@ 
 			<input type="hidden" name="return_module" value="$module_dir">
 			<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';
-		}
-
-
-		$addformheader = get_form_header(translate($this->_popupMeta['create']['createButton']), $formSave, false);
-		return $addformheader;
-	}
-
-	function getQuickCreate(){
-		require_once("include/EditView/PopupQuickCreate.php");
-		$qc = new PopupQuickCreate($this->module);
-		return $qc->process($this->module);
-	}
+        // 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';
+        }
+
+
+        $addformheader = get_form_header(translate($this->_popupMeta['create']['createButton']), $formSave, false);
+        return $addformheader;
+    }
+
+    function getQuickCreate(){
+        require_once("include/EditView/PopupQuickCreate.php");
+        $qc = new PopupQuickCreate($this->module);
+        return $qc->process($this->module);
+    }
 }
 ?>

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

Braces +45 added lines, -25 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -128,8 +130,9 @@ 
         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']))
-                $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true;
+            if(!empty($params['contextMenu']['objectType'])) {
+                            $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true;
+            }
         }
 		$this->th->ss->assign('displayColumns', $this->displayColumns);
 
@@ -147,10 +150,17 @@ 
 		$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') {
@@ -301,7 +311,7 @@ 
 
 		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');
 		}
 
@@ -321,21 +331,24 @@ 
 		$displayColumns = array();
 		if(!empty($_REQUEST['displayColumns'])) {
 		    foreach(explode('|', $_REQUEST['displayColumns']) as $num => $col) {
-		        if(!empty($listViewDefs[$this->module][$col]))
-		            $displayColumns[$col] = $this->listviewdefs[$this->module][$col];
+		        if(!empty($listViewDefs[$this->module][$col])) {
+		        		            $displayColumns[$col] = $this->listviewdefs[$this->module][$col];
+		        }
 		    }
-		}
-		else {
+		} else {
 		    foreach($this->listviewdefs[$this->module] as $col => $para) {
-		        if(!empty($para['default']) && $para['default'])
-		            $displayColumns[$col] = $para;
+		        if(!empty($para['default']) && $para['default']) {
+		        		            $displayColumns[$col] = $para;
+		        }
 		    }
 		}
 		$params['massupdate'] = true;
 		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;
@@ -453,7 +466,9 @@ 
 
         // Need to include the default whereStatement
 		if(!empty($this->_popupMeta['whereStatement'])){
-            if(!empty($where))$where .= ' AND ';
+            if(!empty($where)) {
+                $where .= ' AND ';
+            }
             $where .= $this->_popupMeta['whereStatement'];
 		}
 
@@ -472,11 +487,13 @@ 
 				$this->formData[] = array('field' => $data);
 				$value = '';
 				$this->customFieldDefs[$data['name']]= $data;
-				if(!empty($_REQUEST[$data['name']]))
-	            	$value = $_REQUEST[$data['name']];
+				if(!empty($_REQUEST[$data['name']])) {
+					            	$value = $_REQUEST[$data['name']];
+				}
 	            $this->customFieldDefs[$data['name']]['value'] = $value;
-			}else
-				$this->formData[] = array('field' => array('name'=>$data));
+			} else {
+							$this->formData[] = array('field' => array('name'=>$data));
+			}
 		}
 		$this->fieldDefs = array();
 		if($this->seed){
@@ -487,13 +504,15 @@ 
 	            //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')
-	            	$this->fieldDefs[$name]['type'] = 'name';
+	            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']])) {
 	                $this->fieldDefs[$name]['options'] = $GLOBALS['app_list_strings'][$this->fieldDefs[$name]['options']]; // fill in enums
 	            }
-	            if(!empty($_REQUEST[$name]))
-	            	$value = $_REQUEST[$name];
+	            if(!empty($_REQUEST[$name])) {
+	            	            	$value = $_REQUEST[$name];
+	            }
 	            $this->fieldDefs[$name]['value'] = $value;
 	        }
 		}
@@ -540,8 +559,9 @@ 
 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';
+			foreach($this->_popupMeta['customInput'] as $key => $value) {
+							$formSave .= '<input type="hidden" name="' . $key . '" value="'. $value .'">\n';
+			}
 		}
 
 

Doc Comments +4 added lines

@@ -70,6 +70,9 @@ 
     var $module;
     var $massUpdateData = '';
 
+	/**
+	 * @param string $module
+	 */
 	function PopupSmarty($seed, $module){
 		parent::ListViewSmarty();
 		$this->th = new TemplateHandler();
@@ -108,6 +111,7 @@ 
      * @param file file Template file to use
      * @param data array from ListViewData
      * @param html_var string the corresponding html var in xtpl per row
+     * @param string $htmlVar
      *
      */
 	function process($file, $data, $htmlVar) {

include/language/getJSLanguage.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
     die('Not A Valid Entry Point');
 }
 /**
- * Retrieves the requested js language file, building it if it doesn't exist.
- */
+     * Retrieves the requested js language file, building it if it doesn't exist.
+     */
 function getJSLanguage()
 {
 

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/language/en_us.lang.php

Indentation +759 added lines, -759 removed lines

@@ -50,9 +50,9 @@ 
 //to translate, only modify the right value in each key/value pair
 $app_list_strings = array (
 //e.g. auf Deutsch 'Contacts'=>'Contakten',
-  'language_pack_name' => 'US English',
-  'moduleList' =>
-  array (
+    'language_pack_name' => 'US English',
+    'moduleList' =>
+    array (
     'Home' => 'Home',
     'Contacts' => 'Contacts',
     'Accounts' => 'Accounts',
@@ -106,14 +106,14 @@ 
     'Newsletters' => 'Newsletters',
     'SugarFeed'=>'SuiteCRM Feed',
     'KBDocuments' => 'Knowledge Base',
-  'SugarFavorites'=>'SuiteCRM Favorites',
+    'SugarFavorites'=>'SuiteCRM Favorites',
 
     'OAuthKeys' => 'OAuth Consumer Keys',
     'OAuthTokens' => 'OAuth Tokens',
-  ),
+    ),
 
-  'moduleListSingular' =>
-  array (
+    'moduleListSingular' =>
+    array (
     'Home' => 'Home',
     'Dashboard' => 'Dashboard',
     'Contacts' => 'Contact',
@@ -141,19 +141,19 @@ 
     'SugarFollowing'=>'SuiteCRM Following',
     'Sync'=>'Sync',
     'Users' => 'User',
-  'SugarFavorites'=>'SuiteCRM Favorites'
+    'SugarFavorites'=>'SuiteCRM Favorites'
 
         ),
 
-  'checkbox_dom'=> array(
+    'checkbox_dom'=> array(
     ''=>'',
     '1'=>'Yes',
     '2'=>'No',
-  ),
+    ),
 
-  //e.g. en fran�ais 'Analyst'=>'Analyste',
-  'account_type_dom' =>
-  array (
+    //e.g. en fran�ais 'Analyst'=>'Analyste',
+    'account_type_dom' =>
+    array (
     '' => '',
     'Analyst' => 'Analyst',
     'Competitor' => 'Competitor',
@@ -165,10 +165,10 @@ 
     'Prospect' => 'Prospect',
     'Reseller' => 'Reseller',
     'Other' => 'Other',
-  ),
-  //e.g. en espa�ol 'Apparel'=>'Ropa',
-  'industry_dom' =>
-  array (
+    ),
+    //e.g. en espa�ol 'Apparel'=>'Ropa',
+    'industry_dom' =>
+    array (
     '' => '',
     'Apparel' => 'Apparel',
     'Banking' => 'Banking',
@@ -200,10 +200,10 @@ 
     'Transportation' => 'Transportation',
     'Utilities' => 'Utilities',
     'Other' => 'Other',
-  ),
-  'lead_source_default_key' => 'Self Generated',
-  'lead_source_dom' =>
-  array (
+    ),
+    'lead_source_default_key' => 'Self Generated',
+    'lead_source_dom' =>
+    array (
     '' => '',
     'Cold Call' => 'Cold Call',
     'Existing Customer' => 'Existing Customer',
@@ -219,26 +219,26 @@ 
     'Email' => 'Email',
     'Campaign'=>'Campaign',
     'Other' => 'Other',
-  ),
-  'opportunity_type_dom' =>
-  array (
+    ),
+    'opportunity_type_dom' =>
+    array (
     '' => '',
     'Existing Business' => 'Existing Business',
     'New Business' => 'New Business',
-  ),
-  'roi_type_dom' =>
+    ),
+    'roi_type_dom' =>
     array (
     'Revenue' => 'Revenue',
     'Investment'=>'Investment',
     'Expected_Revenue'=>'Expected Revenue',
     'Budget'=>'Budget',
 
-  ),
-  //Note:  do not translate opportunity_relationship_type_default_key
+    ),
+    //Note:  do not translate opportunity_relationship_type_default_key
 //       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 (
+    'opportunity_relationship_type_default_key' => 'Primary Decision Maker',
+    'opportunity_relationship_type_dom' =>
+    array (
     '' => '',
     'Primary Decision Maker' => 'Primary Decision Maker',
     'Business Decision Maker' => 'Business Decision Maker',
@@ -248,29 +248,29 @@ 
     'Executive Sponsor' => 'Executive Sponsor',
     'Influencer' => 'Influencer',
     'Other' => 'Other',
-  ),
-  //Note:  do not translate case_relationship_type_default_key
+    ),
+    //Note:  do not translate case_relationship_type_default_key
 //       it is the key for the default case_relationship_type_dom value
-  'case_relationship_type_default_key' => 'Primary Contact',
-  'case_relationship_type_dom' =>
-  array (
+    'case_relationship_type_default_key' => 'Primary Contact',
+    'case_relationship_type_dom' =>
+    array (
     '' => '',
     'Primary Contact' => 'Primary Contact',
     'Alternate Contact' => 'Alternate Contact',
-  ),
-  'payment_terms' =>
-  array (
+    ),
+    'payment_terms' =>
+    array (
     '' => '',
     'Net 15' => 'Net 15',
     'Net 30' => 'Net 30',
-  ),
-  'sales_stage_default_key' => 'Prospecting',
-  'fts_type' => array (
-      '' => '',
-      'Elastic' => 'elasticsearch'
-  ),
-  'sales_stage_dom' =>
-  array (
+    ),
+    'sales_stage_default_key' => 'Prospecting',
+    'fts_type' => array (
+        '' => '',
+        'Elastic' => 'elasticsearch'
+    ),
+    'sales_stage_dom' =>
+    array (
     'Prospecting' => 'Prospecting',
     'Qualification' => 'Qualification',
     'Needs Analysis' => 'Needs Analysis',
@@ -281,8 +281,8 @@ 
     'Negotiation/Review' => 'Negotiation/Review',
     'Closed Won' => 'Closed Won',
     'Closed Lost' => 'Closed Lost',
-  ),
-  'in_total_group_stages' => array (
+    ),
+    'in_total_group_stages' => array (
     'Draft' => 'Draft',
     'Negotiation' => 'Negotiation',
     'Delivered' => 'Delivered',
@@ -291,9 +291,9 @@ 
     'Closed Accepted' => 'Closed Accepted',
     'Closed Lost' => 'Closed Lost',
     'Closed Dead' => 'Closed Dead',
-  ),
-  'sales_probability_dom' => // keys must be the same as sales_stage_dom
-  array (
+    ),
+    'sales_probability_dom' => // keys must be the same as sales_stage_dom
+    array (
     'Prospecting' => '10',
     'Qualification' => '20',
     'Needs Analysis' => '25',
@@ -304,85 +304,85 @@ 
     'Negotiation/Review' => '80',
     'Closed Won' => '100',
     'Closed Lost' => '0',
-  ),
-  'activity_dom' =>
-  array (
+    ),
+    'activity_dom' =>
+    array (
     'Call' => 'Call',
     'Meeting' => 'Meeting',
     'Task' => 'Task',
     'Email' => 'Email',
     'Note' => 'Note',
-  ),
-  'salutation_dom' =>
-      array (
+    ),
+    'salutation_dom' =>
+        array (
         '' => '',
         'Mr.' => 'Mr.',
         'Ms.' => 'Ms.',
         'Mrs.' => 'Mrs.',
         'Dr.' => 'Dr.',
         'Prof.' => 'Prof.',
-      ),
-  //time is in seconds; the greater the time the longer it takes;
-  'reminder_max_time' => 90000,
-  'reminder_time_options' => array( 60=> '1 minute prior',
-                                  300=> '5 minutes prior',
-                                  600=> '10 minutes prior',
-                                  900=> '15 minutes prior',
-                                  1800=> '30 minutes prior',
-                                  3600=> '1 hour prior',
-                                  7200 => '2 hours prior',
-                                  10800 => '3 hours prior',
-                                  18000 => '5 hours prior',
-                                  86400 => '1 day prior',
-                                 ),
-
-  'task_priority_default' => 'Medium',
-  'task_priority_dom' =>
-  array (
+        ),
+    //time is in seconds; the greater the time the longer it takes;
+    'reminder_max_time' => 90000,
+    'reminder_time_options' => array( 60=> '1 minute prior',
+                                    300=> '5 minutes prior',
+                                    600=> '10 minutes prior',
+                                    900=> '15 minutes prior',
+                                    1800=> '30 minutes prior',
+                                    3600=> '1 hour prior',
+                                    7200 => '2 hours prior',
+                                    10800 => '3 hours prior',
+                                    18000 => '5 hours prior',
+                                    86400 => '1 day prior',
+                                    ),
+
+    'task_priority_default' => 'Medium',
+    'task_priority_dom' =>
+    array (
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-  'task_status_default' => 'Not Started',
-  'task_status_dom' =>
-  array (
+    ),
+    'task_status_default' => 'Not Started',
+    'task_status_dom' =>
+    array (
     'Not Started' => 'Not Started',
     'In Progress' => 'In Progress',
     'Completed' => 'Completed',
     'Pending Input' => 'Pending Input',
     'Deferred' => 'Deferred',
-  ),
-  'meeting_status_default' => 'Planned',
-  'meeting_status_dom' =>
-  array (
+    ),
+    'meeting_status_default' => 'Planned',
+    'meeting_status_dom' =>
+    array (
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
-  ),
-  'extapi_meeting_password' =>
-  array (
-      'WebEx' => 'WebEx',
-  ),
-  'meeting_type_dom' =>
-   array (
-      'Other' => 'Other',
-      'Sugar' => 'SuiteCRM',
-   ),
-  'call_status_default' => 'Planned',
-  'call_status_dom' =>
-  array (
+    ),
+    'extapi_meeting_password' =>
+    array (
+        'WebEx' => 'WebEx',
+    ),
+    'meeting_type_dom' =>
+    array (
+        'Other' => 'Other',
+        'Sugar' => 'SuiteCRM',
+    ),
+    'call_status_default' => 'Planned',
+    'call_status_dom' =>
+    array (
     'Planned' => 'Planned',
     'Held' => 'Held',
     'Not Held' => 'Not Held',
-  ),
-  'call_direction_default' => 'Outbound',
-  'call_direction_dom' =>
-  array (
+    ),
+    'call_direction_default' => 'Outbound',
+    'call_direction_dom' =>
+    array (
     'Inbound' => 'Inbound',
     'Outbound' => 'Outbound',
-  ),
-  'lead_status_dom' =>
-  array (
+    ),
+    'lead_status_dom' =>
+    array (
     '' => '',
     'New' => 'New',
     'Assigned' => 'Assigned',
@@ -390,54 +390,54 @@ 
     'Converted' => 'Converted',
     'Recycled' => 'Recycled',
     'Dead' => 'Dead',
-  ),
-   'gender_list' =>
-  array (
+    ),
+    'gender_list' =>
+    array (
     'male' => 'Male',
     'female' => 'Female',
-  ),
-  //Note:  do not translate case_status_default_key
+    ),
+    //Note:  do not translate case_status_default_key
 //       it is the key for the default case_status_dom value
-  'case_status_default_key' => 'New',
-  'case_status_dom' =>
-  array (
+    'case_status_default_key' => 'New',
+    'case_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending Input' => 'Pending Input',
     'Rejected' => 'Rejected',
     'Duplicate' => 'Duplicate',
-  ),
-  'case_priority_default_key' => 'P2',
-  'case_priority_dom' =>
-  array (
+    ),
+    'case_priority_default_key' => 'P2',
+    'case_priority_dom' =>
+    array (
     'P1' => 'High',
     'P2' => 'Medium',
     'P3' => 'Low',
-  ),
-  'user_type_dom' =>
-  array (
+    ),
+    'user_type_dom' =>
+    array (
     'RegularUser' => 'Regular User',
     'Administrator' => 'Administrator',
-  ),
-  'user_status_dom' =>
-  array (
+    ),
+    'user_status_dom' =>
+    array (
     'Active' => 'Active',
     'Inactive' => 'Inactive',
-  ),
-  'employee_status_dom' =>
-  array (
+    ),
+    'employee_status_dom' =>
+    array (
     'Active' => 'Active',
     'Terminated' => 'Terminated',
     'Leave of Absence' => 'Leave of Absence',
-  ),
-  'messenger_type_dom' =>
-  array (
+    ),
+    'messenger_type_dom' =>
+    array (
     '' => '',
     'MSN' => 'MSN',
     'Yahoo!' => 'Yahoo!',
     'AOL' => 'AOL',
-  ),
+    ),
     'project_task_priority_options' => array (
         'High' => 'High',
         'Medium' => 'Medium',
@@ -480,11 +480,11 @@ 
         'Low' => 'Low',
     ),
     'project_priority_default' => 'Medium',
-  //Note:  do not translate record_type_default_key
+    //Note:  do not translate record_type_default_key
 //       it is the key for the default record_type_module value
-  'record_type_default_key' => 'Accounts',
-  'record_type_display' =>
-  array (
+    'record_type_default_key' => 'Accounts',
+    'record_type_display' =>
+    array (
     '' => '',
     'Accounts' => 'Account',
     'Opportunities' => 'Opportunity',
@@ -502,10 +502,10 @@ 
 
     'Tasks' => 'Task',
 
-  ),
+    ),
 
-  'record_type_display_notes' =>
-  array (
+    'record_type_display_notes' =>
+    array (
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Opportunities' => 'Opportunity',
@@ -521,10 +521,10 @@ 
 
     'Meetings' => 'Meeting',
     'Calls' => 'Call',
-  ),
+    ),
 
-  'parent_type_display' =>
-  array (
+    'parent_type_display' =>
+    array (
     'Accounts' => 'Account',
     'Contacts' => 'Contact',
     'Tasks' => 'Task',
@@ -541,48 +541,48 @@ 
 
     'Prospects' => 'Target',
 
-  ),
+    ),
 
-  'issue_priority_default_key' => 'Medium',
-  'issue_priority_dom' =>
-  array (
+    'issue_priority_default_key' => 'Medium',
+    'issue_priority_dom' =>
+    array (
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-  'issue_resolution_default_key' => '',
-  'issue_resolution_dom' =>
-  array (
+    ),
+    'issue_resolution_default_key' => '',
+    'issue_resolution_dom' =>
+    array (
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
     'Closed' => 'Closed',
     'Out of Date' => 'Out of Date',
     'Invalid' => 'Invalid',
-  ),
+    ),
 
-  'issue_status_default_key' => 'New',
-  'issue_status_dom' =>
-  array (
+    'issue_status_default_key' => 'New',
+    'issue_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending' => 'Pending',
     'Rejected' => 'Rejected',
-  ),
+    ),
 
-  'bug_priority_default_key' => 'Medium',
-  'bug_priority_dom' =>
-  array (
+    'bug_priority_default_key' => 'Medium',
+    'bug_priority_dom' =>
+    array (
     'Urgent' => 'Urgent',
     'High' => 'High',
     'Medium' => 'Medium',
     'Low' => 'Low',
-  ),
-   'bug_resolution_default_key' => '',
-  'bug_resolution_dom' =>
-  array (
+    ),
+    'bug_resolution_default_key' => '',
+    'bug_resolution_dom' =>
+    array (
     '' => '',
     'Accepted' => 'Accepted',
     'Duplicate' => 'Duplicate',
@@ -590,42 +590,42 @@ 
     'Out of Date' => 'Out of Date',
     'Invalid' => 'Invalid',
     'Later' => 'Later',
-  ),
-  'bug_status_default_key' => 'New',
-  'bug_status_dom' =>
-  array (
+    ),
+    'bug_status_default_key' => 'New',
+    'bug_status_dom' =>
+    array (
     'New' => 'New',
     'Assigned' => 'Assigned',
     'Closed' => 'Closed',
     'Pending' => 'Pending',
     'Rejected' => 'Rejected',
-  ),
-   'bug_type_default_key' => 'Bug',
-  'bug_type_dom' =>
-  array (
+    ),
+    'bug_type_default_key' => 'Bug',
+    'bug_type_dom' =>
+    array (
     'Defect' => 'Defect',
     'Feature' => 'Feature',
-  ),
- 'case_type_dom' =>
-  array (
+    ),
+    'case_type_dom' =>
+    array (
     'Administration' => 'Administration',
     'Product' => 'Product',
     'User' => 'User',
-  ),
+    ),
 
-  'source_default_key' => '',
-  'source_dom' =>
-  array (
+    'source_default_key' => '',
+    'source_dom' =>
+    array (
     '' => '',
     'Internal' => 'Internal',
     'Forum' => 'Forum',
     'Web' => 'Web',
     'InboundEmail' => 'Email'
-  ),
+    ),
 
-  'product_category_default_key' => '',
-  'product_category_dom' =>
-  array (
+    'product_category_default_key' => '',
+    'product_category_dom' =>
+    array (
     '' => '',
     'Accounts' => 'Accounts',
     'Activities' => 'Activities',
@@ -636,15 +636,15 @@ 
     'Cases' => 'Cases',
     'Contacts' => 'Contacts',
     'Currencies' => 'Currencies',
-  'Dashboard' => 'Dashboard',
-  'Documents' => 'Documents',
+    'Dashboard' => 'Dashboard',
+    'Documents' => 'Documents',
     'Emails' => 'Emails',
     'Feeds' => 'Feeds',
     'Forecasts' => 'Forecasts',
     'Help' => 'Help',
     'Home' => 'Home',
-  'Leads' => 'Leads',
-  'Meetings' => 'Meetings',
+    'Leads' => 'Leads',
+    'Meetings' => 'Meetings',
     'Notes' => 'Notes',
     'Opportunities' => 'Opportunities',
     'Outlook Plugin' => 'Outlook Plugin',
@@ -655,10 +655,10 @@ 
     'Studio' => 'Studio',
     'Upgrade' => 'Upgrade',
     'Users' => 'Users',
-  ),
-  /*Added entries 'Queued' and 'Sending' for 4.0 release..*/
-  'campaign_status_dom' =>
-  array (
+    ),
+    /*Added entries 'Queued' and 'Sending' for 4.0 release..*/
+    'campaign_status_dom' =>
+    array (
         '' => '',
         'Planning' => 'Planning',
         'Active' => 'Active',
@@ -666,9 +666,9 @@ 
         'Complete' => 'Complete',
         'In Queue' => 'In Queue',
         'Sending'=> 'Sending',
-  ),
-  'campaign_type_dom' =>
-  array (
+    ),
+    'campaign_type_dom' =>
+    array (
         '' => '',
         'Telesales' => 'Telesales',
         'Mail' => 'Mail',
@@ -680,8 +680,8 @@ 
         'NewsLetter' => 'Newsletter',
         ),
 
-  'newsletter_frequency_dom' =>
-  array (
+    'newsletter_frequency_dom' =>
+    array (
         '' => '',
         'Weekly' => 'Weekly',
         'Monthly' => 'Monthly',
@@ -689,11 +689,11 @@ 
         'Annually' => 'Annually',
         ),
 
-  'notifymail_sendtype' =>
-  array (
+    'notifymail_sendtype' =>
+    array (
     'SMTP' => 'SMTP',
-  ),
-      'dom_cal_month_long'=>array(
+    ),
+        'dom_cal_month_long'=>array(
                 '0'=>"",
                 '1'=>"January",
                 '2'=>"February",
@@ -748,8 +748,8 @@ 
                 'pm'=>"pm"
         ),
     'dom_meridiem_uppercase'=>array(
-                 'AM'=>'AM',
-                 'PM'=>'PM'
+                    'AM'=>'AM',
+                    'PM'=>'PM'
         ),
 
     'dom_report_types'=>array(
@@ -785,26 +785,26 @@ 
                                         'imap'      => 'IMAP',
     ),
     'dom_mailbox_type'      => array(/*''           => '--None Specified--',*/
-                                     'pick'     => '--None--',
-                                     'createcase'  => 'Create Case',
-                                     'bounce'   => 'Bounce Handling',
+                                        'pick'     => '--None--',
+                                        'createcase'  => 'Create Case',
+                                        'bounce'   => 'Bounce Handling',
     ),
     'dom_email_distribution'=> array(''             => '--None--',
-                                     'direct'       => 'Direct Assign',
-                                     'roundRobin'   => 'Round-Robin',
-                                     'leastBusy'    => 'Least-Busy',
+                                        'direct'       => 'Direct Assign',
+                                        'roundRobin'   => 'Round-Robin',
+                                        'leastBusy'    => 'Least-Busy',
     ),
     'dom_email_distribution_for_auto_create'=> array('roundRobin'   => 'Round-Robin',
-                                                     'leastBusy'    => 'Least-Busy',
+                                                        'leastBusy'    => 'Least-Busy',
     ),
     'dom_email_errors'      => array(1 => 'Only select one user when Direct Assigning items.',
-                                     2 => 'You must assign Only Checked Items when Direct Assigning items.',
+                                        2 => 'You must assign Only Checked Items when Direct Assigning items.',
     ),
     'dom_email_bool'        => array('bool_true' => 'Yes',
-                                     'bool_false' => 'No',
+                                        'bool_false' => 'No',
     ),
     'dom_int_bool'          => array(1 => 'Yes',
-                                     0 => 'No',
+                                        0 => 'No',
     ),
     'dom_switch_bool'       => array ('on' => 'Yes',
                                         'off' => 'No',
@@ -841,19 +841,19 @@ 
     array (
     'Active' => 'Active',
     'Inactive' => 'Inactive',
-  ),
+    ),
     'forecast_type_dom' =>
     array (
     'Direct' => 'Direct',
     'Rollup' => 'Rollup',
-  ),
+    ),
     'document_category_dom' =>
     array (
     '' => '',
     'Marketing' => 'Marketing',
     'Knowledege Base' => 'Knowledge Base',
     'Sales' => 'Sales',
-  ),
+    ),
 
     'document_subcategory_dom' =>
     array (
@@ -861,7 +861,7 @@ 
     'Marketing Collateral' => 'Marketing Collateral',
     'Product Brochures' => 'Product Brochures',
     'FAQ' => 'FAQ',
-  ),
+    ),
 
     'document_status_dom' =>
     array (
@@ -871,39 +871,39 @@ 
     'Expired' => 'Expired',
     'Under Review' => 'Under Review',
     'Pending' => 'Pending',
-  ),
-  'document_template_type_dom' =>
-  array(
+    ),
+    'document_template_type_dom' =>
+    array(
     ''=>'',
     'mailmerge'=>'Mail Merge',
     'eula'=>'EULA',
     'nda'=>'NDA',
     'license'=>'License Agreement',
-  ),
+    ),
     'dom_meeting_accept_options' =>
     array (
     'accept' => 'Accept',
     'decline' => 'Decline',
     'tentative' => 'Tentative',
-  ),
+    ),
     'dom_meeting_accept_status' =>
     array (
     'accept' => 'Accepted',
     'decline' => 'Declined',
     'tentative' => 'Tentative',
     'none'      => 'None',
-  ),
+    ),
     'duration_intervals' => array('0'=>'00',
                                     '15'=>'15',
                                     '30'=>'30',
                                     '45'=>'45',
-  ),
+    ),
     'repeat_type_dom' => array(
-    	'' => 'None',
-    	'Daily'	=> 'Daily',
-	'Weekly' => 'Weekly',
-	'Monthly' => 'Monthly',
-	'Yearly' => 'Yearly',
+        '' => 'None',
+        'Daily'	=> 'Daily',
+    'Weekly' => 'Weekly',
+    'Monthly' => 'Monthly',
+    'Yearly' => 'Yearly',
     ),
 
     'repeat_intervals' => array(
@@ -915,19 +915,19 @@ 
     ),
 
     'duration_dom' => array(
-    	'' => 'None',
-    	'900' => '15 minutes',
-	'1800' => '30 minutes',
-	'2700' => '45 minutes',
-	'3600' => '1 hour',
-	'5400' => '1.5 hours',
-	'7200' => '2 hours',
-	'10800' => '3 hours',
-	'21600' => '6 hours',
-	'86400' => '1 day',
-	'172800' => '2 days',
-	'259200' => '3 days',
-	'604800' => '1 week',
+        '' => 'None',
+        '900' => '15 minutes',
+    '1800' => '30 minutes',
+    '2700' => '45 minutes',
+    '3600' => '1 hour',
+    '5400' => '1.5 hours',
+    '7200' => '2 hours',
+    '10800' => '3 hours',
+    '21600' => '6 hours',
+    '86400' => '1 day',
+    '172800' => '2 days',
+    '259200' => '3 days',
+    '604800' => '1 week',
     ),
 
 // deferred
@@ -938,31 +938,31 @@ 
 ),
 */
 //prospect list type dom
-  'prospect_list_type_dom' =>
-  array (
+    'prospect_list_type_dom' =>
+    array (
     'default' => 'Default',
     'seed' => 'Seed',
     'exempt_domain' => 'Suppression List - By Domain',
     'exempt_address' => 'Suppression List - By Email Address',
     'exempt' => 'Suppression List - By Id',
     'test' => 'Test',
-  ),
+    ),
 
-  'email_settings_num_dom' =>
-  array(
+    'email_settings_num_dom' =>
+    array(
         '10'    => '10',
         '20'    => '20',
         '50'    => '50'
     ),
-  'email_marketing_status_dom' =>
-  array (
+    'email_marketing_status_dom' =>
+    array (
     '' => '',
     'active'=>'Active',
     'inactive'=>'Inactive'
-  ),
+    ),
 
-  'campainglog_activity_type_dom' =>
-  array (
+    'campainglog_activity_type_dom' =>
+    array (
     ''=>'',
     'targeted' => 'Message Sent/Attempted',
     'send error'=>'Bounced Messages,Other',
@@ -973,27 +973,27 @@ 
     'lead'=>'Leads Created',
     'contact'=>'Contacts Created',
     'blocked'=>'Suppressed by address or domain',
-  ),
+    ),
 
-  'campainglog_target_type_dom' =>
-  array (
+    'campainglog_target_type_dom' =>
+    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 (
         '0' =>'Disabled',
@@ -1002,15 +1002,15 @@ 
         '3'=>'High Boost',
     ),
 
-  'custom_fields_merge_dup_dom'=> array (
+    'custom_fields_merge_dup_dom'=> array (
         0=>'Disabled',
         1=>'Enabled',
-  ),
+    ),
 
-  'navigation_paradigms' => array(
+    'navigation_paradigms' => array(
         'm'=>'Modules',
         'gm'=>'Grouped Modules',
-  ),
+    ),
 
 
     'projects_priority_options' => array (
@@ -1083,7 +1083,7 @@ 
         '300'   => 'Every 5 minutes',
         '600'   => 'Every 10 minutes',
     ),
-  'dashlet_auto_refresh_options_admin' =>
+    'dashlet_auto_refresh_options_admin' =>
     array (
         '-1'  => 'Never',
         '30'  => 'Every 30 seconds',
@@ -1092,8 +1092,8 @@ 
         '300'   => 'Every 5 minutes',
         '600'   => 'Every 10 minutes',
     ),
-  'date_range_search_dom' =>
-  array(
+    'date_range_search_dom' =>
+    array(
     '=' => 'Equals',
     'not_equal' => 'Not On',
     'greater_than' => 'After',
@@ -1109,9 +1109,9 @@ 
     'this_year' => 'This Year',
     'next_year' => 'Next Year',
     'between' => 'Is Between',
-  ),
-  'numeric_range_search_dom' =>
-  array(
+    ),
+    'numeric_range_search_dom' =>
+    array(
     '=' => 'Equals',
     'not_equal' => 'Does Not Equal',
     'greater_than' => 'Greater Than',
@@ -1119,46 +1119,46 @@ 
     'less_than' => 'Less Than',
     'less_than_equals' => 'Less Than Or Equal To',
     'between' => 'Is Between',
-  ),
-  'lead_conv_activity_opt' =>
-  array(
+    ),
+    'lead_conv_activity_opt' =>
+    array(
         'copy' => 'Copy',
         'move' => 'Move',
         'donothing' => 'Do Nothing',
-  ),
+    ),
 );
 
 $app_strings = array (
-  'LBL_TOUR_NEXT' => 'Next',
-  'LBL_TOUR_SKIP' => 'Skip',
-  'LBL_TOUR_BACK' => 'Back',
-  'LBL_TOUR_CLOSE' => 'Close',
-  'LBL_TOUR_TAKE_TOUR' => 'Take the tour',
-  'LBL_MY_AREA_LINKS' => 'My area links: ' /*for 508 compliance fix*/,
-  'LBL_GETTINGAIR' => 'Getting Air' /*for 508 compliance fix*/,
-  'LBL_WELCOMEBAR' => 'Welcome' /*for 508 compliance fix*/,
-  'LBL_ADVANCEDSEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
-  'LBL_MOREDETAIL' => 'More Detail' /*for 508 compliance fix*/,
-  'LBL_EDIT_INLINE' => 'Edit Inline' /*for 508 compliance fix*/,
-  'LBL_VIEW_INLINE' => 'View' /*for 508 compliance fix*/,
-  'LBL_BASIC_SEARCH' => 'Search' /*for 508 compliance fix*/,
-  'LBL_PROJECT_MINUS' => 'Remove' /*for 508 compliance fix*/,
-  'LBL_PROJECT_PLUS' => 'Add' /*for 508 compliance fix*/,
-  'LBL_Blank' => ' ' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_1' => 'Column' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_2' => '2 Columns' /*for 508 compliance fix*/,
-  'LBL_ICON_COLUMN_3' => '3 Columns' /*for 508 compliance fix*/,
-  'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
-  'LBL_ID_FF_ADD' => 'Add' /*for 508 compliance fix*/,
-  'LBL_HIDE_SHOW' => 'Hide/Show' /*for 508 compliance fix*/,
-  'LBL_DELETE_INLINE' => 'Delete' /*for 508 compliance fix*/,
-  'LBL_PLUS_INLINE' => 'Add' /*for 508 compliance fix*/,
-  'LBL_ID_FF_CLEAR' => 'Clear' /*for 508 compliance fix*/,
-  'LBL_ID_FF_VCARD' => 'vCard' /*for 508 compliance fix*/,
-  'LBL_ID_FF_REMOVE' => 'Remove' /*for 508 compliance fix*/,
-  'LBL_ADD' => 'Add' /*for 508 compliance fix*/,
-  'LBL_COMPANY_LOGO' => 'Company logo' /*for 508 compliance fix*/,
-  'LBL_JS_CALENDAR' => 'Calendar' /*for 508 compliance fix*/,
+    'LBL_TOUR_NEXT' => 'Next',
+    'LBL_TOUR_SKIP' => 'Skip',
+    'LBL_TOUR_BACK' => 'Back',
+    'LBL_TOUR_CLOSE' => 'Close',
+    'LBL_TOUR_TAKE_TOUR' => 'Take the tour',
+    'LBL_MY_AREA_LINKS' => 'My area links: ' /*for 508 compliance fix*/,
+    'LBL_GETTINGAIR' => 'Getting Air' /*for 508 compliance fix*/,
+    'LBL_WELCOMEBAR' => 'Welcome' /*for 508 compliance fix*/,
+    'LBL_ADVANCEDSEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_MOREDETAIL' => 'More Detail' /*for 508 compliance fix*/,
+    'LBL_EDIT_INLINE' => 'Edit Inline' /*for 508 compliance fix*/,
+    'LBL_VIEW_INLINE' => 'View' /*for 508 compliance fix*/,
+    'LBL_BASIC_SEARCH' => 'Search' /*for 508 compliance fix*/,
+    'LBL_PROJECT_MINUS' => 'Remove' /*for 508 compliance fix*/,
+    'LBL_PROJECT_PLUS' => 'Add' /*for 508 compliance fix*/,
+    'LBL_Blank' => ' ' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_1' => 'Column' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_2' => '2 Columns' /*for 508 compliance fix*/,
+    'LBL_ICON_COLUMN_3' => '3 Columns' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_ID_FF_ADD' => 'Add' /*for 508 compliance fix*/,
+    'LBL_HIDE_SHOW' => 'Hide/Show' /*for 508 compliance fix*/,
+    'LBL_DELETE_INLINE' => 'Delete' /*for 508 compliance fix*/,
+    'LBL_PLUS_INLINE' => 'Add' /*for 508 compliance fix*/,
+    'LBL_ID_FF_CLEAR' => 'Clear' /*for 508 compliance fix*/,
+    'LBL_ID_FF_VCARD' => 'vCard' /*for 508 compliance fix*/,
+    'LBL_ID_FF_REMOVE' => 'Remove' /*for 508 compliance fix*/,
+    'LBL_ADD' => 'Add' /*for 508 compliance fix*/,
+    'LBL_COMPANY_LOGO' => 'Company logo' /*for 508 compliance fix*/,
+    'LBL_JS_CALENDAR' => 'Calendar' /*for 508 compliance fix*/,
     'LBL_ADVANCED' => 'Advanced',
     'LBL_BASIC' => 'Basic',
     'LBL_MODULE_FILTER' => 'Filter By',
@@ -1228,8 +1228,8 @@ 
     'LBL_ROUTING_TO'                        => 'to',
     'LBL_ROUTING_TO_ADDRESS'                => 'to address',
     'LBL_ROUTING_WITH_TEMPLATE'             => 'with template',
-  'NTC_OVERWRITE_ADDRESS_PHONE_CONFIRM' => 'This record currently contains values in the Office Phone and Address fields. To overwrite these values with the following Office Phone and Address of the Account that you selected, click "OK". To keep the current values, click "Cancel".',
-  'LBL_DROP_HERE' => '[Drop Here]',
+    'NTC_OVERWRITE_ADDRESS_PHONE_CONFIRM' => 'This record currently contains values in the Office Phone and Address fields. To overwrite these values with the following Office Phone and Address of the Account that you selected, click "OK". To keep the current values, click "Cancel".',
+    'LBL_DROP_HERE' => '[Drop Here]',
     'LBL_EMAIL_ACCOUNTS_EDIT'               => 'Edit',
     'LBL_EMAIL_ACCOUNTS_GMAIL_DEFAULTS'     => 'Prefill Gmail™ Defaults',
     'LBL_EMAIL_ACCOUNTS_NAME'               => 'Name',
@@ -1247,8 +1247,8 @@ 
     'LBL_EMAIL_ACCOUNTS_SMTPPASS_REQD'      => 'SMTP Password is required',
     'LBL_EMAIL_ACCOUNTS_TITLE'              => 'Mail Account Management',
     'LBL_EMAIL_POP3_REMOVE_MESSAGE'     => 'Mail Server Protocol of type POP3 will not be supported in the next release. Only IMAP will be supported.',
-  'LBL_EMAIL_ACCOUNTS_SUBTITLE'           => 'Set up Mail Accounts to view incoming emails from your email accounts.',
-  'LBL_EMAIL_ACCOUNTS_OUTBOUND_SUBTITLE'  => 'Provide SMTP mail server information to use for outgoing email in Mail Accounts.',
+    'LBL_EMAIL_ACCOUNTS_SUBTITLE'           => 'Set up Mail Accounts to view incoming emails from your email accounts.',
+    'LBL_EMAIL_ACCOUNTS_OUTBOUND_SUBTITLE'  => 'Provide SMTP mail server information to use for outgoing email in Mail Accounts.',
     'LBL_EMAIL_ADD'                         => 'Add Address',
 
     'LBL_EMAIL_ADDRESS_BOOK_ADD'            => 'Done',
@@ -1318,7 +1318,7 @@ 
     'LBL_EMAIL_MULT_GROUP_FOLDER_ACCOUNTS'  => 'Multiple',
     'LBL_EMAIL_MULT_GROUP_FOLDER_ACCOUNTS_EMPTY' => 'Empty',
     'LBL_EMAIL_DATE_SENT_BY_SENDER'         => 'Date Sent by Sender',
-  'LBL_EMAIL_DATE_RECEIVED'               => 'Date Received',
+    'LBL_EMAIL_DATE_RECEIVED'               => 'Date Received',
     'LBL_EMAIL_ASSIGNED_TO_USER'            => 'Assigned to User',
     'LBL_EMAIL_DATE_TODAY'                  => 'Today',
     'LBL_EMAIL_DATE_YESTERDAY'              => 'Yesterday',
@@ -1563,17 +1563,17 @@ 
     'LBL_EMAIL_SETTINGS_TOGGLE_ADV'         => 'Show Advanced',
     'LBL_EMAIL_SETTINGS_USER_FOLDERS'       => 'Available User Folders',
     'LBL_EMAIL_ERROR_PREPEND'               => 'Error:',
-  'LBL_EMAIL_INVALID_PERSONAL_OUTBOUND' => 'The outbound mail server selected for the mail account you are using is invalid.  Check the settings or select a different mail server for the mail account.',
-  'LBL_EMAIL_INVALID_SYSTEM_OUTBOUND' => 'An outgoing mail server is not configured to send emails. Please configure an outgoing mail server or select an outgoing mail server for the mail account that you are using in Settings >> Mail Account.',
+    'LBL_EMAIL_INVALID_PERSONAL_OUTBOUND' => 'The outbound mail server selected for the mail account you are using is invalid.  Check the settings or select a different mail server for the mail account.',
+    'LBL_EMAIL_INVALID_SYSTEM_OUTBOUND' => 'An outgoing mail server is not configured to send emails. Please configure an outgoing mail server or select an outgoing mail server for the mail account that you are using in Settings >> Mail Account.',
     'LBL_EMAIL_SHOW_READ'                   => 'Show All',
     'LBL_EMAIL_SHOW_UNREAD_ONLY'            => 'Show Unread Only',
     'LBL_EMAIL_SIGNATURES'                  => 'Signatures',
     'LBL_EMAIL_SIGNATURE_CREATE'            => 'Create Signature',
     'LBL_EMAIL_SIGNATURE_NAME'              => 'Signature Name',
     'LBL_EMAIL_SIGNATURE_TEXT'              => 'Signature Body',
-  'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
-  'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
-  'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
+    'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
+    'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
+    'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
     'LBL_SMTPTYPE_OTHER'                  => 'Other',
     'LBL_EMAIL_SPACER_MAIL_SERVER'          => '[ Remote Folders ]',
     'LBL_EMAIL_SPACER_LOCAL_FOLDER'         => '[ SuiteCRM Folders ]',
@@ -1880,8 +1880,8 @@ 
     'LBL_PRIMARY_ADDRESS_STREET' => 'Primary Address Street:',
     'LBL_PRIMARY_ADDRESS' => 'Primary Address:',
 
-	'LBL_BILLING_STREET'=> 'Street:',
-	'LBL_SHIPPING_STREET'=> 'Street:',
+    'LBL_BILLING_STREET'=> 'Street:',
+    'LBL_SHIPPING_STREET'=> 'Street:',
 
     'LBL_PROSPECTS'=>'Prospects',
     'LBL_PRODUCT_BUNDLES'=>'Product Bundles',
@@ -2151,16 +2151,16 @@ 
     'MSG_JS_ALERT_MTG_REMINDER_STATUS' => 'Status: ',
     'MSG_JS_ALERT_MTG_REMINDER_RELATED_TO' => 'Related To: ',
     'MSG_JS_ALERT_MTG_REMINDER_CALL_MSG' => "\nClick OK to view this call or click Cancel to dismiss this message.",
-  	'MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG' => "\nClick OK to view this meeting or click Cancel to dismiss this message.",
-	'MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME' => 'Event',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION' => '',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION' => 'Location isn\'t set.',
-	'MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE' => 'Start date isn\'t defined.',
- 	'MSG_LIST_VIEW_NO_RESULTS_BASIC' => "No results found.",
-	'MSG_LIST_VIEW_NO_RESULTS' => "No results found for <item1>",
- 	'MSG_LIST_VIEW_NO_RESULTS_SUBMSG' => "Create <item1> as a new <item2>",
-	'MSG_EMPTY_LIST_VIEW_NO_RESULTS' => "You currently have no records saved. <item2> or <item3> one now.",
-	'MSG_EMPTY_LIST_VIEW_NO_RESULTS_SUBMSG' =>	"<item4> to learn more about the <item1> module. In order to access more information, use the user menu drop down located on the main navigation bar to access Help.",
+        'MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG' => "\nClick OK to view this meeting or click Cancel to dismiss this message.",
+    'MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME' => 'Event',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION' => '',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION' => 'Location isn\'t set.',
+    'MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE' => 'Start date isn\'t defined.',
+        'MSG_LIST_VIEW_NO_RESULTS_BASIC' => "No results found.",
+    'MSG_LIST_VIEW_NO_RESULTS' => "No results found for <item1>",
+        'MSG_LIST_VIEW_NO_RESULTS_SUBMSG' => "Create <item1> as a new <item2>",
+    'MSG_EMPTY_LIST_VIEW_NO_RESULTS' => "You currently have no records saved. <item2> or <item3> one now.",
+    'MSG_EMPTY_LIST_VIEW_NO_RESULTS_SUBMSG' =>	"<item4> to learn more about the <item1> module. In order to access more information, use the user menu drop down located on the main navigation bar to access Help.",
 
     'LBL_CLICK_HERE' => "Click here",
     // contextMenu strings
@@ -2187,13 +2187,13 @@ 
     'LBL_TRAINING' => 'Support',
     'ERR_DATABASE_CONN_DROPPED'=>'Error executing a query. Possibly, your database dropped the connection. Please refresh this page, you may need to restart you web server.',
     'ERR_MSSQL_DB_CONTEXT' =>'Changed database context to',
-  'ERR_MSSQL_WARNING' =>'Warning:',
+    'ERR_MSSQL_WARNING' =>'Warning:',
 
     //Meta-Data framework
     'ERR_MISSING_VARDEF_NAME' => 'Warning: field [[field]] does not have a mapped entry in [moduleDir] vardefs.php file',
     'ERR_CANNOT_CREATE_METADATA_FILE' => 'Error: File [[file]] is missing.  Unable to create because no corresponding HTML file was found.',
-  'ERR_CANNOT_FIND_MODULE' => 'Error: Module [module] does not exist.',
-  'LBL_ALT_ADDRESS' => 'Other Address:',
+    'ERR_CANNOT_FIND_MODULE' => 'Error: Module [module] does not exist.',
+    'LBL_ALT_ADDRESS' => 'Other Address:',
     'ERR_SMARTY_UNEQUAL_RELATED_FIELD_PARAMETERS' => 'Error: There are an unequal number of arguments for the \'key\' and \'copy\' elements in the displayParams array.',
     'ERR_SMARTY_MISSING_DISPLAY_PARAMS' => 'Missing index in displayParams Array for: ',
 
@@ -2284,10 +2284,10 @@ 
 
     //jc:#12287 - For javascript validation messages
     'MSG_IS_NOT_BEFORE' => 'is not before',
-  'MSG_IS_MORE_THAN' => 'is more than',
-  'MSG_IS_LESS_THAN' => 'is less than',
-  'MSG_SHOULD_BE' => 'should be',
-  'MSG_OR_GREATER' => 'or greater',
+    'MSG_IS_MORE_THAN' => 'is more than',
+    'MSG_IS_LESS_THAN' => 'is less than',
+    'MSG_SHOULD_BE' => 'should be',
+    'MSG_OR_GREATER' => 'or greater',
 
     'LBL_PORTAL_WELCOME_TITLE' => 'Welcome to SuiteCRM Portal',
     'LBL_PORTAL_WELCOME_INFO' => 'SuiteCRM Portal is a framework which provides real-time view of cases, bugs & newsletters etc to customers. This is an external facing interface to SuiteCRM that can be deployed within any website.',
@@ -2319,13 +2319,13 @@ 
     'LBL_OPERATOR_NOT_IN_TEXT' => 'is not one of the following:',
 
 
-  //Connector
+    //Connector
     'ERR_CONNECTOR_FILL_BEANS_SIZE_MISMATCH' => 'Error: The Array count of the bean parameter does not match the Array count of the results.',
-  'ERR_MISSING_MAPPING_ENTRY_FORM_MODULE' => 'Error: Missing mapping entry for module.',
-  'ERROR_UNABLE_TO_RETRIEVE_DATA' => 'Error: Unable to retrieve data for {0} Connector.  The service may currently be inaccessible or the configuration settings may be invalid.  Connector error message: ({1}).',
-  'LBL_MERGE_CONNECTORS' => 'Get Data',
-  'LBL_MERGE_CONNECTORS_BUTTON_KEY' => '[D]',
-  'LBL_REMOVE_MODULE_ENTRY' => 'Are you sure you want to disable connector integration for this module?',
+    'ERR_MISSING_MAPPING_ENTRY_FORM_MODULE' => 'Error: Missing mapping entry for module.',
+    'ERROR_UNABLE_TO_RETRIEVE_DATA' => 'Error: Unable to retrieve data for {0} Connector.  The service may currently be inaccessible or the configuration settings may be invalid.  Connector error message: ({1}).',
+    'LBL_MERGE_CONNECTORS' => 'Get Data',
+    'LBL_MERGE_CONNECTORS_BUTTON_KEY' => '[D]',
+    'LBL_REMOVE_MODULE_ENTRY' => 'Are you sure you want to disable connector integration for this module?',
 
     // fastcgi checks
     'LBL_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
@@ -2336,28 +2336,28 @@ 
 
     //martin #25548
     'LBL_NO_FLASH_PLAYER' => 'You either have Abobe Flash turned off or are using an older version of the Adobe Flash Player. To get the latest version of the Flash Player, <a href="http://www.adobe.com/go/getflashplayer/">click here</a>.',
-  //Collection Field
-  'LBL_COLLECTION_NAME' => 'Name',
-  'LBL_COLLECTION_PRIMARY' => 'Primary',
-  'ERROR_MISSING_COLLECTION_SELECTION' => 'Empty required field',
+    //Collection Field
+    'LBL_COLLECTION_NAME' => 'Name',
+    'LBL_COLLECTION_PRIMARY' => 'Primary',
+    'ERROR_MISSING_COLLECTION_SELECTION' => 'Empty required field',
     'LBL_COLLECTION_EXACT' => 'Exact',
 
     //MB -Fixed Bug #32812 -Max
     'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
     'LBL_DESCRIPTION' => 'Description',
 
-  'LBL_YESTERDAY'=> 'yesterday',
-  'LBL_TODAY'=>'today',
-  'LBL_TOMORROW'=>'tomorrow',
-  'LBL_NEXT_WEEK'=> 'next week',
-  'LBL_NEXT_MONDAY'=>'next monday',
-  'LBL_NEXT_FRIDAY'=>'next friday',
-  'LBL_TWO_WEEKS'=> 'two weeks',
-  'LBL_NEXT_MONTH'=> 'next month',
-  'LBL_FIRST_DAY_OF_NEXT_MONTH'=> 'first day of next month',
-  'LBL_THREE_MONTHS'=> 'three months',
-  'LBL_SIXMONTHS'=> 'six months',
-  'LBL_NEXT_YEAR'=> 'next year',
+    'LBL_YESTERDAY'=> 'yesterday',
+    'LBL_TODAY'=>'today',
+    'LBL_TOMORROW'=>'tomorrow',
+    'LBL_NEXT_WEEK'=> 'next week',
+    'LBL_NEXT_MONDAY'=>'next monday',
+    'LBL_NEXT_FRIDAY'=>'next friday',
+    'LBL_TWO_WEEKS'=> 'two weeks',
+    'LBL_NEXT_MONTH'=> 'next month',
+    'LBL_FIRST_DAY_OF_NEXT_MONTH'=> 'first day of next month',
+    'LBL_THREE_MONTHS'=> 'three months',
+    'LBL_SIXMONTHS'=> 'six months',
+    'LBL_NEXT_YEAR'=> 'next year',
     'LBL_FILTERED' => 'Filtered',
 
     //Datetimecombo fields
@@ -2384,7 +2384,7 @@ 
 
     //File write error label
     'ERR_FILE_WRITE' => 'Error: Could not write file {0}.  Please check system and web server permissions.',
-  'ERR_FILE_NOT_FOUND' => 'Error: Could not load file {0}.  Please check system and web server permissions.',
+    'ERR_FILE_NOT_FOUND' => 'Error: Could not load file {0}.  Please check system and web server permissions.',
 
     'LBL_AND' => 'And',
     'LBL_BEFORE' => 'Before',
@@ -2456,7 +2456,7 @@ 
     'LBL_ALT_MOVE_COLUMN_UP' =>'Move selected entry up in the displayed list order',
     'LBL_ALT_MOVE_COLUMN_DOWN' => 'Move selected entry down in the displayed list order',
     'LBL_ALT_INFO' => 'Information',
-	'MSG_DUPLICATE' => 'The {0} record you are about to create might be a duplicate of an {0} record that already exists. {1} records containing similar names are listed below.<br>Click Create {1} to continue creating this new {0}, or select an existing {0} listed below.',
+    'MSG_DUPLICATE' => 'The {0} record you are about to create might be a duplicate of an {0} record that already exists. {1} records containing similar names are listed below.<br>Click Create {1} to continue creating this new {0}, or select an existing {0} listed below.',
     'MSG_SHOW_DUPLICATES' => 'The {0} record you are about to create might be a duplicate of a {0} record that already exists. {1} records containing similar names are listed below.  Click Save to continue creating this new {0}, or click Cancel to return to the module without creating the {0}.',
     'LBL_EMAIL_TITLE' => 'email address',
     'LBL_EMAIL_OPT_TITLE' => 'opted out email address',
@@ -2532,9 +2532,9 @@ 
     'Expired' => 'Expired',
     'In Review' => 'In Review',
     'Published' => 'Published',
-  );
+    );
 
-   $app_list_strings['kbadmin_actions_dom'] =
+    $app_list_strings['kbadmin_actions_dom'] =
     array (
     ''          => '--Admin Actions--',
     'Create New Tag' => 'Create New Tag',
@@ -2543,10 +2543,10 @@ 
     'Move Selected Articles'=>'Move Selected Articles',
     'Apply Tags On Articles'=>'Apply Tags To Articles',
     'Delete Selected Articles'=>'Delete Selected Articles',
-  );
+    );
 
 
-  $app_list_strings['kbdocument_attachment_option_dom'] =
+    $app_list_strings['kbdocument_attachment_option_dom'] =
     array(
         ''=>'',
         'some' => 'Has Attachments',
@@ -2555,10 +2555,10 @@ 
         'name' => 'Specify Name',
     );
 
-  $app_list_strings['moduleList']['KBDocuments'] = 'Knowledge Base';
-  $app_strings['LBL_CREATE_KB_DOCUMENT'] = 'Create Article';
-  $app_list_strings['kbdocument_viewing_frequency_dom'] =
-  array(
+    $app_list_strings['moduleList']['KBDocuments'] = 'Knowledge Base';
+    $app_strings['LBL_CREATE_KB_DOCUMENT'] = 'Create Article';
+    $app_list_strings['kbdocument_viewing_frequency_dom'] =
+    array(
     ''=>'',
     'Top_5'  => 'Top 5',
     'Top_10' => 'Top 10',
@@ -2566,9 +2566,9 @@ 
     'Bot_5'  => 'Bottom 5',
     'Bot_10' => 'Bottom 10',
     'Bot_20' => 'Bottom 20',
-  );
+    );
 
-   $app_list_strings['kbdocument_canned_search'] =
+    $app_list_strings['kbdocument_canned_search'] =
     array(
         'all'=>'All',
         'added' => 'Added Last 30 days',
@@ -2835,7 +2835,7 @@ 
         'ZIMBABWE' => 'ZIMBABWE',
     );
 
-  $app_list_strings['charset_dom'] = array(
+    $app_list_strings['charset_dom'] = array(
     'BIG-5'     => 'BIG-5 (Taiwan and Hong Kong)',
     /*'CP866'     => 'CP866', // ms-dos Cyrillic */
     /*'CP949'     => 'CP949 (Microsoft Korean)', */
@@ -2864,389 +2864,389 @@ 
     'KOI8-U'    => 'KOI8-U (Cyrillic Ukranian)',
     'SJIS'      => 'SJIS (MS Japanese)',
     'UTF-8'     => 'UTF-8',
-  );
-
-  $app_list_strings['timezone_dom'] = array(
-
-  'Africa/Algiers' => 'Africa/Algiers',
-  'Africa/Luanda' => 'Africa/Luanda',
-  'Africa/Porto-Novo' => 'Africa/Porto-Novo',
-  'Africa/Gaborone' => 'Africa/Gaborone',
-  'Africa/Ouagadougou' => 'Africa/Ouagadougou',
-  'Africa/Bujumbura' => 'Africa/Bujumbura',
-  'Africa/Douala' => 'Africa/Douala',
-  'Atlantic/Cape_Verde' => 'Atlantic/Cape_Verde',
-  'Africa/Bangui' => 'Africa/Bangui',
-  'Africa/Ndjamena' => 'Africa/Ndjamena',
-  'Indian/Comoro' => 'Indian/Comoro',
-  'Africa/Kinshasa' => 'Africa/Kinshasa',
-  'Africa/Lubumbashi' => 'Africa/Lubumbashi',
-  'Africa/Brazzaville' => 'Africa/Brazzaville',
-  'Africa/Abidjan' => 'Africa/Abidjan',
-  'Africa/Djibouti' => 'Africa/Djibouti',
-  'Africa/Cairo' => 'Africa/Cairo',
-  'Africa/Malabo' => 'Africa/Malabo',
-  'Africa/Asmera' => 'Africa/Asmera',
-  'Africa/Addis_Ababa' => 'Africa/Addis_Ababa',
-  'Africa/Libreville' => 'Africa/Libreville',
-  'Africa/Banjul' => 'Africa/Banjul',
-  'Africa/Accra' => 'Africa/Accra',
-  'Africa/Conakry' => 'Africa/Conakry',
-  'Africa/Bissau' => 'Africa/Bissau',
-  'Africa/Nairobi' => 'Africa/Nairobi',
-  'Africa/Maseru' => 'Africa/Maseru',
-  'Africa/Monrovia' => 'Africa/Monrovia',
-  'Africa/Tripoli' => 'Africa/Tripoli',
-  'Indian/Antananarivo' => 'Indian/Antananarivo',
-  'Africa/Blantyre' => 'Africa/Blantyre',
-  'Africa/Bamako' => 'Africa/Bamako',
-  'Africa/Nouakchott' => 'Africa/Nouakchott',
-  'Indian/Mauritius' => 'Indian/Mauritius',
-  'Indian/Mayotte' => 'Indian/Mayotte',
-  'Africa/Casablanca' => 'Africa/Casablanca',
-  'Africa/El_Aaiun' => 'Africa/El_Aaiun',
-  'Africa/Maputo' => 'Africa/Maputo',
-  'Africa/Windhoek' => 'Africa/Windhoek',
-  'Africa/Niamey' => 'Africa/Niamey',
-  'Africa/Lagos' => 'Africa/Lagos',
-  'Indian/Reunion' => 'Indian/Reunion',
-  'Africa/Kigali' => 'Africa/Kigali',
-  'Atlantic/St_Helena' => 'Atlantic/St_Helena',
-  'Africa/Sao_Tome' => 'Africa/Sao_Tome',
-  'Africa/Dakar' => 'Africa/Dakar',
-  'Indian/Mahe' => 'Indian/Mahe',
-  'Africa/Freetown' => 'Africa/Freetown',
-  'Africa/Mogadishu' => 'Africa/Mogadishu',
-  'Africa/Johannesburg' => 'Africa/Johannesburg',
-  'Africa/Khartoum' => 'Africa/Khartoum',
-  'Africa/Mbabane' => 'Africa/Mbabane',
-  'Africa/Dar_es_Salaam' => 'Africa/Dar_es_Salaam',
-  'Africa/Lome' => 'Africa/Lome',
-  'Africa/Tunis' => 'Africa/Tunis',
-  'Africa/Kampala' => 'Africa/Kampala',
-  'Africa/Lusaka' => 'Africa/Lusaka',
-  'Africa/Harare' => 'Africa/Harare',
-  'Antarctica/Casey' => 'Antarctica/Casey',
-  'Antarctica/Davis' => 'Antarctica/Davis',
-  'Antarctica/Mawson' => 'Antarctica/Mawson',
-  'Indian/Kerguelen' => 'Indian/Kerguelen',
-  'Antarctica/DumontDUrville' => 'Antarctica/DumontDUrville',
-  'Antarctica/Syowa' => 'Antarctica/Syowa',
-  'Antarctica/Vostok' => 'Antarctica/Vostok',
-  'Antarctica/Rothera' => 'Antarctica/Rothera',
-  'Antarctica/Palmer' => 'Antarctica/Palmer',
-  'Antarctica/McMurdo' => 'Antarctica/McMurdo',
-  'Asia/Kabul' => 'Asia/Kabul',
-  'Asia/Yerevan' => 'Asia/Yerevan',
-  'Asia/Baku' => 'Asia/Baku',
-  'Asia/Bahrain' => 'Asia/Bahrain',
-  'Asia/Dhaka' => 'Asia/Dhaka',
-  'Asia/Thimphu' => 'Asia/Thimphu',
-  'Indian/Chagos' => 'Indian/Chagos',
-  'Asia/Brunei' => 'Asia/Brunei',
-  'Asia/Rangoon' => 'Asia/Rangoon',
-  'Asia/Phnom_Penh' => 'Asia/Phnom_Penh',
-  'Asia/Beijing' => 'Asia/Beijing',
-  'Asia/Harbin' => 'Asia/Harbin',
-  'Asia/Shanghai' => 'Asia/Shanghai',
-  'Asia/Chongqing' => 'Asia/Chongqing',
-  'Asia/Urumqi' => 'Asia/Urumqi',
-  'Asia/Kashgar' => 'Asia/Kashgar',
-  'Asia/Hong_Kong' => 'Asia/Hong_Kong',
-  'Asia/Taipei' => 'Asia/Taipei',
-  'Asia/Macau' => 'Asia/Macau',
-  'Asia/Nicosia' => 'Asia/Nicosia',
-  'Asia/Tbilisi' => 'Asia/Tbilisi',
-  'Asia/Dili' => 'Asia/Dili',
-  'Asia/Calcutta' => 'Asia/Calcutta',
-  'Asia/Jakarta' => 'Asia/Jakarta',
-  'Asia/Pontianak' => 'Asia/Pontianak',
-  'Asia/Makassar' => 'Asia/Makassar',
-  'Asia/Jayapura' => 'Asia/Jayapura',
-  'Asia/Tehran' => 'Asia/Tehran',
-  'Asia/Baghdad' => 'Asia/Baghdad',
-  'Asia/Jerusalem' => 'Asia/Jerusalem',
-  'Asia/Tokyo' => 'Asia/Tokyo',
-  'Asia/Amman' => 'Asia/Amman',
-  'Asia/Almaty' => 'Asia/Almaty',
-  'Asia/Qyzylorda' => 'Asia/Qyzylorda',
-  'Asia/Aqtobe' => 'Asia/Aqtobe',
-  'Asia/Aqtau' => 'Asia/Aqtau',
-  'Asia/Oral' => 'Asia/Oral',
-  'Asia/Bishkek' => 'Asia/Bishkek',
-  'Asia/Seoul' => 'Asia/Seoul',
-  'Asia/Pyongyang' => 'Asia/Pyongyang',
-  'Asia/Kuwait' => 'Asia/Kuwait',
-  'Asia/Vientiane' => 'Asia/Vientiane',
-  'Asia/Beirut' => 'Asia/Beirut',
-  'Asia/Kuala_Lumpur' => 'Asia/Kuala_Lumpur',
-  'Asia/Kuching' => 'Asia/Kuching',
-  'Indian/Maldives' => 'Indian/Maldives',
-  'Asia/Hovd' => 'Asia/Hovd',
-  'Asia/Ulaanbaatar' => 'Asia/Ulaanbaatar',
-  'Asia/Choibalsan' => 'Asia/Choibalsan',
-  'Asia/Katmandu' => 'Asia/Katmandu',
-  'Asia/Muscat' => 'Asia/Muscat',
-  'Asia/Karachi' => 'Asia/Karachi',
-  'Asia/Gaza' => 'Asia/Gaza',
-  'Asia/Manila' => 'Asia/Manila',
-  'Asia/Qatar' => 'Asia/Qatar',
-  'Asia/Riyadh' => 'Asia/Riyadh',
-  'Asia/Singapore' => 'Asia/Singapore',
-  'Asia/Colombo' => 'Asia/Colombo',
-  'Asia/Damascus' => 'Asia/Damascus',
-  'Asia/Dushanbe' => 'Asia/Dushanbe',
-  'Asia/Bangkok' => 'Asia/Bangkok',
-  'Asia/Ashgabat' => 'Asia/Ashgabat',
-  'Asia/Dubai' => 'Asia/Dubai',
-  'Asia/Samarkand' => 'Asia/Samarkand',
-  'Asia/Tashkent' => 'Asia/Tashkent',
-  'Asia/Saigon' => 'Asia/Saigon',
-  'Asia/Aden' => 'Asia/Aden',
-  'Australia/Darwin' => 'Australia/Darwin',
-  'Australia/Perth' => 'Australia/Perth',
-  'Australia/Brisbane' => 'Australia/Brisbane',
-  'Australia/Lindeman' => 'Australia/Lindeman',
-  'Australia/Adelaide' => 'Australia/Adelaide',
-  'Australia/Hobart' => 'Australia/Hobart',
-  'Australia/Currie' => 'Australia/Currie',
-  'Australia/Melbourne' => 'Australia/Melbourne',
-  'Australia/Sydney' => 'Australia/Sydney',
-  'Australia/Broken_Hill' => 'Australia/Broken_Hill',
-  'Indian/Christmas' => 'Indian/Christmas',
-  'Pacific/Rarotonga' => 'Pacific/Rarotonga',
-  'Indian/Cocos' => 'Indian/Cocos',
-  'Pacific/Fiji' => 'Pacific/Fiji',
-  'Pacific/Gambier' => 'Pacific/Gambier',
-  'Pacific/Marquesas' => 'Pacific/Marquesas',
-  'Pacific/Tahiti' => 'Pacific/Tahiti',
-  'Pacific/Guam' => 'Pacific/Guam',
-  'Pacific/Tarawa' => 'Pacific/Tarawa',
-  'Pacific/Enderbury' => 'Pacific/Enderbury',
-  'Pacific/Kiritimati' => 'Pacific/Kiritimati',
-  'Pacific/Saipan' => 'Pacific/Saipan',
-  'Pacific/Majuro' => 'Pacific/Majuro',
-  'Pacific/Kwajalein' => 'Pacific/Kwajalein',
-  'Pacific/Truk' => 'Pacific/Truk',
-  'Pacific/Ponape' => 'Pacific/Ponape',
-  'Pacific/Kosrae' => 'Pacific/Kosrae',
-  'Pacific/Nauru' => 'Pacific/Nauru',
-  'Pacific/Noumea' => 'Pacific/Noumea',
-  'Pacific/Auckland' => 'Pacific/Auckland',
-  'Pacific/Chatham' => 'Pacific/Chatham',
-  'Pacific/Niue' => 'Pacific/Niue',
-  'Pacific/Norfolk' => 'Pacific/Norfolk',
-  'Pacific/Palau' => 'Pacific/Palau',
-  'Pacific/Port_Moresby' => 'Pacific/Port_Moresby',
-  'Pacific/Pitcairn' => 'Pacific/Pitcairn',
-  'Pacific/Pago_Pago' => 'Pacific/Pago_Pago',
-  'Pacific/Apia' => 'Pacific/Apia',
-  'Pacific/Guadalcanal' => 'Pacific/Guadalcanal',
-  'Pacific/Fakaofo' => 'Pacific/Fakaofo',
-  'Pacific/Tongatapu' => 'Pacific/Tongatapu',
-  'Pacific/Funafuti' => 'Pacific/Funafuti',
-  'Pacific/Johnston' => 'Pacific/Johnston',
-  'Pacific/Midway' => 'Pacific/Midway',
-  'Pacific/Wake' => 'Pacific/Wake',
-  'Pacific/Efate' => 'Pacific/Efate',
-  'Pacific/Wallis' => 'Pacific/Wallis',
-  'Europe/London' => 'Europe/London',
-  'Europe/Dublin' => 'Europe/Dublin',
-  'WET' => 'WET',
-  'CET' => 'CET',
-  'MET' => 'MET',
-  'EET' => 'EET',
-  'Europe/Tirane' => 'Europe/Tirane',
-  'Europe/Andorra' => 'Europe/Andorra',
-  'Europe/Vienna' => 'Europe/Vienna',
-  'Europe/Minsk' => 'Europe/Minsk',
-  'Europe/Brussels' => 'Europe/Brussels',
-  'Europe/Sofia' => 'Europe/Sofia',
-  'Europe/Prague' => 'Europe/Prague',
-  'Europe/Copenhagen' => 'Europe/Copenhagen',
-  'Atlantic/Faeroe' => 'Atlantic/Faeroe',
-  'America/Danmarkshavn' => 'America/Danmarkshavn',
-  'America/Scoresbysund' => 'America/Scoresbysund',
-  'America/Godthab' => 'America/Godthab',
-  'America/Thule' => 'America/Thule',
-  'Europe/Tallinn' => 'Europe/Tallinn',
-  'Europe/Helsinki' => 'Europe/Helsinki',
-  'Europe/Paris' => 'Europe/Paris',
-  'Europe/Berlin' => 'Europe/Berlin',
-  'Europe/Gibraltar' => 'Europe/Gibraltar',
-  'Europe/Athens' => 'Europe/Athens',
-  'Europe/Budapest' => 'Europe/Budapest',
-  'Atlantic/Reykjavik' => 'Atlantic/Reykjavik',
-  'Europe/Rome' => 'Europe/Rome',
-  'Europe/Riga' => 'Europe/Riga',
-  'Europe/Vaduz' => 'Europe/Vaduz',
-  'Europe/Vilnius' => 'Europe/Vilnius',
-  'Europe/Luxembourg' => 'Europe/Luxembourg',
-  'Europe/Malta' => 'Europe/Malta',
-  'Europe/Chisinau' => 'Europe/Chisinau',
-  'Europe/Monaco' => 'Europe/Monaco',
-  'Europe/Amsterdam' => 'Europe/Amsterdam',
-  'Europe/Oslo' => 'Europe/Oslo',
-  'Europe/Warsaw' => 'Europe/Warsaw',
-  'Europe/Lisbon' => 'Europe/Lisbon',
-  'Atlantic/Azores' => 'Atlantic/Azores',
-  'Atlantic/Madeira' => 'Atlantic/Madeira',
-  'Europe/Bucharest' => 'Europe/Bucharest',
-  'Europe/Kaliningrad' => 'Europe/Kaliningrad',
-  'Europe/Moscow' => 'Europe/Moscow',
-  'Europe/Samara' => 'Europe/Samara',
-  'Asia/Yekaterinburg' => 'Asia/Yekaterinburg',
-  'Asia/Omsk' => 'Asia/Omsk',
-  'Asia/Novosibirsk' => 'Asia/Novosibirsk',
-  'Asia/Krasnoyarsk' => 'Asia/Krasnoyarsk',
-  'Asia/Irkutsk' => 'Asia/Irkutsk',
-  'Asia/Yakutsk' => 'Asia/Yakutsk',
-  'Asia/Vladivostok' => 'Asia/Vladivostok',
-  'Asia/Sakhalin' => 'Asia/Sakhalin',
-  'Asia/Magadan' => 'Asia/Magadan',
-  'Asia/Kamchatka' => 'Asia/Kamchatka',
-  'Asia/Anadyr' => 'Asia/Anadyr',
-  '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/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/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/Adak' => 'America/Adak',
-  'Pacific/Honolulu' => 'Pacific/Honolulu',
-  'America/Phoenix' => 'America/Phoenix',
-  'America/Boise' => 'America/Boise',
-  'America/Indiana/Indianapolis' => 'America/Indiana/Indianapolis',
-  '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/Detroit' => 'America/Detroit',
-  'America/Menominee' => 'America/Menominee',
-  'America/St_Johns' => 'America/St_Johns',
-  'America/Goose_Bay' => 'America/Goose_Bay' ,
-  'America/Halifax' => 'America/Halifax',
-  'America/Glace_Bay' =>'America/Glace_Bay' ,
-  'America/Montreal' => 'America/Montreal',
-  'America/Toronto' => 'America/Toronto',
-  'America/Thunder_Bay' => 'America/Thunder_Bay' ,
-  'America/Nipigon' => 'America/Nipigon',
-  'America/Rainy_River' => 'America/Rainy_River',
-  'America/Winnipeg' => 'America/Winnipeg',
-  'America/Regina' => 'America/Regina',
-  'America/Swift_Current' => 'America/Swift_Current',
-  '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/Rankin_Inlet' => 'America/Rankin_Inlet',
-  'America/Cambridge_Bay' => 'America/Cambridge_Bay',
-  'America/Yellowknife' => 'America/Yellowknife',
-  'America/Inuvik' =>'America/Inuvik' ,
-  'America/Whitehorse' => 'America/Whitehorse' ,
-  'America/Dawson' => 'America/Dawson',
-  'America/Cancun' => 'America/Cancun',
-  'America/Merida' => 'America/Merida',
-  'America/Monterrey' => 'America/Monterrey',
-  'America/Mexico_City' => 'America/Mexico_City',
-  'America/Chihuahua' => 'America/Chihuahua',
-  'America/Hermosillo' => 'America/Hermosillo',
-  'America/Mazatlan' => 'America/Mazatlan',
-  'America/Tijuana' => 'America/Tijuana',
-  'America/Anguilla' => 'America/Anguilla',
-  'America/Antigua' => 'America/Antigua',
-  'America/Nassau' =>'America/Nassau' ,
-  'America/Barbados' => 'America/Barbados',
-  'America/Belize' => 'America/Belize',
-  'Atlantic/Bermuda' => 'Atlantic/Bermuda',
-  'America/Cayman' => 'America/Cayman',
-  'America/Costa_Rica' => 'America/Costa_Rica',
-  'America/Havana' => 'America/Havana',
-  'America/Dominica' => 'America/Dominica',
-  'America/Santo_Domingo' => 'America/Santo_Domingo',
-  'America/El_Salvador' => 'America/El_Salvador',
-  'America/Grenada' => 'America/Grenada',
-  'America/Guadeloupe' => 'America/Guadeloupe',
-  'America/Guatemala' => 'America/Guatemala',
-  'America/Port-au-Prince' => 'America/Port-au-Prince',
-  'America/Tegucigalpa' => 'America/Tegucigalpa',
-  'America/Jamaica' => 'America/Jamaica',
-  'America/Martinique' => 'America/Martinique',
-  'America/Montserrat' => 'America/Montserrat',
-  'America/Managua' => 'America/Managua',
-  'America/Panama' => 'America/Panama',
-  'America/Puerto_Rico' =>'America/Puerto_Rico' ,
-  'America/St_Kitts' => 'America/St_Kitts',
-  'America/St_Lucia' => 'America/St_Lucia',
-  'America/Miquelon' => 'America/Miquelon',
-  'America/St_Vincent' => 'America/St_Vincent',
-  'America/Grand_Turk' => 'America/Grand_Turk',
-  'America/Tortola' => 'America/Tortola',
-  'America/St_Thomas' => 'America/St_Thomas',
-  'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
-  'America/Argentina/Cordoba' => 'America/Argentina/Cordoba',
-  'America/Argentina/Tucuman' => 'America/Argentina/Tucuman',
-  'America/Argentina/La_Rioja' => 'America/Argentina/La_Rioja',
-  'America/Argentina/San_Juan' => 'America/Argentina/San_Juan',
-  'America/Argentina/Jujuy' => 'America/Argentina/Jujuy',
-  'America/Argentina/Catamarca' => 'America/Argentina/Catamarca',
-  'America/Argentina/Mendoza' => 'America/Argentina/Mendoza',
-  'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio_Gallegos',
-  'America/Argentina/Ushuaia' =>  'America/Argentina/Ushuaia',
-  'America/Aruba' => 'America/Aruba',
-  'America/La_Paz' => 'America/La_Paz',
-  'America/Noronha' => 'America/Noronha',
-  'America/Belem' => 'America/Belem',
-  'America/Fortaleza' => 'America/Fortaleza',
-  'America/Recife' => 'America/Recife',
-  'America/Araguaina' => 'America/Araguaina',
-  'America/Maceio' => 'America/Maceio',
-  'America/Bahia' => 'America/Bahia',
-  'America/Sao_Paulo' => 'America/Sao_Paulo',
-  'America/Campo_Grande' => 'America/Campo_Grande',
-  'America/Cuiaba' => 'America/Cuiaba',
-  'America/Porto_Velho' => 'America/Porto_Velho',
-  'America/Boa_Vista' => 'America/Boa_Vista',
-  'America/Manaus' => 'America/Manaus',
-  'America/Eirunepe' => 'America/Eirunepe',
-  'America/Rio_Branco' => 'America/Rio_Branco',
-  'America/Santiago' => 'America/Santiago',
-  'Pacific/Easter' => 'Pacific/Easter' ,
-  'America/Bogota' => 'America/Bogota',
-  'America/Curacao' => 'America/Curacao',
-  'America/Guayaquil' => 'America/Guayaquil',
-  'Pacific/Galapagos' => 'Pacific/Galapagos' ,
-  'Atlantic/Stanley' => 'Atlantic/Stanley',
-  'America/Cayenne' => 'America/Cayenne',
-  'America/Guyana' => 'America/Guyana',
-  'America/Asuncion' => 'America/Asuncion',
-  'America/Lima' => 'America/Lima',
-  'Atlantic/South_Georgia' => 'Atlantic/South_Georgia',
-  'America/Paramaribo' => 'America/Paramaribo',
-  'America/Port_of_Spain' => 'America/Port_of_Spain',
-  'America/Montevideo' => 'America/Montevideo',
-  'America/Caracas' => 'America/Caracas',
-  );
-
-  $app_list_strings['moduleList']['Sugar_Favorites'] = 'Favorites';
-  $app_list_strings['eapm_list']= array(
+    );
+
+    $app_list_strings['timezone_dom'] = array(
+
+    'Africa/Algiers' => 'Africa/Algiers',
+    'Africa/Luanda' => 'Africa/Luanda',
+    'Africa/Porto-Novo' => 'Africa/Porto-Novo',
+    'Africa/Gaborone' => 'Africa/Gaborone',
+    'Africa/Ouagadougou' => 'Africa/Ouagadougou',
+    'Africa/Bujumbura' => 'Africa/Bujumbura',
+    'Africa/Douala' => 'Africa/Douala',
+    'Atlantic/Cape_Verde' => 'Atlantic/Cape_Verde',
+    'Africa/Bangui' => 'Africa/Bangui',
+    'Africa/Ndjamena' => 'Africa/Ndjamena',
+    'Indian/Comoro' => 'Indian/Comoro',
+    'Africa/Kinshasa' => 'Africa/Kinshasa',
+    'Africa/Lubumbashi' => 'Africa/Lubumbashi',
+    'Africa/Brazzaville' => 'Africa/Brazzaville',
+    'Africa/Abidjan' => 'Africa/Abidjan',
+    'Africa/Djibouti' => 'Africa/Djibouti',
+    'Africa/Cairo' => 'Africa/Cairo',
+    'Africa/Malabo' => 'Africa/Malabo',
+    'Africa/Asmera' => 'Africa/Asmera',
+    'Africa/Addis_Ababa' => 'Africa/Addis_Ababa',
+    'Africa/Libreville' => 'Africa/Libreville',
+    'Africa/Banjul' => 'Africa/Banjul',
+    'Africa/Accra' => 'Africa/Accra',
+    'Africa/Conakry' => 'Africa/Conakry',
+    'Africa/Bissau' => 'Africa/Bissau',
+    'Africa/Nairobi' => 'Africa/Nairobi',
+    'Africa/Maseru' => 'Africa/Maseru',
+    'Africa/Monrovia' => 'Africa/Monrovia',
+    'Africa/Tripoli' => 'Africa/Tripoli',
+    'Indian/Antananarivo' => 'Indian/Antananarivo',
+    'Africa/Blantyre' => 'Africa/Blantyre',
+    'Africa/Bamako' => 'Africa/Bamako',
+    'Africa/Nouakchott' => 'Africa/Nouakchott',
+    'Indian/Mauritius' => 'Indian/Mauritius',
+    'Indian/Mayotte' => 'Indian/Mayotte',
+    'Africa/Casablanca' => 'Africa/Casablanca',
+    'Africa/El_Aaiun' => 'Africa/El_Aaiun',
+    'Africa/Maputo' => 'Africa/Maputo',
+    'Africa/Windhoek' => 'Africa/Windhoek',
+    'Africa/Niamey' => 'Africa/Niamey',
+    'Africa/Lagos' => 'Africa/Lagos',
+    'Indian/Reunion' => 'Indian/Reunion',
+    'Africa/Kigali' => 'Africa/Kigali',
+    'Atlantic/St_Helena' => 'Atlantic/St_Helena',
+    'Africa/Sao_Tome' => 'Africa/Sao_Tome',
+    'Africa/Dakar' => 'Africa/Dakar',
+    'Indian/Mahe' => 'Indian/Mahe',
+    'Africa/Freetown' => 'Africa/Freetown',
+    'Africa/Mogadishu' => 'Africa/Mogadishu',
+    'Africa/Johannesburg' => 'Africa/Johannesburg',
+    'Africa/Khartoum' => 'Africa/Khartoum',
+    'Africa/Mbabane' => 'Africa/Mbabane',
+    'Africa/Dar_es_Salaam' => 'Africa/Dar_es_Salaam',
+    'Africa/Lome' => 'Africa/Lome',
+    'Africa/Tunis' => 'Africa/Tunis',
+    'Africa/Kampala' => 'Africa/Kampala',
+    'Africa/Lusaka' => 'Africa/Lusaka',
+    'Africa/Harare' => 'Africa/Harare',
+    'Antarctica/Casey' => 'Antarctica/Casey',
+    'Antarctica/Davis' => 'Antarctica/Davis',
+    'Antarctica/Mawson' => 'Antarctica/Mawson',
+    'Indian/Kerguelen' => 'Indian/Kerguelen',
+    'Antarctica/DumontDUrville' => 'Antarctica/DumontDUrville',
+    'Antarctica/Syowa' => 'Antarctica/Syowa',
+    'Antarctica/Vostok' => 'Antarctica/Vostok',
+    'Antarctica/Rothera' => 'Antarctica/Rothera',
+    'Antarctica/Palmer' => 'Antarctica/Palmer',
+    'Antarctica/McMurdo' => 'Antarctica/McMurdo',
+    'Asia/Kabul' => 'Asia/Kabul',
+    'Asia/Yerevan' => 'Asia/Yerevan',
+    'Asia/Baku' => 'Asia/Baku',
+    'Asia/Bahrain' => 'Asia/Bahrain',
+    'Asia/Dhaka' => 'Asia/Dhaka',
+    'Asia/Thimphu' => 'Asia/Thimphu',
+    'Indian/Chagos' => 'Indian/Chagos',
+    'Asia/Brunei' => 'Asia/Brunei',
+    'Asia/Rangoon' => 'Asia/Rangoon',
+    'Asia/Phnom_Penh' => 'Asia/Phnom_Penh',
+    'Asia/Beijing' => 'Asia/Beijing',
+    'Asia/Harbin' => 'Asia/Harbin',
+    'Asia/Shanghai' => 'Asia/Shanghai',
+    'Asia/Chongqing' => 'Asia/Chongqing',
+    'Asia/Urumqi' => 'Asia/Urumqi',
+    'Asia/Kashgar' => 'Asia/Kashgar',
+    'Asia/Hong_Kong' => 'Asia/Hong_Kong',
+    'Asia/Taipei' => 'Asia/Taipei',
+    'Asia/Macau' => 'Asia/Macau',
+    'Asia/Nicosia' => 'Asia/Nicosia',
+    'Asia/Tbilisi' => 'Asia/Tbilisi',
+    'Asia/Dili' => 'Asia/Dili',
+    'Asia/Calcutta' => 'Asia/Calcutta',
+    'Asia/Jakarta' => 'Asia/Jakarta',
+    'Asia/Pontianak' => 'Asia/Pontianak',
+    'Asia/Makassar' => 'Asia/Makassar',
+    'Asia/Jayapura' => 'Asia/Jayapura',
+    'Asia/Tehran' => 'Asia/Tehran',
+    'Asia/Baghdad' => 'Asia/Baghdad',
+    'Asia/Jerusalem' => 'Asia/Jerusalem',
+    'Asia/Tokyo' => 'Asia/Tokyo',
+    'Asia/Amman' => 'Asia/Amman',
+    'Asia/Almaty' => 'Asia/Almaty',
+    'Asia/Qyzylorda' => 'Asia/Qyzylorda',
+    'Asia/Aqtobe' => 'Asia/Aqtobe',
+    'Asia/Aqtau' => 'Asia/Aqtau',
+    'Asia/Oral' => 'Asia/Oral',
+    'Asia/Bishkek' => 'Asia/Bishkek',
+    'Asia/Seoul' => 'Asia/Seoul',
+    'Asia/Pyongyang' => 'Asia/Pyongyang',
+    'Asia/Kuwait' => 'Asia/Kuwait',
+    'Asia/Vientiane' => 'Asia/Vientiane',
+    'Asia/Beirut' => 'Asia/Beirut',
+    'Asia/Kuala_Lumpur' => 'Asia/Kuala_Lumpur',
+    'Asia/Kuching' => 'Asia/Kuching',
+    'Indian/Maldives' => 'Indian/Maldives',
+    'Asia/Hovd' => 'Asia/Hovd',
+    'Asia/Ulaanbaatar' => 'Asia/Ulaanbaatar',
+    'Asia/Choibalsan' => 'Asia/Choibalsan',
+    'Asia/Katmandu' => 'Asia/Katmandu',
+    'Asia/Muscat' => 'Asia/Muscat',
+    'Asia/Karachi' => 'Asia/Karachi',
+    'Asia/Gaza' => 'Asia/Gaza',
+    'Asia/Manila' => 'Asia/Manila',
+    'Asia/Qatar' => 'Asia/Qatar',
+    'Asia/Riyadh' => 'Asia/Riyadh',
+    'Asia/Singapore' => 'Asia/Singapore',
+    'Asia/Colombo' => 'Asia/Colombo',
+    'Asia/Damascus' => 'Asia/Damascus',
+    'Asia/Dushanbe' => 'Asia/Dushanbe',
+    'Asia/Bangkok' => 'Asia/Bangkok',
+    'Asia/Ashgabat' => 'Asia/Ashgabat',
+    'Asia/Dubai' => 'Asia/Dubai',
+    'Asia/Samarkand' => 'Asia/Samarkand',
+    'Asia/Tashkent' => 'Asia/Tashkent',
+    'Asia/Saigon' => 'Asia/Saigon',
+    'Asia/Aden' => 'Asia/Aden',
+    'Australia/Darwin' => 'Australia/Darwin',
+    'Australia/Perth' => 'Australia/Perth',
+    'Australia/Brisbane' => 'Australia/Brisbane',
+    'Australia/Lindeman' => 'Australia/Lindeman',
+    'Australia/Adelaide' => 'Australia/Adelaide',
+    'Australia/Hobart' => 'Australia/Hobart',
+    'Australia/Currie' => 'Australia/Currie',
+    'Australia/Melbourne' => 'Australia/Melbourne',
+    'Australia/Sydney' => 'Australia/Sydney',
+    'Australia/Broken_Hill' => 'Australia/Broken_Hill',
+    'Indian/Christmas' => 'Indian/Christmas',
+    'Pacific/Rarotonga' => 'Pacific/Rarotonga',
+    'Indian/Cocos' => 'Indian/Cocos',
+    'Pacific/Fiji' => 'Pacific/Fiji',
+    'Pacific/Gambier' => 'Pacific/Gambier',
+    'Pacific/Marquesas' => 'Pacific/Marquesas',
+    'Pacific/Tahiti' => 'Pacific/Tahiti',
+    'Pacific/Guam' => 'Pacific/Guam',
+    'Pacific/Tarawa' => 'Pacific/Tarawa',
+    'Pacific/Enderbury' => 'Pacific/Enderbury',
+    'Pacific/Kiritimati' => 'Pacific/Kiritimati',
+    'Pacific/Saipan' => 'Pacific/Saipan',
+    'Pacific/Majuro' => 'Pacific/Majuro',
+    'Pacific/Kwajalein' => 'Pacific/Kwajalein',
+    'Pacific/Truk' => 'Pacific/Truk',
+    'Pacific/Ponape' => 'Pacific/Ponape',
+    'Pacific/Kosrae' => 'Pacific/Kosrae',
+    'Pacific/Nauru' => 'Pacific/Nauru',
+    'Pacific/Noumea' => 'Pacific/Noumea',
+    'Pacific/Auckland' => 'Pacific/Auckland',
+    'Pacific/Chatham' => 'Pacific/Chatham',
+    'Pacific/Niue' => 'Pacific/Niue',
+    'Pacific/Norfolk' => 'Pacific/Norfolk',
+    'Pacific/Palau' => 'Pacific/Palau',
+    'Pacific/Port_Moresby' => 'Pacific/Port_Moresby',
+    'Pacific/Pitcairn' => 'Pacific/Pitcairn',
+    'Pacific/Pago_Pago' => 'Pacific/Pago_Pago',
+    'Pacific/Apia' => 'Pacific/Apia',
+    'Pacific/Guadalcanal' => 'Pacific/Guadalcanal',
+    'Pacific/Fakaofo' => 'Pacific/Fakaofo',
+    'Pacific/Tongatapu' => 'Pacific/Tongatapu',
+    'Pacific/Funafuti' => 'Pacific/Funafuti',
+    'Pacific/Johnston' => 'Pacific/Johnston',
+    'Pacific/Midway' => 'Pacific/Midway',
+    'Pacific/Wake' => 'Pacific/Wake',
+    'Pacific/Efate' => 'Pacific/Efate',
+    'Pacific/Wallis' => 'Pacific/Wallis',
+    'Europe/London' => 'Europe/London',
+    'Europe/Dublin' => 'Europe/Dublin',
+    'WET' => 'WET',
+    'CET' => 'CET',
+    'MET' => 'MET',
+    'EET' => 'EET',
+    'Europe/Tirane' => 'Europe/Tirane',
+    'Europe/Andorra' => 'Europe/Andorra',
+    'Europe/Vienna' => 'Europe/Vienna',
+    'Europe/Minsk' => 'Europe/Minsk',
+    'Europe/Brussels' => 'Europe/Brussels',
+    'Europe/Sofia' => 'Europe/Sofia',
+    'Europe/Prague' => 'Europe/Prague',
+    'Europe/Copenhagen' => 'Europe/Copenhagen',
+    'Atlantic/Faeroe' => 'Atlantic/Faeroe',
+    'America/Danmarkshavn' => 'America/Danmarkshavn',
+    'America/Scoresbysund' => 'America/Scoresbysund',
+    'America/Godthab' => 'America/Godthab',
+    'America/Thule' => 'America/Thule',
+    'Europe/Tallinn' => 'Europe/Tallinn',
+    'Europe/Helsinki' => 'Europe/Helsinki',
+    'Europe/Paris' => 'Europe/Paris',
+    'Europe/Berlin' => 'Europe/Berlin',
+    'Europe/Gibraltar' => 'Europe/Gibraltar',
+    'Europe/Athens' => 'Europe/Athens',
+    'Europe/Budapest' => 'Europe/Budapest',
+    'Atlantic/Reykjavik' => 'Atlantic/Reykjavik',
+    'Europe/Rome' => 'Europe/Rome',
+    'Europe/Riga' => 'Europe/Riga',
+    'Europe/Vaduz' => 'Europe/Vaduz',
+    'Europe/Vilnius' => 'Europe/Vilnius',
+    'Europe/Luxembourg' => 'Europe/Luxembourg',
+    'Europe/Malta' => 'Europe/Malta',
+    'Europe/Chisinau' => 'Europe/Chisinau',
+    'Europe/Monaco' => 'Europe/Monaco',
+    'Europe/Amsterdam' => 'Europe/Amsterdam',
+    'Europe/Oslo' => 'Europe/Oslo',
+    'Europe/Warsaw' => 'Europe/Warsaw',
+    'Europe/Lisbon' => 'Europe/Lisbon',
+    'Atlantic/Azores' => 'Atlantic/Azores',
+    'Atlantic/Madeira' => 'Atlantic/Madeira',
+    'Europe/Bucharest' => 'Europe/Bucharest',
+    'Europe/Kaliningrad' => 'Europe/Kaliningrad',
+    'Europe/Moscow' => 'Europe/Moscow',
+    'Europe/Samara' => 'Europe/Samara',
+    'Asia/Yekaterinburg' => 'Asia/Yekaterinburg',
+    'Asia/Omsk' => 'Asia/Omsk',
+    'Asia/Novosibirsk' => 'Asia/Novosibirsk',
+    'Asia/Krasnoyarsk' => 'Asia/Krasnoyarsk',
+    'Asia/Irkutsk' => 'Asia/Irkutsk',
+    'Asia/Yakutsk' => 'Asia/Yakutsk',
+    'Asia/Vladivostok' => 'Asia/Vladivostok',
+    'Asia/Sakhalin' => 'Asia/Sakhalin',
+    'Asia/Magadan' => 'Asia/Magadan',
+    'Asia/Kamchatka' => 'Asia/Kamchatka',
+    'Asia/Anadyr' => 'Asia/Anadyr',
+    '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/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/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/Adak' => 'America/Adak',
+    'Pacific/Honolulu' => 'Pacific/Honolulu',
+    'America/Phoenix' => 'America/Phoenix',
+    'America/Boise' => 'America/Boise',
+    'America/Indiana/Indianapolis' => 'America/Indiana/Indianapolis',
+    '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/Detroit' => 'America/Detroit',
+    'America/Menominee' => 'America/Menominee',
+    'America/St_Johns' => 'America/St_Johns',
+    'America/Goose_Bay' => 'America/Goose_Bay' ,
+    'America/Halifax' => 'America/Halifax',
+    'America/Glace_Bay' =>'America/Glace_Bay' ,
+    'America/Montreal' => 'America/Montreal',
+    'America/Toronto' => 'America/Toronto',
+    'America/Thunder_Bay' => 'America/Thunder_Bay' ,
+    'America/Nipigon' => 'America/Nipigon',
+    'America/Rainy_River' => 'America/Rainy_River',
+    'America/Winnipeg' => 'America/Winnipeg',
+    'America/Regina' => 'America/Regina',
+    'America/Swift_Current' => 'America/Swift_Current',
+    '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/Rankin_Inlet' => 'America/Rankin_Inlet',
+    'America/Cambridge_Bay' => 'America/Cambridge_Bay',
+    'America/Yellowknife' => 'America/Yellowknife',
+    'America/Inuvik' =>'America/Inuvik' ,
+    'America/Whitehorse' => 'America/Whitehorse' ,
+    'America/Dawson' => 'America/Dawson',
+    'America/Cancun' => 'America/Cancun',
+    'America/Merida' => 'America/Merida',
+    'America/Monterrey' => 'America/Monterrey',
+    'America/Mexico_City' => 'America/Mexico_City',
+    'America/Chihuahua' => 'America/Chihuahua',
+    'America/Hermosillo' => 'America/Hermosillo',
+    'America/Mazatlan' => 'America/Mazatlan',
+    'America/Tijuana' => 'America/Tijuana',
+    'America/Anguilla' => 'America/Anguilla',
+    'America/Antigua' => 'America/Antigua',
+    'America/Nassau' =>'America/Nassau' ,
+    'America/Barbados' => 'America/Barbados',
+    'America/Belize' => 'America/Belize',
+    'Atlantic/Bermuda' => 'Atlantic/Bermuda',
+    'America/Cayman' => 'America/Cayman',
+    'America/Costa_Rica' => 'America/Costa_Rica',
+    'America/Havana' => 'America/Havana',
+    'America/Dominica' => 'America/Dominica',
+    'America/Santo_Domingo' => 'America/Santo_Domingo',
+    'America/El_Salvador' => 'America/El_Salvador',
+    'America/Grenada' => 'America/Grenada',
+    'America/Guadeloupe' => 'America/Guadeloupe',
+    'America/Guatemala' => 'America/Guatemala',
+    'America/Port-au-Prince' => 'America/Port-au-Prince',
+    'America/Tegucigalpa' => 'America/Tegucigalpa',
+    'America/Jamaica' => 'America/Jamaica',
+    'America/Martinique' => 'America/Martinique',
+    'America/Montserrat' => 'America/Montserrat',
+    'America/Managua' => 'America/Managua',
+    'America/Panama' => 'America/Panama',
+    'America/Puerto_Rico' =>'America/Puerto_Rico' ,
+    'America/St_Kitts' => 'America/St_Kitts',
+    'America/St_Lucia' => 'America/St_Lucia',
+    'America/Miquelon' => 'America/Miquelon',
+    'America/St_Vincent' => 'America/St_Vincent',
+    'America/Grand_Turk' => 'America/Grand_Turk',
+    'America/Tortola' => 'America/Tortola',
+    'America/St_Thomas' => 'America/St_Thomas',
+    'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
+    'America/Argentina/Cordoba' => 'America/Argentina/Cordoba',
+    'America/Argentina/Tucuman' => 'America/Argentina/Tucuman',
+    'America/Argentina/La_Rioja' => 'America/Argentina/La_Rioja',
+    'America/Argentina/San_Juan' => 'America/Argentina/San_Juan',
+    'America/Argentina/Jujuy' => 'America/Argentina/Jujuy',
+    'America/Argentina/Catamarca' => 'America/Argentina/Catamarca',
+    'America/Argentina/Mendoza' => 'America/Argentina/Mendoza',
+    'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio_Gallegos',
+    'America/Argentina/Ushuaia' =>  'America/Argentina/Ushuaia',
+    'America/Aruba' => 'America/Aruba',
+    'America/La_Paz' => 'America/La_Paz',
+    'America/Noronha' => 'America/Noronha',
+    'America/Belem' => 'America/Belem',
+    'America/Fortaleza' => 'America/Fortaleza',
+    'America/Recife' => 'America/Recife',
+    'America/Araguaina' => 'America/Araguaina',
+    'America/Maceio' => 'America/Maceio',
+    'America/Bahia' => 'America/Bahia',
+    'America/Sao_Paulo' => 'America/Sao_Paulo',
+    'America/Campo_Grande' => 'America/Campo_Grande',
+    'America/Cuiaba' => 'America/Cuiaba',
+    'America/Porto_Velho' => 'America/Porto_Velho',
+    'America/Boa_Vista' => 'America/Boa_Vista',
+    'America/Manaus' => 'America/Manaus',
+    'America/Eirunepe' => 'America/Eirunepe',
+    'America/Rio_Branco' => 'America/Rio_Branco',
+    'America/Santiago' => 'America/Santiago',
+    'Pacific/Easter' => 'Pacific/Easter' ,
+    'America/Bogota' => 'America/Bogota',
+    'America/Curacao' => 'America/Curacao',
+    'America/Guayaquil' => 'America/Guayaquil',
+    'Pacific/Galapagos' => 'Pacific/Galapagos' ,
+    'Atlantic/Stanley' => 'Atlantic/Stanley',
+    'America/Cayenne' => 'America/Cayenne',
+    'America/Guyana' => 'America/Guyana',
+    'America/Asuncion' => 'America/Asuncion',
+    'America/Lima' => 'America/Lima',
+    'Atlantic/South_Georgia' => 'Atlantic/South_Georgia',
+    'America/Paramaribo' => 'America/Paramaribo',
+    'America/Port_of_Spain' => 'America/Port_of_Spain',
+    'America/Montevideo' => 'America/Montevideo',
+    'America/Caracas' => 'America/Caracas',
+    );
+
+    $app_list_strings['moduleList']['Sugar_Favorites'] = 'Favorites';
+    $app_list_strings['eapm_list']= array(
     'Sugar'=>'SuiteCRM',
     'WebEx'=>'WebEx',
     'GoToMeeting'=>'GoToMeeting',
@@ -3255,14 +3255,14 @@ 
     'Box' => 'Box.net',
     'Facebook'=>'Facebook',
     'Twitter'=>'Twitter',
-  );
-  $app_list_strings['eapm_list_import']= array(
-  	'Google' => 'Google Contacts',
-  );
+    );
+    $app_list_strings['eapm_list_import']= array(
+        'Google' => 'Google Contacts',
+    );
 $app_list_strings['eapm_list_documents']= array(
-  	'Google' => 'Google Docs',
-  );
-	$app_list_strings['token_status'] = array(
+        'Google' => 'Google Docs',
+    );
+    $app_list_strings['token_status'] = array(
         1 => 'Request',
         2 => 'Access',
         3 => 'Invalid',
@@ -3272,25 +3272,25 @@ 
     '' => '' ,
     'campaign' => 'Campaign' ,
     'email' => 'Email',
-  );
+    );
 
 $app_list_strings ['emailTemplates_type_list_campaigns'] = array (
     '' => '' ,
     'campaign' => 'Campaign' ,
-  );
+    );
 
 $app_list_strings ['emailTemplates_type_list_no_workflow'] = array (
     '' => '' ,
     'campaign' => 'Campaign' ,
     'email' => 'Email',
-  );
+    );
 $app_strings ['documentation'] = array (
     'LBL_DOCS' => 'Documentation',
     'ULT' => '02_Sugar_Ultimate',
-	'ENT' => '02_Sugar_Enterprise',
-	'CORP' => '03_Sugar_Corporate',
-	'PRO' => '04_Sugar_Professional',
-	'COM' => '05_Sugar_Community_Edition'
+    'ENT' => '02_Sugar_Enterprise',
+    'CORP' => '03_Sugar_Corporate',
+    'PRO' => '04_Sugar_Professional',
+    'COM' => '05_Sugar_Community_Edition'
 );
 
 

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');
 
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/SubPanel/SubPanelSearchDisplay.php

Indentation +3 added lines, -3 removed lines

@@ -46,12 +46,12 @@ 
 
 if(empty($_REQUEST['module']))
 {
-	die("'module' was not defined");
+    die("'module' was not defined");
 }
 
 if(!isset($beanList[$_REQUEST['module']]))
 {
-	die("'".$_REQUEST['module']."' is not defined in \$beanList");
+    die("'".$_REQUEST['module']."' is not defined in \$beanList");
 }
 
 if (!isset($_REQUEST['subpanel'])) {
@@ -67,7 +67,7 @@ 
 include('include/SubPanel/SubPanel.php');
 $layout_def_key = '';
 if(!empty($_REQUEST['layout_def_key'])){
-	$layout_def_key = $_REQUEST['layout_def_key'];
+    $layout_def_key = $_REQUEST['layout_def_key'];
 }
 
 $subpanel_object = new CustomSubPanel($module, $record, $subpanel,null, $layout_def_key, $collection);

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.