adamjakab / SuiteCRM

modules/AOR_Reports/metadata/quickcreatedefs.php

Indentation +6 added lines, -6 removed lines

@@ -31,15 +31,15 @@
                                             ),
                                             
                                             
- 'panels' =>array (
-  'default' => 
-  array (
+    'panels' =>array (
+    'default' => 
+    array (
     
     array (
-      'name',
-      'assigned_user_name',
+        'name',
+        'assigned_user_name',
+    ),
     ),
-  ),
                                                     
 ),
                         

Spacing +3 added lines, -3 removed lines

@@ -31,11 +31,11 @@
                                             ),
                                             
                                             
- 'panels' =>array (
+ 'panels' =>array(
   'default' => 
-  array (
+  array(
     
-    array (
+    array(
       'name',
       'assigned_user_name',
     ),

modules/AOR_Reports/metadata/metafiles.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  * @author SalesAgility <info@salesagility.com>
  */
  
- $metafiles['AOR_Reports'] = array(
-	'detailviewdefs'  => 	'modules/AOR_Reports/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/AOR_Reports/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/AOR_Reports/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/AOR_Reports/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/AOR_Reports/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/AOR_Reports/metadata/SearchFields.php',
- );
+    $metafiles['AOR_Reports'] = array(
+    'detailviewdefs'  => 	'modules/AOR_Reports/metadata/detailviewdefs.php', 	
+    'editviewdefs'    => 	'modules/AOR_Reports/metadata/editviewdefs.php',
+        'listviewdefs'    => 	'modules/AOR_Reports/metadata/listviewdefs.php',
+        'searchdefs'      =>    'modules/AOR_Reports/metadata/searchdefs.php',
+        'popupdefs'	      =>    'modules/AOR_Reports/metadata/popupdefs.php',
+        'searchfields'	  =>    'modules/AOR_Reports/metadata/SearchFields.php',
+    );
 ?>

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%',

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

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');
+}
 /**
  * Advanced OpenReports, SugarCRM Reporting.
  * @package Advanced OpenReports for SugarCRM

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

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('include/MVC/View/views/view.edit.php');
 require_once 'modules/AOW_WorkFlow/aow_utils.php';

modules/AOR_Reports/views/view.detail.php

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 'include/MVC/View/views/view.detail.php';
 require_once 'modules/AOW_WorkFlow/aow_utils.php';
 require_once 'modules/AOR_Reports/aor_utils.php';

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

Spacing +13 added lines, -13 removed lines

@@ -27,31 +27,31 @@ 
 require_once 'modules/AOR_Reports/aor_utils.php';
 class AOR_ReportsViewDetail extends 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 {
@@ -64,14 +64,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);
 
@@ -82,11 +82,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>";

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');
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',

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');
+}
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',

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

modules/Relationships/field_arrays.php

Indentation +32 added lines, -32 removed lines

@@ -46,39 +46,39 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['Relationship'] = array ('column_fields' => Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
         'list_fields' =>  Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
     'required_fields' =>   array("relationship_name"=>1),
 );
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 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.
@@ -45,7 +45,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['Relationship'] = array ('column_fields' => Array(
+$fields_array['Relationship'] = array('column_fields' => Array(
 		'id',
 		'relationship_name',
 		'lhs_module',

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/jjwg_Maps/jjwg_Maps_Router.php

Indentation +24 added lines, -24 removed lines

@@ -11,21 +11,21 @@ 
 
 if (!empty($_REQUEST['cron'])) {
   
-  require_once('modules/jjwg_Maps/jjwg_Maps.php');
-  require_once('modules/jjwg_Maps/controller.php');
-  /*
+    require_once('modules/jjwg_Maps/jjwg_Maps.php');
+    require_once('modules/jjwg_Maps/controller.php');
+    /*
    * This script can be used as an entry point for a cron
    * job to run the address geocoding on a regular basis.
    * index.php?module=jjwg_Maps&entryPoint=jjwg_Maps&cron=1&limit=2500
    */
-  $controller = new jjwg_MapsController();
-  $controller->action_geocode_addresses();
+    $controller = new jjwg_MapsController();
+    $controller->action_geocode_addresses();
   
-  exit;
+    exit;
 
 } else {
   
-  /*
+    /*
    * This script is also used to pass selected records from 
    * a module list view to the Maps Module (jjwg_Maps).
    *
@@ -45,25 +45,25 @@ 
    * 4.) Parameter Search - Checked Records - Map
    *     Uses 'uid'(s) parameter to define search
    */
-  //echo 'Test:<pre>'."\n";
-  //foreach (array_keys($_REQUEST) as $key) {
-  //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
-  //}
+    //echo 'Test:<pre>'."\n";
+    //foreach (array_keys($_REQUEST) as $key) {
+    //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
+    //}
   
-  // Redirect parameters to view/action using Javascript form post.
-  echo '<html><head></head><body>';
-  echo '<form name="redirect" action="index.php" method="POST">'."\n";
-  echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
-  echo '<input type="hidden" name="action" value="map_display">'."\n";
-  foreach (array_keys($_REQUEST) as $key) {
+    // Redirect parameters to view/action using Javascript form post.
+    echo '<html><head></head><body>';
+    echo '<form name="redirect" action="index.php" method="POST">'."\n";
+    echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
+    echo '<input type="hidden" name="action" value="map_display">'."\n";
+    foreach (array_keys($_REQUEST) as $key) {
     if (!in_array($key, array('action','module','entryPoint','display_module', 'quick_address'))) {
-      echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
+        echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
-  }
-  echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
-  echo '</form>'."\n";
-  echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
-  echo '</body></html>';
+    }
+    echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
+    echo '</form>'."\n";
+    echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
+    echo '</body></html>';
   
-  exit;
+    exit;
 }

Spacing +2 added lines, -2 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/utils.php');
 require_once('include/export_utils.php');
@@ -56,7 +56,7 @@ 
   echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
   echo '<input type="hidden" name="action" value="map_display">'."\n";
   foreach (array_keys($_REQUEST) as $key) {
-    if (!in_array($key, array('action','module','entryPoint','display_module', 'quick_address'))) {
+    if (!in_array($key, array('action', 'module', 'entryPoint', 'display_module', 'quick_address'))) {
       echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
   }

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');
+}
 
 require_once('include/utils.php');
 require_once('include/export_utils.php');