Completed
Push — develop ( 6df80e...9a0e8e )
by Maxim
06:04
created
manager/actions/mutate_settings/tab1_site_settings.inc.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
   <tr>
14 14
     <th><?php echo $_lang['sitestatus_title'] ?><br><small>[(site_status)]</small></th>
15 15
     <td>
16
-        <?php echo wrap_label($_lang['online'],  form_radio('site_status', 1));?><br />
17
-        <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0));?>
16
+        <?php echo wrap_label($_lang['online'], form_radio('site_status', 1)); ?><br />
17
+        <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0)); ?>
18 18
     </td>
19 19
   </tr>
20 20
   <tr>
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
       <br />
59 59
       <p><?php echo $_lang['update_settings_from_language']; ?></p>
60 60
       <select name="reload_site_unavailable" id="reload_site_unavailable_select" onchange="confirmLangChange(this, 'siteunavailable_message_default', 'site_unavailable_message_textarea');">
61
-<?php echo get_lang_options('siteunavailable_message_default');?>
61
+<?php echo get_lang_options('siteunavailable_message_default'); ?>
62 62
       </select>
63 63
     </th>
64 64
     <td> <textarea name="site_unavailable_message" id="site_unavailable_message_textarea" style="width:100%; height: 120px;"><?php echo $site_unavailable_message_view; ?></textarea>
65
-        <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']);?>" />
66
-  <div class="comment"><?php echo $_lang['siteunavailable_message'];?></div>
65
+        <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']); ?>" />
66
+  <div class="comment"><?php echo $_lang['siteunavailable_message']; ?></div>
67 67
     </td>
68 68
   </tr>
69 69
   <tr>
@@ -78,17 +78,17 @@  discard block
 block discarded – undo
78 78
             'c.category, t.templatename ASC'
79 79
             );
80 80
     ?>
81
-      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template;?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">
81
+      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template; ?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">
82 82
         <?php
83 83
 
84 84
         $currentCategory = '';
85 85
                         while ($row = $modx->getDatabase()->getRow($rs)) {
86 86
             $thisCategory = $row['category'];
87
-            if($thisCategory == null) {
87
+            if ($thisCategory == null) {
88 88
                 $thisCategory = $_lang['no_category'];
89 89
             }
90
-            if($thisCategory != $currentCategory) {
91
-                if($closeOptGroup) {
90
+            if ($thisCategory != $currentCategory) {
91
+                if ($closeOptGroup) {
92 92
                     echo "\t\t\t\t\t</optgroup>\n";
93 93
                 }
94 94
                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
             echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
107 107
             $currentCategory = $thisCategory;
108 108
         }
109
-        if($thisCategory != '') {
109
+        if ($thisCategory != '') {
110 110
             echo "\t\t\t\t\t</optgroup>\n";
111 111
         }
112 112
 ?>
@@ -114,19 +114,19 @@  discard block
 block discarded – undo
114 114
           <br />
115 115
         <div id="template_reset_options_wrapper" style="display:none;">
116 116
             <label><input type="radio" name="reset_template" value="1" /> <?php echo $_lang['template_reset_all']; ?></label><br />
117
-            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'],$oldTmpName); ?></label>
117
+            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'], $oldTmpName); ?></label>
118 118
         </div>
119 119
         <input type="hidden" name="old_template" value="<?php echo $oldTmpId; ?>" />
120 120
   <div class="comment"><?php echo $_lang['defaulttemplate_message'] ?></div>
121 121
     </td>
122 122
   </tr>
123 123
   <tr>
124
-        <th><?php echo $_lang['defaulttemplate_logic_title'];?><br><small>[(auto_template_logic)]</small></th>
124
+        <th><?php echo $_lang['defaulttemplate_logic_title']; ?><br><small>[(auto_template_logic)]</small></th>
125 125
         <td>
126
-            <p><?php echo $_lang['defaulttemplate_logic_general_message'];?></p>
127
-            <label><input type="radio" name="auto_template_logic" value="system"<?php if($auto_template_logic == 'system') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />
128
-            <label><input type="radio" name="auto_template_logic" value="parent"<?php if($auto_template_logic == 'parent') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />
129
-            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if($auto_template_logic == 'sibling') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />
126
+            <p><?php echo $_lang['defaulttemplate_logic_general_message']; ?></p>
127
+            <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />
128
+            <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />
129
+            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />
130 130
         </td>
131 131
     </tr>
132 132
     <tr>
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
               $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_plugins'),
139 139
               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")
140 140
             );
141
-            if($count) {
141
+            if ($count) {
142 142
                 $disabledFilters = 1;
143 143
                 echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';
144 144
             }
145 145
             else $disabledFilters = false;
146 146
         ?>
147
-        <?php echo wrap_label($_lang['yes'],form_radio('enable_filter', 1, '', $disabledFilters));?><br />
148
-        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters));?>
147
+        <?php echo wrap_label($_lang['yes'], form_radio('enable_filter', 1, '', $disabledFilters)); ?><br />
148
+        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters)); ?>
149 149
         <div class="comment"><?php echo $_lang['enable_filter_message']; ?></div>
150 150
       </td>
151 151
     </tr>
152 152
     <tr>
153 153
       <th><?php echo $_lang['enable_at_syntax_title'] ?><br><small>[(enable_at_syntax)]</small></th>
154 154
       <td >
155
-        <?php echo wrap_label($_lang['yes'],form_radio('enable_at_syntax', 1));?><br />
156
-        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0));?>
155
+        <?php echo wrap_label($_lang['yes'], form_radio('enable_at_syntax', 1)); ?><br />
156
+        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0)); ?>
157 157
         <div class="comment">
158 158
             <?php echo $_lang['enable_at_syntax_message']; ?>
159 159
             <ul>
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
   <tr>
168 168
     <th><?php echo $_lang['defaultpublish_title'] ?><br><small>[(publish_default)]</small></th>
169 169
     <td>
170
-        <?php echo wrap_label($_lang['yes'],form_radio('publish_default', 1));?><br />
171
-        <?php echo wrap_label($_lang['no'],form_radio('publish_default', 0));?>
170
+        <?php echo wrap_label($_lang['yes'], form_radio('publish_default', 1)); ?><br />
171
+        <?php echo wrap_label($_lang['no'], form_radio('publish_default', 0)); ?>
172 172
         <div class="comment"><?php echo $_lang['defaultpublish_message'] ?></div>
173 173
     </td>
174 174
   </tr>
@@ -176,24 +176,24 @@  discard block
 block discarded – undo
176 176
   <tr>
177 177
     <th><?php echo $_lang['defaultcache_title'] ?><br><small>[(cache_default)]</small></th>
178 178
     <td>
179
-        <?php echo wrap_label($_lang['yes'],form_radio('cache_default', 1));?><br />
180
-        <?php echo wrap_label($_lang['no'],form_radio('cache_default', 0));?>
179
+        <?php echo wrap_label($_lang['yes'], form_radio('cache_default', 1)); ?><br />
180
+        <?php echo wrap_label($_lang['no'], form_radio('cache_default', 0)); ?>
181 181
         <div class="comment"><?php echo $_lang['defaultcache_message'] ?></div>
182 182
     </td>
183 183
   </tr>
184 184
   <tr>
185 185
     <th><?php echo $_lang['defaultsearch_title'] ?><br><small>[(search_default)]</small></th>
186 186
     <td>
187
-        <?php echo wrap_label($_lang['yes'],form_radio('search_default', 1));?><br />
188
-        <?php echo wrap_label($_lang['no'],form_radio('search_default', 0));?>
187
+        <?php echo wrap_label($_lang['yes'], form_radio('search_default', 1)); ?><br />
188
+        <?php echo wrap_label($_lang['no'], form_radio('search_default', 0)); ?>
189 189
         <div class="comment"><?php echo $_lang['defaultsearch_message'] ?></div>
190 190
     </td>
191 191
   </tr>
192 192
   <tr>
193 193
     <th><?php echo $_lang['defaultmenuindex_title'] ?><br><small>[(auto_menuindex)]</small></th>
194 194
     <td>
195
-        <?php echo wrap_label($_lang['yes'],form_radio('auto_menuindex', 1));?><br />
196
-        <?php echo wrap_label($_lang['no'],form_radio('auto_menuindex', 0));?>
195
+        <?php echo wrap_label($_lang['yes'], form_radio('auto_menuindex', 1)); ?><br />
196
+        <?php echo wrap_label($_lang['no'], form_radio('auto_menuindex', 0)); ?>
197 197
         <div class="comment"><?php echo $_lang['defaultmenuindex_message'] ?></div>
198 198
     </td>
199 199
   </tr>
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
     <table border="0" cellspacing="0" cellpadding="0"><tr><td valign="top">
204 204
     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">
205 205
     <?php
206
-        $ct = explode(",",$custom_contenttype);
207
-        for($i=0;$i<count($ct);$i++) {
206
+        $ct = explode(",", $custom_contenttype);
207
+        for ($i = 0; $i < count($ct); $i++) {
208 208
             echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";
209 209
         }
210 210
     ?>
@@ -218,14 +218,14 @@  discard block
 block discarded – undo
218 218
 <th><?php echo $_lang['docid_incrmnt_method_title'] ?><br><small>[(docid_incrmnt_method)]</small></th>
219 219
 <td>
220 220
 <label><input type="radio" name="docid_incrmnt_method" value="0"
221
-    <?php echo ($docid_incrmnt_method=='0') ? 'checked="checked"' : "" ; ?> />
221
+    <?php echo ($docid_incrmnt_method == '0') ? 'checked="checked"' : ""; ?> />
222 222
     <?php echo $_lang['docid_incrmnt_method_0']?></label><br />
223 223
 
224 224
 <label><input type="radio" name="docid_incrmnt_method" value="1"
225
-    <?php echo ($docid_incrmnt_method=='1') ? 'checked="checked"' : "" ; ?> />
225
+    <?php echo ($docid_incrmnt_method == '1') ? 'checked="checked"' : ""; ?> />
226 226
     <?php echo $_lang['docid_incrmnt_method_1']?></label><br />
227 227
 <label><input type="radio" name="docid_incrmnt_method" value="2"
228
-    <?php echo ($docid_incrmnt_method=='2') ? 'checked="checked"' : "" ; ?> />
228
+    <?php echo ($docid_incrmnt_method == '2') ? 'checked="checked"' : ""; ?> />
229 229
     <?php echo $_lang['docid_incrmnt_method_2']?></label><br />
230 230
 </td>
231 231
 </tr>
@@ -233,24 +233,24 @@  discard block
 block discarded – undo
233 233
 <tr>
234 234
 <th><?php echo $_lang['enable_cache_title'] ?><br><small>[(enable_cache)]</small></th>
235 235
 <td>
236
-    <?php echo wrap_label($_lang['enabled'],form_radio('enable_cache', 1));?><br />
237
-    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0));?><br />
238
-    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2));?>
236
+    <?php echo wrap_label($_lang['enabled'], form_radio('enable_cache', 1)); ?><br />
237
+    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0)); ?><br />
238
+    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2)); ?>
239 239
 </td>
240 240
 </tr>
241 241
 
242 242
 <tr>
243 243
 <th><?php echo $_lang['cache_type_title'] ?><br><small>[(cache_type)]</small></th>
244 244
 <td>
245
-<?php echo wrap_label($_lang['cache_type_1'],form_radio('cache_type', 1));?><br />
246
-<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2));?>
245
+<?php echo wrap_label($_lang['cache_type_1'], form_radio('cache_type', 1)); ?><br />
246
+<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2)); ?>
247 247
 </td>
248 248
 </tr>
249 249
   <tr>
250 250
 <th><?php echo $_lang['minifyphp_incache_title'] ?><br><small>[(minifyphp_incache)]</small></th>
251 251
     <td>
252
-<?php echo wrap_label($_lang['enabled'],form_radio('minifyphp_incache', 1));?><br />
253
-<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0));?>
252
+<?php echo wrap_label($_lang['enabled'], form_radio('minifyphp_incache', 1)); ?><br />
253
+<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0)); ?>
254 254
 <div class="comment"><?php echo $_lang['minifyphp_incache_message'] ?></div>
255 255
     </td>
256 256
   </tr>
@@ -259,23 +259,23 @@  discard block
 block discarded – undo
259 259
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>
260 260
       <td> <select name="server_offset_time" size="1" class="inputBox">
261 261
           <?php
262
-      for($i=-24; $i<25; $i++) {
263
-          $seconds = $i*60*60;
264
-          $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;
262
+      for ($i = -24; $i < 25; $i++) {
263
+          $seconds = $i * 60 * 60;
264
+          $selectedtext = $seconds == $server_offset_time ? "selected='selected'" : "";
265 265
       ?>
266 266
           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>
267 267
           <?php
268 268
       }
269 269
       ?>
270 270
         </select>
271
-        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>
271
+        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $server_offset_time)); ?></div>
272 272
         </td>
273 273
     </tr>
274 274
     <tr>
275 275
       <th><?php echo $_lang['server_protocol_title'] ?><br><small>[(server_protocol)]</small></th>
276 276
       <td>
277
-        <?php echo wrap_label($_lang['server_protocol_http'],form_radio('server_protocol', 'http'));?><br />
278
-        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https'));?>
277
+        <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http')); ?><br />
278
+        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https')); ?>
279 279
         <div class="comment"><?php echo $_lang['server_protocol_message'] ?></div>
280 280
       </td>
281 281
     </tr>
@@ -288,8 +288,8 @@  discard block
 block discarded – undo
288 288
     <tr>
289 289
      <th><?php echo $_lang['track_visitors_title'] ?><br><small>[(track_visitors)]</small></th>
290 290
      <td>
291
-         <?php echo wrap_label($_lang['yes'],form_radio('track_visitors', 1));?><br />
292
-         <?php echo wrap_label($_lang['no'],form_radio('track_visitors', 0));?>
291
+         <?php echo wrap_label($_lang['yes'], form_radio('track_visitors', 1)); ?><br />
292
+         <?php echo wrap_label($_lang['no'], form_radio('track_visitors', 0)); ?>
293 293
          <div class="comment"><?php echo $_lang['track_visitors_message'] ?></div>
294 294
      </td>
295 295
    </tr>
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
         <?php
302 302
             // invoke OnSiteSettingsRender event
303 303
             $evtOut = $modx->invokeEvent('OnSiteSettingsRender');
304
-            if(is_array($evtOut)) echo implode("",$evtOut);
304
+            if (is_array($evtOut)) echo implode("", $evtOut);
305 305
         ?>
306 306
     </td>
307 307
   </tr>
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->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('documentgroup_names'), '', 'name');
11
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
11
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
12 12
 	$docgroupselector = "[no groups to add]";
13 13
 } else {
14
-	$docgroupselector = '<select name="docgroup">' . "\n";
15
-	while($row = $modx->getDatabase()->getRow($rs)) {
16
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
14
+	$docgroupselector = '<select name="docgroup">'."\n";
15
+	while ($row = $modx->getDatabase()->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->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('webgroup_names'), '', 'name');
22
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
22
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
23 23
 	$usrgroupselector = '[no user groups]';
24 24
 } else {
25
-	$usrgroupselector = '<select name="usergroup">' . "\n";
26
-	while($row = $modx->getDatabase()->getRow($rs)) {
27
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
25
+	$usrgroupselector = '<select name="usergroup">'."\n";
26
+	while ($row = $modx->getDatabase()->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->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getDatabase()->getFullTableName('webgroup_names') . " AS groupnames
92
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('web_groups') . " AS groups ON groups.webgroup = groupnames.id
93
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('web_users') . " AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
94
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
91
+			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getDatabase()->getFullTableName('webgroup_names')." AS groupnames
92
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('web_groups')." AS groups ON groups.webgroup = groupnames.id
93
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('web_users')." AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
94
+			if ($modx->getDatabase()->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->getDatabase()->getRow($rs)) {
104
-					if($pid != $row['id']) {
105
-						if($pid != '') {
103
+				while ($row = $modx->getDatabase()->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->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getDatabase()->getFullTableName('documentgroup_names') . " AS dgnames
163
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('document_groups') . " AS dg ON dg.document_group = dgnames.id
164
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('site_content') . " AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
165
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
162
+			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getDatabase()->getFullTableName('documentgroup_names')." AS dgnames
163
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('document_groups')." AS dg ON dg.document_group = dgnames.id
164
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('site_content')." AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
165
+			if ($modx->getDatabase()->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->getDatabase()->getRow($rs)) {
175
-					if($pid != $row['id']) {
176
-						if($pid != '') {
174
+				while ($row = $modx->getDatabase()->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->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getDatabase()->getFullTableName('webgroup_names') . " AS groupnames
221
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('webgroup_access') . " AS groupacc ON groupacc.webgroup = groupnames.id
222
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName('documentgroup_names') . " AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
223
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
220
+			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getDatabase()->getFullTableName('webgroup_names')." AS groupnames
221
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('webgroup_access')." AS groupacc ON groupacc.webgroup = groupnames.id
222
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName('documentgroup_names')." AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
223
+			if ($modx->getDatabase()->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->getDatabase()->getRow($rs)) {
246
-						if($row['id'] != $pid) {
247
-							if($pid != '') {
245
+					while ($row = $modx->getDatabase()->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.
manager/actions/document_data.static.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  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
-if(isset($_REQUEST['id'])) {
6
+if (isset($_REQUEST['id'])) {
7 7
 	$id = (int) $_REQUEST['id'];
8 8
 } else {
9 9
 	$id = 0;
10 10
 }
11 11
 
12
-if(isset($_GET['opened'])) {
12
+if (isset($_GET['opened'])) {
13 13
 	$_SESSION['openedArray'] = $_GET['opened'];
14 14
 }
15 15
 
@@ -22,16 +22,16 @@  discard block
 block discarded – undo
22 22
 $tbl_site_templates = $modx->getDatabase()->getFullTableName('site_templates');
23 23
 
24 24
 // Get access permissions
25
-if($_SESSION['mgrDocgroups']) {
25
+if ($_SESSION['mgrDocgroups']) {
26 26
 	$docgrp = implode(",", $_SESSION['mgrDocgroups']);
27 27
 }
28
-$access = "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0" . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
28
+$access = "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0".(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
29 29
 
30 30
 //
31
-if($_SESSION['tree_show_only_folders']) {
32
-	$parent = $id ? ($modx->getDatabase()->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0;
33
-	$isfolder = $modx->getDatabase()->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1");
34
-	if(!$isfolder && $parent != 0) {
31
+if ($_SESSION['tree_show_only_folders']) {
32
+	$parent = $id ? ($modx->getDatabase()->getValue("SELECT parent FROM ".$tbl_site_content." WHERE id=$id LIMIT 1")) : 0;
33
+	$isfolder = $modx->getDatabase()->getValue("SELECT isfolder FROM ".$tbl_site_content." WHERE id=$id LIMIT 1");
34
+	if (!$isfolder && $parent != 0) {
35 35
 		$id = $_REQUEST['id'] = $parent;
36 36
 	}
37 37
 }
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 $rs = $modx->getDatabase()->select('DISTINCT sc.*', "{$tbl_site_content} AS sc
41 41
 		LEFT JOIN {$tbl_document_groups} AS dg ON dg.document = sc.id", "sc.id ='{$id}' AND ({$access})");
42 42
 $content = $modx->getDatabase()->getRow($rs);
43
-if(!$content) {
43
+if (!$content) {
44 44
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
45 45
 }
46 46
 
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
 );
83 83
 $filter_sort = '';
84 84
 $filter_dir = '';
85
-if($numRecords > 0) {
86
-	$filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //********  resource_opt_is_published - //
87
-		'<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********//
85
+if ($numRecords > 0) {
86
+	$filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&dir='.$dir.'&sort=\'+this.options[this.selectedIndex].value">'.'<option value="createdon"'.(($sort == 'createdon') ? ' selected' : '').'>'.$_lang['createdon'].'</option>'.'<option value="pub_date"'.(($sort == 'pub_date') ? ' selected' : '').'>'.$_lang["page_data_publishdate"].'</option>'.'<option value="pagetitle"'.(($sort == 'pagetitle') ? ' selected' : '').'>'.$_lang['pagetitle'].'</option>'.'<option value="menuindex"'.(($sort == 'menuindex') ? ' selected' : '').'>'.$_lang['resource_opt_menu_index'].'</option>'.//********  resource_opt_is_published - //
87
+		'<option value="published"'.(($sort == 'published') ? ' selected' : '').'>'.$_lang['resource_opt_is_published'].'</option>'.//********//
88 88
 		'</select>';
89
-	$filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>';
89
+	$filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&sort='.$sort.'&dir=\'+this.options[this.selectedIndex].value">'.'<option value="DESC"'.(($dir == 'DESC') ? ' selected' : '').'>'.$_lang['sort_desc'].'</option>'.'<option value="ASC"'.(($dir == 'ASC') ? ' selected' : '').'>'.$_lang['sort_asc'].'</option>'.'</select>';
90 90
 	$resource = $modx->getDatabase()->makeArray($rs);
91 91
 
92 92
 	// CSS style for table
@@ -130,10 +130,10 @@  discard block
 block discarded – undo
130 130
 	);
131 131
 	$modx->getMakeTable()->setColumnWidths($tbWidth);
132 132
 
133
-	$sd = isset($_REQUEST['dir']) ? '&amp;dir=' . $_REQUEST['dir'] : '&amp;dir=DESC';
134
-	$sb = isset($_REQUEST['sort']) ? '&amp;sort=' . $_REQUEST['sort'] : '&amp;sort=createdon';
135
-	$pg = isset($_REQUEST['page']) ? '&amp;page=' . (int) $_REQUEST['page'] : '';
136
-	$add_path = $sd . $sb . $pg;
133
+	$sd = isset($_REQUEST['dir']) ? '&amp;dir='.$_REQUEST['dir'] : '&amp;dir=DESC';
134
+	$sb = isset($_REQUEST['sort']) ? '&amp;sort='.$_REQUEST['sort'] : '&amp;sort=createdon';
135
+	$pg = isset($_REQUEST['page']) ? '&amp;page='.(int) $_REQUEST['page'] : '';
136
+	$add_path = $sd.$sb.$pg;
137 137
 
138 138
 	$icons = array(
139 139
 		'text/html' => $_style['tree_page_html'],
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
 	);
152 152
 
153 153
 	$listDocs = array();
154
-	foreach($resource as $k => $children) {
154
+	foreach ($resource as $k => $children) {
155 155
 
156
-		switch($children['id']) {
156
+		switch ($children['id']) {
157 157
 			case $modx->config['site_start']            :
158 158
 				$icon = $_style['tree_page_home'];
159 159
 				break;
@@ -167,10 +167,10 @@  discard block
 block discarded – undo
167 167
 				$icon = $_style['tree_page_info'];
168 168
 				break;
169 169
 			default:
170
-				if($children['isfolder']) {
170
+				if ($children['isfolder']) {
171 171
 					$icon = $_style['tree_folder_new'];
172 172
 				} else {
173
-					if(isset($icons[$children['contentType']])) {
173
+					if (isset($icons[$children['contentType']])) {
174 174
 						$icon = $icons[$children['contentType']];
175 175
 					} else {
176 176
 						$icon = $_style['tree_page'];
@@ -185,32 +185,32 @@  discard block
 block discarded – undo
185 185
 		$class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
186 186
 		//$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
187 187
 		//$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
188
-		if($modx->hasPermission('edit_document')) {
189
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></a></span>';
188
+		if ($modx->hasPermission('edit_document')) {
189
+			$title = '<span class="doc-item'.$private.'">'.$icon.'<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'">'.'<span class="'.$class.'">'.$children['pagetitle'].'</span></a></span>';
190 190
 		} else {
191
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></span>';
191
+			$title = '<span class="doc-item'.$private.'">'.$icon.'<span class="'.$class.'">'.$children['pagetitle'].'</span></span>';
192 192
 		}
193 193
 
194
-		$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>';
194
+		$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><i class="'.$_style["icons_publish_document"].'"></i></a>' : '<a href="index.php?a=62&amp;id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><i class="'.$_style["icons_unpublish_resource"].'" ></i></a>';
195 195
 
196
-		$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>';
196
+		$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\''.$_lang["confirm_delete_resource"].'\')" href="index.php?a=6&amp;id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><i class="'.$_style["icons_delete_resource"].'"></i></a>' : '<a onclick="return confirm(\''.$_lang["confirm_undelete"].'\')" href="index.php?a=63&amp;id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><i class="'.$_style["icons_undelete_resource"].'"></i></a>';
197 197
 
198 198
 		$listDocs[] = array(
199
-			'docid' => '<div class="text-right">' . $children['id'] . '</div>',
199
+			'docid' => '<div class="text-right">'.$children['id'].'</div>',
200 200
 			'title' => $title,
201
-			'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>',
202
-			'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>',
203
-			'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>',
204
-			'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i 
205
-				class="' . $_style["icons_move_document"] . '"></i></a>' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '</div>'
201
+			'createdon' => '<div class="text-right">'.($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')).'</div>',
202
+			'pub_date' => '<div class="text-right">'.($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '').'</div>',
203
+			'status' => '<div class="text-nowrap">'.($children['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publishedDoc">'.$_lang['page_data_published'].'</span>').'</div>',
204
+			'edit' => '<div class="actions text-center text-nowrap">'.($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><i class="'.$_style["icons_edit_resource"].'"></i></a><a href="index.php?a=51&amp;id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><i 
205
+				class="' . $_style["icons_move_document"].'"></i></a>'.$icon_pub_unpub : '').($modx->hasPermission('delete_document') ? $icon_del_undel : '').'</div>'
206 206
 		);
207 207
 	}
208 208
 
209
-	$modx->getMakeTable()->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort);
210
-	$children_output = $modx->getMakeTable()->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id=' . $content['id']);
209
+	$modx->getMakeTable()->createPagingNavigation($numRecords, 'a=3&id='.$content['id'].'&dir='.$dir.'&sort='.$sort);
210
+	$children_output = $modx->getMakeTable()->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id='.$content['id']);
211 211
 } else {
212 212
 	// No Child documents
213
-	$children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>';
213
+	$children_output = '<div class="container"><p>'.$_lang['resources_in_container_no'].'</p></div>';
214 214
 }
215 215
 ?>
216 216
 	<script type="text/javascript">
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 			},
237 237
 			cancel: function() {
238 238
 				documentDirty = false;
239
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
239
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
240 240
 			},
241 241
 			move: function() {
242 242
 				document.location.href = "index.php?id=<?= $_REQUEST['id'] ?>&a=51";
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 				}
248 248
 			},
249 249
 			view: function() {
250
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
250
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
251 251
 			}
252 252
 		};
253 253
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	<script type="text/javascript" src="media/script/tablesort.js"></script>
256 256
 
257 257
 	<h1>
258
-		<i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . ' <small>(' . $_REQUEST['id'] . ')</small>' ?>
258
+		<i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').' <small>('.$_REQUEST['id'].')</small>' ?>
259 259
 	</h1>
260 260
 
261 261
 <?= $_style['actionbuttons']['static']['document'] ?>
@@ -282,16 +282,16 @@  discard block
 block discarded – undo
282 282
 					<tr>
283 283
 						<td width="200" valign="top"><?= $_lang['long_title'] ?>:</td>
284 284
 						<td>
285
-							<small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></small>
285
+							<small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>".$_lang['not_set']."</i>)" ?></small>
286 286
 						</td>
287 287
 					</tr>
288 288
 					<tr>
289 289
 						<td valign="top"><?= $_lang['resource_description'] ?>:</td>
290
-						<td><?= $content['description'] != '' ? $content['description'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
290
+						<td><?= $content['description'] != '' ? $content['description'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
291 291
 					</tr>
292 292
 					<tr>
293 293
 						<td valign="top"><?= $_lang['resource_summary'] ?>:</td>
294
-						<td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
294
+						<td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
295 295
 					</tr>
296 296
 					<tr>
297 297
 						<td valign="top"><?= $_lang['type'] ?>:</td>
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 					</tr>
300 300
 					<tr>
301 301
 						<td valign="top"><?= $_lang['resource_alias'] ?>:</td>
302
-						<td><?= $content['alias'] != '' ? $content['alias'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
302
+						<td><?= $content['alias'] != '' ? $content['alias'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
303 303
 					</tr>
304 304
 					<tr>
305 305
 						<td colspan="2">&nbsp;</td>
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 						<td><?= $modx->toDateFormat($content['createdon'] + $server_offset_time) ?> (<b><?= $createdbyname ?></b>)
313 313
 						</td>
314 314
 					</tr>
315
-					<?php if($editedbyname != '') { ?>
315
+					<?php if ($editedbyname != '') { ?>
316 316
 						<tr>
317 317
 							<td><?= $_lang['page_data_edited'] ?>:</td>
318 318
 							<td><?= $modx->toDateFormat($content['editedon'] + $server_offset_time) ?> (<b><?= $editedbyname ?></b>)
@@ -327,15 +327,15 @@  discard block
 block discarded – undo
327 327
 					</tr>
328 328
 					<tr>
329 329
 						<td><?= $_lang['page_data_status'] ?>:</td>
330
-						<td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publisheddoc">' . $_lang['page_data_published'] . '</span>' ?></td>
330
+						<td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publisheddoc">'.$_lang['page_data_published'].'</span>' ?></td>
331 331
 					</tr>
332 332
 					<tr>
333 333
 						<td><?= $_lang['page_data_publishdate'] ?>:</td>
334
-						<td><?= $content['pub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
334
+						<td><?= $content['pub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
335 335
 					</tr>
336 336
 					<tr>
337 337
 						<td><?= $_lang['page_data_unpublishdate'] ?>:</td>
338
-						<td><?= $content['unpub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
338
+						<td><?= $content['unpub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
339 339
 					</tr>
340 340
 					<tr>
341 341
 						<td><?= $_lang['page_data_cacheable'] ?>:</td>
@@ -355,11 +355,11 @@  discard block
 block discarded – undo
355 355
 					</tr>
356 356
 					<tr>
357 357
 						<td><?= $_lang['page_data_web_access'] ?>:</td>
358
-						<td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
358
+						<td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
359 359
 					</tr>
360 360
 					<tr>
361 361
 						<td><?= $_lang['page_data_mgr_access'] ?>:</td>
362
-						<td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
362
+						<td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
363 363
 					</tr>
364 364
 					<tr>
365 365
 						<td colspan="2">&nbsp;</td>
@@ -389,13 +389,13 @@  discard block
 block discarded – undo
389 389
 			<script type="text/javascript">docSettings.addTabPage(document.getElementById("tabChildren"));</script>
390 390
 			<div class="container container-body">
391 391
 				<div class="form-group clearfix">
392
-					<?php if($numRecords > 0) : ?>
392
+					<?php if ($numRecords > 0) : ?>
393 393
 						<div class="float-xs-left">
394
-							<span class="publishedDoc"><?= $numRecords . ' ' . $_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span>
394
+							<span class="publishedDoc"><?= $numRecords.' '.$_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span>
395 395
 						</div>
396 396
 					<?php endif; ?>
397 397
 					<div class="float-xs-right">
398
-						<?= $filter_sort . ' ' . $filter_dir ?>
398
+						<?= $filter_sort.' '.$filter_dir ?>
399 399
 					</div>
400 400
 
401 401
 				</div>
@@ -405,23 +405,23 @@  discard block
 block discarded – undo
405 405
 			</div>
406 406
 		</div><!-- end tab-page -->
407 407
 
408
-		<?php if($modx->config['cache_type'] != 2) { ?>
408
+		<?php if ($modx->config['cache_type'] != 2) { ?>
409 409
 			<!-- Page Source -->
410 410
 			<div class="tab-page" id="tabSource">
411 411
 				<h2 class="tab"><?= $_lang['page_data_source'] ?></h2>
412 412
 				<script type="text/javascript">docSettings.addTabPage(document.getElementById("tabSource"));</script>
413 413
 				<?php
414 414
 				$buffer = "";
415
-				$filename = $modx->config['base_path'] . "assets/cache/docid_" . $id . ".pageCache.php";
415
+				$filename = $modx->config['base_path']."assets/cache/docid_".$id.".pageCache.php";
416 416
 				$handle = @fopen($filename, "r");
417
-				if(!$handle) {
418
-					$buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>';
417
+				if (!$handle) {
418
+					$buffer = '<div class="container container-body">'.$_lang['page_data_notcached'].'</div>';
419 419
 				} else {
420
-					while(!feof($handle)) {
420
+					while (!feof($handle)) {
421 421
 						$buffer .= fgets($handle, 4096);
422 422
 					}
423 423
 					fclose($handle);
424
-					$buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->getPhpCompat()->htmlspecialchars($buffer) . "</textarea></div>\n";
424
+					$buffer = '<div class="navbar navbar-editor">'.$_lang['page_data_cached'].'</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">'.$modx->getPhpCompat()->htmlspecialchars($buffer)."</textarea></div>\n";
425 425
 				}
426 426
 				echo $buffer;
427 427
 				?>
@@ -431,12 +431,12 @@  discard block
 block discarded – undo
431 431
 	</div><!-- end documentPane -->
432 432
 
433 433
 <?php
434
-if(isset($_GET['tab']) && is_numeric($_GET['tab'])) {
435
-	echo '<script type="text/javascript"> docSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
434
+if (isset($_GET['tab']) && is_numeric($_GET['tab'])) {
435
+	echo '<script type="text/javascript"> docSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';
436 436
 }
437 437
 ?>
438 438
 
439
-<?php if($show_preview == 1) { ?>
439
+<?php if ($show_preview == 1) { ?>
440 440
 	<div class="sectionHeader"><?= $_lang['preview'] ?></div>
441 441
 	<div class="sectionBody" id="lyr2">
442 442
 		<iframe src="<?= MODX_SITE_URL ?>index.php?id=<?= $id ?>&z=manprev" frameborder="0" border="0" id="previewIframe"></iframe>
Please login to merge, or discard this patch.
manager/actions/mutate_settings.dynamic.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@  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 />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('settings')) {
5
+if (!$modx->hasPermission('settings')) {
6 6
 	$modx->webAlertAndQuit($_lang['error_no_privileges']);
7 7
 }
8 8
 
9 9
 // check to see the edit settings page isn't locked
10
-$rs = $modx->getDatabase()->select('username', $modx->getDatabase()->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");
11
-if($username = $modx->getDatabase()->getValue($rs)) {
10
+$rs = $modx->getDatabase()->select('username', $modx->getDatabase()->getFullTableName('active_users'), "action=17 AND internalKey!='".$modx->getLoginUserID()."'");
11
+if ($username = $modx->getDatabase()->getValue($rs)) {
12 12
 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));
13 13
 }
14 14
 // end check for lock
@@ -16,21 +16,21 @@  discard block
 block discarded – undo
16 16
 // reload system settings from the database.
17 17
 // this will prevent user-defined settings from being saved as system setting
18 18
 $settings = array();
19
-include_once(MODX_MANAGER_PATH . 'includes/default_config.php');
19
+include_once(MODX_MANAGER_PATH.'includes/default_config.php');
20 20
 $rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getDatabase()->getFullTableName('system_settings'));
21
-while($row = $modx->getDatabase()->getRow($rs)) {
21
+while ($row = $modx->getDatabase()->getRow($rs)) {
22 22
 	$settings[$row['setting_name']] = $row['setting_value'];
23 23
 }
24
-$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);
25
-$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);
24
+$settings['filemanager_path'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['filemanager_path']);
25
+$settings['rb_base_dir'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['rb_base_dir']);
26 26
 
27 27
 extract($settings, EXTR_OVERWRITE);
28 28
 
29 29
 // load languages and keys
30 30
 $lang_keys = array();
31 31
 $dir = dir('includes/lang');
32
-while($file = $dir->read()) {
33
-	if(strpos($file, '.inc.php') > 0) {
32
+while ($file = $dir->read()) {
33
+	if (strpos($file, '.inc.php') > 0) {
34 34
 		$endpos = strpos($file, '.');
35 35
 		$languagename = substr($file, 0, $endpos);
36 36
 		$lang_keys[$languagename] = get_lang_keys($file);
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			<input type="hidden" name="site_id" value="<?php echo $site_id; ?>" />
68 68
 			<input type="hidden" name="settings_version" value="<?php echo $modx->getVersionData('version'); ?>" />
69 69
 			<!-- this field is used to check site settings have been entered/ updated after install or upgrade -->
70
-			<?php if(!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>
70
+			<?php if (!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>
71 71
 				<div class='sectionBody'><p class='element-edit-message-tab alert alert-warning'><?php echo $_lang['settings_after_install']; ?></p></div>
72 72
 			<?php } ?>
73 73
 			<div class="tab-pane" id="settingsPane">
@@ -76,13 +76,13 @@  discard block
 block discarded – undo
76 76
 				</script>
77 77
 
78 78
 				<?php
79
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');
80
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');
81
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');
82
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');
83
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');
84
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');
85
-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');
79
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php');
80
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php');
81
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php');
82
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php');
83
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php');
84
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php');
85
+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php');
86 86
 				?>
87 87
 			</div>
88 88
 		</div>
@@ -129,6 +129,6 @@  discard block
 block discarded – undo
129 129
 		});
130 130
 	</script>
131 131
 <?php
132
-if(is_numeric($_GET['tab'])) {
133
-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
132
+if (is_numeric($_GET['tab'])) {
133
+	echo '<script type="text/javascript">tpSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';
134 134
 }
Please login to merge, or discard this patch.
manager/actions/mutate_snippet.dynamic.php 1 patch
Spacing   +12 added lines, -12 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
 
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
19 19
 }
20 20
 
21
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
21
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
22 22
 
23 23
 // Get table Names (alphabetical)
24 24
 $tbl_site_module_depobj = $modx->getDatabase()->getFullTableName('site_module_depobj');
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     $rs = $modx->getDatabase()->select('*', $tbl_site_snippets, "id='{$id}'");
40 40
     $content = $modx->getDatabase()->getRow($rs);
41 41
     if (!$content) {
42
-        header("Location: " . MODX_SITE_URL . "index.php?id=" . $site_start);
42
+        header("Location: ".MODX_SITE_URL."index.php?id=".$site_start);
43 43
     }
44 44
     $_SESSION['itemname'] = $content['name'];
45 45
     if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     $content['name'] = $_REQUEST['itemname'];
51 51
 } else {
52 52
     $_SESSION['itemname'] = $_lang["new_snippet"];
53
-    $content['category'] = (int)$_REQUEST['catid'];
53
+    $content['category'] = (int) $_REQUEST['catid'];
54 54
 }
55 55
 
56 56
 if ($modx->getManagerApi()->hasFormValues()) {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 // Add lock-element JS-Script
63 63
 $lockElementId = $id;
64 64
 $lockElementType = 4;
65
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
65
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
66 66
 ?>
67 67
 <script type="text/javascript">
68 68
 
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
     <input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
432 432
 
433 433
     <h1 class="pagetitle">
434
-        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
434
+        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
435 435
     </h1>
436 436
 
437 437
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
                             <div class="form-control-name clearfix">
458 458
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
459 459
                                 <?php if ($modx->hasPermission('save_role')): ?>
460
-                                    <label class="custom-control" title="<?= $_lang['lock_snippet'] . "\n" . $_lang['lock_snippet_msg'] ?>" tooltip>
460
+                                    <label class="custom-control" title="<?= $_lang['lock_snippet']."\n".$_lang['lock_snippet_msg'] ?>" tooltip>
461 461
                                         <input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
462 462
                                         <i class="fa fa-lock"></i>
463 463
                                     </label>
@@ -481,9 +481,9 @@  discard block
 block discarded – undo
481 481
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
482 482
                                 <option>&nbsp;</option>
483 483
                                 <?php
484
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
484
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
485 485
                                 foreach (getCategories() as $n => $v) {
486
-                                    echo '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v['category']) . '</option>';
486
+                                    echo '<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($v['category']).'</option>';
487 487
                                 }
488 488
                                 ?>
489 489
                             </select>
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
                     <div class="form-group">
501 501
                         <?php if ($_SESSION['mgrRole'] == 1): ?>
502 502
                             <div class="form-row">
503
-                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
503
+                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
504 504
                             </div>
505 505
                         <?php endif; ?>
506 506
                         <div class="form-row">
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
                 <span><?= $_lang['snippet_code'] ?></span>
518 518
             </div>
519 519
             <div class="section-editor clearfix">
520
-                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->getPhpCompat()->htmlspecialchars($content['post'])) : "<?php" . "\n" . trim($modx->getPhpCompat()->htmlspecialchars($content['snippet'])) . "\n") ?></textarea>
520
+                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->getPhpCompat()->htmlspecialchars($content['post'])) : "<?php"."\n".trim($modx->getPhpCompat()->htmlspecialchars($content['snippet']))."\n") ?></textarea>
521 521
             </div>
522 522
             <!-- PHP text editor end -->
523 523
         </div>
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 								INNER JOIN {$tbl_site_module_depobj} AS smd ON smd.module=sm.id AND smd.type=40 
553 553
 								INNER JOIN {$tbl_site_snippets} AS ss ON ss.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams=1", 'sm.name');
554 554
                                 while ($row = $modx->getDatabase()->getRow($ds)) {
555
-                                    echo "<option value='" . $row['guid'] . "'" . ($content['moduleguid'] == $row['guid'] ? " selected='selected'" : "") . ">" . $modx->getPhpCompat()->htmlspecialchars($row['name']) . "</option>";
555
+                                    echo "<option value='".$row['guid']."'".($content['moduleguid'] == $row['guid'] ? " selected='selected'" : "").">".$modx->getPhpCompat()->htmlspecialchars($row['name'])."</option>";
556 556
                                 }
557 557
                                 ?>
558 558
                             </select>
Please login to merge, or discard this patch.
manager/actions/mutate_module.dynamic.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@  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
-switch($modx->getManagerApi()->action) {
5
+switch ($modx->getManagerApi()->action) {
6 6
 	case 107:
7
-		if(!$modx->hasPermission('new_module')) {
7
+		if (!$modx->hasPermission('new_module')) {
8 8
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
9 9
 		}
10 10
 		break;
11 11
 	case 108:
12
-		if(!$modx->hasPermission('edit_module')) {
12
+		if (!$modx->hasPermission('edit_module')) {
13 13
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
14 14
 		}
15 15
 		break;
16 16
 	default:
17 17
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
18 18
 }
19
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
19
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
20 20
 // Get table names (alphabetical)
21 21
 $tbl_membergroup_names = $modx->getDatabase()->getFullTableName('membergroup_names');
22 22
 $tbl_site_content = $modx->getDatabase()->getFullTableName('site_content');
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 
33 33
 // check to see the module editor isn't locked
34
-if($lockedEl = $modx->elementIsLocked(6, $id)) {
34
+if ($lockedEl = $modx->elementIsLocked(6, $id)) {
35 35
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));
36 36
 }
37 37
 // end check for lock
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 // Lock snippet for other users to edit
40 40
 $modx->lockElement(6, $id);
41 41
 
42
-if(isset($_GET['id'])) {
42
+if (isset($_GET['id'])) {
43 43
 	$rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id='{$id}'");
44 44
 	$content = $modx->getDatabase()->getRow($rs);
45
-	if(!$content) {
45
+	if (!$content) {
46 46
 		$modx->webAlertAndQuit("Module not found for id '{$id}'.");
47 47
 	}
48 48
 	$content['properties'] = str_replace("&", "&amp;", $content['properties']);
49 49
 	$_SESSION['itemname'] = $content['name'];
50
-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
50
+	if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
51 51
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
52 52
 	}
53 53
 } else {
54 54
 	$_SESSION['itemname'] = $_lang["new_module"];
55 55
 	$content['wrap'] = '1';
56 56
 }
57
-if($modx->getManagerApi()->hasFormValues()) {
57
+if ($modx->getManagerApi()->hasFormValues()) {
58 58
 	$modx->getManagerApi()->loadFormValues();
59 59
 }
60 60
 
61 61
 // Add lock-element JS-Script
62 62
 $lockElementId = $id;
63 63
 $lockElementType = 6;
64
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
64
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
65 65
 ?>
66 66
 <script type="text/javascript">
67 67
 	function loadDependencies() {
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	function BrowseServer() {
409 409
 		var w = screen.width * 0.7;
410 410
 		var h = screen.height * 0.7;
411
-		OpenServerBrowser("<?= MODX_MANAGER_URL;?>media/browser/<?= $which_browser;?>/browser.php?Type=images", w, h);
411
+		OpenServerBrowser("<?= MODX_MANAGER_URL; ?>media/browser/<?= $which_browser; ?>/browser.php?Type=images", w, h);
412 412
 	}
413 413
 
414 414
 	function SetUrl(url, width, height, alt) {
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 	<?php
429 429
 	// invoke OnModFormPrerender event
430 430
 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));
431
-	if(is_array($evtOut)) {
431
+	if (is_array($evtOut)) {
432 432
 		echo implode('', $evtOut);
433 433
 	}
434 434
 
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 	<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
443 443
 
444 444
 	<h1>
445
-		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
445
+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
446 446
 	</h1>
447 447
 
448 448
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -467,8 +467,8 @@  discard block
 block discarded – undo
467 467
 						<div class="col-md-9 col-lg-10">
468 468
 							<div class="form-control-name clearfix">
469 469
 								<input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
470
-								<?php if($modx->hasPermission('save_role')): ?>
471
-									<label class="custom-control" title="<?= $_lang['lock_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>
470
+								<?php if ($modx->hasPermission('save_role')): ?>
471
+									<label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>
472 472
 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
473 473
 										<i class="fa fa-lock"></i>
474 474
 									</label>
@@ -490,9 +490,9 @@  discard block
 block discarded – undo
490 490
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">
491 491
 								<option>&nbsp;</option>
492 492
 								<?php
493
-								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
494
-								foreach(getCategories() as $n => $v) {
495
-									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v['category']) . "</option>\n";
493
+								include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
494
+								foreach (getCategories() as $n => $v) {
495
+									echo "\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($v['category'])."</option>\n";
496 496
 								}
497 497
 								?>
498 498
 							</select>
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 				<div class="form-group">
525 525
 					<div class="form-row">
526 526
 						<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />
527
-							<?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>
527
+							<?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>
528 528
 					</div>
529 529
 					<div class="form-row">
530 530
 						<label for="parse_docblock">
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 			</div>
590 590
 			<!-- HTML text editor end -->
591 591
 		</div>
592
-		<?php if($modx->getManagerApi()->action == '108'): ?>
592
+		<?php if ($modx->getManagerApi()->action == '108'): ?>
593 593
 			<!-- Dependencies -->
594 594
 			<div class="tab-page" id="tabDepend">
595 595
 				<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 					$grd->columnHeaderClass = 'gridHeader';
624 624
 					$grd->itemClass = 'gridItem';
625 625
 					$grd->altItemClass = 'gridAltItem';
626
-					$grd->columns = $_lang['element_name'] . " ," . $_lang['type'];
626
+					$grd->columns = $_lang['element_name']." ,".$_lang['type'];
627 627
 					$grd->fields = "name,type";
628 628
 					echo $grd->render();
629 629
 					?>
@@ -636,13 +636,13 @@  discard block
 block discarded – undo
636 636
 			<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>
637 637
 			<script type="text/javascript">tp.addTabPage(document.getElementById("tabPermissions"));</script>
638 638
 			<div class="container container-body">
639
-				<?php if($use_udperms == 1) : ?>
639
+				<?php if ($use_udperms == 1) : ?>
640 640
 					<?php
641 641
 					// fetch user access permissions for the module
642 642
 					$rs = $modx->getDatabase()->select('usergroup', $tbl_site_module_access, "module='{$id}'");
643 643
 					$groupsarray = $modx->getDatabase()->getColumn('usergroup', $rs);
644 644
 
645
-					if($modx->hasPermission('access_permissions')) {
645
+					if ($modx->hasPermission('access_permissions')) {
646 646
 						?>
647 647
 						<!-- User Group Access Permissions -->
648 648
 						<script type="text/javascript">
@@ -670,22 +670,22 @@  discard block
 block discarded – undo
670 670
 					}
671 671
 					$chk = '';
672 672
 					$rs = $modx->getDatabase()->select('name, id', $tbl_membergroup_names, '', 'name');
673
-					while($row = $modx->getDatabase()->getRow($rs)) {
673
+					while ($row = $modx->getDatabase()->getRow($rs)) {
674 674
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();
675 675
 						$checked = in_array($row['id'], $groupsarray);
676
-						if($modx->hasPermission('access_permissions')) {
677
-							if($checked) {
676
+						if ($modx->hasPermission('access_permissions')) {
677
+							if ($checked) {
678 678
 								$notPublic = true;
679 679
 							}
680
-							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";
680
+							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="'.$row['id'].'"'.($checked ? ' checked="checked"' : '').' onclick="makePublic(false)" /> '.$row['name']."</label><br />\n";
681 681
 						} else {
682
-							if($checked) {
683
-								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;
682
+							if ($checked) {
683
+								$chks = '<input type="hidden" name="usrgroups[]"  value="'.$row['id'].'" />'."\n".$chks;
684 684
 							}
685 685
 						}
686 686
 					}
687
-					if($modx->hasPermission('access_permissions')) {
688
-						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;
687
+					if ($modx->hasPermission('access_permissions')) {
688
+						$chks = '<label><input type="checkbox" name="chkallgroups"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true)" /><span class="warning"> '.$_lang['all_usr_groups'].'</span></label><br />'."\n".$chks;
689 689
 					}
690 690
 					echo $chks;
691 691
 					?>
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 		<?php
707 707
 		// invoke OnModFormRender event
708 708
 		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));
709
-		if(is_array($evtOut)) {
709
+		if (is_array($evtOut)) {
710 710
 			echo implode('', $evtOut);
711 711
 		}
712 712
 		?>
Please login to merge, or discard this patch.
manager/actions/site_schedule.static.php 1 patch
Spacing   +10 added lines, -10 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('view_eventlog')) {
5
+if (!$modx->hasPermission('view_eventlog')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 ?>
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
 		<div class="form-group" id="lyr1">
18 18
 			<b><?= $_lang["publish_events"] ?></b>
19 19
 			<?php
20
-			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date', $modx->getDatabase()->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');
20
+			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date', $modx->getDatabase()->getFullTableName('site_content'), "pub_date > ".time()."", 'pub_date ASC');
21 21
 			$limit = $modx->getDatabase()->getRecordCount($rs);
22
-			if($limit < 1) {
22
+			if ($limit < 1) {
23 23
 				?>
24 24
 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>
25 25
 				<?php
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 						</thead>
37 37
 						<tbody>
38 38
 						<?php
39
-						while($row = $modx->getDatabase()->getRow($rs)) {
39
+						while ($row = $modx->getDatabase()->getRow($rs)) {
40 40
 							?>
41 41
 							<tr>
42 42
 								<td class="text-right"><?= $row['id'] ?></td>
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 		<div class="form-group" id="lyr2">
57 57
 			<b><?= $_lang["unpublish_events"] ?></b>
58 58
 			<?php
59
-			$rs = $modx->getDatabase()->select('id, pagetitle, unpub_date', $modx->getDatabase()->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');
59
+			$rs = $modx->getDatabase()->select('id, pagetitle, unpub_date', $modx->getDatabase()->getFullTableName('site_content'), "unpub_date > ".time()."", 'unpub_date ASC');
60 60
 			$limit = $modx->getDatabase()->getRecordCount($rs);
61
-			if($limit < 1) {
61
+			if ($limit < 1) {
62 62
 				?>
63 63
 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>
64 64
 				<?php
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 						</thead>
76 76
 						<tbody>
77 77
 						<?php
78
-						while($row = $modx->getDatabase()->getRow($rs)) {
78
+						while ($row = $modx->getDatabase()->getRow($rs)) {
79 79
 							?>
80 80
 							<tr>
81 81
 								<td class="text-right"><?= $row['id'] ?></td>
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 			<?php
98 98
 			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date, unpub_date', $modx->getDatabase()->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");
99 99
 			$limit = $modx->getDatabase()->getRecordCount($rs);
100
-			if($limit < 1) {
100
+			if ($limit < 1) {
101 101
 				?>
102 102
 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>
103 103
 				<?php
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 						</thead>
116 116
 						<tbody>
117 117
 						<?php
118
-						while($row = $modx->getDatabase()->getRow($rs)) {
118
+						while ($row = $modx->getDatabase()->getRow($rs)) {
119 119
 							?>
120 120
 							<tr>
121 121
 								<td class="text-right"><?= $row['id'] ?></td>
Please login to merge, or discard this patch.
manager/actions/web_user_management.static.php 1 patch
Spacing   +9 added lines, -9 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('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
 block discarded – undo
10 10
 $modx->getManagerApi()->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 {
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 			<div class="row">
120 120
 				<div class="table-responsive">
121 121
 					<?php
122
-					$ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getDatabase()->getFullTableName("web_users") . " wu 
123
-			INNER JOIN " . $modx->getDatabase()->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');
122
+					$ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getDatabase()->getFullTableName("web_users")." wu 
123
+			INNER JOIN " . $modx->getDatabase()->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');
124 124
 					$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
125 125
 					$grd->noRecordMsg = $_lang["no_records_found"];
126 126
 					$grd->cssClass = "table data";
@@ -128,15 +128,15 @@  discard block
 block discarded – undo
128 128
 					$grd->itemClass = "tableItem";
129 129
 					$grd->altItemClass = "tableAltItem";
130 130
 					$grd->fields = "id,username,fullname,email,lastlogin,logincount,blocked";
131
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_prevlogin"] . " ," . $_lang["user_logincount"] . " ," . $_lang["user_block"];
131
+					$grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_prevlogin"]." ,".$_lang["user_logincount"]." ,".$_lang["user_block"];
132 132
 					$grd->colWidths = "1%,,,,1%,1%,1%";
133 133
 					$grd->colAligns = "center,,,,right' nowrap='nowrap,right,center";
134
-					$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>||template:[+fullname+]||template:[+email+]||date: " . $modx->toDateFormat('[+thislogin+]', 'formatOnly') .
134
+					$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>||template:[+fullname+]||template:[+email+]||date: ".$modx->toDateFormat('[+thislogin+]', 'formatOnly').
135 135
 					" %H:%M";
136
-					if($listmode == '1') {
136
+					if ($listmode == '1') {
137 137
 						$grd->pageSize = 0;
138 138
 					}
139
-					if($_REQUEST['op'] == 'reset') {
139
+					if ($_REQUEST['op'] == 'reset') {
140 140
 						$grd->pageNumber = 1;
141 141
 					}
142 142
 					// render grid
Please login to merge, or discard this patch.
manager/actions/mutate_content.dynamic.php 1 patch
Spacing   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -1,34 +1,34 @@  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 6
 /********************/
7
-$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC';
8
-$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon';
9
-$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : '';
10
-$add_path = $sd . $sb . $pg;
7
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
8
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
9
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
10
+$add_path = $sd.$sb.$pg;
11 11
 /*******************/
12 12
 
13 13
 // check permissions
14
-switch($modx->getManagerApi()->action) {
14
+switch ($modx->getManagerApi()->action) {
15 15
 	case 27:
16
-		if(!$modx->hasPermission('edit_document')) {
16
+		if (!$modx->hasPermission('edit_document')) {
17 17
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
18 18
 		}
19 19
 		break;
20 20
 	case 85:
21 21
 	case 72:
22 22
 	case 4:
23
-		if(!$modx->hasPermission('new_document')) {
23
+		if (!$modx->hasPermission('new_document')) {
24 24
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
25
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
25
+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
26 26
 			// check user has permissions for parent
27 27
 			$udperms = new EvolutionCMS\Legacy\Permissions();
28 28
 			$udperms->user = $modx->getLoginUserID();
29 29
 			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
30 30
 			$udperms->role = $_SESSION['mgrRole'];
31
-			if(!$udperms->checkPermissions()) {
31
+			if (!$udperms->checkPermissions()) {
32 32
 				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
33 33
 			}
34 34
 		}
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
38 38
 }
39 39
 
40
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
40
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
41 41
 
42 42
 // Get table names (alphabetical)
43 43
 $tbl_categories = $modx->getDatabase()->getFullTableName('categories');
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 $tbl_site_tmplvar_templates = $modx->getDatabase()->getFullTableName('site_tmplvar_templates');
53 53
 $tbl_site_tmplvars = $modx->getDatabase()->getFullTableName('site_tmplvars');
54 54
 
55
-if($modx->getManagerApi()->action == 27) {
55
+if ($modx->getManagerApi()->action == 27) {
56 56
 	//editing an existing document
57 57
 	// check permissions on the document
58 58
 	$udperms = new EvolutionCMS\Legacy\Permissions();
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
60 60
 	$udperms->document = $id;
61 61
 	$udperms->role = $_SESSION['mgrRole'];
62 62
 
63
-	if(!$udperms->checkPermissions()) {
63
+	if (!$udperms->checkPermissions()) {
64 64
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
65 65
 	}
66 66
 }
67 67
 
68 68
 // check to see if resource isn't locked
69
-if($lockedEl = $modx->elementIsLocked(7, $id)) {
69
+if ($lockedEl = $modx->elementIsLocked(7, $id)) {
70 70
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
71 71
 }
72 72
 // end check for lock
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 $modx->lockElement(7, $id);
76 76
 
77 77
 // get document groups for current user
78
-if($_SESSION['mgrDocgroups']) {
78
+if ($_SESSION['mgrDocgroups']) {
79 79
 	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
80 80
 }
81 81
 
82
-if(!empty ($id)) {
82
+if (!empty ($id)) {
83 83
 	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
84
-	if($docgrp) {
84
+	if ($docgrp) {
85 85
 		$access .= " OR dg.document_group IN ({$docgrp})";
86 86
 	}
87 87
 	$rs = $modx->getDatabase()->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
88 88
 	$content = array();
89 89
 	$content = $modx->getDatabase()->getRow($rs);
90 90
 	$modx->documentObject = &$content;
91
-	if(!$content) {
91
+	if (!$content) {
92 92
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
93 93
 	}
94 94
 	$_SESSION['itemname'] = $content['pagetitle'];
95 95
 } else {
96 96
 	$content = array();
97 97
 
98
-	if(isset($_REQUEST['newtemplate'])) {
98
+	if (isset($_REQUEST['newtemplate'])) {
99 99
 		$content['template'] = $_REQUEST['newtemplate'];
100 100
 	} else {
101 101
 		$content['template'] = getDefaultTemplate();
@@ -106,22 +106,22 @@  discard block
 block discarded – undo
106 106
 
107 107
 // restore saved form
108 108
 $formRestored = $modx->getManagerApi()->loadFormValues();
109
-if(isset($_REQUEST['newtemplate'])) {
109
+if (isset($_REQUEST['newtemplate'])) {
110 110
 	$formRestored = true;
111 111
 }
112 112
 
113 113
 // retain form values if template was changed
114 114
 // edited to convert pub_date and unpub_date
115 115
 // sottwell 02-09-2006
116
-if($formRestored == true) {
116
+if ($formRestored == true) {
117 117
 	$content = array_merge($content, $_POST);
118 118
 	$content['content'] = $_POST['ta'];
119
-	if(empty ($content['pub_date'])) {
119
+	if (empty ($content['pub_date'])) {
120 120
 		unset ($content['pub_date']);
121 121
 	} else {
122 122
 		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
123 123
 	}
124
-	if(empty ($content['unpub_date'])) {
124
+	if (empty ($content['unpub_date'])) {
125 125
 		unset ($content['unpub_date']);
126 126
 	} else {
127 127
 		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
 }
130 130
 
131 131
 // increase menu index if this is a new document
132
-if(!isset ($_REQUEST['id'])) {
133
-	if(!isset ($modx->config['auto_menuindex'])) {
132
+if (!isset ($_REQUEST['id'])) {
133
+	if (!isset ($modx->config['auto_menuindex'])) {
134 134
 		$modx->config['auto_menuindex'] = 1;
135 135
 	}
136
-	if($modx->config['auto_menuindex']) {
137
-		$pid = (int)$_REQUEST['pid'];
136
+	if ($modx->config['auto_menuindex']) {
137
+		$pid = (int) $_REQUEST['pid'];
138 138
 		$rs = $modx->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
139 139
 		$content['menuindex'] = $modx->getDatabase()->getValue($rs);
140 140
 	} else {
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
142 142
 	}
143 143
 }
144 144
 
145
-if(isset ($_POST['which_editor'])) {
145
+if (isset ($_POST['which_editor'])) {
146 146
 	$modx->config['which_editor'] = $_POST['which_editor'];
147 147
 }
148 148
 
149 149
 // Add lock-element JS-Script
150 150
 $lockElementId = $id;
151 151
 $lockElementType = 7;
152
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
152
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
153 153
 ?>
154 154
 	<script type="text/javascript">
155 155
 		/* <![CDATA[ */
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 			},
180 180
 			cancel: function() {
181 181
 				documentDirty = false;
182
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
182
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
183 183
 			},
184 184
 			duplicate: function() {
185 185
 				if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) {
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 				}
188 188
 			},
189 189
 			view: function() {
190
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
190
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
191 191
 			}
192 192
 		};
193 193
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 			'template' => $content['template']
550 550
 		));
551 551
 
552
-		if(is_array($evtOut)) {
552
+		if (is_array($evtOut)) {
553 553
 			echo implode('', $evtOut);
554 554
 		}
555 555
 
@@ -573,8 +573,8 @@  discard block
 block discarded – undo
573 573
 		<fieldset id="create_edit">
574 574
 
575 575
 			<h1>
576
-				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
577
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
576
+				<i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) {
577
+					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>';
578 578
 				} else {
579 579
 				    if ($modx->getManagerApi()->action == '4') {
580 580
                         echo $_lang['add_resource'];
@@ -590,36 +590,36 @@  discard block
 block discarded – undo
590 590
 
591 591
 			<?php
592 592
 			// breadcrumbs
593
-			if($modx->config['use_breadcrumbs']) {
593
+			if ($modx->config['use_breadcrumbs']) {
594 594
 				$temp = array();
595 595
 				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
596 596
 
597
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
597
+				if (isset($_REQUEST['id']) && $content['parent'] != 0) {
598 598
 					$bID = (int) $_REQUEST['id'];
599 599
 					$temp = $modx->getParentIds($bID);
600
-				} else if(isset($_REQUEST['pid'])) {
600
+				} else if (isset($_REQUEST['pid'])) {
601 601
 					$bID = (int) $_REQUEST['pid'];
602 602
 					$temp = $modx->getParentIds($bID);
603 603
 					array_unshift($temp, $bID);
604 604
 				}
605 605
 
606
-				if($temp) {
606
+				if ($temp) {
607 607
 					$parents = implode(',', $temp);
608 608
 
609
-					if(!empty($parents)) {
609
+					if (!empty($parents)) {
610 610
 						$where = "FIND_IN_SET(id,'{$parents}') DESC";
611 611
 						$rs = $modx->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
612
-						while($row = $modx->getDatabase()->getRow($rs)) {
612
+						while ($row = $modx->getDatabase()->getRow($rs)) {
613 613
 							$out .= '<li class="breadcrumbs__li">
614
-                                <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
614
+                                <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a>
615 615
                                 <span class="breadcrumbs__sep">&gt;</span>
616 616
                             </li>';
617 617
 						}
618 618
 					}
619 619
 				}
620 620
 
621
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
622
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
621
+				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>';
622
+				echo '<ul class="breadcrumbs">'.$out.'</ul>';
623 623
 			}
624 624
 			?>
625 625
 
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
637 637
 						'id' => $id
638 638
 					));
639
-					if(is_array($evtOut)) {
639
+					if (is_array($evtOut)) {
640 640
 						echo implode('', $evtOut);
641 641
 					} else {
642 642
 						?>
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
 									</td>
693 693
 								</tr>
694 694
 
695
-								<?php if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
695
+								<?php if ($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
696 696
 
697 697
 									<tr>
698 698
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -728,17 +728,17 @@  discard block
 block discarded – undo
728 728
 											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
729 729
 											$rs = $modx->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
730 730
 											$currentCategory = '';
731
-											while($row = $modx->getDatabase()->getRow($rs)) {
732
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
731
+											while ($row = $modx->getDatabase()->getRow($rs)) {
732
+												if ($row['selectable'] != 1 && $row['id'] != $content['template']) {
733 733
 													continue;
734 734
 												};
735 735
 												// Skip if not selectable but show if selected!
736 736
 												$thisCategory = $row['category'];
737
-												if($thisCategory == null) {
737
+												if ($thisCategory == null) {
738 738
 													$thisCategory = $_lang["no_category"];
739 739
 												}
740
-												if($thisCategory != $currentCategory) {
741
-													if($closeOptGroup) {
740
+												if ($thisCategory != $currentCategory) {
741
+													if ($closeOptGroup) {
742 742
 														echo "\t\t\t\t\t</optgroup>\n";
743 743
 													}
744 744
 													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
@@ -747,10 +747,10 @@  discard block
 block discarded – undo
747 747
 
748 748
 												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
749 749
 
750
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
750
+												echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
751 751
 												$currentCategory = $thisCategory;
752 752
 											}
753
-											if($thisCategory != '') {
753
+											if ($thisCategory != '') {
754 754
 												echo "\t\t\t\t\t</optgroup>\n";
755 755
 											}
756 756
 											?>
@@ -794,20 +794,20 @@  discard block
 block discarded – undo
794 794
 									<td valign="top">
795 795
 										<?php
796 796
 										$parentlookup = false;
797
-										if(isset ($_REQUEST['id'])) {
798
-											if($content['parent'] == 0) {
797
+										if (isset ($_REQUEST['id'])) {
798
+											if ($content['parent'] == 0) {
799 799
 												$parentname = $site_name;
800 800
 											} else {
801 801
 												$parentlookup = $content['parent'];
802 802
 											}
803
-										} elseif(isset ($_REQUEST['pid'])) {
804
-											if($_REQUEST['pid'] == 0) {
803
+										} elseif (isset ($_REQUEST['pid'])) {
804
+											if ($_REQUEST['pid'] == 0) {
805 805
 												$parentname = $site_name;
806 806
 											} else {
807 807
 												$parentlookup = $_REQUEST['pid'];
808 808
 											}
809
-										} elseif(isset($_POST['parent'])) {
810
-											if($_POST['parent'] == 0) {
809
+										} elseif (isset($_POST['parent'])) {
810
+											if ($_POST['parent'] == 0) {
811 811
 												$parentname = $site_name;
812 812
 											} else {
813 813
 												$parentlookup = $_POST['parent'];
@@ -816,10 +816,10 @@  discard block
 block discarded – undo
816 816
 											$parentname = $site_name;
817 817
 											$content['parent'] = 0;
818 818
 										}
819
-										if($parentlookup !== false && is_numeric($parentlookup)) {
819
+										if ($parentlookup !== false && is_numeric($parentlookup)) {
820 820
 											$rs = $modx->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
821 821
 											$parentname = $modx->getDatabase()->getValue($rs);
822
-											if(!$parentname) {
822
+											if (!$parentname) {
823 823
 												$modx->webAlertAndQuit($_lang["error_no_parent"]);
824 824
 											}
825 825
 										}
@@ -861,7 +861,7 @@  discard block
 block discarded – undo
861 861
 								}*/
862 862
 								?>
863 863
 
864
-								<?php if($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
864
+								<?php if ($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
865 865
 									<tr>
866 866
 										<td colspan="2">
867 867
 											<hr>
@@ -874,8 +874,8 @@  discard block
 block discarded – undo
874 874
 														<?php
875 875
 														// invoke OnRichTextEditorRegister event
876 876
 														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
877
-														if(is_array($evtOut)) {
878
-															for($i = 0; $i < count($evtOut); $i++) {
877
+														if (is_array($evtOut)) {
878
+															for ($i = 0; $i < count($evtOut); $i++) {
879 879
 																$editor = $evtOut[$i];
880 880
 																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
881 881
 															}
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
886 886
 											</div>
887 887
 											<div id="content_body">
888 888
 												<?php
889
-												if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
889
+												if (($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
890 890
 													$htmlContent = $content['content'];
891 891
 													?>
892 892
 													<div class="section-editor clearfix">
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
900 900
 													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
901 901
 												} else {
902
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
902
+													echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>'."\n";
903 903
 												}
904 904
 												?>
905 905
 											</div>
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 
916 916
                             if (($content['type'] == 'document' || $modx->getManagerApi()->action == '4') || ($content['type'] == 'reference' || $modx->getManagerApi()->action == 72)) {
917 917
                                 $template = $default_template;
918
-                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
918
+                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs'];
919 919
                                 if (isset ($_REQUEST['newtemplate'])) {
920 920
                                     $template = $_REQUEST['newtemplate'];
921 921
                                 } else {
@@ -943,10 +943,10 @@  discard block
 block discarded – undo
943 943
                                 );
944 944
                                 $sort = 'tvtpl.rank,tv.rank, tv.id';
945 945
                                 if ($group_tvs) {
946
-                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
946
+                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank';
947 947
                                     $from .= '
948
-                                    LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
949
-                                    $sort = 'cat.rank,cat.id,' . $sort;
948
+                                    LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category';
949
+                                    $sort = 'cat.rank,cat.id,'.$sort;
950 950
                                 }
951 951
                                 $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
952 952
                                 $rs = $modx->getDatabase()->select($field, $from, $where, $sort);
@@ -964,8 +964,8 @@  discard block
 block discarded – undo
964 964
                                                 if ($group_tvs == 1 || $group_tvs == 3) {
965 965
                                                     if ($i === 0) {
966 966
                                                         $templateVariablesOutput .= '
967
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
968
-                                <div class="tab-header">' . $row['category'] . '</div>
967
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
968
+                                <div class="tab-header">' . $row['category'].'</div>
969 969
                                 <div class="tab-body tmplvars">
970 970
                                     <table>' . "\n";
971 971
                                                     } else {
@@ -974,17 +974,17 @@  discard block
 block discarded – undo
974 974
                                 </div>
975 975
                             </div>
976 976
                             
977
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
978
-                                <div class="tab-header">' . $row['category'] . '</div>
977
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
978
+                                <div class="tab-header">' . $row['category'].'</div>
979 979
                                 <div class="tab-body tmplvars">
980 980
                                     <table>';
981 981
                                                     }
982 982
                                                 } else if ($group_tvs == 2 || $group_tvs == 4) {
983 983
                                                     if ($i === 0) {
984 984
                                                         $templateVariablesOutput .= '
985
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
986
-                                <h2 class="tab">' . $row['category'] . '</h2>
987
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
985
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
986
+                                <h2 class="tab">' . $row['category'].'</h2>
987
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
988 988
                                 
989 989
                                 <div class="tab-body tmplvars">
990 990
                                     <table>';
@@ -994,9 +994,9 @@  discard block
 block discarded – undo
994 994
                                 </div>
995 995
                             </div>
996 996
                             
997
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
998
-                                <h2 class="tab">' . $row['category'] . '</h2>
999
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
997
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
998
+                                <h2 class="tab">' . $row['category'].'</h2>
999
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
1000 1000
                                 
1001 1001
                                 <div class="tab-body tmplvars">
1002 1002
                                     <table>';
@@ -1004,18 +1004,18 @@  discard block
 block discarded – undo
1004 1004
                                                 } else if ($group_tvs == 5) {
1005 1005
                                                     if ($i === 0) {
1006 1006
                                                         $templateVariablesOutput .= '
1007
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
1008
-                                    <h2 class="tab">' . $row['category'] . '</h2>
1009
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
1007
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
1008
+                                    <h2 class="tab">' . $row['category'].'</h2>
1009
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
1010 1010
                                     <table>';
1011 1011
                                                     } else {
1012 1012
                                                         $templateVariablesOutput .= '
1013 1013
                                     </table>
1014 1014
                                 </div>
1015 1015
                                 
1016
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
1017
-                                    <h2 class="tab">' . $row['category'] . '</h2>
1018
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
1016
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
1017
+                                    <h2 class="tab">' . $row['category'].'</h2>
1018
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
1019 1019
                                     
1020 1020
                                     <table>';
1021 1021
                                                     }
@@ -1035,8 +1035,8 @@  discard block
 block discarded – undo
1035 1035
                                                 $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
1036 1036
                                             };
1037 1037
                                             // Add richtext editor to the list
1038
-                                            $richtexteditorIds[$editor][] = "tv" . $row['id'];
1039
-                                            $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
1038
+                                            $richtexteditorIds[$editor][] = "tv".$row['id'];
1039
+                                            $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions;
1040 1040
                                         }
1041 1041
 
1042 1042
                                         $templateVariablesTmp = '';
@@ -1053,24 +1053,24 @@  discard block
 block discarded – undo
1053 1053
                                         }
1054 1054
 
1055 1055
                                         // post back value
1056
-                                        if (array_key_exists('tv' . $row['id'], $_POST)) {
1057
-                                            if (is_array($_POST['tv' . $row['id']])) {
1058
-                                                $tvPBV = implode('||', $_POST['tv' . $row['id']]);
1056
+                                        if (array_key_exists('tv'.$row['id'], $_POST)) {
1057
+                                            if (is_array($_POST['tv'.$row['id']])) {
1058
+                                                $tvPBV = implode('||', $_POST['tv'.$row['id']]);
1059 1059
                                             } else {
1060
-                                                $tvPBV = $_POST['tv' . $row['id']];
1060
+                                                $tvPBV = $_POST['tv'.$row['id']];
1061 1061
                                             }
1062 1062
                                         } else {
1063 1063
                                             $tvPBV = $row['value'];
1064 1064
                                         }
1065 1065
 
1066
-                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : '';
1067
-                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : '';
1068
-                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : '';
1066
+                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : '';
1067
+                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : '';
1068
+                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : '';
1069 1069
 
1070 1070
                                         $templateVariablesTmp .= '
1071 1071
                                         <tr>
1072
-                                            <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td>
1073
-                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td>
1072
+                                            <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td>
1073
+                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td>
1074 1074
                                         </tr>';
1075 1075
 
1076 1076
                                         if ($group_tvs && $row['category_id'] == 0) {
@@ -1084,37 +1084,37 @@  discard block
 block discarded – undo
1084 1084
                                     }
1085 1085
 
1086 1086
                                     if ($templateVariablesGeneral) {
1087
-                                        echo '<table id="tabTV_0" class="tmplvars"><tbody>' . $templateVariablesGeneral . '</tbody></table>';
1087
+                                        echo '<table id="tabTV_0" class="tmplvars"><tbody>'.$templateVariablesGeneral.'</tbody></table>';
1088 1088
                                     }
1089 1089
 
1090 1090
                                     $templateVariables .= '
1091 1091
                         <!-- Template Variables -->' . "\n";
1092 1092
                                     if (!$group_tvs) {
1093 1093
                                         $templateVariables .= '
1094
-                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div>
1094
+                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div>
1095 1095
                                         <div class="sectionBody tmplvars">
1096 1096
                                             <table>';
1097 1097
                                     } else if ($group_tvs == 2) {
1098 1098
                                         $templateVariables .= '
1099 1099
                     <div class="tab-section">
1100
-                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div>
1100
+                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div>
1101 1101
                         <div class="tab-pane" id="paneTemplateVariables">
1102 1102
                             <script type="text/javascript">
1103
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
1103
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
1104 1104
                             </script>';
1105 1105
                                     } else if ($group_tvs == 3) {
1106 1106
                                         $templateVariables .= '
1107 1107
                         <div id="templateVariables" class="tab-page tmplvars">
1108
-                            <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
1108
+                            <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
1109 1109
                             <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>';
1110 1110
                                     } else if ($group_tvs == 4) {
1111 1111
                                         $templateVariables .= '
1112 1112
                     <div id="templateVariables" class="tab-page tmplvars">
1113
-                        <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
1113
+                        <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
1114 1114
                         <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>
1115 1115
                         <div class="tab-pane" id="paneTemplateVariables">
1116 1116
                             <script type="text/javascript">
1117
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
1117
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
1118 1118
                             </script>';
1119 1119
                                     }
1120 1120
                                     if ($templateVariablesOutput) {
@@ -1208,7 +1208,7 @@  discard block
 block discarded – undo
1208 1208
 
1209 1209
 								<?php
1210 1210
 
1211
-								if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
1211
+								if ($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
1212 1212
 									?>
1213 1213
 									<tr>
1214 1214
 										<td>
@@ -1231,13 +1231,13 @@  discard block
 block discarded – undo
1231 1231
 										<td>
1232 1232
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
1233 1233
 												<?php
1234
-												if(!$content['contentType']) {
1234
+												if (!$content['contentType']) {
1235 1235
 													$content['contentType'] = 'text/html';
1236 1236
 												}
1237 1237
 												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
1238 1238
 												$ct = explode(",", $custom_contenttype);
1239
-												for($i = 0; $i < count($ct); $i++) {
1240
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
1239
+												for ($i = 0; $i < count($ct); $i++) {
1240
+													echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n";
1241 1241
 												}
1242 1242
 												?>
1243 1243
 											</select>
@@ -1263,7 +1263,7 @@  discard block
 block discarded – undo
1263 1263
 									</tr>
1264 1264
 									<?php
1265 1265
 								} else {
1266
-									if($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
1266
+									if ($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
1267 1267
 										// non-admin managers creating or editing a document resource
1268 1268
 										?>
1269 1269
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
@@ -1363,15 +1363,15 @@  discard block
 block discarded – undo
1363 1363
 						<?php
1364 1364
 					/*******************************
1365 1365
 					 * Document Access Permissions */
1366
-					if($use_udperms == 1) {
1366
+					if ($use_udperms == 1) {
1367 1367
 						$groupsarray = array();
1368 1368
 						$sql = '';
1369 1369
 
1370 1370
 						$documentId = ($modx->getManagerApi()->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
1371
-						if($documentId > 0) {
1371
+						if ($documentId > 0) {
1372 1372
 							// Load up, the permissions from the parent (if new document) or existing document
1373 1373
 							$rs = $modx->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
1374
-							while($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
1374
+							while ($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id'];
1375 1375
 
1376 1376
 							// Load up the current permissions and names
1377 1377
 							$vs = array(
@@ -1387,7 +1387,7 @@  discard block
 block discarded – undo
1387 1387
 						}
1388 1388
 
1389 1389
 						// retain selected doc groups between post
1390
-						if(isset($_POST['docgroups'])) {
1390
+						if (isset($_POST['docgroups'])) {
1391 1391
 							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
1392 1392
 						}
1393 1393
 
@@ -1406,26 +1406,26 @@  discard block
 block discarded – undo
1406 1406
 						$permissions_no = 0; // count permissions the current mgr user doesn't have
1407 1407
 
1408 1408
 						// Loop through the permissions list
1409
-						while($row = $modx->getDatabase()->getRow($rs)) {
1409
+						while ($row = $modx->getDatabase()->getRow($rs)) {
1410 1410
 
1411 1411
 							// Create an inputValue pair (group ID and group link (if it exists))
1412
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
1413
-							$inputId = 'group-' . $row['id'];
1412
+							$inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new');
1413
+							$inputId = 'group-'.$row['id'];
1414 1414
 
1415 1415
 							$checked = in_array($inputValue, $groupsarray);
1416
-							if($checked) {
1416
+							if ($checked) {
1417 1417
 								$notPublic = true;
1418 1418
 							} // Mark as private access (either web or manager)
1419 1419
 
1420 1420
 							// Skip the access permission if the user doesn't have access...
1421
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
1421
+							if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
1422 1422
 								continue;
1423 1423
 							}
1424 1424
 
1425 1425
 							// Setup attributes for this Input box
1426 1426
 							$inputAttributes['id'] = $inputId;
1427 1427
 							$inputAttributes['value'] = $inputValue;
1428
-							if($checked) {
1428
+							if ($checked) {
1429 1429
 								$inputAttributes['checked'] = 'checked';
1430 1430
 							} else {
1431 1431
 								unset($inputAttributes['checked']);
@@ -1433,10 +1433,10 @@  discard block
 block discarded – undo
1433 1433
 
1434 1434
 							// Create attribute string list
1435 1435
 							$inputString = array();
1436
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
1436
+							foreach ($inputAttributes as $k => $v) $inputString[] = $k.'="'.$v.'"';
1437 1437
 
1438 1438
 							// Make the <input> HTML
1439
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
1439
+							$inputHTML = '<input '.implode(' ', $inputString).' />';
1440 1440
 
1441 1441
 							// does user have this permission?
1442 1442
 							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
@@ -1447,23 +1447,23 @@  discard block
 block discarded – undo
1447 1447
 							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
1448 1448
 							$rsp = $modx->getDatabase()->select('COUNT(mg.id)', $from, $where);
1449 1449
 							$count = $modx->getDatabase()->getValue($rsp);
1450
-							if($count > 0) {
1450
+							if ($count > 0) {
1451 1451
 								++$permissions_yes;
1452 1452
 							} else {
1453 1453
 								++$permissions_no;
1454 1454
 							}
1455
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
1455
+							$permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>';
1456 1456
 						}
1457 1457
 						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
1458
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
1458
+						if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
1459 1459
 							$permissions = array();
1460 1460
 						}
1461 1461
 
1462 1462
 						// See if the Access Permissions section is worth displaying...
1463
-						if(!empty($permissions)) {
1463
+						if (!empty($permissions)) {
1464 1464
 							// Add the "All Document Groups" item if we have rights in both contexts
1465
-							if($isManager && $isWeb) {
1466
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
1465
+							if ($isManager && $isWeb) {
1466
+								array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>');
1467 1467
 							}
1468 1468
 							// Output the permissions list...
1469 1469
 							?>
@@ -1496,12 +1496,12 @@  discard block
 block discarded – undo
1496 1496
 								</script>
1497 1497
 								<p><?= $_lang['access_permissions_docs_message'] ?></p>
1498 1498
 								<ul>
1499
-									<?= implode("\n", $permissions) . "\n" ?>
1499
+									<?= implode("\n", $permissions)."\n" ?>
1500 1500
 								</ul>
1501 1501
 							</div><!--div class="tab-page" id="tabAccess"-->
1502 1502
 							<?php
1503 1503
 						} // !empty($permissions)
1504
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
1504
+						elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
1505 1505
 							?>
1506 1506
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
1507 1507
 							<?php
@@ -1521,7 +1521,7 @@  discard block
 block discarded – undo
1521 1521
 						'template' => $content['template']
1522 1522
 					));
1523 1523
 
1524
-					if(is_array($evtOut)) {
1524
+					if (is_array($evtOut)) {
1525 1525
 						echo implode('', $evtOut);
1526 1526
 					}
1527 1527
 					?>
@@ -1534,16 +1534,16 @@  discard block
 block discarded – undo
1534 1534
 		storeCurTemplate();
1535 1535
 	</script>
1536 1536
 <?php
1537
-if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->action == '72') && $use_editor == 1) {
1538
-	if(is_array($richtexteditorIds)) {
1539
-		foreach($richtexteditorIds as $editor => $elements) {
1537
+if (($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->action == '72') && $use_editor == 1) {
1538
+	if (is_array($richtexteditorIds)) {
1539
+		foreach ($richtexteditorIds as $editor => $elements) {
1540 1540
 			// invoke OnRichTextEditorInit event
1541 1541
 			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
1542 1542
 				'editor' => $editor,
1543 1543
 				'elements' => $elements,
1544 1544
 				'options' => $richtexteditorOptions[$editor]
1545 1545
 			));
1546
-			if(is_array($evtOut)) {
1546
+			if (is_array($evtOut)) {
1547 1547
 				echo implode('', $evtOut);
1548 1548
 			}
1549 1549
 		}
Please login to merge, or discard this patch.