Completed
Push — develop ( e6bcf2...351294 )
by Dmytro
06:18
created
manager/actions/mutate_settings/tab1_site_settings.inc.php 1 patch
Spacing   +44 added lines, -44 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>
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
     <?php
73 73
         $rs = $modx->db->select(
74 74
             't.templatename, t.id, c.category',
75
-            $modx->getFullTableName('site_templates') . " AS t
76
-                LEFT JOIN " . $modx->getFullTableName('categories') . " AS c ON t.category = c.id",
75
+            $modx->getFullTableName('site_templates')." AS t
76
+                LEFT JOIN " . $modx->getFullTableName('categories')." AS c ON t.category = c.id",
77 77
             "",
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 = '';
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
                                 $oldTmpName = $row['templatename'];
104 104
                             }
105 105
             
106
-                            echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
106
+                            echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
107 107
                             $currentCategory = $thisCategory;
108 108
                         }
109 109
         if ($thisCategory != '') {
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
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>
126
+            <p><?php echo $_lang['defaulttemplate_logic_general_message']; ?></p>
127 127
             <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {
128 128
     echo " checked='checked'";
129 129
 }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />
@@ -146,21 +146,21 @@  discard block
 block discarded – undo
146 146
             );
147 147
             if ($count) {
148 148
                 $disabledFilters = 1;
149
-                echo '<b>' . $_lang['enable_filter_phx_warning'] . '</b><br/>';
149
+                echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';
150 150
             } else {
151 151
                 $disabledFilters = false;
152 152
             }
153 153
         ?>
154
-        <?php echo wrap_label($_lang['yes'], form_radio('enable_filter', 1, '', $disabledFilters));?><br />
155
-        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters));?>
154
+        <?php echo wrap_label($_lang['yes'], form_radio('enable_filter', 1, '', $disabledFilters)); ?><br />
155
+        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters)); ?>
156 156
         <div class="comment"><?php echo $_lang['enable_filter_message']; ?></div>
157 157
       </td>
158 158
     </tr>
159 159
     <tr>
160 160
       <th><?php echo $_lang['enable_at_syntax_title'] ?><br><small>[(enable_at_syntax)]</small></th>
161 161
       <td >
162
-        <?php echo wrap_label($_lang['yes'], form_radio('enable_at_syntax', 1));?><br />
163
-        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0));?>
162
+        <?php echo wrap_label($_lang['yes'], form_radio('enable_at_syntax', 1)); ?><br />
163
+        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0)); ?>
164 164
         <div class="comment">
165 165
             <?php echo $_lang['enable_at_syntax_message']; ?>
166 166
             <ul>
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
   <tr>
175 175
     <th><?php echo $_lang['defaultpublish_title'] ?><br><small>[(publish_default)]</small></th>
176 176
     <td>
177
-        <?php echo wrap_label($_lang['yes'], form_radio('publish_default', 1));?><br />
178
-        <?php echo wrap_label($_lang['no'], form_radio('publish_default', 0));?>
177
+        <?php echo wrap_label($_lang['yes'], form_radio('publish_default', 1)); ?><br />
178
+        <?php echo wrap_label($_lang['no'], form_radio('publish_default', 0)); ?>
179 179
         <div class="comment"><?php echo $_lang['defaultpublish_message'] ?></div>
180 180
     </td>
181 181
   </tr>
@@ -183,24 +183,24 @@  discard block
 block discarded – undo
183 183
   <tr>
184 184
     <th><?php echo $_lang['defaultcache_title'] ?><br><small>[(cache_default)]</small></th>
185 185
     <td>
186
-        <?php echo wrap_label($_lang['yes'], form_radio('cache_default', 1));?><br />
187
-        <?php echo wrap_label($_lang['no'], form_radio('cache_default', 0));?>
186
+        <?php echo wrap_label($_lang['yes'], form_radio('cache_default', 1)); ?><br />
187
+        <?php echo wrap_label($_lang['no'], form_radio('cache_default', 0)); ?>
188 188
         <div class="comment"><?php echo $_lang['defaultcache_message'] ?></div>
189 189
     </td>
190 190
   </tr>
191 191
   <tr>
192 192
     <th><?php echo $_lang['defaultsearch_title'] ?><br><small>[(search_default)]</small></th>
193 193
     <td>
194
-        <?php echo wrap_label($_lang['yes'], form_radio('search_default', 1));?><br />
195
-        <?php echo wrap_label($_lang['no'], form_radio('search_default', 0));?>
194
+        <?php echo wrap_label($_lang['yes'], form_radio('search_default', 1)); ?><br />
195
+        <?php echo wrap_label($_lang['no'], form_radio('search_default', 0)); ?>
196 196
         <div class="comment"><?php echo $_lang['defaultsearch_message'] ?></div>
197 197
     </td>
198 198
   </tr>
199 199
   <tr>
200 200
     <th><?php echo $_lang['defaultmenuindex_title'] ?><br><small>[(auto_menuindex)]</small></th>
201 201
     <td>
202
-        <?php echo wrap_label($_lang['yes'], form_radio('auto_menuindex', 1));?><br />
203
-        <?php echo wrap_label($_lang['no'], form_radio('auto_menuindex', 0));?>
202
+        <?php echo wrap_label($_lang['yes'], form_radio('auto_menuindex', 1)); ?><br />
203
+        <?php echo wrap_label($_lang['no'], form_radio('auto_menuindex', 0)); ?>
204 204
         <div class="comment"><?php echo $_lang['defaultmenuindex_message'] ?></div>
205 205
     </td>
206 206
   </tr>
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">
212 212
     <?php
213 213
         $ct = explode(",", $custom_contenttype);
214
-        for ($i=0;$i<count($ct);$i++) {
215
-            echo "<option value=\"" . $ct[$i] . "\">" . $ct[$i] . "</option>";
214
+        for ($i = 0; $i < count($ct); $i++) {
215
+            echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";
216 216
         }
217 217
     ?>
218 218
     </select>
@@ -225,14 +225,14 @@  discard block
 block discarded – undo
225 225
 <th><?php echo $_lang['docid_incrmnt_method_title'] ?><br><small>[(docid_incrmnt_method)]</small></th>
226 226
 <td>
227 227
 <label><input type="radio" name="docid_incrmnt_method" value="0"
228
-    <?php echo ($docid_incrmnt_method=='0') ? 'checked="checked"' : "" ; ?> />
228
+    <?php echo ($docid_incrmnt_method == '0') ? 'checked="checked"' : ""; ?> />
229 229
     <?php echo $_lang['docid_incrmnt_method_0']?></label><br />
230 230
     
231 231
 <label><input type="radio" name="docid_incrmnt_method" value="1"
232
-    <?php echo ($docid_incrmnt_method=='1') ? 'checked="checked"' : "" ; ?> />
232
+    <?php echo ($docid_incrmnt_method == '1') ? 'checked="checked"' : ""; ?> />
233 233
     <?php echo $_lang['docid_incrmnt_method_1']?></label><br />
234 234
 <label><input type="radio" name="docid_incrmnt_method" value="2"
235
-    <?php echo ($docid_incrmnt_method=='2') ? 'checked="checked"' : "" ; ?> />
235
+    <?php echo ($docid_incrmnt_method == '2') ? 'checked="checked"' : ""; ?> />
236 236
     <?php echo $_lang['docid_incrmnt_method_2']?></label><br />
237 237
 </td>
238 238
 </tr>
@@ -240,24 +240,24 @@  discard block
 block discarded – undo
240 240
 <tr>
241 241
 <th><?php echo $_lang['enable_cache_title'] ?><br><small>[(enable_cache)]</small></th>
242 242
 <td>
243
-    <?php echo wrap_label($_lang['enabled'], form_radio('enable_cache', 1));?><br />
244
-    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0));?><br />
245
-    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2));?>
243
+    <?php echo wrap_label($_lang['enabled'], form_radio('enable_cache', 1)); ?><br />
244
+    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0)); ?><br />
245
+    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2)); ?>
246 246
 </td>
247 247
 </tr>
248 248
 
249 249
 <tr>
250 250
 <th><?php echo $_lang['cache_type_title'] ?><br><small>[(cache_type)]</small></th>
251 251
 <td>
252
-<?php echo wrap_label($_lang['cache_type_1'], form_radio('cache_type', 1));?><br />
253
-<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2));?>
252
+<?php echo wrap_label($_lang['cache_type_1'], form_radio('cache_type', 1)); ?><br />
253
+<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2)); ?>
254 254
 </td>
255 255
 </tr>
256 256
   <tr>
257 257
 <th><?php echo $_lang['minifyphp_incache_title'] ?><br><small>[(minifyphp_incache)]</small></th>
258 258
     <td>
259
-<?php echo wrap_label($_lang['enabled'], form_radio('minifyphp_incache', 1));?><br />
260
-<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0));?>
259
+<?php echo wrap_label($_lang['enabled'], form_radio('minifyphp_incache', 1)); ?><br />
260
+<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0)); ?>
261 261
 <div class="comment"><?php echo $_lang['minifyphp_incache_message'] ?></div>
262 262
     </td>
263 263
   </tr>
@@ -266,22 +266,22 @@  discard block
 block discarded – undo
266 266
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>
267 267
       <td> <select name="server_offset_time" size="1" class="inputBox">
268 268
           <?php
269
-      for ($i=-24; $i<25; $i++) {
270
-          $seconds = $i*60*60;
271
-          $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ; ?>
269
+      for ($i = -24; $i < 25; $i++) {
270
+          $seconds = $i * 60 * 60;
271
+          $selectedtext = $seconds == $server_offset_time ? "selected='selected'" : ""; ?>
272 272
           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>
273 273
           <?php
274 274
       }
275 275
       ?>
276 276
         </select>
277
-        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>
277
+        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $server_offset_time)); ?></div>
278 278
         </td>
279 279
     </tr>
280 280
     <tr>
281 281
       <th><?php echo $_lang['server_protocol_title'] ?><br><small>[(server_protocol)]</small></th>
282 282
       <td>
283
-        <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http'));?><br />
284
-        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https'));?>
283
+        <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http')); ?><br />
284
+        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https')); ?>
285 285
         <div class="comment"><?php echo $_lang['server_protocol_message'] ?></div>
286 286
       </td>
287 287
     </tr>
@@ -294,8 +294,8 @@  discard block
 block discarded – undo
294 294
     <tr>
295 295
      <th><?php echo $_lang['track_visitors_title'] ?><br><small>[(track_visitors)]</small></th>
296 296
      <td>
297
-         <?php echo wrap_label($_lang['yes'], form_radio('track_visitors', 1));?><br />
298
-         <?php echo wrap_label($_lang['no'], form_radio('track_visitors', 0));?>
297
+         <?php echo wrap_label($_lang['yes'], form_radio('track_visitors', 1)); ?><br />
298
+         <?php echo wrap_label($_lang['no'], form_radio('track_visitors', 0)); ?>
299 299
          <div class="comment"><?php echo $_lang['track_visitors_message'] ?></div>
300 300
      </td>
301 301
    </tr>
Please login to merge, or discard this patch.
manager/actions/resources/tab6_categoryview.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 } ?>
5 5
 
Please login to merge, or discard this patch.
manager/actions/resources/mgrResources.class.php 1 patch
Spacing   +23 added lines, -23 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
 
@@ -38,36 +38,36 @@  discard block
 block discarded – undo
38 38
     public function setTypes()
39 39
     {
40 40
         global $_lang;
41
-        $this->types['site_templates']    = array(
41
+        $this->types['site_templates'] = array(
42 42
             'title'=>$_lang["manage_templates"],
43
-            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
44
-            'permissions'=>array('new_template','edit_template'),
43
+            'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
44
+            'permissions'=>array('new_template', 'edit_template'),
45 45
             'name'=>'templatename'
46 46
         );
47
-        $this->types['site_tmplvars']     = array(
47
+        $this->types['site_tmplvars'] = array(
48 48
             'title'=>$_lang["tmplvars"],
49
-            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
50
-            'permissions'=>array('new_template','edit_template'),
49
+            'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
50
+            'permissions'=>array('new_template', 'edit_template'),
51 51
         );
52 52
         $this->types['site_htmlsnippets'] = array(
53 53
             'title'=>$_lang["manage_htmlsnippets"],
54
-            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
55
-            'permissions'=>array('new_chunk','edit_chunk'),
54
+            'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
55
+            'permissions'=>array('new_chunk', 'edit_chunk'),
56 56
         );
57
-        $this->types['site_snippets']     = array(
57
+        $this->types['site_snippets'] = array(
58 58
             'title'=>$_lang["manage_snippets"],
59
-            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
60
-            'permissions'=>array('new_snippet','edit_snippet'),
59
+            'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
60
+            'permissions'=>array('new_snippet', 'edit_snippet'),
61 61
         );
62
-        $this->types['site_plugins']      = array(
62
+        $this->types['site_plugins'] = array(
63 63
             'title'=>$_lang["manage_plugins"],
64
-            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
65
-            'permissions'=>array('new_plugin','edit_plugin'),
64
+            'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
65
+            'permissions'=>array('new_plugin', 'edit_plugin'),
66 66
         );
67
-        $this->types['site_modules']      = array(
67
+        $this->types['site_modules'] = array(
68 68
             'title'=>$_lang["manage_modules"],
69
-            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
70
-            'permissions'=>array('new_module','edit_module'),
69
+            'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
70
+            'permissions'=>array('new_module', 'edit_module'),
71 71
         );
72 72
     }
73 73
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             'site_plugins',
118 118
             'site_modules'
119 119
         );
120
-        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
120
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : '';
121 121
 
122 122
         $tvsql  = '';
123 123
         $tvjoin = '';
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 
134 134
         $rs = $modx->db->select(
135 135
             "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
136
-            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
137
-	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
136
+            $modx->getFullTableName($resourceTable)." AS {$resourceTable}
137
+	            LEFT JOIN ".$modx->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
138 138
             "",
139 139
             "category,name"
140 140
         );
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
     public function prepareCategoryArrays()
158 158
     {
159 159
         foreach ($this->items as $type=>$items) {
160
-            foreach ((array)$items as $item) {
160
+            foreach ((array) $items as $item) {
161 161
                 $catid = $item['catid'] ? $item['catid'] : 0;
162 162
                 $this->categories[$catid] = $item['category'];
163 163
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
         // Now sort by name
173 173
         foreach ($this->itemsPerCategory as $catid=>$items) {
174
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
174
+            usort($this->itemsPerCategory[$catid], function($a, $b){
175 175
                 return strcasecmp($a['name'], $b['name']);
176 176
             });
177 177
         }
Please login to merge, or discard this patch.
manager/actions/resources/tab3_chunks.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- chunks -->
2 2
 <?php
3
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab5_plugins.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- plugins -->
2 2
 <?php
3
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab2_templatevars.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- Template variables -->
2 2
 <?php
3
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab1_templates.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- Templates -->
2 2
 <?php
3
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/tab4_snippets.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <!-- snippets -->
2 2
 <?php
3
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
4 4
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
5 5
 }
6 6
 
Please login to merge, or discard this patch.
manager/actions/resources/functions.inc.php 1 patch
Spacing   +27 added lines, -27 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 /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
6 6
 $tpl = array(
7
-    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),
8
-    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
9
-    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
10
-    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
11
-    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')
7
+    'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),
8
+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
9
+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
10
+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
11
+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')
12 12
 );
13 13
 
14 14
 /**
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
52 52
 
53
-    if (! is_array($items) || empty($items)) {
53
+    if (!is_array($items) || empty($items)) {
54 54
         return $_lang['no_results'];
55 55
     }
56 56
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $panelGroup .= parsePh($tpl['panelHeading'], array(
71 71
             'tab' => $resourceTable,
72 72
             'category' => $categories[$catid]['name'],
73
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
73
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
74 74
             'catid' => $catid,
75 75
         ));
76 76
 
@@ -112,10 +112,10 @@  discard block
 block discarded – undo
112 112
     }
113 113
 
114 114
     $tpl = array(
115
-        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
116
-        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
117
-        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
118
-        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),
115
+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
116
+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
117
+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
118
+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),
119 119
     );
120 120
 
121 121
     // Easily loop through $itemsPerCategory-Array
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $panelGroup .= parsePh($tpl['panelHeading'], array(
134 134
             'tab' => 'categories_list',
135 135
             'category' => $categories[$catid],
136
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
136
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
137 137
             'catid' => $catid,
138 138
         ));
139 139
 
@@ -206,32 +206,32 @@  discard block
 block discarded – undo
206 206
     if ($rowLock && $modx->hasPermission('display_locks')) {
207 207
         if ($rowLock['sid'] == $modx->sid) {
208 208
             $title = $modx->parseText($_lang["lock_element_editing"], array(
209
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
209
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
210 210
                 'lasthit_df' => $rowLock['lasthit_df']
211 211
             ));
212
-            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';
212
+            $lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';
213 213
         } else {
214 214
             $title = $modx->parseText($_lang["lock_element_locked_by"], array(
215
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
215
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
216 216
                 'username' => $rowLock['username'],
217 217
                 'lasthit_df' => $rowLock['lasthit_df']
218 218
             ));
219 219
             if ($modx->hasPermission('remove_locks')) {
220
-                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';
220
+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';
221 221
             } else {
222
-                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';
222
+                $lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';
223 223
             }
224 224
         }
225 225
     }
226 226
     if ($lockedByUser) {
227
-        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';
227
+        $lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';
228 228
     }
229 229
 
230 230
     // Caption
231 231
     if ($resourceTable == 'site_tmplvars') {
232
-        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];
232
+        $caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];
233 233
     } else {
234
-        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';
234
+        $caption = !empty($row['description']) ? ' '.$row['description'] : '';
235 235
     }
236 236
 
237 237
     // Special marks
@@ -242,26 +242,26 @@  discard block
 block discarded – undo
242 242
     if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
243 243
         $tplInfo[] = $_lang['defaulttemplate_title'];
244 244
     }
245
-    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
245
+    $marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';
246 246
 
247 247
     /* row buttons */
248 248
     $buttons = '';
249 249
     if ($modx->hasPermission($types['actions']['edit'][1])) {
250
-        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';
250
+        $buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';
251 251
     }
252 252
     if ($modx->hasPermission($types['actions']['duplicate'][1])) {
253
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';
253
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';
254 254
     }
255 255
     if ($modx->hasPermission($types['actions']['remove'][1])) {
256
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';
256
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';
257 257
     }
258
-    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';
258
+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';
259 259
 
260 260
     $catid = $row['catid'] ? $row['catid'] : 0;
261 261
 
262 262
     // Placeholders for elements-row
263 263
     return array(
264
-        'class' => $class ? ' class="' . $class . '"' : '',
264
+        'class' => $class ? ' class="'.$class.'"' : '',
265 265
         'lockedByUser' => $lockedByUser,
266 266
         'name' => $row['name'],
267 267
         'caption' => $caption,
Please login to merge, or discard this patch.