adamjakab / SuiteCRM

include/language/jsLanguage.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -50,9 +50,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function jsLanguage(){
+    function jsLanguage() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -77,7 +77,7 @@ 
 EOQ;
 
         $cacheDir = create_cache_directory('jsLanguage/');
-        if($fh = @sugar_fopen($cacheDir . $lang . '.js', "w")){
+        if ($fh = @sugar_fopen($cacheDir.$lang.'.js', "w")) {
             fputs($fh, $str);
             fclose($fh);
         }
@@ -89,16 +89,16 @@ 
         // cn: bug 8242 - non-US langpack chokes
         $mod_strings = return_module_language($lang, $moduleDir);
         $mod_strings_encoded = $json->encode($mod_strings);
-        $str = "SUGAR.language.setLanguage('" . $moduleDir . "', " . $mod_strings_encoded . ");";
+        $str = "SUGAR.language.setLanguage('".$moduleDir."', ".$mod_strings_encoded.");";
 
-        $cacheDir = create_cache_directory('jsLanguage/' . $moduleDir . '/');
+        $cacheDir = create_cache_directory('jsLanguage/'.$moduleDir.'/');
 
-        if($fh = @fopen($cacheDir . $lang . '.js', "w")){
+        if ($fh = @fopen($cacheDir.$lang.'.js', "w")) {
             fputs($fh, $str);
             fclose($fh);
         }
 
-        if($return) {
+        if ($return) {
             return $str;
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

include/SugarEmailAddress/SugarEmailAddress.php

Spacing +171 added lines, -171 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -81,9 +81,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarEmailAddress(){
+    public function SugarEmailAddress() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -99,16 +99,16 @@ 
      * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
-        if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
             if (empty($this->addresses) || !isset($_REQUEST['massupdate'])) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == "1") ? true : false;
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == "1") ? true : false;
 
                 $isPrimary = true;
-                for($i = 1; $i <= 10; $i++){
+                for ($i = 1; $i <= 10; $i++) {
                     $email = 'email'.$i;
-                    if(isset($bean->$email) && !empty($bean->$email)){
+                    if (isset($bean->$email) && !empty($bean->$email)) {
                         $opt_out_field = $email.'_opt_out';
                         $invalid_field = $email.'_invalid';
                         $field_optOut = (isset($bean->$opt_out_field)) ? $bean->$opt_out_field : $optOut;
@@ -119,8 +119,8 @@ 
                 }
             }
         }
-        $this->populateAddresses($bean->id, $bean->module_dir, array(),'');
-        if(isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
+        $this->populateAddresses($bean->id, $bean->module_dir, array(), '');
+        if (isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
             $this->populateLegacyFields($bean);
         }
     }
@@ -142,11 +142,11 @@ 
         return;
     }
 
-    function populateLegacyFields(&$bean){
+    function populateLegacyFields(&$bean) {
         $primary_found = false;
         $alternate_found = false;
         $alternate2_found = false;
-        foreach($this->addresses as $k=>$address) {
+        foreach ($this->addresses as $k=>$address) {
             if ($primary_found && $alternate_found)
                 break;
             if ($address['primary_address'] == 1 && !$primary_found) {
@@ -155,7 +155,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -192,27 +192,27 @@ 
         $args = func_get_args();
         return call_user_func_array(array($this, '_save'), $args);
     }
-    private function _save($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='', $in_workflow=false) {
-        if(empty($this->addresses) || $in_workflow){
-            $this->populateAddresses($id, $module, $new_addrs,$primary);
+    private function _save($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '', $in_workflow = false) {
+        if (empty($this->addresses) || $in_workflow) {
+            $this->populateAddresses($id, $module, $new_addrs, $primary);
         }
 
         //find all email addresses..
-        $current_links=array();
+        $current_links = array();
         // Need to correct this to handle the Employee/User split
         $module = $this->getCorrectedModule($module);
-        $q2="select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
+        $q2 = "select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
         $r2 = $this->db->query($q2);
-        while(($row2=$this->db->fetchByAssoc($r2)) != null ) {
-            $current_links[$row2['email_address_id']]=$row2;
+        while (($row2 = $this->db->fetchByAssoc($r2)) != null) {
+            $current_links[$row2['email_address_id']] = $row2;
         }
 
         $isConversion = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? true : false;
 
         if (!empty($this->addresses)) {
             // insert new relationships and create email address record, if they don't exist
-            foreach($this->addresses as $address) {
-                if(!empty($address['email_address'])) {
+            foreach ($this->addresses as $address) {
+                if (!empty($address['email_address'])) {
                     $guid = create_guid();
                     $emailId = isset($address['email_address_id'])
                         && isset($current_links[$address['email_address_id']])
@@ -220,14 +220,14 @@ 
                     $emailId = $this->AddUpdateEmailAddress($address['email_address'],
                                                             $address['invalid_email'],
                                                             $address['opt_out'],
-                                                            $emailId);// this will save the email address if not found
+                                                            $emailId); // this will save the email address if not found
 
                     //verify linkage and flags.
-                    $upd_eabr="";
+                    $upd_eabr = "";
                     if (isset($current_links[$emailId])) {
                         if (!$isConversion) { // do not update anything if this is for lead conversion
-                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address'] ) {
-                            $upd_eabr="UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
+                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address']) {
+                            $upd_eabr = "UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
                         }
 
                         unset($current_links[$emailId]);
@@ -258,13 +258,13 @@ 
         // for lead conversion, do not delete email addresses
         if (!empty($current_links) && !$isConversion) {
 
-            $delete="";
+            $delete = "";
             foreach ($current_links as $eabr) {
 
-                $delete.=empty($delete) ? "'".$this->db->quote($eabr['id']) . "' " : ",'" . $this->db->quote($eabr['id']) . "'";
+                $delete .= empty($delete) ? "'".$this->db->quote($eabr['id'])."' " : ",'".$this->db->quote($eabr['id'])."'";
             }
 
-            $eabr_unlink="update email_addr_bean_rel set deleted=1 where id in ({$delete})";
+            $eabr_unlink = "update email_addr_bean_rel set deleted=1 where id in ({$delete})";
             $this->db->query($eabr_unlink);
         }
         $this->stateBeforeWorkflow = null;
@@ -286,7 +286,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -324,10 +324,10 @@ 
         $r = $this->db->query($q, true);
 
         $retArr = array();
-        while($a = $this->db->fetchByAssoc($r)) {
+        while ($a = $this->db->fetchByAssoc($r)) {
             $retArr[] = $a['bean_id'];
         }
-        if(count($retArr) > 0) {
+        if (count($retArr) > 0) {
             return $retArr;
         } else {
             return false;
@@ -347,7 +347,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -356,12 +356,12 @@ 
                 WHERE ea.email_address_caps = $emailCaps and eabl.deleted=0 ";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r)) {
-            if(isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
+        while ($a = $this->db->fetchByAssoc($r)) {
+            if (isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
                 $className = $beanList[$a['bean_module']];
 
-                if(isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
-                    if(!class_exists($className)) {
+                if (isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
+                    if (!class_exists($className)) {
                         require_once($beanFiles[$className]);
                     }
 
@@ -389,7 +389,7 @@ 
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
      */
-    function populateAddresses($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='') {
+    function populateAddresses($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '') {
         $module = $this->getCorrectedModule($module);
         //One last check for the ConvertLead action in which case we need to change $module to 'Leads'
         $module = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? 'Leads' : $module;
@@ -400,54 +400,54 @@ 
         $hasEmailValue = false;
         $email_ids = array();
 
-        if (isset($_REQUEST) && isset($_REQUEST[$module .'_email_widget_id'])) {
+        if (isset($_REQUEST) && isset($_REQUEST[$module.'_email_widget_id'])) {
 
             $fromRequest = false;
             // determine which array to process
-            foreach($_REQUEST as $k => $v) {
-                if(strpos($k, 'emailAddress') !== false) {
+            foreach ($_REQUEST as $k => $v) {
+                if (strpos($k, 'emailAddress') !== false) {
                    $fromRequest = true;
                    break;
                 }
-            $widget_id = $_REQUEST[$module .'_email_widget_id'];
+            $widget_id = $_REQUEST[$module.'_email_widget_id'];
     }
 
             //Iterate over the widgets for this module, in case there are multiple email widgets for this module
-            while(isset($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount]))
+            while (isset($_REQUEST[$module.$widget_id."emailAddress".$widgetCount]))
             {
-                if (empty($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount])) {
+                if (empty($_REQUEST[$module.$widget_id."emailAddress".$widgetCount])) {
                     $widgetCount++;
                     continue;
                 }
 
                 $hasEmailValue = true;
 
-                $eId = $module . $widget_id;
-                if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                $eId = $module.$widget_id;
+                if (isset($_REQUEST[$eId.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$eId.'emailAddressPrimaryFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$module.'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$eId.'emailAddressOptOutFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$module.'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$eId.'emailAddressInvalidFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$module.'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$eId.'emailAddressDeleteFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$module.'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -455,36 +455,36 @@ 
                 $replyToField = '';
                 $invalidField = '';
                 $optOutField = '';
-                if($fromRequest && empty($primary) && isset($primaryValue)) {
+                if ($fromRequest && empty($primary) && isset($primaryValue)) {
                     $primaryField = $primaryValue;
                 }
 
-                if($fromRequest && empty($replyTo)) {
-                    if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
-                    } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                if ($fromRequest && empty($replyTo)) {
+                    if (isset($_REQUEST[$eId.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$eId.'emailAddressReplyToFlag'];
+                    } else if (isset($_REQUEST[$module.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$module.'emailAddressReplyToFlag'];
                     }
                 }
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
                             $new_addrs[$k] = $v;
                         }
                     }
                 }
-                if($fromRequest && empty($email_ids)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($email_ids)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
                             $key = str_replace('emailAddressId', 'emailAddress', $k);
                             $email_ids[$key] = $v;
                         }
                     }
                 }
 
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        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;
@@ -493,21 +493,21 @@ 
                 }
 
                 //empty the addresses array if the post happened from email address widget.
-                if($post_from_email_address_widget) {
-                    $this->addresses=array();  //this gets populated during retrieve of the contact bean.
+                if ($post_from_email_address_widget) {
+                    $this->addresses = array(); //this gets populated during retrieve of the contact bean.
                 } else {
                     $optOutValues = array();
                     $invalidValues = array();
-                    foreach($new_addrs as $k=>$email) {
+                    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'])) {
+                       $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'])) {
+                          if (!empty($row['invalid_email'])) {
                              $invalidValues[$k] = "emailAddress$count";
                           }
                        }
@@ -515,11 +515,11 @@ 
                 }
                 // Re-populate the addresses class variable if we have new address(es).
                 if (!empty($new_addrs)) {
-                    foreach($new_addrs as $k => $reqVar) {
+                    foreach ($new_addrs as $k => $reqVar) {
                         //$key = preg_match("/^$eId/s", $k) ? substr($k, strlen($eId)) : $k;
                         $reqVar = trim($reqVar);
-                        if(strpos($k, 'emailAddress') !== false) {
-                            if(!empty($reqVar) && !in_array($k, $deleteValues)) {
+                        if (strpos($k, 'emailAddress') !== false) {
+                            if (!empty($reqVar) && !in_array($k, $deleteValues)) {
                                 $email_id   = (array_key_exists($k, $email_ids)) ? $email_ids[$k] : null;
                                 $primary    = ($k == $primaryValue) ? true : false;
                                 $replyTo    = ($k == $replyToField) ? true : false;
@@ -536,7 +536,7 @@ 
         }
 
         //If no widgets, set addresses array to empty
-        if($post_from_email_address_widget && !$hasEmailValue) {
+        if ($post_from_email_address_widget && !$hasEmailValue) {
            $this->addresses = array();
         }
     }
@@ -547,9 +547,9 @@ 
      * @param bool $primary Default false
      * @param bool $replyTo Default false
      */
-    function addAddress($addr, $primary=false, $replyTo=false, $invalid=false, $optOut=false, $email_id = null) {
+    function addAddress($addr, $primary = false, $replyTo = false, $invalid = false, $optOut = false, $email_id = null) {
         $addr = html_entity_decode($addr, ENT_QUOTES);
-        if(preg_match($this->regex, $addr)) {
+        if (preg_match($this->regex, $addr)) {
             $primaryFlag = ($primary) ? '1' : '0';
             $replyToFlag = ($replyTo) ? '1' : '0';
             $invalidFlag = ($invalid) ? '1' : '0';
@@ -585,17 +585,17 @@ 
      * Updates invalid_email and opt_out flags for each address
      */
     function updateFlags() {
-        if(!empty($this->addresses)) {
-            foreach($this->addresses as $addressMeta) {
-                if(isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
+        if (!empty($this->addresses)) {
+            foreach ($this->addresses as $addressMeta) {
+                if (isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
                     $address = $this->db->quote($this->_cleanAddress($addressMeta['email_address']));
 
                     $q = "SELECT * FROM email_addresses WHERE email_address = '{$address}'";
                     $r = $this->db->query($q);
                     $a = $this->db->fetchByAssoc($r);
 
-                    if(!empty($a)) {
-                        if(isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
+                    if (!empty($a)) {
+                        if (isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
                             $qUpdate = "UPDATE email_addresses SET invalid_email = ".intval($addressMeta['invalid_email']).", opt_out = ".intval($addressMeta['opt_out']).", date_modified = '".TimeDate::getInstance()->nowDb()."' WHERE id = '".$this->db->quote($a['id'])."'";
                             $rUpdate = $this->db->query($qUpdate);
                         }
@@ -608,7 +608,7 @@ 
     public function splitEmailAddress($addr)
     {
         $email = $this->_cleanAddress($addr);
-        if(!preg_match($this->regex, $email)) {
+        if (!preg_match($this->regex, $email)) {
             $email = ''; // remove bad email addr
         }
         $name = trim(str_replace(array($email, '<', '>', '"', "'"), '', $addr));
@@ -624,8 +624,8 @@ 
     function _cleanAddress($addr) {
         $addr = trim(from_html($addr));
 
-        if(strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
-            $address = trim(substr($addr, strrpos($addr, "<") +1, strrpos($addr, ">") - strrpos($addr, "<") -1));
+        if (strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
+            $address = trim(substr($addr, strrpos($addr, "<") + 1, strrpos($addr, ">") - strrpos($addr, "<") - 1));
         } else {
             $address = trim($addr);
         }
@@ -646,11 +646,11 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(!empty($a) && !empty($a['id'])) {
+        if (!empty($a) && !empty($a['id'])) {
             return $a['id'];
         } else {
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted)
@@ -672,7 +672,7 @@ 
      *        to propagate to the new SugarEmailAddress - see bug 39188
      * @return String GUID of Email Address or '' if cleaned address was empty.
      */
-    public function AddUpdateEmailAddress($addr,$invalid=0,$opt_out=0,$id=null)
+    public function AddUpdateEmailAddress($addr, $invalid = 0, $opt_out = 0, $id = null)
     {
         // sanity checks to avoid SQL injection.
         $invalid = intval($invalid);
@@ -722,12 +722,12 @@ 
             if ($duplicate_email['invalid_email'] != $new_invalid ||
                 $duplicate_email['opt_out'] != $new_opt_out ||
                 (trim($duplicate_email['email_address']) != $address)) {
-                $upd_q = 'UPDATE ' . $this->table_name . ' ' .
-                    'SET email_address=\'' . $address . '\', ' .
-                    'invalid_email=' . $new_invalid . ', ' .
-                    'opt_out=' . $new_opt_out . ', ' .
-                    'date_modified=' . $this->db->now() . ' ' .
-                    'WHERE id=\'' . $this->db->quote($duplicate_email['id']) . '\'';
+                $upd_q = 'UPDATE '.$this->table_name.' '.
+                    'SET email_address=\''.$address.'\', '.
+                    'invalid_email='.$new_invalid.', '.
+                    'opt_out='.$new_opt_out.', '.
+                    'date_modified='.$this->db->now().' '.
+                    'WHERE id=\''.$this->db->quote($duplicate_email['id']).'\'';
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
@@ -735,7 +735,7 @@ 
         else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted, invalid_email, opt_out)
@@ -751,12 +751,12 @@ 
      * @param object $focus Object in focus
      * @return string email
      */
-    function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
+    function getPrimaryAddress($focus, $parent_id = null, $parent_type = null) {
 
-        $parent_type=empty($parent_type) ? $focus->module_dir : $parent_type;
+        $parent_type = empty($parent_type) ? $focus->module_dir : $parent_type;
         // Bug63174: Email address is not shown in the list view for employees
         $parent_type = $this->getCorrectedModule($parent_type);
-        $parent_id=empty($parent_id) ? $focus->id : $parent_id;
+        $parent_id = empty($parent_id) ? $focus->id : $parent_id;
 
         $q = "SELECT ea.email_address FROM email_addresses ea
                 LEFT JOIN email_addr_bean_rel ear ON ea.id = ear.email_address_id
@@ -768,7 +768,7 @@ 
         $r = $this->db->limitQuery($q, 0, 1);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -809,7 +809,7 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -834,7 +834,7 @@ 
                 ORDER BY ear.reply_to_address, ear.primary_address DESC";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r, FALSE)) {
+        while ($a = $this->db->fetchByAssoc($r, FALSE)) {
             $return[] = $a;
         }
 
@@ -848,9 +848,9 @@ 
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
+    function getEmailAddressWidgetEditView($id, $module, $asMetadata = false, $tpl = '', $tabindex = '0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings, $dictionary, $beanList;
@@ -861,33 +861,33 @@ 
         $passedModule = $module;
         $module = $this->getCorrectedModule($module);
         $saveModule = $module;
-        if(isset($_POST['is_converted']) && $_POST['is_converted']==true){
-            $id=$_POST['return_id'];
-            $module=$_POST['return_module'];
+        if (isset($_POST['is_converted']) && $_POST['is_converted'] == true) {
+            $id = $_POST['return_id'];
+            $module = $_POST['return_module'];
         }
         $prefillDataArr = array();
-        if(!empty($id)) {
+        if (!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
             if (empty($prefillDataArr) && $module == "Contacts")
                 $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
-        } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
-            $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
+        } else if (isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])) {
+            $widget_id = isset($_REQUEST[$module.'_email_widget_id']) ? $_REQUEST[$module.'_email_widget_id'] : '0';
             $count = 0;
-            $key = $module . $widget_id . 'emailAddress'.$count;
-            while(isset($_REQUEST[$key])) {
+            $key = $module.$widget_id.'emailAddress'.$count;
+            while (isset($_REQUEST[$key])) {
                    $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
+                   $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
         }
 
-        if(!empty($prefillDataArr)) {
+        if (!empty($prefillDataArr)) {
             $json = new JSON(JSON_LOOSE_TYPE);
             $prefillData = $json->encode($prefillDataArr);
             $prefill = !empty($prefillDataArr) ? 'true' : 'false';
@@ -910,16 +910,16 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
-            $form = 'form_DC'.$this->view .'_'.$module;
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+        if ($this->view == "QuickCreate") {
+            $form = 'form_DC'.$this->view.'_'.$module;
+            if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'SubpanelCreates' || $_REQUEST['action'] == 'SubpanelEdits') {
+                $form = 'form_Subpanel'.$this->view.'_'.$module;
             }
         }
 
         $this->smarty->assign('emailView', $form);
 
-        if($module == 'Users') {
+        if ($module == 'Users') {
             $this->smarty->assign('useReplyTo', true);
         } else {
             $this->smarty->assign('useOptOut', true);
@@ -930,7 +930,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -948,18 +948,18 @@ 
      * @param object $focus Bean in focus
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetDetailView($focus, $tpl='')
+    function getEmailAddressWidgetDetailView($focus, $tpl = '')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if (empty($focus->id))return '';
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
-        foreach($prefillData as $addressItem) {
+        foreach ($prefillData as $addressItem) {
             $key = ($addressItem['primary_address'] == 1) ? 'primary' : "";
             $key = ($addressItem['reply_to_address'] == 1) ? 'reply_to' : $key;
             $key = ($addressItem['opt_out'] == 1) ? 'opt_out' : $key;
@@ -985,7 +985,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -995,49 +995,49 @@ 
         $invalid = array();
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $this->smarty->assign('email_widget_id',$widget_id);
-        $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $this->smarty->assign('email_widget_id', $widget_id);
+        $this->smarty->assign('emailAddressWidget', $_POST['emailAddressWidget']);
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+        if (isset($_POST[$mod.$widget_id.'emailAddressPrimaryFlag'])) {
+           $primary = $_POST[$mod.$widget_id.'emailAddressPrimaryFlag'];
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
-            $emails[] = $_POST[$mod . $widget_id . 'emailAddress' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddress".$count])) {
+            $emails[] = $_POST[$mod.$widget_id.'emailAddress'.$count];
             $count++;
         }
 
-        if($count == 0) {
+        if ($count == 0) {
            return "";
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressOptOutFlag'])) {
+           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) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressInvalidFlag'])) {
+           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) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressReplyToFlag'])) {
+           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) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressDeleteFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressDeleteFlag'] as $v) {
               $delete[] = $v;
            }
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
-            $verified[] = $_POST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddressVerifiedValue".$count])) {
+            $verified[] = $_POST[$mod.$widget_id.'emailAddressVerifiedValue'.$count];
             $count++;
         }
 
@@ -1062,33 +1062,33 @@ 
         $count = 0;
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $get .= '&' . $mod . '_email_widget_id='. $widget_id;
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $get .= '&'.$mod.'_email_widget_id='.$widget_id;
         $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]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddress'.$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]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddressVerifiedValue".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count]);
               $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $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;
+            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];
+                   $get .= "&".$optionIdentifier."=".$_REQUEST[$optionIdentifier];
                }
             } //if
         } //foreach
@@ -1106,7 +1106,7 @@ 
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
-        return ($module == "Employees")? "Users" : $module;
+        return ($module == "Employees") ? "Users" : $module;
     }
 
     public function stash($parentBeanId, $moduleName)
@@ -1116,7 +1116,7 @@ 
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result, false))
         {
-            $ids[] =$this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
+            $ids[] = $this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
         }
         if (!empty($ids))
         {
@@ -1140,15 +1140,15 @@ 
  * @param string $view DetailView or EditView
  * @return string
  */
-function getEmailAddressWidget($focus, $field, $value, $view, $tabindex='0') {
+function getEmailAddressWidget($focus, $field, $value, $view, $tabindex = '0') {
     $sea = new SugarEmailAddress();
     $sea->setView($view);
 
-        if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
+        if ($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
             if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
 
-            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
+            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false, '', $tabindex);
         }
 
     return $sea->getEmailAddressWidgetDetailView($focus);

Braces +40 added lines, -28 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -85,8 +87,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -147,8 +148,9 @@ 
         $alternate_found = false;
         $alternate2_found = false;
         foreach($this->addresses as $k=>$address) {
-            if ($primary_found && $alternate_found)
-                break;
+            if ($primary_found && $alternate_found) {
+                            break;
+            }
             if ($address['primary_address'] == 1 && !$primary_found) {
                 $primary_index = $k;
                 $primary_found = true;
@@ -286,8 +288,9 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
-            return 0;
+        if(empty($emailCaps)) {
+                    return 0;
+        }
 
         $q = "SELECT *
                 FROM email_addr_bean_rel eabl JOIN email_addresses ea
@@ -303,7 +306,9 @@ 
 
         // do it this way to make the count accurate in oracle
         $i = 0;
-        while ($this->db->fetchByAssoc($r)) ++$i;
+        while ($this->db->fetchByAssoc($r)) {
+            ++$i;
+        }
 
         return $i;
     }
@@ -486,8 +491,9 @@ 
                     foreach($_REQUEST as $k => $v) {
                         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;
+                            if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true") {
+                                                          $new_addrs[$k] = $v;
+                            }
                         }
                     }
                 }
@@ -690,8 +696,7 @@ 
         if ($id) {
             $r = $this->db->query("SELECT * FROM email_addresses WHERE id='".$this->db->quote($id)."'");
             $current_email = $this->db->fetchByAssoc($r);
-        }
-        else {
+        } else {
             $current_email = null;
         }
 
@@ -731,8 +736,7 @@ 
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
-        }
-        else {
+        } else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
             if(!empty($address)){
@@ -798,8 +802,7 @@ 
             // otherwise
             $q .= "
                 ORDER BY ear.reply_to_address DESC";
-        }
-        else
+        } else
         {
             // retrieve reply-to address only
             $q .= "
@@ -850,8 +853,9 @@ 
      */
     function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         global $app_strings, $dictionary, $beanList;
 
@@ -869,8 +873,9 @@ 
         if(!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
-            if (empty($prefillDataArr) && $module == "Contacts")
-                $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
+            if (empty($prefillDataArr) && $module == "Contacts") {
+                            $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
+            }
         } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
             $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
             $count = 0;
@@ -895,8 +900,9 @@ 
 
         $required = false;
         $vardefs = $dictionary[$beanList[$passedModule]]['fields'];
-        if (!empty($vardefs['email1']) && isset($vardefs['email1']['required']) && $vardefs['email1']['required'])
-            $required = true;
+        if (!empty($vardefs['email1']) && isset($vardefs['email1']['required']) && $vardefs['email1']['required']) {
+                    $required = true;
+        }
         $this->smarty->assign('required', $required);
 
         $this->smarty->assign('module', $saveModule);
@@ -950,13 +956,16 @@ 
      */
     function getEmailAddressWidgetDetailView($focus, $tpl='')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if(empty($focus->id)) {
+            return '';
+        }
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
         foreach($prefillData as $addressItem) {
@@ -985,8 +994,9 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         $count = 0;
         $emails = array();
@@ -1146,7 +1156,9 @@ 
 
         if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
-            if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
+            if ($view == 'ConvertLead' && $module == "Contacts") {
+                $module = "Leads";
+            }
 
             return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
         }

include/SugarPHPMailer.php

Indentation +255 added lines, -255 removed lines

@@ -48,130 +48,130 @@ 
  */
 class SugarPHPMailer extends PHPMailer
 {
-	var $oe; // OutboundEmail
-	var $protocol = "tcp://";
-	var $preppedForOutbound = false;
-	var $disclosureEnabled;
-	var $disclosureText;
-	var $isHostEmpty = false;
-	var $opensslOpened = true;
-
-	/**
-	 * Sole constructor
-	 */
-	public function __construct() {
+    var $oe; // OutboundEmail
+    var $protocol = "tcp://";
+    var $preppedForOutbound = false;
+    var $disclosureEnabled;
+    var $disclosureText;
+    var $isHostEmpty = false;
+    var $opensslOpened = true;
+
+    /**
+     * Sole constructor
+     */
+    public function __construct() {
         parent::__construct();
-		global $locale;
-		global $current_user;
-		global $sugar_config;
+        global $locale;
+        global $current_user;
+        global $sugar_config;
 
-		$admin = new Administration();
-		$admin->retrieveSettings();
+        $admin = new Administration();
+        $admin->retrieveSettings();
 
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
-			$this->disclosureEnabled = true;
-			$this->disclosureText = $admin->settings['disclosure_text'];
-		}
+        if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+            $this->disclosureEnabled = true;
+            $this->disclosureText = $admin->settings['disclosure_text'];
+        }
 
-		$this->oe = new OutboundEmail();
-		$this->oe->getUserMailerSettings($current_user);
+        $this->oe = new OutboundEmail();
+        $this->oe->getUserMailerSettings($current_user);
 
-		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+        $this->SetLanguage('en', 'include/phpmailer/language/');
+        $this->PluginDir	= 'include/phpmailer/';
+        $this->Mailer	 	= 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
+        $this->Encoding		= 'quoted-printable';
         $this->IsHTML(false);  // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
         $this->WordWrap		= 996;
-		// cn: gmail fix
-		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
-
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function SugarPHPMailer(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	/**
-	 * Prefills outbound details
-	 */
-	function setMailer() {
-		global $current_user;
-
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getUserMailerSettings($current_user);
-
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
-
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+        // cn: gmail fix
+        $this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
+
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function SugarPHPMailer(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    /**
+     * Prefills outbound details
+     */
+    function setMailer() {
+        global $current_user;
+
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getUserMailerSettings($current_user);
+
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
-            	$this->SMTPSecure = 'ssl';
+                $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-			$this->Mailer = "sendmail";
-	}
-
-	/**
-	 * Prefills mailer for system
-	 */
-	function setMailerForSystem() {
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getSystemMailerSettings();
-
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
-
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
+
+    /**
+     * Prefills mailer for system
+     */
+    function setMailerForSystem() {
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getSystemMailerSettings();
+
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
                 $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-		  $this->Mailer = "sendmail";
-	}
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
@@ -230,38 +230,38 @@ 
         return join("", $mime);
     }*/
 
-	/**
-	 * handles Charset translation for all visual parts of the email.
-	 * @param string charset Default = ''
-	 */
-	function prepForOutbound() {
-		global $locale;
-
-		if($this->preppedForOutbound == false) {
-			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
-			//$this->preppedForOutbound = true; // flag so we don't redo this
-			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
-
-			// handle disclosure
-			if($this->disclosureEnabled) {
-				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
-				$this->AltBody .= "\r\r{$this->disclosureText}";
-			}
+    /**
+     * handles Charset translation for all visual parts of the email.
+     * @param string charset Default = ''
+     */
+    function prepForOutbound() {
+        global $locale;
+
+        if($this->preppedForOutbound == false) {
+            //bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
+            //$this->preppedForOutbound = true; // flag so we don't redo this
+            $OBCharset = $locale->getPrecedentPreference('default_email_charset');
+
+            // handle disclosure
+            if($this->disclosureEnabled) {
+                $this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
+                $this->AltBody .= "\r\r{$this->disclosureText}";
+            }
 
-			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            // body text
+            $this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+            $this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
             $subjectUTF8		= from_html(trim($this->Subject));
             $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
             $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
-			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+            // HTML email RFC compliance
+            if($this->ContentType == "text/html") {
+                if(strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+                    $head=<<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -270,15 +270,15 @@ 
 </head>
 <body>
 eoq;
-					$this->Body = $head.$this->Body."</body></html>";
-				}
-			}
+                    $this->Body = $head.$this->Body."</body></html>";
+                }
+            }
 
-			// Headers /////////////////////////////////
-			// the below is done in PHPMailer::CreateHeader();
-			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
-			/*
+            // Headers /////////////////////////////////
+            // the below is done in PHPMailer::CreateHeader();
+            //$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
+            $this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+            /*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
 			}
@@ -296,129 +296,129 @@ 
 			}
 			*/
 
-		}
-	}
-
-	/**
-	 * Replace images with locations specified by regex with cid: images
-	 * and attach needed files
-	 * @param string $regex Regular expression
-	 * @param string $local_prefix Prefix where local files are stored
-	 * @param bool $object Use attachment object
-	 */
-	public function replaceImageByRegex($regex, $local_prefix, $object = false)
-	{
-		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
-		$i = 0;
+        }
+    }
+
+    /**
+     * Replace images with locations specified by regex with cid: images
+     * and attach needed files
+     * @param string $regex Regular expression
+     * @param string $local_prefix Prefix where local files are stored
+     * @param bool $object Use attachment object
+     */
+    public function replaceImageByRegex($regex, $local_prefix, $object = false)
+    {
+        preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
+        $i = 0;
         foreach($matches[2] as $match) {
-			$filename = urldecode($match);
-			$cid = $filename;
-			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
-			            case 'documents':
-			                $beanname = 'DocumentRevisions';
-			                break;
-			            case 'notes':
-			                $beanname = 'Notes';
-			                break;
-			        }
-			    }
-			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
-			        $bean = SugarModule::get($beanname)->loadBean();
-    			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
-        			    $mime_type = $bean->file_mime_type;
-        			    $filename = $bean->filename;
-    			    }
-			    }
-			} else {
-			    $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-			}
-		    if (!$this->embeddedAttachmentExists($cid)) {
-		    	$this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
-		    }
-		    $i++;
+            $filename = urldecode($match);
+            $cid = $filename;
+            $file_location = $local_prefix.$filename;
+            if(!file_exists($file_location)) continue;
+            if($object) {
+                if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+                    switch(strtolower($typematch[1])) {
+                        case 'documents':
+                            $beanname = 'DocumentRevisions';
+                            break;
+                        case 'notes':
+                            $beanname = 'Notes';
+                            break;
+                    }
+                }
+                $mime_type = "application/octet-stream";
+                if(isset($beanname)) {
+                    $bean = SugarModule::get($beanname)->loadBean();
+                    $bean->retrieve($filename);
+                    if(!empty($bean->id)) {
+                        $mime_type = $bean->file_mime_type;
+                        $filename = $bean->filename;
+                    }
+                }
+            } else {
+                $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+            }
+            if (!$this->embeddedAttachmentExists($cid)) {
+                $this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
+            }
+            $i++;
         }
-		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
-		// remove bad img line from outbound email
-		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
-	}
-
-	/**
-	 * @param notes	array of note beans
-	 */
-	function handleAttachments($notes) {
-		global $sugar_config;
-
-		// cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
-		$this->ClearAttachments();
-
-		//replace references to cache/images with cid tag
+        //replace references to cache with cid tag
+        $this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+        // remove bad img line from outbound email
+        $this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
+    }
+
+    /**
+     * @param notes	array of note beans
+     */
+    function handleAttachments($notes) {
+        global $sugar_config;
+
+        // cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
+        $this->ClearAttachments();
+
+        //replace references to cache/images with cid tag
         $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
 
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
-
-		//Replace any embeded images using the secure entryPoint for src url.
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
-
-		if (empty($notes)) {
-				return;
-		}
-		//Handle regular attachments.
-		foreach($notes as $note) {
-				$mime_type = 'text/plain';
-				$file_location = '';
-				$filename = '';
-
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
-						$file_location = $note->file->temp_file_location;
-						$filename = $note->file->original_file_name;
-						$mime_type = $note->file->mime_type;
-					} else {
-						$file_location = "upload://{$note->id}";
-						$filename = $note->id.$note->filename;
-						$mime_type = $note->file_mime_type;
-					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
-					$filename = $note->id.$note->filename;
-					$file_location = "upload://$filename";
-					$mime_type = $note->file_mime_type;
-				}
-
-				$filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
-				if (!$note->embed_flag) {
-					$this->AddAttachment($file_location, $filename, 'base64', $mime_type);
-				} // else
-			}
-	}
-
-	/**
-	 * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
-	 *
-	 */
-	function SetError($msg) {
-		$GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
-		parent::SetError($msg);
-	}
-
-	function SmtpConnect($options = array()) {
-		$connection = parent::SmtpConnect();
-		if (!$connection) {
-			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
-			} else {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
-			} // else
-		}
-		return $connection;
-	} // fn
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
+
+        //Replace any embeded images using the secure entryPoint for src url.
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
+
+        if (empty($notes)) {
+                return;
+        }
+        //Handle regular attachments.
+        foreach($notes as $note) {
+                $mime_type = 'text/plain';
+                $file_location = '';
+                $filename = '';
+
+                if($note->object_name == 'Note') {
+                    if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+                        $file_location = $note->file->temp_file_location;
+                        $filename = $note->file->original_file_name;
+                        $mime_type = $note->file->mime_type;
+                    } else {
+                        $file_location = "upload://{$note->id}";
+                        $filename = $note->id.$note->filename;
+                        $mime_type = $note->file_mime_type;
+                    }
+                } elseif($note->object_name == 'DocumentRevision') { // from Documents
+                    $filename = $note->id.$note->filename;
+                    $file_location = "upload://$filename";
+                    $mime_type = $note->file_mime_type;
+                }
+
+                $filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
+                if (!$note->embed_flag) {
+                    $this->AddAttachment($file_location, $filename, 'base64', $mime_type);
+                } // else
+            }
+    }
+
+    /**
+     * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
+     *
+     */
+    function SetError($msg) {
+        $GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
+        parent::SetError($msg);
+    }
+
+    function SmtpConnect($options = array()) {
+        $connection = parent::SmtpConnect();
+        if (!$connection) {
+            global $app_strings;
+            if(isset($this->oe) && $this->oe->type == "system") {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
+            } else {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
+            } // else
+        }
+        return $connection;
+    } // fn
 
     /*
      * overloads PHPMailer::PreSend() to allow for empty messages to go out.

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -68,7 +68,7 @@ 
 		$admin = new Administration();
 		$admin->retrieveSettings();
 
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+		if (isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
 			$this->disclosureEnabled = true;
 			$this->disclosureText = $admin->settings['disclosure_text'];
 		}
@@ -77,14 +77,14 @@ 
 		$this->oe->getUserMailerSettings($current_user);
 
 		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+		$this->PluginDir = 'include/phpmailer/';
+		$this->Mailer = 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
-        $this->IsHTML(false);  // default to plain-text email
+		$this->Encoding = 'quoted-printable';
+        $this->IsHTML(false); // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
-        $this->WordWrap		= 996;
+        $this->WordWrap = 996;
 		// cn: gmail fix
 		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
@@ -93,9 +93,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function SugarPHPMailer(){
+	public function SugarPHPMailer() {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -117,7 +117,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -130,7 +130,7 @@ 
             	$this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -151,7 +151,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -163,7 +163,7 @@ 
             if ($oe->mail_smtpssl == 2) {
             	$this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -237,31 +237,31 @@ 
 	function prepForOutbound() {
 		global $locale;
 
-		if($this->preppedForOutbound == false) {
+		if ($this->preppedForOutbound == false) {
 			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
 			//$this->preppedForOutbound = true; // flag so we don't redo this
 			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
 
 			// handle disclosure
-			if($this->disclosureEnabled) {
+			if ($this->disclosureEnabled) {
 				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
 				$this->AltBody .= "\r\r{$this->disclosureText}";
 			}
 
 			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
-            $subjectUTF8		= from_html(trim($this->Subject));
-            $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
-            $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+			$this->Body = from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+			$this->AltBody = from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            $subjectUTF8 = from_html(trim($this->Subject));
+            $subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+            $this->Subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
 			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+			if ($this->ContentType == "text/html") {
+				if (strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+					$head = <<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -277,7 +277,7 @@ 
 			// Headers /////////////////////////////////
 			// the below is done in PHPMailer::CreateHeader();
 			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+			$this->FromName = $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
 			/*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
@@ -310,14 +310,14 @@ 
 	{
 		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
 		$i = 0;
-        foreach($matches[2] as $match) {
+        foreach ($matches[2] as $match) {
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
+			if (!file_exists($file_location)) continue;
+			if ($object) {
+			    if (preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+			        switch (strtolower($typematch[1])) {
 			            case 'documents':
 			                $beanname = 'DocumentRevisions';
 			                break;
@@ -327,10 +327,10 @@ 
 			        }
 			    }
 			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
+			    if (isset($beanname)) {
 			        $bean = SugarModule::get($beanname)->loadBean();
     			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
+    			    if (!empty($bean->id)) {
         			    $mime_type = $bean->file_mime_type;
         			    $filename = $bean->filename;
     			    }
@@ -344,7 +344,7 @@ 
 		    $i++;
         }
 		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+		$this->Body = preg_replace("|\"$regex|i", '"cid:', $this->Body);
 		// remove bad img line from outbound email
 		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
 	}
@@ -359,7 +359,7 @@ 
 		$this->ClearAttachments();
 
 		//replace references to cache/images with cid tag
-        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
+        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';', '="cid:', $this->Body);
 
 		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
 
@@ -370,13 +370,13 @@ 
 				return;
 		}
 		//Handle regular attachments.
-		foreach($notes as $note) {
+		foreach ($notes as $note) {
 				$mime_type = 'text/plain';
 				$file_location = '';
 				$filename = '';
 
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+				if ($note->object_name == 'Note') {
+					if (!empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
 						$file_location = $note->file->temp_file_location;
 						$filename = $note->file->original_file_name;
 						$mime_type = $note->file->mime_type;
@@ -385,7 +385,7 @@ 
 						$filename = $note->id.$note->filename;
 						$mime_type = $note->file_mime_type;
 					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
+				} elseif ($note->object_name == 'DocumentRevision') { // from Documents
 					$filename = $note->id.$note->filename;
 					$file_location = "upload://$filename";
 					$mime_type = $note->file_mime_type;
@@ -411,7 +411,7 @@ 
 		$connection = parent::SmtpConnect();
 		if (!$connection) {
 			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
+			if (isset($this->oe) && $this->oe->type == "system") {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
 			} else {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
@@ -425,7 +425,7 @@ 
      */
     public function PreSend() {
         //check to see if message body is empty
-        if(empty($this->Body)){
+        if (empty($this->Body)) {
             //PHPMailer will throw an error if the body is empty, so insert a blank space if body is empty
             $this->Body = " ";
         }

Braces +11 added lines, -8 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -97,8 +99,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct();
@@ -135,9 +136,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+					$this->Mailer = "sendmail";
 		}
-		else
-			$this->Mailer = "sendmail";
 	}
 
 	/**
@@ -168,9 +169,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+				  $this->Mailer = "sendmail";
 		}
-		else
-		  $this->Mailer = "sendmail";
 	}
 
     /**
@@ -314,7 +315,9 @@ 
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
+			if(!file_exists($file_location)) {
+			    continue;
+			}
 			if($object) {
 			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
 			        switch(strtolower($typematch[1])) {

include/SugarObjects/templates/basic/Basic.php

Spacing +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function Basic(){
+    public function Basic() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

include/SubPanel/SubPanel.php

Indentation +370 added lines, -370 removed lines

@@ -45,420 +45,420 @@
  */
 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 __construct($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;
-
-		}
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() ){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key, $collections);
-	}
-
-	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 __construct($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;
+
+        }
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() ){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key, $collections);
+    }
+
+    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 '';
+    }
 }
 ?>

Spacing +85 added lines, -85 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,24 +48,24 @@ 
 	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 $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_define = null; // contains the layout_def.php
 	var $subpanel_defs;
-	var $subpanel_query=null;
-    var $layout_def_key='';
-	var $search_query='';
+	var $subpanel_query = null;
+    var $layout_def_key = '';
+	var $search_query = '';
 	var $collections = array();
 
-	function __construct($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() )
+	function __construct($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key = '', $collections = array())
 	{
 		global $beanList, $beanFiles, $focus, $app_strings;
 
-		$this->subpanel_defs=$subpanelDef;
+		$this->subpanel_defs = $subpanelDef;
 		$this->subpanel_id = $subpanel_id;
 		$this->parent_record_id = $record_id;
 		$this->parent_module = $module;
@@ -75,7 +75,7 @@ 
 		$this->parent_bean = $focus;
 		$result = $focus;
 
-		if(empty($result))
+		if (empty($result))
 		{
 			$parent_bean_name = $beanList[$module];
 			$parent_bean_file = $beanFiles[$parent_bean_name];
@@ -85,7 +85,7 @@ 
 			$result = $this->parent_bean;
 		}
 
-		if($record_id!='fab4' && $result == null)
+		if ($record_id != 'fab4' && $result == null)
 		{
 			sugar_die($app_strings['ERROR_NO_RECORD']);
 		}
@@ -93,11 +93,11 @@ 
 		if (empty($subpanelDef)) {
 			//load the subpanel by name.
 			if (!class_exists('MyClass')) {
-				require_once 'include/SubPanel/SubPanelDefinitions.php' ;
+				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;
+			$panelsdef = new SubPanelDefinitions($result, $layout_def_key);
+			$subpanelDef = $panelsdef->load_subpanel($subpanel_id, false, false, $this->search_query, $collections);
+			$this->subpanel_defs = $subpanelDef;
 
 		}
 	}
@@ -105,9 +105,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() ){
+	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key = '', $collections = array()) {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -121,38 +121,38 @@ 
 		$this->template_file = $template_file;
 	}
 
-	function setBeanList(&$value){
-		$this->bean_list =$value;
+	function setBeanList(&$value) {
+		$this->bean_list = $value;
 	}
 
-	function setHideNewButton($value){
+	function setHideNewButton($value) {
 		$this->hideNewButton = $value;
 	}
 
 
-	function getHeaderText( $currentModule){
+	function getHeaderText($currentModule) {
 	}
 
-	function get_buttons( $panel_query=null)
+	function get_buttons($panel_query = null)
 	{
 
-		$thisPanel =& $this->subpanel_defs;
+		$thisPanel = & $this->subpanel_defs;
 		$subpanel_def = $thisPanel->get_buttons();
 
-		if(!isset($this->listview)){
+		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)
+		foreach ($subpanel_def as $widget_data)
 		{
 			$widget_data['action'] = $_REQUEST['action'];
-			$widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
+			$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";
+			$widget_contents .= '<td style="padding-right: 2px; padding-bottom: 2px;">'."\n";
 
-			if(empty($widget_data['widget_class']))
+			if (empty($widget_data['widget_class']))
 			{
 				$widget_contents .= "widget_class not defined for top subpanel buttons";
 			}
@@ -175,33 +175,33 @@ 
 		global $current_user;
 		global $sugar_config;
 
-		if(isset($this->listview)){
-			$ListView =& $this->listview;
-		}else{
+		if (isset($this->listview)) {
+			$ListView = & $this->listview;
+		} else {
 			$ListView = new ListView();
 		}
-		$ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
+		$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("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("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 ($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']))
+		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>";
+			$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('');
@@ -216,7 +216,7 @@ 
 		$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) ) {
+		if (!empty($this->layout_def_key)) {
 			$ListView->end_link_wrapper = '&layout_def_key='.$this->layout_def_key.$ListView->end_link_wrapper;
 		}
 
@@ -226,8 +226,8 @@ 
 
 		//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;
+		$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;
@@ -237,7 +237,7 @@ 
 	{
 		$result_array = array();
 
-		$return_string = $this->ProcessSubPanelListView($this->template_file,$result_array);
+		$return_string = $this->ProcessSubPanelListView($this->template_file, $result_array);
 
 		print $return_string;
 	}
@@ -247,9 +247,9 @@ 
 		global $beanList;
 		$dir = dir('modules');
 		$modules = array();
-		while($entry = $dir->read())
+		while ($entry = $dir->read())
 		{
-			if(file_exists('modules/' . $entry . '/layout_defs.php'))
+			if (file_exists('modules/'.$entry.'/layout_defs.php'))
 			{
 				$modules[$entry] = $entry;
 			}
@@ -257,10 +257,10 @@ 
 		return $modules;
 	}
 
-  static function getModuleSubpanels($module){
+  static function getModuleSubpanels($module) {
   	require_once('include/SubPanel/SubPanelDefinitions.php');
   		global $beanList, $beanFiles;
-  		if(!isset($beanList[$module])){
+  		if (!isset($beanList[$module])) {
   			return array();
   		}
 
@@ -271,9 +271,9 @@ 
   		$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] )) {
+  		foreach ($tabs as $key=>$tab) {
+  		    foreach ($tab as $k=>$v) {
+                if (!isset ($reject_tabs [$k])) {
                     $ret_tabs [$k] = $v;
                 }
             }
@@ -285,50 +285,50 @@ 
   }
 
   //saves overrides for defs
-  function saveSubPanelDefOverride( $panel, $subsection, $override){
+  function saveSubPanelDefOverride($panel, $subsection, $override) {
   		global $layout_defs, $beanList;
 
   		//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';
+  		$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");
+  		$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");
+  		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');
+  		write_array_to_file($name, $override, $path.'/'.$filename.'.php');
 
   		//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');
+  		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');
+  		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)
@@ -336,7 +336,7 @@ 
 		$subpanel_setup = '';
 		$layout_defs = get_layout_defs();
 
-		if(!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
+		if (!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
       {
       	$subpanel_setup = $layout_defs[$module]['subpanel_setup'];
       }
@@ -354,9 +354,9 @@ 
 
 		$subpanel_define = array_merge($default_subpanel_define, $custom_subpanel_define);
 
-		if(empty($subpanel_define))
+		if (empty($subpanel_define))
 		{
-			print('Could not load subpanel definition for: ' . $subpanel_id);
+			print('Could not load subpanel definition for: '.$subpanel_id);
 		}
 
 		return $subpanel_define;
@@ -366,11 +366,11 @@ 
 	{
 		$ret_val = array();
 
-		if($subpanel_id != '')
+		if ($subpanel_id != '')
 		{
 			$layout_defs = get_layout_defs();
 
-			if(!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
+			if (!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
 			{
 				$ret_val = $layout_defs[$module]['custom_subpanel_defines'][$subpanel_id];
 			}
@@ -383,11 +383,11 @@ 
 	{
 		$ret_val = array();
 
-		if($subpanel_id != '')
+		if ($subpanel_id != '')
 		{
 	  		$layout_defs = get_layout_defs();
 
-			if(!empty($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'];
 			}
@@ -414,20 +414,20 @@ 
 
 		$where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
 
-		if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+		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;
+		$thisPanel = & $this->subpanel_defs;
 		$subpanel_defs = $thisPanel->_instance_properties;
 
-		if(isset($subpanel_defs['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 )) ;
+			$searchdefs[$module]['templateMeta'] = Array('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array('label' => 10, 'field' => 30));
 			return $searchdefs;
 		}
 
@@ -446,11 +446,11 @@ 
 
 		$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');
 
-			if(!empty($this->collections))
+			if (!empty($this->collections))
 				$searchForm->searchFields['collection'] = array();
 
 			$searchForm->populateFromRequest();

Braces +21 added lines, -14 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -109,8 +111,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key, $collections);
@@ -155,8 +156,7 @@ 
 			if(empty($widget_data['widget_class']))
 			{
 				$widget_contents .= "widget_class not defined for top subpanel buttons";
-			}
-			else
+			} else
 			{
 				$widget_contents .= $layout_manager->widgetDisplay($widget_data);
 			}
@@ -177,7 +177,7 @@ 
 
 		if(isset($this->listview)){
 			$ListView =& $this->listview;
-		}else{
+		} else{
 			$ListView = new ListView();
 		}
 		$ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
@@ -192,7 +192,9 @@ 
 		$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';
+		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']))
@@ -325,10 +327,12 @@ 
   		$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');
+  		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)
@@ -414,7 +418,9 @@ 
 
 		$where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
 
-		if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+		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);
@@ -450,8 +456,9 @@ 
 
 			$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();
 

include/SubPanel/SubPanelDefinitions.php

Indentation +722 added lines, -722 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 __construct ($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 __construct ($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,24 +156,24 @@ 
             if (isset($subpanel_layout) && is_array($subpanel_layout)) {
                 $this->set_panel_definition($subpanel_layout);
 
-			}
-		}
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	function aSubPanel($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($name, $instance_properties, $parent_bean, $reload, $original_only, $search_query, $collections);
-	}
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    function aSubPanel($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($name, $instance_properties, $parent_bean, $reload, $original_only, $search_query, $collections);
+    }
 
     /**
      * is the sub panel default hidden?
@@ -190,64 +190,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 ;
+    }
 
 
     /**
@@ -258,327 +258,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
@@ -596,301 +596,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 __construct ( $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 __construct ( $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 ;
+    }
 
-		//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);
+    /**
+     * 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);
+
+        //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;
+    }
 
 
 }

Spacing +214 added lines, -214 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry) die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry) die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -54,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?
@@ -73,53 +73,53 @@ 
     var $canDisplay = true;
 
 	//module's table name and column fields.
-	var $table_name ;
-	var $db_fields ;
-	var $bean_name ;
-	var $template_instance ;
+	var $table_name;
+	var $db_fields;
+	var $bean_name;
+	var $template_instance;
 
 	var $search_query;
 	var $base_collection_list = array();
 
-	function __construct ($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
+	function __construct($name, $instance_properties, $parent_bean, $reload = false, $original_only = false, $search_query = '', $collections = array()) {
 
-		$this->_instance_properties = $instance_properties ;
+		$this->_instance_properties = $instance_properties;
 
-		if(isset($instance_properties['collection_list' ])) $this->base_collection_list = $instance_properties['collection_list' ];
+		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)){
+		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()){
+		if (!$this->isCollection()) {
 			$table = strtolower($instance_properties['module']);
-			$search_query = str_replace('meetings',$table,$search_query);
+			$search_query = str_replace('meetings', $table, $search_query);
 		}
 
 		$this->search_query = $search_query;
-		$this->name = $name ;
-		$this->parent_bean = $parent_bean ;
+		$this->name = $name;
+		$this->parent_bean = $parent_bean;
 
 		//set language
-		global $current_language ;
-		if (! isset ( $parent_bean->mbvardefs ))
+		global $current_language;
+		if (!isset ($parent_bean->mbvardefs))
 		{
-			$mod_strings = return_module_language ( $current_language, $parent_bean->module_dir ) ;
+			$mod_strings = return_module_language($current_language, $parent_bean->module_dir);
 		}
-		$this->mod_strings = $mod_strings ;
+		$this->mod_strings = $mod_strings;
 
-        if ($this->isCollection ())
+        if ($this->isCollection())
 		{
-			$this->canDisplay = $this->load_sub_subpanels () ; //load sub-panel definition.
+			$this->canDisplay = $this->load_sub_subpanels(); //load sub-panel definition.
 		} else
 		{
-			if (!is_dir('modules/' . $this->_instance_properties [ 'module' ])){
+			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' ;
+			$def_path = 'modules/'.$this->_instance_properties ['module'].'/metadata/subpanels/'.$this->_instance_properties ['subpanel_name'].'.php';
 
 			$orig_exists = is_file($def_path);
 			$loaded = false;
@@ -128,16 +128,16 @@ 
 				require ($def_path);
 				$loaded = true;
 			}
-			if (is_file("custom/$def_path") && (!$original_only  || !$orig_exists))
+			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' ))
+			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) ;
+				$cust_def_path = 'custom/modules/'.$this->_instance_properties ['module'].'/metadata/subpanels/'.$this->_instance_properties ['override_subpanel_name'].'.php';
+				require ($cust_def_path);
 				$loaded = true;
 			}
 
@@ -164,9 +164,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	function aSubPanel($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
+	function aSubPanel($name, $instance_properties, $parent_bean, $reload = false, $original_only = false, $search_query = '', $collections = array()) {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -182,7 +182,7 @@ 
      */
     public function isDefaultHidden()
     {
-        if(isset($this->_instance_properties['default_hidden']) && $this->_instance_properties['default_hidden'] == true) {
+        if (isset($this->_instance_properties['default_hidden']) && $this->_instance_properties['default_hidden'] == true) {
             return true;
         }
 
@@ -190,63 +190,63 @@ 
     }
 
 
-	function distinct_query ()
+	function distinct_query()
 	{
-		if (isset ( $this->_instance_properties [ 'get_distinct_data' ] ))
+		if (isset ($this->_instance_properties ['get_distinct_data']))
 		{
 			return !empty($this->_instance_properties['get_distinct_data']) ? true : false;
 		}
-		return false ;
+		return false;
 	}
 
 	//return the translated header value.
-	function get_title ()
+	function get_title()
 	{
-		if (empty ( $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ))
+		if (empty ($this->mod_strings [$this->_instance_properties ['title_key']]))
 		{
-			return translate ( $this->_instance_properties [ 'title_key' ], $this->_instance_properties [ 'module' ] ) ;
+			return translate($this->_instance_properties ['title_key'], $this->_instance_properties ['module']);
 		}
-		return $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ;
+		return $this->mod_strings [$this->_instance_properties ['title_key']];
 	}
 
 	//return the definition of buttons. looks for buttons in 2 locations.
-	function get_buttons ()
+	function get_buttons()
 	{
-		$buttons = array ( ) ;
-		if (isset ( $this->_instance_properties [ 'top_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' ] ;
+			$buttons = $this->_instance_properties ['top_buttons'];
 		} else
 		{
-			$buttons = $this->panel_definition [ 'top_buttons' ] ;
+			$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 () ;
+		$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 ))))
+			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 ($buttons as $key => $button)
 				{
-					foreach ( $button as $property => $value )
+					foreach ($button as $property => $value)
 					{
 						if ($value === 'SubPanelTopComposeEmailButton' || $value === 'SubPanelTopArchiveEmailButton')
 						{
 							//remove this button from the array.
-							unset ( $buttons [ $key ] ) ;
+							unset ($buttons [$key]);
 						}
 					}
 				}
 			}
 		}
 
-		return $buttons ;
+		return $buttons;
 	}
 
 
@@ -258,67 +258,67 @@ 
      * @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 ()
+	function load_sub_subpanels()
 	{
 
-		global $modListHeader ;
+		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 ))
+		if (!isset ($modListHeader))
 		{
-			global $current_user ;
-			if (isset ( $current_user ))
+			global $current_user;
+			if (isset ($current_user))
 			{
-				$modListHeader = query_module_access_list ( $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 ;
+		global $modules_exempt_from_availability_check;
 		$modules_exempt_from_availability_check['Emails'] = 'Emails';
 
 		$listFieldMap = array();
 
-		if (empty ( $this->sub_subpanels ))
+		if (empty ($this->sub_subpanels))
 		{
-			$panels = $this->get_inst_prop_value ( 'collection_list' ) ;
-			foreach ( $panels as $panel => $properties )
+			$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 ))
+				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 ) ;
+					$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;
+			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 )
+			foreach ($this->sub_subpanels as $key => $subpanel)
 			{
 				$list_fields = $subpanel->get_list_fields();
 				$listFieldMap[$key] = array();
 				$index = 0;
-				foreach($list_fields as $field => $def)
+				foreach ($list_fields as $field => $def)
 				{
 					if (isset($def['vname']) && isset($def['width']))
 					{
 						$index++;
-						if(!empty($def['alias']))
+						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)
+							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'] )),
+									array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'])),
 									$end
 								);
 							} else
@@ -335,10 +335,10 @@ 
 					}
 				}
 			}
-			foreach ( $this->sub_subpanels as $key => $subpanel )
+			foreach ($this->sub_subpanels as $key => $subpanel)
 			{
 				$list_fields = array();
-				foreach($display_fields as $vname => $def)
+				foreach ($display_fields as $vname => $def)
 				{
 					$field = $def['name'];
 					$list_key = isset($listFieldMap[$key][$field]) ? $listFieldMap[$key][$field] : $field;
@@ -356,7 +356,7 @@ 
 						$list_fields[$field] = $display_fields[$vname];
 					}
 				}
-				foreach($query_fields as $field => $def)
+				foreach ($query_fields as $field => $def)
 				{
 					if (isset($subpanel->panel_definition['list_fields'][$field]))
 					{
@@ -376,25 +376,25 @@ 
 	protected function getDisplayFieldsFromCollection($sub_subpanels)
 	{
 		$display_fields = array();
-		foreach ($sub_subpanels as $key => $subpanel )
+		foreach ($sub_subpanels as $key => $subpanel)
 		{
 			$list_fields = $subpanel->get_list_fields();
 			$index = 0;
-			foreach($list_fields as $field => $def)
+			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)
+						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'] )),
+								array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'])),
 								$end
 							);
 						} else
@@ -411,13 +411,13 @@ 
 		}
 	}
 
-	function isDatasourceFunction ()
+	function isDatasourceFunction()
 	{
-		if (strpos ( $this->get_inst_prop_value ( 'get_subpanel_data' ), 'function' ) === false)
+		if (strpos($this->get_inst_prop_value('get_subpanel_data'), 'function') === false)
 		{
-			return false ;
+			return false;
 		}
-		return true ;
+		return true;
 	}
 
     /**
@@ -425,159 +425,159 @@ 
      *
      * @return bool
      */
-	function isCollection ()
+	function isCollection()
 	{
-		return ($this->get_inst_prop_value ( 'type' ) == 'collection');
+		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 )
+	function get_inst_prop_value($name)
 	{
-		return isset($this->_instance_properties[$name]) ? $this->_instance_properties [ $name ] : null;
+		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 )
+	function get_def_prop_value($name)
 	{
-		if (isset ( $this->panel_definition [ $name ] ))
+		if (isset ($this->panel_definition [$name]))
 		{
-			return $this->panel_definition [ $name ] ;
+			return $this->panel_definition [$name];
 		} else
 		{
-			return null ;
+			return null;
 		}
 	}
 
 	//if datasource is of the type function then return the function name
 	//else return the value as is.
-	function get_function_parameters ()
+	function get_function_parameters()
 	{
-		$parameters = array ( ) ;
-		if ($this->isDatasourceFunction ())
+		$parameters = array( );
+		if ($this->isDatasourceFunction())
 		{
-			$parameters = $this->get_inst_prop_value ( 'function_parameters' ) ;
+			$parameters = $this->get_inst_prop_value('function_parameters');
 		}
-		return $parameters ;
+		return $parameters;
 	}
 
-	function get_data_source_name ( $check_set_subpanel_data = false )
+	function get_data_source_name($check_set_subpanel_data = false)
 	{
-		$prop_value = null ;
+		$prop_value = null;
 		if ($check_set_subpanel_data)
 		{
-			$prop_value = $this->get_inst_prop_value ( 'set_subpanel_data' ) ;
+			$prop_value = $this->get_inst_prop_value('set_subpanel_data');
 		}
-		if (! empty ( $prop_value ))
+		if (!empty ($prop_value))
 		{
-			return $prop_value ;
+			return $prop_value;
 		} else
 		{
 			//fall back to default behavior.
 		}
-		if ($this->isDatasourceFunction ())
+		if ($this->isDatasourceFunction())
 		{
-			return (substr_replace ( $this->get_inst_prop_value ( 'get_subpanel_data' ), '', 0, 9 )) ;
+			return (substr_replace($this->get_inst_prop_value('get_subpanel_data'), '', 0, 9));
 		} else
 		{
-			return $this->get_inst_prop_value ( 'get_subpanel_data' ) ;
+			return $this->get_inst_prop_value('get_subpanel_data');
 		}
 	}
 
 	//returns the where clause for the query.
-	function get_where ()
+	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 != ''){
+		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' ) ;
+		return $this->get_def_prop_value('where');
 	}
 
-	function is_fill_in_additional_fields ()
+	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 ;
+		$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 ()
+	function get_list_fields()
 	{
-		if (isset ( $this->panel_definition [ 'list_fields' ] ))
+		if (isset ($this->panel_definition ['list_fields']))
 		{
-			return $this->panel_definition [ 'list_fields' ] ;
+			return $this->panel_definition ['list_fields'];
 		} else
 		{
-			return array ( ) ;
+			return array( );
 		}
 	}
 
-	function get_module_name ()
+	function get_module_name()
 	{
-		return $this->get_inst_prop_value ( 'module' ) ;
+		return $this->get_inst_prop_value('module');
 	}
 
-	function get_name ()
+	function get_name()
 	{
-		return $this->name ;
+		return $this->name;
 	}
 
 	//load subpanel module's table name and column fields.
-	function load_module_info ()
+	function load_module_info()
 	{
-		global $beanList ;
-		global $beanFiles ;
+		global $beanList;
+		global $beanFiles;
 
-		$module_name = $this->get_module_name () ;
-		if (! empty ( $module_name ))
+		$module_name = $this->get_module_name();
+		if (!empty ($module_name))
 		{
 
-			$bean_name = $beanList [ $this->get_module_name () ] ;
+			$bean_name = $beanList [$this->get_module_name()];
 
-			$this->bean_name = $bean_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 ;
+			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 ()
+	function get_header_panel_def()
 	{
-		if (! empty ( $this->sub_subpanels ))
+		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' ] ] ))
+			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' ] ] ;
+				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)
+				foreach ($this->sub_subpanels as $subpanel)
 				{
 					$list_fields = $subpanel->get_list_fields();
-					foreach($list_fields as $field => $def)
+					foreach ($list_fields as $field => $def)
 					{
 
 					}
 				}
 
-				reset ( $this->sub_subpanels ) ;
-				return current ( $this->sub_subpanels ) ;
+				reset($this->sub_subpanels);
+				return current($this->sub_subpanels);
 			}
 		}
-		return null ;
+		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 ()
+	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 ) ) ;
+		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));
 	}
 
     /**
@@ -596,10 +596,10 @@ 
 class SubPanelDefinitions
 {
 
-	var $_focus ;
-	var $_visible_tabs_array ;
-	var $panels ;
-	var $layout_defs ;
+	var $_focus;
+	var $_visible_tabs_array;
+	var $panels;
+	var $layout_defs;
 
 	/**
 	 * Enter description here...
@@ -609,16 +609,16 @@ 
 	 * @param ARRAY $layout_def_override - if you wish to override the default loaded layout defs you pass them in here.
 	 * @return SubPanelDefinitions
 	 */
-	function __construct ( $focus , $layout_def_key = '' , $layout_def_override = '' )
+	function __construct($focus, $layout_def_key = '', $layout_def_override = '')
 	{
-		$this->_focus = $focus ;
-		if (! empty ( $layout_def_override ))
+		$this->_focus = $focus;
+		if (!empty ($layout_def_override))
 		{
-			$this->layout_defs = $layout_def_override ;
+			$this->layout_defs = $layout_def_override;
 
 		} else
 		{
-			$this->open_layout_defs ( false, $layout_def_key ) ;
+			$this->open_layout_defs(false, $layout_def_key);
 		}
 	}
 
@@ -633,68 +633,68 @@ 
 	 * @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)
+	function get_available_tabs($FromGetModuleSubpanels = false)
 	{
-		global $modListHeader ;
-		global $modules_exempt_from_availability_check ;
+		global $modListHeader;
+		global $modules_exempt_from_availability_check;
 
-		if (isset ( $this->_visible_tabs_array ))
-			return $this->_visible_tabs_array ;
+		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
+		$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
+		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)){
+			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 )
+			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']) )
+                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)) ){
+				 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") ;
+				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 ) ) ) ;
+				$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" : "" ) ) ) ;
+				$GLOBALS ['log']->debug("SubPanelDefinitions->get_available_tabs(): ".$key."= ".($exempt ? "exempt " : "not exempt ".($ok ? " ACL OK" : "")));
 
-				if ( $ok )
+				if ($ok)
 				{
-					while ( ! empty ( $this->_visible_tabs_array [ $values_array [ 'order' ] ] ) )
+					while (!empty ($this->_visible_tabs_array [$values_array ['order']]))
 					{
-						$values_array [ 'order' ] ++ ;
+						$values_array ['order']++;
 					}
 
-					$this->_visible_tabs_array [ $values_array ['order'] ] = ($FromGetModuleSubpanels) ? array($key=>$values_array['title_key']) : $key ;
+					$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 ;
+		ksort($this->_visible_tabs_array);
+		return $this->_visible_tabs_array;
 	}
 
 	/**
@@ -708,15 +708,15 @@ 
      * @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() )
+	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' ]))
+		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) {
+		if ($subpanel->canDisplay == true) {
 			return $subpanel;
 		}
 
@@ -727,23 +727,23 @@ 
 	/**
 	 * 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 )
+	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 ( ) ;
+		$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 (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 (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 ] ;
+			if (!empty ($layout_def_key))
+				$this->layout_defs = $layout_defs [$layout_def_key];
 			else
-				$this->layout_defs = $layout_defs [ $this->_focus->module_dir ] ;
+				$this->layout_defs = $layout_defs [$this->_focus->module_dir];
 
 		}
 
@@ -754,24 +754,24 @@ 
 	 * Returns true if successful, false otherwise.
 	 * Hint: Used by Campaign's DetailView.
 	 */
-	function exclude_tab ( $tab_name )
+	function exclude_tab($tab_name)
 	{
-		$result = false ;
+		$result = false;
 		//unset layout definition
-		if (! empty ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ))
+		if (!empty ($this->layout_defs ['subpanel_setup'] [$tab_name]))
 		{
-			unset ( $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 ))
+		if (!empty ($this->_visible_tabs_array))
 		{
-			$key = array_search ( $tab_name, $this->_visible_tabs_array ) ;
+			$key = array_search($tab_name, $this->_visible_tabs_array);
 			if ($key !== false)
 			{
-				unset ( $this->_visible_tabs_array [ $key ] ) ;
+				unset ($this->_visible_tabs_array [$key]);
 			}
 		}
-		return $result ;
+		return $result;
 	}
 
 
@@ -779,7 +779,7 @@ 
 	 * 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 )
+	function get_all_subpanels($return_tab_modules_only = true, $group_by_module = false)
 	{
 		global $moduleList, $beanFiles, $beanList, $module;
 
@@ -796,36 +796,36 @@ 
 		$spd = '';
 		$spd_arr = array();
 		//iterate through modules and build subpanel array
-		foreach($modules_to_check as $mod_name){
+		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;
+			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;
+			if (!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) continue;
 
 			//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) ;
+			$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){
+			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']) )
+                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;
+				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;
+				if ($group_by_module) $panel_key_name = $class.'_'.$panel_key_name;
 				//add panel name to subpanel array
 				$spd_arr[$panel_key_name] = $panel_module;
 			}
@@ -836,7 +836,7 @@ 
 	/*
 	 * save array of hidden panels to mysettings category in config table
 	 */
-	function set_hidden_subpanels($panels){
+	function set_hidden_subpanels($panels) {
 		$administration = new Administration();
 		$serialized = base64_encode(serialize($panels));
 		$administration->saveSetting('MySettings', 'hide_subpanels', $serialized);
@@ -845,26 +845,26 @@ 
 	/*
 	 * retrieve hidden subpanels
 	 */
-	function get_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))
+		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'])){
+			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)){
+				if (!empty($hidden_subpanels)) {
 					//decode and unserialize to retrieve the array
 					$hidden_subpanels = base64_decode($hidden_subpanels);
 					$hidden_subpanels = unserialize($hidden_subpanels);
@@ -873,12 +873,12 @@ 
 					//get user preference
 					//unserialize and add to array if not empty
 					$pref_hidden = array();
-					foreach($pref_hidden as $id => $pref_hidden_panel) {
+					foreach ($pref_hidden as $id => $pref_hidden_panel) {
 						$hidden_subpanels[] = $pref_hidden_panel;
 					}
 
 
-				}else{
+				} else {
 					//no settings found, return empty
 					return $hidden_subpanels;
 				}

Braces +61 added lines, -41 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry) die ( 'Not A Valid Entry Point' ) ;
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
+    die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -85,7 +87,9 @@ 
 
 		$this->_instance_properties = $instance_properties ;
 
-		if(isset($instance_properties['collection_list' ])) $this->base_collection_list = $instance_properties['collection_list' ];
+		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){
@@ -168,8 +172,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($name, $instance_properties, $parent_bean, $reload, $original_only, $search_query, $collections);
@@ -291,7 +294,9 @@ 
 				}
 			}
 			// if it's empty just dump out as there is nothing to process.
-			if(empty($this->sub_subpanels)) return false;
+			if(empty($this->sub_subpanels)) {
+			    return false;
+			}
 			//Sync displayed list fields across the subpanels
 			$display_fields = $this->getDisplayFieldsFromCollection($this->sub_subpanels);
 			$query_fields = array();
@@ -305,10 +310,11 @@ 
 					if (isset($def['vname']) && isset($def['width']))
 					{
 						$index++;
-						if(!empty($def['alias']))
-							$listFieldMap[$key][$def['alias']] = $field;
-						else
-							$listFieldMap[$key][$field] = $field;
+						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)
@@ -346,13 +352,11 @@ 
 					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]))
+					} 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 {
+					} else {
 						$list_fields[$field] = $display_fields[$vname];
 					}
 				}
@@ -361,8 +365,7 @@ 
 					if (isset($subpanel->panel_definition['list_fields'][$field]))
 					{
 						$list_fields[$field] = $subpanel->panel_definition['list_fields'][$field];
-					}
-					else {
+					} else {
 						$list_fields[$field] = $def;
 					}
 				}
@@ -638,18 +641,22 @@ 
 		global $modListHeader ;
 		global $modules_exempt_from_availability_check ;
 
-		if (isset ( $this->_visible_tabs_array ))
-			return $this->_visible_tabs_array ;
+		if (isset ( $this->_visible_tabs_array )) {
+					return $this->_visible_tabs_array ;
+		}
 
-		if (empty($modListHeader))
-		    $modListHeader = query_module_access_list($GLOBALS['current_user']);
+		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
+		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.
@@ -662,8 +669,9 @@ 
 			{
 				//exclude if this subpanel is hidden from admin screens
                 $module = $key;
-                if ( isset($values_array['module']) )
-                    $module = strtolower($values_array['module']);
+                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;
@@ -710,8 +718,9 @@ 
 	 */
 	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;
+		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 ) ;
 
@@ -734,16 +743,19 @@ 
 
 		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 (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 ] ;
+			}
 
 		}
 
@@ -799,11 +811,15 @@ 
 		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;
+			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;
+			if(!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) {
+			    continue;
+			}
 
 			//retrieve subpanels for this bean
 			require_once($beanFiles[$class]);
@@ -817,15 +833,20 @@ 
 			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 ( 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;
+				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;
+				if($group_by_module) {
+				    $panel_key_name = $class.'_'.$panel_key_name;
+				}
 				//add panel name to subpanel array
 				$spd_arr[$panel_key_name] = $panel_module;
 			}
@@ -878,12 +899,11 @@ 
 					}
 
 
-				}else{
+				} else{
 					//no settings found, return empty
 					return $hidden_subpanels;
 				}
-			}
-			else
+			} else
 			{	//no settings found, return empty
 				return $hidden_subpanels;
 			}

include/SubPanel/SubPanelSearchForm.php

Spacing +11 added lines, -11 removed lines

@@ -7,11 +7,11 @@ 
 
 require_once('include/SearchForm/SearchForm2.php');
 
-class SubPanelSearchForm extends SearchForm  {
+class SubPanelSearchForm extends SearchForm {
 
     var $subPanel; // the instantiated bean of the subPanel
 
-    function __construct($seed, $module, $subPanel, $options = array()){
+    function __construct($seed, $module, $subPanel, $options = array()) {
         $this->subPanel = $subPanel;
         parent::__construct($seed, $module, 'DetailView', $options);
     }
@@ -19,9 +19,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SubPanelSearchForm($seed, $module, $subPanel, $options = array()){
+    function SubPanelSearchForm($seed, $module, $subPanel, $options = array()) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -31,7 +31,7 @@ 
     }
 
 
-    function display($header = false){
+    function display($header = false) {
         /*//global $app_list_strings;
         if($this->subPanel->subpanel_defs->isCollection() && isset($this->subPanel->subpanel_defs->base_collection_list)){
             $GLOBALS['app_list_strings']['collection_temp_list'] = $this->getCollectionList($this->subPanel->subpanel_defs->base_collection_list);
@@ -39,23 +39,23 @@ 
         $this->th->ss->assign('subpanel', $this->subPanel->subpanel_id);
 
         // Adding the offset to subpanel search field - this has no affect on pagination
-        if($this->subPanel->parent_bean->module_dir != ''){
+        if ($this->subPanel->parent_bean->module_dir != '') {
             $this->th->ss->assign('subpanelPageOffset', '<input type="hidden" name="'.$this->subPanel->parent_bean->module_dir.'_'.$this->subPanel->subpanel_id.'_CELL_offset" value="0" />');
         }
         $this->parsedView = 'sps';
         return parent::display($header);
     }
 
-    function getCollectionList($collection = array()){
+    function getCollectionList($collection = array()) {
         global $app_list_strings;
 
         $select = array();
 
-        if(!empty($collection)){
+        if (!empty($collection)) {
 
             $select = array();
-            foreach($collection as $name => $value_array){
-                if(isset($app_list_strings['moduleList'][$value_array['module']])){
+            foreach ($collection as $name => $value_array) {
+                if (isset($app_list_strings['moduleList'][$value_array['module']])) {
                     $select[$name] = $app_list_strings['moduleList'][$value_array['module']];
                 }
             }
@@ -63,7 +63,7 @@ 
         return $select;
     }
 
-    function displaySavedSearchSelect(){
+    function displaySavedSearchSelect() {
         return null;
     }
 

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

include/TemplateHandler/TemplateHandler.php

Spacing +101 added lines, -101 removed lines

@@ -57,9 +57,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function TemplateHandler(){
+    public function TemplateHandler() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -69,8 +69,8 @@ 
     }
 
 
-    function loadSmarty(){
-        if(empty($this->ss)){
+    function loadSmarty() {
+        if (empty($this->ss)) {
             $this->ss = new Sugar_Smarty();
         }
     }
@@ -83,7 +83,7 @@ 
      */
     static function clearAll() {
     	global $beanList;
-		foreach($beanList as $module_dir =>$object_name){
+		foreach ($beanList as $module_dir =>$object_name) {
                 TemplateHandler::clearCache($module_dir);
 		}
     }
@@ -96,14 +96,14 @@ 
      * @param String $module The module directory to clear
      * @param String $view Optional view value (DetailView, EditView, etc.)
      */
-    static function clearCache($module, $view=''){
-        $cacheDir = create_cache_directory('modules/'. $module . '/');
+    static function clearCache($module, $view = '') {
+        $cacheDir = create_cache_directory('modules/'.$module.'/');
         $d = dir($cacheDir);
-        while($e = $d->read()){
-            if(!empty($view) && $e != $view )continue;
-            $end =strlen($e) - 4;
-            if(is_file($cacheDir . $e) && $end > 1 && substr($e, $end) == '.tpl'){
-                unlink($cacheDir . $e);
+        while ($e = $d->read()) {
+            if (!empty($view) && $e != $view)continue;
+            $end = strlen($e) - 4;
+            if (is_file($cacheDir.$e) && $end > 1 && substr($e, $end) == '.tpl') {
+                unlink($cacheDir.$e);
             }
         }
     }
@@ -121,21 +121,21 @@ 
     function buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs) {
         $this->loadSmarty();
 
-        $cacheDir = create_cache_directory($this->templateDir. $module . '/');
-        $file = $cacheDir . $view . '.tpl';
-        $string = '{* Create Date: ' . date('Y-m-d H:i:s') . "*}\n";
+        $cacheDir = create_cache_directory($this->templateDir.$module.'/');
+        $file = $cacheDir.$view.'.tpl';
+        $string = '{* Create Date: '.date('Y-m-d H:i:s')."*}\n";
         $this->ss->left_delimiter = '{{';
         $this->ss->right_delimiter = '}}';
         $this->ss->assign('module', $module);
         $this->ss->assign('built_in_buttons', array('CANCEL', 'DELETE', 'DUPLICATE', 'EDIT', 'FIND_DUPLICATES', 'SAVE', 'CONNECTOR'));
         $contents = $this->ss->fetch($tpl);
         //Insert validation and quicksearch stuff here
-        if($view == 'EditView' || strpos($view,'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
+        if ($view == 'EditView' || strpos($view, 'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
 
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -144,14 +144,14 @@ 
             //Retrieve all panel field definitions with displayParams Array field set
             $panelFields = array();
 
-            foreach($metaDataDefs['panels'] as $panel) {
-                    foreach($panel as $row) {
-                            foreach($row as $entry) {
-                                    if(empty($entry)) {
+            foreach ($metaDataDefs['panels'] as $panel) {
+                    foreach ($panel as $row) {
+                            foreach ($row as $entry) {
+                                    if (empty($entry)) {
                                        continue;
                                     }
 
-                                    if(is_array($entry) &&
+                                    if (is_array($entry) &&
                                        isset($entry['name']) &&
                                        isset($entry['displayParams']) &&
                                        isset($entry['displayParams']['required']) &&
@@ -159,7 +159,7 @@ 
                                        $panelFields[$entry['name']] = $entry;
                                     }
 
-                                    if(is_array($entry)) {
+                                    if (is_array($entry)) {
                                       $defs2[$entry['name']] = $entry;
                                     } else {
                                       $defs2[$entry] = array('name' => $entry);
@@ -168,18 +168,18 @@ 
                     } //foreach
             } //foreach
 
-            foreach($panelFields as $field=>$value) {
+            foreach ($panelFields as $field=>$value) {
                       $nameList = array();
-                      if(!is_array($value['displayParams']['required'])) {
+                      if (!is_array($value['displayParams']['required'])) {
                          $nameList[] = $field;
                       } else {
-                         foreach($value['displayParams']['required'] as $groupedField) {
+                         foreach ($value['displayParams']['required'] as $groupedField) {
                                  $nameList[] = $groupedField;
                          }
                       }
 
-                      foreach($nameList as $x) {
-                         if(isset($defs[$x]) &&
+                      foreach ($nameList as $x) {
+                         if (isset($defs[$x]) &&
                             isset($defs[$x]['type']) &&
                             !isset($defs[$x]['required'])) {
                             $defs[$x]['required'] = true;
@@ -198,7 +198,7 @@ 
 
             $javascript->setSugarBean($sugarbean);
             if ($view != "ConvertLead")
-                $javascript->addAllFields('', null,true);
+                $javascript->addAllFields('', null, true);
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'), 'false', '', 'assigned_user_id');
@@ -209,20 +209,20 @@ 
             //3) not have validateDepedency set to false in metadata
             //4) have id_name in vardef entry
             //5) not already been added to Array
-            foreach($sugarbean->field_name_map as $name=>$def) {
+            foreach ($sugarbean->field_name_map as $name=>$def) {
 
-               if($def['type']=='relate' &&
+               if ($def['type'] == 'relate' &&
                   isset($defs2[$name]) &&
                   (!isset($defs2[$name]['validateDependency']) || $defs2[$name]['validateDependency'] === true) &&
                   isset($def['id_name']) &&
                   !in_array($name, $validatedFields)) {
 
-                  if(isset($mod_strings[$def['vname']])
+                  if (isset($mod_strings[$def['vname']])
                         || isset($app_strings[$def['vname']])
-                        || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
+                        || translate($def['vname'], $sugarbean->module_dir) != $def['vname']) {
                      $vname = $def['vname'];
                   }
-                  else{
+                  else {
                      $vname = "undefined";
                   }
                   $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
@@ -234,11 +234,11 @@ 
             $contents .= $javascript->getScript();
             $contents .= $this->createQuickSearchCode($defs, $defs2, $view, $module);
             $contents .= "{/literal}\n";
-        }else if(preg_match('/^SearchForm_.+/', $view)){
+        } else if (preg_match('/^SearchForm_.+/', $view)) {
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -251,7 +251,7 @@ 
         //Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
 
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $contents);
             fclose($fh);
         }
@@ -267,12 +267,12 @@ 
      * @param module string module name
      * @param view string view need (eg DetailView, EditView, etc)
      */
-    function checkTemplate($module, $view, $checkFormName = false, $formName='') {
-        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+    function checkTemplate($module, $view, $checkFormName = false, $formName = '') {
+        if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
             return false;
         }
         $view = $checkFormName ? $formName : $view;
-        return file_exists($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+        return file_exists($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
     }
 
     /**
@@ -286,16 +286,16 @@ 
      */
     function displayTemplate($module, $view, $tpl, $ajaxSave = false, $metaDataDefs = null) {
         $this->loadSmarty();
-        if(!$this->checkTemplate($module, $view)) {
+        if (!$this->checkTemplate($module, $view)) {
             $this->buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs);
         }
-        $file = $this->cacheDir . $this->templateDir . $module . '/' . $view . '.tpl';
-        if(file_exists($file)) {
+        $file = $this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl';
+        if (file_exists($file)) {
            return $this->ss->fetch($file);
         } else {
            global $app_strings;
-           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
-           return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
+           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'].": $file");
+           return $app_strings['ERR_NO_SUCH_FILE'].": $file";
         }
     }
 
@@ -306,16 +306,16 @@ 
      * @param view string view need (eg DetailView, EditView, etc)
      */
     function deleteTemplate($module, $view) {
-        if(is_file($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl')) {
+        if (is_file($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl')) {
             // Bug #54634 : RTC 18144 : Cannot add more than 1 user to role but popup is multi-selectable
-            if ( !isset($this->ss) )
+            if (!isset($this->ss))
             {
                 $this->loadSmarty();
             }
-            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
             SugarCache::cleanFile($cache_file_name);
 
-            return unlink($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            return unlink($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
         }
         return false;
     }
@@ -332,47 +332,47 @@ 
      * @param strign $module
      * @return string
      */
-    public function createQuickSearchCode($defs, $defs2, $view = '', $module='')
+    public function createQuickSearchCode($defs, $defs2, $view = '', $module = '')
     {
         $sqs_objects = array();
         require_once('include/QuickSearchDefaults.php');
-        if(isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
+        if (isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults($this->getQSDLookup());
-        }else
+        } else
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults(array());
         }
         $qsd->setFormName($view);
-        if(preg_match('/^SearchForm_.+/', $view)){
-        	if(strpos($view, 'popup_query_form')){
+        if (preg_match('/^SearchForm_.+/', $view)) {
+        	if (strpos($view, 'popup_query_form')) {
         		$qsd->setFormName('popup_query_form');
             	$parsedView = 'advanced';
-        	}else{
+        	} else {
         		$qsd->setFormName('search_form');
             	$parsedView = preg_replace("/^SearchForm_/", "", $view);
         	}
             //Loop through the Meta-Data fields to see which ones need quick search support
-            foreach($defs as $f) {
+            foreach ($defs as $f) {
                 $field = $f;
-                $name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name.'_'.$field['name'];
 
-                if($field['type'] == 'relate' && isset($field['module']) && preg_match('/_name$|_c$/si',$name)  || !empty($field['quicksearch']) ) {
-                    if(preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
+                if ($field['type'] == 'relate' && isset($field['module']) && preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch'])) {
+                    if (preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
+                        } else if ($matches[0] == 'Users') {
 
-                            if(!empty($f['name']) && !empty($f['id_name'])) {
-                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],$f['id_name']);
+                            if (!empty($f['name']) && !empty($f['id_name'])) {
+                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'], $f['id_name']);
                             }
                             else {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                             }
-                        } else if($matches[0] == 'Campaigns') {
+                        } else if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Accounts') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -385,12 +385,12 @@ 
                             $shippingKey = isset($f['displayParams']['shippingKey']) ? $f['displayParams']['shippingKey'] : null;
                             $additionalFields = isset($f['displayParams']['additionalFields']) ? $f['displayParams']['additionalFields'] : null;
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSContact($field['name'], $field['id_name']);
                         }
                     } else {
                          $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
-                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                         if (!isset($field['field_list']) && !isset($field['populate_list'])) {
                              $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
                              $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
                          } else {
@@ -398,63 +398,63 @@ 
                              $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
                          }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
                 } //if-else
             } //foreach
 
-            foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
-                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
-        }else{
+            foreach ($sqs_objects as $name => $field)
+               foreach ($field['populate_list'] as $key => $fieldname)
+                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key].'_'.$parsedView;
+        } else {
             //Loop through the Meta-Data fields to see which ones need quick search support
-            foreach($defs2 as $f) {
-                if(!isset($defs[$f['name']])) continue;
+            foreach ($defs2 as $f) {
+                if (!isset($defs[$f['name']])) continue;
 
                 $field = $defs[$f['name']];
                 if ($view == "ConvertLead")
                 {
-                    $field['name'] = $module . $field['name'];
+                    $field['name'] = $module.$field['name'];
                     if (isset($field['module']) && isset($field['id_name']) && substr($field['id_name'], -4) == "_ida") {
                         $lc_module = strtolower($field['module']);
                         $ida_suffix = "_".$lc_module.$lc_module."_ida";
                         if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
-                            $field['id_name'] = $module . $field['id_name'];
+                            $field['id_name'] = $module.$field['id_name'];
                         }
                         else
-                            $field['id_name'] = $field['name'] . "_" . $field['id_name'];
+                            $field['id_name'] = $field['name']."_".$field['id_name'];
                     }
                     else {
                         if (!empty($field['id_name']))
                             $field['id_name'] = $module.$field['id_name'];
                     }
                 }
-				$name = $qsd->form_name . '_' . $field['name'];
+				$name = $qsd->form_name.'_'.$field['name'];
 
 
-                if($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si',$name) || !empty($field['quicksearch']))) {
-                    if (!preg_match('/_c$/si',$name)
-                        && (!isset($field['id_name']) || !preg_match('/_c$/si',$field['id_name']))
+                if ($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch']))) {
+                    if (!preg_match('/_c$/si', $name)
+                        && (!isset($field['id_name']) || !preg_match('/_c$/si', $field['id_name']))
                         && preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)
                     ) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
-                            if($field['name'] == 'reports_to_name'){
-                                $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
+                        } else if ($matches[0] == 'Users') {
+                            if ($field['name'] == 'reports_to_name') {
+                                $sqs_objects[$name] = $qsd->getQSUser('reports_to_name', 'reports_to_id');
                              // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
-                            }elseif($field['name'] == 'assigned_user_name'){
-                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
+                            }elseif ($field['name'] == 'assigned_user_name') {
+                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name', 'assigned_user_id');
                              }
                              else
                              {
                                  $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
 							}
-                        } else if($matches[0] == 'Campaigns') {
+                        } else if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Accounts') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -467,15 +467,15 @@ 
                             $shippingKey = SugarArray::staticGet($f, 'displayParams.shippingKey');
                             $additionalFields = SugarArray::staticGet($f, 'displayParams.additionalFields');
                             $sqs_objects[$name] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $sqs_objects[$name] = $qsd->getQSContact($field['name'], $field['id_name']);
-                            if(preg_match('/_c$/si',$name) || !empty($field['quicksearch'])){
+                            if (preg_match('/_c$/si', $name) || !empty($field['quicksearch'])) {
                                 $sqs_objects[$name]['field_list'] = array('salutation', 'first_name', 'last_name', 'id');
                             }
                         }
                     } else {
                         $sqs_objects[$name] = $qsd->getQSParent($field['module']);
-                        if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                        if (!isset($field['field_list']) && !isset($field['populate_list'])) {
                             $sqs_objects[$name]['populate_list'] = array($field['name'], $field['id_name']);
                             // now handle quicksearches where the column to match is not 'name' but rather specified in 'rname'
                             if (!isset($field['rname']))
@@ -484,14 +484,14 @@ 
                             {
                                 $sqs_objects[$name]['field_list'] = array($field['rname'], 'id');
                                 $sqs_objects[$name]['order'] = $field['rname'];
-                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'],'op'=>'like_custom','end'=>'%','value'=>''));
+                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'], 'op'=>'like_custom', 'end'=>'%', 'value'=>''));
                             }
                         } else {
                             $sqs_objects[$name]['populate_list'] = $field['field_list'];
                             $sqs_objects[$name]['field_list'] = $field['populate_list'];
                         }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name] = $qsd->getQSParent();
                 } //if-else
 
@@ -501,13 +501,13 @@ 
 
                 //merge populate_list && field_list with vardef
                 if (!empty($field['field_list']) && !empty($field['populate_list'])) {
-                    for ($j=0; $j<count($field['field_list']); $j++) {
+                    for ($j = 0; $j < count($field['field_list']); $j++) {
                 		//search for the same couple (field_list_item,populate_field_item)
                			$field_list_item = $field['field_list'][$j];
-               			$field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
+               			$field_list_item_alternate = $qsd->form_name.'_'.$field['field_list'][$j];
                			$populate_list_item = $field['populate_list'][$j];
                 		$found = false;
-                		for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
+                		for ($k = 0; $k < count($sqs_objects[$name]['field_list']); $k++) {
                 			if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
                 				$populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
                 				$found = true;
@@ -525,14 +525,14 @@ 
         }
 
        //Implement QuickSearch for the field
-       if(!empty($sqs_objects) && count($sqs_objects) > 0) {
+       if (!empty($sqs_objects) && count($sqs_objects) > 0) {
            $quicksearch_js = '<script language="javascript">';
-           $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
+           $quicksearch_js .= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
            $json = getJSONobj();
-           foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
+           foreach ($sqs_objects as $sqsfield=>$sqsfieldArray) {
                $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
            }
-           return $quicksearch_js . '</script>';
+           return $quicksearch_js.'</script>';
        }
        return '';
     }

Braces +33 added lines, -29 removed lines

@@ -61,8 +61,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -100,7 +99,9 @@ 
         $cacheDir = create_cache_directory('modules/'. $module . '/');
         $d = dir($cacheDir);
         while($e = $d->read()){
-            if(!empty($view) && $e != $view )continue;
+            if(!empty($view) && $e != $view ) {
+                continue;
+            }
             $end =strlen($e) - 4;
             if(is_file($cacheDir . $e) && $end > 1 && substr($e, $end) == '.tpl'){
                 unlink($cacheDir . $e);
@@ -197,8 +198,9 @@ 
             $javascript->setFormName($view);
 
             $javascript->setSugarBean($sugarbean);
-            if ($view != "ConvertLead")
-                $javascript->addAllFields('', null,true);
+            if ($view != "ConvertLead") {
+                            $javascript->addAllFields('', null,true);
+            }
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'), 'false', '', 'assigned_user_id');
@@ -221,8 +223,7 @@ 
                         || isset($app_strings[$def['vname']])
                         || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
                      $vname = $def['vname'];
-                  }
-                  else{
+                  } else{
                      $vname = "undefined";
                   }
                   $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
@@ -234,7 +235,7 @@ 
             $contents .= $javascript->getScript();
             $contents .= $this->createQuickSearchCode($defs, $defs2, $view, $module);
             $contents .= "{/literal}\n";
-        }else if(preg_match('/^SearchForm_.+/', $view)){
+        } else if(preg_match('/^SearchForm_.+/', $view)){
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
@@ -336,10 +337,12 @@ 
     {
         $sqs_objects = array();
         require_once('include/QuickSearchDefaults.php');
-        if(isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
+        if(isset($this) && $this instanceof TemplateHandler) {
+            //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults($this->getQSDLookup());
-        }else
+        }
+        } else
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults(array());
         }
@@ -348,7 +351,7 @@ 
         	if(strpos($view, 'popup_query_form')){
         		$qsd->setFormName('popup_query_form');
             	$parsedView = 'advanced';
-        	}else{
+        	} else{
         		$qsd->setFormName('search_form');
             	$parsedView = preg_replace("/^SearchForm_/", "", $view);
         	}
@@ -366,8 +369,7 @@ 
 
                             if(!empty($f['name']) && !empty($f['id_name'])) {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],$f['id_name']);
-                            }
-                            else {
+                            } else {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                             }
                         } else if($matches[0] == 'Campaigns') {
@@ -403,13 +405,16 @@ 
                 } //if-else
             } //foreach
 
-            foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
+            foreach ( $sqs_objects as $name => $field ) {
+                           foreach ( $field['populate_list'] as $key => $fieldname )
                     $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
-        }else{
+            }
+        } else{
             //Loop through the Meta-Data fields to see which ones need quick search support
             foreach($defs2 as $f) {
-                if(!isset($defs[$f['name']])) continue;
+                if(!isset($defs[$f['name']])) {
+                    continue;
+                }
 
                 $field = $defs[$f['name']];
                 if ($view == "ConvertLead")
@@ -420,13 +425,13 @@ 
                         $ida_suffix = "_".$lc_module.$lc_module."_ida";
                         if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
                             $field['id_name'] = $module . $field['id_name'];
+                        } else {
+                                                    $field['id_name'] = $field['name'] . "_" . $field['id_name'];
+                        }
+                    } else {
+                        if (!empty($field['id_name'])) {
+                                                    $field['id_name'] = $module.$field['id_name'];
                         }
-                        else
-                            $field['id_name'] = $field['name'] . "_" . $field['id_name'];
-                    }
-                    else {
-                        if (!empty($field['id_name']))
-                            $field['id_name'] = $module.$field['id_name'];
                     }
                 }
 				$name = $qsd->form_name . '_' . $field['name'];
@@ -444,10 +449,9 @@ 
                             if($field['name'] == 'reports_to_name'){
                                 $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
                              // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
-                            }elseif($field['name'] == 'assigned_user_name'){
+                            } elseif($field['name'] == 'assigned_user_name'){
                                  $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
-                             }
-                             else
+                             } else
                              {
                                  $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
@@ -478,9 +482,9 @@ 
                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
                             $sqs_objects[$name]['populate_list'] = array($field['name'], $field['id_name']);
                             // now handle quicksearches where the column to match is not 'name' but rather specified in 'rname'
-                            if (!isset($field['rname']))
-                                $sqs_objects[$name]['field_list'] = array('name', 'id');
-                            else
+                            if (!isset($field['rname'])) {
+                                                            $sqs_objects[$name]['field_list'] = array('name', 'id');
+                            } else
                             {
                                 $sqs_objects[$name]['field_list'] = array($field['rname'], 'id');
                                 $sqs_objects[$name]['order'] = $field['rname'];

include/generic/SugarWidgets/SugarWidgetFieldvarchar.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,9 +49,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SugarWidgetFieldVarchar(&$layout_manager){
+    function SugarWidgetFieldVarchar(&$layout_manager) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -92,15 +92,15 @@ 
 
  function queryFilterone_of(&$layout_def)
  {
-    foreach($layout_def['input_name0'] as $key => $value) {
+    foreach ($layout_def['input_name0'] as $key => $value) {
         $layout_def['input_name0'][$key] = $GLOBALS['db']->quote($value);
     }
-    return $this->_get_column_select($layout_def) . " IN ('" . implode("','", $layout_def['input_name0']) . "')\n";
+    return $this->_get_column_select($layout_def)." IN ('".implode("','", $layout_def['input_name0'])."')\n";
  }
 
  function displayInput(&$layout_def)
  {
- 		$str = '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
+ 		$str = '<input type="text" size="20" value="'.$layout_def['input_name0'].'" name="'.$layout_def['name'].'">';
  		return $str;
  }
 }

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();