Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
modules/AOR_Reports/metadata/editviewdefs.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
  */
24 24
 
25 25
 $viewdefs ['AOR_Reports'] =
26
-array (
26
+array(
27 27
   'EditView' => 
28
-  array (
28
+  array(
29 29
     'templateMeta' => 
30
-    array (
30
+    array(
31 31
       'maxColumns' => '2',
32 32
       'widths' => 
33
-      array (
33
+      array(
34 34
         0 => 
35
-        array (
35
+        array(
36 36
           'label' => '10',
37 37
           'field' => '30',
38 38
         ),
39 39
         1 => 
40
-        array (
40
+        array(
41 41
           'label' => '10',
42 42
           'field' => '30',
43 43
         ),
@@ -49,18 +49,18 @@  discard block
 block discarded – undo
49 49
         ),
50 50
     ),
51 51
     'panels' => 
52
-    array (
52
+    array(
53 53
       'default' => 
54
-      array (
54
+      array(
55 55
         0 => 
56
-        array (
56
+        array(
57 57
           0 => 'name',
58 58
           1 => 'assigned_user_name',
59 59
         ),
60 60
         1 => 
61
-        array (
61
+        array(
62 62
           0 => 
63
-          array (
63
+          array(
64 64
             'name' => 'report_module',
65 65
             'studio' => 'visible',
66 66
             'label' => 'LBL_REPORT_MODULE',
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
           1 => '',
69 69
         ),
70 70
           2 =>
71
-              array (
71
+              array(
72 72
                   0 =>
73
-                      array (
73
+                      array(
74 74
                           'name' => 'graphs_per_row',
75 75
                           'label' => 'LBL_GRAPHS_PER_ROW',
76 76
                       ),
Please login to merge, or discard this patch.
modules/AOR_Reports/metadata/popupdefs.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /**
4 4
  * Advanced OpenReports, SugarCRM Reporting.
5 5
  * @package Advanced OpenReports for SugarCRM
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 						'whereClauses' => 
30 30
 							array('name' => 'aor_reports.name', 
31 31
 								),
32
-						    'searchInputs'=> array('aor_reports_number', 'name', 'priority','status'),
32
+						    'searchInputs'=> array('aor_reports_number', 'name', 'priority', 'status'),
33 33
 							
34 34
 						);
35 35
 ?>
Please login to merge, or discard this patch.
modules/AOR_Reports/metadata/SearchFields.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /**
4 4
  * Advanced OpenReports, SugarCRM Reporting.
5 5
  * @package Advanced OpenReports for SugarCRM
@@ -24,18 +24,18 @@  discard block
 block discarded – undo
24 24
  */
25 25
 
26 26
 $searchFields['AOR_Reports'] = 
27
-	array (
28
-		'name' => array( 'query_type'=>'default'),
29
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
27
+	array(
28
+		'name' => array('query_type'=>'default'),
29
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
30 30
 		'assigned_user_id'=> array('query_type'=>'default'),
31 31
 	    
32 32
 		//Range Search Support 
33
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
34
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
35
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
36
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
37
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
38
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
33
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
34
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
35
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
36
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
37
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
38
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
39 39
 	    //Range Search Support 		
40 40
 	);
41 41
 ?>
Please login to merge, or discard this patch.
modules/AOR_Reports/metadata/subpanels/default.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /**
4 4
  * Advanced OpenReports, SugarCRM Reporting.
5 5
  * @package Advanced OpenReports for SugarCRM
Please login to merge, or discard this patch.
modules/AOR_Reports/metadata/quickcreatedefs.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@
 block discarded – undo
31 31
                                             ),
32 32
                                             
33 33
                                             
34
- 'panels' =>array (
34
+ 'panels' =>array(
35 35
   'default' => 
36
-  array (
36
+  array(
37 37
     
38
-    array (
38
+    array(
39 39
       'name',
40 40
       'assigned_user_name',
41 41
     ),
Please login to merge, or discard this patch.
modules/AOR_Reports/metadata/listviewdefs.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /**
4 4
  * Advanced OpenReports, SugarCRM Reporting.
5 5
  * @package Advanced OpenReports for SugarCRM
@@ -25,16 +25,16 @@  discard block
 block discarded – undo
25 25
 
26 26
 
27 27
 $listViewDefs ['AOR_Reports'] =
28
-array (
28
+array(
29 29
   'NAME' => 
30
-  array (
30
+  array(
31 31
     'width' => '15%',
32 32
     'label' => 'LBL_NAME',
33 33
     'default' => true,
34 34
     'link' => true,
35 35
   ),
36 36
   'REPORT_MODULE' => 
37
-  array (
37
+  array(
38 38
     'type' => 'enum',
39 39
     'default' => true,
40 40
     'studio' => 'visible',
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     'width' => '15%',
43 43
   ),
44 44
   'ASSIGNED_USER_NAME' => 
45
-  array (
45
+  array(
46 46
     'width' => '15%',
47 47
     'label' => 'LBL_ASSIGNED_TO_NAME',
48 48
     'module' => 'Employees',
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
50 50
     'default' => true,
51 51
   ),
52 52
   'DATE_ENTERED' => 
53
-  array (
53
+  array(
54 54
     'type' => 'datetime',
55 55
     'label' => 'LBL_DATE_ENTERED',
56 56
     'width' => '15%',
57 57
     'default' => true,
58 58
   ),
59 59
   'DATE_MODIFIED' => 
60
-  array (
60
+  array(
61 61
     'type' => 'datetime',
62 62
     'label' => 'LBL_DATE_MODIFIED',
63 63
     'width' => '15%',
Please login to merge, or discard this patch.
modules/AOR_Reports/views/view.edit.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -38,17 +38,17 @@  discard block
 block discarded – undo
38 38
         //readfile('modules/AOR_Reports/css/edit.css');
39 39
         readfile('modules/AOR_Reports/js/jqtree/jqtree.css');
40 40
         echo "</style>";
41
-        if (!is_file('cache/jsLanguage/AOR_Fields/' . $GLOBALS['current_language'] . '.js')) {
41
+        if (!is_file('cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js')) {
42 42
             require_once ('include/language/jsLanguage.php');
43 43
             jsLanguage::createModuleStringsCache('AOR_Fields', $GLOBALS['current_language']);
44 44
         }
45
-        echo '<script src="cache/jsLanguage/AOR_Fields/'. $GLOBALS['current_language'] . '.js"></script>';
45
+        echo '<script src="cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js"></script>';
46 46
 
47
-        if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
47
+        if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
48 48
             require_once ('include/language/jsLanguage.php');
49 49
             jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
50 50
         }
51
-        echo '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
51
+        echo '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
52 52
         echo '<script src="include/javascript/yui3/build/yui/yui-min.js"></script>';
53 53
 
54 54
         echo "<script>";
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
         parent::preDisplay();
70 70
     }
71 71
 
72
-    private function getConditionLines(){
73
-        if(!$this->bean->id){
72
+    private function getConditionLines() {
73
+        if (!$this->bean->id) {
74 74
             return array();
75 75
         }
76 76
         $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 @@  discard block
 block discarded – undo
79 79
         while ($row = $this->bean->db->fetchByAssoc($result)) {
80 80
             $condition_name = new AOR_Condition();
81 81
             $condition_name->retrieve($row['id']);
82
-            if(!$condition_name->parenthesis) {
82
+            if (!$condition_name->parenthesis) {
83 83
                 $condition_name->module_path = implode(":", unserialize(base64_decode($condition_name->module_path)));
84 84
             }
85
-            if($condition_name->value_type == 'Date'){
85
+            if ($condition_name->value_type == 'Date') {
86 86
                 $condition_name->value = unserialize(base64_decode($condition_name->value));
87 87
             }
88 88
             $condition_item = $condition_name->toArray();
89 89
 
90
-            if(!$condition_name->parenthesis) {
90
+            if (!$condition_name->parenthesis) {
91 91
                 $display = getDisplayForField($condition_name->module_path, $condition_name->field, $this->bean->report_module);
92 92
                 $condition_item['module_path_display'] = $display['module'];
93 93
                 $condition_item['field_label'] = $display['field'];
94 94
             }
95
-            if(isset($conditions[$condition_item['condition_order']])) {
95
+            if (isset($conditions[$condition_item['condition_order']])) {
96 96
                 $conditions[] = $condition_item;
97 97
             }
98 98
             else {
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
         return $conditions;
103 103
     }
104 104
 
105
-    private function getFieldLines(){
106
-        if(!$this->bean->id){
105
+    private function getFieldLines() {
106
+        if (!$this->bean->id) {
107 107
             return array();
108 108
         }
109 109
         $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 @@  discard block
 block discarded – undo
113 113
         while ($row = $this->bean->db->fetchByAssoc($result)) {
114 114
             $field_name = new AOR_Field();
115 115
             $field_name->retrieve($row['id']);
116
-            $field_name->module_path = implode(":",unserialize(base64_decode($field_name->module_path)));
116
+            $field_name->module_path = implode(":", unserialize(base64_decode($field_name->module_path)));
117 117
             $arr = $field_name->toArray();
118 118
 
119
-            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field  , $this->bean->report_module);
119
+            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
120 120
 
121 121
             $display = getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
122 122
 
@@ -127,42 +127,42 @@  discard block
 block discarded – undo
127 127
         return $fields;
128 128
     }
129 129
 
130
-    private function getChartLines(){
130
+    private function getChartLines() {
131 131
         $charts = array();
132
-        if(!$this->bean->id){
132
+        if (!$this->bean->id) {
133 133
             return array();
134 134
         }
135
-        foreach($this->bean->get_linked_beans('aor_charts','AOR_Charts') as $chart){
135
+        foreach ($this->bean->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
136 136
             $charts[] = $chart->toArray();
137 137
         }
138 138
         return $charts;
139 139
     }
140 140
 
141
-    public function getDisplayForField($modulePath, $field, $reportModule){
141
+    public function getDisplayForField($modulePath, $field, $reportModule) {
142 142
         $modulePathDisplay = array();
143 143
         $currentBean = BeanFactory::getBean($reportModule);
144 144
         $modulePathDisplay[] = $currentBean->module_name;
145
-        if(is_array($modulePath)) {
145
+        if (is_array($modulePath)) {
146 146
             $split = $modulePath;
147
-        }else{
147
+        } else {
148 148
             $split = explode(':', $modulePath);
149 149
         }
150 150
         if ($split && $split[0] == $currentBean->module_dir) {
151 151
             array_shift($split);
152 152
         }
153
-        foreach($split as $relName){
154
-            if(empty($relName)){
153
+        foreach ($split as $relName) {
154
+            if (empty($relName)) {
155 155
                 continue;
156 156
             }
157
-            if(!empty($currentBean->field_name_map[$relName]['vname'])){
158
-                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'],$currentBean->module_dir),':');
157
+            if (!empty($currentBean->field_name_map[$relName]['vname'])) {
158
+                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'], $currentBean->module_dir), ':');
159 159
             }
160 160
             $thisModule = getRelatedModule($currentBean->module_dir, $relName);
161 161
             $currentBean = BeanFactory::getBean($thisModule);
162 162
 
163
-            if(!empty($moduleLabel)){
163
+            if (!empty($moduleLabel)) {
164 164
                 $modulePathDisplay[] = $moduleLabel;
165
-            }else {
165
+            } else {
166 166
                 $modulePathDisplay[] = $currentBean->module_name;
167 167
             }
168 168
         }
Please login to merge, or discard this patch.
modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.meta.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 global $app_strings;
4 4
 
5 5
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',
Please login to merge, or discard this patch.
modules/DynamicFields/UpgradeFields.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); 
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); 
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,45 +41,45 @@  discard block
 block discarded – undo
41 41
 require_once('modules/DynamicFields/FieldCases.php');
42 42
 require_once('modules/DynamicFields/DynamicField.php');
43 43
  global $db;
44
- if(!isset($db)){
44
+ if (!isset($db)) {
45 45
  	$db = DBManagerFactory::getInstance();
46 46
  }
47
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
47
+ $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
48 48
  $modules = array();
49 49
  /*
50 50
   * get the real field_meta_data
51 51
   */
52
- while($row = $db->fetchByAssoc($result)){
52
+ while ($row = $db->fetchByAssoc($result)) {
53 53
  	$the_modules = $row['custom_module'];
54
- 	if(!isset($modules[$the_modules])){
54
+ 	if (!isset($modules[$the_modules])) {
55 55
  		$modules[$the_modules] = array();	
56 56
  	}
57 57
  	$modules[$the_modules][$row['name']] = $row['name'];
58 58
  }
59 59
  	
60 60
  $simulate = false;
61
- if(!isset($_REQUEST['run'])){
61
+ if (!isset($_REQUEST['run'])) {
62 62
  	$simulate = true;
63 63
  	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
64 64
  }	
65 65
 
66
- foreach($modules as $the_module=>$fields){
67
-         if(isset($beanList[$the_module]))
66
+ foreach ($modules as $the_module=>$fields) {
67
+         if (isset($beanList[$the_module]))
68 68
          {
69 69
  	$class_name = $beanList[$the_module];
70 70
  	echo "<br><br>Scanning $the_module <br>";
71 71
 		
72 72
 		require_once($beanFiles[$class_name]);
73 73
 		$mod = new $class_name();
74
-		if(!$db->tableExists($mod->table_name . "_cstm")){
74
+		if (!$db->tableExists($mod->table_name."_cstm")) {
75 75
 			$mod->custom_fields = new DynamicField();
76 76
 			$mod->custom_fields->setup($mod);
77 77
 		$mod->custom_fields->createCustomTable();
78 78
 		}
79 79
 
80
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
80
+		$result = $db->query("DESCRIBE $mod->table_name"."_cstm");
81 81
 		
82
-		while($row = $db->fetchByAssoc($result)){
82
+		while ($row = $db->fetchByAssoc($result)) {
83 83
 			
84 84
 			
85 85
 			$col = $row['Field'];
@@ -88,16 +88,16 @@  discard block
 block discarded – undo
88 88
 			$the_field = get_widget($fieldDef['type']);
89 89
 			$the_field->set($fieldDef);
90 90
 				
91
-				if(!isset($fields[$col]) && $col != 'id_c'){
92
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
91
+				if (!isset($fields[$col]) && $col != 'id_c') {
92
+					if (!$simulate)$db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
93 93
 					unset($fields[$col]);
94
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
95
-				}	else{
96
-					if($col != 'id_c'){
97
-					if(trim($the_field->get_db_type()) != trim($type)){
94
+					echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
95
+				} else {
96
+					if ($col != 'id_c') {
97
+					if (trim($the_field->get_db_type()) != trim($type)) {
98 98
 						
99
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
100
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
99
+					echo "Fixing Column Type for $col changing $type to ".$the_field->get_db_type()."<br>";
100
+					if (!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));		
101 101
 					}
102 102
 					}
103 103
 					
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
 			
107 107
 		}
108 108
 			
109
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
110
-			foreach($fields as $field){
111
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
112
-				if(!$simulate){
109
+			echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
110
+			foreach ($fields as $field) {
111
+				echo "Adding Column $field to $mod->table_name"."_cstm<br>";
112
+				if (!$simulate) {
113 113
 					$the_field = $mod->getFieldDefinition($field);
114 114
 					$field = get_widget($the_field['type']);
115 115
 					$field->set($the_field);
116
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
116
+					$query = $field->get_db_add_alter_table($mod->table_name.'_cstm');
117 117
 					echo $query;
118
-            		if(!empty($query)){
118
+            		if (!empty($query)) {
119 119
                 		$mod->db->query($query);
120 120
             		}
121 121
 				}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	
127 127
 	DynamicField::deleteCache();	
128 128
 	echo '<br>Done<br>';
129
-	if($simulate){
129
+	if ($simulate) {
130 130
 		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
131 131
 	}
132 132
 		
Please login to merge, or discard this patch.