Replace `WCF_N` with `1` and use `WCF::getDB()->prepare()` instead of `WCF::getDB...

diff --git a/files/lib/system/exporter/IPB3xExporter.class.php b/files/lib/system/exporter/IPB3xExporter.class.php
index b036b5c8bab72e750e551164916ce83ef644eb87..33ffe1421f4b3c6cd2b413b7b8cfc5f980ea13a4 100644 (file)
--- a/files/lib/system/exporter/IPB3xExporter.class.php
+++ b/files/lib/system/exporter/IPB3xExporter.class.php
@@ -225,10 +225,10 @@ final class IPB3xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      pfields_content.*, members.*, profile_portal.*

diff --git a/files/lib/system/exporter/IPB4xExporter.class.php b/files/lib/system/exporter/IPB4xExporter.class.php
index 61c87b922eac2fd09f40cfe7ea20e0795d1f62ef..8d291f68c0cbde81deeff511023290062080fde4 100644 (file)
--- a/files/lib/system/exporter/IPB4xExporter.class.php
+++ b/files/lib/system/exporter/IPB4xExporter.class.php
@@ -283,10 +283,10 @@ final class IPB4xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      pfields_content.*, members.*

diff --git a/files/lib/system/exporter/Kunena3xExporter.class.php b/files/lib/system/exporter/Kunena3xExporter.class.php
index 3e06b38533c08f36953456cfec777ac7410ca604..3774eb1b12f48c7e243755a554efc4355812fca1 100644 (file)
--- a/files/lib/system/exporter/Kunena3xExporter.class.php
+++ b/files/lib/system/exporter/Kunena3xExporter.class.php
@@ -206,10 +206,10 @@ final class Kunena3xExporter extends AbstractExporter
     public function exportUsers($offset, $limit)
     {
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      kunena_users.*, users.*,

diff --git a/files/lib/system/exporter/MyBB16xExporter.class.php b/files/lib/system/exporter/MyBB16xExporter.class.php
index 502ef833ef31106135a926bd72f325ab6253c06c..5dce9de0372abb6e57d77004b46301f50a04c215 100644 (file)
--- a/files/lib/system/exporter/MyBB16xExporter.class.php
+++ b/files/lib/system/exporter/MyBB16xExporter.class.php
@@ -304,10 +304,10 @@ final class MyBB16xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      userfields_table.*,

diff --git a/files/lib/system/exporter/NodeBB0xRedisExporter.class.php b/files/lib/system/exporter/NodeBB0xRedisExporter.class.php
index 5d496256b57ea32ce21291a21cbcaf0ea226de31..85078f703c156372a810efc5dfab2bc9cdf06d96 100644 (file)
--- a/files/lib/system/exporter/NodeBB0xRedisExporter.class.php
+++ b/files/lib/system/exporter/NodeBB0xRedisExporter.class.php
@@ -167,10 +167,10 @@ final class NodeBB0xRedisExporter extends AbstractExporter
     public function exportUsers($offset, $limit)
     {
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         $userIDs = $this->database->zrange('users:joindate', $offset, $offset + $limit);
         if (!$userIDs) {

diff --git a/files/lib/system/exporter/PhpBB31xExporter.class.php b/files/lib/system/exporter/PhpBB31xExporter.class.php
index 60d524bc8d808e5bde9bf9f3188a02a5d1c6cd60..856a95bc995aafe0fb8ca25bb63e89b0a3dd0acb 100644 (file)
--- a/files/lib/system/exporter/PhpBB31xExporter.class.php
+++ b/files/lib/system/exporter/PhpBB31xExporter.class.php
@@ -349,10 +349,10 @@ final class PhpBB31xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      fields_table.*, user_table.*, ban_table.ban_give_reason AS banReason,

diff --git a/files/lib/system/exporter/PhpBB3xExporter.class.php b/files/lib/system/exporter/PhpBB3xExporter.class.php
index 57b69ed3f882ff1a077ee09939f7230ad8f1b963..5f3048f8d0895a2d3a4e385f9bef93313a896c6d 100644 (file)
--- a/files/lib/system/exporter/PhpBB3xExporter.class.php
+++ b/files/lib/system/exporter/PhpBB3xExporter.class.php
@@ -334,10 +334,10 @@ final class PhpBB3xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      fields_table.*, user_table.*, ban_table.ban_give_reason AS banReason,

diff --git a/files/lib/system/exporter/SMF2xExporter.class.php b/files/lib/system/exporter/SMF2xExporter.class.php
index 4833828531e76e7014a7a3e1e3cdd371b369e3dc..bcd0472722129c24569f527183d3f4365b66ad06 100644 (file)
--- a/files/lib/system/exporter/SMF2xExporter.class.php
+++ b/files/lib/system/exporter/SMF2xExporter.class.php
@@ -298,10 +298,10 @@ final class SMF2xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get userIDs
         $userIDs = [];

diff --git a/files/lib/system/exporter/VB3or4xExporter.class.php b/files/lib/system/exporter/VB3or4xExporter.class.php
index 30fb3aecd24e17c2d3d1dc490c8c290a3b7e3688..c7ad38eb553381ad853a2bda31afe1446df666af 100644 (file)
--- a/files/lib/system/exporter/VB3or4xExporter.class.php
+++ b/files/lib/system/exporter/VB3or4xExporter.class.php
@@ -493,10 +493,10 @@ final class VB3or4xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      userfield.*, user_table.*, textfield.*,

diff --git a/files/lib/system/exporter/VB5xExporter.class.php b/files/lib/system/exporter/VB5xExporter.class.php
index ff9dc26b5a6c378322610ac819422e63d430af5e..0849724174d71c61377df9424894369b5a9111e5 100644 (file)
--- a/files/lib/system/exporter/VB5xExporter.class.php
+++ b/files/lib/system/exporter/VB5xExporter.class.php
@@ -353,10 +353,10 @@ final class VB5xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      userfield.*, user_table.*, textfield.*,

diff --git a/files/lib/system/exporter/WBB2xExporter.class.php b/files/lib/system/exporter/WBB2xExporter.class.php
index c13d774f897d6416b3627e13187a3e5fa039e300..1e406ae567973b5756be9f163351043b16ed8322 100644 (file)
--- a/files/lib/system/exporter/WBB2xExporter.class.php
+++ b/files/lib/system/exporter/WBB2xExporter.class.php
@@ -300,10 +300,10 @@ final class WBB2xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      userfields.*, user.*,

diff --git a/files/lib/system/exporter/WBB3xExporter.class.php b/files/lib/system/exporter/WBB3xExporter.class.php
index e2f5d3f8f61f794e4c441b0dce2feda081cf95e9..958489e70c8c048822cc4e9de945b2f394a39d3c 100644 (file)
--- a/files/lib/system/exporter/WBB3xExporter.class.php
+++ b/files/lib/system/exporter/WBB3xExporter.class.php
@@ -436,9 +436,9 @@ final class WBB3xExporter extends AbstractExporter
         // cache existing user options
         $existingUserOptions = [];
         $sql = "SELECT  optionName, optionID
-                FROM    wcf" . WCF_N . "_user_option
+                FROM    wcf1_user_option
                 WHERE   optionName NOT LIKE 'option%'";
-        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement = WCF::getDB()->prepare($sql);
         $statement->execute();
         while ($row = $statement->fetchArray()) {
             $existingUserOptions[$row['optionName']] = true;
@@ -455,10 +455,10 @@ final class WBB3xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get password encryption
         $encryption = 'wcf1';
@@ -3242,9 +3242,9 @@ final class WBB3xExporter extends AbstractExporter
     {
         $optionsNames = [];
         $sql = "SELECT  optionName
-                FROM    wcf" . WCF_N . "_user_option
+                FROM    wcf1_user_option
                 WHERE   optionName NOT LIKE ?";
-        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement = WCF::getDB()->prepare($sql);
         $statement->execute(['option%']);
         while ($row = $statement->fetchArray()) {
             $optionsNames[] = $row['optionName'];

diff --git a/files/lib/system/exporter/WBB4xExporter.class.php b/files/lib/system/exporter/WBB4xExporter.class.php
index cb7bfa2392a0d0daef5cd0d13112d125d947c90a..115407f53fe45a0731b30f666bdd69efaf275990 100644 (file)
--- a/files/lib/system/exporter/WBB4xExporter.class.php
+++ b/files/lib/system/exporter/WBB4xExporter.class.php
@@ -584,9 +584,9 @@ final class WBB4xExporter extends AbstractExporter
         // cache existing user options
         $existingUserOptions = [];
         $sql = "SELECT  optionName, optionID
-                FROM    wcf" . WCF_N . "_user_option
+                FROM    wcf1_user_option
                 WHERE   optionName NOT LIKE 'option%'";
-        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement = WCF::getDB()->prepare($sql);
         $statement->execute();
         while ($row = $statement->fetchArray()) {
             $existingUserOptions[$row['optionName']] = true;
@@ -603,10 +603,10 @@ final class WBB4xExporter extends AbstractExporter
         }
 
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      user_option_value.*, user_table.*,
@@ -4288,9 +4288,9 @@ final class WBB4xExporter extends AbstractExporter
     {
         $optionsNames = [];
         $sql = "SELECT  optionName
-                FROM    wcf" . WCF_N . "_user_option
+                FROM    wcf1_user_option
                 WHERE   optionName NOT LIKE ?";
-        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement = WCF::getDB()->prepare($sql);
         $statement->execute(['option%']);
         while ($row = $statement->fetchArray()) {
             $optionsNames[] = $row['optionName'];

diff --git a/files/lib/system/exporter/WordPress3xExporter.class.php b/files/lib/system/exporter/WordPress3xExporter.class.php
index 1aa40148d59f9e914d171ec3a026908c192e9734..ca22086b1e5e0256a59be8ed65b8bad099c2598f 100644 (file)
--- a/files/lib/system/exporter/WordPress3xExporter.class.php
+++ b/files/lib/system/exporter/WordPress3xExporter.class.php
@@ -147,10 +147,10 @@ final class WordPress3xExporter extends AbstractExporter
     public function exportUsers($offset, $limit)
     {
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      *

diff --git a/files/lib/system/exporter/XF12xExporter.class.php b/files/lib/system/exporter/XF12xExporter.class.php
index 39748cce56fb238c50885273b1616f4d90b3da01..f1ae300c991b4fb59b6df70082724da5ee099165 100644 (file)
--- a/files/lib/system/exporter/XF12xExporter.class.php
+++ b/files/lib/system/exporter/XF12xExporter.class.php
@@ -308,10 +308,10 @@ final class XF12xExporter extends AbstractExporter
     public function exportUsers($offset, $limit)
     {
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      user_table.*, user_profile_table.*, INET_NTOA(ip_table.ip) AS ip,

diff --git a/files/lib/system/exporter/XF2xExporter.class.php b/files/lib/system/exporter/XF2xExporter.class.php
index ca6ed17506f58d89dc8ceadd67d10e9fae1cf22e..ba2f4ee01f8b4b306243967bcee29727f156e632 100644 (file)
--- a/files/lib/system/exporter/XF2xExporter.class.php
+++ b/files/lib/system/exporter/XF2xExporter.class.php
@@ -344,10 +344,10 @@ final class XF2xExporter extends AbstractExporter
     public function exportUsers($offset, $limit)
     {
         // prepare password update
-        $sql = "UPDATE  wcf" . WCF_N . "_user
+        $sql = "UPDATE  wcf1_user
                 SET     password = ?
                 WHERE   userID = ?";
-        $passwordUpdateStatement = WCF::getDB()->prepareStatement($sql);
+        $passwordUpdateStatement = WCF::getDB()->prepare($sql);
 
         // get users
         $sql = "SELECT      user_table.*, user_profile_table.*, INET_NTOA(ip_table.ip) AS ip,