Completed
Pull Request — develop (#522)
by Agel_Nash
07:16
created
manager/actions/mutate_plugin.dynamic.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 // Add lock-element JS-Script
57 57
 $lockElementId = $id;
58 58
 $lockElementType = 5;
59
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
59
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
60 60
 
61 61
 function bold($cond = false)
62 62
 {
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
     <input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
479 479
 
480 480
     <h1>
481
-        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
481
+        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
482 482
     </h1>
483 483
 
484 484
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                             <div class="form-control-name clearfix">
505 505
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
506 506
                                 <?php if ($modx->hasPermission('save_role')): ?>
507
-                                <label class="custom-control" title="<?= $_lang['lock_plugin'] . "\n" . $_lang['lock_plugin_msg'] ?>" tooltip>
507
+                                <label class="custom-control" title="<?= $_lang['lock_plugin']."\n".$_lang['lock_plugin_msg'] ?>" tooltip>
508 508
                                     <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
509 509
                                     <i class="fa fa-lock"></i>
510 510
                                 </label>
@@ -528,9 +528,9 @@  discard block
 block discarded – undo
528 528
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
529 529
                                 <option>&nbsp;</option>
530 530
                                 <?php
531
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
531
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
532 532
                                 foreach (getCategories() as $n => $v) {
533
-                                    echo '<option value="' . $v['id'] . '"' . ($content["category"] == $v["id"] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v["category"]) . "</option>";
533
+                                    echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v["category"])."</option>";
534 534
                                 }
535 535
                                 ?>
536 536
                             </select>
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
                 <?php if ($modx->hasPermission('save_role')): ?>
547 547
                 <div class="form-group">
548 548
                     <div class="form-row">
549
-                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['plugin_disabled'] . "</span>" : $_lang['plugin_disabled']) ?></label>
549
+                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['plugin_disabled']."</span>" : $_lang['plugin_disabled']) ?></label>
550 550
                     </div>
551 551
                     <div class="form-row">
552 552
                         <label>
@@ -593,11 +593,11 @@  discard block
 block discarded – undo
593 593
                             <select name="moduleguid" class="form-control" onchange="documentDirty=true;">
594 594
                                 <option>&nbsp;</option>
595 595
                                 <?php
596
-                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm 
597
-								INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
598
-								INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
596
+                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm 
597
+								INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
598
+								INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
599 599
                                 while ($row = $modx->db->getRow($ds)) {
600
-                                    echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($row["name"]) . "</option>";
600
+                                    echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($row["name"])."</option>";
601 601
                                 }
602 602
                                 ?>
603 603
                             </select>
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
                                 echoEventRows($evtnames);
659 659
                             }
660 660
                             echo '<hr class="clear">';
661
-                            echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>';
661
+                            echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>';
662 662
                         }
663 663
                         // display group name
664 664
                         if ($grp != $row['groupname']) {
@@ -667,9 +667,9 @@  discard block
 block discarded – undo
667 667
                                 echoEventRows($evtnames);
668 668
                             }
669 669
                             echo '<hr class="clear">';
670
-                            echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>';
670
+                            echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>';
671 671
                         }
672
-                        $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n";
672
+                        $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n";
673 673
                         if (count($evtnames) == 2) {
674 674
                             echoEventRows($evtnames);
675 675
                         }
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
 
682 682
                 function echoEventRows(&$evtnames)
683 683
                 {
684
-                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">' . implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) . '</div></div>';
684
+                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">'.implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).'</div></div>';
685 685
                     $evtnames = array();
686 686
                 }
687 687
 
Please login to merge, or discard this patch.
manager/actions/logging.static.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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]; // ."&nbsp;";
@@ -244,11 +244,11 @@  discard block
 block discarded – undo
244 244
         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";
245 245
     } else {
246 246
         for ($i = 0; $i < $pagesfound; $i++) {
247
-            $paging .= $array_row_paging[$i] . "&nbsp;";
247
+            $paging .= $array_row_paging[$i]."&nbsp;";
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
 block discarded – undo
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&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';
285
+                        $item = '<a href="index.php?a=3&amp;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>
Please login to merge, or discard this patch.
manager/actions/export_site.static.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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>
Please login to merge, or discard this patch.
manager/actions/messages.static.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'] . "&lt;&lt;" . (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']."&lt;&lt;".(isset($array_paging['previous_link']) ? "</a> " : " ");
124 124
         for ($i = 0; $i < sizeof($array_row_paging); $i++) {
125
-            $pager .= $array_row_paging[$i] . "&nbsp;";
125
+            $pager .= $array_row_paging[$i]."&nbsp;";
126 126
         }
127
-        $pager .= $array_paging['next_link'] . "&gt;&gt;" . (isset($array_paging['next_link']) ? "</a>" : "");
127
+        $pager .= $array_paging['next_link']."&gt;&gt;".(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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 ?>
Please login to merge, or discard this patch.
manager/actions/mutate_tv_rank.dynamic.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
manager/actions/mutate_role.dynamic.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
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
 
6
-switch((int) $modx->manager->action) {
6
+switch ((int) $modx->manager->action) {
7 7
 	case 35:
8
-		if(!$modx->hasPermission('edit_role')) {
8
+		if (!$modx->hasPermission('edit_role')) {
9 9
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
10 10
 		}
11 11
 		break;
12 12
 	case 38:
13
-		if(!$modx->hasPermission('new_role')) {
13
+		if (!$modx->hasPermission('new_role')) {
14 14
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
15 15
 		}
16 16
 		break;
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 $tbl_user_roles = $modx->getFullTableName('user_roles');
24 24
 
25 25
 // check to see the snippet editor isn't locked
26
-if($lockedEl = $modx->elementIsLocked(8, $role)) {
26
+if ($lockedEl = $modx->elementIsLocked(8, $role)) {
27 27
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
28 28
 }
29 29
 // end check for lock
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 // Lock snippet for other users to edit
32 32
 $modx->lockElement(8, $role);
33 33
 
34
-if($modx->manager->action == '35') {
34
+if ($modx->manager->action == '35') {
35 35
 	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
36 36
 	$roledata = $modx->db->getRow($rs);
37
-	if(!$roledata) {
37
+	if (!$roledata) {
38 38
 		$modx->webAlertAndQuit("No role returned!");
39 39
 	}
40 40
 	$_SESSION['itemname'] = $roledata['name'];
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 // Add lock-element JS-Script
47 47
 $lockElementId = $role;
48 48
 $lockElementType = 8;
49
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
49
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
50 50
 ?>
51 51
 	<script type="text/javascript">
52 52
 		function changestate(element) {
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		<input type="hidden" name="id" value="<?= $_GET['id'] ?>">
83 83
 
84 84
 		<h1>
85
-            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?>
85
+            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?>
86 86
         </h1>
87 87
 
88 88
 		<?= $_style['actionbuttons']['dynamic']['savedelete'] ?>
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 	</form>
294 294
 
295 295
 <?php
296
-function render_form($name, $label, $status = '') {
296
+function render_form($name, $label, $status = ''){
297 297
 	global $modx, $roledata;
298 298
 
299 299
 	$tpl = '<label class="d-block" for="[+name+]check">
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 
305 305
 	$checked = ($roledata[$name] == 1) ? 'checked' : '';
306 306
 	$value = ($roledata[$name] == 1) ? 1 : 0;
307
-	if($status == 'disabled') {
307
+	if ($status == 'disabled') {
308 308
 		$checked = 'checked';
309 309
 		$value = 1;
310 310
 		$set = 'fix';
Please login to merge, or discard this patch.
manager/actions/help/02Documentation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-if( ! defined('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
 ?>
Please login to merge, or discard this patch.
manager/actions/help/03Version_Notices.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
manager/actions/help/01About_EVO.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,37 +1,37 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.