adamjakab / SuiteCRM

modules/AOR_Reports/metadata/listviewdefs.php

Spacing +7 added lines, -7 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');
 /**
  * Advanced OpenReports, SugarCRM Reporting.
  * @package Advanced OpenReports for SugarCRM
@@ -25,16 +25,16 @@ 
 
 
 $listViewDefs ['AOR_Reports'] =
-array (
+array(
   'NAME' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
   ),
   'REPORT_MODULE' => 
-  array (
+  array(
     'type' => 'enum',
     'default' => true,
     'studio' => 'visible',
@@ -42,7 +42,7 @@ 
     'width' => '15%',
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_ASSIGNED_TO_NAME',
     'module' => 'Employees',
@@ -50,14 +50,14 @@ 
     'default' => true,
   ),
   'DATE_ENTERED' => 
-  array (
+  array(
     'type' => 'datetime',
     'label' => 'LBL_DATE_ENTERED',
     'width' => '15%',
     'default' => true,
   ),
   'DATE_MODIFIED' => 
-  array (
+  array(
     'type' => 'datetime',
     'label' => 'LBL_DATE_MODIFIED',
     'width' => '15%',

Braces +3 added lines, -1 removed lines

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

Indentation +15 added lines, -15 removed lines

@@ -26,42 +26,42 @@
 
 $listViewDefs ['AOR_Reports'] =
 array (
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
-  ),
-  'REPORT_MODULE' => 
-  array (
+    ),
+    'REPORT_MODULE' => 
+    array (
     'type' => 'enum',
     'default' => true,
     'studio' => 'visible',
     'label' => 'LBL_REPORT_MODULE',
     'width' => '15%',
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_ASSIGNED_TO_NAME',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'DATE_ENTERED' => 
-  array (
+    ),
+    'DATE_ENTERED' => 
+    array (
     'type' => 'datetime',
     'label' => 'LBL_DATE_ENTERED',
     'width' => '15%',
     'default' => true,
-  ),
-  'DATE_MODIFIED' => 
-  array (
+    ),
+    'DATE_MODIFIED' => 
+    array (
     'type' => 'datetime',
     'label' => 'LBL_DATE_MODIFIED',
     'width' => '15%',
     'default' => true,
-  ),
+    ),
 );
 ?>

modules/AOR_Reports/views/view.edit.php

Spacing +26 added lines, -26 removed lines

@@ -38,17 +38,17 @@ 
         //readfile('modules/AOR_Reports/css/edit.css');
         readfile('modules/AOR_Reports/js/jqtree/jqtree.css');
         echo "</style>";
-        if (!is_file('cache/jsLanguage/AOR_Fields/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Fields', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Fields/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js"></script>';
 
-        if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
         echo '<script src="include/javascript/yui3/build/yui/yui-min.js"></script>';
 
         echo "<script>";
@@ -69,8 +69,8 @@ 
         parent::preDisplay();
     }
 
-    private function getConditionLines(){
-        if(!$this->bean->id){
+    private function getConditionLines() {
+        if (!$this->bean->id) {
             return array();
         }
         $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->bean->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -79,20 +79,20 @@ 
         while ($row = $this->bean->db->fetchByAssoc($result)) {
             $condition_name = new AOR_Condition();
             $condition_name->retrieve($row['id']);
-            if(!$condition_name->parenthesis) {
+            if (!$condition_name->parenthesis) {
                 $condition_name->module_path = implode(":", unserialize(base64_decode($condition_name->module_path)));
             }
-            if($condition_name->value_type == 'Date'){
+            if ($condition_name->value_type == 'Date') {
                 $condition_name->value = unserialize(base64_decode($condition_name->value));
             }
             $condition_item = $condition_name->toArray();
 
-            if(!$condition_name->parenthesis) {
+            if (!$condition_name->parenthesis) {
                 $display = getDisplayForField($condition_name->module_path, $condition_name->field, $this->bean->report_module);
                 $condition_item['module_path_display'] = $display['module'];
                 $condition_item['field_label'] = $display['field'];
             }
-            if(isset($conditions[$condition_item['condition_order']])) {
+            if (isset($conditions[$condition_item['condition_order']])) {
                 $conditions[] = $condition_item;
             }
             else {
@@ -102,8 +102,8 @@ 
         return $conditions;
     }
 
-    private function getFieldLines(){
-        if(!$this->bean->id){
+    private function getFieldLines() {
+        if (!$this->bean->id) {
             return array();
         }
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->bean->id."' AND deleted = 0 ORDER BY field_order ASC";
@@ -113,10 +113,10 @@ 
         while ($row = $this->bean->db->fetchByAssoc($result)) {
             $field_name = new AOR_Field();
             $field_name->retrieve($row['id']);
-            $field_name->module_path = implode(":",unserialize(base64_decode($field_name->module_path)));
+            $field_name->module_path = implode(":", unserialize(base64_decode($field_name->module_path)));
             $arr = $field_name->toArray();
 
-            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field  , $this->bean->report_module);
+            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
 
             $display = getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
 
@@ -127,42 +127,42 @@ 
         return $fields;
     }
 
-    private function getChartLines(){
+    private function getChartLines() {
         $charts = array();
-        if(!$this->bean->id){
+        if (!$this->bean->id) {
             return array();
         }
-        foreach($this->bean->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        foreach ($this->bean->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
             $charts[] = $chart->toArray();
         }
         return $charts;
     }
 
-    public function getDisplayForField($modulePath, $field, $reportModule){
+    public function getDisplayForField($modulePath, $field, $reportModule) {
         $modulePathDisplay = array();
         $currentBean = BeanFactory::getBean($reportModule);
         $modulePathDisplay[] = $currentBean->module_name;
-        if(is_array($modulePath)) {
+        if (is_array($modulePath)) {
             $split = $modulePath;
-        }else{
+        } else {
             $split = explode(':', $modulePath);
         }
         if ($split && $split[0] == $currentBean->module_dir) {
             array_shift($split);
         }
-        foreach($split as $relName){
-            if(empty($relName)){
+        foreach ($split as $relName) {
+            if (empty($relName)) {
                 continue;
             }
-            if(!empty($currentBean->field_name_map[$relName]['vname'])){
-                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'],$currentBean->module_dir),':');
+            if (!empty($currentBean->field_name_map[$relName]['vname'])) {
+                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'], $currentBean->module_dir), ':');
             }
             $thisModule = getRelatedModule($currentBean->module_dir, $relName);
             $currentBean = BeanFactory::getBean($thisModule);
 
-            if(!empty($moduleLabel)){
+            if (!empty($moduleLabel)) {
                 $modulePathDisplay[] = $moduleLabel;
-            }else {
+            } else {
                 $modulePathDisplay[] = $currentBean->module_name;
             }
         }

Braces +3 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
             }
             if(isset($conditions[$condition_item['condition_order']])) {
                 $conditions[] = $condition_item;
-            }
-            else {
+            } else {
                 $conditions[$condition_item['condition_order']] = $condition_item;
             }
         }
@@ -144,7 +143,7 @@ 
         $modulePathDisplay[] = $currentBean->module_name;
         if(is_array($modulePath)) {
             $split = $modulePath;
-        }else{
+        } else{
             $split = explode(':', $modulePath);
         }
         if ($split && $split[0] == $currentBean->module_dir) {
@@ -162,7 +161,7 @@ 
 
             if(!empty($moduleLabel)){
                 $modulePathDisplay[] = $moduleLabel;
-            }else {
+            } else {
                 $modulePathDisplay[] = $currentBean->module_name;
             }
         }

Doc Comments +4 added lines

@@ -138,6 +138,10 @@
         return $charts;
     }
 
+    /**
+     * @param string $modulePath
+     * @param string $field
+     */
     public function getDisplayForField($modulePath, $field, $reportModule){
         $modulePathDisplay = array();
         $currentBean = BeanFactory::getBean($reportModule);

Indentation +23 added lines, -23 removed lines

@@ -1,27 +1,27 @@
 <?php
- /**
- *
- *
- * @package
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <support@salesagility.com>
- */
+    /**
+     *
+     *
+     * @package
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author Salesagility Ltd <support@salesagility.com>
+     */
 class AOD_LogicHooks{
 
     function saveModuleChanges(SugarBean $bean, $event, $arguments){

modules/AOR_Reports/views/view.detail.php

Spacing +13 added lines, -13 removed lines

@@ -29,31 +29,31 @@ 
     public function __construct() {
         parent::ViewDetail();
     }
-    private function getReportParameters(){
-        if(!$this->bean->id){
+    private function getReportParameters() {
+        if (!$this->bean->id) {
             return array();
         }
-        $conditions = $this->bean->get_linked_beans('aor_conditions','AOR_Conditions', 'condition_order');
+        $conditions = $this->bean->get_linked_beans('aor_conditions', 'AOR_Conditions', 'condition_order');
         $parameters = array();
-        foreach($conditions as $condition){
-            if(!$condition->parameter){
+        foreach ($conditions as $condition) {
+            if (!$condition->parameter) {
                 continue;
             }
-            $condition->module_path = implode(":",unserialize(base64_decode($condition->module_path)));
-            if($condition->value_type == 'Date'){
+            $condition->module_path = implode(":", unserialize(base64_decode($condition->module_path)));
+            if ($condition->value_type == 'Date') {
                 $condition->value = unserialize(base64_decode($condition->value));
             }
             $condition_item = $condition->toArray();
             $display = getDisplayForField($condition->module_path, $condition->field, $this->bean->report_module);
             $condition_item['module_path_display'] = $display['module'];
             $condition_item['field_label'] = $display['field'];
-            if(!empty($this->bean->user_parameters[$condition->id])){
+            if (!empty($this->bean->user_parameters[$condition->id])) {
                 $param = $this->bean->user_parameters[$condition->id];
                 $condition_item['operator'] = $param['operator'];
                 $condition_item['value_type'] = $param['type'];
                 $condition_item['value'] = $param['value'];
             }
-            if(isset($parameters[$condition_item['condition_order']])) {
+            if (isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
             }
             else {
@@ -66,14 +66,14 @@ 
     public function preDisplay() {
         global $app_list_strings;
         parent::preDisplay();
-        $this->ss->assign('report_module',$this->bean->report_module);
+        $this->ss->assign('report_module', $this->bean->report_module);
 
 
 
         $this->bean->user_parameters = requestToUserParameters();
 
         //$reportHTML = $this->bean->build_group_report(0,true);
-        $reportHTML = $this->bean->buildMultiGroupReport(0,true);
+        $reportHTML = $this->bean->buildMultiGroupReport(0, true);
 
         $chartsHTML = $this->bean->build_report_chart(null, AOR_Report::CHART_TYPE_RGRAPH);
 
@@ -84,11 +84,11 @@ 
         $this->ss->assign('report_content', $reportHTML);
 
         echo "<input type='hidden' name='report_module' id='report_module' value='{$this->bean->report_module}'>";
-        if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
 
         $params = $this->getReportParameters();
         echo "<script>var reportParameters = ".json_encode($params).";</script>";

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }
             if(isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
-            }
-            else {
+            } else {
                 $parameters[$condition_item['condition_order']] = $condition_item;
             }
         }

Indentation +23 added lines, -23 removed lines

@@ -1,27 +1,27 @@
 <?php
- /**
- * 
- * 
- * @package 
- * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <support@salesagility.com>
- */
+    /**
+     * 
+     * 
+     * @package 
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     * 
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author Salesagility Ltd <support@salesagility.com>
+     */
 require_once 'modules/InboundEmail/InboundEmail.php';
 require_once 'include/clean.php';
 class AOPInboundEmail extends InboundEmail {

modules/AOR_Reports/controller.php

Braces +110 added lines, -51 removed lines

@@ -191,10 +191,11 @@ 
 
             for($x =0; $x < $countOfCharts; $x++)
             {
-                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus)
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
-                else
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus) {
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
+                } else {
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                }
             }
 
 /*            foreach($graphs as $g)
@@ -241,7 +242,7 @@ 
             $pdf->WriteHTML($printable,3);
             $pdf->Output($this->bean->name.'.pdf', "D");
 
-        }catch(mPDF_exception $e){
+        } catch(mPDF_exception $e){
             echo $e;
         }
 
@@ -259,7 +260,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_function_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_function_list'][$value];
         }
         die;
@@ -278,11 +279,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -329,7 +336,7 @@ 
         $app_list_strings['aor_operator_list'];
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_operator_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_operator_list'][$value];
         }
         die;
@@ -348,11 +355,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -403,7 +416,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_condition_type_list'][$value];
         }
         die;
@@ -423,11 +436,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -460,7 +479,9 @@ 
                 break;
             case 'relate':
                 $valid_opp = array('Value','Field');
-                if($vardef['module'] == 'Users') $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                if($vardef['module'] == 'Users') {
+                    $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                }
                 break;
             default:
                 $valid_opp = array('Value','Field');
@@ -475,7 +496,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_action_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_action_type_list'][$value];
         }
         die;
@@ -494,18 +515,26 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -518,7 +547,7 @@ 
             case 'Period':
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getDropdownList('date_time_period_list',$_REQUEST['aor_value']) ."</select>";
-                }else{
+                } else{
                     echo getDropdownList('date_time_period_list',$_REQUEST['aor_value']);
                 }
 
@@ -540,23 +569,33 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Date':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 echo getDateField($module, $aor_field, $view, $value);
                 break;
             Case 'Round_Robin';
@@ -575,11 +614,17 @@ 
 
     protected function action_getModuleField()
     {
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         echo getModuleField($_REQUEST['aor_module'],$_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value );
         die;
@@ -591,18 +636,26 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -624,11 +677,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -652,7 +711,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_rel_action_type_list'][$value];
         }
         die;

Spacing +148 added lines, -148 removed lines

@@ -31,19 +31,19 @@ 
     protected function action_getModuleFields()
     {
         if (!empty($_REQUEST['aor_module']) && $_REQUEST['aor_module'] != '') {
-            if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-                $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+            if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+                $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
             } else {
                 $module = $_REQUEST['aor_module'];
             }
             $val = !empty($_REQUEST['aor_value']) ? $_REQUEST['aor_value'] : '';
-            echo getModuleFields($module,$_REQUEST['view'],$val);
+            echo getModuleFields($module, $_REQUEST['view'], $val);
         }
         die;
 
     }
-    function action_getVarDefs(){
-        if($_REQUEST['aor_module']){
+    function action_getVarDefs() {
+        if ($_REQUEST['aor_module']) {
             $bean = BeanFactory::getBean($_REQUEST['aor_module']);
             echo json_encode((array)$bean->field_defs[$_REQUEST['aor_request']]);
             die();
@@ -69,11 +69,11 @@ 
         die;
     }
 
-    protected function action_changeReportPage(){
+    protected function action_changeReportPage() {
         $tableId = !empty($_REQUEST['table_id']) ? $_REQUEST['table_id'] : '';
         $group = !empty($_REQUEST['group']) ? $_REQUEST['group'] : '';
         $offset = !empty($_REQUEST['offset']) ? $_REQUEST['offset'] : 0;
-        if(!empty($this->bean->id)){
+        if (!empty($this->bean->id)) {
             $this->bean->user_parameters = requestToUserParameters();
             //echo $this->bean->build_report_html($offset, true,$group,$tableId);
             echo $this->bean->build_group_report($offset, true);
@@ -82,17 +82,17 @@ 
         die();
     }
 
-    protected function action_getParametersForReport(){
-        if(empty($_REQUEST['record'])){
+    protected function action_getParametersForReport() {
+        if (empty($_REQUEST['record'])) {
             echo json_encode(array());
             return;
         }
-        $report = BeanFactory::getBean('AOR_Reports',$_REQUEST['record']);
-        if(!$report){
+        $report = BeanFactory::getBean('AOR_Reports', $_REQUEST['record']);
+        if (!$report) {
             echo json_encode(array());
             return;
         }
-        if(empty($report->id)) {
+        if (empty($report->id)) {
             echo json_encode(array());
             return;
         }
@@ -100,24 +100,24 @@ 
         echo json_encode($conditions);
     }
 
-    protected function action_getChartsForReport(){
-        if(empty($_REQUEST['record'])){
+    protected function action_getChartsForReport() {
+        if (empty($_REQUEST['record'])) {
             echo json_encode(array());
             return;
         }
-        $report = BeanFactory::getBean('AOR_Reports',$_REQUEST['record']);
-        if(!$report){
+        $report = BeanFactory::getBean('AOR_Reports', $_REQUEST['record']);
+        if (!$report) {
             echo json_encode(array());
             return;
         }
         $charts = array();
-        foreach($report->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        foreach ($report->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
             $charts[$chart->id] = $chart->name;
         }
         echo json_encode($charts);
     }
 
-    protected function action_addToProspectList(){
+    protected function action_addToProspectList() {
         global $beanList;
 
         require_once('modules/Relationships/Relationship.php');
@@ -135,13 +135,13 @@ 
             $result = $this->bean->db->query($sql);
             $beans = array();
             while ($row = $this->bean->db->fetchByAssoc($result)) {
-                if (isset($row[$module->table_name.'_id'])){
+                if (isset($row[$module->table_name.'_id'])) {
                     $beans[] = $row[$module->table_name.'_id'];
                 }
             }
-            if(!empty($beans)){
-                foreach($prospectList->field_defs as $field=>$def){
-                    if($def['type'] == 'link' && !empty($def['relationship']) && $def['relationship'] == $key){
+            if (!empty($beans)) {
+                foreach ($prospectList->field_defs as $field=>$def) {
+                    if ($def['type'] == 'link' && !empty($def['relationship']) && $def['relationship'] == $key) {
                         $prospectList->load_relationship($field);
                         $prospectList->$field->add($beans);
                     }
@@ -170,41 +170,41 @@ 
         error_reporting(0);
         require_once('modules/AOS_PDF_Templates/PDF_Lib/mpdf.php');
 
-        $d_image = explode('?',SugarThemeRegistry::current()->getImageURL('company_logo.png'));
+        $d_image = explode('?', SugarThemeRegistry::current()->getImageURL('company_logo.png'));
         $graphs = $_POST["graphsForPDF"];
         $graphHtml = "<div class='reportGraphs' style='width:100%; text-align:center;'>";
 
         $chartsPerRow = $this->bean->graphs_per_row;
         $countOfCharts = count($graphs);
-        if($countOfCharts > 0)
+        if ($countOfCharts > 0)
         {
-            $width = ((int)100/$chartsPerRow);
+            $width = ((int)100 / $chartsPerRow);
 
             $modulusRemainder = $countOfCharts % $chartsPerRow;
 
-            if($modulusRemainder > 0)
+            if ($modulusRemainder > 0)
             {
-                $modulusWidth = ((int)100/$modulusRemainder);
+                $modulusWidth = ((int)100 / $modulusRemainder);
                 $itemsWithModulus = $countOfCharts - $modulusRemainder;
             }
 
 
-            for($x =0; $x < $countOfCharts; $x++)
+            for ($x = 0; $x < $countOfCharts; $x++)
             {
-                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus)
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
+                if (is_null($itemsWithModulus) || $x < $itemsWithModulus)
+                    $graphHtml .= "<img src='.$graphs[$x].' style='width:$width%;' />";
                 else
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                    $graphHtml .= "<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
             }
 
 /*            foreach($graphs as $g)
             {
                 $graphHtml.="<img src='.$g.' style='width:$width%;' />";
             }*/
-            $graphHtml.="</div>";
+            $graphHtml .= "</div>";
         }
 
-        $head =  '<table style="width: 100%; font-family: Arial; text-align: center;" border="0" cellpadding="2" cellspacing="2">
+        $head = '<table style="width: 100%; font-family: Arial; text-align: center;" border="0" cellpadding="2" cellspacing="2">
                 <tbody style="text-align: left;">
                 <tr style="text-align: left;">
                 <td style="text-align: left;">
@@ -229,25 +229,25 @@ 
 
         $this->bean->user_parameters = requestToUserParameters();
 
-        $printable = $this->bean->build_group_report(-1,false);
-        $stylesheet = file_get_contents(SugarThemeRegistry::current()->getCSSURL('style.css',false));
+        $printable = $this->bean->build_group_report(-1, false);
+        $stylesheet = file_get_contents(SugarThemeRegistry::current()->getCSSURL('style.css', false));
         ob_clean();
-        try{
-            $pdf=new mPDF('en','A4','','DejaVuSansCondensed');
+        try {
+            $pdf = new mPDF('en', 'A4', '', 'DejaVuSansCondensed');
             $pdf->setAutoFont();
-            $pdf->WriteHTML($stylesheet,1);
-            $pdf->WriteHTML($head,2);
-            $pdf->WriteHTML($printable,3);
+            $pdf->WriteHTML($stylesheet, 1);
+            $pdf->WriteHTML($head, 2);
+            $pdf->WriteHTML($printable, 3);
             $pdf->Output($this->bean->name.'.pdf', "D");
 
-        }catch(mPDF_exception $e){
+        }catch (mPDF_exception $e) {
             echo $e;
         }
 
         die;
     }
 
-    protected function action_getModuleFunctionField(){
+    protected function action_getModuleFunctionField() {
         global $app_list_strings;
 
         $view = $_REQUEST['view'];
@@ -256,31 +256,31 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_function_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_function_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_function_list'][$value];
         }
         die;
     }
 
 
-    protected function action_getModuleOperatorField(){
+    protected function action_getModuleOperatorField() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -288,12 +288,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'uint':
             case 'ulong':
@@ -301,24 +301,24 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'enum':
             case 'multienum':
-                $valid_opp = array('Equal_To','Not_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To');
                 break;
             default:
-                $valid_opp = array('Equal_To','Not_Equal_To','Contains', 'Starts_With', 'Ends_With',);
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Contains', 'Starts_With', 'Ends_With',);
                 break;
         }
 
-        foreach($app_list_strings['aor_operator_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_operator_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_operator_list'][$key]);
             }
         }
@@ -326,31 +326,31 @@ 
 
 
         $app_list_strings['aor_operator_list'];
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_operator_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_operator_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_operator_list'][$value];
         }
         die;
 
     }
 
-    protected function action_getFieldTypeOptions(){
+    protected function action_getFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -358,12 +358,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'uint':
             case 'ulong':
@@ -371,50 +371,50 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Value','Field', 'Date', 'Period');
+                $valid_opp = array('Value', 'Field', 'Date', 'Period');
                 break;
             case 'enum':
             case 'dynamicenum':
             case 'multienum':
-                $valid_opp = array('Value','Field', 'Multi');
+                $valid_opp = array('Value', 'Field', 'Multi');
                 break;
             default:
                 // Added to compare fields like assinged to with the current user
-                if( (isset($vardef['module']) && $vardef['module'] == "Users") || $vardef['name'] = 'id') {
-                    $valid_opp = array('Value','Field', 'CurrentUserID');
+                if ((isset($vardef['module']) && $vardef['module'] == "Users") || $vardef['name'] = 'id') {
+                    $valid_opp = array('Value', 'Field', 'CurrentUserID');
                 } else {
-                    $valid_opp = array('Value','Field');
+                    $valid_opp = array('Value', 'Field');
                 }
 
                 break;
         }
 
-        foreach($app_list_strings['aor_condition_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_condition_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_condition_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_condition_type_list'][$value];
         }
         die;
 
     }
 
-    protected function action_getActionFieldTypeOptions(){
+    protected function action_getActionFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
@@ -422,10 +422,10 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -433,12 +433,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'uint':
             case 'ulong':
@@ -446,35 +446,35 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Value','Field', 'Date');
+                $valid_opp = array('Value', 'Field', 'Date');
                 break;
             case 'enum':
             case 'multienum':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'relate':
-                $valid_opp = array('Value','Field');
-                if($vardef['module'] == 'Users') $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                $valid_opp = array('Value', 'Field');
+                if ($vardef['module'] == 'Users') $valid_opp = array('Value', 'Field', 'Round_Robin', 'Least_Busy', 'Random');
                 break;
             default:
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
         }
 
-        foreach($app_list_strings['aor_action_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_action_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_action_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_action_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_action_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_action_type_list'][$value];
         }
         die;
@@ -483,8 +483,8 @@ 
 
     protected function action_getModuleFieldType()
     {
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $rel_module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $rel_module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $rel_module = $_REQUEST['aor_module'];
         }
@@ -493,18 +493,18 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -512,13 +512,13 @@ 
                 echo getDateField($module, $aor_field, $view, $value, false);
                 break;
             case 'Multi':
-                echo getModuleField($rel_module,$fieldname, $aor_field, $view, $value,'multienum');
+                echo getModuleField($rel_module, $fieldname, $aor_field, $view, $value, 'multienum');
                 break;
             case 'Period':
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getDropdownList('date_time_period_list',$_REQUEST['aor_value']) ."</select>";
-                }else{
-                    echo getDropdownList('date_time_period_list',$_REQUEST['aor_value']);
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getDropdownList('date_time_period_list', $_REQUEST['aor_value'])."</select>";
+                } else {
+                    echo getDropdownList('date_time_period_list', $_REQUEST['aor_value']);
                 }
 
                 break;
@@ -526,7 +526,7 @@ 
                 break;
             case 'Value':
             default:
-                echo getModuleField($rel_module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($rel_module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
@@ -539,23 +539,23 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Date':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
                 echo getDateField($module, $aor_field, $view, $value);
                 break;
             Case 'Round_Robin';
@@ -565,7 +565,7 @@ 
                 break;
             case 'Value':
             default:
-                echo getModuleField($module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
@@ -574,13 +574,13 @@ 
 
     protected function action_getModuleField()
     {
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        echo getModuleField($_REQUEST['aor_module'],$_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value );
+        echo getModuleField($_REQUEST['aor_module'], $_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value);
         die;
     }
 
@@ -590,31 +590,31 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Value':
             default:
-                echo getModuleField($module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
 
     }
 
-    protected function action_getRelActionFieldTypeOptions(){
+    protected function action_getRelActionFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
@@ -623,10 +623,10 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -643,15 +643,15 @@ 
         }*/
         $valid_opp = array('Value');
 
-        foreach($app_list_strings['aor_rel_action_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_rel_action_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_rel_action_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_rel_action_type_list'][$value];
         }
         die;

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php

Indentation +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     var $onlyCharts;
 
     function AORReportsDashlet($id, $def = array()) {
-		global $current_user, $app_strings;
+        global $current_user, $app_strings;
 
         parent::Dashlet($id);
         $this->isConfigurable = true;
@@ -68,7 +68,7 @@ 
         }
     }
 
-	function process() {
+    function process() {
     }
 
     public function displayOptions() {

Spacing +22 added lines, -22 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');
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -17,14 +17,14 @@ 
         parent::Dashlet($id);
         $this->isConfigurable = true;
         $this->def = $def;
-        if(empty($def['dashletTitle'])) {
+        if (empty($def['dashletTitle'])) {
             $this->title = translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports');
-        } else{
+        } else {
             $this->title = $def['dashletTitle'];
         }
 
         $this->params = array();
-        if(!empty($def['parameter_id'])) {
+        if (!empty($def['parameter_id'])) {
             foreach ($def['parameter_id'] as $key => $parameterId) {
                 $this->params[$parameterId] = array(
                     'id' => $parameterId,
@@ -33,7 +33,7 @@ 
                     'value' => $def['parameter_value'][$key]);
             }
         }
-        if(!empty($def['aor_report_id'])) {
+        if (!empty($def['aor_report_id'])) {
             $this->report = BeanFactory::getBean('AOR_Reports', $def['aor_report_id']);
             $this->report->user_parameters = $this->params;
         }
@@ -46,12 +46,12 @@ 
         $mod_strings = return_module_language($current_language, 'AOR_Reports');
         $dashletSmarty = new Sugar_Smarty();
         $dashletTemplate = get_custom_file_if_exists('modules/AOR_Reports/Dashlets/AORReportsDashlet/dashlet.tpl');
-        $dashletSmarty->assign('MOD',$mod_strings);
-        $dashletSmarty->assign('dashlet_id',$this->id);
-        $dashletSmarty->assign('report_id',$this->report->id);
-        $dashletSmarty->assign('chartHTML',$this->getChartHTML());
+        $dashletSmarty->assign('MOD', $mod_strings);
+        $dashletSmarty->assign('dashlet_id', $this->id);
+        $dashletSmarty->assign('report_id', $this->report->id);
+        $dashletSmarty->assign('chartHTML', $this->getChartHTML());
         $dashletSmarty->assign('onlyCharts', $this->onlyCharts);
-        $dashletSmarty->assign('parameters',json_encode(array(
+        $dashletSmarty->assign('parameters', json_encode(array(
                                             'ids' => $this->def['parameter_id'],
                                             'operators' => $this->def['parameter_operator'],
                                             'types' => $this->def['parameter_type'],
@@ -59,11 +59,11 @@ 
         return $dashletSmarty->fetch($dashletTemplate);
     }
 
-    function getChartHTML(){
-        if(!empty($this->report->id)) {
+    function getChartHTML() {
+        if (!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else {
             return '';
         }
     }
@@ -76,7 +76,7 @@ 
         global $current_language, $app_list_strings, $datetime;
         $mod_strings = return_module_language($current_language, 'AOR_Reports');
         $optionsSmarty = new Sugar_Smarty();
-        $optionsSmarty->assign('MOD',$mod_strings);
+        $optionsSmarty->assign('MOD', $mod_strings);
         $optionsSmarty->assign('id', $this->id);
         $optionsSmarty->assign('dashletTitle', $this->title);
         $optionsSmarty->assign('aor_report_id', $this->report->id);
@@ -89,16 +89,16 @@ 
         $optionsSmarty->assign('date_time_period_list', $app_list_strings['date_time_period_list']);
 
         $charts = array();
-        if(!empty($this->report->id)){
-            foreach($this->report->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        if (!empty($this->report->id)) {
+            foreach ($this->report->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
                 $charts[$chart->id] = $chart->name;
             }
         }
         $conditions = getConditionsAsParameters($this->report, $this->params);
         $i = 0;
-        foreach($conditions as $condition) {
-            if($condition["value_type"] == "Date"){
-                if($condition["additionalConditions"][0] == "now") {
+        foreach ($conditions as $condition) {
+            if ($condition["value_type"] == "Date") {
+                if ($condition["additionalConditions"][0] == "now") {
                     $conditions[$i]["value"] = date("d/m/Y");
                 }
             }
@@ -106,7 +106,7 @@ 
             $i++;
         }
         $optionsSmarty->assign('parameters', $conditions);
-        $chartOptions = get_select_options_with_id($charts,$this->charts);
+        $chartOptions = get_select_options_with_id($charts, $this->charts);
         $optionsSmarty->assign('chartOptions', $chartOptions);
         $optionsTemplate = get_custom_file_if_exists('modules/AOR_Reports/Dashlets/AORReportsDashlet/dashletConfigure.tpl');
         ob_clean();
@@ -119,8 +119,8 @@ 
 //            $req['parameter_value'][0] = $secondValue;
 //            $req['parameter_value'][1] = $firstValue;
 //        }
-        $allowedKeys = array_flip(array('aor_report_id','dashletTitle','charts','onlyCharts','parameter_id','parameter_value','parameter_type','parameter_operator'));
-        $intersected = array_intersect_key($req,$allowedKeys);
+        $allowedKeys = array_flip(array('aor_report_id', 'dashletTitle', 'charts', 'onlyCharts', 'parameter_id', 'parameter_value', 'parameter_type', 'parameter_operator'));
+        $intersected = array_intersect_key($req, $allowedKeys);
         return $intersected;
     }
 

Braces +4 added lines, -2 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');
+}
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -63,7 +65,7 @@ 
         if(!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else{
             return '';
         }
     }

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.meta.php

Indentation +3 added lines, -3 removed lines

@@ -3,6 +3,6 @@
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',
-										  'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
-                                          'description' => 'Displays Reports',
-                                          'category'    => 'Module Views');
+                                            'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
+                                            'description' => 'Displays Reports',
+                                            'category'    => 'Module Views');

Spacing +1 added lines, -1 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.

Braces +3 added lines, -1 removed lines

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

modules/DynamicFields/DynamicField.php

Indentation +68 added lines, -68 removed lines

@@ -51,7 +51,7 @@ 
         $this->base_path = "custom/Extension/modules/{$this->module}/Ext/Vardefs";
     }
 
-   function getModuleName()
+    function getModuleName()
     {
         return $this->module ;
     }
@@ -69,11 +69,11 @@ 
 
 
     /**
-    * This will add the bean as a reference in this object as well as building the custom field cache if it has not been built
-    * LOADS THE BEAN IF THE BEAN IS NOT BEING PASSED ALONG IN SETUP IT SHOULD BE SET PRIOR TO SETUP
-    *
-    * @param SUGARBEAN $bean
-    */
+     * This will add the bean as a reference in this object as well as building the custom field cache if it has not been built
+     * LOADS THE BEAN IF THE BEAN IS NOT BEING PASSED ALONG IN SETUP IT SHOULD BE SET PRIOR TO SETUP
+     *
+     * @param SUGARBEAN $bean
+     */
     function setup($bean = null) {
         if ($bean) {
             $this->bean = $bean;
@@ -95,12 +95,12 @@ 
     }
 
     /**
-    * Builds the cache for custom fields based on the vardefs
-    *
-    * @param STRING $module
-    * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
-    * @return unknown
-    */
+     * Builds the cache for custom fields based on the vardefs
+     *
+     * @param STRING $module
+     * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
+     * @return unknown
+     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
         if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
@@ -161,8 +161,8 @@ 
     }
 
     /**
-    * Returns the widget for a custom field from the fields_meta_data table.
-    */
+     * Returns the widget for a custom field from the fields_meta_data table.
+     */
     function getFieldWidget($module, $fieldName) {
         if (empty($module) || empty($fieldName)){
             sugar_die("Unable to load widget for '$module' : '$fieldName'");
@@ -179,12 +179,12 @@ 
 
 
     /**
-    * Updates the cached vardefs with the custom field information stored in result
-    *
-    * @param string $module
-    * @param array $result
-    * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
-    */
+     * Updates the cached vardefs with the custom field information stored in result
+     *
+     * @param string $module
+     * @param array $result
+     * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
+     */
     function saveToVardef($module,$result,$saveCache=true) {
 
 
@@ -248,14 +248,14 @@ 
     }
 
     /**
-    * returns either false or an array containing the select and join parameter for a query using custom fields
-    * @param $expandedList boolean	If true, return a list of all fields with source=custom_fields in the select instead of the standard _cstm.*
-    *     This is required for any downstream construction of a SQL statement where we need to manipulate the select list,
-    *     for example, listviews with custom relate fields where the value comes from join rather than from the custom table
-    *
-    * @return array select=>select columns, join=>prebuilt join statement
-    */
-  function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
+     * returns either false or an array containing the select and join parameter for a query using custom fields
+     * @param $expandedList boolean	If true, return a list of all fields with source=custom_fields in the select instead of the standard _cstm.*
+     *     This is required for any downstream construction of a SQL statement where we need to manipulate the select list,
+     *     for example, listviews with custom relate fields where the value comes from join rather than from the custom table
+     *
+     * @return array select=>select columns, join=>prebuilt join statement
+     */
+    function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
         if(!$this->bean->hasCustomFields()){
             return array(
                 'select' => '',
@@ -308,7 +308,7 @@ 
 
     }
 
-   function getRelateJoin($field_def, $joinTableAlias, $withIdName = true) {
+    function getRelateJoin($field_def, $joinTableAlias, $withIdName = true) {
         if (empty($field_def['type']) || $field_def['type'] != "relate") {
             return false;
         }
@@ -346,13 +346,13 @@ 
         $ret_array['from'] = " LEFT JOIN $rel_table $joinTableAlias ON $tableName.$relID = $joinTableAlias.id"
                             . " AND $joinTableAlias.deleted=0 ";
         return $ret_array;
-   }
+    }
 
-   /**
-    * Fills in all the custom fields of type relate relationships for an object
-    *
-    */
-   function fill_relationships(){
+    /**
+     * Fills in all the custom fields of type relate relationships for an object
+     *
+     */
+    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
             if($this->bean->relDepth > 1)return;
@@ -387,7 +387,7 @@ 
      *
      * @param boolean $isUpdate
      */
-     function save($isUpdate){
+        function save($isUpdate){
 
         if($this->bean->hasCustomFields() && isset($this->bean->id)){
 
@@ -422,8 +422,8 @@ 
                     }
 
                     $val = $this->bean->$name;
-					if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
-                    	$quote = '';
+                    if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
+                        $quote = '';
                         $val = 'NULL';
                         $this->bean->$name = ''; // do not set it to string 'NULL'
                     }
@@ -571,11 +571,11 @@ 
         if($field){
             if(!$is_update){
                 //Do two SQL calls here in this case
-            	//The first is to create the column in the custom table without the default value
-            	//The second is to modify the column created in the custom table to set the default value
-            	//We do this so that the existing entries in the custom table don't have the default value set
-            	$field->default = '';
-            	$field->default_value = '';
+                //The first is to create the column in the custom table without the default value
+                //The second is to modify the column created in the custom table to set the default value
+                //We do this so that the existing entries in the custom table don't have the default value set
+                $field->default = '';
+                $field->default_value = '';
                 // resetting default and default_value does not work for multienum and causes trouble for mssql
                 // so using a temporary variable here to indicate that we don't want default for this query
                 $field->no_default = 1;
@@ -583,19 +583,19 @@ 
                 // unsetting temporary member variable
                 unset($field->no_default);
                 if(!empty($query)){
-                	$GLOBALS['db']->query($query, true, "Cannot create column");
-	                $field->default = $fmd->default_value;
-	                $field->default_value = $fmd->default_value;
-	                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-	                if(!empty($query)){
-	                	$GLOBALS['db']->query($query, true, "Cannot set default");
-	            	}
+                    $GLOBALS['db']->query($query, true, "Cannot create column");
+                    $field->default = $fmd->default_value;
+                    $field->default_value = $fmd->default_value;
+                    $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
+                    if(!empty($query)){
+                        $GLOBALS['db']->query($query, true, "Cannot set default");
+                    }
                 }
             }else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
-                	$GLOBALS['db']->query($query, true, "Cannot modify field");
-            	}
+                    $GLOBALS['db']->query($query, true, "Cannot modify field");
+                }
             }
             $fmd->save();
             $this->buildCache($this->module);
@@ -761,12 +761,12 @@ 
                 )
             );
             $ididx = array(
-       			'id'=>array(
-       				'name' =>$this->bean->table_name."_cstm_pk",
-       				'type' =>'primary',
-       				'fields'=>array('id_c')
+                    'id'=>array(
+                        'name' =>$this->bean->table_name."_cstm_pk",
+                        'type' =>'primary',
+                        'fields'=>array('id_c')
                 ),
-           );
+            );
 
             $query = $GLOBALS['db']->createTableSQLParams($this->bean->table_name."_cstm", $iddef, $ididx);
             if(!$GLOBALS['db']->supports("inline_keys")) {
@@ -798,14 +798,14 @@ 
      *
      */
     function add_existing_custom_fields($execute = true){
-    	$out = "";
+        $out = "";
         if($this->bean->hasCustomFields()){
-	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
+            foreach($this->bean->field_defs as $name=>$data){
+                if(empty($data['source']) || $data['source'] != 'custom_fields')
                     continue;
-	            $out .= $this->add_existing_custom_field($data, $execute);
-	        }
-    	}
+                $out .= $this->add_existing_custom_field($data, $execute);
+            }
+        }
         return $out;
     }
 
@@ -959,7 +959,7 @@ 
 
     }
 
-   function populateXTPL($xtpl, $view) {
+    function populateXTPL($xtpl, $view) {
 
         if($this->bean->hasCustomFields()){
             $results = $this->getAllFieldsView($view, 'xtpl');
@@ -984,12 +984,12 @@ 
     }
 
     function getAllFieldsView($view, $type){
-         require_once ('modules/DynamicFields/FieldCases.php');
-         $results = array();
-         foreach($this->bean->field_defs as $name=>$data){
+            require_once ('modules/DynamicFields/FieldCases.php');
+            $results = array();
+            foreach($this->bean->field_defs as $name=>$data){
             if(empty($data['source']) || $data['source'] != 'custom_fields')
             {
-            	continue;
+                continue;
             }
             $field = get_widget ( $data ['type'] );
             $field->populateFromRow($data);

Spacing +209 added lines, -209 removed lines

@@ -1,6 +1,6 @@ 
 <?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
@@ -47,13 +47,13 @@ 
     var $base_path = "";
 
     function DynamicField($module = '') {
-        $this->module = (! empty ( $module )) ? $module :( (isset($_REQUEST['module']) && ! empty($_REQUEST['module'])) ? $_REQUEST ['module'] : '');
+        $this->module = (!empty ($module)) ? $module : ((isset($_REQUEST['module']) && !empty($_REQUEST['module'])) ? $_REQUEST ['module'] : '');
         $this->base_path = "custom/Extension/modules/{$this->module}/Ext/Vardefs";
     }
 
    function getModuleName()
     {
-        return $this->module ;
+        return $this->module;
     }
 
     /*
@@ -61,10 +61,10 @@ 
      */
     function getPackageName()
     {
-        return null ;
+        return null;
     }
 
-    function deleteCache(){
+    function deleteCache() {
     }
 
 
@@ -78,20 +78,20 @@ 
         if ($bean) {
             $this->bean = $bean;
         }
-        if (isset ( $this->bean->module_dir )) {
+        if (isset ($this->bean->module_dir)) {
             $this->module = $this->bean->module_dir;
         }
-        if(!isset($GLOBALS['dictionary'][$this->bean->object_name]['custom_fields'])){
-            $this->buildCache ( $this->module );
+        if (!isset($GLOBALS['dictionary'][$this->bean->object_name]['custom_fields'])) {
+            $this->buildCache($this->module);
         }
     }
 
-    function setLabel( $language='en_us' , $key , $value )
+    function setLabel($language = 'en_us', $key, $value)
     {
-        $params [ "label_" . $key ] = $value;
-        require_once 'modules/ModuleBuilder/parsers/parser.label.php' ;
-        $parser = new ParserLabel ( $this->module ) ;
-        $parser->handleSave( $params , $language);
+        $params ["label_".$key] = $value;
+        require_once 'modules/ModuleBuilder/parsers/parser.label.php';
+        $parser = new ParserLabel($this->module);
+        $parser->handleSave($params, $language);
     }
 
     /**
@@ -101,58 +101,58 @@ 
     * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
     * @return unknown
     */
-    function buildCache($module = false, $saveCache=true) {
+    function buildCache($module = false, $saveCache = true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true || empty($GLOBALS['db']))
             return false;
-        if($module == '../data')return false;
+        if ($module == '../data')return false;
 
-        static $results = array ( ) ;
+        static $results = array( );
 
         $where = '';
-        if (! empty ( $module )) {
+        if (!empty ($module)) {
             $where .= " custom_module='$module' AND ";
-            unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
+            unset($results[$module]); // clear out any old results for the module as $results is declared static
         }
         else
         {
-            $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
+            $results = array( ); // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
 
-        $GLOBALS['log']->debug('rebuilding cache for ' . $module);
+        $GLOBALS['log']->debug('rebuilding cache for '.$module);
         $query = "SELECT * FROM fields_meta_data WHERE $where deleted = 0";
 
-        $result = $GLOBALS['db']->query ( $query );
+        $result = $GLOBALS['db']->query($query);
         require_once ('modules/DynamicFields/FieldCases.php');
 
         // retrieve the field definition from the fields_meta_data table
         // using 'encode'=false to fetchByAssoc to prevent any pre-formatting of the base metadata
         // for immediate use in HTML. This metadata will be further massaged by get_field_def() and so should not be pre-formatted
-        while ( $row = $GLOBALS['db']->fetchByAssoc ( $result, false ) ) {
-            $field = get_widget ( $row ['type'] );
+        while ($row = $GLOBALS['db']->fetchByAssoc($result, false)) {
+            $field = get_widget($row ['type']);
 
-            foreach ( $row as $key => $value ) {
+            foreach ($row as $key => $value) {
                 $field->$key = $value;
             }
             $field->default = $field->default_value;
-            $vardef = $field->get_field_def ();
+            $vardef = $field->get_field_def();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
+            if (empty ($vardef ['source']))
                 $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ($results [$row ['custom_module']]))
+                $results [$row ['custom_module']] = array( );
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
-        if (empty ( $module )) {
-            foreach ( $results as $module => $result ) {
-                $this->saveToVardef ( $module, $result, $saveCache);
+        if (empty ($module)) {
+            foreach ($results as $module => $result) {
+                $this->saveToVardef($module, $result, $saveCache);
             }
         } else {
-            if (! empty ( $results [$module] )) {
-                $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
-                $this->saveToVardef ( $module, false, $saveCache);
+            if (!empty ($results [$module])) {
+                $this->saveToVardef($module, $results [$module], $saveCache);
+            } else {
+                $this->saveToVardef($module, false, $saveCache);
             }
         }
 
@@ -164,14 +164,14 @@ 
     * Returns the widget for a custom field from the fields_meta_data table.
     */
     function getFieldWidget($module, $fieldName) {
-        if (empty($module) || empty($fieldName)){
+        if (empty($module) || empty($fieldName)) {
             sugar_die("Unable to load widget for '$module' : '$fieldName'");
         }
         $query = "SELECT * FROM fields_meta_data WHERE custom_module='$module' AND name='$fieldName' AND deleted = 0";
-        $result = $GLOBALS['db']->query ( $query );
+        $result = $GLOBALS['db']->query($query);
         require_once ('modules/DynamicFields/FieldCases.php');
-        if ( $row = $GLOBALS['db']->fetchByAssoc ( $result ) ) {
-            $field = get_widget ( $row ['type'] );
+        if ($row = $GLOBALS['db']->fetchByAssoc($result)) {
+            $field = get_widget($row ['type']);
             $field->populateFromRow($row);
             return $field;
         }
@@ -185,41 +185,41 @@ 
     * @param array $result
     * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
     */
-    function saveToVardef($module,$result,$saveCache=true) {
+    function saveToVardef($module, $result, $saveCache = true) {
 
 
         global $beanList;
-        if (! empty ( $beanList [$module] )) {
+        if (!empty ($beanList [$module])) {
             $object = BeanFactory::getObjectName($module);
 
-            if(empty($GLOBALS['dictionary'][$object]['fields'])){
+            if (empty($GLOBALS['dictionary'][$object]['fields'])) {
                 //if the vardef isn't loaded let's try loading it.
-                VardefManager::refreshVardefs($module,$object, null, false);
+                VardefManager::refreshVardefs($module, $object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if (empty($GLOBALS['dictionary'][$object]['fields']))return;
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
             }
-            if (! empty ( $GLOBALS ['dictionary'] [$object] )) {
-                if (! empty ( $result )) {
+            if (!empty ($GLOBALS ['dictionary'] [$object])) {
+                if (!empty ($result)) {
                     // First loop to add
 
-                foreach ( $result as $field ) {
-                    foreach($field as $k=>$v){
+                foreach ($result as $field) {
+                    foreach ($field as $k=>$v) {
                         //allows values for custom fields to be defined outside of the scope of studio
-                        if(!isset($GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k])){
+                        if (!isset($GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k])) {
                             $GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k] = $v;
                         }
                     }
                 }
 
                     // Second loop to remove
-                    foreach ( $GLOBALS ['dictionary'] [$object] ['fields'] as $name => $fieldDef ) {
+                    foreach ($GLOBALS ['dictionary'] [$object] ['fields'] as $name => $fieldDef) {
 
-                        if (isset ( $fieldDef ['custom_module'] )) {
-                            if (! isset ( $result [$name] )) {
-                                unset ( $GLOBALS ['dictionary'] [$object] ['fields'] [$name] );
+                        if (isset ($fieldDef ['custom_module'])) {
+                            if (!isset ($result [$name])) {
+                                unset ($GLOBALS ['dictionary'] [$object] ['fields'] [$name]);
                             } else {
                                 $GLOBALS ['dictionary'] [$object] ['custom_fields'] = true;
                             }
@@ -230,9 +230,9 @@ 
             }
 
             $manager = new VardefManager();
-            if($saveCache)
+            if ($saveCache)
             {
-                $manager->saveCache ($this->module, $object);
+                $manager->saveCache($this->module, $object);
             }
 
             // Everything works off of vardefs, so let's have it save the users vardefs
@@ -255,38 +255,38 @@ 
     *
     * @return array select=>select columns, join=>prebuilt join statement
     */
-  function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
-        if(!$this->bean->hasCustomFields()){
+  function getJOIN($expandedList = false, $includeRelates = false, &$where = false) {
+        if (!$this->bean->hasCustomFields()) {
             return array(
                 'select' => '',
                 'join' => ''
             );
         }
 
-        if (empty($expandedList) )
+        if (empty($expandedList))
         {
-            $select = ",{$this->bean->table_name}_cstm.*" ;
+            $select = ",{$this->bean->table_name}_cstm.*";
         }
         else
         {
             $select = '';
             $isList = is_array($expandedList);
-            foreach($this->bean->field_defs as $name=>$field)
+            foreach ($this->bean->field_defs as $name=>$field)
             {
-                if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
+                if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))) {
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ($field['type'] != 'html' && $name != 'parent_name')
+                        $select .= ",{$this->bean->table_name}_cstm.{$name}";
                 }
             }
         }
-        $join = " LEFT JOIN " .$this->bean->table_name. "_cstm ON " .$this->bean->table_name. ".id = ". $this->bean->table_name. "_cstm.id_c ";
+        $join = " LEFT JOIN ".$this->bean->table_name."_cstm ON ".$this->bean->table_name.".id = ".$this->bean->table_name."_cstm.id_c ";
 
         if ($includeRelates) {
             $jtAlias = "relJoin";
             $jtCount = 1;
-            foreach($this->bean->field_defs as $name=>$field)
+            foreach ($this->bean->field_defs as $name=>$field)
             {
                 if ($field['type'] == 'relate' && isset($field['custom_module'])) {
                     $relateJoinInfo = $this->getRelateJoin($field, $jtAlias.$jtCount);
@@ -297,7 +297,7 @@ 
                     {
                         $pattern = '/'.$field['name'].'\slike/i';
                         $replacement = $relateJoinInfo['name_field'].' like';
-                        $where = preg_replace($pattern,$replacement,$where);
+                        $where = preg_replace($pattern, $replacement, $where);
                     }
                     $jtCount++;
                 }
@@ -314,7 +314,7 @@ 
         }
         global $beanFiles, $beanList, $module;
         $rel_module = $field_def['module'];
-        if(empty($beanFiles[$beanList[$rel_module]])) {
+        if (empty($beanFiles[$beanList[$rel_module]])) {
             return false;
         }
 
@@ -324,25 +324,25 @@ 
         if (isset($rel_mod->field_defs['name']))
         {
             $name_field_def = $rel_mod->field_defs['name'];
-            if(isset($name_field_def['db_concat_fields']))
+            if (isset($name_field_def['db_concat_fields']))
             {
                 $name_field = db_concat($joinTableAlias, $name_field_def['db_concat_fields']);
             }
             //If the name field is non-db, we need to find another field to display
-            else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
+            else if (!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
-                $name_field = "$joinTableAlias." . $field_def['rname'];
+                $name_field = "$joinTableAlias.".$field_def['rname'];
             }
             else
             {
                 $name_field = "$joinTableAlias.name";
             }
         }
-        $tableName = isset($field_def['custom_module']) ? "{$this->bean->table_name}_cstm" : $this->bean->table_name ;
+        $tableName = isset($field_def['custom_module']) ? "{$this->bean->table_name}_cstm" : $this->bean->table_name;
         $relID = $field_def['id_name'];
         $ret_array['rel_table'] = $rel_table;
         $ret_array['name_field'] = $name_field;
-        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : "") . ", {$name_field} {$field_def['name']} ";
+        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : "").", {$name_field} {$field_def['name']} ";
         $ret_array['from'] = " LEFT JOIN $rel_table $joinTableAlias ON $tableName.$relID = $joinTableAlias.id"
                             . " AND $joinTableAlias.deleted=0 ";
         return $ret_array;
@@ -352,24 +352,24 @@ 
     * Fills in all the custom fields of type relate relationships for an object
     *
     */
-   function fill_relationships(){
+   function fill_relationships() {
         global $beanList, $beanFiles;
-        if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+        if (!empty($this->bean->relDepth)) {
+            if ($this->bean->relDepth > 1)return;
+        } else {
             $this->bean->relDepth = 0;
         }
-        foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-            if($field['type'] == 'relate'){
-                $related_module =$field['ext2'];
+        foreach ($this->bean->field_defs as $field) {
+            if (empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if ($field['type'] == 'relate') {
+                $related_module = $field['ext2'];
                 $name = $field['name'];
                 if (empty($this->bean->$name)) { //Don't load the relationship twice
                     $id_name = $field['id_name'];
-                    if(isset($beanList[ $related_module])){
+                    if (isset($beanList[$related_module])) {
                         $class = $beanList[$related_module];
 
-                        if(file_exists($beanFiles[$class]) && isset($this->bean->$name)){
+                        if (file_exists($beanFiles[$class]) && isset($this->bean->$name)) {
                             require_once($beanFiles[$class]);
                             $mod = new $class();
                             $mod->relDepth = $this->bean->relDepth + 1;
@@ -387,72 +387,72 @@ 
      *
      * @param boolean $isUpdate
      */
-     function save($isUpdate){
+     function save($isUpdate) {
 
-        if($this->bean->hasCustomFields() && isset($this->bean->id)){
+        if ($this->bean->hasCustomFields() && isset($this->bean->id)) {
 
-            if($isUpdate){
-                $query = "UPDATE ". $this->bean->table_name. "_cstm SET ";
+            if ($isUpdate) {
+                $query = "UPDATE ".$this->bean->table_name."_cstm SET ";
             }
-            $queryInsert = "INSERT INTO ". $this->bean->table_name. "_cstm (id_c";
+            $queryInsert = "INSERT INTO ".$this->bean->table_name."_cstm (id_c";
             $values = "('".$this->bean->id."'";
             $first = true;
-            foreach($this->bean->field_defs as $name=>$field){
+            foreach ($this->bean->field_defs as $name=>$field) {
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
-                if(isset($this->bean->$name)){
+                if (empty($field['source']) || $field['source'] != 'custom_fields')continue;
+                if ($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if (isset($this->bean->$name)) {
                     $quote = "'";
 
-                    if(in_array($field['type'], array('int', 'float', 'double', 'uint', 'ulong', 'long', 'short', 'tinyint', 'currency', 'decimal'))) {
+                    if (in_array($field['type'], array('int', 'float', 'double', 'uint', 'ulong', 'long', 'short', 'tinyint', 'currency', 'decimal'))) {
                         $quote = '';
-                        if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
-                            if($field['required']){
+                        if (!isset($this->bean->$name) || !is_numeric($this->bean->$name)) {
+                            if ($field['required']) {
                                 $this->bean->$name = 0;
-                            }else{
+                            } else {
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
-                    if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
+                    if ($field['type'] == 'bool') {
+                        if ($this->bean->$name === FALSE)
                             $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
+                        elseif ($this->bean->$name === TRUE)
                             $this->bean->$name = '1';
                     }
 
                     $val = $this->bean->$name;
-					if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
+					if (($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name) || $this->bean->$name == '1900-01-01')) {
                     	$quote = '';
                         $val = 'NULL';
                         $this->bean->$name = ''; // do not set it to string 'NULL'
                     }
-                    if($isUpdate){
-                        if($first){
+                    if ($isUpdate) {
+                        if ($first) {
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else {
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
                     $first = false;
                     $queryInsert .= " ,$name";
-                    $values .= " ,$quote". $GLOBALS['db']->quote($val). "$quote";
+                    $values .= " ,$quote".$GLOBALS['db']->quote($val)."$quote";
                 }
             }
-            if($isUpdate){
-                $query.= " WHERE id_c='" . $this->bean->id ."'";
+            if ($isUpdate) {
+                $query .= " WHERE id_c='".$this->bean->id."'";
 
             }
 
             $queryInsert .= " ) VALUES $values )";
 
-            if(!$first){
-                if(!$isUpdate){
+            if (!$first) {
+                if (!$isUpdate) {
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else {
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
-                    if ( $GLOBALS['db']->getOne($checkquery) ) {
+                    if ($GLOBALS['db']->getOne($checkquery)) {
                         $result = $GLOBALS['db']->query($query);
                     } else {
                         $GLOBALS['db']->query($queryInsert);
@@ -467,7 +467,7 @@ 
      * Use the widgets get_db_modify_alter_table() method to get the table sql - some widgets do not need any custom table modifications
      * @param STRING $name - field name
      */
-    function deleteField($widget){
+    function deleteField($widget) {
         require_once('modules/DynamicFields/templates/Fields/TemplateField.php');
         global $beanList;
         if (!($widget instanceof TemplateField)) {
@@ -483,10 +483,10 @@ 
             $object_name = $newName != false ? $newName : $object_name;
         }
 
-        $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
-        $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='".$this->module.$widget->name."'");
+        $sql = $widget->get_db_delete_alter_table($this->bean->table_name."_cstm");
+        if (!empty($sql))
+            $GLOBALS['db']->query($sql);
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -498,25 +498,25 @@ 
      * Method required by the TemplateRelatedTextField->save() method
      * Taken from MBModule's implementation
      */
-    function fieldExists($name = '', $type = ''){
+    function fieldExists($name = '', $type = '') {
         // must get the vardefs from the GLOBAL array as $bean->field_defs does not contain the values from the cache at this point
         // TODO: fix this - saveToVardefs() updates GLOBAL['dictionary'] correctly, obtaining its information directly from the fields_meta_data table via buildCache()...
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
-        if(!empty($vardefs)){
-            if(empty($type) && empty($name))
+        if (!empty($vardefs)) {
+            if (empty($type) && empty($name))
                 return false;
-            else if(empty($type))
+            else if (empty($type))
                 return !empty($vardefs[$name]);
-            else if(empty($name)){
-                foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
+            else if (empty($name)) {
+                foreach ($vardefs as $def) {
+                    if (!empty($def['type']) && $def['type'] == $type)
                         return true;
                 }
                 return false;
-            }else
+            } else
                 return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+        } else {
             return false;
         }
     }
@@ -528,24 +528,24 @@ 
      * @param Field Object $field
      * @return boolean
      */
-    function addFieldObject(&$field){
+    function addFieldObject(&$field) {
         $GLOBALS['log']->debug('adding field');
         $object_name = $this->module;
         $db_name = $field->name;
 
         $fmd = new FieldsMetaData();
-        $id =  $fmd->retrieve($object_name.$db_name,true, false);
+        $id = $fmd->retrieve($object_name.$db_name, true, false);
         $is_update = false;
-        $label = strtoupper( $field->label );
-        if(!empty($id)){
+        $label = strtoupper($field->label);
+        if (!empty($id)) {
             $is_update = true;
-        }else{
+        } else {
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
         $this->createCustomTable();
         $fmd->id = $object_name.$db_name;
-        $fmd->custom_module= $object_name;
+        $fmd->custom_module = $object_name;
         $fmd->name = $db_name;
         $fmd->vname = $label;
         $fmd->type = $field->type;
@@ -560,16 +560,16 @@ 
         $fmd->ext4 = (isset($field->ext4) ? $field->ext4 : '');
         $fmd->comments = $field->comment;
         $fmd->massupdate = $field->massupdate;
-        $fmd->importable = ( isset ( $field->importable ) ) ? $field->importable : null ;
+        $fmd->importable = (isset ($field->importable)) ? $field->importable : null;
         $fmd->duplicate_merge = $field->duplicate_merge;
-        $fmd->audited =$field->audited;
+        $fmd->audited = $field->audited;
         $fmd->inline_edit = $field->inline_edit;
         $fmd->reportable = ($field->reportable ? 1 : 0);
-        if(!$is_update){
-            $fmd->new_with_id=true;
+        if (!$is_update) {
+            $fmd->new_with_id = true;
         }
-        if($field){
-            if(!$is_update){
+        if ($field) {
+            if (!$is_update) {
                 //Do two SQL calls here in this case
             	//The first is to create the column in the custom table without the default value
             	//The second is to modify the column created in the custom table to set the default value
@@ -579,21 +579,21 @@ 
                 // resetting default and default_value does not work for multienum and causes trouble for mssql
                 // so using a temporary variable here to indicate that we don't want default for this query
                 $field->no_default = 1;
-                $query = $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
+                $query = $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
                 // unsetting temporary member variable
                 unset($field->no_default);
-                if(!empty($query)){
+                if (!empty($query)) {
                 	$GLOBALS['db']->query($query, true, "Cannot create column");
 	                $field->default = $fmd->default_value;
 	                $field->default_value = $fmd->default_value;
-	                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-	                if(!empty($query)){
+	                $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
+	                if (!empty($query)) {
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
-                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-                if(!empty($query)){
+            } else {
+                $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
+                if (!empty($query)) {
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
             	}
             }
@@ -607,18 +607,18 @@ 
 
     function saveExtendedAttributes($field, $column_fields)
     {
-            require_once ('modules/ModuleBuilder/parsers/StandardField.php') ;
-            require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/ModuleBuilder/parsers/StandardField.php');
+            require_once ('modules/DynamicFields/FieldCases.php');
             global $beanList;
 
             $to_save = array();
-            $base_field = get_widget ( $field->type) ;
-        foreach ($field->vardef_map as $property => $fmd_col){
+            $base_field = get_widget($field->type);
+        foreach ($field->vardef_map as $property => $fmd_col) {
             //Skip over attribes that are either the default or part of the normal attributes stored in the DB
             if (!isset($field->$property) || in_array($fmd_col, $column_fields) || in_array($property, $column_fields)
                 || $this->isDefaultValue($property, $field->$property, $base_field)
                 || $property == "action" || $property == "label_value" || $property == "label"
-                || (substr($property, 0,3) == 'ext' && strlen($property) == 4))
+                || (substr($property, 0, 3) == 'ext' && strlen($property) == 4))
             {
                 continue;
             }
@@ -634,19 +634,19 @@ 
     {
         switch ($property) {
             case "importable":
-                return ( $value === 'true' || $value === '1' || $value === true || $value === 1 ); break;
+                return ($value === 'true' || $value === '1' || $value === true || $value === 1); break;
             case "required":
             case "audited":
             case "inline_edit":
             case "massupdate":
-                return ( $value === 'false' || $value === '0' || $value === false || $value === 0); break;
+                return ($value === 'false' || $value === '0' || $value === false || $value === 0); break;
             case "default_value":
             case "default":
             case "help":
             case "comments":
                 return ($value == "");
             case "duplicate_merge":
-                return ( $value === 'false' || $value === '0' || $value === false || $value === 0 || $value === "disabled"); break;
+                return ($value === 'false' || $value === '0' || $value === false || $value === 0 || $value === "disabled"); break;
         }
 
         if (isset($baseField->$property))
@@ -663,10 +663,10 @@ 
         $vBean = $bean_name == "aCase" ? "Case" : $bean_name;
         $file_loc = "$this->base_path/sugarfield_{$field->name}.php";
 
-        $out =  "<?php\n // created: " . date('Y-m-d H:i:s') . "\n";
+        $out = "<?php\n // created: ".date('Y-m-d H:i:s')."\n";
         foreach ($def_override as $property => $val)
         {
-            $out .= override_value_to_string_recursive(array($vBean, "fields", $field->name, $property), "dictionary", $val) . "\n";
+            $out .= override_value_to_string_recursive(array($vBean, "fields", $field->name, $property), "dictionary", $val)."\n";
         }
 
         $out .= "\n ?>";
@@ -674,15 +674,15 @@ 
         if (!file_exists($this->base_path))
             mkdir_recursive($this->base_path);
 
-        if( $fh = @sugar_fopen( $file_loc, 'w' ) )
+        if ($fh = @sugar_fopen($file_loc, 'w'))
         {
-            fputs( $fh, $out);
-            fclose( $fh );
-            return true ;
+            fputs($fh, $out);
+            fclose($fh);
+            return true;
         }
         else
         {
-            return false ;
+            return false;
         }
     }
 
@@ -719,11 +719,11 @@ 
      * @param unknown_type $comment
      * @return boolean
      */
-    function addField($name,$label='', $type='Text',$max_size='255',$required_option='optional', $default_value='', $ext1='', $ext2='', $ext3='',$audited=0, $inline_edit = 1, $mass_update = 0 , $ext4='', $help='',$duplicate_merge=0, $comment=''){
+    function addField($name, $label = '', $type = 'Text', $max_size = '255', $required_option = 'optional', $default_value = '', $ext1 = '', $ext2 = '', $ext3 = '', $audited = 0, $inline_edit = 1, $mass_update = 0, $ext4 = '', $help = '', $duplicate_merge = 0, $comment = '') {
         require_once('modules/DynamicFields/templates/Fields/TemplateField.php');
         $field = new TemplateField();
         $field->label = $label;
-        if(empty($field->label)){
+        if (empty($field->label)) {
             $field->label = $name;
         }
         $field->name = $name;
@@ -749,10 +749,10 @@ 
      * Creates the custom table with an id of id_c
      *
      */
-    function createCustomTable($execute = true){
+    function createCustomTable($execute = true) {
         $out = "";
         if (!$GLOBALS['db']->tableExists($this->bean->table_name."_cstm")) {
-            $GLOBALS['log']->debug('creating custom table for '. $this->bean->table_name);
+            $GLOBALS['log']->debug('creating custom table for '.$this->bean->table_name);
             $iddef = array(
                 "id_c" => array(
                     "name" => "id_c",
@@ -769,21 +769,21 @@ 
            );
 
             $query = $GLOBALS['db']->createTableSQLParams($this->bean->table_name."_cstm", $iddef, $ididx);
-            if(!$GLOBALS['db']->supports("inline_keys")) {
+            if (!$GLOBALS['db']->supports("inline_keys")) {
                 $indicesArr = $GLOBALS['db']->getConstraintSql($ididx, $this->bean->table_name."_cstm");
             } else {
                 $indicesArr = array();
             }
-            if($execute) {
+            if ($execute) {
                 $GLOBALS['db']->query($query);
-                if(!empty($indicesArr)) {
-                    foreach($indicesArr as $idxq) {
+                if (!empty($indicesArr)) {
+                    foreach ($indicesArr as $idxq) {
                         $GLOBALS['db']->query($idxq);
                     }
                 }
             }
-            $out = $query . "\n";
-            if(!empty($indicesArr)) {
+            $out = $query."\n";
+            if (!empty($indicesArr)) {
                 $out .= join("\n", $indicesArr)."\n";
             }
 
@@ -797,11 +797,11 @@ 
      * Updates the db schema and adds any custom fields we have used if the custom table was dropped
      *
      */
-    function add_existing_custom_fields($execute = true){
+    function add_existing_custom_fields($execute = true) {
     	$out = "";
-        if($this->bean->hasCustomFields()){
-	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
+        if ($this->bean->hasCustomFields()) {
+	        foreach ($this->bean->field_defs as $name=>$data) {
+	        	if (empty($data['source']) || $data['source'] != 'custom_fields')
                     continue;
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
@@ -812,11 +812,11 @@ 
     function add_existing_custom_field($data, $execute = true)
     {
 
-        $field = get_widget ( $data ['type'] );
+        $field = get_widget($data ['type']);
         $field->populateFromRow($data);
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
-                . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
-        $out = $query . "\n";
+                . $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
+        $out = $query."\n";
         if ($execute)
             $GLOBALS['db']->query($query);
 
@@ -834,8 +834,8 @@ 
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
-        foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
+        foreach ($this->bean->field_defs as $name=>$data) {
+            if (empty($data['source']) || $data['source'] != 'custom_fields')
                 continue;
             /**
              * @bug 43471
@@ -845,7 +845,7 @@ 
              * force the name to be lower as it needs to be lower since that is how it's put into the key
              * in the get_columns() call above.
              */
-            if(!empty($compareFieldDefs[strtolower($name)])) {
+            if (!empty($compareFieldDefs[strtolower($name)])) {
                 continue;
             }
             $out .= $this->add_existing_custom_field($data, $execute);
@@ -864,24 +864,24 @@ 
      * @return string The core of the system label name - returns currency_id5 for example, when the full label would then be LBL_CURRENCY_ID5
      * TODO: Only the core is returned for historical reasons - switch to return the real system label
      */
-    function addLabel ( $displayLabel )
+    function addLabel($displayLabel)
     {
-        $mod_strings = return_module_language($GLOBALS[ 'current_language' ], $this->module);
+        $mod_strings = return_module_language($GLOBALS['current_language'], $this->module);
         $limit = 10;
         $count = 0;
         $field_key = $this->getDBName($displayLabel, false);
         $systemLabel = $field_key;
-        if(!$this->use_existing_labels){ // use_existing_labels defaults to false in this module; as of today, only set to true by ModuleInstaller.php
-            while( isset( $mod_strings [ $systemLabel ] ) && $count <= $limit )
+        if (!$this->use_existing_labels) { // use_existing_labels defaults to false in this module; as of today, only set to true by ModuleInstaller.php
+            while (isset($mod_strings [$systemLabel]) && $count <= $limit)
             {
-                $systemLabel = $field_key. "_$count";
+                $systemLabel = $field_key."_$count";
                 $count++;
             }
         }
         $selMod = (!empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : $this->module;
-        require_once 'modules/ModuleBuilder/parsers/parser.label.php' ;
-        $parser = new ParserLabel ( $selMod , isset ( $_REQUEST [ 'view_package' ] ) ? $_REQUEST [ 'view_package' ] : null ) ;
-        $parser->handleSave ( array('label_'. $systemLabel => $displayLabel ) , $GLOBALS [ 'current_language' ] ) ;
+        require_once 'modules/ModuleBuilder/parsers/parser.label.php';
+        $parser = new ParserLabel($selMod, isset ($_REQUEST ['view_package']) ? $_REQUEST ['view_package'] : null);
+        $parser->handleSave(array('label_'.$systemLabel => $displayLabel), $GLOBALS ['current_language']);
 
         return $systemLabel;
     }
@@ -893,27 +893,27 @@ 
      * @param BOOLEAN $_C do we append _c to the name
      * @return STRING
      */
-    function getDBName($name, $_C= true){
+    function getDBName($name, $_C = true) {
         static $cached_results = array();
-        if(!empty($cached_results[$name]))
+        if (!empty($cached_results[$name]))
         {
             return $cached_results[$name];
         }
         $exclusions = array('parent_type', 'parent_id', 'currency_id', 'parent_name');
         // Remove any non-db friendly characters
-        $return_value = preg_replace("/[^\w]+/","_",$name);
-        if($_C == true && !in_array($return_value, $exclusions) && substr($return_value, -2) != '_c'){
+        $return_value = preg_replace("/[^\w]+/", "_", $name);
+        if ($_C == true && !in_array($return_value, $exclusions) && substr($return_value, -2) != '_c') {
             $return_value .= '_c';
         }
         $cached_results[$name] = $return_value;
         return $return_value;
     }
 
-    function setWhereClauses(&$where_clauses){
+    function setWhereClauses(&$where_clauses) {
         if (isset($this->avail_fields)) {
-            foreach($this->avail_fields as $name=>$value){
-                if(!empty($_REQUEST[$name])){
-                    $where_clauses[] = $this->bean->table_name . "_cstm.$name LIKE '". $GLOBALS['db']->quote($_REQUEST[$name]). "%'";
+            foreach ($this->avail_fields as $name=>$value) {
+                if (!empty($_REQUEST[$name])) {
+                    $where_clauses[] = $this->bean->table_name."_cstm.$name LIKE '".$GLOBALS['db']->quote($_REQUEST[$name])."%'";
                 }
             }
         }
@@ -933,12 +933,12 @@ 
 
     function retrieve()
     {
-        if(!isset($this->bean)){
+        if (!isset($this->bean)) {
             $GLOBALS['log']->fatal("DynamicField retrieve, bean not instantiated: ".var_export(debug_print_backtrace(), true));
             return false;
         }
 
-        if(!$this->bean->hasCustomFields()){
+        if (!$this->bean->hasCustomFields()) {
             return false;
         }
 
@@ -946,9 +946,9 @@ 
         $result = $GLOBALS['db']->query($query);
         $row = $GLOBALS['db']->fetchByAssoc($result);
 
-        if($row)
+        if ($row)
         {
-            foreach($row as $name=>$value)
+            foreach ($row as $name=>$value)
             {
                 // originally in pre-r30895 we checked if this field was in avail_fields i.e., in fields_meta_data and not deleted
                 // with the removal of avail_fields post-r30895 we have simplified this - we now retrieve every custom field even if previously deleted
@@ -961,12 +961,12 @@ 
 
    function populateXTPL($xtpl, $view) {
 
-        if($this->bean->hasCustomFields()){
+        if ($this->bean->hasCustomFields()) {
             $results = $this->getAllFieldsView($view, 'xtpl');
-            foreach($results as $name=>$value){
-                if(is_array($value['xtpl']))
+            foreach ($results as $name=>$value) {
+                if (is_array($value['xtpl']))
                 {
-                    foreach($value['xtpl'] as $xName=>$xValue)
+                    foreach ($value['xtpl'] as $xName=>$xValue)
                     {
                         $xtpl->assign(strtoupper($xName), $xValue);
                     }
@@ -978,24 +978,24 @@ 
 
     }
 
-    function populateAllXTPL($xtpl, $view){
+    function populateAllXTPL($xtpl, $view) {
         $this->populateXTPL($xtpl, $view);
 
     }
 
-    function getAllFieldsView($view, $type){
+    function getAllFieldsView($view, $type) {
          require_once ('modules/DynamicFields/FieldCases.php');
          $results = array();
-         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
+         foreach ($this->bean->field_defs as $name=>$data) {
+            if (empty($data['source']) || $data['source'] != 'custom_fields')
             {
             	continue;
             }
-            $field = get_widget ( $data ['type'] );
+            $field = get_widget($data ['type']);
             $field->populateFromRow($data);
             $field->view = $view;
             $field->bean = $this->bean;
-            switch(strtolower($type))
+            switch (strtolower($type))
             {
                 case 'xtpl':
                     $results[$name] = array('xtpl'=>$field->get_xtpl());

Braces +84 added lines, -59 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -103,9 +104,12 @@ 
     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db'])) {
+                    return false;
+        }
+        if($module == '../data') {
             return false;
-        if($module == '../data')return false;
+        }
 
         static $results = array ( ) ;
 
@@ -113,8 +117,7 @@ 
         if (! empty ( $module )) {
             $where .= " custom_module='$module' AND ";
             unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
-        }
-        else
+        } else
         {
             $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
@@ -138,10 +141,12 @@ 
             $vardef = $field->get_field_def ();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
-                $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ( $vardef ['source'] )) {
+                            $vardef ['source'] = 'custom_fields';
+            }
+            if (empty ( $results [$row ['custom_module']] )) {
+                            $results [$row ['custom_module']] = array ( );
+            }
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
         if (empty ( $module )) {
@@ -151,7 +156,7 @@ 
         } else {
             if (! empty ( $results [$module] )) {
                 $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
+            } else{
                 $this->saveToVardef ( $module, false, $saveCache);
             }
         }
@@ -196,7 +201,9 @@ 
                 //if the vardef isn't loaded let's try loading it.
                 VardefManager::refreshVardefs($module,$object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                    return;
+                }
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
@@ -266,8 +273,7 @@ 
         if (empty($expandedList) )
         {
             $select = ",{$this->bean->table_name}_cstm.*" ;
-        }
-        else
+        } else
         {
             $select = '';
             $isList = is_array($expandedList);
@@ -276,8 +282,9 @@ 
                 if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ( $field['type'] != 'html' && $name != 'parent_name') {
+                                            $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    }
                 }
             }
         }
@@ -332,8 +339,7 @@ 
             else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
                 $name_field = "$joinTableAlias." . $field_def['rname'];
-            }
-            else
+            } else
             {
                 $name_field = "$joinTableAlias.name";
             }
@@ -355,12 +361,16 @@ 
    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+            if($this->bean->relDepth > 1) {
+                return;
+            }
+        } else{
             $this->bean->relDepth = 0;
         }
         foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                continue;
+            }
             if($field['type'] == 'relate'){
                 $related_module =$field['ext2'];
                 $name = $field['name'];
@@ -399,8 +409,12 @@ 
             $first = true;
             foreach($this->bean->field_defs as $name=>$field){
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                    continue;
+                }
+                if($field['type'] == 'html' || $field['type'] == 'parent') {
+                    continue;
+                }
                 if(isset($this->bean->$name)){
                     $quote = "'";
 
@@ -409,16 +423,17 @@ 
                         if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
                             if($field['required']){
                                 $this->bean->$name = 0;
-                            }else{
+                            } else{
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
                     if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
-                            $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
-                            $this->bean->$name = '1';
+                        if ( $this->bean->$name === FALSE ) {
+                                                    $this->bean->$name = '0';
+                        } elseif ( $this->bean->$name === TRUE ) {
+                                                    $this->bean->$name = '1';
+                        }
                     }
 
                     $val = $this->bean->$name;
@@ -431,7 +446,7 @@ 
                         if($first){
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else{
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
@@ -450,7 +465,7 @@ 
             if(!$first){
                 if(!$isUpdate){
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else{
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
                     if ( $GLOBALS['db']->getOne($checkquery) ) {
                         $result = $GLOBALS['db']->query($query);
@@ -485,8 +500,9 @@ 
 
         $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
         $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        if (! empty( $sql ) ) {
+                    $GLOBALS['db']->query( $sql );
+        }
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -504,19 +520,21 @@ 
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
         if(!empty($vardefs)){
-            if(empty($type) && empty($name))
-                return false;
-            else if(empty($type))
-                return !empty($vardefs[$name]);
-            else if(empty($name)){
+            if(empty($type) && empty($name)) {
+                            return false;
+            } else if(empty($type)) {
+                            return !empty($vardefs[$name]);
+            } else if(empty($name)){
                 foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
-                        return true;
+                    if(!empty($def['type']) && $def['type'] == $type) {
+                                            return true;
+                    }
                 }
                 return false;
-            }else
-                return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+            } else {
+                            return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
+            }
+        } else{
             return false;
         }
     }
@@ -539,7 +557,7 @@ 
         $label = strtoupper( $field->label );
         if(!empty($id)){
             $is_update = true;
-        }else{
+        } else{
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
@@ -550,8 +568,10 @@ 
         $fmd->vname = $label;
         $fmd->type = $field->type;
         $fmd->help = $field->help;
-        if (!empty($field->len))
-            $fmd->len = $field->len; // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
+        if (!empty($field->len)) {
+                    $fmd->len = $field->len;
+        }
+        // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
         $fmd->required = ($field->required ? 1 : 0);
         $fmd->default_value = $field->default;
         $fmd->ext1 = $field->ext1;
@@ -591,7 +611,7 @@ 
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
+            } else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
@@ -671,16 +691,16 @@ 
 
         $out .= "\n ?>";
 
-        if (!file_exists($this->base_path))
-            mkdir_recursive($this->base_path);
+        if (!file_exists($this->base_path)) {
+                    mkdir_recursive($this->base_path);
+        }
 
         if( $fh = @sugar_fopen( $file_loc, 'w' ) )
         {
             fputs( $fh, $out);
             fclose( $fh );
             return true ;
-        }
-        else
+        } else
         {
             return false ;
         }
@@ -801,8 +821,9 @@ 
     	$out = "";
         if($this->bean->hasCustomFields()){
 	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
-                    continue;
+	        	if(empty($data['source']) || $data['source'] != 'custom_fields') {
+	        	                    continue;
+	        	}
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
     	}
@@ -817,8 +838,9 @@ 
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
                 . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
         $out = $query . "\n";
-        if ($execute)
-            $GLOBALS['db']->query($query);
+        if ($execute) {
+                    $GLOBALS['db']->query($query);
+        }
 
         return $out;
     }
@@ -827,16 +849,18 @@ 
     {
         $out = $this->createCustomTable($execute);
         //If the table didn't exist, createCustomTable will have returned all the SQL to create and populate it
-        if (!empty($out))
-            return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
         //Otherwise make sure all the custom fields defined in the vardefs exist in the custom table.
         //We aren't checking for data types, just that the column exists.
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
-                continue;
+            if(empty($data['source']) || $data['source'] != 'custom_fields') {
+                            continue;
+            }
             /**
              * @bug 43471
              * @issue 43471
@@ -850,8 +874,9 @@ 
             }
             $out .= $this->add_existing_custom_field($data, $execute);
         }
-        if (!empty($out))
-            $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
 
         return $out;
     }

Doc Comments +18 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
     *
     * @param STRING $module
     * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
-    * @return unknown
+    * @return boolean
     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
@@ -308,6 +308,9 @@ 
 
     }
 
+   /**
+    * @param string $joinTableAlias
+    */
    function getRelateJoin($field_def, $joinTableAlias, $withIdName = true) {
         if (empty($field_def['type']) || $field_def['type'] != "relate") {
             return false;
@@ -465,7 +468,6 @@ 
     /**
      * Deletes the field from fields_meta_data and drops the database column then it rebuilds the cache
      * Use the widgets get_db_modify_alter_table() method to get the table sql - some widgets do not need any custom table modifications
-     * @param STRING $name - field name
      */
     function deleteField($widget){
         require_once('modules/DynamicFields/templates/Fields/TemplateField.php');
@@ -525,7 +527,7 @@ 
     /**
      * Adds a custom field using a field object
      *
-     * @param Field Object $field
+     * @param Field TemplateField $field
      * @return boolean
      */
     function addFieldObject(&$field){
@@ -605,6 +607,9 @@ 
         return true;
     }
 
+    /**
+     * @param string[] $column_fields
+     */
     function saveExtendedAttributes($field, $column_fields)
     {
             require_once ('modules/ModuleBuilder/parsers/StandardField.php') ;
@@ -686,6 +691,9 @@ 
         }
     }
 
+    /**
+     * @param TemplateField $field
+     */
     protected function removeVardefExtension($field)
     {
         $file_loc = "$this->base_path/sugarfield_{$field->name}.php";
@@ -710,12 +718,12 @@ 
      * @param unknown_type $ext1
      * @param unknown_type $ext2
      * @param unknown_type $ext3
-     * @param unknown_type $audited
-     * @param unknown_type $inline_edit
-     * @param unknown_type $mass_update
+     * @param integer $audited
+     * @param integer $inline_edit
+     * @param integer $mass_update
      * @param unknown_type $ext4
      * @param unknown_type $help
-     * @param unknown_type $duplicate_merge
+     * @param integer $duplicate_merge
      * @param unknown_type $comment
      * @return boolean
      */
@@ -983,6 +991,9 @@ 
 
     }
 
+    /**
+     * @param string $type
+     */
     function getAllFieldsView($view, $type){
          require_once ('modules/DynamicFields/FieldCases.php');
          $results = array();

modules/DynamicFields/FieldsMetaData.php

Spacing +5 added lines, -5 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 @@ 
 	var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+	var $required_fields = array("name"=>1, "date_start"=>2, "time_start"=>3,);
 
 	var $table_name = 'fields_meta_data';
 	var $object_name = 'FieldsMetaData';
@@ -124,15 +124,15 @@ 
 	function mark_deleted($id)
 	{
 		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
+		$this->db->query($query, true, "Error deleting record: ");
 		$this->mark_relationships_deleted($id);
 
 	}
 	
-	function get_list_view_data(){
+	function get_list_view_data() {
 	    $data = parent::get_list_view_data();
 	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="'.$this->id.'">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record='.$this->id.'" >';
 	    return $data;
 	}
 

Braces +3 added lines, -1 removed lines

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

Indentation +79 added lines, -79 removed lines

@@ -51,95 +51,95 @@
 
 
 class FieldsMetaData extends SugarBean {
-	// database table columns
-	var $id;
-	var $name;
-	var $vname;
-  	var $custom_module;
-  	var $type;
-  	var $len;
-  	var $required;
-  	var $default_value;
-  	var $deleted;
-  	var $ext1;
-  	var $ext2;
-  	var $ext3;
-	var $audited;
-	var $inline_edit;
+    // database table columns
+    var $id;
+    var $name;
+    var $vname;
+        var $custom_module;
+        var $type;
+        var $len;
+        var $required;
+        var $default_value;
+        var $deleted;
+        var $ext1;
+        var $ext2;
+        var $ext3;
+    var $audited;
+    var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
-
-	var $table_name = 'fields_meta_data';
-	var $object_name = 'FieldsMetaData';
-	var $module_dir = 'DynamicFields';
-	var $column_fields = array(
-		'id',
-		'name',
-		'vname',
-		'custom_module',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'deleted',
-		'ext1',
-		'ext2',
-		'ext3',
-		'audited',
-		'inline_edit',
-		'massupdate',
+    var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+
+    var $table_name = 'fields_meta_data';
+    var $object_name = 'FieldsMetaData';
+    var $module_dir = 'DynamicFields';
+    var $column_fields = array(
+        'id',
+        'name',
+        'vname',
+        'custom_module',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'deleted',
+        'ext1',
+        'ext2',
+        'ext3',
+        'audited',
+        'inline_edit',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
-
-	var $list_fields = array(
-		'id',
-		'name',
-		'vname',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'audited',
+    );
+
+    var $list_fields = array(
+        'id',
+        'name',
+        'vname',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'audited',
         'inline_edit',
-		'massupdate',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
+    );
 
-	var $field_name_map;
-	var $new_schema = true;
+    var $field_name_map;
+    var $new_schema = true;
 
-	//////////////////////////////////////////////////////////////////
-	// METHODS
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
+    // METHODS
+    //////////////////////////////////////////////////////////////////
 
     public function __construct()
-	{
-		parent::__construct();
-		$this->disable_row_level_security = true;
-	}
-
-	function mark_deleted($id)
-	{
-		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
-		$this->mark_relationships_deleted($id);
-
-	}
-
-	function get_list_view_data(){
-	    $data = parent::get_list_view_data();
-	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
-	    return $data;
-	}
-
-
-	function get_summary_text()
-	{
-		return $this->name;
-	}
+    {
+        parent::__construct();
+        $this->disable_row_level_security = true;
+    }
+
+    function mark_deleted($id)
+    {
+        $query = "DELETE FROM $this->table_name WHERE  id='$id'";
+        $this->db->query($query, true,"Error deleting record: ");
+        $this->mark_relationships_deleted($id);
+
+    }
+
+    function get_list_view_data(){
+        $data = parent::get_list_view_data();
+        $data['VNAME'] = translate($this->vname, $this->custom_module);
+        $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+        return $data;
+    }
+
+
+    function get_summary_text()
+    {
+        return $this->name;
+    }
 }
 ?>

modules/DynamicFields/UpgradeFields.php

Indentation +74 added lines, -74 removed lines

@@ -40,95 +40,95 @@ 
 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
- global $db;
- if(!isset($db)){
- 	$db = DBManagerFactory::getInstance();
- }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
- $modules = array();
- /*
+    global $db;
+    if(!isset($db)){
+        $db = DBManagerFactory::getInstance();
+    }
+    $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+    $modules = array();
+    /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
- 	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
- 		$modules[$the_modules] = array();	
- 	}
- 	$modules[$the_modules][$row['name']] = $row['name'];
- }
+    while($row = $db->fetchByAssoc($result)){
+        $the_modules = $row['custom_module'];
+        if(!isset($modules[$the_modules])){
+            $modules[$the_modules] = array();	
+        }
+        $modules[$the_modules][$row['name']] = $row['name'];
+    }
  	
- $simulate = false;
- if(!isset($_REQUEST['run'])){
- 	$simulate = true;
- 	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
- }	
+    $simulate = false;
+    if(!isset($_REQUEST['run'])){
+        $simulate = true;
+        echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
-         {
- 	$class_name = $beanList[$the_module];
- 	echo "<br><br>Scanning $the_module <br>";
+    foreach($modules as $the_module=>$fields){
+            if(isset($beanList[$the_module]))
+            {
+        $class_name = $beanList[$the_module];
+        echo "<br><br>Scanning $the_module <br>";
 		
-		require_once($beanFiles[$class_name]);
-		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
-			$mod->custom_fields = new DynamicField();
-			$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-		}
+        require_once($beanFiles[$class_name]);
+        $mod = new $class_name();
+        if(!$db->tableExists($mod->table_name . "_cstm")){
+            $mod->custom_fields = new DynamicField();
+            $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+        }
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+        $result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+        while($row = $db->fetchByAssoc($result)){
 			
 			
-			$col = $row['Field'];
-			$type = $row['Type'];
-			$fieldDef = $mod->getFieldDefinition($col);
-			$the_field = get_widget($fieldDef['type']);
-			$the_field->set($fieldDef);
+            $col = $row['Field'];
+            $type = $row['Type'];
+            $fieldDef = $mod->getFieldDefinition($col);
+            $the_field = get_widget($fieldDef['type']);
+            $the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
-					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+                if(!isset($fields[$col]) && $col != 'id_c'){
+                    if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+                    unset($fields[$col]);
+                    echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
+                }	else{
+                    if($col != 'id_c'){
+                    if(trim($the_field->get_db_type()) != trim($type)){
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
-					}
-					}
+                    echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
+                    if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+                    }
+                    }
 					
-					unset($fields[$col]);
-				}
+                    unset($fields[$col]);
+                }
 			
-		}
+        }
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
-					$the_field = $mod->getFieldDefinition($field);
-					$field = get_widget($the_field['type']);
-					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
-					echo $query;
-            		if(!empty($query)){
-                		$mod->db->query($query);
-            		}
-				}
-			}
-         }
-	}
+            echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
+            foreach($fields as $field){
+                echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
+                if(!$simulate){
+                    $the_field = $mod->getFieldDefinition($field);
+                    $field = get_widget($the_field['type']);
+                    $field->set($the_field);
+                    $query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+                    echo $query;
+                    if(!empty($query)){
+                        $mod->db->query($query);
+                    }
+                }
+            }
+            }
+    }
 	
 	
-	DynamicField::deleteCache();	
-	echo '<br>Done<br>';
-	if($simulate){
-		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
-	}
+    DynamicField::deleteCache();	
+    echo '<br>Done<br>';
+    if($simulate){
+        echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
+    }
 		
 		
  
@@ -137,4 +137,4 @@ 
  
  
  
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

Spacing +26 added lines, -26 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.
@@ -41,45 +41,45 @@ 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
  global $db;
- if(!isset($db)){
+ if (!isset($db)) {
  	$db = DBManagerFactory::getInstance();
  }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+ $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
  $modules = array();
  /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
+ while ($row = $db->fetchByAssoc($result)) {
  	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
+ 	if (!isset($modules[$the_modules])) {
  		$modules[$the_modules] = array();	
  	}
  	$modules[$the_modules][$row['name']] = $row['name'];
  }
  	
  $simulate = false;
- if(!isset($_REQUEST['run'])){
+ if (!isset($_REQUEST['run'])) {
  	$simulate = true;
  	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
  }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
+ foreach ($modules as $the_module=>$fields) {
+         if (isset($beanList[$the_module]))
          {
  	$class_name = $beanList[$the_module];
  	echo "<br><br>Scanning $the_module <br>";
 		
 		require_once($beanFiles[$class_name]);
 		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
+		if (!$db->tableExists($mod->table_name."_cstm")) {
 			$mod->custom_fields = new DynamicField();
 			$mod->custom_fields->setup($mod);
 		$mod->custom_fields->createCustomTable();
 		}
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+		$result = $db->query("DESCRIBE $mod->table_name"."_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+		while ($row = $db->fetchByAssoc($result)) {
 			
 			
 			$col = $row['Field'];
@@ -88,16 +88,16 @@ 
 			$the_field = get_widget($fieldDef['type']);
 			$the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+				if (!isset($fields[$col]) && $col != 'id_c') {
+					if (!$simulate)$db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
 					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+					echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
+				} else {
+					if ($col != 'id_c') {
+					if (trim($the_field->get_db_type()) != trim($type)) {
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					echo "Fixing Column Type for $col changing $type to ".$the_field->get_db_type()."<br>";
+					if (!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));		
 					}
 					}
 					
@@ -106,16 +106,16 @@ 
 			
 		}
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
+			echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
+			foreach ($fields as $field) {
+				echo "Adding Column $field to $mod->table_name"."_cstm<br>";
+				if (!$simulate) {
 					$the_field = $mod->getFieldDefinition($field);
 					$field = get_widget($the_field['type']);
 					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+					$query = $field->get_db_add_alter_table($mod->table_name.'_cstm');
 					echo $query;
-            		if(!empty($query)){
+            		if (!empty($query)) {
                 		$mod->db->query($query);
             		}
 				}
@@ -126,7 +126,7 @@ 
 	
 	DynamicField::deleteCache();	
 	echo '<br>Done<br>';
-	if($simulate){
+	if ($simulate) {
 		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
 	}
 		

Braces +10 added lines, -4 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.
@@ -89,15 +91,19 @@ 
 			$the_field->set($fieldDef);
 				
 				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					if(!$simulate) {
+					    $db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					}
 					unset($fields[$col]);
 					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
+				} else{
 					if($col != 'id_c'){
 					if(trim($the_field->get_db_type()) != trim($type)){
 						
 					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					if(!$simulate) {
+					    $db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));
+					}
 					}
 					}