Completed
Push — develop ( 47dc8d...db0854 )
by Agel_Nash
05:29
created
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/04Changelog.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
 ?>
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
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>
Please login to merge, or discard this patch.
manager/actions/resources/tab2_templatevars.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- Template variables -->
2 2
 <?php
3
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab3_chunks.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- chunks -->
2 2
 <?php
3
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab6_categoryview.inc.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/resources/tab4_snippets.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- snippets -->
2 2
 <?php
3
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab1_templates.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- Templates -->
2 2
 <?php
3
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab5_plugins.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- plugins -->
2 2
 <?php
3
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/web_access_permissions.dynamic.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -1,30 +1,30 @@  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('web_access_permissions')) {
5
+if (!$modx->hasPermission('web_access_permissions')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 // find all document groups, for the select :)
10 10
 $rs = $modx->db->select('*', $modx->getFullTableName('documentgroup_names'), '', 'name');
11
-if($modx->db->getRecordCount($rs) < 1) {
11
+if ($modx->db->getRecordCount($rs) < 1) {
12 12
 	$docgroupselector = "[no groups to add]";
13 13
 } else {
14
-	$docgroupselector = '<select name="docgroup">' . "\n";
15
-	while($row = $modx->db->getRow($rs)) {
16
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
14
+	$docgroupselector = '<select name="docgroup">'."\n";
15
+	while ($row = $modx->db->getRow($rs)) {
16
+		$docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
17 17
 	}
18 18
 	$docgroupselector .= "</select>\n";
19 19
 }
20 20
 
21 21
 $rs = $modx->db->select('*', $modx->getFullTableName('webgroup_names'), '', 'name');
22
-if($modx->db->getRecordCount($rs) < 1) {
22
+if ($modx->db->getRecordCount($rs) < 1) {
23 23
 	$usrgroupselector = '[no user groups]';
24 24
 } else {
25
-	$usrgroupselector = '<select name="usergroup">' . "\n";
26
-	while($row = $modx->db->getRow($rs)) {
27
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
25
+	$usrgroupselector = '<select name="usergroup">'."\n";
26
+	while ($row = $modx->db->getRow($rs)) {
27
+		$usrgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
28 28
 	}
29 29
 	$usrgroupselector .= "</select>\n";
30 30
 }
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	<div class="alert alert-info"><?= $_lang['access_permissions_introtext'] ?></div>
61 61
 </div>
62 62
 
63
-<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">' . $_lang['access_permissions_off'] . '</div>' : '') ?></div>
63
+<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">'.$_lang['access_permissions_off'].'</div>' : '') ?></div>
64 64
 
65 65
 
66 66
 <div class="tab-pane" id="wuapPane">
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 				</form>
89 89
 			</div>
90 90
 			<?php
91
-			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
92
-			LEFT JOIN " . $modx->getFullTableName('web_groups') . " AS groups ON groups.webgroup = groupnames.id
93
-			LEFT JOIN " . $modx->getFullTableName('web_users') . " AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
94
-			if($modx->db->getRecordCount($rs) < 1) {
91
+			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names')." AS groupnames
92
+			LEFT JOIN " . $modx->getFullTableName('web_groups')." AS groups ON groups.webgroup = groupnames.id
93
+			LEFT JOIN " . $modx->getFullTableName('web_users')." AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
94
+			if ($modx->db->getRecordCount($rs) < 1) {
95 95
 				?>
96 96
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
97 97
 				<?php
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 			<div class="form-group">
101 101
 				<?php
102 102
 				$pid = '';
103
-				while($row = $modx->db->getRow($rs)) {
104
-					if($pid != $row['id']) {
105
-						if($pid != '') {
103
+				while ($row = $modx->db->getRow($rs)) {
104
+					if ($pid != $row['id']) {
105
+						if ($pid != '') {
106 106
 							echo '</div><div class="form-group">';
107 107
 						}
108 108
 						?>
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 						<?= $_lang['web_access_permissions_users_in_group'] ?>
122 122
 						<?php
123 123
 					}
124
-					if(!$row['user_id']) {
124
+					if (!$row['user_id']) {
125 125
 						?>
126 126
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
127 127
 						<?php
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 				</form>
160 160
 			</div>
161 161
 			<?php
162
-			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
163
-			LEFT JOIN " . $modx->getFullTableName('document_groups') . " AS dg ON dg.document_group = dgnames.id
164
-			LEFT JOIN " . $modx->getFullTableName('site_content') . " AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
165
-			if($modx->db->getRecordCount($rs) < 1) {
162
+			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names')." AS dgnames
163
+			LEFT JOIN " . $modx->getFullTableName('document_groups')." AS dg ON dg.document_group = dgnames.id
164
+			LEFT JOIN " . $modx->getFullTableName('site_content')." AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
165
+			if ($modx->db->getRecordCount($rs) < 1) {
166 166
 				?>
167 167
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
168 168
 				<?php
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 			<div class="form-group">
172 172
 				<?php
173 173
 				$pid = '';
174
-				while($row = $modx->db->getRow($rs)) {
175
-					if($pid != $row['id']) {
176
-						if($pid != '') {
174
+				while ($row = $modx->db->getRow($rs)) {
175
+					if ($pid != $row['id']) {
176
+						if ($pid != '') {
177 177
 							echo '</div><div class="form-group">';
178 178
 						}
179 179
 						?>
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 						<?= $_lang['access_permissions_resources_in_group'] ?>
193 193
 						<?php
194 194
 					}
195
-					if(!$row['doc_id']) {
195
+					if (!$row['doc_id']) {
196 196
 						?>
197 197
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
198 198
 						<?php
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
 		<div class="container container-body">
218 218
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
219 219
 			<?php
220
-			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
221
-			LEFT JOIN " . $modx->getFullTableName('webgroup_access') . " AS groupacc ON groupacc.webgroup = groupnames.id
222
-			LEFT JOIN " . $modx->getFullTableName('documentgroup_names') . " AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
223
-			if($modx->db->getRecordCount($rs) < 1) {
220
+			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names')." AS groupnames
221
+			LEFT JOIN " . $modx->getFullTableName('webgroup_access')." AS groupacc ON groupacc.webgroup = groupnames.id
222
+			LEFT JOIN " . $modx->getFullTableName('documentgroup_names')." AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
223
+			if ($modx->db->getRecordCount($rs) < 1) {
224 224
 				?>
225 225
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
226 226
 				<?php
@@ -242,23 +242,23 @@  discard block
 block discarded – undo
242 242
 				<ul>
243 243
 					<?php
244 244
 					$pid = '';
245
-					while($row = $modx->db->getRow($rs)) {
246
-						if($row['id'] != $pid) {
247
-							if($pid != '') {
245
+					while ($row = $modx->db->getRow($rs)) {
246
+						if ($row['id'] != $pid) {
247
+							if ($pid != '') {
248 248
 								echo '</ul></li>';
249 249
 							} // close previous one
250 250
 							?>
251 251
 							<li><b><?= $row['name'] ?></b></li>
252 252
 							<?php
253
-							if(!$row['dg_id']) {
254
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
253
+							if (!$row['dg_id']) {
254
+								echo '<i>'.$_lang['no_groups_found'].'</i></li>';
255 255
 								$pid = '';
256 256
 								continue;
257 257
 							} else {
258 258
 								echo '<ul>';
259 259
 							}
260 260
 						}
261
-						if(!$row['dg_id']) {
261
+						if (!$row['dg_id']) {
262 262
 							continue;
263 263
 						}
264 264
 						?>
Please login to merge, or discard this patch.