Completed
Push — develop ( d568f8...c061fc )
by Agel_Nash
06:25
created
manager/includes/footer.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
 global $SystemAlertMsgQueque;
Please login to merge, or discard this patch.
manager/includes/manager.lockout.inc.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  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 ($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])) {
7
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
8
-    $logouturl = MODX_MANAGER_URL . 'index.php?a=8';
6
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
7
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
8
+    $logouturl = MODX_MANAGER_URL.'index.php?a=8';
9 9
 
10 10
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
11 11
     $modx->setPlaceholder('theme', $manager_theme);
@@ -18,51 +18,51 @@  discard block
 block discarded – undo
18 18
     $modx->setPlaceholder('homeurl', $homeurl);
19 19
     $modx->setPlaceholder('logout', $_lang["logout"]);
20 20
     $modx->setPlaceholder('logouturl', $logouturl);
21
-    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
21
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
22 22
     $modx->setPlaceholder('year', date('Y'));
23 23
 
24 24
     // load template
25 25
     if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
26
-        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
26
+        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
27 27
     }
28 28
 
29 29
     $target = $modx->config['manager_lockout_tpl'];
30 30
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
31 31
     $target = $modx->mergeSettingsContent($target);
32 32
 
33
-    if (substr($target, 0, 1)==='@') {
34
-        if (substr($target, 0, 6)==='@CHUNK') {
33
+    if (substr($target, 0, 1) === '@') {
34
+        if (substr($target, 0, 6) === '@CHUNK') {
35 35
             $target = trim(substr($target, 7));
36 36
             $lockout_tpl = $modx->getChunk($target);
37
-        } elseif (substr($target, 0, 5)==='@FILE') {
37
+        } elseif (substr($target, 0, 5) === '@FILE') {
38 38
             $target = trim(substr($target, 6));
39 39
             $lockout_tpl = file_get_contents($target);
40 40
         }
41 41
     } else {
42 42
         $chunk = $modx->getChunk($target);
43
-        if ($chunk!==false && !empty($chunk)) {
43
+        if ($chunk !== false && !empty($chunk)) {
44 44
             $lockout_tpl = $chunk;
45
-        } elseif (is_file(MODX_BASE_PATH . $target)) {
46
-            $target = MODX_BASE_PATH . $target;
45
+        } elseif (is_file(MODX_BASE_PATH.$target)) {
46
+            $target = MODX_BASE_PATH.$target;
47 47
             $lockout_tpl = file_get_contents($target);
48
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
49
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
48
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
49
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
50 50
             $lockout_tpl = file_get_contents($target);
51
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
52
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
51
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
52
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
53 53
             $login_tpl = file_get_contents($target);
54
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
55
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
54
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
55
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
56 56
             $lockout_tpl = file_get_contents($target);
57 57
         } else {
58
-            $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
58
+            $target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
59 59
             $lockout_tpl = file_get_contents($target);
60 60
         }
61 61
     }
62 62
 
63 63
     // merge placeholders
64 64
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
65
-    $regx = strpos($lockout_tpl, '[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
65
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
66 66
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
67 67
 
68 68
     echo $lockout_tpl;
Please login to merge, or discard this patch.
manager/includes/preload.functions.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,14 +4,14 @@  discard block
 block discarded – undo
4 4
 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession
5 5
 
6 6
 
7
-if (! function_exists('evolutionCMS')) {
7
+if (!function_exists('evolutionCMS')) {
8 8
     /**
9 9
      * @return DocumentParser
10 10
      */
11 11
     function evolutionCMS()
12 12
     {
13
-        if (! defined('MODX_CLASS')) {
14
-            if (! class_exists('DocumentParser')) {
13
+        if (!defined('MODX_CLASS')) {
14
+            if (!class_exists('DocumentParser')) {
15 15
                 throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');
16 16
             }
17 17
             define('MODX_CLASS', 'DocumentParser');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
     $_ = crc32(__FILE__);
30 30
     $_ = sprintf('%u', $_);
31 31
 
32
-    return 'evo' . base_convert($_, 10, 36);
32
+    return 'evo'.base_convert($_, 10, 36);
33 33
 }
34 34
 
35 35
 /**
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     session_start();
53 53
     $key = "modx.mgr.session.cookie.lifetime";
54 54
     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
55
-        $cookieLifetime = (int)$_SESSION[$key];
55
+        $cookieLifetime = (int) $_SESSION[$key];
56 56
         if ($cookieLifetime) {
57 57
             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;
58 58
         }
Please login to merge, or discard this patch.