@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | * display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM". |
39 | 39 | ********************************************************************************/ |
40 | 40 | |
41 | - //Request object must have these property values: |
|
42 | - // Module: module name, this module should have a file called TreeData.php |
|
43 | - // Function: name of the function to be called in TreeData.php, the function will be called statically. |
|
44 | - // PARAM prefixed properties: array of these property/values will be passed to the function as parameter. |
|
41 | + //Request object must have these property values: |
|
42 | + // Module: module name, this module should have a file called TreeData.php |
|
43 | + // Function: name of the function to be called in TreeData.php, the function will be called statically. |
|
44 | + // PARAM prefixed properties: array of these property/values will be passed to the function as parameter. |
|
45 | 45 | |
46 | 46 | require_once('include/JSON.php'); |
47 | 47 | require_once('include/upload_file.php'); |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | $json = getJSONobj(); |
52 | 52 | $file_name = $json->decode(html_entity_decode($_REQUEST['file_name'])); |
53 | - if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){ |
|
54 | - $file_name = $file_name['jsonObject']; |
|
55 | - } |
|
53 | + if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){ |
|
54 | + $file_name = $file_name['jsonObject']; |
|
55 | + } |
|
56 | 56 | |
57 | 57 | $filesize = ''; |
58 | 58 | if(file_exists($file_name)){ |
@@ -73,10 +73,10 @@ discard block |
||
73 | 73 | //$uploadSizeIni = substr(ini_get("upload_max_filesize"), 0, strlen( ini_get("upload_max_filesize")) - 1); |
74 | 74 | //$GLOBALS['log']->fatal('Upload php setting Size '.return_bytes(ini_get("upload_max_filesize"))); |
75 | 75 | if($filesize != null){ |
76 | - if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){ |
|
77 | - $response=$filesize; |
|
78 | - //$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>"; |
|
79 | - } |
|
76 | + if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){ |
|
77 | + $response=$filesize; |
|
78 | + //$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>"; |
|
79 | + } |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | if (!empty($response)) { |
@@ -1,5 +1,5 @@ discard block |
||
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. |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | |
51 | 51 | $json = getJSONobj(); |
52 | 52 | $file_name = $json->decode(html_entity_decode($_REQUEST['file_name'])); |
53 | - if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){ |
|
53 | + if (isset($file_name['jsonObject']) && $file_name['jsonObject'] != null) { |
|
54 | 54 | $file_name = $file_name['jsonObject']; |
55 | 55 | } |
56 | 56 | |
57 | 57 | $filesize = ''; |
58 | -if(file_exists($file_name)){ |
|
59 | - $filesize =filesize($file_name); |
|
58 | +if (file_exists($file_name)) { |
|
59 | + $filesize = filesize($file_name); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | //get the file size defined in php.ini |
73 | 73 | //$uploadSizeIni = substr(ini_get("upload_max_filesize"), 0, strlen( ini_get("upload_max_filesize")) - 1); |
74 | 74 | //$GLOBALS['log']->fatal('Upload php setting Size '.return_bytes(ini_get("upload_max_filesize"))); |
75 | -if($filesize != null){ |
|
76 | - if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){ |
|
77 | - $response=$filesize; |
|
75 | +if ($filesize != null) { |
|
76 | + if (($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))) { |
|
77 | + $response = $filesize; |
|
78 | 78 | //$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>"; |
79 | 79 | } |
80 | 80 | } |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /********************************************************************************* |
4 | 6 | * SugarCRM Community Edition is a customer relationship management program developed by |
5 | 7 | * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. |
@@ -72,18 +72,18 @@ |
||
72 | 72 | } |
73 | 73 | */ |
74 | 74 | |
75 | - $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime']; |
|
76 | - $response = $_SESSION['totalUpgradeTime']; |
|
75 | + $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime']; |
|
76 | + $response = $_SESSION['totalUpgradeTime']; |
|
77 | 77 | |
78 | 78 | $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']); |
79 | - //$uptime = $uptime+$_REQUEST['upgradeStepTime']; |
|
80 | - $GLOBALS['log']->fatal($response); |
|
79 | + //$uptime = $uptime+$_REQUEST['upgradeStepTime']; |
|
80 | + $GLOBALS['log']->fatal($response); |
|
81 | 81 | |
82 | 82 | |
83 | - if (!empty($response)) { |
|
83 | + if (!empty($response)) { |
|
84 | 84 | $json = getJSONobj(); |
85 | - print $json->encode($response); |
|
86 | - } |
|
85 | + print $json->encode($response); |
|
86 | + } |
|
87 | 87 | |
88 | 88 | sugar_cleanup(); |
89 | 89 | exit(); |
@@ -1,5 +1,5 @@ discard block |
||
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. |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | */ |
74 | 74 | |
75 | - $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime']; |
|
75 | + $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime'] + $_REQUEST['upgradeStepTime']; |
|
76 | 76 | $response = $_SESSION['totalUpgradeTime']; |
77 | 77 | |
78 | 78 | $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']); |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /********************************************************************************* |
4 | 6 | * SugarCRM Community Edition is a customer relationship management program developed by |
5 | 7 | * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | */ |
69 | 69 | public function getFilesToRemove($version) |
70 | 70 | { |
71 | - return array(); |
|
71 | + return array(); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -79,31 +79,31 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function processFilesToRemove($files=array()) |
81 | 81 | { |
82 | - if(empty($files) || !is_array($files)) |
|
83 | - { |
|
84 | - return; |
|
85 | - } |
|
82 | + if(empty($files) || !is_array($files)) |
|
83 | + { |
|
84 | + return; |
|
85 | + } |
|
86 | 86 | |
87 | - require_once('include/dir_inc.php'); |
|
87 | + require_once('include/dir_inc.php'); |
|
88 | 88 | |
89 | - if(!file_exists('custom/backup')) |
|
90 | - { |
|
91 | - mkdir_recursive('custom/backup'); |
|
92 | - } |
|
89 | + if(!file_exists('custom/backup')) |
|
90 | + { |
|
91 | + mkdir_recursive('custom/backup'); |
|
92 | + } |
|
93 | 93 | |
94 | - foreach($files as $file) |
|
95 | - { |
|
96 | - if(file_exists($file)) |
|
97 | - { |
|
98 | - $this->backup($file); |
|
99 | - if(is_dir($file)) |
|
100 | - { |
|
101 | - rmdir_recursive($file); |
|
102 | - } else { |
|
103 | - unlink($file); |
|
104 | - } |
|
105 | - } |
|
106 | - } |
|
94 | + foreach($files as $file) |
|
95 | + { |
|
96 | + if(file_exists($file)) |
|
97 | + { |
|
98 | + $this->backup($file); |
|
99 | + if(is_dir($file)) |
|
100 | + { |
|
101 | + rmdir_recursive($file); |
|
102 | + } else { |
|
103 | + unlink($file); |
|
104 | + } |
|
105 | + } |
|
106 | + } |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | |
@@ -115,20 +115,20 @@ discard block |
||
115 | 115 | */ |
116 | 116 | protected function backup($file) |
117 | 117 | { |
118 | - $basename = basename($file); |
|
119 | - $basepath = str_replace($basename, '', $file); |
|
118 | + $basename = basename($file); |
|
119 | + $basepath = str_replace($basename, '', $file); |
|
120 | 120 | |
121 | - if(!empty($basepath) && !file_exists('custom/backup/' . $basepath)) |
|
122 | - { |
|
123 | - mkdir_recursive('custom/backup/' . $basepath); |
|
124 | - } |
|
121 | + if(!empty($basepath) && !file_exists('custom/backup/' . $basepath)) |
|
122 | + { |
|
123 | + mkdir_recursive('custom/backup/' . $basepath); |
|
124 | + } |
|
125 | 125 | |
126 | - if(is_dir($file)) |
|
127 | - { |
|
128 | - copy_recursive($file, 'custom/backup/' . $file); |
|
129 | - } else { |
|
130 | - copy($file, 'custom/backup/' . $file); |
|
131 | - } |
|
126 | + if(is_dir($file)) |
|
127 | + { |
|
128 | + copy_recursive($file, 'custom/backup/' . $file); |
|
129 | + } else { |
|
130 | + copy($file, 'custom/backup/' . $file); |
|
131 | + } |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | } |
@@ -1,5 +1,5 @@ discard block |
||
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. |
@@ -77,26 +77,26 @@ discard block |
||
77 | 77 | * |
78 | 78 | * @param mixed $files |
79 | 79 | */ |
80 | -public function processFilesToRemove($files=array()) |
|
80 | +public function processFilesToRemove($files = array()) |
|
81 | 81 | { |
82 | - if(empty($files) || !is_array($files)) |
|
82 | + if (empty($files) || !is_array($files)) |
|
83 | 83 | { |
84 | 84 | return; |
85 | 85 | } |
86 | 86 | |
87 | 87 | require_once('include/dir_inc.php'); |
88 | 88 | |
89 | - if(!file_exists('custom/backup')) |
|
89 | + if (!file_exists('custom/backup')) |
|
90 | 90 | { |
91 | 91 | mkdir_recursive('custom/backup'); |
92 | 92 | } |
93 | 93 | |
94 | - foreach($files as $file) |
|
94 | + foreach ($files as $file) |
|
95 | 95 | { |
96 | - if(file_exists($file)) |
|
96 | + if (file_exists($file)) |
|
97 | 97 | { |
98 | 98 | $this->backup($file); |
99 | - if(is_dir($file)) |
|
99 | + if (is_dir($file)) |
|
100 | 100 | { |
101 | 101 | rmdir_recursive($file); |
102 | 102 | } else { |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | $basename = basename($file); |
119 | 119 | $basepath = str_replace($basename, '', $file); |
120 | 120 | |
121 | - if(!empty($basepath) && !file_exists('custom/backup/' . $basepath)) |
|
121 | + if (!empty($basepath) && !file_exists('custom/backup/'.$basepath)) |
|
122 | 122 | { |
123 | - mkdir_recursive('custom/backup/' . $basepath); |
|
123 | + mkdir_recursive('custom/backup/'.$basepath); |
|
124 | 124 | } |
125 | 125 | |
126 | - if(is_dir($file)) |
|
126 | + if (is_dir($file)) |
|
127 | 127 | { |
128 | - copy_recursive($file, 'custom/backup/' . $file); |
|
128 | + copy_recursive($file, 'custom/backup/'.$file); |
|
129 | 129 | } else { |
130 | - copy($file, 'custom/backup/' . $file); |
|
130 | + copy($file, 'custom/backup/'.$file); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /********************************************************************************* |
4 | 6 | * SugarCRM Community Edition is a customer relationship management program developed by |
5 | 7 | * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. |
@@ -35,29 +35,29 @@ discard block |
||
35 | 35 | ********************************************************************************/ |
36 | 36 | |
37 | 37 | function build_argument_string($arguments=array()) { |
38 | - if(!is_array($arguments)) { |
|
39 | - return ''; |
|
40 | - } |
|
38 | + if(!is_array($arguments)) { |
|
39 | + return ''; |
|
40 | + } |
|
41 | 41 | |
42 | - $argument_string = ''; |
|
43 | - $count = 0; |
|
44 | - foreach($arguments as $arg) { |
|
45 | - if($count != 0) |
|
46 | - { |
|
47 | - //If current directory or parent directory is specified, substitute with full path |
|
48 | - if($arg == '.') |
|
49 | - { |
|
50 | - $arg = getcwd(); |
|
51 | - } else if ($arg == '..') { |
|
52 | - $dir = getcwd(); |
|
53 | - $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR)); |
|
54 | - } |
|
55 | - $argument_string .= ' ' . escapeshellarg($arg); |
|
56 | - } |
|
57 | - $count++; |
|
58 | - } |
|
42 | + $argument_string = ''; |
|
43 | + $count = 0; |
|
44 | + foreach($arguments as $arg) { |
|
45 | + if($count != 0) |
|
46 | + { |
|
47 | + //If current directory or parent directory is specified, substitute with full path |
|
48 | + if($arg == '.') |
|
49 | + { |
|
50 | + $arg = getcwd(); |
|
51 | + } else if ($arg == '..') { |
|
52 | + $dir = getcwd(); |
|
53 | + $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR)); |
|
54 | + } |
|
55 | + $argument_string .= ' ' . escapeshellarg($arg); |
|
56 | + } |
|
57 | + $count++; |
|
58 | + } |
|
59 | 59 | |
60 | - return $argument_string; |
|
60 | + return $argument_string; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | //Bug 52872. Dies if the request does not come from CLI. |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | $run_dce_upgrade = true; |
76 | 76 | //set the php path if found |
77 | 77 | if(is_file($argv[7].'dce_config.php')){ |
78 | - include($argv[7].'dce_config.php'); |
|
79 | - $php_path = $dce_config['client_php_path'].'/'; |
|
78 | + include($argv[7].'dce_config.php'); |
|
79 | + $php_path = $dce_config['client_php_path'].'/'; |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
@@ -92,25 +92,25 @@ discard block |
||
92 | 92 | $has_error = $output == 0 ? false : true; |
93 | 93 | |
94 | 94 | if(!$has_error) { |
95 | - if($run_dce_upgrade) { |
|
96 | - $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv); |
|
97 | - passthru($step2, $output); |
|
98 | - } else { |
|
99 | - $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv); |
|
100 | - passthru($step2, $output); |
|
101 | - } |
|
95 | + if($run_dce_upgrade) { |
|
96 | + $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv); |
|
97 | + passthru($step2, $output); |
|
98 | + } else { |
|
99 | + $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv); |
|
100 | + passthru($step2, $output); |
|
101 | + } |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | if($run_dce_upgrade) { |
105 | - $has_error = $output == 0 ? false : true; |
|
106 | - if(!$has_error) { |
|
107 | - $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv); |
|
108 | - passthru($step3, $output); |
|
109 | - } |
|
105 | + $has_error = $output == 0 ? false : true; |
|
106 | + if(!$has_error) { |
|
107 | + $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv); |
|
108 | + passthru($step3, $output); |
|
109 | + } |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | if($output != 0) { |
113 | - echo "*************** silentupgrade failed ***************: $output\n"; |
|
113 | + echo "*************** silentupgrade failed ***************: $output\n"; |
|
114 | 114 | } |
115 | 115 | exit($output); |
116 | 116 | ?> |
@@ -34,25 +34,25 @@ discard block |
||
34 | 34 | * "Powered by SugarCRM". |
35 | 35 | ********************************************************************************/ |
36 | 36 | |
37 | -function build_argument_string($arguments=array()) { |
|
38 | - if(!is_array($arguments)) { |
|
37 | +function build_argument_string($arguments = array()) { |
|
38 | + if (!is_array($arguments)) { |
|
39 | 39 | return ''; |
40 | 40 | } |
41 | 41 | |
42 | 42 | $argument_string = ''; |
43 | 43 | $count = 0; |
44 | - foreach($arguments as $arg) { |
|
45 | - if($count != 0) |
|
44 | + foreach ($arguments as $arg) { |
|
45 | + if ($count != 0) |
|
46 | 46 | { |
47 | 47 | //If current directory or parent directory is specified, substitute with full path |
48 | - if($arg == '.') |
|
48 | + if ($arg == '.') |
|
49 | 49 | { |
50 | 50 | $arg = getcwd(); |
51 | 51 | } else if ($arg == '..') { |
52 | 52 | $dir = getcwd(); |
53 | 53 | $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR)); |
54 | 54 | } |
55 | - $argument_string .= ' ' . escapeshellarg($arg); |
|
55 | + $argument_string .= ' '.escapeshellarg($arg); |
|
56 | 56 | } |
57 | 57 | $count++; |
58 | 58 | } |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | |
70 | 70 | $php_path = ''; |
71 | 71 | $run_dce_upgrade = false; |
72 | -if(isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) { |
|
72 | +if (isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) { |
|
73 | 73 | //this is a dce call, set the dce flag |
74 | 74 | chdir($argv[3]); |
75 | 75 | $run_dce_upgrade = true; |
76 | 76 | //set the php path if found |
77 | - if(is_file($argv[7].'dce_config.php')){ |
|
77 | + if (is_file($argv[7].'dce_config.php')) { |
|
78 | 78 | include($argv[7].'dce_config.php'); |
79 | 79 | $php_path = $dce_config['client_php_path'].'/'; |
80 | 80 | } |
@@ -82,34 +82,34 @@ discard block |
||
82 | 82 | |
83 | 83 | $php_file = $argv[0]; |
84 | 84 | $p_info = pathinfo($php_file); |
85 | -$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ? $p_info['dirname'] . '/' : ''; |
|
85 | +$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ? $p_info['dirname'].'/' : ''; |
|
86 | 86 | |
87 | -$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php " . build_argument_string($argv); |
|
87 | +$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php ".build_argument_string($argv); |
|
88 | 88 | passthru($step1, $output); |
89 | -if($output != 0) { |
|
89 | +if ($output != 0) { |
|
90 | 90 | echo "*************** step1 failed ***************: $output\n"; |
91 | 91 | } |
92 | 92 | $has_error = $output == 0 ? false : true; |
93 | 93 | |
94 | -if(!$has_error) { |
|
95 | - if($run_dce_upgrade) { |
|
96 | - $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv); |
|
94 | +if (!$has_error) { |
|
95 | + if ($run_dce_upgrade) { |
|
96 | + $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php ".build_argument_string($argv); |
|
97 | 97 | passthru($step2, $output); |
98 | 98 | } else { |
99 | - $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv); |
|
99 | + $step2 = "php -f {$php_dir}silentUpgrade_step2.php ".build_argument_string($argv); |
|
100 | 100 | passthru($step2, $output); |
101 | 101 | } |
102 | 102 | } |
103 | 103 | |
104 | -if($run_dce_upgrade) { |
|
104 | +if ($run_dce_upgrade) { |
|
105 | 105 | $has_error = $output == 0 ? false : true; |
106 | - if(!$has_error) { |
|
107 | - $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv); |
|
106 | + if (!$has_error) { |
|
107 | + $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php ".build_argument_string($argv); |
|
108 | 108 | passthru($step3, $output); |
109 | 109 | } |
110 | 110 | } |
111 | 111 | |
112 | -if($output != 0) { |
|
112 | +if ($output != 0) { |
|
113 | 113 | echo "*************** silentupgrade failed ***************: $output\n"; |
114 | 114 | } |
115 | 115 | exit($output); |
@@ -38,45 +38,45 @@ discard block |
||
38 | 38 | ********************************************************************************/ |
39 | 39 | |
40 | 40 | $dictionary['AOR_Report'] = array( |
41 | - 'table'=>'aor_reports', |
|
42 | - 'audited'=>true, |
|
43 | - 'duplicate_merge'=>true, |
|
44 | - 'fields'=>array ( |
|
45 | - 'report_module' => |
|
46 | - array ( |
|
47 | - 'required' => true, |
|
48 | - 'name' => 'report_module', |
|
49 | - 'vname' => 'LBL_REPORT_MODULE', |
|
50 | - 'type' => 'enum', |
|
51 | - 'massupdate' => 0, |
|
52 | - 'default' => '', |
|
53 | - 'no_default' => false, |
|
54 | - 'comments' => '', |
|
55 | - 'help' => '', |
|
56 | - 'importable' => 'true', |
|
57 | - 'duplicate_merge' => 'disabled', |
|
58 | - 'duplicate_merge_dom_value' => '0', |
|
59 | - 'audited' => true, |
|
60 | - 'reportable' => true, |
|
61 | - 'unified_search' => false, |
|
62 | - 'merge_filter' => 'disabled', |
|
63 | - 'len' => 100, |
|
64 | - 'size' => '20', |
|
65 | - 'options' => 'aor_moduleList', |
|
66 | - 'studio' => 'visible', |
|
67 | - 'dependency' => false, |
|
68 | - ), |
|
41 | + 'table'=>'aor_reports', |
|
42 | + 'audited'=>true, |
|
43 | + 'duplicate_merge'=>true, |
|
44 | + 'fields'=>array ( |
|
45 | + 'report_module' => |
|
46 | + array ( |
|
47 | + 'required' => true, |
|
48 | + 'name' => 'report_module', |
|
49 | + 'vname' => 'LBL_REPORT_MODULE', |
|
50 | + 'type' => 'enum', |
|
51 | + 'massupdate' => 0, |
|
52 | + 'default' => '', |
|
53 | + 'no_default' => false, |
|
54 | + 'comments' => '', |
|
55 | + 'help' => '', |
|
56 | + 'importable' => 'true', |
|
57 | + 'duplicate_merge' => 'disabled', |
|
58 | + 'duplicate_merge_dom_value' => '0', |
|
59 | + 'audited' => true, |
|
60 | + 'reportable' => true, |
|
61 | + 'unified_search' => false, |
|
62 | + 'merge_filter' => 'disabled', |
|
63 | + 'len' => 100, |
|
64 | + 'size' => '20', |
|
65 | + 'options' => 'aor_moduleList', |
|
66 | + 'studio' => 'visible', |
|
67 | + 'dependency' => false, |
|
68 | + ), |
|
69 | 69 | |
70 | - 'graphs_per_row' => |
|
71 | - array ( |
|
72 | - 'required' => true, |
|
73 | - 'name' => 'graphs_per_row', |
|
74 | - 'vname' => 'LBL_GRAPHS_PER_ROW', |
|
75 | - 'type' => 'int', |
|
76 | - 'massupdate' => 0, |
|
77 | - 'default' => 2, |
|
78 | - 'no_default' => false, |
|
79 | - ), |
|
70 | + 'graphs_per_row' => |
|
71 | + array ( |
|
72 | + 'required' => true, |
|
73 | + 'name' => 'graphs_per_row', |
|
74 | + 'vname' => 'LBL_GRAPHS_PER_ROW', |
|
75 | + 'type' => 'int', |
|
76 | + 'massupdate' => 0, |
|
77 | + 'default' => 2, |
|
78 | + 'no_default' => false, |
|
79 | + ), |
|
80 | 80 | |
81 | 81 | 'field_lines' => |
82 | 82 | array ( |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | 'include' => 'modules/AOR_Conditions/conditionLines.php' |
119 | 119 | ), |
120 | 120 | ), |
121 | - 'aor_fields' => |
|
122 | - array ( |
|
121 | + 'aor_fields' => |
|
122 | + array ( |
|
123 | 123 | 'name' => 'aor_fields', |
124 | 124 | 'type' => 'link', |
125 | 125 | 'relationship' => 'aor_reports_aor_fields', |
@@ -127,26 +127,26 @@ discard block |
||
127 | 127 | 'bean_name'=>'AOR_Field', |
128 | 128 | 'source'=>'non-db', |
129 | 129 | 'id_name' => 'aor_report_id', |
130 | - ), |
|
131 | - 'aor_conditions' => |
|
132 | - array ( |
|
133 | - 'name' => 'aor_conditions', |
|
134 | - 'type' => 'link', |
|
135 | - 'relationship' => 'aor_reports_aor_conditions', |
|
136 | - 'module'=>'AOR_Conditions', |
|
137 | - 'bean_name'=>'AOR_Condition', |
|
138 | - 'source'=>'non-db', |
|
139 | - ), |
|
140 | - 'aor_charts' => |
|
141 | - array ( |
|
130 | + ), |
|
131 | + 'aor_conditions' => |
|
132 | + array ( |
|
133 | + 'name' => 'aor_conditions', |
|
134 | + 'type' => 'link', |
|
135 | + 'relationship' => 'aor_reports_aor_conditions', |
|
136 | + 'module'=>'AOR_Conditions', |
|
137 | + 'bean_name'=>'AOR_Condition', |
|
138 | + 'source'=>'non-db', |
|
139 | + ), |
|
140 | + 'aor_charts' => |
|
141 | + array ( |
|
142 | 142 | 'name' => 'aor_charts', |
143 | 143 | 'type' => 'link', |
144 | 144 | 'relationship' => 'aor_charts_aor_reports', |
145 | 145 | 'source' => 'non-db', |
146 | 146 | 'id_name' => 'aor_report_id', |
147 | 147 | 'vname' => 'LBL_AOR_CHARTS', |
148 | - ), |
|
149 | - 'aor_scheduled_reports' => |
|
148 | + ), |
|
149 | + 'aor_scheduled_reports' => |
|
150 | 150 | array ( |
151 | 151 | 'name' => 'aor_scheduled_reports', |
152 | 152 | 'type' => 'link', |
@@ -188,8 +188,8 @@ discard block |
||
188 | 188 | 'relationship_type'=>'one-to-many', |
189 | 189 | ), |
190 | 190 | ), |
191 | - 'optimistic_locking'=>true, |
|
192 | - 'unified_search'=>true, |
|
191 | + 'optimistic_locking'=>true, |
|
192 | + 'unified_search'=>true, |
|
193 | 193 | ); |
194 | 194 | |
195 | 195 | if (!class_exists('VardefManager')){ |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | 'table'=>'aor_reports', |
42 | 42 | 'audited'=>true, |
43 | 43 | 'duplicate_merge'=>true, |
44 | - 'fields'=>array ( |
|
44 | + 'fields'=>array( |
|
45 | 45 | 'report_module' => |
46 | - array ( |
|
46 | + array( |
|
47 | 47 | 'required' => true, |
48 | 48 | 'name' => 'report_module', |
49 | 49 | 'vname' => 'LBL_REPORT_MODULE', |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | ), |
69 | 69 | |
70 | 70 | 'graphs_per_row' => |
71 | - array ( |
|
71 | + array( |
|
72 | 72 | 'required' => true, |
73 | 73 | 'name' => 'graphs_per_row', |
74 | 74 | 'vname' => 'LBL_GRAPHS_PER_ROW', |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ), |
80 | 80 | |
81 | 81 | 'field_lines' => |
82 | - array ( |
|
82 | + array( |
|
83 | 83 | 'required' => false, |
84 | 84 | 'name' => 'field_lines', |
85 | 85 | 'vname' => 'LBL_FIELD_LINES', |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | 'audited' => false, |
93 | 93 | 'reportable' => false, |
94 | 94 | 'function' => |
95 | - array ( |
|
95 | + array( |
|
96 | 96 | 'name' => 'display_field_lines', |
97 | 97 | 'returns' => 'html', |
98 | 98 | 'include' => 'modules/AOR_Fields/fieldLines.php' |
99 | 99 | ), |
100 | 100 | ), |
101 | 101 | 'condition_lines' => |
102 | - array ( |
|
102 | + array( |
|
103 | 103 | 'required' => false, |
104 | 104 | 'name' => 'condition_lines', |
105 | 105 | 'vname' => 'LBL_CONDITION_LINES', |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | 'audited' => false, |
113 | 113 | 'reportable' => false, |
114 | 114 | 'function' => |
115 | - array ( |
|
115 | + array( |
|
116 | 116 | 'name' => 'display_condition_lines', |
117 | 117 | 'returns' => 'html', |
118 | 118 | 'include' => 'modules/AOR_Conditions/conditionLines.php' |
119 | 119 | ), |
120 | 120 | ), |
121 | 121 | 'aor_fields' => |
122 | - array ( |
|
122 | + array( |
|
123 | 123 | 'name' => 'aor_fields', |
124 | 124 | 'type' => 'link', |
125 | 125 | 'relationship' => 'aor_reports_aor_fields', |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | 'id_name' => 'aor_report_id', |
130 | 130 | ), |
131 | 131 | 'aor_conditions' => |
132 | - array ( |
|
132 | + array( |
|
133 | 133 | 'name' => 'aor_conditions', |
134 | 134 | 'type' => 'link', |
135 | 135 | 'relationship' => 'aor_reports_aor_conditions', |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | 'source'=>'non-db', |
139 | 139 | ), |
140 | 140 | 'aor_charts' => |
141 | - array ( |
|
141 | + array( |
|
142 | 142 | 'name' => 'aor_charts', |
143 | 143 | 'type' => 'link', |
144 | 144 | 'relationship' => 'aor_charts_aor_reports', |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | 'vname' => 'LBL_AOR_CHARTS', |
148 | 148 | ), |
149 | 149 | 'aor_scheduled_reports' => |
150 | - array ( |
|
150 | + array( |
|
151 | 151 | 'name' => 'aor_scheduled_reports', |
152 | 152 | 'type' => 'link', |
153 | 153 | 'relationship' => 'aor_scheduled_reports_aor_reports', |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | ), |
158 | 158 | |
159 | 159 | ), |
160 | -'relationships'=>array ( |
|
160 | +'relationships'=>array( |
|
161 | 161 | 'aor_reports_aor_fields' => |
162 | 162 | array( |
163 | 163 | 'lhs_module'=> 'AOR_Reports', |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | 'rhs_key' => 'aor_report_id', |
179 | 179 | 'relationship_type'=>'one-to-many', |
180 | 180 | ), |
181 | - "aor_scheduled_reports_aor_reports" => array ( |
|
181 | + "aor_scheduled_reports_aor_reports" => array( |
|
182 | 182 | 'lhs_module'=> 'AOR_Reports', |
183 | 183 | 'lhs_table'=> 'aor_reports', |
184 | 184 | 'lhs_key' => 'id', |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | 'unified_search'=>true, |
193 | 193 | ); |
194 | 194 | |
195 | -if (!class_exists('VardefManager')){ |
|
195 | +if (!class_exists('VardefManager')) { |
|
196 | 196 | require_once('include/SugarObjects/VardefManager.php'); |
197 | 197 | } |
198 | -VardefManager::createVardef('AOR_Reports','AOR_Report', array('basic','assignable','security_groups')); |
|
198 | +VardefManager::createVardef('AOR_Reports', 'AOR_Report', array('basic', 'assignable', 'security_groups')); |
|
199 | 199 |
@@ -23,21 +23,21 @@ discard block |
||
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 |
||
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 |
||
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 | ), |
@@ -24,25 +24,25 @@ discard block |
||
24 | 24 | |
25 | 25 | $viewdefs ['AOR_Reports'] = |
26 | 26 | array ( |
27 | - 'EditView' => |
|
28 | - array ( |
|
27 | + 'EditView' => |
|
28 | + array ( |
|
29 | 29 | 'templateMeta' => |
30 | 30 | array ( |
31 | - 'maxColumns' => '2', |
|
32 | - 'widths' => |
|
33 | - array ( |
|
31 | + 'maxColumns' => '2', |
|
32 | + 'widths' => |
|
33 | + array ( |
|
34 | 34 | 0 => |
35 | 35 | array ( |
36 | - 'label' => '10', |
|
37 | - 'field' => '30', |
|
36 | + 'label' => '10', |
|
37 | + 'field' => '30', |
|
38 | 38 | ), |
39 | 39 | 1 => |
40 | 40 | array ( |
41 | - 'label' => '10', |
|
42 | - 'field' => '30', |
|
41 | + 'label' => '10', |
|
42 | + 'field' => '30', |
|
43 | + ), |
|
43 | 44 | ), |
44 | - ), |
|
45 | - 'useTabs' => false, |
|
45 | + 'useTabs' => false, |
|
46 | 46 | 'form' => array( |
47 | 47 | 'headerTpl' => 'modules/AOR_Reports/tpls/EditViewHeader.tpl', |
48 | 48 | 'footerTpl' => 'modules/AOR_Reports/tpls/EditViewFooter.tpl', |
@@ -50,38 +50,38 @@ discard block |
||
50 | 50 | ), |
51 | 51 | 'panels' => |
52 | 52 | array ( |
53 | - 'default' => |
|
54 | - array ( |
|
53 | + 'default' => |
|
54 | + array ( |
|
55 | 55 | 0 => |
56 | 56 | array ( |
57 | - 0 => 'name', |
|
58 | - 1 => 'assigned_user_name', |
|
57 | + 0 => 'name', |
|
58 | + 1 => 'assigned_user_name', |
|
59 | 59 | ), |
60 | 60 | 1 => |
61 | 61 | array ( |
62 | - 0 => |
|
63 | - array ( |
|
62 | + 0 => |
|
63 | + array ( |
|
64 | 64 | 'name' => 'report_module', |
65 | 65 | 'studio' => 'visible', |
66 | 66 | 'label' => 'LBL_REPORT_MODULE', |
67 | - ), |
|
68 | - 1 => '', |
|
67 | + ), |
|
68 | + 1 => '', |
|
69 | 69 | ), |
70 | - 2 => |
|
71 | - array ( |
|
72 | - 0 => |
|
73 | - array ( |
|
74 | - 'name' => 'graphs_per_row', |
|
75 | - 'label' => 'LBL_GRAPHS_PER_ROW', |
|
76 | - ), |
|
77 | - 1 => '', |
|
78 | - ), |
|
70 | + 2 => |
|
71 | + array ( |
|
72 | + 0 => |
|
73 | + array ( |
|
74 | + 'name' => 'graphs_per_row', |
|
75 | + 'label' => 'LBL_GRAPHS_PER_ROW', |
|
76 | + ), |
|
77 | + 1 => '', |
|
78 | + ), |
|
79 | 79 | // 2 => |
80 | 80 | // array ( |
81 | 81 | // 0 => 'description', |
82 | 82 | // ), |
83 | - ), |
|
83 | + ), |
|
84 | + ), |
|
84 | 85 | ), |
85 | - ), |
|
86 | 86 | ); |
87 | 87 | ?> |
@@ -1,5 +1,5 @@ discard block |
||
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 |
||
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 | ?> |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /** |
4 | 6 | * Advanced OpenReports, SugarCRM Reporting. |
5 | 7 | * @package Advanced OpenReports for SugarCRM |
@@ -24,14 +24,14 @@ |
||
24 | 24 | */ |
25 | 25 | |
26 | 26 | $popupMeta = array('moduleMain' => 'AOR_Reports', |
27 | - 'varName' => 'AOR_Report', |
|
28 | - 'orderBy' => 'aor_reports.name', |
|
29 | - 'whereClauses' => |
|
30 | - array('name' => 'aor_reports.name', |
|
31 | - ), |
|
32 | - 'searchInputs'=> array('aor_reports_number', 'name', 'priority','status'), |
|
27 | + 'varName' => 'AOR_Report', |
|
28 | + 'orderBy' => 'aor_reports.name', |
|
29 | + 'whereClauses' => |
|
30 | + array('name' => 'aor_reports.name', |
|
31 | + ), |
|
32 | + 'searchInputs'=> array('aor_reports_number', 'name', 'priority','status'), |
|
33 | 33 | |
34 | - ); |
|
34 | + ); |
|
35 | 35 | ?> |
36 | 36 | |
37 | 37 |
@@ -24,18 +24,18 @@ |
||
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'), |
|
30 | - 'assigned_user_id'=> array('query_type'=>'default'), |
|
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 | + 'assigned_user_id'=> array('query_type'=>'default'), |
|
31 | 31 | |
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), |
|
39 | - //Range Search Support |
|
40 | - ); |
|
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), |
|
39 | + //Range Search Support |
|
40 | + ); |
|
41 | 41 | ?> |
@@ -1,5 +1,5 @@ discard block |
||
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 |
||
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 | ?> |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /** |
4 | 6 | * Advanced OpenReports, SugarCRM Reporting. |
5 | 7 | * @package Advanced OpenReports for SugarCRM |
@@ -1,5 +1,5 @@ |
||
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,36 +25,36 @@ |
||
25 | 25 | |
26 | 26 | |
27 | 27 | $subpanel_layout = array( |
28 | - 'top_buttons' => array( |
|
29 | - array('widget_class' => 'SubPanelTopCreateButton'), |
|
30 | - array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'AOR_Reports'), |
|
31 | - ), |
|
28 | + 'top_buttons' => array( |
|
29 | + array('widget_class' => 'SubPanelTopCreateButton'), |
|
30 | + array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'AOR_Reports'), |
|
31 | + ), |
|
32 | 32 | |
33 | - 'where' => '', |
|
33 | + 'where' => '', |
|
34 | 34 | |
35 | - 'list_fields' => array( |
|
36 | - 'name'=>array( |
|
37 | - 'vname' => 'LBL_NAME', |
|
38 | - 'widget_class' => 'SubPanelDetailViewLink', |
|
39 | - 'width' => '45%', |
|
40 | - ), |
|
41 | - 'date_modified'=>array( |
|
42 | - 'vname' => 'LBL_DATE_MODIFIED', |
|
43 | - 'width' => '45%', |
|
44 | - ), |
|
45 | - 'edit_button'=>array( |
|
35 | + 'list_fields' => array( |
|
36 | + 'name'=>array( |
|
37 | + 'vname' => 'LBL_NAME', |
|
38 | + 'widget_class' => 'SubPanelDetailViewLink', |
|
39 | + 'width' => '45%', |
|
40 | + ), |
|
41 | + 'date_modified'=>array( |
|
42 | + 'vname' => 'LBL_DATE_MODIFIED', |
|
43 | + 'width' => '45%', |
|
44 | + ), |
|
45 | + 'edit_button'=>array( |
|
46 | 46 | 'vname' => 'LBL_EDIT_BUTTON', |
47 | - 'widget_class' => 'SubPanelEditButton', |
|
48 | - 'module' => 'AOR_Reports', |
|
49 | - 'width' => '4%', |
|
50 | - ), |
|
51 | - 'remove_button'=>array( |
|
47 | + 'widget_class' => 'SubPanelEditButton', |
|
48 | + 'module' => 'AOR_Reports', |
|
49 | + 'width' => '4%', |
|
50 | + ), |
|
51 | + 'remove_button'=>array( |
|
52 | 52 | 'vname' => 'LBL_REMOVE', |
53 | - 'widget_class' => 'SubPanelRemoveButton', |
|
54 | - 'module' => 'AOR_Reports', |
|
55 | - 'width' => '5%', |
|
56 | - ), |
|
57 | - ), |
|
53 | + 'widget_class' => 'SubPanelRemoveButton', |
|
54 | + 'module' => 'AOR_Reports', |
|
55 | + 'width' => '5%', |
|
56 | + ), |
|
57 | + ), |
|
58 | 58 | ); |
59 | 59 | |
60 | 60 | ?> |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); |
|
2 | +if(!defined('sugarEntry') || !sugarEntry) { |
|
3 | + die('Not A Valid Entry Point'); |
|
4 | +} |
|
3 | 5 | /** |
4 | 6 | * Advanced OpenReports, SugarCRM Reporting. |
5 | 7 | * @package Advanced OpenReports for SugarCRM |