@@ -1,5 +1,5 @@ |
||
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 | ?> |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
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('edit_web_user')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | // initialize page view state - the $_PAGE object |
@@ -11,12 +11,12 @@ discard block |
||
11 | 11 | |
12 | 12 | // get and save search string |
13 | 13 | if($_REQUEST['op'] == 'reset') { |
14 | - $query = ''; |
|
15 | - $_PAGE['vs']['search'] = ''; |
|
14 | + $query = ''; |
|
15 | + $_PAGE['vs']['search'] = ''; |
|
16 | 16 | } else { |
17 | - $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; |
|
18 | - $sqlQuery = $modx->db->escape($query); |
|
19 | - $_PAGE['vs']['search'] = $query; |
|
17 | + $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; |
|
18 | + $sqlQuery = $modx->db->escape($query); |
|
19 | + $_PAGE['vs']['search'] = $query; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | // get & save listmode |
@@ -120,29 +120,29 @@ discard block |
||
120 | 120 | <div class="row"> |
121 | 121 | <div class="table-responsive"> |
122 | 122 | <?php |
123 | - $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
123 | + $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
124 | 124 | INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
125 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
126 | - $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
|
127 | - $grd->noRecordMsg = $_lang["no_records_found"]; |
|
128 | - $grd->cssClass = "table data"; |
|
129 | - $grd->columnHeaderClass = "tableHeader"; |
|
130 | - $grd->itemClass = "tableItem"; |
|
131 | - $grd->altItemClass = "tableAltItem"; |
|
132 | - $grd->fields = "id,username,fullname,email,gender,blocked"; |
|
133 | - $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
134 | - $grd->colWidths = "1%,,,,1%,1%"; |
|
135 | - $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
|
136 | - $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
137 | - if($listmode == '1') { |
|
138 | - $grd->pageSize = 0; |
|
139 | - } |
|
140 | - if($_REQUEST['op'] == 'reset') { |
|
141 | - $grd->pageNumber = 1; |
|
142 | - } |
|
143 | - // render grid |
|
144 | - echo $grd->render(); |
|
145 | - ?> |
|
125 | + include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
126 | + $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
|
127 | + $grd->noRecordMsg = $_lang["no_records_found"]; |
|
128 | + $grd->cssClass = "table data"; |
|
129 | + $grd->columnHeaderClass = "tableHeader"; |
|
130 | + $grd->itemClass = "tableItem"; |
|
131 | + $grd->altItemClass = "tableAltItem"; |
|
132 | + $grd->fields = "id,username,fullname,email,gender,blocked"; |
|
133 | + $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
134 | + $grd->colWidths = "1%,,,,1%,1%"; |
|
135 | + $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
|
136 | + $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
137 | + if($listmode == '1') { |
|
138 | + $grd->pageSize = 0; |
|
139 | + } |
|
140 | + if($_REQUEST['op'] == 'reset') { |
|
141 | + $grd->pageNumber = 1; |
|
142 | + } |
|
143 | + // render grid |
|
144 | + echo $grd->render(); |
|
145 | + ?> |
|
146 | 146 | </div> |
147 | 147 | </div> |
148 | 148 | </div> |
@@ -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('edit_web_user')) { |
|
5 | +if (!$modx->hasPermission('edit_web_user')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | $modx->manager->initPageViewState(); |
11 | 11 | |
12 | 12 | // get and save search string |
13 | -if($_REQUEST['op'] == 'reset') { |
|
13 | +if ($_REQUEST['op'] == 'reset') { |
|
14 | 14 | $query = ''; |
15 | 15 | $_PAGE['vs']['search'] = ''; |
16 | 16 | } else { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | |
27 | 27 | // context menu |
28 | -include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php"; |
|
28 | +include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; |
|
29 | 29 | $cm = new ContextMenu("cntxm", 150); |
30 | 30 | $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0)); |
31 | 31 | $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0)); |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | <div class="row"> |
121 | 121 | <div class="table-responsive"> |
122 | 122 | <?php |
123 | - $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
124 | - INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
|
125 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
123 | + $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users")." wu |
|
124 | + INNER JOIN " . $modx->getFullTableName("web_user_attributes")." wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
|
125 | + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; |
|
126 | 126 | $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
127 | 127 | $grd->noRecordMsg = $_lang["no_records_found"]; |
128 | 128 | $grd->cssClass = "table data"; |
@@ -130,14 +130,14 @@ discard block |
||
130 | 130 | $grd->itemClass = "tableItem"; |
131 | 131 | $grd->altItemClass = "tableAltItem"; |
132 | 132 | $grd->fields = "id,username,fullname,email,gender,blocked"; |
133 | - $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
133 | + $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_gender"]." ,".$_lang["user_block"]; |
|
134 | 134 | $grd->colWidths = "1%,,,,1%,1%"; |
135 | 135 | $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
136 | - $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
137 | - if($listmode == '1') { |
|
136 | + $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='".$_style["icons_user"]."'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='".$_lang["click_to_edit_title"]."'>[+value+]</a>"; |
|
137 | + if ($listmode == '1') { |
|
138 | 138 | $grd->pageSize = 0; |
139 | 139 | } |
140 | - if($_REQUEST['op'] == 'reset') { |
|
140 | + if ($_REQUEST['op'] == 'reset') { |
|
141 | 141 | $grd->pageNumber = 1; |
142 | 142 | } |
143 | 143 | // render grid |
@@ -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')) { |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
66 | 66 | foreach ($logs_user as $row) { |
67 | 67 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
68 | - echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
|
68 | + echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n"; |
|
69 | 69 | } |
70 | 70 | ?> |
71 | 71 | </select> |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | continue; |
87 | 87 | } |
88 | 88 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
89 | - echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n"; |
|
89 | + echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n"; |
|
90 | 90 | } |
91 | 91 | ?> |
92 | 92 | </select> |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
103 | 103 | foreach ($logs_items as $row) { |
104 | 104 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
105 | - echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
|
105 | + echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n"; |
|
106 | 106 | } |
107 | 107 | ?> |
108 | 108 | </select> |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
119 | 119 | foreach ($logs_names as $row) { |
120 | 120 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
121 | - echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
|
121 | + echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n"; |
|
122 | 122 | } |
123 | 123 | ?> |
124 | 124 | </select> |
@@ -176,26 +176,26 @@ discard block |
||
176 | 176 | // get the selections the user made. |
177 | 177 | $sqladd = array(); |
178 | 178 | if ($_REQUEST['searchuser'] != 0) { |
179 | - $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'"; |
|
179 | + $sqladd[] = "internalKey='".intval($_REQUEST['searchuser'])."'"; |
|
180 | 180 | } |
181 | 181 | if ($_REQUEST['action'] != 0) { |
182 | - $sqladd[] = "action=" . intval($_REQUEST['action']); |
|
182 | + $sqladd[] = "action=".intval($_REQUEST['action']); |
|
183 | 183 | } |
184 | 184 | if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
185 | - $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
|
185 | + $sqladd[] = "itemid='".$_REQUEST['itemid']."'"; |
|
186 | 186 | } |
187 | 187 | if ($_REQUEST['itemname'] != '0') { |
188 | - $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
|
188 | + $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'"; |
|
189 | 189 | } |
190 | 190 | if ($_REQUEST['message'] != "") { |
191 | - $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
|
191 | + $sqladd[] = "message LIKE '%".$modx->db->escape($_REQUEST['message'])."%'"; |
|
192 | 192 | } |
193 | 193 | // date stuff |
194 | 194 | if ($_REQUEST['datefrom'] != "") { |
195 | - $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
|
195 | + $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']); |
|
196 | 196 | } |
197 | 197 | if ($_REQUEST['dateto'] != "") { |
198 | - $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
|
198 | + $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | // If current position is not set, set it to zero |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
209 | 209 | $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs; |
210 | 210 | |
211 | - $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) |
|
211 | + $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) |
|
212 | 212 | |
213 | 213 | // build the sql |
214 | 214 | $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''))); |
@@ -216,9 +216,9 @@ discard block |
||
216 | 216 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}"); |
217 | 217 | |
218 | 218 | if ($limit < 1) { |
219 | - echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
|
219 | + echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>'; |
|
220 | 220 | } else { |
221 | - echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
|
221 | + echo '<p>'.$_lang["mgrlog_sortinst"].'</p>'; |
|
222 | 222 | |
223 | 223 | include_once "paginate.inc.php"; |
224 | 224 | // New instance of the Paging class, you can modify the color and the width of the html table |
@@ -230,11 +230,11 @@ discard block |
||
230 | 230 | $current_row = $int_cur_position / $int_num_result; |
231 | 231 | |
232 | 232 | // Display the result as you like... |
233 | - print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower']; |
|
234 | - print " " . $_lang["paging_to"] . " " . $array_paging['upper']; |
|
235 | - print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />"; |
|
236 | - $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
|
237 | - $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
233 | + print "<p>".$_lang["paging_showing"]." ".$array_paging['lower']; |
|
234 | + print " ".$_lang["paging_to"]." ".$array_paging['upper']; |
|
235 | + print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />"; |
|
236 | + $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " "); |
|
237 | + $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
238 | 238 | $pagesfound = sizeof($array_row_paging); |
239 | 239 | if ($pagesfound > 6) { |
240 | 240 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
@@ -244,11 +244,11 @@ discard block |
||
244 | 244 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
245 | 245 | } else { |
246 | 246 | for ($i = 0; $i < $pagesfound; $i++) { |
247 | - $paging .= $array_row_paging[$i] . " "; |
|
247 | + $paging .= $array_row_paging[$i]." "; |
|
248 | 248 | } |
249 | 249 | } |
250 | - $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " "; |
|
251 | - $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " "; |
|
250 | + $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." "; |
|
251 | + $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." "; |
|
252 | 252 | // The above exemple print somethings like: |
253 | 253 | // 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 >>> |
254 | 254 | // Of course you can now play with array_row_paging in order to print |
@@ -282,16 +282,16 @@ discard block |
||
282 | 282 | if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
283 | 283 | $item = '<div style="text-align:center;">-</div>'; |
284 | 284 | } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
285 | - $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
|
285 | + $item = '<a href="index.php?a=3&id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>'; |
|
286 | 286 | } else { |
287 | 287 | $item = $logentry['itemname']; |
288 | 288 | } |
289 | 289 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
290 | - $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true'; |
|
290 | + $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true'; |
|
291 | 291 | ?> |
292 | 292 | <tr> |
293 | - <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td> |
|
294 | - <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td> |
|
293 | + <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td> |
|
294 | + <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td> |
|
295 | 295 | <td class="text-xs-right"><?= $logentry['itemid'] ?></td> |
296 | 296 | <td><?= $item ?></td> |
297 | 297 | <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td> |
@@ -1,22 +1,22 @@ 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 | |
9 | -function array_unique_multi($array, $checkKey) |
|
10 | -{ |
|
9 | +function array_unique_multi($array, $checkKey) |
|
10 | +{ |
|
11 | 11 | // Use the builtin if we're not a multi-dimensional array |
12 | - if (!is_array(current($array)) || empty($checkKey)) { |
|
12 | + if (!is_array(current($array)) || empty($checkKey)) { |
|
13 | 13 | return array_unique($array); |
14 | 14 | } |
15 | 15 | |
16 | 16 | $ret = array(); |
17 | 17 | $checkValues = array(); // contains the unique key Values |
18 | - foreach ($array as $key => $current) { |
|
19 | - if (in_array($current[$checkKey], $checkValues)) { |
|
18 | + foreach ($array as $key => $current) { |
|
19 | + if (in_array($current[$checkKey], $checkValues)) { |
|
20 | 20 | continue; |
21 | 21 | } // duplicate |
22 | 22 | |
@@ -26,17 +26,17 @@ discard block |
||
26 | 26 | return $ret; |
27 | 27 | } |
28 | 28 | |
29 | -function record_sort($array, $key) |
|
30 | -{ |
|
29 | +function record_sort($array, $key) |
|
30 | +{ |
|
31 | 31 | $hash = array(); |
32 | - foreach ($array as $k => $v) { |
|
32 | + foreach ($array as $k => $v) { |
|
33 | 33 | $hash[$k] = $v[$key]; |
34 | 34 | } |
35 | 35 | |
36 | 36 | natsort($hash); |
37 | 37 | |
38 | 38 | $records = array(); |
39 | - foreach ($hash as $k => $row) { |
|
39 | + foreach ($hash as $k => $row) { |
|
40 | 40 | $records[$k] = $array[$k]; |
41 | 41 | } |
42 | 42 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | <?php |
64 | 64 | // get all users currently in the log |
65 | 65 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
66 | - foreach ($logs_user as $row) { |
|
66 | + foreach ($logs_user as $row) { |
|
67 | 67 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
68 | 68 | echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
69 | 69 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | // get all available actions in the log |
81 | 81 | include_once "actionlist.inc.php"; |
82 | 82 | $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action'); |
83 | - foreach ($logs_actions as $row) { |
|
83 | + foreach ($logs_actions as $row) { |
|
84 | 84 | $action = getAction($row['action']); |
85 | - if ($action == 'Idle') { |
|
85 | + if ($action == 'Idle') { |
|
86 | 86 | continue; |
87 | 87 | } |
88 | 88 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | <?php |
101 | 101 | // get all itemid currently in logging |
102 | 102 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
103 | - foreach ($logs_items as $row) { |
|
103 | + foreach ($logs_items as $row) { |
|
104 | 104 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
105 | 105 | echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
106 | 106 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | <?php |
117 | 117 | // get all itemname currently in logging |
118 | 118 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
119 | - foreach ($logs_names as $row) { |
|
119 | + foreach ($logs_names as $row) { |
|
120 | 120 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
121 | 121 | echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
122 | 122 | } |
@@ -172,36 +172,36 @@ discard block |
||
172 | 172 | <div class="container container-body"> |
173 | 173 | |
174 | 174 | <?php |
175 | -if (isset($_REQUEST['log_submit'])) { |
|
175 | +if (isset($_REQUEST['log_submit'])) { |
|
176 | 176 | // get the selections the user made. |
177 | 177 | $sqladd = array(); |
178 | - if ($_REQUEST['searchuser'] != 0) { |
|
178 | + if ($_REQUEST['searchuser'] != 0) { |
|
179 | 179 | $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'"; |
180 | 180 | } |
181 | - if ($_REQUEST['action'] != 0) { |
|
181 | + if ($_REQUEST['action'] != 0) { |
|
182 | 182 | $sqladd[] = "action=" . intval($_REQUEST['action']); |
183 | 183 | } |
184 | - if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
184 | + if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
185 | 185 | $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
186 | 186 | } |
187 | - if ($_REQUEST['itemname'] != '0') { |
|
187 | + if ($_REQUEST['itemname'] != '0') { |
|
188 | 188 | $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
189 | 189 | } |
190 | - if ($_REQUEST['message'] != "") { |
|
190 | + if ($_REQUEST['message'] != "") { |
|
191 | 191 | $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
192 | 192 | } |
193 | 193 | // date stuff |
194 | - if ($_REQUEST['datefrom'] != "") { |
|
194 | + if ($_REQUEST['datefrom'] != "") { |
|
195 | 195 | $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
196 | 196 | } |
197 | - if ($_REQUEST['dateto'] != "") { |
|
197 | + if ($_REQUEST['dateto'] != "") { |
|
198 | 198 | $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
199 | 199 | } |
200 | 200 | |
201 | 201 | // If current position is not set, set it to zero |
202 | - if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
202 | + if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
203 | 203 | $int_cur_position = 0; |
204 | - } else { |
|
204 | + } else { |
|
205 | 205 | $int_cur_position = $_REQUEST['int_cur_position']; |
206 | 206 | } |
207 | 207 | |
@@ -215,9 +215,9 @@ discard block |
||
215 | 215 | |
216 | 216 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}"); |
217 | 217 | |
218 | -if ($limit < 1) { |
|
218 | +if ($limit < 1) { |
|
219 | 219 | echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
220 | -} else { |
|
220 | +} else { |
|
221 | 221 | echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
222 | 222 | |
223 | 223 | include_once "paginate.inc.php"; |
@@ -236,14 +236,14 @@ discard block |
||
236 | 236 | $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
237 | 237 | $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
238 | 238 | $pagesfound = sizeof($array_row_paging); |
239 | - if ($pagesfound > 6) { |
|
239 | + if ($pagesfound > 6) { |
|
240 | 240 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
241 | 241 | $paging .= $array_row_paging[$current_row - 1]; // ." "; |
242 | 242 | $paging .= $array_row_paging[$current_row]; // ." "; |
243 | 243 | $paging .= $array_row_paging[$current_row + 1]; // ." "; |
244 | 244 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
245 | - } else { |
|
246 | - for ($i = 0; $i < $pagesfound; $i++) { |
|
245 | + } else { |
|
246 | + for ($i = 0; $i < $pagesfound; $i++) { |
|
247 | 247 | $paging .= $array_row_paging[$i] . " "; |
248 | 248 | } |
249 | 249 | } |
@@ -278,12 +278,12 @@ discard block |
||
278 | 278 | // grab the entire log file... |
279 | 279 | $logentries = array(); |
280 | 280 | $i = 0; |
281 | - while ($logentry = $modx->db->getRow($rs)) { |
|
282 | - if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
281 | + while ($logentry = $modx->db->getRow($rs)) { |
|
282 | + if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
283 | 283 | $item = '<div style="text-align:center;">-</div>'; |
284 | - } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
284 | + } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
285 | 285 | $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
286 | - } else { |
|
286 | + } else { |
|
287 | 287 | $item = $logentry['itemname']; |
288 | 288 | } |
289 | 289 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
@@ -318,6 +318,6 @@ discard block |
||
318 | 318 | // @see index.php @ 915 |
319 | 319 | global $action; |
320 | 320 | $action = 1; |
321 | -} else { |
|
321 | +} else { |
|
322 | 322 | echo $_lang["mgrlog_noquery"]; |
323 | 323 | } |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
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('export_static')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | // figure out the base of the server, so we know where to get the documents in order to export them |
@@ -35,11 +35,11 @@ discard block |
||
35 | 35 | |
36 | 36 | <div class="container container-body"> |
37 | 37 | <?php |
38 | - if(isset($_POST['export'])) { |
|
39 | - $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
40 | - echo $rs; |
|
41 | - } else { |
|
42 | - ?> |
|
38 | + if(isset($_POST['export'])) { |
|
39 | + $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
40 | + echo $rs; |
|
41 | + } else { |
|
42 | + ?> |
|
43 | 43 | <form action="index.php" method="post" name="exportFrm"> |
44 | 44 | <input type="hidden" name="export" value="export" /> |
45 | 45 | <input type="hidden" name="a" value="83" /> |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | </script> |
82 | 82 | </form> |
83 | 83 | <?php |
84 | - } |
|
85 | - ?> |
|
84 | + } |
|
85 | + ?> |
|
86 | 86 | </div> |
87 | 87 | </div> |
88 | 88 |
@@ -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('export_static')) { |
|
5 | +if (!$modx->hasPermission('export_static')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | |
36 | 36 | <div class="container container-body"> |
37 | 37 | <?php |
38 | - if(isset($_POST['export'])) { |
|
39 | - $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
38 | + if (isset($_POST['export'])) { |
|
39 | + $rs = include_once(MODX_MANAGER_PATH.'processors/export_site.processor.php'); |
|
40 | 40 | echo $rs; |
41 | 41 | } else { |
42 | 42 | ?> |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | <a href="javascript:;" class="btn btn-primary" onclick="document.exportFrm.submit();jQuery(this).hide();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["export_site_start"] ?></a> |
77 | 77 | <script> |
78 | 78 | jQuery('#exportButton a').click(function() { |
79 | - jQuery(this).parent().html('<?= $_style['ajax_loader'];?>'); |
|
79 | + jQuery(this).parent().html('<?= $_style['ajax_loader']; ?>'); |
|
80 | 80 | }); |
81 | 81 | </script> |
82 | 82 | </form> |
@@ -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('messages')) { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | <div class="container container-body" id="lyr3"> |
17 | 17 | <b><?= $_lang['messages_read_message'] ?></b> |
18 | 18 | <?php |
19 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'"); |
|
19 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".(int) $_REQUEST['id']."'"); |
|
20 | 20 | $message = $modx->db->getRow($rs); |
21 | 21 | if (!$message) { |
22 | 22 | echo "Wrong number of messages returned!"; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | <p><b><?= $_lang['messages_inbox'] ?></b></p> |
88 | 88 | <?php |
89 | 89 | // Get number of rows |
90 | - $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . ""); |
|
90 | + $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID().""); |
|
91 | 91 | $num_rows = $modx->db->getValue($rs); |
92 | 92 | |
93 | 93 | // ============================================================== |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
101 | 101 | $int_cur_position = 0; |
102 | 102 | } else { |
103 | - $int_cur_position = (int)$_REQUEST['int_cur_position']; |
|
103 | + $int_cur_position = (int) $_REQUEST['int_cur_position']; |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
@@ -117,21 +117,21 @@ discard block |
||
117 | 117 | $array_row_paging = $p->getPagingRowArray(); |
118 | 118 | |
119 | 119 | // Display the result as you like... |
120 | - $pager .= $_lang['showing'] . " " . $array_paging['lower']; |
|
121 | - $pager .= " " . $_lang['to'] . " " . $array_paging['upper']; |
|
122 | - $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")"; |
|
123 | - $pager .= "<br />" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
120 | + $pager .= $_lang['showing']." ".$array_paging['lower']; |
|
121 | + $pager .= " ".$_lang['to']." ".$array_paging['upper']; |
|
122 | + $pager .= " (".$array_paging['total']." ".$_lang['total'].")"; |
|
123 | + $pager .= "<br />".$array_paging['previous_link']."<<".(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
124 | 124 | for ($i = 0; $i < sizeof($array_row_paging); $i++) { |
125 | - $pager .= $array_row_paging[$i] . " "; |
|
125 | + $pager .= $array_row_paging[$i]." "; |
|
126 | 126 | } |
127 | - $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "</a>" : ""); |
|
127 | + $pager .= $array_paging['next_link'].">>".(isset($array_paging['next_link']) ? "</a>" : ""); |
|
128 | 128 | |
129 | 129 | // The above exemple print somethings like: |
130 | 130 | // 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 >>> |
131 | 131 | // Of course you can now play with array_row_paging in order to print |
132 | 132 | // only the results you would like... |
133 | 133 | |
134 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); |
|
134 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); |
|
135 | 135 | $limit = $modx->db->getRecordCount($rs); |
136 | 136 | if ($limit < 1) { |
137 | 137 | echo $_lang['messages_no_messages']; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | <p><b><?= $_lang['messages_compose'] ?></b></p> |
190 | 190 | <?php |
191 | 191 | if (($_REQUEST['m'] == 'rp' || $_REQUEST['m'] == 'f') && isset($_REQUEST['id'])) { |
192 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'"); |
|
192 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".$_REQUEST['id']."'"); |
|
193 | 193 | $message = $modx->db->getRow($rs); |
194 | 194 | if (!$message) { |
195 | 195 | echo "Wrong number of messages returned!"; |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } |
209 | 209 | $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: "; |
210 | 210 | $subjecttext .= $message['subject']; |
211 | - $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message']; |
|
211 | + $messagetext = "\n\n\n-----\n".$_lang['messages_from'].": $sendername\n".$_lang['messages_sent'].": ".$modx->toDateFormat($message['postdate'] + $server_offset_time)."\n".$_lang['messages_subject'].": ".$message['subject']."\n\n".$message['message']; |
|
212 | 212 | if ($_REQUEST['m'] == 'rp') { |
213 | 213 | $recipientindex = $message['sender']; |
214 | 214 | } |
@@ -295,9 +295,9 @@ discard block |
||
295 | 295 | |
296 | 296 | <?php |
297 | 297 | // count messages again, as any action on the messages page may have altered the message count |
298 | -$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . " and messageread=0"); |
|
298 | +$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." and messageread=0"); |
|
299 | 299 | $_SESSION['nrnewmessages'] = $modx->db->getValue($rs); |
300 | -$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . ""); |
|
300 | +$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID().""); |
|
301 | 301 | $_SESSION['nrtotalmessages'] = $modx->db->getValue($rs); |
302 | 302 | $messagesallowed = $modx->hasPermission('messages'); |
303 | 303 | ?> |
@@ -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_template')) { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | $updateMsg = ''; |
16 | 16 | |
17 | 17 | if (isset($_POST['listSubmitted'])) { |
18 | - $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>'; |
|
18 | + $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>'; |
|
19 | 19 | foreach ($_POST as $listName => $listValue) { |
20 | 20 | if ($listName == 'listSubmitted' || $listName == 'reset') { |
21 | 21 | continue; |
@@ -40,11 +40,11 @@ discard block |
||
40 | 40 | $sortableList = '<div class="clearfix"><ul id="sortlist" class="sortableList">'; |
41 | 41 | while ($row = $modx->db->getRow($rs)) { |
42 | 42 | $caption = $row['caption'] != '' ? $row['caption'] : $row['name']; |
43 | - $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>'; |
|
43 | + $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>'; |
|
44 | 44 | } |
45 | 45 | $sortableList .= '</ul></div>'; |
46 | 46 | } else { |
47 | - $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>'; |
|
47 | + $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>'; |
|
48 | 48 | } |
49 | 49 | ?> |
50 | 50 |
@@ -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 | |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | usort($notices, 'version_compare'); |
16 | 16 | $notices = array_reverse($notices); |
17 | 17 | |
18 | - foreach($notices as $v) { |
|
18 | + foreach ($notices as $v) { |
|
19 | 19 | if ($v >= '1.3.0') { |
20 | 20 | $cms = 'EVO'; |
21 | 21 | } |
@@ -18,8 +18,7 @@ |
||
18 | 18 | foreach($notices as $v) { |
19 | 19 | if ($v >= '1.3.0') { |
20 | 20 | $cms = 'EVO'; |
21 | - } |
|
22 | - else { |
|
21 | + } else { |
|
23 | 22 | $cms = 'MODX EVO'; |
24 | 23 | } |
25 | 24 | echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">'; |
@@ -4,38 +4,38 @@ |
||
4 | 4 | } |
5 | 5 | $logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">'; |
6 | 6 | $downloadLinks = array( |
7 | - 0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'), |
|
8 | - 1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'), |
|
9 | - 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'), |
|
10 | - 3=>array('title'=>$_lang["extras"],'link'=>array( |
|
11 | - 'http://extras.evolution-cms.com/', |
|
12 | - 'https://github.com/extras-evolution' |
|
13 | - )), |
|
7 | + 0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'), |
|
8 | + 1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'), |
|
9 | + 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'), |
|
10 | + 3=>array('title'=>$_lang["extras"],'link'=>array( |
|
11 | + 'http://extras.evolution-cms.com/', |
|
12 | + 'https://github.com/extras-evolution' |
|
13 | + )), |
|
14 | 14 | ); |
15 | 15 | |
16 | 16 | $translationLinks = array( |
17 | - 0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'), |
|
18 | - 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'), |
|
17 | + 0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'), |
|
18 | + 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'), |
|
19 | 19 | ); |
20 | 20 | |
21 | 21 | function createList($sectionHeader, $linkArr) { |
22 | - $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n"; |
|
23 | - $output .= '<table width="500" border="0" cellspacing="0" cellpadding="0">'."\n"; |
|
24 | - $links = ''; |
|
25 | - foreach($linkArr as $row) { |
|
26 | - if (!is_array($row['link'])) $row['link'] = array($row['link']); |
|
27 | - foreach ($row['link'] as $link) { |
|
28 | - $links .= $links != '' ? '<br/>' : ''; |
|
29 | - $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>'; |
|
30 | - } |
|
31 | - $output .= ' |
|
22 | + $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n"; |
|
23 | + $output .= '<table width="500" border="0" cellspacing="0" cellpadding="0">'."\n"; |
|
24 | + $links = ''; |
|
25 | + foreach($linkArr as $row) { |
|
26 | + if (!is_array($row['link'])) $row['link'] = array($row['link']); |
|
27 | + foreach ($row['link'] as $link) { |
|
28 | + $links .= $links != '' ? '<br/>' : ''; |
|
29 | + $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>'; |
|
30 | + } |
|
31 | + $output .= ' |
|
32 | 32 | <tr> |
33 | 33 | <td align="left"><strong>' . $row["title"] . '</strong></td> |
34 | 34 | <td align="left">' . $links . '</td> |
35 | 35 | </tr>'; |
36 | - $links = ''; |
|
37 | - } |
|
38 | - $output .= '</table></div>'."\n"; |
|
36 | + $links = ''; |
|
37 | + } |
|
38 | + $output .= '</table></div>'."\n"; |
|
39 | 39 | return $output; |
40 | 40 | } |
41 | 41 | echo $logo; |
@@ -1,37 +1,37 @@ |
||
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 | -$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">'; |
|
5 | +$logo = '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">'; |
|
6 | 6 | $downloadLinks = array( |
7 | - 0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'), |
|
8 | - 1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'), |
|
9 | - 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'), |
|
10 | - 3=>array('title'=>$_lang["extras"],'link'=>array( |
|
7 | + 0=>array('title'=>$_lang["information"], 'link'=>'https://evo.im/'), |
|
8 | + 1=>array('title'=>$_lang["download"], 'link'=>'https://github.com/evolution-cms/evolution/releases'), |
|
9 | + 2=>array('title'=>$_lang["previous_releases"], 'link'=>'https://modx.com/download/evolution/previous-releases.html'), |
|
10 | + 3=>array('title'=>$_lang["extras"], 'link'=>array( |
|
11 | 11 | 'http://extras.evolution-cms.com/', |
12 | 12 | 'https://github.com/extras-evolution' |
13 | 13 | )), |
14 | 14 | ); |
15 | 15 | |
16 | 16 | $translationLinks = array( |
17 | - 0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'), |
|
18 | - 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'), |
|
17 | + 0=>array('title'=>'Evolution CMS', 'link'=>'https://www.transifex.com/evolutioncms/evolution/'), |
|
18 | + 1=>array('title'=>$_lang["extras"], 'link'=>'https://www.transifex.com/evolutioncms/extras/'), |
|
19 | 19 | ); |
20 | 20 | |
21 | -function createList($sectionHeader, $linkArr) { |
|
21 | +function createList($sectionHeader, $linkArr){ |
|
22 | 22 | $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n"; |
23 | 23 | $output .= '<table width="500" border="0" cellspacing="0" cellpadding="0">'."\n"; |
24 | 24 | $links = ''; |
25 | - foreach($linkArr as $row) { |
|
25 | + foreach ($linkArr as $row) { |
|
26 | 26 | if (!is_array($row['link'])) $row['link'] = array($row['link']); |
27 | 27 | foreach ($row['link'] as $link) { |
28 | 28 | $links .= $links != '' ? '<br/>' : ''; |
29 | - $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>'; |
|
29 | + $links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>'; |
|
30 | 30 | } |
31 | 31 | $output .= ' |
32 | 32 | <tr> |
33 | - <td align="left"><strong>' . $row["title"] . '</strong></td> |
|
34 | - <td align="left">' . $links . '</td> |
|
33 | + <td align="left"><strong>' . $row["title"].'</strong></td> |
|
34 | + <td align="left">' . $links.'</td> |
|
35 | 35 | </tr>'; |
36 | 36 | $links = ''; |
37 | 37 | } |
@@ -18,12 +18,15 @@ |
||
18 | 18 | 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'), |
19 | 19 | ); |
20 | 20 | |
21 | -function createList($sectionHeader, $linkArr) { |
|
21 | +function createList($sectionHeader, $linkArr) |
|
22 | +{ |
|
22 | 23 | $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n"; |
23 | 24 | $output .= '<table width="500" border="0" cellspacing="0" cellpadding="0">'."\n"; |
24 | 25 | $links = ''; |
25 | 26 | foreach($linkArr as $row) { |
26 | - if (!is_array($row['link'])) $row['link'] = array($row['link']); |
|
27 | + if (!is_array($row['link'])) { |
|
28 | + $row['link'] = array($row['link']); |
|
29 | + } |
|
27 | 30 | foreach ($row['link'] as $link) { |
28 | 31 | $links .= $links != '' ? '<br/>' : ''; |
29 | 32 | $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>'; |
@@ -7,8 +7,8 @@ |
||
7 | 7 | <div class="sectionHeader">Changelog</div> |
8 | 8 | <div class="sectionBody"> |
9 | 9 | <?php |
10 | - $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt'; |
|
11 | - if(is_readable($changeLog)) |
|
12 | - echo str_replace("\n",'<br>',file_get_contents($changeLog)); |
|
10 | + $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt'; |
|
11 | + if(is_readable($changeLog)) |
|
12 | + echo str_replace("\n",'<br>',file_get_contents($changeLog)); |
|
13 | 13 | ?> |
14 | 14 | </div> |
@@ -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 | ?> |
@@ -7,8 +7,8 @@ discard block |
||
7 | 7 | <div class="sectionHeader">Changelog</div> |
8 | 8 | <div class="sectionBody"> |
9 | 9 | <?php |
10 | - $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt'; |
|
11 | - if(is_readable($changeLog)) |
|
12 | - echo str_replace("\n",'<br>',file_get_contents($changeLog)); |
|
10 | + $changeLog = MODX_BASE_PATH.'assets/docs/changelog.txt'; |
|
11 | + if (is_readable($changeLog)) |
|
12 | + echo str_replace("\n", '<br>', file_get_contents($changeLog)); |
|
13 | 13 | ?> |
14 | 14 | </div> |
@@ -8,7 +8,8 @@ |
||
8 | 8 | <div class="sectionBody"> |
9 | 9 | <?php |
10 | 10 | $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt'; |
11 | - if(is_readable($changeLog)) |
|
12 | - echo str_replace("\n",'<br>',file_get_contents($changeLog)); |
|
13 | -?> |
|
11 | + if(is_readable($changeLog)) { |
|
12 | + echo str_replace("\n",'<br>',file_get_contents($changeLog)); |
|
13 | + } |
|
14 | + ?> |
|
14 | 15 | </div> |