adamjakab / SuiteCRM

modules/AOR_Reports/metadata/SearchFields.php

Spacing +10 added lines, -10 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
@@ -24,18 +24,18 @@ 
  */
 
 $searchFields['AOR_Reports'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+	array(
+		'name' => array('query_type'=>'default'),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
 	    
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 		
 	);
 ?>

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 +34 added lines, -34 removed lines

@@ -1,41 +1,41 @@
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @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 <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @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 <info@salesagility.com>
+     */
 
 $searchFields['AOR_Reports'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
 	    
-		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 		
-	);
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 		
+    );
 ?>

modules/AOR_Reports/metadata/detailviewdefs.php

Indentation +34 added lines, -34 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @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 <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @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 <info@salesagility.com>
+     */
 
 $viewdefs['AOR_Reports']['DetailView'] = array(
 'templateMeta' => array(
@@ -62,27 +62,27 @@ 
 'panels' =>array (
     'default' =>
     array (
-  array (
+    array (
     'name',
     'assigned_user_name',
-  ),
+    ),
 
-  array (
-	array (
-      'name' => 'date_entered',
-      'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-      'label' => 'LBL_DATE_ENTERED',
+    array (
+    array (
+        'name' => 'date_entered',
+        'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
+        'label' => 'LBL_DATE_ENTERED',
     ),
     array (
-      'name' => 'date_modified',
-      'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-      'label' => 'LBL_DATE_MODIFIED',
+        'name' => 'date_modified',
+        'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
+        'label' => 'LBL_DATE_MODIFIED',
+    ),
     ),
-  ),
 
-  array (
+    array (
     'description',
-  ),
+    ),
     ),
 )
 );

Spacing +12 added lines, -12 removed lines

@@ -29,13 +29,13 @@ 
             'EDIT',
             'DUPLICATE',
             'DELETE',
-            array (
+            array(
                 'customCode' => '<input type="button" class="button" id="download_csv_button_old" value="{$MOD.LBL_EXPORT}">',
             ),
-            array (
+            array(
                 'customCode' => '<input type="button" class="button" id="download_pdf_button_old" value="{$MOD.LBL_DOWNLOAD_PDF}">',
             ),
-            array (
+            array(
                 'customCode' => '<input type="button" class="button" onClick="openProspectPopup();" value="{$MOD.LBL_ADD_TO_PROSPECT_LIST}">',
             ),
         ),
@@ -50,37 +50,37 @@ 
         array('file'=>'modules/AOR_Reports/AOR_Report.js'),
     ),
     'tabDefs' =>
-        array (
+        array(
             'DEFAULT' =>
-                array (
+                array(
                     'newTab' => false,
                     'panelDefault' => 'collapsed',
                 ),
         ),
 ),
 
-'panels' =>array (
+'panels' =>array(
     'default' =>
-    array (
-  array (
+    array(
+  array(
     'name',
     'assigned_user_name',
   ),
 
-  array (
-	array (
+  array(
+	array(
       'name' => 'date_entered',
       'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
       'label' => 'LBL_DATE_ENTERED',
     ),
-    array (
+    array(
       'name' => 'date_modified',
       'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
       'label' => 'LBL_DATE_MODIFIED',
     ),
   ),
 
-  array (
+  array(
     'description',
   ),
     ),

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/listviewdefs.php

Indentation +36 added lines, -36 removed lines

@@ -1,67 +1,67 @@
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @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 <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @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 <info@salesagility.com>
+     */
 
 
 $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,
-  ),
+    ),
 );
 ?>

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.

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 'modules/InboundEmail/InboundEmail.php';
 require_once 'include/clean.php';
 class AOPInboundEmail extends InboundEmail {

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

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

Spacing +147 added lines, -147 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,26 +229,26 @@ 
 
         $this->bean->user_parameters = requestToUserParameters();
 
-        $printable = $this->bean->build_group_report(-1,false);
+        $printable = $this->bean->build_group_report(-1, false);
         $stylesheet = file_get_contents('themes/Suite7/css/style.css');
 
         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'];
@@ -257,31 +257,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 = '';
 
 
@@ -289,12 +289,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':
@@ -302,24 +302,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]);
             }
         }
@@ -327,31 +327,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 = '';
 
 
@@ -359,12 +359,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':
@@ -372,50 +372,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'];
         }
@@ -423,10 +423,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 = '';
 
 
@@ -434,12 +434,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':
@@ -447,35 +447,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;
@@ -484,8 +484,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'];
         }
@@ -494,18 +494,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;
@@ -513,13 +513,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;
@@ -527,7 +527,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;
@@ -540,23 +540,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';
@@ -566,7 +566,7 @@ 
                 break;
             case 'Value':
             default:
-                echo getModuleField($module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
@@ -575,13 +575,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;
     }
 
@@ -591,31 +591,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;
 
@@ -624,10 +624,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 = '';
 
 
@@ -644,15 +644,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;

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;

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @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 <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @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 <info@salesagility.com>
+     */
 
 /**
  * This file adds support for studio

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.