[REF] MODX_ to EVO_.

Author: Seiger

core/artisan

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-define('MODX_API_MODE', true);
+if (!defined('EVO_API_MODE')) define('EVO_API_MODE', true);
 
 require __DIR__ . '/bootstrap.php';
 

core/functions/preload.php

@@ -13,41 +13,41 @@ function evo()
             define('EVO_CLASS', '\DocumentParser');
         }
 
-        global $modx;
-        if ($modx === null) {
+        global $evo;
+        if ($evo === null) {
             try {
                 $obj = new ReflectionClass(EVO_CLASS);
-                $modx = $obj->newInstanceWithoutConstructor()->getInstance();
+                $evo = $obj->newInstanceWithoutConstructor()->getInstance();
             } catch (ReflectionException $exception) {
                 echo $exception->getMessage();
                 exit($exception->getCode());
             }
         }
 
-        if (IN_MANAGER_MODE == true && IN_INSTALL_MODE == false  && MODX_API_MODE != true) {
+        if (IN_MANAGER_MODE == true && IN_INSTALL_MODE == false  && EVO_API_MODE != true) {
             // attempt to foil some simple types of CSRF attacks
-            if ((int)$modx->getConfig('validate_referer') !== 0) {
+            if ((int)$evo->getConfig('validate_referer') !== 0) {
                 if (isset($_SERVER['HTTP_REFERER'])) {
 
                     $referer = $_SERVER['HTTP_REFERER'];
 
                     if (!empty($referer)) {
-                        if (!preg_match('/^' . preg_quote(MODX_SITE_URL, '/') . '/i', $referer)) {
-                            $modx->webAlertAndQuit(
+                        if (!preg_match('/^' . preg_quote(EVO_SITE_URL, '/') . '/i', $referer)) {
+                            $evo->webAlertAndQuit(
                                 "A possible CSRF attempt was detected from referer: {$referer}.",
                                 "/" . MGR_DIR . "/index.php"
                             );
                         }
                     } else {
-                        $modx->webAlertAndQuit(
+                        $evo->webAlertAndQuit(
                             "A possible CSRF attempt was detected. No referer was provided by the client.",
                             "/" . MGR_DIR . "/index.php"
                         );
                     }
                 } else {
 
                     if (mb_strtoupper($_SERVER['REQUEST_METHOD']) !== 'GET') {
-                        $modx->webAlertAndQuit(
+                        $evo->webAlertAndQuit(
                             "A possible CSRF attempt was detected. No referer was provided by the server.",
                             "/" . MGR_DIR . "/index.php"
                         );
@@ -57,7 +57,7 @@ function evo()
             }
         }
 
-        return $modx;
+        return $evo;
     }
 }
 
@@ -110,7 +110,7 @@ function startCMSSession()
         }
         session_set_cookie_params(
             0
-            , $session_cookie_path ? $session_cookie_path : MODX_BASE_URL
+            , $session_cookie_path ? $session_cookie_path : EVO_BASE_URL
             , $session_cookie_domain ? $session_cookie_domain : ''
             , $secure
             , true
@@ -159,7 +159,7 @@ function startCMSSession()
                 session_name()
                 , session_id()
                 , (int)$_SESSION[$key] ? $_SERVER['REQUEST_TIME'] + (int)$_SESSION[$key] : 0
-                , $session_cookie_path ? $session_cookie_path : MODX_BASE_URL
+                , $session_cookie_path ? $session_cookie_path : EVO_BASE_URL
                 , $session_cookie_domain ? $session_cookie_domain : ''
                 , $secure
                 , true
@@ -251,7 +251,7 @@ function getSanitizedValue($value = '')
             }
             $sanitizedBracket = str_replace(
                 '#',
-                MODX_SANITIZE_SEED,
+                EVO_SANITIZE_SEED,
                 sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1))
             );
             $value = str_replace($bracket, $sanitizedBracket, $value);
@@ -269,10 +269,10 @@ function getSanitizedValue($value = '')
      */
     function removeSanitizeSeed($string = '')
     {
-        if (!$string || strpos($string, MODX_SANITIZE_SEED) === false) {
+        if (!$string || strpos($string, EVO_SANITIZE_SEED) === false) {
             return $string;
         }
 
-        return str_replace(MODX_SANITIZE_SEED, '', $string);
+        return str_replace(EVO_SANITIZE_SEED, '', $string);
     }
 }

core/src/ManagerTheme.php

@@ -406,7 +406,7 @@ public function handleRoute()
 
         Route::middleware('mgr')
             ->namespace('\\EvolutionCMS\\Controllers')
-            ->group(MODX_MANAGER_PATH . '/routes.php');
+            ->group(EVO_MANAGER_PATH . '/routes.php');
 
         $routes = $evo->router->getRoutes();
         $routes->refreshNameLookups();

manager/media/style/common/images/favicon.ico

@@ -1,24 +1,22 @@
 <!DOCTYPE html>
-<html lang="{{ ManagerTheme::getLang() }}" dir="{{ ManagerTheme::getTextDir() }}">
+<html lang="{{ManagerTheme::getLang()}}" dir="{{ManagerTheme::getTextDir()}}">
 <head>
     <title>Evolution CMS</title>
-    <base href="{{ MODX_MANAGER_URL }}">
-    <meta http-equiv="Content-Type" content="text/html; charset={{ ManagerTheme::getCharset() }}"/>
+    <base href="{{EVO_MANAGER_URL}}">
+    <meta http-equiv="Content-Type" content="text/html; charset={{ManagerTheme::getCharset()}}"/>
     <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width"/>
     <meta name="theme-color" content="#1d2023"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    @if(class_exists(Tracy\Debugger::class) && EvolutionCMS()->get('config')->get('tracy.active'))
+    @if(class_exists(Tracy\Debugger::class) && evo()->get('config')->get('tracy.active'))
         {!! Tracy\Debugger::renderLoader() !!}
     @endif
-    <link rel="stylesheet" type="text/css" href="{{ ManagerTheme::css() }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ManagerTheme::css()}}"/>
     <script type="text/javascript" src="media/script/tabpane.js"></script>
-    <script type="text/javascript" src="{{ EvolutionCMS()->getConfig('mgr_jquery_path') }}"></script>
-    @if (EvolutionCMS()->getConfig('show_picker') === true)
-        <script src="{{ ManagerTheme::getThemeUrl() }}/js/color.switcher.js" type="text/javascript"></script>
+    <script type="text/javascript" src="{{evo()->getConfig('mgr_jquery_path')}}"></script>
+    @if (evo()->getConfig('show_picker') === true)
+        <script src="{{ManagerTheme::getThemeUrl()}}/js/color.switcher.js" type="text/javascript"></script>
     @endif
-
-    {!! ManagerTheme::getMainFrameHeaderHTMLBlock() !!}
-
+    {!!ManagerTheme::getMainFrameHeaderHTMLBlock()!!}
     <script type="text/javascript">
         if (!evo) {
             var evo = {};
@@ -41,15 +39,14 @@
             ManagerTheme::getStyle(),
             ['icon_file', 'icon_pencil', 'icon_reply', 'icon_plus']
         )) !!};
-        evo.MODX_MANAGER_URL = '{{  MODX_MANAGER_URL }}';
-        evo.config.which_browser = '{{ EvolutionCMS()->getConfig('which_browser') }}';
+        evo.EVO_MANAGER_URL = '{{EVO_MANAGER_URL}}';
+        evo.config.which_browser = '{{evo()->getConfig('which_browser')}}';
     </script>
     <script src="media/script/main.js"></script>
     @if (get_by_key($_REQUEST, 'r', '', 'is_numeric'))
         <script>doRefresh({{ $_REQUEST['r'] }});</script>
     @endif
     @stack('scripts.top')
-    {!! EvolutionCMS()->getRegisteredClientStartupScripts() !!}
+    {!!evo()->getRegisteredClientStartupScripts()!!}
 </head>
-
-<body class="{{ ManagerTheme::getTextDir() }} {{ ManagerTheme::getThemeStyle() }}" data-evocp="color">
+<body class="{{ManagerTheme::getTextDir()}} {{ManagerTheme::getThemeStyle()}}" data-evocp="color">