adamjakab / SuiteCRM

include/SugarEmailAddress/SugarEmailAddress.php

Indentation +61 added lines, -61 removed lines

@@ -56,7 +56,7 @@ 
     var $object_name = 'EmailAddress';
 
     //bug 40068, According to rules in page 6 of http://www.apps.ietf.org/rfc/rfc3696.html#sec-3,
-	//allowed special characters ! # $ % & ' * + - / = ?  ^ _ ` . { | } ~ in local part
+    //allowed special characters ! # $ % & ' * + - / = ?  ^ _ ` . { | } ~ in local part
     var $regex = "/^(?:['\.\-\+&#!\$\*=\?\^_`\{\}~\/\w]+)@(?:(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|\w+(?:[\.-]*\w+)*(?:\.[\w-]{2,})+)\$/";
     var $disable_custom_fields = true;
     var $db;
@@ -391,8 +391,8 @@ 
             // determine which array to process
             foreach($_REQUEST as $k => $v) {
                 if(strpos($k, 'emailAddress') !== false) {
-                   $fromRequest = true;
-                   break;
+                    $fromRequest = true;
+                    break;
                 }
             $widget_id = $_REQUEST[$module .'_email_widget_id'];
     }
@@ -409,30 +409,30 @@ 
 
                 $eId = $module . $widget_id;
                 if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
+                    $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                    $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
+                    $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                    $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
+                    $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                    $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
+                    $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                    $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -446,9 +446,9 @@ 
 
                 if($fromRequest && empty($replyTo)) {
                     if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
+                        $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
                     } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                        $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
                     }
                 }
                 if($fromRequest && empty($new_addrs)) {
@@ -472,7 +472,7 @@ 
                         if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
-                              $new_addrs[$k] = $v;
+                                $new_addrs[$k] = $v;
                         }
                     }
                 }
@@ -484,18 +484,18 @@ 
                     $optOutValues = array();
                     $invalidValues = array();
                     foreach($new_addrs as $k=>$email) {
-                       preg_match('/emailAddress([0-9])+$/', $k, $matches);
-                       $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
-                             $optOutValues[$k] = "emailAddress$count";
-                          }
-                          if(!empty($row['invalid_email'])) {
-                             $invalidValues[$k] = "emailAddress$count";
-                          }
-                       }
+                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
+                        $count = $matches[1];
+                        $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
+                        if(!empty($result)) {
+                            $row=$this->db->fetchByAssoc($result);
+                            if(!empty($row['opt_out'])) {
+                                $optOutValues[$k] = "emailAddress$count";
+                            }
+                            if(!empty($row['invalid_email'])) {
+                                $invalidValues[$k] = "emailAddress$count";
+                            }
+                        }
                     }
                 }
                 // Re-populate the addresses class variable if we have new address(es).
@@ -522,7 +522,7 @@ 
 
         //If no widgets, set addresses array to empty
         if($post_from_email_address_widget && !$hasEmailValue) {
-           $this->addresses = array();
+            $this->addresses = array();
         }
     }
 
@@ -861,14 +861,14 @@ 
             $count = 0;
             $key = $module . $widget_id . 'emailAddress'.$count;
             while(isset($_REQUEST[$key])) {
-                   $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
-                                             'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
-                                             'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
-                                             'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
-                                             'reply_to_address'=>false
+                    $email = $_REQUEST[$key];
+                    $prefillDataArr[] =  array('email_address'=>$email,
+                                                'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
+                                                'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
+                                                'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
+                                                'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                    $key = $module . $widget_id . 'emailAddress' . ++$count;
             } //while
         }
 
@@ -985,7 +985,7 @@ 
         $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+            $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
         }
 
         while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
@@ -994,31 +994,31 @@ 
         }
 
         if($count == 0) {
-           return "";
+            return "";
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
-              $optOut[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+                $optOut[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
-              $invalid[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+                $invalid[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
-              $replyTo[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+                $replyTo[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
-              $delete[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+                $delete[] = $v;
+            }
         }
 
         while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
@@ -1052,13 +1052,13 @@ 
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
         while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
-              $count++;
+                $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+                $count++;
         } //while
 
         while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
-              $count++;
+                $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+                $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
@@ -1067,14 +1067,14 @@ 
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
             if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
-                      $count++;
-                   } //foreach
-               } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
-               }
+                if(is_array($_REQUEST[$optionIdentifier])) {
+                    foreach($_REQUEST[$optionIdentifier] as $optOut) {
+                        $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+                        $count++;
+                    } //foreach
+                } else {
+                    $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                }
             } //if
         } //foreach
         return $get;
@@ -1082,7 +1082,7 @@ 
     }
 
     function setView($view) {
-       $this->view = $view;
+        $this->view = $view;
     }
 
 /**

include/SugarOauth.php

Indentation +39 added lines, -39 removed lines

@@ -145,34 +145,34 @@ 
          * @return array
          */
         public function getAccessToken($url,
-                                       Zend_Oauth_Token_Request $token = null,
-                                       $httpMethod = null,
-                                       Zend_Oauth_Http_AccessToken $request = null)
+                                        Zend_Oauth_Token_Request $token = null,
+                                        $httpMethod = null,
+                                        Zend_Oauth_Http_AccessToken $request = null)
         {
             $this->setAccessTokenUrl($url);
             $this->_last = $token = parent::getAccessToken($_REQUEST, $this->makeRequestToken());
             return array('oauth_token' => $token->getToken(), 'oauth_token_secret' => $token->getTokenSecret());
         }
 
-       /**
-        * Fetch URL with OAuth
-        * @param string $url
-        * @param string $params Query params
-        * @param string $method HTTP method
-        * @param array $headers HTTP headers
-        * @return string
-        */
+        /**
+         * Fetch URL with OAuth
+         * @param string $url
+         * @param string $params Query params
+         * @param string $method HTTP method
+         * @param array $headers HTTP headers
+         * @return string
+         */
         
         public function fetch($url, $params = null, $method = 'GET', $headers = null)
         {
             $acc = $this->makeAccessToken();
             if ( strpos($url,'?') ) {
-               list($clean_url, $query) = explode('?', $url);
-               if($query) {
-                   $url = $clean_url;
-                   parse_str($query, $query_params);
-                   $params = array_merge($params?$params:array(), $query_params);
-               }
+                list($clean_url, $query) = explode('?', $url);
+                if($query) {
+                    $url = $clean_url;
+                    parse_str($query, $query_params);
+                    $params = array_merge($params?$params:array(), $query_params);
+                }
             }
             $client = $acc->getHttpClient($this->_oauth_config, $url);
             
@@ -212,33 +212,33 @@ 
             $this->_last = $resp = $client->request();
             $this->_lastReq = $client->getLastRequest();
             return $resp->getBody();
-       }
+        }
 
-       /**
-        * Get HTTP client
-        * @return Zend_Oauth_Client
-        */
-       public function getClient()
-       {
+        /**
+         * Get HTTP client
+         * @return Zend_Oauth_Client
+         */
+        public function getClient()
+        {
             $acc = $this->makeAccessToken();
             return $acc->getHttpClient($this->_oauth_config);
-       }
+        }
 
-       /**
-        * Get last response
-        * @return string
-        */
-       public function getLastResponse()
-       {
+        /**
+         * Get last response
+         * @return string
+         */
+        public function getLastResponse()
+        {
             return $this->_last;
-       }
+        }
 
-       /**
-        * Get last request
-        * @return string
-        */
-       public function getLastRequest()
-       {
+        /**
+         * Get last request
+         * @return string
+         */
+        public function getLastRequest()
+        {
             return $this->_lastReq;
-       }
+        }
     }

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: ';

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.'%';
+        }
 
-	}
+    }
 
 
 }

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

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

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

include/SubPanel/SubPanelDefinitions.php

Indentation +709 added lines, -709 removed lines

@@ -54,13 +54,13 @@ 
 class aSubPanel
 {
 
-	var $name ;
-	var $_instance_properties ;
+    var $name ;
+    var $_instance_properties ;
 
-	var $mod_strings ;
-	var $panel_definition ;
-	var $sub_subpanels ;
-	var $parent_bean ;
+    var $mod_strings ;
+    var $panel_definition ;
+    var $sub_subpanels ;
+    var $parent_bean ;
 
     /**
      * Can we display this subpanel?
@@ -72,80 +72,80 @@ 
      */
     var $canDisplay = true;
 
-	//module's table name and column fields.
-	var $table_name ;
-	var $db_fields ;
-	var $bean_name ;
-	var $template_instance ;
-
-	var $search_query;
-	var $base_collection_list = array();
-
-	function aSubPanel ($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
-
-		$this->_instance_properties = $instance_properties ;
-
-		if(isset($instance_properties['collection_list' ])) $this->base_collection_list = $instance_properties['collection_list' ];
-
-		if(!empty($collections) && isset($instance_properties['collection_list' ])){
-			foreach($instance_properties['collection_list' ] as $cname => $value){
-				if(!in_array($value['module'], $collections)){
-					unset($instance_properties['collection_list'][$cname]);
-				}
-			}
-		}
-		if (!$this->isCollection()){
-			$table = strtolower($instance_properties['module']);
-			$search_query = str_replace('meetings',$table,$search_query);
-		}
-
-		$this->search_query = $search_query;
-		$this->name = $name ;
-		$this->parent_bean = $parent_bean ;
-
-		//set language
-		global $current_language ;
-		if (! isset ( $parent_bean->mbvardefs ))
-		{
-			$mod_strings = return_module_language ( $current_language, $parent_bean->module_dir ) ;
-		}
-		$this->mod_strings = $mod_strings ;
+    //module's table name and column fields.
+    var $table_name ;
+    var $db_fields ;
+    var $bean_name ;
+    var $template_instance ;
+
+    var $search_query;
+    var $base_collection_list = array();
+
+    function aSubPanel ($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
+
+        $this->_instance_properties = $instance_properties ;
+
+        if(isset($instance_properties['collection_list' ])) $this->base_collection_list = $instance_properties['collection_list' ];
+
+        if(!empty($collections) && isset($instance_properties['collection_list' ])){
+            foreach($instance_properties['collection_list' ] as $cname => $value){
+                if(!in_array($value['module'], $collections)){
+                    unset($instance_properties['collection_list'][$cname]);
+                }
+            }
+        }
+        if (!$this->isCollection()){
+            $table = strtolower($instance_properties['module']);
+            $search_query = str_replace('meetings',$table,$search_query);
+        }
+
+        $this->search_query = $search_query;
+        $this->name = $name ;
+        $this->parent_bean = $parent_bean ;
+
+        //set language
+        global $current_language ;
+        if (! isset ( $parent_bean->mbvardefs ))
+        {
+            $mod_strings = return_module_language ( $current_language, $parent_bean->module_dir ) ;
+        }
+        $this->mod_strings = $mod_strings ;
 
         if ($this->isCollection ())
-		{
-			$this->canDisplay = $this->load_sub_subpanels () ; //load sub-panel definition.
-		} else
-		{
-			if (!is_dir('modules/' . $this->_instance_properties [ 'module' ])){
-				_pstack_trace();
-			}
-			$def_path = 'modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'subpanel_name' ] . '.php' ;
-
-			$orig_exists = is_file($def_path);
-			$loaded = false;
-			if ($orig_exists)
-			{
-				require ($def_path);
-				$loaded = true;
-			}
-			if (is_file("custom/$def_path") && (!$original_only  || !$orig_exists))
-			{
-				require ("custom/$def_path");
-				$loaded = true;
-			}
-
-			if (! $original_only && isset ( $this->_instance_properties [ 'override_subpanel_name' ] ) && file_exists ( 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ))
-			{
-				$cust_def_path = 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ;
-				require ($cust_def_path) ;
-				$loaded = true;
-			}
-
-			if (!$loaded)
-			{
-				$GLOBALS['log']->fatal("Failed to load original or custom subpanel data for $name in $def_path");
+        {
+            $this->canDisplay = $this->load_sub_subpanels () ; //load sub-panel definition.
+        } else
+        {
+            if (!is_dir('modules/' . $this->_instance_properties [ 'module' ])){
+                _pstack_trace();
+            }
+            $def_path = 'modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'subpanel_name' ] . '.php' ;
+
+            $orig_exists = is_file($def_path);
+            $loaded = false;
+            if ($orig_exists)
+            {
+                require ($def_path);
+                $loaded = true;
+            }
+            if (is_file("custom/$def_path") && (!$original_only  || !$orig_exists))
+            {
+                require ("custom/$def_path");
+                $loaded = true;
+            }
+
+            if (! $original_only && isset ( $this->_instance_properties [ 'override_subpanel_name' ] ) && file_exists ( 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ))
+            {
+                $cust_def_path = 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ;
+                require ($cust_def_path) ;
+                $loaded = true;
+            }
+
+            if (!$loaded)
+            {
+                $GLOBALS['log']->fatal("Failed to load original or custom subpanel data for $name in $def_path");
                 $this->canDisplay = false;
-			}
+            }
 
             // load module info from the module's bean file
             $this->load_module_info();
@@ -156,10 +156,10 @@ 
             if (isset($subpanel_layout) && is_array($subpanel_layout)) {
                 $this->set_panel_definition($subpanel_layout);
 
-			}
-		}
+            }
+        }
 
-	}
+    }
 
     /**
      * is the sub panel default hidden?
@@ -176,64 +176,64 @@ 
     }
 
 
-	function distinct_query ()
-	{
-		if (isset ( $this->_instance_properties [ 'get_distinct_data' ] ))
-		{
-			return !empty($this->_instance_properties['get_distinct_data']) ? true : false;
-		}
-		return false ;
-	}
-
-	//return the translated header value.
-	function get_title ()
-	{
-		if (empty ( $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ))
-		{
-			return translate ( $this->_instance_properties [ 'title_key' ], $this->_instance_properties [ 'module' ] ) ;
-		}
-		return $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ;
-	}
-
-	//return the definition of buttons. looks for buttons in 2 locations.
-	function get_buttons ()
-	{
-		$buttons = array ( ) ;
-		if (isset ( $this->_instance_properties [ 'top_buttons' ] ))
-		{
-			//this will happen only in the case of sub-panels with multiple sources(activities).
-			$buttons = $this->_instance_properties [ 'top_buttons' ] ;
-		} else
-		{
-			$buttons = $this->panel_definition [ 'top_buttons' ] ;
-		}
-
-		// permissions. hide SubPanelTopComposeEmailButton from activities if email module is disabled.
-		//only email is  being tested becuase other submodules in activites/history such as notes, tasks, meetings and calls cannot be disabled.
-		//as of today these are the only 2 sub-panels that use the union clause.
-		$mod_name = $this->get_module_name () ;
-		if ($mod_name == 'Activities' || $mod_name == 'History')
-		{
-			global $modListHeader ;
-			global $modules_exempt_from_availability_check ;
-			if (isset ( $modListHeader ) && (! (array_key_exists ( 'Emails', $modListHeader ) or array_key_exists ( 'Emails', $modules_exempt_from_availability_check ))))
-			{
-				foreach ( $buttons as $key => $button )
-				{
-					foreach ( $button as $property => $value )
-					{
-						if ($value === 'SubPanelTopComposeEmailButton' || $value === 'SubPanelTopArchiveEmailButton')
-						{
-							//remove this button from the array.
-							unset ( $buttons [ $key ] ) ;
-						}
-					}
-				}
-			}
-		}
-
-		return $buttons ;
-	}
+    function distinct_query ()
+    {
+        if (isset ( $this->_instance_properties [ 'get_distinct_data' ] ))
+        {
+            return !empty($this->_instance_properties['get_distinct_data']) ? true : false;
+        }
+        return false ;
+    }
+
+    //return the translated header value.
+    function get_title ()
+    {
+        if (empty ( $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ))
+        {
+            return translate ( $this->_instance_properties [ 'title_key' ], $this->_instance_properties [ 'module' ] ) ;
+        }
+        return $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ;
+    }
+
+    //return the definition of buttons. looks for buttons in 2 locations.
+    function get_buttons ()
+    {
+        $buttons = array ( ) ;
+        if (isset ( $this->_instance_properties [ 'top_buttons' ] ))
+        {
+            //this will happen only in the case of sub-panels with multiple sources(activities).
+            $buttons = $this->_instance_properties [ 'top_buttons' ] ;
+        } else
+        {
+            $buttons = $this->panel_definition [ 'top_buttons' ] ;
+        }
+
+        // permissions. hide SubPanelTopComposeEmailButton from activities if email module is disabled.
+        //only email is  being tested becuase other submodules in activites/history such as notes, tasks, meetings and calls cannot be disabled.
+        //as of today these are the only 2 sub-panels that use the union clause.
+        $mod_name = $this->get_module_name () ;
+        if ($mod_name == 'Activities' || $mod_name == 'History')
+        {
+            global $modListHeader ;
+            global $modules_exempt_from_availability_check ;
+            if (isset ( $modListHeader ) && (! (array_key_exists ( 'Emails', $modListHeader ) or array_key_exists ( 'Emails', $modules_exempt_from_availability_check ))))
+            {
+                foreach ( $buttons as $key => $button )
+                {
+                    foreach ( $button as $property => $value )
+                    {
+                        if ($value === 'SubPanelTopComposeEmailButton' || $value === 'SubPanelTopArchiveEmailButton')
+                        {
+                            //remove this button from the array.
+                            unset ( $buttons [ $key ] ) ;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $buttons ;
+    }
 
 
     /**
@@ -244,327 +244,327 @@ 
      * @return bool         True by default if the subpanel was loaded.  Will return false if none in the collection are
      *                      allowed by the current user.
      */
-	function load_sub_subpanels ()
-	{
-
-		global $modListHeader ;
-		// added a check for security of tabs to see if an user has access to them
-		// this prevents passing an "unseen" tab to the query string and pulling up its contents
-		if (! isset ( $modListHeader ))
-		{
-			global $current_user ;
-			if (isset ( $current_user ))
-			{
-				$modListHeader = query_module_access_list ( $current_user ) ;
-			}
-		}
-
-		//by default all the activities modules are exempt, so hiding them won't affect their appearance unless the 'activity' subpanel itself is hidden.
-		//add email to the list temporarily so it is not affected in activities subpanel
-		global $modules_exempt_from_availability_check ;
-		$modules_exempt_from_availability_check['Emails'] = 'Emails';
-
-		$listFieldMap = array();
-
-		if (empty ( $this->sub_subpanels ))
-		{
-			$panels = $this->get_inst_prop_value ( 'collection_list' ) ;
-			foreach ( $panels as $panel => $properties )
-			{
-				if (array_key_exists ( $properties [ 'module' ], $modListHeader ) or array_key_exists ( $properties [ 'module' ], $modules_exempt_from_availability_check ))
-				{
-					$this->sub_subpanels [ $panel ] = new aSubPanel ( $panel, $properties, $this->parent_bean, false, false, $this->search_query ) ;
-				}
-			}
-			// if it's empty just dump out as there is nothing to process.
-			if(empty($this->sub_subpanels)) return false;
-			//Sync displayed list fields across the subpanels
-			$display_fields = $this->getDisplayFieldsFromCollection($this->sub_subpanels);
-			$query_fields = array();
-			foreach ( $this->sub_subpanels as $key => $subpanel )
-			{
-				$list_fields = $subpanel->get_list_fields();
-				$listFieldMap[$key] = array();
-				$index = 0;
-				foreach($list_fields as $field => $def)
-				{
-					if (isset($def['vname']) && isset($def['width']))
-					{
-						$index++;
-						if(!empty($def['alias']))
-							$listFieldMap[$key][$def['alias']] = $field;
-						else
-							$listFieldMap[$key][$field] = $field;
-						if (!isset($display_fields[$def['vname']]))
-						{
-							if(sizeof($display_fields) > $index)
-							{
-								//Try to insert the new field in an order that makes sense
-								$start = array_slice($display_fields, 0, $index);
-								$end = array_slice($display_fields, $index);
-								$display_fields = array_merge(
-									$start,
-									array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
-									$end
-								);
-							} else
-							{
-								$display_fields[$def['vname']] = array(
-									'name' => empty($def['alias']) ? $field : $def['alias'],
-									'vname' => $def['vname'],
-									'width' => $def['width'],
-								);
-							}
-						}
-					} else {
-						$query_fields[$field] = $def;
-					}
-				}
-			}
-			foreach ( $this->sub_subpanels as $key => $subpanel )
-			{
-				$list_fields = array();
-				foreach($display_fields as $vname => $def)
-				{
-					$field = $def['name'];
-					$list_key = isset($listFieldMap[$key][$field]) ? $listFieldMap[$key][$field] : $field;
-
-					if (isset($subpanel->panel_definition['list_fields'][$field]))
-					{
-						$list_fields[$field] = $subpanel->panel_definition['list_fields'][$field];
-					}
-					else if ($list_key != $field && isset($subpanel->panel_definition['list_fields'][$list_key]))
-					{
-						$list_fields[$list_key] = $subpanel->panel_definition['list_fields'][$list_key];
-
-					}
-					else {
-						$list_fields[$field] = $display_fields[$vname];
-					}
-				}
-				foreach($query_fields as $field => $def)
-				{
-					if (isset($subpanel->panel_definition['list_fields'][$field]))
-					{
-						$list_fields[$field] = $subpanel->panel_definition['list_fields'][$field];
-					}
-					else {
-						$list_fields[$field] = $def;
-					}
-				}
-				$subpanel->panel_definition['list_fields'] = $list_fields;
-			}
-		}
-
-		return true;
-	}
-
-	protected function getDisplayFieldsFromCollection($sub_subpanels)
-	{
-		$display_fields = array();
-		foreach ($sub_subpanels as $key => $subpanel )
-		{
-			$list_fields = $subpanel->get_list_fields();
-			$index = 0;
-			foreach($list_fields as $field => $def)
-			{
-				if (isset($def['vname']) && isset($def['width']))
-				{
-					$index++;
-					if (!isset($display_fields[$def['vname']]))
-					{
-						if(sizeof($display_fields) > $index)
-						{
-							//Try to insert the new field in an order that makes sense
-							$start = array_slice($display_fields, 0, $index);
-							$end = array_slice($display_fields, $index);
-							$display_fields = array_merge(
-								$start,
-								array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
-								$end
-							);
-						} else
-						{
-							$display_fields[$def['vname']] = array(
-								'name' => $field,
-								'vname' => $def['vname'],
-								'width' => $def['width'],
-							);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	function isDatasourceFunction ()
-	{
-		if (strpos ( $this->get_inst_prop_value ( 'get_subpanel_data' ), 'function' ) === false)
-		{
-			return false ;
-		}
-		return true ;
-	}
+    function load_sub_subpanels ()
+    {
+
+        global $modListHeader ;
+        // added a check for security of tabs to see if an user has access to them
+        // this prevents passing an "unseen" tab to the query string and pulling up its contents
+        if (! isset ( $modListHeader ))
+        {
+            global $current_user ;
+            if (isset ( $current_user ))
+            {
+                $modListHeader = query_module_access_list ( $current_user ) ;
+            }
+        }
+
+        //by default all the activities modules are exempt, so hiding them won't affect their appearance unless the 'activity' subpanel itself is hidden.
+        //add email to the list temporarily so it is not affected in activities subpanel
+        global $modules_exempt_from_availability_check ;
+        $modules_exempt_from_availability_check['Emails'] = 'Emails';
+
+        $listFieldMap = array();
+
+        if (empty ( $this->sub_subpanels ))
+        {
+            $panels = $this->get_inst_prop_value ( 'collection_list' ) ;
+            foreach ( $panels as $panel => $properties )
+            {
+                if (array_key_exists ( $properties [ 'module' ], $modListHeader ) or array_key_exists ( $properties [ 'module' ], $modules_exempt_from_availability_check ))
+                {
+                    $this->sub_subpanels [ $panel ] = new aSubPanel ( $panel, $properties, $this->parent_bean, false, false, $this->search_query ) ;
+                }
+            }
+            // if it's empty just dump out as there is nothing to process.
+            if(empty($this->sub_subpanels)) return false;
+            //Sync displayed list fields across the subpanels
+            $display_fields = $this->getDisplayFieldsFromCollection($this->sub_subpanels);
+            $query_fields = array();
+            foreach ( $this->sub_subpanels as $key => $subpanel )
+            {
+                $list_fields = $subpanel->get_list_fields();
+                $listFieldMap[$key] = array();
+                $index = 0;
+                foreach($list_fields as $field => $def)
+                {
+                    if (isset($def['vname']) && isset($def['width']))
+                    {
+                        $index++;
+                        if(!empty($def['alias']))
+                            $listFieldMap[$key][$def['alias']] = $field;
+                        else
+                            $listFieldMap[$key][$field] = $field;
+                        if (!isset($display_fields[$def['vname']]))
+                        {
+                            if(sizeof($display_fields) > $index)
+                            {
+                                //Try to insert the new field in an order that makes sense
+                                $start = array_slice($display_fields, 0, $index);
+                                $end = array_slice($display_fields, $index);
+                                $display_fields = array_merge(
+                                    $start,
+                                    array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
+                                    $end
+                                );
+                            } else
+                            {
+                                $display_fields[$def['vname']] = array(
+                                    'name' => empty($def['alias']) ? $field : $def['alias'],
+                                    'vname' => $def['vname'],
+                                    'width' => $def['width'],
+                                );
+                            }
+                        }
+                    } else {
+                        $query_fields[$field] = $def;
+                    }
+                }
+            }
+            foreach ( $this->sub_subpanels as $key => $subpanel )
+            {
+                $list_fields = array();
+                foreach($display_fields as $vname => $def)
+                {
+                    $field = $def['name'];
+                    $list_key = isset($listFieldMap[$key][$field]) ? $listFieldMap[$key][$field] : $field;
+
+                    if (isset($subpanel->panel_definition['list_fields'][$field]))
+                    {
+                        $list_fields[$field] = $subpanel->panel_definition['list_fields'][$field];
+                    }
+                    else if ($list_key != $field && isset($subpanel->panel_definition['list_fields'][$list_key]))
+                    {
+                        $list_fields[$list_key] = $subpanel->panel_definition['list_fields'][$list_key];
+
+                    }
+                    else {
+                        $list_fields[$field] = $display_fields[$vname];
+                    }
+                }
+                foreach($query_fields as $field => $def)
+                {
+                    if (isset($subpanel->panel_definition['list_fields'][$field]))
+                    {
+                        $list_fields[$field] = $subpanel->panel_definition['list_fields'][$field];
+                    }
+                    else {
+                        $list_fields[$field] = $def;
+                    }
+                }
+                $subpanel->panel_definition['list_fields'] = $list_fields;
+            }
+        }
+
+        return true;
+    }
+
+    protected function getDisplayFieldsFromCollection($sub_subpanels)
+    {
+        $display_fields = array();
+        foreach ($sub_subpanels as $key => $subpanel )
+        {
+            $list_fields = $subpanel->get_list_fields();
+            $index = 0;
+            foreach($list_fields as $field => $def)
+            {
+                if (isset($def['vname']) && isset($def['width']))
+                {
+                    $index++;
+                    if (!isset($display_fields[$def['vname']]))
+                    {
+                        if(sizeof($display_fields) > $index)
+                        {
+                            //Try to insert the new field in an order that makes sense
+                            $start = array_slice($display_fields, 0, $index);
+                            $end = array_slice($display_fields, $index);
+                            $display_fields = array_merge(
+                                $start,
+                                array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
+                                $end
+                            );
+                        } else
+                        {
+                            $display_fields[$def['vname']] = array(
+                                'name' => $field,
+                                'vname' => $def['vname'],
+                                'width' => $def['width'],
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    function isDatasourceFunction ()
+    {
+        if (strpos ( $this->get_inst_prop_value ( 'get_subpanel_data' ), 'function' ) === false)
+        {
+            return false ;
+        }
+        return true ;
+    }
 
     /**
      * Test to see if the sub panels defs contain a collection
      *
      * @return bool
      */
-	function isCollection ()
-	{
-		return ($this->get_inst_prop_value ( 'type' ) == 'collection');
-	}
-
-	//get value of a property defined at the panel instance level.
-	function get_inst_prop_value ( $name )
-	{
-		return isset($this->_instance_properties[$name]) ? $this->_instance_properties [ $name ] : null;
-	}
-	//get value of a property defined at the panel definition level.
-	function get_def_prop_value ( $name )
-	{
-		if (isset ( $this->panel_definition [ $name ] ))
-		{
-			return $this->panel_definition [ $name ] ;
-		} else
-		{
-			return null ;
-		}
-	}
-
-	//if datasource is of the type function then return the function name
-	//else return the value as is.
-	function get_function_parameters ()
-	{
-		$parameters = array ( ) ;
-		if ($this->isDatasourceFunction ())
-		{
-			$parameters = $this->get_inst_prop_value ( 'function_parameters' ) ;
-		}
-		return $parameters ;
-	}
-
-	function get_data_source_name ( $check_set_subpanel_data = false )
-	{
-		$prop_value = null ;
-		if ($check_set_subpanel_data)
-		{
-			$prop_value = $this->get_inst_prop_value ( 'set_subpanel_data' ) ;
-		}
-		if (! empty ( $prop_value ))
-		{
-			return $prop_value ;
-		} else
-		{
-			//fall back to default behavior.
-		}
-		if ($this->isDatasourceFunction ())
-		{
-			return (substr_replace ( $this->get_inst_prop_value ( 'get_subpanel_data' ), '', 0, 9 )) ;
-		} else
-		{
-			return $this->get_inst_prop_value ( 'get_subpanel_data' ) ;
-		}
-	}
-
-	//returns the where clause for the query.
-	function get_where ()
-	{
-		if($this->get_def_prop_value ( 'where' ) != '' && $this->search_query != ''){
-			return $this->get_def_prop_value ( 'where' ).' AND '.$this->search_query;
-		} else if($this->search_query != ''){
-			return $this->search_query;
-		}
-		return $this->get_def_prop_value ( 'where' ) ;
-	}
-
-	function is_fill_in_additional_fields ()
-	{
-		// do both. inst_prop returns values from metadata/subpaneldefs.php and def_prop returns from subpanel/default.php
-		$temp = $this->get_inst_prop_value ( 'fill_in_additional_fields' ) || $this->get_def_prop_value ( 'fill_in_additional_fields' ) ;
-		return $temp ;
-	}
-
-	function get_list_fields ()
-	{
-		if (isset ( $this->panel_definition [ 'list_fields' ] ))
-		{
-			return $this->panel_definition [ 'list_fields' ] ;
-		} else
-		{
-			return array ( ) ;
-		}
-	}
-
-	function get_module_name ()
-	{
-		return $this->get_inst_prop_value ( 'module' ) ;
-	}
-
-	function get_name ()
-	{
-		return $this->name ;
-	}
-
-	//load subpanel module's table name and column fields.
-	function load_module_info ()
-	{
-		global $beanList ;
-		global $beanFiles ;
-
-		$module_name = $this->get_module_name () ;
-		if (! empty ( $module_name ))
-		{
-
-			$bean_name = $beanList [ $this->get_module_name () ] ;
-
-			$this->bean_name = $bean_name ;
-
-			include_once ($beanFiles [ $bean_name ]) ;
-			$this->template_instance = new $bean_name ( ) ;
-			$this->template_instance->force_load_details = true ;
-			$this->table_name = $this->template_instance->table_name ;
-			//$this->db_fields=$this->template_instance->column_fields;
-		}
-	}
-	//this function is to be used only with sub-panels that are based
-	//on collections.
-	function get_header_panel_def ()
-	{
-		if (! empty ( $this->sub_subpanels ))
-		{
-			if (! empty ( $this->_instance_properties [ 'header_definition_from_subpanel' ] ) && ! empty ( $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ))
-			{
-				return $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ;
-			} else
-			{
-				$display_fields = array();
-				//If we are not pulling from a specific subpanel, create a list of all list fields and use that.
-				foreach($this->sub_subpanels as $subpanel)
-				{
-					$list_fields = $subpanel->get_list_fields();
-					foreach($list_fields as $field => $def)
-					{
-
-					}
-				}
-
-				reset ( $this->sub_subpanels ) ;
-				return current ( $this->sub_subpanels ) ;
-			}
-		}
-		return null ;
-	}
-
-	/**
-	 * Returns an array of current properties of the class.
-	 * It will simply give the class name for instances of classes.
-	 */
-	function _to_array ()
-	{
-		return array ( '_instance_properties' => $this->_instance_properties , 'db_fields' => $this->db_fields , 'mod_strings' => $this->mod_strings , 'name' => $this->name , 'panel_definition' => $this->panel_definition , 'parent_bean' => get_class ( $this->parent_bean ) , 'sub_subpanels' => $this->sub_subpanels , 'table_name' => $this->table_name , 'template_instance' => get_class ( $this->template_instance ) ) ;
-	}
+    function isCollection ()
+    {
+        return ($this->get_inst_prop_value ( 'type' ) == 'collection');
+    }
+
+    //get value of a property defined at the panel instance level.
+    function get_inst_prop_value ( $name )
+    {
+        return isset($this->_instance_properties[$name]) ? $this->_instance_properties [ $name ] : null;
+    }
+    //get value of a property defined at the panel definition level.
+    function get_def_prop_value ( $name )
+    {
+        if (isset ( $this->panel_definition [ $name ] ))
+        {
+            return $this->panel_definition [ $name ] ;
+        } else
+        {
+            return null ;
+        }
+    }
+
+    //if datasource is of the type function then return the function name
+    //else return the value as is.
+    function get_function_parameters ()
+    {
+        $parameters = array ( ) ;
+        if ($this->isDatasourceFunction ())
+        {
+            $parameters = $this->get_inst_prop_value ( 'function_parameters' ) ;
+        }
+        return $parameters ;
+    }
+
+    function get_data_source_name ( $check_set_subpanel_data = false )
+    {
+        $prop_value = null ;
+        if ($check_set_subpanel_data)
+        {
+            $prop_value = $this->get_inst_prop_value ( 'set_subpanel_data' ) ;
+        }
+        if (! empty ( $prop_value ))
+        {
+            return $prop_value ;
+        } else
+        {
+            //fall back to default behavior.
+        }
+        if ($this->isDatasourceFunction ())
+        {
+            return (substr_replace ( $this->get_inst_prop_value ( 'get_subpanel_data' ), '', 0, 9 )) ;
+        } else
+        {
+            return $this->get_inst_prop_value ( 'get_subpanel_data' ) ;
+        }
+    }
+
+    //returns the where clause for the query.
+    function get_where ()
+    {
+        if($this->get_def_prop_value ( 'where' ) != '' && $this->search_query != ''){
+            return $this->get_def_prop_value ( 'where' ).' AND '.$this->search_query;
+        } else if($this->search_query != ''){
+            return $this->search_query;
+        }
+        return $this->get_def_prop_value ( 'where' ) ;
+    }
+
+    function is_fill_in_additional_fields ()
+    {
+        // do both. inst_prop returns values from metadata/subpaneldefs.php and def_prop returns from subpanel/default.php
+        $temp = $this->get_inst_prop_value ( 'fill_in_additional_fields' ) || $this->get_def_prop_value ( 'fill_in_additional_fields' ) ;
+        return $temp ;
+    }
+
+    function get_list_fields ()
+    {
+        if (isset ( $this->panel_definition [ 'list_fields' ] ))
+        {
+            return $this->panel_definition [ 'list_fields' ] ;
+        } else
+        {
+            return array ( ) ;
+        }
+    }
+
+    function get_module_name ()
+    {
+        return $this->get_inst_prop_value ( 'module' ) ;
+    }
+
+    function get_name ()
+    {
+        return $this->name ;
+    }
+
+    //load subpanel module's table name and column fields.
+    function load_module_info ()
+    {
+        global $beanList ;
+        global $beanFiles ;
+
+        $module_name = $this->get_module_name () ;
+        if (! empty ( $module_name ))
+        {
+
+            $bean_name = $beanList [ $this->get_module_name () ] ;
+
+            $this->bean_name = $bean_name ;
+
+            include_once ($beanFiles [ $bean_name ]) ;
+            $this->template_instance = new $bean_name ( ) ;
+            $this->template_instance->force_load_details = true ;
+            $this->table_name = $this->template_instance->table_name ;
+            //$this->db_fields=$this->template_instance->column_fields;
+        }
+    }
+    //this function is to be used only with sub-panels that are based
+    //on collections.
+    function get_header_panel_def ()
+    {
+        if (! empty ( $this->sub_subpanels ))
+        {
+            if (! empty ( $this->_instance_properties [ 'header_definition_from_subpanel' ] ) && ! empty ( $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ))
+            {
+                return $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ;
+            } else
+            {
+                $display_fields = array();
+                //If we are not pulling from a specific subpanel, create a list of all list fields and use that.
+                foreach($this->sub_subpanels as $subpanel)
+                {
+                    $list_fields = $subpanel->get_list_fields();
+                    foreach($list_fields as $field => $def)
+                    {
+
+                    }
+                }
+
+                reset ( $this->sub_subpanels ) ;
+                return current ( $this->sub_subpanels ) ;
+            }
+        }
+        return null ;
+    }
+
+    /**
+     * Returns an array of current properties of the class.
+     * It will simply give the class name for instances of classes.
+     */
+    function _to_array ()
+    {
+        return array ( '_instance_properties' => $this->_instance_properties , 'db_fields' => $this->db_fields , 'mod_strings' => $this->mod_strings , 'name' => $this->name , 'panel_definition' => $this->panel_definition , 'parent_bean' => get_class ( $this->parent_bean ) , 'sub_subpanels' => $this->sub_subpanels , 'table_name' => $this->table_name , 'template_instance' => get_class ( $this->template_instance ) ) ;
+    }
 
     /**
      * Sets definition of the subpanel
@@ -582,301 +582,301 @@ 
 class SubPanelDefinitions
 {
 
-	var $_focus ;
-	var $_visible_tabs_array ;
-	var $panels ;
-	var $layout_defs ;
-
-	/**
-	 * Enter description here...
-	 *
-	 * @param BEAN $focus - this is the bean you want to get the data from
-	 * @param STRING $layout_def_key - if you wish to use a layout_def defined in the default metadata/subpaneldefs.php that is not keyed off of $bean->module_dir pass in the key here
-	 * @param ARRAY $layout_def_override - if you wish to override the default loaded layout defs you pass them in here.
-	 * @return SubPanelDefinitions
-	 */
-	function SubPanelDefinitions ( $focus , $layout_def_key = '' , $layout_def_override = '' )
-	{
-		$this->_focus = $focus ;
-		if (! empty ( $layout_def_override ))
-		{
-			$this->layout_defs = $layout_def_override ;
-
-		} else
-		{
-			$this->open_layout_defs ( false, $layout_def_key ) ;
-		}
-	}
-
-	/**
-	 * This function returns an ordered list of all "tabs", actually subpanels, for this module
-	 * The source list is obtained from the subpanel layout contained in the layout_defs for this module,
-	 * found either in the modules metadata/subpaneldefs.php file, or in the modules custom/.../Ext/Layoutdefs/layoutdefs.ext.php file
-	 * and filtered through an ACL check.
-	 * Note that the keys for the resulting array of tabs are in practice the name of the underlying source relationship for the subpanel
-	 * So for example, the key for a custom module's subpanel with Accounts might be 'one_one_accounts', as generated by the Studio Relationship Editor
-	 * Although OOB module subpanels have keys such as 'accounts', which might on the face of it appear to be a reference to the related module, in fact 'accounts' is still the relationship name
-	 * @param boolean 	Optional - include the subpanel title label in the return array (false)
-	 * @return array	All tabs that pass an ACL check
-	 */
-	function get_available_tabs ($FromGetModuleSubpanels=false)
-	{
-		global $modListHeader ;
-		global $modules_exempt_from_availability_check ;
-
-		if (isset ( $this->_visible_tabs_array ))
-			return $this->_visible_tabs_array ;
-
-		if (empty($modListHeader))
-		    $modListHeader = query_module_access_list($GLOBALS['current_user']);
-
-		$this->_visible_tabs_array = array ( ) ; // bug 16820 - make sure this is an array for the later ksort
-
-		if (isset ( $this->layout_defs [ 'subpanel_setup' ] )) // bug 17434 - belts-and-braces - check that we have some subpanels first
-		{
-			//retrieve list of hidden subpanels
-			$hidden_panels = $this->get_hidden_subpanels();
-
-			//activities is a special use case in that if it is hidden,
-			//then the history tab should be hidden too.
-			if(!empty($hidden_panels) && is_array($hidden_panels) && in_array('activities',$hidden_panels)){
-				//add history to list hidden_panels
-				$hidden_panels['history'] = 'history';
-			}
-
-			foreach ( $this->layout_defs [ 'subpanel_setup' ] as $key => $values_array )
-			{
-				//exclude if this subpanel is hidden from admin screens
+    var $_focus ;
+    var $_visible_tabs_array ;
+    var $panels ;
+    var $layout_defs ;
+
+    /**
+     * Enter description here...
+     *
+     * @param BEAN $focus - this is the bean you want to get the data from
+     * @param STRING $layout_def_key - if you wish to use a layout_def defined in the default metadata/subpaneldefs.php that is not keyed off of $bean->module_dir pass in the key here
+     * @param ARRAY $layout_def_override - if you wish to override the default loaded layout defs you pass them in here.
+     * @return SubPanelDefinitions
+     */
+    function SubPanelDefinitions ( $focus , $layout_def_key = '' , $layout_def_override = '' )
+    {
+        $this->_focus = $focus ;
+        if (! empty ( $layout_def_override ))
+        {
+            $this->layout_defs = $layout_def_override ;
+
+        } else
+        {
+            $this->open_layout_defs ( false, $layout_def_key ) ;
+        }
+    }
+
+    /**
+     * This function returns an ordered list of all "tabs", actually subpanels, for this module
+     * The source list is obtained from the subpanel layout contained in the layout_defs for this module,
+     * found either in the modules metadata/subpaneldefs.php file, or in the modules custom/.../Ext/Layoutdefs/layoutdefs.ext.php file
+     * and filtered through an ACL check.
+     * Note that the keys for the resulting array of tabs are in practice the name of the underlying source relationship for the subpanel
+     * So for example, the key for a custom module's subpanel with Accounts might be 'one_one_accounts', as generated by the Studio Relationship Editor
+     * Although OOB module subpanels have keys such as 'accounts', which might on the face of it appear to be a reference to the related module, in fact 'accounts' is still the relationship name
+     * @param boolean 	Optional - include the subpanel title label in the return array (false)
+     * @return array	All tabs that pass an ACL check
+     */
+    function get_available_tabs ($FromGetModuleSubpanels=false)
+    {
+        global $modListHeader ;
+        global $modules_exempt_from_availability_check ;
+
+        if (isset ( $this->_visible_tabs_array ))
+            return $this->_visible_tabs_array ;
+
+        if (empty($modListHeader))
+            $modListHeader = query_module_access_list($GLOBALS['current_user']);
+
+        $this->_visible_tabs_array = array ( ) ; // bug 16820 - make sure this is an array for the later ksort
+
+        if (isset ( $this->layout_defs [ 'subpanel_setup' ] )) // bug 17434 - belts-and-braces - check that we have some subpanels first
+        {
+            //retrieve list of hidden subpanels
+            $hidden_panels = $this->get_hidden_subpanels();
+
+            //activities is a special use case in that if it is hidden,
+            //then the history tab should be hidden too.
+            if(!empty($hidden_panels) && is_array($hidden_panels) && in_array('activities',$hidden_panels)){
+                //add history to list hidden_panels
+                $hidden_panels['history'] = 'history';
+            }
+
+            foreach ( $this->layout_defs [ 'subpanel_setup' ] as $key => $values_array )
+            {
+                //exclude if this subpanel is hidden from admin screens
                 $module = $key;
                 if ( isset($values_array['module']) )
                     $module = strtolower($values_array['module']);
-				 if ($hidden_panels && is_array($hidden_panels) && (in_array($module, $hidden_panels) || array_key_exists($module, $hidden_panels)) ){
-				 	//this panel is hidden, skip it
-				 	continue;
-				 }
-
-				// make sure the module attribute is set, else none of this works...
-				if ( !isset($values_array [ 'module' ])) {
-					$GLOBALS['log']->debug("SubPanelDefinitions->get_available_tabs(): no module defined in subpaneldefs for '$key' =>" . var_export($values_array,true) . " - ingoring subpanel defintion") ;
-					continue;
-				}
-
-				//check permissions.
-				$exempt = array_key_exists ( $values_array [ 'module' ], $modules_exempt_from_availability_check ) ;
-				$ok = $exempt || ( (! ACLController::moduleSupportsACL ( $values_array [ 'module' ] ) || ACLController::checkAccess ( $values_array [ 'module' ], 'list', true ) ) ) ;
-
-				$GLOBALS [ 'log' ]->debug ( "SubPanelDefinitions->get_available_tabs(): " . $key . "= " . ( $exempt ? "exempt " : "not exempt " .( $ok ? " ACL OK" : "" ) ) ) ;
-
-				if ( $ok )
-				{
-					while ( ! empty ( $this->_visible_tabs_array [ $values_array [ 'order' ] ] ) )
-					{
-						$values_array [ 'order' ] ++ ;
-					}
-
-					$this->_visible_tabs_array [ $values_array ['order'] ] = ($FromGetModuleSubpanels) ? array($key=>$values_array['title_key']) : $key ;
-				}
-			}
-		}
-
-		ksort ( $this->_visible_tabs_array ) ;
-		return $this->_visible_tabs_array ;
-	}
-
-	/**
-	 * Load the definition of the a sub-panel.
-	 * Also the sub-panel is added to an array of sub-panels.
-	 * use of reload has been deprecated, since the subpanel is initialized every time.
+                    if ($hidden_panels && is_array($hidden_panels) && (in_array($module, $hidden_panels) || array_key_exists($module, $hidden_panels)) ){
+                        //this panel is hidden, skip it
+                        continue;
+                    }
+
+                // make sure the module attribute is set, else none of this works...
+                if ( !isset($values_array [ 'module' ])) {
+                    $GLOBALS['log']->debug("SubPanelDefinitions->get_available_tabs(): no module defined in subpaneldefs for '$key' =>" . var_export($values_array,true) . " - ingoring subpanel defintion") ;
+                    continue;
+                }
+
+                //check permissions.
+                $exempt = array_key_exists ( $values_array [ 'module' ], $modules_exempt_from_availability_check ) ;
+                $ok = $exempt || ( (! ACLController::moduleSupportsACL ( $values_array [ 'module' ] ) || ACLController::checkAccess ( $values_array [ 'module' ], 'list', true ) ) ) ;
+
+                $GLOBALS [ 'log' ]->debug ( "SubPanelDefinitions->get_available_tabs(): " . $key . "= " . ( $exempt ? "exempt " : "not exempt " .( $ok ? " ACL OK" : "" ) ) ) ;
+
+                if ( $ok )
+                {
+                    while ( ! empty ( $this->_visible_tabs_array [ $values_array [ 'order' ] ] ) )
+                    {
+                        $values_array [ 'order' ] ++ ;
+                    }
+
+                    $this->_visible_tabs_array [ $values_array ['order'] ] = ($FromGetModuleSubpanels) ? array($key=>$values_array['title_key']) : $key ;
+                }
+            }
+        }
+
+        ksort ( $this->_visible_tabs_array ) ;
+        return $this->_visible_tabs_array ;
+    }
+
+    /**
+     * Load the definition of the a sub-panel.
+     * Also the sub-panel is added to an array of sub-panels.
+     * use of reload has been deprecated, since the subpanel is initialized every time.
      *
      * @param string $name              The name of the sub-panel to reload
      * @param boolean $reload           Reload the sub-panel (unused)
      * @param boolean $original_only    Only load the original sub-panel and no custom ones
      * @return boolean|aSubPanel        Returns aSubPanel object or boolean false if one is not found or it can't be
      *      displayed due to ACL reasons.
-	 */
-	function load_subpanel ( $name , $reload = false , $original_only = false, $search_query = '', $collections = array() )
-	{
-		if (!is_dir('modules/' . $this->layout_defs [ 'subpanel_setup' ][ strtolower ( $name ) ] [ 'module' ]))
-			return false;
+     */
+    function load_subpanel ( $name , $reload = false , $original_only = false, $search_query = '', $collections = array() )
+    {
+        if (!is_dir('modules/' . $this->layout_defs [ 'subpanel_setup' ][ strtolower ( $name ) ] [ 'module' ]))
+            return false;
 
-		$subpanel = new aSubPanel ( $name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower ( $name ) ], $this->_focus, $reload, $original_only, $search_query, $collections ) ;
+        $subpanel = new aSubPanel ( $name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower ( $name ) ], $this->_focus, $reload, $original_only, $search_query, $collections ) ;
 
-		// only return the subpanel object if we can display it.
-		if($subpanel->canDisplay == true) {
-			return $subpanel;
-		}
+        // only return the subpanel object if we can display it.
+        if($subpanel->canDisplay == true) {
+            return $subpanel;
+        }
 
-		// by default return false so we don't show anything if it's not required.
-		return false;
-	}
+        // by default return false so we don't show anything if it's not required.
+        return false;
+    }
 
-	/**
-	 * Load the layout def file and associate the definition with a variable in the file.
-	 */
-	function open_layout_defs ( $reload = false , $layout_def_key = '' , $original_only = false )
-	{
-		$layout_defs [ $this->_focus->module_dir ] = array ( ) ;
-		$layout_defs [ $layout_def_key ] = array ( ) ;
+    /**
+     * Load the layout def file and associate the definition with a variable in the file.
+     */
+    function open_layout_defs ( $reload = false , $layout_def_key = '' , $original_only = false )
+    {
+        $layout_defs [ $this->_focus->module_dir ] = array ( ) ;
+        $layout_defs [ $layout_def_key ] = array ( ) ;
 
-		if (empty ( $this->layout_defs ) || $reload || (! empty ( $layout_def_key ) && ! isset ( $layout_defs [ $layout_def_key ] )))
-		{
-			if (file_exists ( 'modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php' ))
-				require ('modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php') ;
+        if (empty ( $this->layout_defs ) || $reload || (! empty ( $layout_def_key ) && ! isset ( $layout_defs [ $layout_def_key ] )))
+        {
+            if (file_exists ( 'modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php' ))
+                require ('modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php') ;
 
-			if (! $original_only && file_exists ( 'custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php' ))
-				require ('custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php') ;
+            if (! $original_only && file_exists ( 'custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php' ))
+                require ('custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php') ;
 
-			if (! empty ( $layout_def_key ))
-				$this->layout_defs = $layout_defs [ $layout_def_key ] ;
-			else
-				$this->layout_defs = $layout_defs [ $this->_focus->module_dir ] ;
+            if (! empty ( $layout_def_key ))
+                $this->layout_defs = $layout_defs [ $layout_def_key ] ;
+            else
+                $this->layout_defs = $layout_defs [ $this->_focus->module_dir ] ;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Removes a tab from the list of loaded tabs.
-	 * Returns true if successful, false otherwise.
-	 * Hint: Used by Campaign's DetailView.
-	 */
-	function exclude_tab ( $tab_name )
-	{
-		$result = false ;
-		//unset layout definition
-		if (! empty ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ))
-		{
-			unset ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ) ;
-		}
-		//unset instance from _visible_tab_array
-		if (! empty ( $this->_visible_tabs_array ))
-		{
-			$key = array_search ( $tab_name, $this->_visible_tabs_array ) ;
-			if ($key !== false)
-			{
-				unset ( $this->_visible_tabs_array [ $key ] ) ;
-			}
-		}
-		return $result ;
-	}
-
-
-	/**
-	 * return all available subpanels that belong to the list of tab modules.  You can optionally return all
-	 * available subpanels, and also optionally group by module (prepends the key with the bean class name).
-	 */
-	function get_all_subpanels( $return_tab_modules_only = true, $group_by_module = false )
-	{
-		global $moduleList, $beanFiles, $beanList, $module;
+    /**
+     * Removes a tab from the list of loaded tabs.
+     * Returns true if successful, false otherwise.
+     * Hint: Used by Campaign's DetailView.
+     */
+    function exclude_tab ( $tab_name )
+    {
+        $result = false ;
+        //unset layout definition
+        if (! empty ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ))
+        {
+            unset ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ) ;
+        }
+        //unset instance from _visible_tab_array
+        if (! empty ( $this->_visible_tabs_array ))
+        {
+            $key = array_search ( $tab_name, $this->_visible_tabs_array ) ;
+            if ($key !== false)
+            {
+                unset ( $this->_visible_tabs_array [ $key ] ) ;
+            }
+        }
+        return $result ;
+    }
+
+
+    /**
+     * return all available subpanels that belong to the list of tab modules.  You can optionally return all
+     * available subpanels, and also optionally group by module (prepends the key with the bean class name).
+     */
+    function get_all_subpanels( $return_tab_modules_only = true, $group_by_module = false )
+    {
+        global $moduleList, $beanFiles, $beanList, $module;
 
-		//use tab controller function to get module list with named keys
-		require_once("modules/MySettings/TabController.php");
-		$modules_to_check = TabController::get_key_array($moduleList);
+        //use tab controller function to get module list with named keys
+        require_once("modules/MySettings/TabController.php");
+        $modules_to_check = TabController::get_key_array($moduleList);
 
-		//change case to match subpanel processing later on
-		$modules_to_check = array_change_key_case($modules_to_check);
+        //change case to match subpanel processing later on
+        $modules_to_check = array_change_key_case($modules_to_check);
         // Append on the CampaignLog module, because that is where the subpanels point, not directly to Campaigns
         $modules_to_check['campaignlog'] = "CampaignLog";
 
 
-		$spd = '';
-		$spd_arr = array();
-		//iterate through modules and build subpanel array
-		foreach($modules_to_check as $mod_name){
+        $spd = '';
+        $spd_arr = array();
+        //iterate through modules and build subpanel array
+        foreach($modules_to_check as $mod_name){
 
-			//skip if module name is not in bean list, otherwise get the bean class name
-			if(!isset($beanList[$mod_name])) continue;
-			$class = $beanList[$mod_name];
+            //skip if module name is not in bean list, otherwise get the bean class name
+            if(!isset($beanList[$mod_name])) continue;
+            $class = $beanList[$mod_name];
 
-			//skip if class name is not in file list, otherwise require the bean file and create new class
-			if(!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) continue;
+            //skip if class name is not in file list, otherwise require the bean file and create new class
+            if(!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) continue;
 
-			//retrieve subpanels for this bean
-			require_once($beanFiles[$class]);
-			$bean_class = new $class();
+            //retrieve subpanels for this bean
+            require_once($beanFiles[$class]);
+            $bean_class = new $class();
 
-			//create new subpanel definition instance and get list of tabs
-			$spd = new SubPanelDefinitions($bean_class) ;
-			$sub_tabs = $spd->get_available_tabs();
+            //create new subpanel definition instance and get list of tabs
+            $spd = new SubPanelDefinitions($bean_class) ;
+            $sub_tabs = $spd->get_available_tabs();
 
-			//add each subpanel to array of total subpanles
-			foreach( $sub_tabs as $panel_key){
-				$panel_key = strtolower($panel_key);
+            //add each subpanel to array of total subpanles
+            foreach( $sub_tabs as $panel_key){
+                $panel_key = strtolower($panel_key);
                 $panel_module = $panel_key;
                 if ( isset($spd->layout_defs['subpanel_setup'][$panel_key]['module']) )
                     $panel_module = strtolower($spd->layout_defs['subpanel_setup'][$panel_key]['module']);
                 //if module_only flag is set, only if it is also in module array
-				if($return_tab_modules_only && !array_key_exists($panel_module, $modules_to_check)) continue;
-				$panel_key_name = $panel_module;
-
-				//group_by_key_name is set to true, then array will hold an entry for each
-				//subpanel, with the module name prepended in the key
-				if($group_by_module) $panel_key_name = $class.'_'.$panel_key_name;
-				//add panel name to subpanel array
-				$spd_arr[$panel_key_name] = $panel_module;
-			}
-		}
-		return 	$spd_arr;
-	}
-
-	/*
+                if($return_tab_modules_only && !array_key_exists($panel_module, $modules_to_check)) continue;
+                $panel_key_name = $panel_module;
+
+                //group_by_key_name is set to true, then array will hold an entry for each
+                //subpanel, with the module name prepended in the key
+                if($group_by_module) $panel_key_name = $class.'_'.$panel_key_name;
+                //add panel name to subpanel array
+                $spd_arr[$panel_key_name] = $panel_module;
+            }
+        }
+        return 	$spd_arr;
+    }
+
+    /*
 	 * save array of hidden panels to mysettings category in config table
 	 */
-	function set_hidden_subpanels($panels){
-		$administration = new Administration();
-		$serialized = base64_encode(serialize($panels));
-		$administration->saveSetting('MySettings', 'hide_subpanels', $serialized);
-	}
+    function set_hidden_subpanels($panels){
+        $administration = new Administration();
+        $serialized = base64_encode(serialize($panels));
+        $administration->saveSetting('MySettings', 'hide_subpanels', $serialized);
+    }
 
-	/*
+    /*
 	 * retrieve hidden subpanels
 	 */
-	function get_hidden_subpanels(){
-		global $moduleList;
-
-		//create variable as static to minimize queries
-		static $hidden_subpanels = null;
-
-		// if the static value is not already cached, then retrieve it.
-		if(empty($hidden_subpanels))
-		{
-
-			//create Administration object and retrieve any settings for panels
-			$administration = new Administration();
-			$administration->retrieveSettings('MySettings');
-
-			if(isset($administration->settings) && isset($administration->settings['MySettings_hide_subpanels'])){
-				$hidden_subpanels = $administration->settings['MySettings_hide_subpanels'];
-				$hidden_subpanels = trim($hidden_subpanels);
-
-				//make sure serialized string is not empty
-				if (!empty($hidden_subpanels)){
-					//decode and unserialize to retrieve the array
-					$hidden_subpanels = base64_decode($hidden_subpanels);
-					$hidden_subpanels = unserialize($hidden_subpanels);
-
-					//Ensure modules saved in the preferences exist.
-					//get user preference
-					//unserialize and add to array if not empty
-					$pref_hidden = array();
-					foreach($pref_hidden as $id => $pref_hidden_panel) {
-						$hidden_subpanels[] = $pref_hidden_panel;
-					}
-
-
-				}else{
-					//no settings found, return empty
-					return $hidden_subpanels;
-				}
-			}
-			else
-			{	//no settings found, return empty
-				return $hidden_subpanels;
-			}
-		}
-
-		return $hidden_subpanels;
-	}
+    function get_hidden_subpanels(){
+        global $moduleList;
+
+        //create variable as static to minimize queries
+        static $hidden_subpanels = null;
+
+        // if the static value is not already cached, then retrieve it.
+        if(empty($hidden_subpanels))
+        {
+
+            //create Administration object and retrieve any settings for panels
+            $administration = new Administration();
+            $administration->retrieveSettings('MySettings');
+
+            if(isset($administration->settings) && isset($administration->settings['MySettings_hide_subpanels'])){
+                $hidden_subpanels = $administration->settings['MySettings_hide_subpanels'];
+                $hidden_subpanels = trim($hidden_subpanels);
+
+                //make sure serialized string is not empty
+                if (!empty($hidden_subpanels)){
+                    //decode and unserialize to retrieve the array
+                    $hidden_subpanels = base64_decode($hidden_subpanels);
+                    $hidden_subpanels = unserialize($hidden_subpanels);
+
+                    //Ensure modules saved in the preferences exist.
+                    //get user preference
+                    //unserialize and add to array if not empty
+                    $pref_hidden = array();
+                    foreach($pref_hidden as $id => $pref_hidden_panel) {
+                        $hidden_subpanels[] = $pref_hidden_panel;
+                    }
+
+
+                }else{
+                    //no settings found, return empty
+                    return $hidden_subpanels;
+                }
+            }
+            else
+            {	//no settings found, return empty
+                return $hidden_subpanels;
+            }
+        }
+
+        return $hidden_subpanels;
+    }
 
 
 }

include/SubPanel/SubPanel.php

Indentation +356 added lines, -356 removed lines

@@ -45,406 +45,406 @@
  */
 class SubPanel
 {
-	var $hideNewButton = false;
-	var $subpanel_id;
-	var $parent_record_id;
-	var $parent_module;  // the name of the parent module
-	var $parent_bean;  // the instantiated bean of the parent
-	var $template_file;
-	var $linked_fields;
-	var $action = 'DetailView';
-	var $show_select_button = true;
-	var $subpanel_define = null;  // contains the layout_def.php
-	var $subpanel_defs;
-	var $subpanel_query=null;
+    var $hideNewButton = false;
+    var $subpanel_id;
+    var $parent_record_id;
+    var $parent_module;  // the name of the parent module
+    var $parent_bean;  // the instantiated bean of the parent
+    var $template_file;
+    var $linked_fields;
+    var $action = 'DetailView';
+    var $show_select_button = true;
+    var $subpanel_define = null;  // contains the layout_def.php
+    var $subpanel_defs;
+    var $subpanel_query=null;
     var $layout_def_key='';
-	var $search_query='';
-	var $collections = array();
-
-	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() )
-	{
-		global $beanList, $beanFiles, $focus, $app_strings;
-
-		$this->subpanel_defs=$subpanelDef;
-		$this->subpanel_id = $subpanel_id;
-		$this->parent_record_id = $record_id;
-		$this->parent_module = $module;
-		$this->layout_def_key = $layout_def_key;
-		$this->collections = $collections;
-
-		$this->parent_bean = $focus;
-		$result = $focus;
-
-		if(empty($result))
-		{
-			$parent_bean_name = $beanList[$module];
-			$parent_bean_file = $beanFiles[$parent_bean_name];
-			require_once($parent_bean_file);
-			$this->parent_bean = new $parent_bean_name();
-			$this->parent_bean->retrieve($this->parent_record_id);
-			$result = $this->parent_bean;
-		}
-
-		if($record_id!='fab4' && $result == null)
-		{
-			sugar_die($app_strings['ERROR_NO_RECORD']);
-		}
-		$this->buildSearchQuery();
-		if (empty($subpanelDef)) {
-			//load the subpanel by name.
-			if (!class_exists('MyClass')) {
-				require_once 'include/SubPanel/SubPanelDefinitions.php' ;
-			}
-			$panelsdef=new SubPanelDefinitions($result,$layout_def_key);
-			$subpanelDef=$panelsdef->load_subpanel($subpanel_id, false, false, $this->search_query,$collections);
-			$this->subpanel_defs=$subpanelDef;
-
-		}
-	}
-
-	function setTemplateFile($template_file)
-	{
-		$this->template_file = $template_file;
-	}
-
-	function setBeanList(&$value){
-		$this->bean_list =$value;
-	}
-
-	function setHideNewButton($value){
-		$this->hideNewButton = $value;
-	}
-
-
-	function getHeaderText( $currentModule){
-	}
-
-	function get_buttons( $panel_query=null)
-	{
-
-		$thisPanel =& $this->subpanel_defs;
-		$subpanel_def = $thisPanel->get_buttons();
-
-		if(!isset($this->listview)){
-			$this->listview = new ListView();
-		}
-		$layout_manager = $this->listview->getLayoutManager();
-		$widget_contents = '<div><table cellpadding="0" cellspacing="0"><tr>';
-		foreach($subpanel_def as $widget_data)
-		{
-			$widget_data['action'] = $_REQUEST['action'];
-			$widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
-			$widget_data['focus'] = $this->parent_bean;
-			$widget_data['subpanel_definition'] = $thisPanel;
-			$widget_contents .= '<td style="padding-right: 2px; padding-bottom: 2px;">' . "\n";
-
-			if(empty($widget_data['widget_class']))
-			{
-				$widget_contents .= "widget_class not defined for top subpanel buttons";
-			}
-			else
-			{
-				$widget_contents .= $layout_manager->widgetDisplay($widget_data);
-			}
-
-			$widget_contents .= '</td>';
-		}
-
-		$widget_contents .= '</tr></table></div>';
-		return $widget_contents;
-	}
-
-
-	function ProcessSubPanelListView($xTemplatePath, &$mod_strings)
-	{
-		global $app_strings;
-		global $current_user;
-		global $sugar_config;
-
-		if(isset($this->listview)){
-			$ListView =& $this->listview;
-		}else{
-			$ListView = new ListView();
-		}
-		$ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
-		$ListView->xTemplateAssign("RETURN_URL", "&return_module=".$this->parent_module."&return_action=DetailView&return_id=".$this->parent_bean->id);
-		$ListView->xTemplateAssign("RELATED_MODULE", $this->parent_module);  // TODO: what about unions?
-		$ListView->xTemplateAssign("RECORD_ID", $this->parent_bean->id);
-		$ListView->xTemplateAssign("EDIT_INLINE_PNG", SugarThemeRegistry::current()->getImage('edit_inline','align="absmiddle"  border="0"',null,null,'.gif',$app_strings['LNK_EDIT']));
-		$ListView->xTemplateAssign("DELETE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_DELETE_INLINE']));
-		$ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_ID_FF_REMOVE']));
-		$header_text= '';
-
-		$ListView->xTemplateAssign("SUBPANEL_ID", $this->subpanel_id);
-		$ListView->xTemplateAssign("SUBPANEL_SEARCH", $this->getSearchForm());
-		$display_sps = '';
-		if($this->search_query == '' && empty($this->collections)) $display_sps = 'display:none';
-		$ListView->xTemplateAssign("DISPLAY_SPS",$display_sps);
-
-		if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace']))
-		{
-			$exploded = explode('/', $xTemplatePath);
-			$file_name = $exploded[sizeof($exploded) - 1];
-			$mod_name =  $exploded[sizeof($exploded) - 2];
-			$header_text= "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=$file_name&from_module=$mod_name&mod_lang="
-				.$_REQUEST['module']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif','Edit Layout')."</a>";
-		}
-		$ListView->setHeaderTitle('');
-		$ListView->setHeaderText('');
-
-		ob_start();
-
-		$ListView->is_dynamic = true;
-		$ListView->records_per_page = $sugar_config['list_max_entries_per_subpanel'] + 0;
-		if (isset($this->subpanel_defs->_instance_properties['records_per_page'])) {
-			$ListView->records_per_page = $this->subpanel_defs->_instance_properties['records_per_page'] + 0;
-		}
-		$ListView->start_link_wrapper = "javascript:showSubPanel('".$this->subpanel_id."','";
-		$ListView->subpanel_id = $this->subpanel_id;
-		$ListView->end_link_wrapper = "',true);";
-		if ( !empty($this->layout_def_key) ) {
-			$ListView->end_link_wrapper = '&layout_def_key='.$this->layout_def_key.$ListView->end_link_wrapper;
-		}
-
-		$where = '';
-		$ListView->setQuery($where, '', '', '');
-		$ListView->show_export_button = false;
-
-		//function returns the query that was used to populate sub-panel data.
-
-		$query=$ListView->process_dynamic_listview($this->parent_module, $this->parent_bean,$this->subpanel_defs);
-		$this->subpanel_query=$query;
-		$ob_contents = ob_get_contents();
-		ob_end_clean();
-		return $ob_contents;
-	}
-
-	function display()
-	{
-		$result_array = array();
-
-		$return_string = $this->ProcessSubPanelListView($this->template_file,$result_array);
-
-		print $return_string;
-	}
-
-	function getModulesWithSubpanels()
-	{
-		global $beanList;
-		$dir = dir('modules');
-		$modules = array();
-		while($entry = $dir->read())
-		{
-			if(file_exists('modules/' . $entry . '/layout_defs.php'))
-			{
-				$modules[$entry] = $entry;
-			}
-		}
-		return $modules;
-	}
-
-  static function getModuleSubpanels($module){
-  	require_once('include/SubPanel/SubPanelDefinitions.php');
-  		global $beanList, $beanFiles;
-  		if(!isset($beanList[$module])){
-  			return array();
-  		}
-
-  		$class = $beanList[$module];
-  		require_once($beanFiles[$class]);
-  		$mod = new $class();
-  		$spd = new SubPanelDefinitions($mod);
-  		$tabs = $spd->get_available_tabs(true);
-  		$ret_tabs = array();
-  		$reject_tabs = array('history'=>1, 'activities'=>1);
-  		foreach($tabs as $key=>$tab){
-  		    foreach($tab as $k=>$v){
+    var $search_query='';
+    var $collections = array();
+
+    function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() )
+    {
+        global $beanList, $beanFiles, $focus, $app_strings;
+
+        $this->subpanel_defs=$subpanelDef;
+        $this->subpanel_id = $subpanel_id;
+        $this->parent_record_id = $record_id;
+        $this->parent_module = $module;
+        $this->layout_def_key = $layout_def_key;
+        $this->collections = $collections;
+
+        $this->parent_bean = $focus;
+        $result = $focus;
+
+        if(empty($result))
+        {
+            $parent_bean_name = $beanList[$module];
+            $parent_bean_file = $beanFiles[$parent_bean_name];
+            require_once($parent_bean_file);
+            $this->parent_bean = new $parent_bean_name();
+            $this->parent_bean->retrieve($this->parent_record_id);
+            $result = $this->parent_bean;
+        }
+
+        if($record_id!='fab4' && $result == null)
+        {
+            sugar_die($app_strings['ERROR_NO_RECORD']);
+        }
+        $this->buildSearchQuery();
+        if (empty($subpanelDef)) {
+            //load the subpanel by name.
+            if (!class_exists('MyClass')) {
+                require_once 'include/SubPanel/SubPanelDefinitions.php' ;
+            }
+            $panelsdef=new SubPanelDefinitions($result,$layout_def_key);
+            $subpanelDef=$panelsdef->load_subpanel($subpanel_id, false, false, $this->search_query,$collections);
+            $this->subpanel_defs=$subpanelDef;
+
+        }
+    }
+
+    function setTemplateFile($template_file)
+    {
+        $this->template_file = $template_file;
+    }
+
+    function setBeanList(&$value){
+        $this->bean_list =$value;
+    }
+
+    function setHideNewButton($value){
+        $this->hideNewButton = $value;
+    }
+
+
+    function getHeaderText( $currentModule){
+    }
+
+    function get_buttons( $panel_query=null)
+    {
+
+        $thisPanel =& $this->subpanel_defs;
+        $subpanel_def = $thisPanel->get_buttons();
+
+        if(!isset($this->listview)){
+            $this->listview = new ListView();
+        }
+        $layout_manager = $this->listview->getLayoutManager();
+        $widget_contents = '<div><table cellpadding="0" cellspacing="0"><tr>';
+        foreach($subpanel_def as $widget_data)
+        {
+            $widget_data['action'] = $_REQUEST['action'];
+            $widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
+            $widget_data['focus'] = $this->parent_bean;
+            $widget_data['subpanel_definition'] = $thisPanel;
+            $widget_contents .= '<td style="padding-right: 2px; padding-bottom: 2px;">' . "\n";
+
+            if(empty($widget_data['widget_class']))
+            {
+                $widget_contents .= "widget_class not defined for top subpanel buttons";
+            }
+            else
+            {
+                $widget_contents .= $layout_manager->widgetDisplay($widget_data);
+            }
+
+            $widget_contents .= '</td>';
+        }
+
+        $widget_contents .= '</tr></table></div>';
+        return $widget_contents;
+    }
+
+
+    function ProcessSubPanelListView($xTemplatePath, &$mod_strings)
+    {
+        global $app_strings;
+        global $current_user;
+        global $sugar_config;
+
+        if(isset($this->listview)){
+            $ListView =& $this->listview;
+        }else{
+            $ListView = new ListView();
+        }
+        $ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
+        $ListView->xTemplateAssign("RETURN_URL", "&return_module=".$this->parent_module."&return_action=DetailView&return_id=".$this->parent_bean->id);
+        $ListView->xTemplateAssign("RELATED_MODULE", $this->parent_module);  // TODO: what about unions?
+        $ListView->xTemplateAssign("RECORD_ID", $this->parent_bean->id);
+        $ListView->xTemplateAssign("EDIT_INLINE_PNG", SugarThemeRegistry::current()->getImage('edit_inline','align="absmiddle"  border="0"',null,null,'.gif',$app_strings['LNK_EDIT']));
+        $ListView->xTemplateAssign("DELETE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_DELETE_INLINE']));
+        $ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_ID_FF_REMOVE']));
+        $header_text= '';
+
+        $ListView->xTemplateAssign("SUBPANEL_ID", $this->subpanel_id);
+        $ListView->xTemplateAssign("SUBPANEL_SEARCH", $this->getSearchForm());
+        $display_sps = '';
+        if($this->search_query == '' && empty($this->collections)) $display_sps = 'display:none';
+        $ListView->xTemplateAssign("DISPLAY_SPS",$display_sps);
+
+        if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace']))
+        {
+            $exploded = explode('/', $xTemplatePath);
+            $file_name = $exploded[sizeof($exploded) - 1];
+            $mod_name =  $exploded[sizeof($exploded) - 2];
+            $header_text= "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=$file_name&from_module=$mod_name&mod_lang="
+                .$_REQUEST['module']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif','Edit Layout')."</a>";
+        }
+        $ListView->setHeaderTitle('');
+        $ListView->setHeaderText('');
+
+        ob_start();
+
+        $ListView->is_dynamic = true;
+        $ListView->records_per_page = $sugar_config['list_max_entries_per_subpanel'] + 0;
+        if (isset($this->subpanel_defs->_instance_properties['records_per_page'])) {
+            $ListView->records_per_page = $this->subpanel_defs->_instance_properties['records_per_page'] + 0;
+        }
+        $ListView->start_link_wrapper = "javascript:showSubPanel('".$this->subpanel_id."','";
+        $ListView->subpanel_id = $this->subpanel_id;
+        $ListView->end_link_wrapper = "',true);";
+        if ( !empty($this->layout_def_key) ) {
+            $ListView->end_link_wrapper = '&layout_def_key='.$this->layout_def_key.$ListView->end_link_wrapper;
+        }
+
+        $where = '';
+        $ListView->setQuery($where, '', '', '');
+        $ListView->show_export_button = false;
+
+        //function returns the query that was used to populate sub-panel data.
+
+        $query=$ListView->process_dynamic_listview($this->parent_module, $this->parent_bean,$this->subpanel_defs);
+        $this->subpanel_query=$query;
+        $ob_contents = ob_get_contents();
+        ob_end_clean();
+        return $ob_contents;
+    }
+
+    function display()
+    {
+        $result_array = array();
+
+        $return_string = $this->ProcessSubPanelListView($this->template_file,$result_array);
+
+        print $return_string;
+    }
+
+    function getModulesWithSubpanels()
+    {
+        global $beanList;
+        $dir = dir('modules');
+        $modules = array();
+        while($entry = $dir->read())
+        {
+            if(file_exists('modules/' . $entry . '/layout_defs.php'))
+            {
+                $modules[$entry] = $entry;
+            }
+        }
+        return $modules;
+    }
+
+    static function getModuleSubpanels($module){
+        require_once('include/SubPanel/SubPanelDefinitions.php');
+            global $beanList, $beanFiles;
+            if(!isset($beanList[$module])){
+                return array();
+            }
+
+            $class = $beanList[$module];
+            require_once($beanFiles[$class]);
+            $mod = new $class();
+            $spd = new SubPanelDefinitions($mod);
+            $tabs = $spd->get_available_tabs(true);
+            $ret_tabs = array();
+            $reject_tabs = array('history'=>1, 'activities'=>1);
+            foreach($tabs as $key=>$tab){
+                foreach($tab as $k=>$v){
                 if (! isset ( $reject_tabs [$k] )) {
                     $ret_tabs [$k] = $v;
                 }
             }
-  		}
+            }
 
-  		return $ret_tabs;
+            return $ret_tabs;
 
 
-  }
+    }
 
-  //saves overrides for defs
-  function saveSubPanelDefOverride( $panel, $subsection, $override){
-  		global $layout_defs, $beanList;
+    //saves overrides for defs
+    function saveSubPanelDefOverride( $panel, $subsection, $override){
+            global $layout_defs, $beanList;
 
-  		//save the new subpanel
-  		$name = "subpanel_layout['list_fields']";
+            //save the new subpanel
+            $name = "subpanel_layout['list_fields']";
 
-  		//bugfix: load looks for moduleName/metadata/subpanels, not moduleName/subpanels
-  		$path = 'custom/modules/'. $panel->_instance_properties['module'] . '/metadata/subpanels';
+            //bugfix: load looks for moduleName/metadata/subpanels, not moduleName/subpanels
+            $path = 'custom/modules/'. $panel->_instance_properties['module'] . '/metadata/subpanels';
 
-  		//bug# 40171: "Custom subpanels not working as expected"
-  		//each custom subpanel needs to have a unique custom def file
-  		$filename = $panel->parent_bean->object_name . "_subpanel_" . $panel->name; //bug 42262 (filename with $panel->_instance_properties['get_subpanel_data'] can create problem if had word "function" in it)
-  		$oldName1 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['module'] . $panel->_instance_properties['subpanel_name'] ;
-  		$oldName2 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['get_subpanel_data'] ;
-  		if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php")){
-  		  unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php");
-  		}
-  		if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php")){
-         unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php");
-  		}
-  		$extname = '_override'.$filename;
-  		//end of bug# 40171
+            //bug# 40171: "Custom subpanels not working as expected"
+            //each custom subpanel needs to have a unique custom def file
+            $filename = $panel->parent_bean->object_name . "_subpanel_" . $panel->name; //bug 42262 (filename with $panel->_instance_properties['get_subpanel_data'] can create problem if had word "function" in it)
+            $oldName1 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['module'] . $panel->_instance_properties['subpanel_name'] ;
+            $oldName2 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['get_subpanel_data'] ;
+            if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php")){
+            unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php");
+            }
+            if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php")){
+            unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php");
+            }
+            $extname = '_override'.$filename;
+            //end of bug# 40171
 
-  		mkdir_recursive($path, true);
-  		write_array_to_file( $name, $override,$path.'/' . $filename .'.php');
+            mkdir_recursive($path, true);
+            write_array_to_file( $name, $override,$path.'/' . $filename .'.php');
 
-  		//save the override for the layoutdef
+            //save the override for the layoutdef
         //tyoung 10.12.07 pushed panel->name to lowercase to match case in subpaneldefs.php files -
         //gave error on bad index 'module' as this override key didn't match the key in the subpaneldefs
-  		$name = "layout_defs['".  $panel->parent_bean->module_dir. "']['subpanel_setup']['" .strtolower($panel->name). "']";
+            $name = "layout_defs['".  $panel->parent_bean->module_dir. "']['subpanel_setup']['" .strtolower($panel->name). "']";
 //  	$GLOBALS['log']->debug('SubPanel.php->saveSubPanelDefOverride(): '.$name);
-  		$newValue = override_value_to_string($name, 'override_subpanel_name', $filename);
-  		mkdir_recursive('custom/Extension/modules/'. $panel->parent_bean->module_dir . '/Ext/Layoutdefs', true);
-  		$fp = sugar_fopen('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$extname.php", 'w');
-  		fwrite($fp, "<?php\n//auto-generated file DO NOT EDIT\n$newValue\n?>");
-  		fclose($fp);
-  		require_once('ModuleInstall/ModuleInstaller.php');
-  		$moduleInstaller = new ModuleInstaller();
-  		$moduleInstaller->silent = true; // make sure that the ModuleInstaller->log() function doesn't echo while rebuilding the layoutdefs
-  		$moduleInstaller->rebuild_layoutdefs();
-  		if (file_exists('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php'))
-  			include('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php');
-  		if (file_exists('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
-  			include('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
-  }
-
-	function get_subpanel_setup($module)
-	{
-		$subpanel_setup = '';
-		$layout_defs = get_layout_defs();
-
-		if(!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
-      {
-      	$subpanel_setup = $layout_defs[$module]['subpanel_setup'];
-      }
-
-      return $subpanel_setup;
-	}
-
-	/**
-	 * Retrieve the subpanel definition from the registered layout_defs arrays.
-	 */
-	function getSubPanelDefine($module, $subpanel_id)
-	{
-		$default_subpanel_define = SubPanel::_get_default_subpanel_define($module, $subpanel_id);
-		$custom_subpanel_define = SubPanel::_get_custom_subpanel_define($module, $subpanel_id);
-
-		$subpanel_define = array_merge($default_subpanel_define, $custom_subpanel_define);
-
-		if(empty($subpanel_define))
-		{
-			print('Could not load subpanel definition for: ' . $subpanel_id);
-		}
-
-		return $subpanel_define;
-	}
-
-	function _get_custom_subpanel_define($module, $subpanel_id)
-	{
-		$ret_val = array();
-
-		if($subpanel_id != '')
-		{
-			$layout_defs = get_layout_defs();
-
-			if(!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
-			{
-				$ret_val = $layout_defs[$module]['custom_subpanel_defines'][$subpanel_id];
-			}
-		}
+            $newValue = override_value_to_string($name, 'override_subpanel_name', $filename);
+            mkdir_recursive('custom/Extension/modules/'. $panel->parent_bean->module_dir . '/Ext/Layoutdefs', true);
+            $fp = sugar_fopen('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$extname.php", 'w');
+            fwrite($fp, "<?php\n//auto-generated file DO NOT EDIT\n$newValue\n?>");
+            fclose($fp);
+            require_once('ModuleInstall/ModuleInstaller.php');
+            $moduleInstaller = new ModuleInstaller();
+            $moduleInstaller->silent = true; // make sure that the ModuleInstaller->log() function doesn't echo while rebuilding the layoutdefs
+            $moduleInstaller->rebuild_layoutdefs();
+            if (file_exists('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php'))
+                include('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php');
+            if (file_exists('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
+                include('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+    }
+
+    function get_subpanel_setup($module)
+    {
+        $subpanel_setup = '';
+        $layout_defs = get_layout_defs();
+
+        if(!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
+        {
+            $subpanel_setup = $layout_defs[$module]['subpanel_setup'];
+        }
+
+        return $subpanel_setup;
+    }
+
+    /**
+     * Retrieve the subpanel definition from the registered layout_defs arrays.
+     */
+    function getSubPanelDefine($module, $subpanel_id)
+    {
+        $default_subpanel_define = SubPanel::_get_default_subpanel_define($module, $subpanel_id);
+        $custom_subpanel_define = SubPanel::_get_custom_subpanel_define($module, $subpanel_id);
+
+        $subpanel_define = array_merge($default_subpanel_define, $custom_subpanel_define);
+
+        if(empty($subpanel_define))
+        {
+            print('Could not load subpanel definition for: ' . $subpanel_id);
+        }
+
+        return $subpanel_define;
+    }
+
+    function _get_custom_subpanel_define($module, $subpanel_id)
+    {
+        $ret_val = array();
+
+        if($subpanel_id != '')
+        {
+            $layout_defs = get_layout_defs();
+
+            if(!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
+            {
+                $ret_val = $layout_defs[$module]['custom_subpanel_defines'][$subpanel_id];
+            }
+        }
 
-		return $ret_val;
-	}
+        return $ret_val;
+    }
 
-	function _get_default_subpanel_define($module, $subpanel_id)
-	{
-		$ret_val = array();
+    function _get_default_subpanel_define($module, $subpanel_id)
+    {
+        $ret_val = array();
 
-		if($subpanel_id != '')
-		{
-	  		$layout_defs = get_layout_defs();
+        if($subpanel_id != '')
+        {
+                $layout_defs = get_layout_defs();
 
-			if(!empty($layout_defs[$subpanel_id]['default_subpanel_define']))
-			{
-				$ret_val = $layout_defs[$subpanel_id]['default_subpanel_define'];
-			}
-		}
+            if(!empty($layout_defs[$subpanel_id]['default_subpanel_define']))
+            {
+                $ret_val = $layout_defs[$subpanel_id]['default_subpanel_define'];
+            }
+        }
 
-		return $ret_val;
-	}
+        return $ret_val;
+    }
 
-	function buildSearchQuery()
-	{
-		require_once('include/SubPanel/SubPanelSearchForm.php');
+    function buildSearchQuery()
+    {
+        require_once('include/SubPanel/SubPanelSearchForm.php');
 
-		$module = 'Meetings';
+        $module = 'Meetings';
 
-		$seed = new Meeting();
+        $seed = new Meeting();
 
-		$_REQUEST['searchFormTab'] = 'basic_search';
-		$searchForm = new SubPanelSearchForm($seed, $module, $this);
+        $_REQUEST['searchFormTab'] = 'basic_search';
+        $searchForm = new SubPanelSearchForm($seed, $module, $this);
 
-		$searchMetaData = $searchForm->retrieveSearchDefs($module);
-		$searchForm->setup($searchMetaData['searchdefs'], $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
+        $searchMetaData = $searchForm->retrieveSearchDefs($module);
+        $searchForm->setup($searchMetaData['searchdefs'], $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
 
-		$searchForm->populateFromRequest();
+        $searchForm->populateFromRequest();
 
-		$where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
+        $where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
 
-		if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
-		$GLOBALS['log']->info("Subpanel Where Clause: $this->search_query");
+        if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+        $GLOBALS['log']->info("Subpanel Where Clause: $this->search_query");
 
-		return print_r($where_clauses,true);
-	}
+        return print_r($where_clauses,true);
+    }
 
-	function get_searchdefs($module)
-	{
-		$thisPanel =& $this->subpanel_defs;
-		$subpanel_defs = $thisPanel->_instance_properties;
+    function get_searchdefs($module)
+    {
+        $thisPanel =& $this->subpanel_defs;
+        $subpanel_defs = $thisPanel->_instance_properties;
 
-		if(isset($subpanel_defs['searchdefs'])){
-			$searchdefs[$module]['layout']['basic_search'] = $subpanel_defs['searchdefs'];
-			$searchdefs[$module]['templateMeta'] = Array ('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array ( 'label' => 10, 'field' => 30 )) ;
-			return $searchdefs;
-		}
+        if(isset($subpanel_defs['searchdefs'])){
+            $searchdefs[$module]['layout']['basic_search'] = $subpanel_defs['searchdefs'];
+            $searchdefs[$module]['templateMeta'] = Array ('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array ( 'label' => 10, 'field' => 30 )) ;
+            return $searchdefs;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	function getSearchForm()
-	{
-		require_once('include/SubPanel/SubPanelSearchForm.php');
+    function getSearchForm()
+    {
+        require_once('include/SubPanel/SubPanelSearchForm.php');
 
-		$module = 'Meetings';
+        $module = 'Meetings';
 
-		$seed = new Meeting();
+        $seed = new Meeting();
 
-		$searchForm = new SubPanelSearchForm($seed, $module, $this);
+        $searchForm = new SubPanelSearchForm($seed, $module, $this);
 
-		$searchMetaData = $searchForm->retrieveSearchDefs($module);
+        $searchMetaData = $searchForm->retrieveSearchDefs($module);
 
-		if ($subpanel_searchMetaData = $this->get_searchdefs($module)){
+        if ($subpanel_searchMetaData = $this->get_searchdefs($module)){
 
-			$searchForm->setup($subpanel_searchMetaData, $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
+            $searchForm->setup($subpanel_searchMetaData, $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
 
-			if(!empty($this->collections))
-				$searchForm->searchFields['collection'] = array();
+            if(!empty($this->collections))
+                $searchForm->searchFields['collection'] = array();
 
-			$searchForm->populateFromRequest();
+            $searchForm->populateFromRequest();
 
-			return $searchForm->display();
-		}
+            return $searchForm->display();
+        }
 
-		return '';
-	}
+        return '';
+    }
 }
 ?>