@@ -1,5 +1,7 @@ discard block |
||
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. |
@@ -97,8 +99,7 @@ discard block |
||
97 | 99 | $personTypeList.="<option value='".$count."'>".$b->name."</option>"; |
98 | 100 | $count++; |
99 | 101 | } |
100 | -} |
|
101 | -else |
|
102 | +} else |
|
102 | 103 | { |
103 | 104 | $personTypeList.="<option value='noPerson'>No matching types</option>"; |
104 | 105 | } |
@@ -133,8 +134,12 @@ discard block |
||
133 | 134 | |
134 | 135 | $xtpl->assign("WEB_POST_URL",$web_post_url); |
135 | 136 | |
136 | -if (empty($focus->assigned_user_id) && empty($focus->id)) $focus->assigned_user_id = $current_user->id; |
|
137 | -if (empty($focus->assigned_name) && empty($focus->id)) $focus->assigned_user_name = $current_user->user_name; |
|
137 | +if (empty($focus->assigned_user_id) && empty($focus->id)) { |
|
138 | + $focus->assigned_user_id = $current_user->id; |
|
139 | +} |
|
140 | +if (empty($focus->assigned_name) && empty($focus->id)) { |
|
141 | + $focus->assigned_user_name = $current_user->user_name; |
|
142 | +} |
|
138 | 143 | $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name); |
139 | 144 | $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id ); |
140 | 145 | |
@@ -197,8 +202,7 @@ discard block |
||
197 | 202 | $col_arr[0]=$cols_name; |
198 | 203 | $col_arr[1]=$field_def['name']; |
199 | 204 | $col_arr[2]=true; |
200 | - } |
|
201 | - else{ |
|
205 | + } else{ |
|
202 | 206 | $cols_name=$field_def['vname']; |
203 | 207 | $col_arr[0]=$cols_name; |
204 | 208 | $col_arr[1]=$field_def['name']; |
@@ -232,8 +236,9 @@ discard block |
||
232 | 236 | foreach($GLOBALS['moduleList'] as $mod) |
233 | 237 | { |
234 | 238 | $item = BeanFactory::getBean($mod); |
235 | - if($item && is_subclass_of($item,$superclass)) |
|
236 | - $subclasses[] = $item; |
|
239 | + if($item && is_subclass_of($item,$superclass)) { |
|
240 | + $subclasses[] = $item; |
|
241 | + } |
|
237 | 242 | } |
238 | 243 | return $subclasses; |
239 | 244 | } |
@@ -1,5 +1,7 @@ discard block |
||
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. |
@@ -89,7 +91,9 @@ discard block |
||
89 | 91 | $out = "<select name=\"$name\">"; |
90 | 92 | foreach($options as $key => $value) { |
91 | 93 | $selected = ''; |
92 | - if($key==$default) $selected = ' selected="selected"'; |
|
94 | + if($key==$default) { |
|
95 | + $selected = ' selected="selected"'; |
|
96 | + } |
|
93 | 97 | $out .= "<option label=\"$value\" value=\"$key\"$selected>$value</option>"; |
94 | 98 | } |
95 | 99 | $out .= "</select>"; |
@@ -275,8 +279,7 @@ discard block |
||
275 | 279 | if(!empty($value)) { |
276 | 280 | if(!empty($value['required'])) { |
277 | 281 | $form .= "<span class=\"required\">*</span>"; |
278 | - } |
|
279 | - else { |
|
282 | + } else { |
|
280 | 283 | } |
281 | 284 | if(!empty($_SESSION[$name])) { |
282 | 285 | $sessval = $_SESSION[$name]; |
@@ -295,7 +298,7 @@ discard block |
||
295 | 298 | //if the type is password, set a hidden field to capture the value. This is so that we can properly encode special characters, which is a limitation with password fields |
296 | 299 | if($type=='password'){ |
297 | 300 | $form .= "</div><div class=\"install_block\"><label>{$mod_strings['LBL_DBCONF_TITLE_PSWD_INFO_LABEL']}</label><span> </span><input type='$type' name='{$name}_entry' id='{$name}_entry' value='".urldecode($sessval)."'><input type='hidden' name='$name' id='$name' value='".urldecode($sessval)."'></div><div class=\"install_block\">"; |
298 | - }else{ |
|
301 | + } else{ |
|
299 | 302 | $form .= "<input type='$type' name='$name' id='$name' value='$sessval'>"; |
300 | 303 | } |
301 | 304 | |
@@ -590,7 +593,9 @@ discard block |
||
590 | 593 | $notify_allow_default_outbound_checked = empty($_SESSION['notify_allow_default_outbound']) ? '' : ' checked="checked" '; |
591 | 594 | |
592 | 595 | // set default smtp toggle buttons selected value |
593 | - if(empty($_SESSION['smtp_tab_selected'])) $_SESSION['smtp_tab_selected'] = 'smtp_tab_other'; |
|
596 | + if(empty($_SESSION['smtp_tab_selected'])) { |
|
597 | + $_SESSION['smtp_tab_selected'] = 'smtp_tab_other'; |
|
598 | + } |
|
594 | 599 | |
595 | 600 | $out .= <<<EOQ |
596 | 601 | <div class="floatbox full" id="fb2"> |
@@ -1803,28 +1808,37 @@ discard block |
||
1803 | 1808 | |
1804 | 1809 | |
1805 | 1810 | if( is_file("config.php") ){ |
1806 | - if(!empty($sugar_config['default_theme'])) |
|
1807 | - $_SESSION['site_default_theme'] = $sugar_config['default_theme']; |
|
1811 | + if(!empty($sugar_config['default_theme'])) { |
|
1812 | + $_SESSION['site_default_theme'] = $sugar_config['default_theme']; |
|
1813 | + } |
|
1808 | 1814 | |
1809 | - if(!empty($sugar_config['disable_persistent_connections'])) |
|
1810 | - $_SESSION['disable_persistent_connections'] = |
|
1815 | + if(!empty($sugar_config['disable_persistent_connections'])) { |
|
1816 | + $_SESSION['disable_persistent_connections'] = |
|
1811 | 1817 | $sugar_config['disable_persistent_connections']; |
1812 | - if(!empty($sugar_config['default_language'])) |
|
1813 | - $_SESSION['default_language'] = $sugar_config['default_language']; |
|
1814 | - if(!empty($sugar_config['translation_string_prefix'])) |
|
1815 | - $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix']; |
|
1816 | - if(!empty($sugar_config['default_charset'])) |
|
1817 | - $_SESSION['default_charset'] = $sugar_config['default_charset']; |
|
1818 | - |
|
1819 | - if(!empty($sugar_config['default_currency_name'])) |
|
1820 | - $_SESSION['default_currency_name'] = $sugar_config['default_currency_name']; |
|
1821 | - if(!empty($sugar_config['default_currency_symbol'])) |
|
1822 | - $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol']; |
|
1823 | - if(!empty($sugar_config['default_currency_iso4217'])) |
|
1824 | - $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217']; |
|
1825 | - |
|
1826 | - if(!empty($sugar_config['rss_cache_time'])) |
|
1827 | - $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time']; |
|
1818 | + } |
|
1819 | + if(!empty($sugar_config['default_language'])) { |
|
1820 | + $_SESSION['default_language'] = $sugar_config['default_language']; |
|
1821 | + } |
|
1822 | + if(!empty($sugar_config['translation_string_prefix'])) { |
|
1823 | + $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix']; |
|
1824 | + } |
|
1825 | + if(!empty($sugar_config['default_charset'])) { |
|
1826 | + $_SESSION['default_charset'] = $sugar_config['default_charset']; |
|
1827 | + } |
|
1828 | + |
|
1829 | + if(!empty($sugar_config['default_currency_name'])) { |
|
1830 | + $_SESSION['default_currency_name'] = $sugar_config['default_currency_name']; |
|
1831 | + } |
|
1832 | + if(!empty($sugar_config['default_currency_symbol'])) { |
|
1833 | + $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol']; |
|
1834 | + } |
|
1835 | + if(!empty($sugar_config['default_currency_iso4217'])) { |
|
1836 | + $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217']; |
|
1837 | + } |
|
1838 | + |
|
1839 | + if(!empty($sugar_config['rss_cache_time'])) { |
|
1840 | + $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time']; |
|
1841 | + } |
|
1828 | 1842 | if(!empty($sugar_config['languages'])) |
1829 | 1843 | { |
1830 | 1844 | // We need to encode the languages in a way that can be retrieved later. |
@@ -1844,8 +1858,9 @@ discard block |
||
1844 | 1858 | |
1845 | 1859 | //Load in the array for the site scenarios |
1846 | 1860 | require_once('install/suite_install/scenarios.php'); |
1847 | -if(isset($installation_scenarios)) |
|
1861 | +if(isset($installation_scenarios)) { |
|
1848 | 1862 | $_SESSION['installation_scenarios'] = $installation_scenarios; |
1863 | +} |
|
1849 | 1864 | |
1850 | 1865 | //// errors |
1851 | 1866 | $errors = ''; |
@@ -176,8 +176,7 @@ discard block |
||
176 | 176 | $jsonConfig['exclusions'][$newKey] = $jsonConfig['exclusions'][$key]; |
177 | 177 | unset($jsonConfig['exclusions'][$key]); |
178 | 178 | } |
179 | - } |
|
180 | - elseif(isset($jsonConfig['exclusions']) && count($jsonConfig['exclusions']) == 0) |
|
179 | + } elseif(isset($jsonConfig['exclusions']) && count($jsonConfig['exclusions']) == 0) |
|
181 | 180 | { |
182 | 181 | $jsonConfig['exclusions'] = new stdClass(); |
183 | 182 | } |
@@ -188,8 +187,7 @@ discard block |
||
188 | 187 | $jsonConfig['inclusions'][$newKey] = $jsonConfig['inclusions'][$key]; |
189 | 188 | unset($jsonConfig['inclusions'][$key]); |
190 | 189 | } |
191 | - } |
|
192 | - elseif(isset($jsonConfig['inclusions']) && count($jsonConfig['inclusions']) == 0) |
|
190 | + } elseif(isset($jsonConfig['inclusions']) && count($jsonConfig['inclusions']) == 0) |
|
193 | 191 | { |
194 | 192 | $jsonConfig['inclusions'] = new stdClass(); |
195 | 193 | } |
@@ -200,8 +198,7 @@ discard block |
||
200 | 198 | $jsonConfig['inclusionsInfo'][$newKey] = $jsonConfig['inclusionsInfo'][$key]; |
201 | 199 | unset($jsonConfig['inclusionsInfo'][$key]); |
202 | 200 | } |
203 | - } |
|
204 | - elseif(isset($jsonConfig['inclusionsInfo']) && count($jsonConfig['inclusionsInfo']) == 0) |
|
201 | + } elseif(isset($jsonConfig['inclusionsInfo']) && count($jsonConfig['inclusionsInfo']) == 0) |
|
205 | 202 | { |
206 | 203 | $jsonConfig['inclusionsInfo'] = new stdClass(); |
207 | 204 | } |
@@ -44,7 +44,13 @@ |
||
44 | 44 | |
45 | 45 | global $mod_strings, $app_strings, $sugar_config; |
46 | 46 | |
47 | - if(ACLController::checkAccess('jjwg_Markers', 'edit', true))$module_menu[]=Array("index.php?module=jjwg_Markers&action=EditView", $mod_strings['LNK_NEW_RECORD'],"Create", 'jjwg_Markers'); |
|
48 | - if(ACLController::checkAccess('jjwg_Markers', 'list', true))$module_menu[]=Array("index.php?module=jjwg_Markers&action=index", $mod_strings['LNK_LIST'],"List", 'jjwg_Markers'); |
|
49 | - if(ACLController::checkAccess('jjwg_Markers', 'import', true))$module_menu[]=Array("index.php?module=jjwg_Markers&action=index", $mod_strings['LNK_IMPORT_JJWG_MARKERS'],"Import", 'jjwg_Markers'); |
|
47 | + if(ACLController::checkAccess('jjwg_Markers', 'edit', true)) { |
|
48 | + $module_menu[]=Array("index.php?module=jjwg_Markers&action=EditView", $mod_strings['LNK_NEW_RECORD'],"Create", 'jjwg_Markers'); |
|
49 | + } |
|
50 | + if(ACLController::checkAccess('jjwg_Markers', 'list', true)) { |
|
51 | + $module_menu[]=Array("index.php?module=jjwg_Markers&action=index", $mod_strings['LNK_LIST'],"List", 'jjwg_Markers'); |
|
52 | + } |
|
53 | + if(ACLController::checkAccess('jjwg_Markers', 'import', true)) { |
|
54 | + $module_menu[]=Array("index.php?module=jjwg_Markers&action=index", $mod_strings['LNK_IMPORT_JJWG_MARKERS'],"Import", 'jjwg_Markers'); |
|
55 | + } |
|
50 | 56 |
@@ -1,6 +1,14 @@ |
||
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 | -if(ACLController::checkAccess('jjwg_Areas', 'edit', true)) $module_menu[]=Array("index.php?module=jjwg_Areas&action=EditView&return_module=jjwg_Areas&return_action=index", $GLOBALS['mod_strings']['LNK_NEW_RECORD'], "Create", 'jjwg_Areas'); |
|
5 | -if(ACLController::checkAccess('jjwg_Areas', 'list', true)) $module_menu[]=Array("index.php?module=jjwg_Areas&action=index&return_module=jjwg_Areas&return_action=DetailView", $GLOBALS['mod_strings']['LNK_LIST'], "List", 'jjwg_Areas'); |
|
6 | -if(ACLController::checkAccess('jjwg_Areas', 'import', true))$module_menu[]=Array("index.php?module=jjwg_Areas&action=Step1&import_module=jjwg_Areas&return_module=jjwg_Areas&return_action=index", $GLOBALS['app_strings']['LBL_IMPORT'],"Import", 'jjwg_Areas'); |
|
6 | +if(ACLController::checkAccess('jjwg_Areas', 'edit', true)) { |
|
7 | + $module_menu[]=Array("index.php?module=jjwg_Areas&action=EditView&return_module=jjwg_Areas&return_action=index", $GLOBALS['mod_strings']['LNK_NEW_RECORD'], "Create", 'jjwg_Areas'); |
|
8 | +} |
|
9 | +if(ACLController::checkAccess('jjwg_Areas', 'list', true)) { |
|
10 | + $module_menu[]=Array("index.php?module=jjwg_Areas&action=index&return_module=jjwg_Areas&return_action=DetailView", $GLOBALS['mod_strings']['LNK_LIST'], "List", 'jjwg_Areas'); |
|
11 | +} |
|
12 | +if(ACLController::checkAccess('jjwg_Areas', 'import', true)) { |
|
13 | + $module_menu[]=Array("index.php?module=jjwg_Areas&action=Step1&import_module=jjwg_Areas&return_module=jjwg_Areas&return_action=index", $GLOBALS['app_strings']['LBL_IMPORT'],"Import", 'jjwg_Areas'); |
|
14 | +} |
@@ -44,7 +44,11 @@ |
||
44 | 44 | |
45 | 45 | global $mod_strings, $app_strings, $sugar_config; |
46 | 46 | |
47 | -if(ACLController::checkAccess('Spots', 'edit', true))$module_menu[]=Array("index.php?module=Spots&action=EditView", $mod_strings['LNK_SPOT_CREATE'],"Create", 'Spots'); |
|
48 | -if(ACLController::checkAccess('Spots', 'list', true))$module_menu[]=Array("index.php?module=Spots&action=index", $mod_strings['LNK_SPOT_LIST'],"List", 'Spots'); |
|
47 | +if(ACLController::checkAccess('Spots', 'edit', true)) { |
|
48 | + $module_menu[]=Array("index.php?module=Spots&action=EditView", $mod_strings['LNK_SPOT_CREATE'],"Create", 'Spots'); |
|
49 | +} |
|
50 | +if(ACLController::checkAccess('Spots', 'list', true)) { |
|
51 | + $module_menu[]=Array("index.php?module=Spots&action=index", $mod_strings['LNK_SPOT_LIST'],"List", 'Spots'); |
|
52 | +} |
|
49 | 53 | |
50 | 54 | ; |
@@ -44,6 +44,10 @@ |
||
44 | 44 | |
45 | 45 | global $mod_strings, $app_strings, $sugar_config; |
46 | 46 | |
47 | - if(ACLController::checkAccess('AOK_KnowledgeBase', 'edit', true))$module_menu[]=Array("index.php?module=AOK_KnowledgeBase&action=EditView", $mod_strings['LNK_NEW_RECORD'],"Create", 'AOK_KnowledgeBase'); |
|
48 | - if(ACLController::checkAccess('AOK_KnowledgeBase', 'list', true))$module_menu[]=Array("index.php?module=AOK_KnowledgeBase&action=index", $mod_strings['LNK_LIST'],"List", 'AOK_KnowledgeBase'); |
|
47 | + if(ACLController::checkAccess('AOK_KnowledgeBase', 'edit', true)) { |
|
48 | + $module_menu[]=Array("index.php?module=AOK_KnowledgeBase&action=EditView", $mod_strings['LNK_NEW_RECORD'],"Create", 'AOK_KnowledgeBase'); |
|
49 | + } |
|
50 | + if(ACLController::checkAccess('AOK_KnowledgeBase', 'list', true)) { |
|
51 | + $module_menu[]=Array("index.php?module=AOK_KnowledgeBase&action=index", $mod_strings['LNK_LIST'],"List", 'AOK_KnowledgeBase'); |
|
52 | + } |
|
49 | 53 |
@@ -1,5 +1,7 @@ discard block |
||
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 | * |
5 | 7 | * SugarCRM Community Edition is a customer relationship management program developed by |
@@ -50,7 +52,13 @@ discard block |
||
50 | 52 | global $mod_strings, $app_strings, $sugar_config; |
51 | 53 | |
52 | 54 | |
53 | -if(ACLController::checkAccess('AM_ProjectTemplates', 'edit', true))$module_menu[]=Array("index.php?module=AM_ProjectTemplates&action=EditView&return_module=AM_ProjectTemplates&return_action=index", $mod_strings['LNK_NEW_RECORD'],"Create", 'AM_ProjectTemplates'); |
|
54 | -if(ACLController::checkAccess('AM_ProjectTemplates', 'list', true))$module_menu[]=Array("index.php?module=AM_ProjectTemplates&action=index&return_module=AM_ProjectTemplates&return_action=DetailView", $mod_strings['LNK_LIST'],"List", 'AM_ProjectTemplates'); |
|
55 | -if(ACLController::checkAccess('AM_ProjectTemplates', 'import', true))$module_menu[]=Array("index.php?module=Import&action=Step1&import_module=AM_ProjectTemplates&return_module=AM_ProjectTemplates&return_action=index", $mod_strings['LNK_IMPORT_AM_PROJECTTEMPLATES'],"Import", 'AM_ProjectTemplates'); |
|
55 | +if(ACLController::checkAccess('AM_ProjectTemplates', 'edit', true)) { |
|
56 | + $module_menu[]=Array("index.php?module=AM_ProjectTemplates&action=EditView&return_module=AM_ProjectTemplates&return_action=index", $mod_strings['LNK_NEW_RECORD'],"Create", 'AM_ProjectTemplates'); |
|
57 | +} |
|
58 | +if(ACLController::checkAccess('AM_ProjectTemplates', 'list', true)) { |
|
59 | + $module_menu[]=Array("index.php?module=AM_ProjectTemplates&action=index&return_module=AM_ProjectTemplates&return_action=DetailView", $mod_strings['LNK_LIST'],"List", 'AM_ProjectTemplates'); |
|
60 | +} |
|
61 | +if(ACLController::checkAccess('AM_ProjectTemplates', 'import', true)) { |
|
62 | + $module_menu[]=Array("index.php?module=Import&action=Step1&import_module=AM_ProjectTemplates&return_module=AM_ProjectTemplates&return_action=index", $mod_strings['LNK_IMPORT_AM_PROJECTTEMPLATES'],"Import", 'AM_ProjectTemplates'); |
|
63 | +} |
|
56 | 64 | ?> |
57 | 65 | \ No newline at end of file |
@@ -51,8 +51,7 @@ discard block |
||
51 | 51 | $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code'; |
52 | 52 | if(isset($GLOBALS['log'])) { |
53 | 53 | $GLOBALS['log']->deprecated($deprecatedMessage); |
54 | - } |
|
55 | - else { |
|
54 | + } else { |
|
56 | 55 | trigger_error($deprecatedMessage, E_USER_DEPRECATED); |
57 | 56 | } |
58 | 57 | self::__construct(); |
@@ -68,7 +67,7 @@ discard block |
||
68 | 67 | ){ |
69 | 68 | parent::save(true) ; |
70 | 69 | $return_id = $focus->id; |
71 | - }else{ |
|
70 | + } else{ |
|
72 | 71 | |
73 | 72 | if(!empty($_POST['user_invitees'])) { |
74 | 73 | $userInvitees = explode(',', trim($_POST['user_invitees'], ',')); |
@@ -125,7 +124,7 @@ discard block |
||
125 | 124 | foreach($contacts as $a) { |
126 | 125 | if(!in_array($a->id, $contactInvitees)) { |
127 | 126 | $deleteContacts[$a->id] = $a->id; |
128 | - } else { |
|
127 | + } else { |
|
129 | 128 | $existingContacts[$a->id] = $a->id; |
130 | 129 | } |
131 | 130 | } |