@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
4 | 4 | } |
5 | 5 | if (!$modx->hasPermission('logs')) { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
29 | 29 | foreach ($logs_user as $row) { |
30 | 30 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
31 | - echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
|
31 | + echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n"; |
|
32 | 32 | } |
33 | 33 | ?> |
34 | 34 | </select> |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | continue; |
50 | 50 | } |
51 | 51 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
52 | - echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n"; |
|
52 | + echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n"; |
|
53 | 53 | } |
54 | 54 | ?> |
55 | 55 | </select> |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
66 | 66 | foreach ($logs_items as $row) { |
67 | 67 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
68 | - echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
|
68 | + echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n"; |
|
69 | 69 | } |
70 | 70 | ?> |
71 | 71 | </select> |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
82 | 82 | foreach ($logs_names as $row) { |
83 | 83 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
84 | - echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
|
84 | + echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n"; |
|
85 | 85 | } |
86 | 86 | ?> |
87 | 87 | </select> |
@@ -139,26 +139,26 @@ discard block |
||
139 | 139 | // get the selections the user made. |
140 | 140 | $sqladd = array(); |
141 | 141 | if ($_REQUEST['searchuser'] != 0) { |
142 | - $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'"; |
|
142 | + $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'"; |
|
143 | 143 | } |
144 | 144 | if ($_REQUEST['action'] != 0) { |
145 | - $sqladd[] = "action=" . (int)$_REQUEST['action']; |
|
145 | + $sqladd[] = "action=".(int) $_REQUEST['action']; |
|
146 | 146 | } |
147 | 147 | if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
148 | - $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
|
148 | + $sqladd[] = "itemid='".$_REQUEST['itemid']."'"; |
|
149 | 149 | } |
150 | 150 | if ($_REQUEST['itemname'] != '0') { |
151 | - $sqladd[] = "itemname='" . $modx->getDatabase()->escape($_REQUEST['itemname']) . "'"; |
|
151 | + $sqladd[] = "itemname='".$modx->getDatabase()->escape($_REQUEST['itemname'])."'"; |
|
152 | 152 | } |
153 | 153 | if ($_REQUEST['message'] != "") { |
154 | - $sqladd[] = "message LIKE '%" . $modx->getDatabase()->escape($_REQUEST['message']) . "%'"; |
|
154 | + $sqladd[] = "message LIKE '%".$modx->getDatabase()->escape($_REQUEST['message'])."%'"; |
|
155 | 155 | } |
156 | 156 | // date stuff |
157 | 157 | if ($_REQUEST['datefrom'] != "") { |
158 | - $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
|
158 | + $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']); |
|
159 | 159 | } |
160 | 160 | if ($_REQUEST['dateto'] != "") { |
161 | - $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
|
161 | + $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | // If current position is not set, set it to zero |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
172 | 172 | $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs; |
173 | 173 | |
174 | - $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
174 | + $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
175 | 175 | |
176 | 176 | // build the sql |
177 | 177 | $limit = $num_rows = $modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''))); |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}"); |
180 | 180 | |
181 | 181 | if ($limit < 1) { |
182 | - echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
|
182 | + echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>'; |
|
183 | 183 | } else { |
184 | - echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
|
184 | + echo '<p>'.$_lang["mgrlog_sortinst"].'</p>'; |
|
185 | 185 | |
186 | 186 | // New instance of the Paging class, you can modify the color and the width of the html table |
187 | 187 | $p = new EvolutionCMS\Support\Paginate($num_rows, $int_cur_position, $int_num_result, $extargv); |
@@ -192,11 +192,11 @@ discard block |
||
192 | 192 | $current_row = $int_cur_position / $int_num_result; |
193 | 193 | |
194 | 194 | // Display the result as you like... |
195 | - print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower']; |
|
196 | - print " " . $_lang["paging_to"] . " " . $array_paging['upper']; |
|
197 | - print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />"; |
|
198 | - $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
|
199 | - $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
195 | + print "<p>".$_lang["paging_showing"]." ".$array_paging['lower']; |
|
196 | + print " ".$_lang["paging_to"]." ".$array_paging['upper']; |
|
197 | + print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />"; |
|
198 | + $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " "); |
|
199 | + $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
200 | 200 | $pagesfound = sizeof($array_row_paging); |
201 | 201 | if ($pagesfound > 6) { |
202 | 202 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
@@ -206,11 +206,11 @@ discard block |
||
206 | 206 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
207 | 207 | } else { |
208 | 208 | for ($i = 0; $i < $pagesfound; $i++) { |
209 | - $paging .= $array_row_paging[$i] . " "; |
|
209 | + $paging .= $array_row_paging[$i]." "; |
|
210 | 210 | } |
211 | 211 | } |
212 | - $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " "; |
|
213 | - $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " "; |
|
212 | + $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." "; |
|
213 | + $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." "; |
|
214 | 214 | // The above exemple print somethings like: |
215 | 215 | // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> |
216 | 216 | // Of course you can now play with array_row_paging in order to print |
@@ -246,16 +246,16 @@ discard block |
||
246 | 246 | if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
247 | 247 | $item = '<div style="text-align:center;">-</div>'; |
248 | 248 | } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
249 | - $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
|
249 | + $item = '<a href="index.php?a=3&id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>'; |
|
250 | 250 | } else { |
251 | 251 | $item = $logentry['itemname']; |
252 | 252 | } |
253 | 253 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
254 | - $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true'; |
|
254 | + $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true'; |
|
255 | 255 | ?> |
256 | 256 | <tr> |
257 | - <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td> |
|
258 | - <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td> |
|
257 | + <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td> |
|
258 | + <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td> |
|
259 | 259 | <td class="text-xs-right"><?= $logentry['itemid'] ?></td> |
260 | 260 | <td><?= $item ?></td> |
261 | 261 | <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td> |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
4 | 4 | } |
5 | -if (!$modx->hasPermission('logs')) { |
|
5 | +if (!$modx->hasPermission('logs')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | <?php |
27 | 27 | // get all users currently in the log |
28 | 28 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
29 | - foreach ($logs_user as $row) { |
|
29 | + foreach ($logs_user as $row) { |
|
30 | 30 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
31 | 31 | echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
32 | 32 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | // get all available actions in the log |
44 | 44 | include_once "actionlist.inc.php"; |
45 | 45 | $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action'); |
46 | - foreach ($logs_actions as $row) { |
|
46 | + foreach ($logs_actions as $row) { |
|
47 | 47 | $action = getAction($row['action']); |
48 | - if ($action == 'Idle') { |
|
48 | + if ($action == 'Idle') { |
|
49 | 49 | continue; |
50 | 50 | } |
51 | 51 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | <?php |
64 | 64 | // get all itemid currently in logging |
65 | 65 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
66 | - foreach ($logs_items as $row) { |
|
66 | + foreach ($logs_items as $row) { |
|
67 | 67 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
68 | 68 | echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
69 | 69 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | <?php |
80 | 80 | // get all itemname currently in logging |
81 | 81 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
82 | - foreach ($logs_names as $row) { |
|
82 | + foreach ($logs_names as $row) { |
|
83 | 83 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
84 | 84 | echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
85 | 85 | } |
@@ -135,36 +135,36 @@ discard block |
||
135 | 135 | <div class="container container-body"> |
136 | 136 | |
137 | 137 | <?php |
138 | -if (isset($_REQUEST['log_submit'])) { |
|
138 | +if (isset($_REQUEST['log_submit'])) { |
|
139 | 139 | // get the selections the user made. |
140 | 140 | $sqladd = array(); |
141 | - if ($_REQUEST['searchuser'] != 0) { |
|
141 | + if ($_REQUEST['searchuser'] != 0) { |
|
142 | 142 | $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'"; |
143 | 143 | } |
144 | - if ($_REQUEST['action'] != 0) { |
|
144 | + if ($_REQUEST['action'] != 0) { |
|
145 | 145 | $sqladd[] = "action=" . (int)$_REQUEST['action']; |
146 | 146 | } |
147 | - if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
147 | + if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
148 | 148 | $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
149 | 149 | } |
150 | - if ($_REQUEST['itemname'] != '0') { |
|
150 | + if ($_REQUEST['itemname'] != '0') { |
|
151 | 151 | $sqladd[] = "itemname='" . $modx->getDatabase()->escape($_REQUEST['itemname']) . "'"; |
152 | 152 | } |
153 | - if ($_REQUEST['message'] != "") { |
|
153 | + if ($_REQUEST['message'] != "") { |
|
154 | 154 | $sqladd[] = "message LIKE '%" . $modx->getDatabase()->escape($_REQUEST['message']) . "%'"; |
155 | 155 | } |
156 | 156 | // date stuff |
157 | - if ($_REQUEST['datefrom'] != "") { |
|
157 | + if ($_REQUEST['datefrom'] != "") { |
|
158 | 158 | $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
159 | 159 | } |
160 | - if ($_REQUEST['dateto'] != "") { |
|
160 | + if ($_REQUEST['dateto'] != "") { |
|
161 | 161 | $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
162 | 162 | } |
163 | 163 | |
164 | 164 | // If current position is not set, set it to zero |
165 | - if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
165 | + if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
166 | 166 | $int_cur_position = 0; |
167 | - } else { |
|
167 | + } else { |
|
168 | 168 | $int_cur_position = $_REQUEST['int_cur_position']; |
169 | 169 | } |
170 | 170 | |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | |
179 | 179 | $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}"); |
180 | 180 | |
181 | -if ($limit < 1) { |
|
181 | +if ($limit < 1) { |
|
182 | 182 | echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
183 | -} else { |
|
183 | +} else { |
|
184 | 184 | echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
185 | 185 | |
186 | 186 | // New instance of the Paging class, you can modify the color and the width of the html table |
@@ -198,14 +198,14 @@ discard block |
||
198 | 198 | $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
199 | 199 | $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
200 | 200 | $pagesfound = sizeof($array_row_paging); |
201 | - if ($pagesfound > 6) { |
|
201 | + if ($pagesfound > 6) { |
|
202 | 202 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
203 | 203 | $paging .= $array_row_paging[$current_row - 1]; // ." "; |
204 | 204 | $paging .= $array_row_paging[$current_row]; // ." "; |
205 | 205 | $paging .= $array_row_paging[$current_row + 1]; // ." "; |
206 | 206 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
207 | - } else { |
|
208 | - for ($i = 0; $i < $pagesfound; $i++) { |
|
207 | + } else { |
|
208 | + for ($i = 0; $i < $pagesfound; $i++) { |
|
209 | 209 | $paging .= $array_row_paging[$i] . " "; |
210 | 210 | } |
211 | 211 | } |
@@ -242,12 +242,12 @@ discard block |
||
242 | 242 | // grab the entire log file... |
243 | 243 | $logentries = array(); |
244 | 244 | $i = 0; |
245 | - while ($logentry = $modx->getDatabase()->getRow($rs)) { |
|
246 | - if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
245 | + while ($logentry = $modx->getDatabase()->getRow($rs)) { |
|
246 | + if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
247 | 247 | $item = '<div style="text-align:center;">-</div>'; |
248 | - } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
248 | + } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
249 | 249 | $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
250 | - } else { |
|
250 | + } else { |
|
251 | 251 | $item = $logentry['itemname']; |
252 | 252 | } |
253 | 253 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
@@ -284,6 +284,6 @@ discard block |
||
284 | 284 | // @see index.php @ 915 |
285 | 285 | global $action; |
286 | 286 | $action = 1; |
287 | -} else { |
|
287 | +} else { |
|
288 | 288 | echo $_lang["mgrlog_noquery"]; |
289 | 289 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
4 | 4 | } |
5 | 5 | if (!$modx->hasPermission('save_plugin')) { |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | $updateMsg = ''; |
12 | 12 | |
13 | 13 | if (isset($_POST['listSubmitted'])) { |
14 | - $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>'; |
|
14 | + $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>'; |
|
15 | 15 | $tbl = $modx->getDatabase()->getFullTableName('site_plugin_events'); |
16 | 16 | |
17 | 17 | foreach ($_POST as $listName => $listValue) { |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | $modx->clearCache('full'); |
35 | 35 | } |
36 | 36 | |
37 | -$rs = $modx->getDatabase()->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getDatabase()->getFullTableName('system_eventnames') . " sysevt |
|
38 | - INNER JOIN " . $modx->getDatabase()->getFullTableName('site_plugin_events') . " pe ON pe.evtid = sysevt.id |
|
39 | - INNER JOIN " . $modx->getDatabase()->getFullTableName('site_plugins') . " plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority'); |
|
37 | +$rs = $modx->getDatabase()->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getDatabase()->getFullTableName('system_eventnames')." sysevt |
|
38 | + INNER JOIN " . $modx->getDatabase()->getFullTableName('site_plugin_events')." pe ON pe.evtid = sysevt.id |
|
39 | + INNER JOIN " . $modx->getDatabase()->getFullTableName('site_plugins')." plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority'); |
|
40 | 40 | |
41 | 41 | $insideUl = 0; |
42 | 42 | $preEvt = ''; |
@@ -47,17 +47,17 @@ discard block |
||
47 | 47 | if ($preEvt !== $plugins['evtid']) { |
48 | 48 | $sortables[] = $plugins['evtid']; |
49 | 49 | $sortableList .= $insideUl ? '</ul></div>' : ''; |
50 | - $sortableList .= '<div class="form-group clearfix"><strong>' . $plugins['evtname'] . '</strong><ul id="' . $plugins['evtid'] . '" class="sortableList">'; |
|
50 | + $sortableList .= '<div class="form-group clearfix"><strong>'.$plugins['evtname'].'</strong><ul id="'.$plugins['evtid'].'" class="sortableList">'; |
|
51 | 51 | $insideUl = 1; |
52 | 52 | } |
53 | - $sortableList .= '<li id="item_' . $plugins['pluginid'] . '"' . ($plugins['disabled'] ? ' class="disabledPlugin"' : '') . '><i class="fa fa-plug"></i> ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . '</li>'; |
|
53 | + $sortableList .= '<li id="item_'.$plugins['pluginid'].'"'.($plugins['disabled'] ? ' class="disabledPlugin"' : '').'><i class="fa fa-plug"></i> '.$plugins['name'].($plugins['disabled'] ? ' (hide)' : '').'</li>'; |
|
54 | 54 | $preEvt = $plugins['evtid']; |
55 | 55 | } |
56 | 56 | if ($insideUl) { |
57 | 57 | $sortableList .= '</ul></div>'; |
58 | 58 | } |
59 | 59 | |
60 | -require_once(MODX_MANAGER_PATH . 'includes/header.inc.php'); |
|
60 | +require_once(MODX_MANAGER_PATH.'includes/header.inc.php'); |
|
61 | 61 | ?> |
62 | 62 | |
63 | 63 | <script type="text/javascript"> |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | $modx->sid = session_id(); |
19 | 19 | |
20 | 20 | $_lang = array(); |
21 | -include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php'; |
|
21 | +include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php'; |
|
22 | 22 | if ($modx->config['manager_language'] != 'english') { |
23 | - include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php'; |
|
23 | + include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php'; |
|
24 | 24 | } |
25 | -include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php'; |
|
25 | +include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php'; |
|
26 | 26 | |
27 | 27 | $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : ''; |
28 | 28 | $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : ''; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | switch ($frame) { |
41 | 41 | case 'nodes': |
42 | - include_once MODX_MANAGER_PATH . '/frames/nodes.php'; |
|
42 | + include_once MODX_MANAGER_PATH.'/frames/nodes.php'; |
|
43 | 43 | |
44 | 44 | break; |
45 | 45 | } |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | $sql = ''; |
58 | 58 | $a = ''; |
59 | 59 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : ''; |
60 | - $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
61 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
60 | + $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
61 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
62 | 62 | |
63 | 63 | switch ($elements) { |
64 | 64 | case 'element_templates': |
65 | 65 | $a = 16; |
66 | - $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
66 | + $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
67 | 67 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.templatename AS name, t1.locked, 0 AS disabled |
68 | - FROM ' . $modx->getDatabase()->getFullTableName('site_templates') . ' AS t1 |
|
69 | - ' . $sqlLike . ' |
|
68 | + FROM ' . $modx->getDatabase()->getFullTableName('site_templates').' AS t1 |
|
69 | + ' . $sqlLike.' |
|
70 | 70 | ORDER BY t1.templatename ASC |
71 | 71 | ' . $sqlLimit); |
72 | 72 | |
73 | 73 | if ($modx->hasPermission('new_template')) { |
74 | - $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>'; |
|
74 | + $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>'; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | break; |
@@ -79,15 +79,15 @@ discard block |
||
79 | 79 | case 'element_tplvars': |
80 | 80 | $a = 301; |
81 | 81 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, IF(MIN(t2.tmplvarid),0,1) AS disabled |
82 | - FROM ' . $modx->getDatabase()->getFullTableName('site_tmplvars') . ' AS t1 |
|
83 | - LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid |
|
84 | - ' . $sqlLike . ' |
|
82 | + FROM ' . $modx->getDatabase()->getFullTableName('site_tmplvars').' AS t1 |
|
83 | + LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid |
|
84 | + ' . $sqlLike.' |
|
85 | 85 | GROUP BY t1.id |
86 | 86 | ORDER BY t1.name ASC |
87 | 87 | ' . $sqlLimit); |
88 | 88 | |
89 | 89 | if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
90 | - $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>'; |
|
90 | + $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>'; |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | break; |
@@ -95,13 +95,13 @@ discard block |
||
95 | 95 | case 'element_htmlsnippets': |
96 | 96 | $a = 78; |
97 | 97 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled |
98 | - FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets') . ' AS t1 |
|
99 | - ' . $sqlLike . ' |
|
98 | + FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets').' AS t1 |
|
99 | + ' . $sqlLike.' |
|
100 | 100 | ORDER BY t1.name ASC |
101 | 101 | ' . $sqlLimit); |
102 | 102 | |
103 | 103 | if ($modx->hasPermission('new_chunk')) { |
104 | - $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>'; |
|
104 | + $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>'; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | break; |
@@ -109,13 +109,13 @@ discard block |
||
109 | 109 | case 'element_snippets': |
110 | 110 | $a = 22; |
111 | 111 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled |
112 | - FROM ' . $modx->getDatabase()->getFullTableName('site_snippets') . ' AS t1 |
|
113 | - ' . $sqlLike . ' |
|
112 | + FROM ' . $modx->getDatabase()->getFullTableName('site_snippets').' AS t1 |
|
113 | + ' . $sqlLike.' |
|
114 | 114 | ORDER BY t1.name ASC |
115 | 115 | ' . $sqlLimit); |
116 | 116 | |
117 | 117 | if ($modx->hasPermission('new_snippet')) { |
118 | - $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>'; |
|
118 | + $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>'; |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | break; |
@@ -123,13 +123,13 @@ discard block |
||
123 | 123 | case 'element_plugins': |
124 | 124 | $a = 102; |
125 | 125 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled |
126 | - FROM ' . $modx->getDatabase()->getFullTableName('site_plugins') . ' AS t1 |
|
127 | - ' . $sqlLike . ' |
|
126 | + FROM ' . $modx->getDatabase()->getFullTableName('site_plugins').' AS t1 |
|
127 | + ' . $sqlLike.' |
|
128 | 128 | ORDER BY t1.name ASC |
129 | 129 | ' . $sqlLimit); |
130 | 130 | |
131 | 131 | if ($modx->hasPermission('new_plugin')) { |
132 | - $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>'; |
|
132 | + $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>'; |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | break; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | continue; |
145 | 145 | } |
146 | 146 | |
147 | - $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n"; |
|
147 | + $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n"; |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
@@ -165,23 +165,23 @@ discard block |
||
165 | 165 | $output = ''; |
166 | 166 | $items = ''; |
167 | 167 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
168 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
169 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
168 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
169 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
170 | 170 | |
171 | - if(!$modx->hasPermission('save_role')) { |
|
171 | + if (!$modx->hasPermission('save_role')) { |
|
172 | 172 | $sqlLike .= $sqlLike ? ' AND ' : 'WHERE '; |
173 | 173 | $sqlLike .= 't2.role != 1'; |
174 | 174 | } |
175 | 175 | |
176 | 176 | $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked |
177 | - FROM ' . $modx->getDatabase()->getFullTableName('manager_users') . ' AS t1 |
|
178 | - LEFT JOIN ' . $modx->getDatabase()->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey |
|
179 | - ' . $sqlLike . ' |
|
177 | + FROM ' . $modx->getDatabase()->getFullTableName('manager_users').' AS t1 |
|
178 | + LEFT JOIN ' . $modx->getDatabase()->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey |
|
179 | + ' . $sqlLike.' |
|
180 | 180 | ORDER BY t1.username ASC |
181 | 181 | ' . $sqlLimit); |
182 | 182 | |
183 | 183 | if ($modx->hasPermission('new_user')) { |
184 | - $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>'; |
|
184 | + $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>'; |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
190 | 190 | } |
191 | 191 | while ($row = $modx->getDatabase()->getRow($sql)) { |
192 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>'; |
|
192 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'; |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
@@ -209,18 +209,18 @@ discard block |
||
209 | 209 | $output = ''; |
210 | 210 | $items = ''; |
211 | 211 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
212 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
213 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
212 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
213 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
214 | 214 | |
215 | 215 | $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked |
216 | - FROM ' . $modx->getDatabase()->getFullTableName('web_users') . ' AS t1 |
|
217 | - LEFT JOIN ' . $modx->getDatabase()->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey |
|
218 | - ' . $sqlLike . ' |
|
216 | + FROM ' . $modx->getDatabase()->getFullTableName('web_users').' AS t1 |
|
217 | + LEFT JOIN ' . $modx->getDatabase()->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey |
|
218 | + ' . $sqlLike.' |
|
219 | 219 | ORDER BY t1.username ASC |
220 | 220 | ' . $sqlLimit); |
221 | 221 | |
222 | 222 | if ($modx->hasPermission('new_web_user')) { |
223 | - $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>'; |
|
223 | + $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>'; |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
229 | 229 | } |
230 | 230 | while ($row = $modx->getDatabase()->getRow($sql)) { |
231 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>'; |
|
231 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'; |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | |
@@ -254,35 +254,35 @@ discard block |
||
254 | 254 | case 'SnippetNoCache': { |
255 | 255 | |
256 | 256 | $sql = $modx->getDatabase()->query('SELECT * |
257 | - FROM ' . $modx->getDatabase()->getFullTableName('site_snippets') . ' |
|
258 | - WHERE name="' . $name . '" |
|
257 | + FROM ' . $modx->getDatabase()->getFullTableName('site_snippets').' |
|
258 | + WHERE name="' . $name.'" |
|
259 | 259 | LIMIT 1'); |
260 | 260 | |
261 | 261 | if ($modx->getDatabase()->getRecordCount($sql)) { |
262 | 262 | $row = $modx->getDatabase()->getRow($sql); |
263 | 263 | $contextmenu = array( |
264 | 264 | 'header' => array( |
265 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
265 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
266 | 266 | ), |
267 | 267 | 'item' => array( |
268 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
269 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
268 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
269 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
270 | 270 | ) |
271 | 271 | ); |
272 | 272 | if (!empty($row['description'])) { |
273 | 273 | $contextmenu['seperator'] = ''; |
274 | 274 | $contextmenu['description'] = array( |
275 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
275 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
276 | 276 | ); |
277 | 277 | } |
278 | 278 | } else { |
279 | 279 | $contextmenu = array( |
280 | 280 | 'header' => array( |
281 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
281 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
282 | 282 | ), |
283 | 283 | 'item' => array( |
284 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
285 | - 'url' => "index.php?a=23&itemname=" . $name |
|
284 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
285 | + 'url' => "index.php?a=23&itemname=".$name |
|
286 | 286 | ) |
287 | 287 | ); |
288 | 288 | } |
@@ -292,35 +292,35 @@ discard block |
||
292 | 292 | case 'Chunk' : { |
293 | 293 | |
294 | 294 | $sql = $modx->getDatabase()->query('SELECT * |
295 | - FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets') . ' |
|
296 | - WHERE name="' . $name . '" |
|
295 | + FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets').' |
|
296 | + WHERE name="' . $name.'" |
|
297 | 297 | LIMIT 1'); |
298 | 298 | |
299 | 299 | if ($modx->getDatabase()->getRecordCount($sql)) { |
300 | 300 | $row = $modx->getDatabase()->getRow($sql); |
301 | 301 | $contextmenu = array( |
302 | 302 | 'header' => array( |
303 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name'] |
|
303 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name'] |
|
304 | 304 | ), |
305 | 305 | 'item' => array( |
306 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
307 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
306 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
307 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
308 | 308 | ) |
309 | 309 | ); |
310 | 310 | if (!empty($row['description'])) { |
311 | 311 | $contextmenu['seperator'] = ''; |
312 | 312 | $contextmenu['description'] = array( |
313 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
313 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
314 | 314 | ); |
315 | 315 | } |
316 | 316 | } else { |
317 | 317 | $contextmenu = array( |
318 | 318 | 'header' => array( |
319 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name |
|
319 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$name |
|
320 | 320 | ), |
321 | 321 | 'item' => array( |
322 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
323 | - 'url' => "index.php?a=77&itemname=" . $name |
|
322 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
323 | + 'url' => "index.php?a=77&itemname=".$name |
|
324 | 324 | ) |
325 | 325 | ); |
326 | 326 | } |
@@ -329,8 +329,8 @@ discard block |
||
329 | 329 | } |
330 | 330 | case 'AttributeValue': { |
331 | 331 | $sql = $modx->getDatabase()->query('SELECT * |
332 | - FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets') . ' |
|
333 | - WHERE name="' . $name . '" |
|
332 | + FROM ' . $modx->getDatabase()->getFullTableName('site_htmlsnippets').' |
|
333 | + WHERE name="' . $name.'" |
|
334 | 334 | LIMIT 1'); |
335 | 335 | |
336 | 336 | if ($modx->getDatabase()->getRecordCount($sql)) { |
@@ -340,52 +340,52 @@ discard block |
||
340 | 340 | 'innerText' => $row['name'] |
341 | 341 | ), |
342 | 342 | 'item' => array( |
343 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
344 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
343 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
344 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
345 | 345 | ) |
346 | 346 | ); |
347 | 347 | if (!empty($row['description'])) { |
348 | 348 | $contextmenu['seperator'] = ''; |
349 | 349 | $contextmenu['description'] = array( |
350 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
350 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
351 | 351 | ); |
352 | 352 | } |
353 | 353 | } else { |
354 | 354 | |
355 | 355 | $sql = $modx->getDatabase()->query('SELECT * |
356 | - FROM ' . $modx->getDatabase()->getFullTableName('site_snippets') . ' |
|
357 | - WHERE name="' . $name . '" |
|
356 | + FROM ' . $modx->getDatabase()->getFullTableName('site_snippets').' |
|
357 | + WHERE name="' . $name.'" |
|
358 | 358 | LIMIT 1'); |
359 | 359 | |
360 | 360 | if ($modx->getDatabase()->getRecordCount($sql)) { |
361 | 361 | $row = $modx->getDatabase()->getRow($sql); |
362 | 362 | $contextmenu = array( |
363 | 363 | 'header' => array( |
364 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
364 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
365 | 365 | ), |
366 | 366 | 'item' => array( |
367 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
368 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
367 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
368 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
369 | 369 | ) |
370 | 370 | ); |
371 | 371 | if (!empty($row['description'])) { |
372 | 372 | $contextmenu['seperator'] = ''; |
373 | 373 | $contextmenu['description'] = array( |
374 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
374 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
375 | 375 | ); |
376 | 376 | } |
377 | 377 | } else { |
378 | 378 | $contextmenu = array( |
379 | 379 | 'header' => array( |
380 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
380 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
381 | 381 | ), |
382 | 382 | 'item' => array( |
383 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
384 | - 'url' => "index.php?a=77&itemname=" . $name |
|
383 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
384 | + 'url' => "index.php?a=77&itemname=".$name |
|
385 | 385 | ), |
386 | 386 | 'item2' => array( |
387 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
388 | - 'url' => "index.php?a=23&itemname=" . $name |
|
387 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
388 | + 'url' => "index.php?a=23&itemname=".$name |
|
389 | 389 | ) |
390 | 390 | ); |
391 | 391 | } |
@@ -441,35 +441,35 @@ discard block |
||
441 | 441 | } |
442 | 442 | |
443 | 443 | $sql = $modx->getDatabase()->query('SELECT * |
444 | - FROM ' . $modx->getDatabase()->getFullTableName('site_tmplvars') . ' |
|
445 | - WHERE name="' . $name . '" |
|
444 | + FROM ' . $modx->getDatabase()->getFullTableName('site_tmplvars').' |
|
445 | + WHERE name="' . $name.'" |
|
446 | 446 | LIMIT 1'); |
447 | 447 | |
448 | 448 | if ($modx->getDatabase()->getRecordCount($sql)) { |
449 | 449 | $row = $modx->getDatabase()->getRow($sql); |
450 | 450 | $contextmenu = array( |
451 | 451 | 'header' => array( |
452 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name'] |
|
452 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name'] |
|
453 | 453 | ), |
454 | 454 | 'item' => array( |
455 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
456 | - 'url' => "index.php?a=301&id=" . $row['id'] |
|
455 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
456 | + 'url' => "index.php?a=301&id=".$row['id'] |
|
457 | 457 | ) |
458 | 458 | ); |
459 | 459 | if (!empty($row['description'])) { |
460 | 460 | $contextmenu['seperator'] = ''; |
461 | 461 | $contextmenu['description'] = array( |
462 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
462 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
463 | 463 | ); |
464 | 464 | } |
465 | 465 | } else { |
466 | 466 | $contextmenu = array( |
467 | 467 | 'header' => array( |
468 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name |
|
468 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name |
|
469 | 469 | ), |
470 | 470 | 'item' => array( |
471 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'], |
|
472 | - 'url' => "index.php?a=300&itemname=" . $name |
|
471 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'], |
|
472 | + 'url' => "index.php?a=300&itemname=".$name |
|
473 | 473 | ) |
474 | 474 | ); |
475 | 475 | } |
@@ -488,15 +488,15 @@ discard block |
||
488 | 488 | $json = array(); |
489 | 489 | |
490 | 490 | if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { |
491 | - $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
|
492 | - $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0; |
|
491 | + $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; |
|
492 | + $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0; |
|
493 | 493 | $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0; |
494 | 494 | |
495 | 495 | // set parent |
496 | 496 | if ($id && $parent >= 0) { |
497 | 497 | |
498 | 498 | // find older parent |
499 | - $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $id)); |
|
499 | + $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getDatabase()->getFullTableName('site_content'), 'id='.$id)); |
|
500 | 500 | |
501 | 501 | $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [ |
502 | 502 | 'id_document' => $id, |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | if (empty($json['errors'])) { |
518 | 518 | // check privileges user for move docs |
519 | 519 | if (!empty($modx->config['tree_show_protected']) && $role != 1) { |
520 | - $sql = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')'); |
|
520 | + $sql = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')'); |
|
521 | 521 | if ($modx->getDatabase()->getRecordCount($sql)) { |
522 | 522 | $document_groups = array(); |
523 | 523 | while ($row = $modx->getDatabase()->getRow($sql)) { |
@@ -542,22 +542,22 @@ discard block |
||
542 | 542 | // set new parent |
543 | 543 | $modx->getDatabase()->update(array( |
544 | 544 | 'parent' => $parent |
545 | - ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $id); |
|
545 | + ), $modx->getDatabase()->getFullTableName('site_content'), 'id='.$id); |
|
546 | 546 | // set parent isfolder = 1 |
547 | 547 | $modx->getDatabase()->update(array( |
548 | 548 | 'isfolder' => 1 |
549 | - ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parent); |
|
549 | + ), $modx->getDatabase()->getFullTableName('site_content'), 'id='.$parent); |
|
550 | 550 | |
551 | 551 | if ($parent != $parentOld) { |
552 | 552 | // check children docs and set parent isfolder |
553 | - if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'parent=' . $parentOld))) { |
|
553 | + if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'parent='.$parentOld))) { |
|
554 | 554 | $modx->getDatabase()->update(array( |
555 | 555 | 'isfolder' => 1 |
556 | - ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parentOld); |
|
556 | + ), $modx->getDatabase()->getFullTableName('site_content'), 'id='.$parentOld); |
|
557 | 557 | } else { |
558 | 558 | $modx->getDatabase()->update(array( |
559 | 559 | 'isfolder' => 0 |
560 | - ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parentOld); |
|
560 | + ), $modx->getDatabase()->getFullTableName('site_content'), 'id='.$parentOld); |
|
561 | 561 | } |
562 | 562 | } |
563 | 563 | |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | if (!empty($menuindex)) { |
566 | 566 | $menuindex = explode(',', $menuindex); |
567 | 567 | foreach ($menuindex as $key => $value) { |
568 | - $modx->getDatabase()->query('UPDATE ' . $modx->getDatabase()->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value); |
|
568 | + $modx->getDatabase()->query('UPDATE '.$modx->getDatabase()->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value); |
|
569 | 569 | } |
570 | 570 | } else { |
571 | 571 | // TODO: max(*) menuindex |
@@ -594,19 +594,19 @@ discard block |
||
594 | 594 | } |
595 | 595 | |
596 | 596 | case 'getLockedElements': { |
597 | - $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0; |
|
598 | - $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
597 | + $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0; |
|
598 | + $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
599 | 599 | |
600 | 600 | $output = !!$modx->elementIsLocked($type, $id, true); |
601 | 601 | |
602 | 602 | if (!$output) { |
603 | 603 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : ''; |
604 | - $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : ''; |
|
604 | + $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : ''; |
|
605 | 605 | $sql = ' |
606 | - SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked |
|
607 | - FROM ' . $modx->getDatabase()->getFullTableName('site_content') . ' AS sc |
|
608 | - LEFT JOIN ' . $modx->getDatabase()->getFullTableName('document_groups') . ' dg ON dg.document=sc.id |
|
609 | - WHERE sc.id=' . $id . ' GROUP BY sc.id'; |
|
606 | + SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked |
|
607 | + FROM ' . $modx->getDatabase()->getFullTableName('site_content').' AS sc |
|
608 | + LEFT JOIN ' . $modx->getDatabase()->getFullTableName('document_groups').' dg ON dg.document=sc.id |
|
609 | + WHERE sc.id=' . $id.' GROUP BY sc.id'; |
|
610 | 610 | $sql = $modx->getDatabase()->query($sql); |
611 | 611 | if ($modx->getDatabase()->getRecordCount($sql)) { |
612 | 612 | $row = $modx->getDatabase()->getRow($sql); |
@@ -7,11 +7,11 @@ discard block |
||
7 | 7 | |
8 | 8 | $modx->getDatabase()->connect(); |
9 | 9 | |
10 | -if (empty ($modx->config)) { |
|
10 | +if (empty ($modx->config)) { |
|
11 | 11 | $modx->getSettings(); |
12 | 12 | } |
13 | 13 | |
14 | -if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) { |
|
14 | +if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) { |
|
15 | 15 | $modx->sendErrorPage(); |
16 | 16 | } |
17 | 17 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | $_lang = array(); |
21 | 21 | include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php'; |
22 | -if ($modx->config['manager_language'] != 'english') { |
|
22 | +if ($modx->config['manager_language'] != 'english') { |
|
23 | 23 | include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php'; |
24 | 24 | } |
25 | 25 | include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php'; |
@@ -32,12 +32,12 @@ discard block |
||
32 | 32 | // set limit sql query |
33 | 33 | $limit = !empty($modx->config['number_of_results']) ? (int) $modx->config['number_of_results'] : 100; |
34 | 34 | |
35 | -if (isset($action)) { |
|
36 | - switch ($action) { |
|
35 | +if (isset($action)) { |
|
36 | + switch ($action) { |
|
37 | 37 | |
38 | 38 | case '1': { |
39 | 39 | |
40 | - switch ($frame) { |
|
40 | + switch ($frame) { |
|
41 | 41 | case 'nodes': |
42 | 42 | include_once MODX_MANAGER_PATH . '/frames/nodes.php'; |
43 | 43 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : ''; |
53 | 53 | |
54 | - if ($elements) { |
|
54 | + if ($elements) { |
|
55 | 55 | $output = ''; |
56 | 56 | $items = ''; |
57 | 57 | $sql = ''; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
61 | 61 | $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
62 | 62 | |
63 | - switch ($elements) { |
|
63 | + switch ($elements) { |
|
64 | 64 | case 'element_templates': |
65 | 65 | $a = 16; |
66 | 66 | $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | ORDER BY t1.templatename ASC |
71 | 71 | ' . $sqlLimit); |
72 | 72 | |
73 | - if ($modx->hasPermission('new_template')) { |
|
73 | + if ($modx->hasPermission('new_template')) { |
|
74 | 74 | $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>'; |
75 | 75 | } |
76 | 76 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | ORDER BY t1.name ASC |
87 | 87 | ' . $sqlLimit); |
88 | 88 | |
89 | - if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
|
89 | + if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
|
90 | 90 | $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>'; |
91 | 91 | } |
92 | 92 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ORDER BY t1.name ASC |
101 | 101 | ' . $sqlLimit); |
102 | 102 | |
103 | - if ($modx->hasPermission('new_chunk')) { |
|
103 | + if ($modx->hasPermission('new_chunk')) { |
|
104 | 104 | $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>'; |
105 | 105 | } |
106 | 106 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | ORDER BY t1.name ASC |
115 | 115 | ' . $sqlLimit); |
116 | 116 | |
117 | - if ($modx->hasPermission('new_snippet')) { |
|
117 | + if ($modx->hasPermission('new_snippet')) { |
|
118 | 118 | $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>'; |
119 | 119 | } |
120 | 120 | |
@@ -128,19 +128,19 @@ discard block |
||
128 | 128 | ORDER BY t1.name ASC |
129 | 129 | ' . $sqlLimit); |
130 | 130 | |
131 | - if ($modx->hasPermission('new_plugin')) { |
|
131 | + if ($modx->hasPermission('new_plugin')) { |
|
132 | 132 | $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>'; |
133 | 133 | } |
134 | 134 | |
135 | 135 | break; |
136 | 136 | } |
137 | 137 | |
138 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
139 | - if ($count == $limit) { |
|
138 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
139 | + if ($count == $limit) { |
|
140 | 140 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
141 | 141 | } |
142 | - while ($row = $modx->getDatabase()->getRow($sql)) { |
|
143 | - if (($row['disabled'] || $row['locked']) && $role != 1) { |
|
142 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
143 | + if (($row['disabled'] || $row['locked']) && $role != 1) { |
|
144 | 144 | continue; |
145 | 145 | } |
146 | 146 | |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
151 | - if (isset($_REQUEST['filter'])) { |
|
151 | + if (isset($_REQUEST['filter'])) { |
|
152 | 152 | $output = $items; |
153 | - } else { |
|
153 | + } else { |
|
154 | 154 | $output .= $items; |
155 | 155 | } |
156 | 156 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
169 | 169 | $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
170 | 170 | |
171 | - if(!$modx->hasPermission('save_role')) { |
|
171 | + if(!$modx->hasPermission('save_role')) { |
|
172 | 172 | $sqlLike .= $sqlLike ? ' AND ' : 'WHERE '; |
173 | 173 | $sqlLike .= 't2.role != 1'; |
174 | 174 | } |
@@ -180,22 +180,22 @@ discard block |
||
180 | 180 | ORDER BY t1.username ASC |
181 | 181 | ' . $sqlLimit); |
182 | 182 | |
183 | - if ($modx->hasPermission('new_user')) { |
|
183 | + if ($modx->hasPermission('new_user')) { |
|
184 | 184 | $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>'; |
185 | 185 | } |
186 | 186 | |
187 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
188 | - if ($count == $limit) { |
|
187 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
188 | + if ($count == $limit) { |
|
189 | 189 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
190 | 190 | } |
191 | - while ($row = $modx->getDatabase()->getRow($sql)) { |
|
191 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
192 | 192 | $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>'; |
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
196 | - if (isset($_REQUEST['filter'])) { |
|
196 | + if (isset($_REQUEST['filter'])) { |
|
197 | 197 | $output = $items; |
198 | - } else { |
|
198 | + } else { |
|
199 | 199 | $output .= $items; |
200 | 200 | } |
201 | 201 | |
@@ -219,22 +219,22 @@ discard block |
||
219 | 219 | ORDER BY t1.username ASC |
220 | 220 | ' . $sqlLimit); |
221 | 221 | |
222 | - if ($modx->hasPermission('new_web_user')) { |
|
222 | + if ($modx->hasPermission('new_web_user')) { |
|
223 | 223 | $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>'; |
224 | 224 | } |
225 | 225 | |
226 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
227 | - if ($count == $limit) { |
|
226 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
227 | + if ($count == $limit) { |
|
228 | 228 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
229 | 229 | } |
230 | - while ($row = $modx->getDatabase()->getRow($sql)) { |
|
230 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
231 | 231 | $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>'; |
232 | 232 | } |
233 | 233 | } |
234 | 234 | |
235 | - if (isset($_REQUEST['filter'])) { |
|
235 | + if (isset($_REQUEST['filter'])) { |
|
236 | 236 | $output = $items; |
237 | - } else { |
|
237 | + } else { |
|
238 | 238 | $output .= $items; |
239 | 239 | } |
240 | 240 | |
@@ -248,8 +248,8 @@ discard block |
||
248 | 248 | $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->getDatabase()->escape($_REQUEST['type']) : false; |
249 | 249 | $contextmenu = ''; |
250 | 250 | |
251 | - if ($role && $name && $type) { |
|
252 | - switch ($type) { |
|
251 | + if ($role && $name && $type) { |
|
252 | + switch ($type) { |
|
253 | 253 | case 'Snippet': |
254 | 254 | case 'SnippetNoCache': { |
255 | 255 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | WHERE name="' . $name . '" |
259 | 259 | LIMIT 1'); |
260 | 260 | |
261 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
261 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
262 | 262 | $row = $modx->getDatabase()->getRow($sql); |
263 | 263 | $contextmenu = array( |
264 | 264 | 'header' => array( |
@@ -269,13 +269,13 @@ discard block |
||
269 | 269 | 'url' => "index.php?a=22&id=" . $row['id'] |
270 | 270 | ) |
271 | 271 | ); |
272 | - if (!empty($row['description'])) { |
|
272 | + if (!empty($row['description'])) { |
|
273 | 273 | $contextmenu['seperator'] = ''; |
274 | 274 | $contextmenu['description'] = array( |
275 | 275 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
276 | 276 | ); |
277 | 277 | } |
278 | - } else { |
|
278 | + } else { |
|
279 | 279 | $contextmenu = array( |
280 | 280 | 'header' => array( |
281 | 281 | 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | WHERE name="' . $name . '" |
297 | 297 | LIMIT 1'); |
298 | 298 | |
299 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
299 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
300 | 300 | $row = $modx->getDatabase()->getRow($sql); |
301 | 301 | $contextmenu = array( |
302 | 302 | 'header' => array( |
@@ -307,13 +307,13 @@ discard block |
||
307 | 307 | 'url' => "index.php?a=78&id=" . $row['id'] |
308 | 308 | ) |
309 | 309 | ); |
310 | - if (!empty($row['description'])) { |
|
310 | + if (!empty($row['description'])) { |
|
311 | 311 | $contextmenu['seperator'] = ''; |
312 | 312 | $contextmenu['description'] = array( |
313 | 313 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
314 | 314 | ); |
315 | 315 | } |
316 | - } else { |
|
316 | + } else { |
|
317 | 317 | $contextmenu = array( |
318 | 318 | 'header' => array( |
319 | 319 | 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | WHERE name="' . $name . '" |
334 | 334 | LIMIT 1'); |
335 | 335 | |
336 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
336 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
337 | 337 | $row = $modx->getDatabase()->getRow($sql); |
338 | 338 | $contextmenu = array( |
339 | 339 | 'header' => array( |
@@ -344,20 +344,20 @@ discard block |
||
344 | 344 | 'url' => "index.php?a=78&id=" . $row['id'] |
345 | 345 | ) |
346 | 346 | ); |
347 | - if (!empty($row['description'])) { |
|
347 | + if (!empty($row['description'])) { |
|
348 | 348 | $contextmenu['seperator'] = ''; |
349 | 349 | $contextmenu['description'] = array( |
350 | 350 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
351 | 351 | ); |
352 | 352 | } |
353 | - } else { |
|
353 | + } else { |
|
354 | 354 | |
355 | 355 | $sql = $modx->getDatabase()->query('SELECT * |
356 | 356 | FROM ' . $modx->getDatabase()->getFullTableName('site_snippets') . ' |
357 | 357 | WHERE name="' . $name . '" |
358 | 358 | LIMIT 1'); |
359 | 359 | |
360 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
360 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
361 | 361 | $row = $modx->getDatabase()->getRow($sql); |
362 | 362 | $contextmenu = array( |
363 | 363 | 'header' => array( |
@@ -368,13 +368,13 @@ discard block |
||
368 | 368 | 'url' => "index.php?a=22&id=" . $row['id'] |
369 | 369 | ) |
370 | 370 | ); |
371 | - if (!empty($row['description'])) { |
|
371 | + if (!empty($row['description'])) { |
|
372 | 372 | $contextmenu['seperator'] = ''; |
373 | 373 | $contextmenu['description'] = array( |
374 | 374 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
375 | 375 | ); |
376 | 376 | } |
377 | - } else { |
|
377 | + } else { |
|
378 | 378 | $contextmenu = array( |
379 | 379 | 'header' => array( |
380 | 380 | 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | 'alias_visible' |
437 | 437 | ); |
438 | 438 | |
439 | - if (in_array($name, $default_field)) { |
|
439 | + if (in_array($name, $default_field)) { |
|
440 | 440 | return; |
441 | 441 | } |
442 | 442 | |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | WHERE name="' . $name . '" |
446 | 446 | LIMIT 1'); |
447 | 447 | |
448 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
448 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
449 | 449 | $row = $modx->getDatabase()->getRow($sql); |
450 | 450 | $contextmenu = array( |
451 | 451 | 'header' => array( |
@@ -456,13 +456,13 @@ discard block |
||
456 | 456 | 'url' => "index.php?a=301&id=" . $row['id'] |
457 | 457 | ) |
458 | 458 | ); |
459 | - if (!empty($row['description'])) { |
|
459 | + if (!empty($row['description'])) { |
|
460 | 460 | $contextmenu['seperator'] = ''; |
461 | 461 | $contextmenu['description'] = array( |
462 | 462 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
463 | 463 | ); |
464 | 464 | } |
465 | - } else { |
|
465 | + } else { |
|
466 | 466 | $contextmenu = array( |
467 | 467 | 'header' => array( |
468 | 468 | 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name |
@@ -487,13 +487,13 @@ discard block |
||
487 | 487 | case 'movedocument' : { |
488 | 488 | $json = array(); |
489 | 489 | |
490 | - if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { |
|
490 | + if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { |
|
491 | 491 | $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
492 | 492 | $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0; |
493 | 493 | $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0; |
494 | 494 | |
495 | 495 | // set parent |
496 | - if ($id && $parent >= 0) { |
|
496 | + if ($id && $parent >= 0) { |
|
497 | 497 | |
498 | 498 | // find older parent |
499 | 499 | $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $id)); |
@@ -504,31 +504,31 @@ discard block |
||
504 | 504 | 'new_parent' => $parent, |
505 | 505 | ]); |
506 | 506 | |
507 | - if (is_array($eventOut) && count($eventOut) > 0) { |
|
507 | + if (is_array($eventOut) && count($eventOut) > 0) { |
|
508 | 508 | $eventParent = array_pop($eventOut); |
509 | 509 | |
510 | - if ($eventParent == $parentOld) { |
|
510 | + if ($eventParent == $parentOld) { |
|
511 | 511 | $json['errors'] = $_lang['error_movedocument2']; |
512 | - } else { |
|
512 | + } else { |
|
513 | 513 | $parent = $eventParent; |
514 | 514 | } |
515 | 515 | } |
516 | 516 | |
517 | - if (empty($json['errors'])) { |
|
517 | + if (empty($json['errors'])) { |
|
518 | 518 | // check privileges user for move docs |
519 | - if (!empty($modx->config['tree_show_protected']) && $role != 1) { |
|
519 | + if (!empty($modx->config['tree_show_protected']) && $role != 1) { |
|
520 | 520 | $sql = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')'); |
521 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
521 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
522 | 522 | $document_groups = array(); |
523 | - while ($row = $modx->getDatabase()->getRow($sql)) { |
|
523 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
524 | 524 | $document_groups[$row['document']]['groups'][] = $row['document_group']; |
525 | 525 | } |
526 | - foreach ($document_groups as $key => $value) { |
|
527 | - if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) { |
|
526 | + foreach ($document_groups as $key => $value) { |
|
527 | + if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) { |
|
528 | 528 | $json['errors'] = $_lang["error_no_privileges"]; |
529 | 529 | } |
530 | 530 | } |
531 | - if ($json['errors']) { |
|
531 | + if ($json['errors']) { |
|
532 | 532 | header('content-type: application/json'); |
533 | 533 | echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE); |
534 | 534 | break; |
@@ -536,9 +536,9 @@ discard block |
||
536 | 536 | } |
537 | 537 | } |
538 | 538 | |
539 | - if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) { |
|
539 | + if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) { |
|
540 | 540 | $json['errors'] = $_lang["error_no_privileges"]; |
541 | - } else { |
|
541 | + } else { |
|
542 | 542 | // set new parent |
543 | 543 | $modx->getDatabase()->update(array( |
544 | 544 | 'parent' => $parent |
@@ -548,13 +548,13 @@ discard block |
||
548 | 548 | 'isfolder' => 1 |
549 | 549 | ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parent); |
550 | 550 | |
551 | - if ($parent != $parentOld) { |
|
551 | + if ($parent != $parentOld) { |
|
552 | 552 | // check children docs and set parent isfolder |
553 | - if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'parent=' . $parentOld))) { |
|
553 | + if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'parent=' . $parentOld))) { |
|
554 | 554 | $modx->getDatabase()->update(array( |
555 | 555 | 'isfolder' => 1 |
556 | 556 | ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parentOld); |
557 | - } else { |
|
557 | + } else { |
|
558 | 558 | $modx->getDatabase()->update(array( |
559 | 559 | 'isfolder' => 0 |
560 | 560 | ), $modx->getDatabase()->getFullTableName('site_content'), 'id=' . $parentOld); |
@@ -562,16 +562,16 @@ discard block |
||
562 | 562 | } |
563 | 563 | |
564 | 564 | // set menuindex |
565 | - if (!empty($menuindex)) { |
|
565 | + if (!empty($menuindex)) { |
|
566 | 566 | $menuindex = explode(',', $menuindex); |
567 | - foreach ($menuindex as $key => $value) { |
|
567 | + foreach ($menuindex as $key => $value) { |
|
568 | 568 | $modx->getDatabase()->query('UPDATE ' . $modx->getDatabase()->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value); |
569 | 569 | } |
570 | - } else { |
|
570 | + } else { |
|
571 | 571 | // TODO: max(*) menuindex |
572 | 572 | } |
573 | 573 | |
574 | - if (!$json['errors']) { |
|
574 | + if (!$json['errors']) { |
|
575 | 575 | $json['success'] = $_lang["actioncomplete"]; |
576 | 576 | |
577 | 577 | $modx->invokeEvent('onAfterMoveDocument', [ |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | } |
584 | 584 | } |
585 | 585 | } |
586 | - } else { |
|
586 | + } else { |
|
587 | 587 | $json['errors'] = $_lang["error_no_privileges"]; |
588 | 588 | } |
589 | 589 | |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | |
600 | 600 | $output = !!$modx->elementIsLocked($type, $id, true); |
601 | 601 | |
602 | - if (!$output) { |
|
602 | + if (!$output) { |
|
603 | 603 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : ''; |
604 | 604 | $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : ''; |
605 | 605 | $sql = ' |
@@ -608,7 +608,7 @@ discard block |
||
608 | 608 | LEFT JOIN ' . $modx->getDatabase()->getFullTableName('document_groups') . ' dg ON dg.document=sc.id |
609 | 609 | WHERE sc.id=' . $id . ' GROUP BY sc.id'; |
610 | 610 | $sql = $modx->getDatabase()->query($sql); |
611 | - if ($modx->getDatabase()->getRecordCount($sql)) { |
|
611 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
612 | 612 | $row = $modx->getDatabase()->getRow($sql); |
613 | 613 | $output = !!$row['locked']; |
614 | 614 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | if (!empty($user_id)) { |
15 | 15 | // Raymond: grab the user settings from the database. |
16 | 16 | $rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getDatabase()->getFullTableName('user_settings'), |
17 | - "user=" . $modx->getLoginUserID()); |
|
17 | + "user=".$modx->getLoginUserID()); |
|
18 | 18 | |
19 | 19 | $which_browser_default = $which_browser; |
20 | 20 | while ($row = $modx->getDatabase()->getRow($rs)) { |
@@ -20,14 +20,14 @@ |
||
20 | 20 | ($docid > 0 ? "id='$docid'" : "privatemgr = 1")); |
21 | 21 | $rs = $modx->getDatabase()->select( |
22 | 22 | 'DISTINCT sc.id', |
23 | - $modx->getDatabase()->getFullTableName("site_content") . " sc |
|
24 | - LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id |
|
25 | - LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group", |
|
26 | - ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0" |
|
23 | + $modx->getDatabase()->getFullTableName("site_content")." sc |
|
24 | + LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id |
|
25 | + LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group", |
|
26 | + ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0" |
|
27 | 27 | ); |
28 | 28 | $ids = $modx->getDatabase()->getColumn("id", $rs); |
29 | 29 | if (count($ids) > 0) { |
30 | 30 | $modx->getDatabase()->update('privatemgr = 1', $modx->getDatabase()->getFullTableName("site_content"), |
31 | - "id IN (" . implode(", ", $ids) . ")"); |
|
31 | + "id IN (".implode(", ", $ids).")"); |
|
32 | 32 | } |
33 | 33 | } |
@@ -4,15 +4,15 @@ |
||
4 | 4 | } |
5 | 5 | |
6 | 6 | $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), |
7 | - "recipient=" . $modx->getLoginUserID() . " AND messageread=0"); |
|
7 | + "recipient=".$modx->getLoginUserID()." AND messageread=0"); |
|
8 | 8 | $nrnewmessages = $modx->getDatabase()->getValue($rs); |
9 | -$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID()); |
|
9 | +$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()); |
|
10 | 10 | $nrtotalmessages = $modx->getDatabase()->getValue($rs); |
11 | 11 | $messagesallowed = $modx->hasPermission('messages'); |
12 | 12 | |
13 | 13 | // ajax response |
14 | 14 | if (isset($_POST['updateMsgCount'])) { |
15 | 15 | header("Content-Type: application/json; charset=utf-8"); |
16 | - print $nrnewmessages . ',' . $nrtotalmessages; |
|
16 | + print $nrnewmessages.','.$nrtotalmessages; |
|
17 | 17 | exit; |
18 | 18 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php namespace EvolutionCMS\Legacy; |
2 | 2 | |
3 | -class mgrResources { |
|
3 | +class mgrResources{ |
|
4 | 4 | /** |
5 | 5 | * @var array |
6 | 6 | */ |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * mgrResources constructor. |
23 | 23 | */ |
24 | - public function __construct() { |
|
24 | + public function __construct(){ |
|
25 | 25 | $this->setTypes(); |
26 | 26 | $this->queryItemsFromDB(); |
27 | 27 | $this->prepareCategoryArrays(); |
@@ -30,47 +30,47 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * @return void |
32 | 32 | */ |
33 | - public function setTypes() { |
|
33 | + public function setTypes(){ |
|
34 | 34 | global $_lang; |
35 | - $this->types['site_templates'] = array( |
|
35 | + $this->types['site_templates'] = array( |
|
36 | 36 | 'title'=>$_lang["manage_templates"], |
37 | - 'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ), |
|
38 | - 'permissions'=>array('new_template','edit_template'), |
|
37 | + 'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')), |
|
38 | + 'permissions'=>array('new_template', 'edit_template'), |
|
39 | 39 | 'name'=>'templatename' |
40 | 40 | ); |
41 | - $this->types['site_tmplvars'] = array( |
|
41 | + $this->types['site_tmplvars'] = array( |
|
42 | 42 | 'title'=>$_lang["tmplvars"], |
43 | - 'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')), |
|
44 | - 'permissions'=>array('new_template','edit_template'), |
|
43 | + 'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')), |
|
44 | + 'permissions'=>array('new_template', 'edit_template'), |
|
45 | 45 | ); |
46 | 46 | $this->types['site_htmlsnippets'] = array( |
47 | 47 | 'title'=>$_lang["manage_htmlsnippets"], |
48 | - 'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')), |
|
49 | - 'permissions'=>array('new_chunk','edit_chunk'), |
|
48 | + 'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')), |
|
49 | + 'permissions'=>array('new_chunk', 'edit_chunk'), |
|
50 | 50 | ); |
51 | - $this->types['site_snippets'] = array( |
|
51 | + $this->types['site_snippets'] = array( |
|
52 | 52 | 'title'=>$_lang["manage_snippets"], |
53 | - 'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')), |
|
54 | - 'permissions'=>array('new_snippet','edit_snippet'), |
|
53 | + 'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')), |
|
54 | + 'permissions'=>array('new_snippet', 'edit_snippet'), |
|
55 | 55 | ); |
56 | - $this->types['site_plugins'] = array( |
|
56 | + $this->types['site_plugins'] = array( |
|
57 | 57 | 'title'=>$_lang["manage_plugins"], |
58 | - 'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')), |
|
59 | - 'permissions'=>array('new_plugin','edit_plugin'), |
|
58 | + 'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')), |
|
59 | + 'permissions'=>array('new_plugin', 'edit_plugin'), |
|
60 | 60 | ); |
61 | - $this->types['site_modules'] = array( |
|
61 | + $this->types['site_modules'] = array( |
|
62 | 62 | 'title'=>$_lang["manage_modules"], |
63 | - 'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')), |
|
64 | - 'permissions'=>array('new_module','edit_module'), |
|
63 | + 'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')), |
|
64 | + 'permissions'=>array('new_module', 'edit_module'), |
|
65 | 65 | ); |
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
69 | 69 | * @return void |
70 | 70 | */ |
71 | - public function queryItemsFromDB() { |
|
72 | - foreach($this->types as $resourceTable=>$type) { |
|
73 | - if($this->hasAnyPermissions($type['permissions'])) { |
|
71 | + public function queryItemsFromDB(){ |
|
72 | + foreach ($this->types as $resourceTable=>$type) { |
|
73 | + if ($this->hasAnyPermissions($type['permissions'])) { |
|
74 | 74 | $nameField = isset($type['name']) ? $type['name'] : 'name'; |
75 | 75 | $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField); |
76 | 76 | } |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | * @param array $permissions |
82 | 82 | * @return bool |
83 | 83 | */ |
84 | - public function hasAnyPermissions($permissions) { |
|
84 | + public function hasAnyPermissions($permissions){ |
|
85 | 85 | $modx = evolutionCMS(); |
86 | 86 | |
87 | - foreach($permissions as $p) |
|
88 | - if($modx->hasPermission($p)) return true; |
|
87 | + foreach ($permissions as $p) |
|
88 | + if ($modx->hasPermission($p)) return true; |
|
89 | 89 | |
90 | 90 | return false; |
91 | 91 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @param string $nameField |
96 | 96 | * @return array|bool |
97 | 97 | */ |
98 | - public function queryResources($resourceTable, $nameField = 'name') { |
|
98 | + public function queryResources($resourceTable, $nameField = 'name'){ |
|
99 | 99 | $modx = evolutionCMS(); global $_lang; |
100 | 100 | |
101 | 101 | $allowed = array( |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | 'site_plugins', |
105 | 105 | 'site_modules' |
106 | 106 | ); |
107 | - $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : ''; |
|
107 | + $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : ''; |
|
108 | 108 | |
109 | 109 | $tvsql = ''; |
110 | 110 | $tvjoin = ''; |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | |
120 | 120 | $rs = $modx->getDatabase()->select( |
121 | 121 | "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid", |
122 | - $modx->getDatabase()->getFullTableName($resourceTable) . " AS {$resourceTable} |
|
123 | - LEFT JOIN " . $modx->getDatabase()->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}", |
|
122 | + $modx->getDatabase()->getFullTableName($resourceTable)." AS {$resourceTable} |
|
123 | + LEFT JOIN ".$modx->getDatabase()->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}", |
|
124 | 124 | "", |
125 | 125 | "category,name" |
126 | 126 | ); |
127 | 127 | $limit = $modx->getDatabase()->getRecordCount($rs); |
128 | 128 | |
129 | - if($limit < 1) return false; |
|
129 | + if ($limit < 1) return false; |
|
130 | 130 | |
131 | 131 | $result = array(); |
132 | 132 | while ($row = $modx->getDatabase()->getRow($rs)) { |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | /** |
139 | 139 | * @return void |
140 | 140 | */ |
141 | - public function prepareCategoryArrays() { |
|
142 | - foreach($this->items as $type=>$items) { |
|
143 | - foreach((array)$items as $item) { |
|
141 | + public function prepareCategoryArrays(){ |
|
142 | + foreach ($this->items as $type=>$items) { |
|
143 | + foreach ((array) $items as $item) { |
|
144 | 144 | $catid = $item['catid'] ? $item['catid'] : 0; |
145 | 145 | $this->categories[$catid] = $item['category']; |
146 | 146 | |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | natcasesort($this->categories); |
154 | 154 | |
155 | 155 | // Now sort by name |
156 | - foreach($this->itemsPerCategory as $catid=>$items) { |
|
157 | - usort($this->itemsPerCategory[$catid], function ($a, $b) { |
|
156 | + foreach ($this->itemsPerCategory as $catid=>$items) { |
|
157 | + usort($this->itemsPerCategory[$catid], function($a, $b){ |
|
158 | 158 | return strcasecmp($a['name'], $b['name']); |
159 | 159 | }); |
160 | 160 | } |
@@ -1,6 +1,7 @@ discard block |
||
1 | 1 | <?php namespace EvolutionCMS\Legacy; |
2 | 2 | |
3 | -class mgrResources { |
|
3 | +class mgrResources |
|
4 | +{ |
|
4 | 5 | /** |
5 | 6 | * @var array |
6 | 7 | */ |
@@ -21,7 +22,8 @@ discard block |
||
21 | 22 | /** |
22 | 23 | * mgrResources constructor. |
23 | 24 | */ |
24 | - public function __construct() { |
|
25 | + public function __construct() |
|
26 | + { |
|
25 | 27 | $this->setTypes(); |
26 | 28 | $this->queryItemsFromDB(); |
27 | 29 | $this->prepareCategoryArrays(); |
@@ -30,7 +32,8 @@ discard block |
||
30 | 32 | /** |
31 | 33 | * @return void |
32 | 34 | */ |
33 | - public function setTypes() { |
|
35 | + public function setTypes() |
|
36 | + { |
|
34 | 37 | global $_lang; |
35 | 38 | $this->types['site_templates'] = array( |
36 | 39 | 'title'=>$_lang["manage_templates"], |
@@ -68,7 +71,8 @@ discard block |
||
68 | 71 | /** |
69 | 72 | * @return void |
70 | 73 | */ |
71 | - public function queryItemsFromDB() { |
|
74 | + public function queryItemsFromDB() |
|
75 | + { |
|
72 | 76 | foreach($this->types as $resourceTable=>$type) { |
73 | 77 | if($this->hasAnyPermissions($type['permissions'])) { |
74 | 78 | $nameField = isset($type['name']) ? $type['name'] : 'name'; |
@@ -81,11 +85,13 @@ discard block |
||
81 | 85 | * @param array $permissions |
82 | 86 | * @return bool |
83 | 87 | */ |
84 | - public function hasAnyPermissions($permissions) { |
|
88 | + public function hasAnyPermissions($permissions) |
|
89 | + { |
|
85 | 90 | $modx = evolutionCMS(); |
86 | 91 | |
87 | - foreach($permissions as $p) |
|
88 | - if($modx->hasPermission($p)) return true; |
|
92 | + foreach($permissions as $p) { |
|
93 | + if($modx->hasPermission($p)) return true; |
|
94 | + } |
|
89 | 95 | |
90 | 96 | return false; |
91 | 97 | } |
@@ -95,7 +101,8 @@ discard block |
||
95 | 101 | * @param string $nameField |
96 | 102 | * @return array|bool |
97 | 103 | */ |
98 | - public function queryResources($resourceTable, $nameField = 'name') { |
|
104 | + public function queryResources($resourceTable, $nameField = 'name') |
|
105 | + { |
|
99 | 106 | $modx = evolutionCMS(); global $_lang; |
100 | 107 | |
101 | 108 | $allowed = array( |
@@ -112,8 +119,9 @@ discard block |
||
112 | 119 | $tvsql = 'site_tmplvars.caption, '; |
113 | 120 | $tvjoin = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getDatabase()->getFullTableName('site_tmplvar_templates')); |
114 | 121 | $sttfield = 'IF(stt.templateid,1,0) AS reltpl,'; |
122 | + } else { |
|
123 | + $sttfield = ''; |
|
115 | 124 | } |
116 | - else $sttfield = ''; |
|
117 | 125 | |
118 | 126 | $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : ""; |
119 | 127 | |
@@ -126,7 +134,9 @@ discard block |
||
126 | 134 | ); |
127 | 135 | $limit = $modx->getDatabase()->getRecordCount($rs); |
128 | 136 | |
129 | - if($limit < 1) return false; |
|
137 | + if($limit < 1) { |
|
138 | + return false; |
|
139 | + } |
|
130 | 140 | |
131 | 141 | $result = array(); |
132 | 142 | while ($row = $modx->getDatabase()->getRow($rs)) { |
@@ -138,7 +148,8 @@ discard block |
||
138 | 148 | /** |
139 | 149 | * @return void |
140 | 150 | */ |
141 | - public function prepareCategoryArrays() { |
|
151 | + public function prepareCategoryArrays() |
|
152 | + { |
|
142 | 153 | foreach($this->items as $type=>$items) { |
143 | 154 | foreach((array)$items as $item) { |
144 | 155 | $catid = $item['catid'] ? $item['catid'] : 0; |
@@ -154,7 +165,7 @@ discard block |
||
154 | 165 | |
155 | 166 | // Now sort by name |
156 | 167 | foreach($this->itemsPerCategory as $catid=>$items) { |
157 | - usort($this->itemsPerCategory[$catid], function ($a, $b) { |
|
168 | + usort($this->itemsPerCategory[$catid], function ($a, $b){ |
|
158 | 169 | return strcasecmp($a['name'], $b['name']); |
159 | 170 | }); |
160 | 171 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $this->db_tbl['categories'] = $modx->getDatabase()->getFullTableName('categories'); |
18 | 18 | |
19 | 19 | foreach ($this->elements as $element) { |
20 | - $this->db_tbl[$element] = $modx->getDatabase()->getFullTableName('site_' . $element); |
|
20 | + $this->db_tbl[$element] = $modx->getDatabase()->getFullTableName('site_'.$element); |
|
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->db->select( |
52 | 52 | '*', |
53 | 53 | $this->db_tbl['categories'], |
54 | - "`" . $where . "` = '" . $this->db->escape($search) . "'" |
|
54 | + "`".$where."` = '".$this->db->escape($search)."'" |
|
55 | 55 | ) |
56 | 56 | ); |
57 | 57 | |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | { |
69 | 69 | $_value = $this->db->getValue( |
70 | 70 | $this->db->select( |
71 | - '`' . $value . '`', |
|
71 | + '`'.$value.'`', |
|
72 | 72 | $this->db_tbl['categories'], |
73 | - "`" . $where . "` = '" . $this->db->escape($search) . "'" |
|
73 | + "`".$where."` = '".$this->db->escape($search)."'" |
|
74 | 74 | ) |
75 | 75 | ); |
76 | 76 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $this->db->select( |
90 | 90 | '*', |
91 | 91 | $this->db_tbl[$element], |
92 | - "`category` = '" . (int)$category_id . "'" |
|
92 | + "`category` = '".(int) $category_id."'" |
|
93 | 93 | ) |
94 | 94 | ); |
95 | 95 | |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | $this->db->update( |
133 | 133 | $_update, |
134 | 134 | $this->db_tbl[$element], |
135 | - "`category` = '" . (int)$category_id . "'" |
|
135 | + "`category` = '".(int) $category_id."'" |
|
136 | 136 | ); |
137 | 137 | } |
138 | 138 | |
139 | 139 | $this->db->delete( |
140 | 140 | $this->db_tbl['categories'], |
141 | - "`id` = '" . (int)$category_id . "'" |
|
141 | + "`id` = '".(int) $category_id."'" |
|
142 | 142 | ); |
143 | 143 | |
144 | 144 | return $this->db->getAffectedRows() === 1; |
@@ -157,13 +157,13 @@ discard block |
||
157 | 157 | |
158 | 158 | $_update = array( |
159 | 159 | 'category' => $this->db->escape($data['category']), |
160 | - 'rank' => (int)$data['rank'] |
|
160 | + 'rank' => (int) $data['rank'] |
|
161 | 161 | ); |
162 | 162 | |
163 | 163 | $this->db->update( |
164 | 164 | $_update, |
165 | 165 | $this->db_tbl['categories'], |
166 | - "`id` = '" . (int)$category_id . "'" |
|
166 | + "`id` = '".(int) $category_id."'" |
|
167 | 167 | ); |
168 | 168 | |
169 | 169 | if ($this->db->getAffectedRows() === 1) { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | $_insert = array( |
188 | 188 | 'category' => $this->db->escape($category_name), |
189 | - 'rank' => (int)$category_rank |
|
189 | + 'rank' => (int) $category_rank |
|
190 | 190 | ); |
191 | 191 | |
192 | 192 | $this->db->insert( |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $this->db->select( |
214 | 214 | '`id`', |
215 | 215 | $this->db_tbl['categories'], |
216 | - "`category` = '" . $category . "'" |
|
216 | + "`category` = '".$category."'" |
|
217 | 217 | ) |
218 | 218 | ); |
219 | 219 |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | } |
38 | 38 | |
39 | -if(!function_exists('duplicateDocument')) { |
|
39 | +if (!function_exists('duplicateDocument')) { |
|
40 | 40 | /** |
41 | 41 | * @param int $docid |
42 | 42 | * @param null|int $parent |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->getFullTableName('site_content'), |
91 | 91 | "pagetitle LIKE '{$pagetitle} Duplicate%'")); |
92 | 92 | if ($count >= 1) { |
93 | - $count = ' ' . ($count + 1); |
|
93 | + $count = ' '.($count + 1); |
|
94 | 94 | } else { |
95 | 95 | $count = ''; |
96 | 96 | } |
97 | 97 | |
98 | - $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle']; |
|
98 | + $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle']; |
|
99 | 99 | $content['alias'] = null; |
100 | 100 | } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
101 | 101 | $content['alias'] = null; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | } |
154 | 154 | } |
155 | 155 | |
156 | -if(!function_exists('duplicateTVs')) { |
|
156 | +if (!function_exists('duplicateTVs')) { |
|
157 | 157 | /** |
158 | 158 | * Duplicate Document TVs |
159 | 159 | * |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | |
167 | 167 | $tbltvc = $modx->getDatabase()->getFullTableName('site_tmplvar_contentvalues'); |
168 | 168 | |
169 | - $newid = (int)$newid; |
|
170 | - $oldid = (int)$oldid; |
|
169 | + $newid = (int) $newid; |
|
170 | + $oldid = (int) $oldid; |
|
171 | 171 | |
172 | 172 | $modx->getDatabase()->insert( |
173 | 173 | array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
179 | -if(!function_exists('duplicateAccess')) { |
|
179 | +if (!function_exists('duplicateAccess')) { |
|
180 | 180 | /** |
181 | 181 | * Duplicate Document Access Permissions |
182 | 182 | * |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | |
190 | 190 | $tbldg = $modx->getDatabase()->getFullTableName('document_groups'); |
191 | 191 | |
192 | - $newid = (int)$newid; |
|
193 | - $oldid = (int)$oldid; |
|
192 | + $newid = (int) $newid; |
|
193 | + $oldid = (int) $oldid; |
|
194 | 194 | |
195 | 195 | $modx->getDatabase()->insert( |
196 | 196 | array('document' => '', 'document_group' => ''), $tbldg, // Insert into |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
202 | -if(!function_exists('evalModule')) { |
|
202 | +if (!function_exists('evalModule')) { |
|
203 | 203 | /** |
204 | 204 | * evalModule |
205 | 205 | * |
@@ -235,17 +235,17 @@ discard block |
||
235 | 235 | } |
236 | 236 | if ($modx->config['error_reporting'] === '99' || 2 < $error_level) { |
237 | 237 | $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], |
238 | - $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg); |
|
238 | + $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg); |
|
239 | 239 | $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>"); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | unset($modx->event->params); |
243 | 243 | |
244 | - return $mod . $msg; |
|
244 | + return $mod.$msg; |
|
245 | 245 | } |
246 | 246 | } |
247 | 247 | |
248 | -if(!function_exists('allChildren')) { |
|
248 | +if (!function_exists('allChildren')) { |
|
249 | 249 | /** |
250 | 250 | * @param int $currDocID |
251 | 251 | * @return array |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | } |
266 | 266 | } |
267 | 267 | |
268 | -if(!function_exists('jsAlert')) { |
|
268 | +if (!function_exists('jsAlert')) { |
|
269 | 269 | /** |
270 | 270 | * show javascript alert |
271 | 271 | * |
@@ -275,14 +275,14 @@ discard block |
||
275 | 275 | { |
276 | 276 | $modx = evolutionCMS(); |
277 | 277 | if ($_POST['ajax'] != 1) { |
278 | - echo "<script>window.setTimeout(\"alert('" . addslashes($modx->getDatabase()->escape($msg)) . "')\",10);history.go(-1)</script>"; |
|
278 | + echo "<script>window.setTimeout(\"alert('".addslashes($modx->getDatabase()->escape($msg))."')\",10);history.go(-1)</script>"; |
|
279 | 279 | } else { |
280 | - echo $msg . "\n"; |
|
280 | + echo $msg."\n"; |
|
281 | 281 | } |
282 | 282 | } |
283 | 283 | } |
284 | 284 | |
285 | -if(!function_exists('login')) { |
|
285 | +if (!function_exists('login')) { |
|
286 | 286 | /** |
287 | 287 | * @param string $username |
288 | 288 | * @param string $givenPassword |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | } |
298 | 298 | } |
299 | 299 | |
300 | -if(!function_exists('loginV1')) { |
|
300 | +if (!function_exists('loginV1')) { |
|
301 | 301 | /** |
302 | 302 | * @param int $internalKey |
303 | 303 | * @param string $givenPassword |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | } |
332 | 332 | |
333 | -if(!function_exists('loginMD5')) { |
|
333 | +if (!function_exists('loginMD5')) { |
|
334 | 334 | /** |
335 | 335 | * @param int $internalKey |
336 | 336 | * @param string $givenPassword |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | } |
352 | 352 | } |
353 | 353 | |
354 | -if(!function_exists('updateNewHash')) { |
|
354 | +if (!function_exists('updateNewHash')) { |
|
355 | 355 | /** |
356 | 356 | * @param string $username |
357 | 357 | * @param string $password |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | } |
371 | 371 | } |
372 | 372 | |
373 | -if(!function_exists('incrementFailedLoginCount')) { |
|
373 | +if (!function_exists('incrementFailedLoginCount')) { |
|
374 | 374 | /** |
375 | 375 | * @param int $internalKey |
376 | 376 | * @param int $failedlogins |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | |
398 | 398 | if ($failedlogins < $failed_allowed) { |
399 | 399 | //sleep to help prevent brute force attacks |
400 | - $sleep = (int)$failedlogins / 2; |
|
400 | + $sleep = (int) $failedlogins / 2; |
|
401 | 401 | if ($sleep > 5) { |
402 | 402 | $sleep = 5; |
403 | 403 | } |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | } |
411 | 411 | } |
412 | 412 | |
413 | -if(!function_exists('saveUserGroupAccessPermissons')) { |
|
413 | +if (!function_exists('saveUserGroupAccessPermissons')) { |
|
414 | 414 | /** |
415 | 415 | * saves module user group access |
416 | 416 | */ |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | } |
442 | 442 | } |
443 | 443 | |
444 | -if(!function_exists('saveEventListeners')) { |
|
444 | +if (!function_exists('saveEventListeners')) { |
|
445 | 445 | # Save Plugin Event Listeners |
446 | 446 | function saveEventListeners($id, $sysevents, $mode) |
447 | 447 | { |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | } |
512 | 512 | } |
513 | 513 | |
514 | -if(!function_exists('getEventIdByName')) { |
|
514 | +if (!function_exists('getEventIdByName')) { |
|
515 | 515 | /** |
516 | 516 | * @param string $name |
517 | 517 | * @return string|int |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | } |
538 | 538 | } |
539 | 539 | |
540 | -if(!function_exists('saveTemplateAccess')) { |
|
540 | +if (!function_exists('saveTemplateAccess')) { |
|
541 | 541 | /** |
542 | 542 | * @param int $id |
543 | 543 | */ |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | } |
577 | 577 | } |
578 | 578 | |
579 | -if(!function_exists('saveTemplateVarAccess')) { |
|
579 | +if (!function_exists('saveTemplateVarAccess')) { |
|
580 | 580 | /** |
581 | 581 | * @return void |
582 | 582 | */ |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | } |
616 | 616 | } |
617 | 617 | |
618 | -if(!function_exists('saveDocumentAccessPermissons')) { |
|
618 | +if (!function_exists('saveDocumentAccessPermissons')) { |
|
619 | 619 | function saveDocumentAccessPermissons() |
620 | 620 | { |
621 | 621 | global $id, $newid; |
@@ -784,10 +784,10 @@ discard block |
||
784 | 784 | } |
785 | 785 | |
786 | 786 | foreach ($defaults as $k) { |
787 | - if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') { |
|
787 | + if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') { |
|
788 | 788 | unset($settings[$k]); |
789 | 789 | } |
790 | - unset($settings['default_' . $k]); |
|
790 | + unset($settings['default_'.$k]); |
|
791 | 791 | } |
792 | 792 | |
793 | 793 | $modx->getDatabase()->delete($tbl_user_settings, "user='{$id}'"); |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | global $id, $modx; |
820 | 820 | $mode = $_POST['mode']; |
821 | 821 | $modx->getManagerApi()->saveFormValues($mode); |
822 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : '')); |
|
822 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : '')); |
|
823 | 823 | } |
824 | 824 | } |
825 | 825 | |
@@ -835,7 +835,7 @@ discard block |
||
835 | 835 | global $deltime; |
836 | 836 | |
837 | 837 | $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), |
838 | - "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'"); |
|
838 | + "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'"); |
|
839 | 839 | // the document has children documents, we'll need to delete those too |
840 | 840 | while ($row = $modx->getDatabase()->getRow($rs)) { |
841 | 841 | $children[] = $row['id']; |
@@ -384,10 +384,12 @@ |
||
384 | 384 | $failedlogins += 1; |
385 | 385 | |
386 | 386 | $fields = array('failedlogincount' => $failedlogins); |
387 | - if ($failedlogins >= $failed_allowed) //block user for too many fail attempts |
|
387 | + if ($failedlogins >= $failed_allowed) { |
|
388 | + //block user for too many fail attempts |
|
388 | 389 | { |
389 | 390 | $fields['blockeduntil'] = time() + ($blocked_minutes * 60); |
390 | 391 | } |
392 | + } |
|
391 | 393 | |
392 | 394 | $modx->getDatabase()->update( |
393 | 395 | $fields, |