Merge pull request #2205 from elcreator/3.5.x

[FIX] reverted prefix placeholder support and fixed login issue

Author: Seiger

core/src/Controllers/Users/LogInOut.php

@@ -81,7 +81,7 @@ public function simpleLogin()
             }
         }
         $log = new \EvolutionCMS\Legacy\LogHandler();
-        $log->initAndWriteLog('Logged in', EvolutionCMS()->getLoginUserID('mgr'), $_SESSION['mgrShortname'], '58', '-', 'EVO');
+        $log->initAndWriteLog('Logged in', $user->id, $user->username, '58', '-', 'EVO');
 
         $id = 0;
 // check if we should redirect user to a web page

core/src/Database.php

@@ -34,6 +34,27 @@ public function __construct(?Container $container = null)
         $this->prepareNativeConfig();
     }
 
+    /**
+     * @param string $sql
+     * @return null|string|string[]
+     */
+    public function replacePrefixPlaceholderInTableName($sql)
+    {
+        if (str_contains($sql, '[+prefix+]')) {
+            $connection = $this->getConnection();
+            $grammar = $connection->getQueryGrammar();
+            return preg_replace_callback(
+                '@\[\+prefix\+\](\w+)@',
+                static function ($matches) use ($grammar) {
+                    return $grammar->wrapTable($matches[1]);
+                },
+                $sql
+            );
+        }
+
+        return $sql;
+    }
+
     /**
      * @param string $sql
      * @param bool $watchError
@@ -154,6 +175,11 @@ public function isConnected()
         return $this->conn instanceof Connection && $this->conn->getPdo() instanceof \PDO;
     }
 
+    /**
+     * @deprecated
+     * @since 1.4
+     * @todo [remove@3.7] Remove in Evolution CMS 3.7
+     */
     public function insertFrom(
         $fields,
         $table,
@@ -316,15 +342,15 @@ protected function prepareFrom($data, $hasArray = false)
         if (\is_array($data) && $hasArray === true) {
             $tmp = [];
             foreach ($data as $table) {
-                $tmp[] = $table;
+                $tmp[] = $this->replacePrefixPlaceholderInTableName($table);
             }
             $data = implode(' ', $tmp);
         }
         if (!is_scalar($data) || empty($data)) {
             throw new Exceptions\TableNotDefinedException($data);
         }
 
-        return $data;
+        return $this->replacePrefixPlaceholderInTableName($data);
     }
 
     /**
@@ -458,6 +484,7 @@ public function delete($from, $where = '', $orderBy = '', $limit = '')
         if (!$from) {
             evo()->getService('ExceptionHandler')->messageQuit("Empty \$from parameters in DBAPI::delete().");
         } else {
+            $from = $this->replacePrefixPlaceholderInTableName($from);
             $where = trim($where);
             $orderBy = trim($orderBy);
             $limit = trim($limit);
@@ -572,6 +599,7 @@ public function insert($fields, $intotable, $fromfields = "*", $fromtable = "",
         if (!$intotable) {
             evo()->getService('ExceptionHandler')->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
         } else {
+            $intotable = $this->replacePrefixPlaceholderInTableName($intotable);
             if (!is_array($fields)) {
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
@@ -631,6 +659,7 @@ public function update($fields, $table, $where = "")
         if (!$table) {
             evo()->getService('ExceptionHandler')->messageQuit('Empty ' . $table . ' parameter in DBAPI::update().');
         } else {
+            $table = $this->replacePrefixPlaceholderInTableName($table);
             if (is_array($fields)) {
                 foreach ($fields as $key => $value) {
                     if ($value === null || strtolower($value) === 'null') {
@@ -669,6 +698,7 @@ public function getTableMetaData($table)
         $metadata = [];
         $driver = evo()->getDatabase()->getConfig('driver');
         if (!empty($table) && is_scalar($table)) {
+            $table = $this->replacePrefixPlaceholderInTableName($table);
             switch ($driver) {
                 case 'sqlite':
                 case 'sqlite3':

core/vendor/evolutioncms-services/user-manager/src/Services/Users/SafelyDestroyUserSessionTrait.php

@@ -21,7 +21,7 @@ trait SafelyDestroyUserSessionTrait
 
     protected function safelyDestroyUserSession()
     {
-        if (defined('NO_SESSION')) {
+        if (defined('NO_SESSION') && !(defined('IN_MANAGER_MODE') && IN_MANAGER_MODE)) {
             return;
         }
 

core/vendor/evolutioncms-services/user-manager/src/Services/Users/UserLogin.php

@@ -280,7 +280,7 @@ public function authProcess()
 
         EvolutionCMS()->cleanupExpiredLocks();
         EvolutionCMS()->cleanupMultipleActiveUsers();
-        if(!defined('NO_SESSION')) {
+        if ((defined('IN_MANAGER_MODE') && IN_MANAGER_MODE) || !defined('NO_SESSION')) {
             $this->writeSession();
         }
         // successful login so reset fail count and update key values

index.php

@@ -129,7 +129,7 @@
 }
 
 // Initiate a new document parser
-$evo = evo();
+$GLOBALS['evo'] = $GLOBALS['modx'] = $evo = $modx = evo();
 $evo->minParserPasses = 1; // min number of parser recursive loops or passes
 $evo->maxParserPasses = 10; // max number of parser recursive loops or passes
 $evo->dumpSQL = false;