Completed
Pull Request — develop (#716)
by Agel_Nash
11:45 queued 04:51
created
manager/includes/functions/actions/logging.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('array_unique_multi')) {
2
+if (!function_exists('array_unique_multi')) {
3 3
     /**
4 4
      * @param array $array
5 5
      * @param string $checkKey
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     }
28 28
 }
29 29
 
30
-if(!function_exists('record_sort')) {
30
+if (!function_exists('record_sort')) {
31 31
     /**
32 32
      * @param array $array
33 33
      * @param string $key
Please login to merge, or discard this patch.
manager/includes/functions/actions/bkmanager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('import_sql')) {
2
+if (!function_exists('import_sql')) {
3 3
     /**
4 4
      * @param string $source
5 5
      * @param string $result_code
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     }
41 41
 }
42 42
 
43
-if(!function_exists('dumpSql')) {
43
+if (!function_exists('dumpSql')) {
44 44
     /**
45 45
      * @param string $dumpstring
46 46
      * @return bool
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     }
67 67
 }
68 68
 
69
-if(!function_exists('snapshot')) {
69
+if (!function_exists('snapshot')) {
70 70
     /**
71 71
      * @param string $dumpstring
72 72
      * @return bool
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     }
81 81
 }
82 82
 
83
-if(!function_exists('getSettings')) {
83
+if (!function_exists('getSettings')) {
84 84
     /**
85 85
      * @return array
86 86
      */
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     }
108 108
 }
109 109
 
110
-if(!function_exists('restoreSettings')) {
110
+if (!function_exists('restoreSettings')) {
111 111
     /**
112 112
      * @param array $settings
113 113
      */
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
     }
123 123
 }
124 124
 
125
-if(!function_exists('parsePlaceholder')) {
125
+if (!function_exists('parsePlaceholder')) {
126 126
     /**
127 127
      * @param string $tpl
128 128
      * @param array $ph
Please login to merge, or discard this patch.
manager/includes/functions/actions/mutate_role.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
 <?php
2 2
 
3
-if(!function_exists('render_form')) {
3
+if (!function_exists('render_form')) {
4 4
     /**
5 5
      * @param string $name
6 6
      * @param string $label
Please login to merge, or discard this patch.
manager/includes/functions/processors.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -403,10 +403,12 @@
 block discarded – undo
403 403
         $failedlogins += 1;
404 404
 
405 405
         $fields = array('failedlogincount' => $failedlogins);
406
-        if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
406
+        if ($failedlogins >= $failed_allowed) {
407
+            //block user for too many fail attempts
407 408
         {
408 409
             $fields['blockeduntil'] = time() + ($blocked_minutes * 60);
409 410
         }
411
+        }
410 412
 
411 413
         $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
412 414
 
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     }
37 37
 }
38 38
 
39
-if(!function_exists('duplicateDocument')) {
39
+if (!function_exists('duplicateDocument')) {
40 40
     /**
41 41
      * @param int $docid
42 42
      * @param null|int $parent
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
90 90
             $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'),
91 91
                 "pagetitle LIKE '{$pagetitle} Duplicate%'"));
92 92
             if ($count >= 1) {
93
-                $count = ' ' . ($count + 1);
93
+                $count = ' '.($count + 1);
94 94
             } else {
95 95
                 $count = '';
96 96
             }
97 97
 
98
-            $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle'];
98
+            $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
99 99
             $content['alias'] = null;
100 100
         } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
101 101
             $content['alias'] = null;
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
     }
154 154
 }
155 155
 
156
-if(!function_exists('duplicateTVs')) {
156
+if (!function_exists('duplicateTVs')) {
157 157
     /**
158 158
      * Duplicate Document TVs
159 159
      *
@@ -166,8 +166,8 @@  discard block
 block discarded – undo
166 166
 
167 167
         $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
168 168
 
169
-        $newid = (int)$newid;
170
-        $oldid = (int)$oldid;
169
+        $newid = (int) $newid;
170
+        $oldid = (int) $oldid;
171 171
 
172 172
         $modx->db->insert(
173 173
             array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
     }
177 177
 }
178 178
 
179
-if(!function_exists('duplicateAccess')) {
179
+if (!function_exists('duplicateAccess')) {
180 180
     /**
181 181
      * Duplicate Document Access Permissions
182 182
      *
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
         $tbldg = $modx->getFullTableName('document_groups');
191 191
 
192
-        $newid = (int)$newid;
193
-        $oldid = (int)$oldid;
192
+        $newid = (int) $newid;
193
+        $oldid = (int) $oldid;
194 194
 
195 195
         $modx->db->insert(
196 196
             array('document' => '', 'document_group' => ''), $tbldg, // Insert into
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     }
200 200
 }
201 201
 
202
-if(!function_exists('evalModule')) {
202
+if (!function_exists('evalModule')) {
203 203
     /**
204 204
      * evalModule
205 205
      *
@@ -235,17 +235,17 @@  discard block
 block discarded – undo
235 235
             }
236 236
             if ($modx->config['error_reporting'] === '99' || 2 < $error_level) {
237 237
                 $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'],
238
-                    $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
238
+                    $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg);
239 239
                 $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
240 240
             }
241 241
         }
242 242
         unset($modx->event->params);
243 243
 
244
-        return $mod . $msg;
244
+        return $mod.$msg;
245 245
     }
246 246
 }
247 247
 
248
-if(!function_exists('allChildren')) {
248
+if (!function_exists('allChildren')) {
249 249
     /**
250 250
      * @param int $currDocID
251 251
      * @return array
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
     }
266 266
 }
267 267
 
268
-if(!function_exists('jsAlert')) {
268
+if (!function_exists('jsAlert')) {
269 269
     /**
270 270
      * show javascript alert
271 271
      *
@@ -275,14 +275,14 @@  discard block
 block discarded – undo
275 275
     {
276 276
         $modx = evolutionCMS();
277 277
         if ($_POST['ajax'] != 1) {
278
-            echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
278
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
279 279
         } else {
280
-            echo $msg . "\n";
280
+            echo $msg."\n";
281 281
         }
282 282
     }
283 283
 }
284 284
 
285
-if(!function_exists('login')) {
285
+if (!function_exists('login')) {
286 286
     /**
287 287
      * @param string $username
288 288
      * @param string $givenPassword
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
     }
298 298
 }
299 299
 
300
-if(!function_exists('loginV1')) {
300
+if (!function_exists('loginV1')) {
301 301
     /**
302 302
      * @param int $internalKey
303 303
      * @param string $givenPassword
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
     }
331 331
 }
332 332
 
333
-if(!function_exists('loginMD5')) {
333
+if (!function_exists('loginMD5')) {
334 334
     /**
335 335
      * @param int $internalKey
336 336
      * @param string $givenPassword
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
     }
352 352
 }
353 353
 
354
-if(!function_exists('updateNewHash')) {
354
+if (!function_exists('updateNewHash')) {
355 355
     /**
356 356
      * @param string $username
357 357
      * @param string $password
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
     }
367 367
 }
368 368
 
369
-if(!function_exists('incrementFailedLoginCount')) {
369
+if (!function_exists('incrementFailedLoginCount')) {
370 370
     /**
371 371
      * @param int $internalKey
372 372
      * @param int $failedlogins
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 
390 390
         if ($failedlogins < $failed_allowed) {
391 391
             //sleep to help prevent brute force attacks
392
-            $sleep = (int)$failedlogins / 2;
392
+            $sleep = (int) $failedlogins / 2;
393 393
             if ($sleep > 5) {
394 394
                 $sleep = 5;
395 395
             }
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
     }
403 403
 }
404 404
 
405
-if(!function_exists('saveUserGroupAccessPermissons')) {
405
+if (!function_exists('saveUserGroupAccessPermissons')) {
406 406
     /**
407 407
      * saves module user group access
408 408
      */
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
     }
434 434
 }
435 435
 
436
-if(!function_exists('saveEventListeners')) {
436
+if (!function_exists('saveEventListeners')) {
437 437
 # Save Plugin Event Listeners
438 438
     function saveEventListeners($id, $sysevents, $mode)
439 439
     {
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
     }
487 487
 }
488 488
 
489
-if(!function_exists('getEventIdByName')) {
489
+if (!function_exists('getEventIdByName')) {
490 490
     /**
491 491
      * @param string $name
492 492
      * @return string|int
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
     }
510 510
 }
511 511
 
512
-if(!function_exists('saveTemplateAccess')) {
512
+if (!function_exists('saveTemplateAccess')) {
513 513
     /**
514 514
      * @param int $id
515 515
      */
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
     }
549 549
 }
550 550
 
551
-if(!function_exists('saveTemplateVarAccess')) {
551
+if (!function_exists('saveTemplateVarAccess')) {
552 552
     /**
553 553
      * @return void
554 554
      */
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
     }
588 588
 }
589 589
 
590
-if(!function_exists('saveDocumentAccessPermissons')) {
590
+if (!function_exists('saveDocumentAccessPermissons')) {
591 591
     function saveDocumentAccessPermissons()
592 592
     {
593 593
         global $id, $newid;
@@ -756,10 +756,10 @@  discard block
 block discarded – undo
756 756
         }
757 757
 
758 758
         foreach ($defaults as $k) {
759
-            if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
759
+            if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
760 760
                 unset($settings[$k]);
761 761
             }
762
-            unset($settings['default_' . $k]);
762
+            unset($settings['default_'.$k]);
763 763
         }
764 764
 
765 765
         $modx->db->delete($tbl_user_settings, "user='{$id}'");
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
         global $id, $modx;
792 792
         $mode = $_POST['mode'];
793 793
         $modx->manager->saveFormValues($mode);
794
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
794
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
795 795
     }
796 796
 }
797 797
 
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
         global $deltime;
808 808
 
809 809
         $rs = $modx->db->select('id', $modx->getFullTableName('site_content'),
810
-            "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'");
810
+            "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
811 811
         // the document has children documents, we'll need to delete those too
812 812
         while ($row = $modx->db->getRow($rs)) {
813 813
             $children[] = $row['id'];
Please login to merge, or discard this patch.
manager/includes/functions/helper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!function_exists('createGUID')) {
3
+if (!function_exists('createGUID')) {
4 4
     /**
5 5
      * create globally unique identifiers (guid)
6 6
      *
@@ -8,22 +8,22 @@  discard block
 block discarded – undo
8 8
      */
9 9
     function createGUID()
10 10
     {
11
-        srand((double)microtime() * 1000000);
11
+        srand((double) microtime() * 1000000);
12 12
         $r = rand();
13
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
13
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
14 14
         $m = md5($u);
15 15
 
16 16
         return $m;
17 17
     }
18 18
 }
19 19
 
20
-if(!function_exists('generate_password')) {
20
+if (!function_exists('generate_password')) {
21 21
 // Generate password
22 22
     function generate_password($length = 10)
23 23
     {
24 24
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
25 25
         $ps_len = strlen($allowable_characters);
26
-        mt_srand((double)microtime() * 1000000);
26
+        mt_srand((double) microtime() * 1000000);
27 27
         $pass = "";
28 28
         for ($i = 0; $i < $length; $i++) {
29 29
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
Please login to merge, or discard this patch.
manager/includes/tmplvars.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
3
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';
Please login to merge, or discard this patch.
manager/includes/tmplvars.commands.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
3
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';
Please login to merge, or discard this patch.
manager/includes/tmplvars.format.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
3
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';
Please login to merge, or discard this patch.
manager/processors/remove_installer.processor.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 }
37 37
 
38 38
 $msg = '';
39
-$pth = dirname(dirname(__DIR__)) . '/install/';
39
+$pth = dirname(dirname(__DIR__)).'/install/';
40 40
 $pth = str_replace('\\', '/', $pth);
41 41
 
42 42
 if (isset($_GET['rminstall'])) {
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     }
48 48
 }
49 49
 if ($msg) {
50
-    echo "<script>alert('" . addslashes($msg) . "');</script>";
50
+    echo "<script>alert('".addslashes($msg)."');</script>";
51 51
 }
52 52
 
53 53
 echo "<script>window.location='../index.php?a=2';</script>";
Please login to merge, or discard this patch.