Removed import of unsupported message settings

diff --git a/files/lib/system/exporter/MyBB16xExporter.class.php b/files/lib/system/exporter/MyBB16xExporter.class.php
index cb8d739546c903254f946e8cd256e8b0e769b137..c9e8e36b4737f168b1f9cd715424d7958fb4af54 100644 (file)
--- a/files/lib/system/exporter/MyBB16xExporter.class.php
+++ b/files/lib/system/exporter/MyBB16xExporter.class.php
@@ -297,9 +297,6 @@ class MyBB16xExporter extends AbstractExporter {
                                'oldUsername' => '',
                                'registrationIpAddress' => UserUtil::convertIPv4To6($row['regip']),
                                'signature' => $row['signature'],
-                               'signatureEnableBBCodes' => 1,
-                               'signatureEnableHtml' => 0,
-                               'signatureEnableSmilies' => 1,
                                'disableSignature' => $row['suspendsignature'],
                                'disableSignatureReason' => '',
                                'userTitle' => $row['usertitle'],
@@ -626,9 +623,7 @@ class MyBB16xExporter extends AbstractExporter {
                                'userID' => $row['fromid'],
                                'username' => $row['username'] ?: '',
                                'message' => self::fixBBCodes($row['message']),
-                               'time' => $row['dateline'],
-                               'enableSmilies' => $row['smilieoff'] ? 0 : 1,
-                               'showSignature' => $row['includesig'] ? 1 : 0
+                               'time' => $row['dateline']
                        ]);
                }
        }
@@ -804,8 +799,6 @@ class MyBB16xExporter extends AbstractExporter {
                                'editor' => $row['editor'] ?: '',
                                'lastEditTime' => $row['edittime'],
                                'editCount' => $row['editor'] ? 1 : 0,
-                               'enableSmilies' => $row['smilieoff'] ? 0 : 1,
-                               'showSignature' => $row['includesig'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['ipaddress'])
                        ]);
                }

diff --git a/files/lib/system/exporter/PhpBB31xExporter.class.php b/files/lib/system/exporter/PhpBB31xExporter.class.php
index e00e5b60ea69063e6f1a409d042dc3b089b415f0..8b2b23ab8a2fa3a0adbf419fa5546539f4df6de1 100644 (file)
--- a/files/lib/system/exporter/PhpBB31xExporter.class.php
+++ b/files/lib/system/exporter/PhpBB31xExporter.class.php
@@ -321,9 +321,6 @@ class PhpBB31xExporter extends AbstractExporter {
                                'banReason' => $row['banReason'],
                                'registrationIpAddress' => UserUtil::convertIPv4To6($row['user_ip']),
                                'signature' => self::fixBBCodes(StringUtil::decodeHTML($row['user_sig']), $row['user_sig_bbcode_uid']),
-                               'signatureEnableBBCodes' => ($row['user_sig_bbcode_uid'] ? (mb_strpos($row['user_sig'], $row['user_sig_bbcode_uid']) !== false ? 1 : 0) : 1),
-                               'signatureEnableHtml' => 0,
-                               'signatureEnableSmilies' => preg_match('/<!-- s.*? -->/', $row['user_sig']),
                                'lastActivityTime' => $row['user_lastvisit']
                        ];
                        
@@ -818,11 +815,7 @@ class PhpBB31xExporter extends AbstractExporter {
                                'username' => StringUtil::decodeHTML($row['username']) ?: '',
                                'message' => self::fixBBCodes(StringUtil::decodeHTML($row['message_text']), $row['bbcode_uid']),
                                'time' => $row['message_time'],
-                               'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enable_smilies'],
-                               'enableHtml' => 0,
-                               'enableBBCodes' => $row['enable_bbcode'],
-                               'showSignature' => $row['enable_sig']
+                               'attachments' => $row['attachments']
                        ]);
                }
        }
@@ -1046,10 +1039,7 @@ class PhpBB31xExporter extends AbstractExporter {
                                'editCount' => $row['post_edit_count'],
                                'editReason' => (!empty($row['post_edit_reason']) ? $row['post_edit_reason'] : ''),
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enable_smilies'],
                                'enableHtml' => 0,
-                               'enableBBCodes' => $row['enable_bbcode'],
-                               'showSignature' => $row['enable_sig'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['poster_ip'])
                        ]);
                }

diff --git a/files/lib/system/exporter/PhpBB3xExporter.class.php b/files/lib/system/exporter/PhpBB3xExporter.class.php
index 1e35dcdc2a12cdca935526cd2a804e0dbf74162d..252b76bafe42410979e22e144b3f6ba80396e776 100644 (file)
--- a/files/lib/system/exporter/PhpBB3xExporter.class.php
+++ b/files/lib/system/exporter/PhpBB3xExporter.class.php
@@ -310,9 +310,6 @@ class PhpBB3xExporter extends AbstractExporter {
                                'banReason' => $row['banReason'],
                                'registrationIpAddress' => UserUtil::convertIPv4To6($row['user_ip']),
                                'signature' => self::fixBBCodes(StringUtil::decodeHTML($row['user_sig']), $row['user_sig_bbcode_uid']),
-                               'signatureEnableBBCodes' => ($row['user_sig_bbcode_uid'] ? (mb_strpos($row['user_sig'], $row['user_sig_bbcode_uid']) !== false ? 1 : 0) : 1),
-                               'signatureEnableHtml' => 0,
-                               'signatureEnableSmilies' => preg_match('/<!-- s.*? -->/', $row['user_sig']),
                                'lastActivityTime' => $row['user_lastvisit']
                        ];
                        
@@ -755,11 +752,7 @@ class PhpBB3xExporter extends AbstractExporter {
                                'username' => StringUtil::decodeHTML($row['username']) ?: '',
                                'message' => self::fixBBCodes(StringUtil::decodeHTML($row['message_text']), $row['bbcode_uid']),
                                'time' => $row['message_time'],
-                               'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enable_smilies'],
-                               'enableHtml' => 0,
-                               'enableBBCodes' => $row['enable_bbcode'],
-                               'showSignature' => $row['enable_sig']
+                               'attachments' => $row['attachments']
                        ]);
                }
        }
@@ -979,10 +972,7 @@ class PhpBB3xExporter extends AbstractExporter {
                                'editCount' => $row['post_edit_count'],
                                'editReason' => (!empty($row['post_edit_reason']) ? $row['post_edit_reason'] : ''),
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enable_smilies'],
                                'enableHtml' => 0,
-                               'enableBBCodes' => $row['enable_bbcode'],
-                               'showSignature' => $row['enable_sig'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['poster_ip'])
                        ]);
                }

diff --git a/files/lib/system/exporter/SMF2xExporter.class.php b/files/lib/system/exporter/SMF2xExporter.class.php
index 2fc25c6494ec494a353b188010093819faa45a56..cbed4328c8929cb485217bed8f0124396ef74d2d 100644 (file)
--- a/files/lib/system/exporter/SMF2xExporter.class.php
+++ b/files/lib/system/exporter/SMF2xExporter.class.php
@@ -316,9 +316,6 @@ class SMF2xExporter extends AbstractExporter {
                                'activationCode' => $row['validation_code'] ? UserRegistrationUtil::getActivationCode() : 0, // smf's codes are strings
                                'registrationIpAddress' => $row['member_ip'], // member_ip2 is HTTP_X_FORWARDED_FOR
                                'signature' => $row['signature'],
-                               'signatureEnableBBCodes' => 1,
-                               'signatureEnableHtml' => 0,
-                               'signatureEnableSmilies' => 1,
                                'userTitle' => StringUtil::decodeHTML($row['usertitle']),
                                'lastActivityTime' => $row['last_login']
                        ];
@@ -696,11 +693,7 @@ class SMF2xExporter extends AbstractExporter {
                                'username' => $row['from_name'],
                                'message' => self::fixBBCodes($row['body']),
                                'time' => $row['msgtime'],
-                               'attachments' => 0, // not supported
-                               'enableSmilies' => 1,
-                               'enableHtml' => 0,
-                               'enableBBCodes' => 1,
-                               'showSignature' => 1
+                               'attachments' => 0 // not supported
                        ]);
                }
        }
@@ -910,10 +903,7 @@ class SMF2xExporter extends AbstractExporter {
                                'lastEditTime' => $row['modified_time'],
                                'editCount' => $row['modified_time'] ? 1 : 0,
                                'editReason' => (!empty($row['editReason']) ? $row['editReason'] : ''),
-                               'enableSmilies' => $row['smileys_enabled'],
                                'enableHtml' => 0,
-                               'enableBBCodes' => 1,
-                               'showSignature' => 1,
                                'ipAddress' => UserUtil::convertIPv4To6($row['poster_ip'])
                        ]);
                }

diff --git a/files/lib/system/exporter/VB3or4xExporter.class.php b/files/lib/system/exporter/VB3or4xExporter.class.php
index cfdf3105060ca5619266ea2d8bca7356e780de3f..85004af8a45a005ca5f3853632bfec5c6c5ef7e6 100644 (file)
--- a/files/lib/system/exporter/VB3or4xExporter.class.php
+++ b/files/lib/system/exporter/VB3or4xExporter.class.php
@@ -880,11 +880,7 @@ class VB3or4xExporter extends AbstractExporter {
                                'userID' => $row['fromuserid'],
                                'username' => StringUtil::decodeHTML($row['fromusername']),
                                'message' => self::fixBBCodes($row['message']),
-                               'time' => $row['dateline'],
-                               'enableSmilies' => $row['allowsmilie'],
-                               'enableHtml' => 0,
-                               'enableBBCodes' => 1,
-                               'showSignature' => $row['showsignature']
+                               'time' => $row['dateline']
                        ]);
                }
        }
@@ -1129,10 +1125,7 @@ class VB3or4xExporter extends AbstractExporter {
                                'editCount' => ($row['editCount'] && $row['editCount'] > 0 ? $row['editCount'] : 0),
                                'editReason' => $row['editReason'] ?: '',
                                'attachments' => $row['attach'],
-                               'enableSmilies' => $row['allowsmilie'],
                                'enableHtml' => (isset($row['htmlState']) && $row['htmlState'] != 'off' ? 1 : 0),
-                               'enableBBCodes' => 1,
-                               'showSignature' => $row['showsignature'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['ipaddress'])
                        ]);
                }
@@ -1933,7 +1926,6 @@ class VB3or4xExporter extends AbstractExporter {
                                'subject' => $row['title'],
                                'message' => self::fixBBCodes($row['event']),
                                'time' => $row['dateline'],
-                               'enableSmilies' => $row['allowsmilies'],
                                'eventDate' => serialize($eventDateData)
                        ];
                        

diff --git a/files/lib/system/exporter/VB5xExporter.class.php b/files/lib/system/exporter/VB5xExporter.class.php
index 6036d064e6f1c2df437bb8eb7e5cefcc578b3098..3ea1a2a868334fc0836195d4e21805f2ce8ef347 100644 (file)
--- a/files/lib/system/exporter/VB5xExporter.class.php
+++ b/files/lib/system/exporter/VB5xExporter.class.php
@@ -531,10 +531,7 @@ class VB5xExporter extends AbstractExporter {
                                'lastEditTime' => 0,
                                'editCount' => 0,
                                'editReason' => '',
-                               'enableSmilies' => $row['allowsmilie'],
                                'enableHtml' => (isset($row['htmlState']) && $row['htmlState'] != 'off' ? 1 : 0),
-                               'enableBBCodes' => 1,
-                               'showSignature' => $row['showsignature'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['ipaddress'])
                        ]);
                }

diff --git a/files/lib/system/exporter/WBB2xExporter.class.php b/files/lib/system/exporter/WBB2xExporter.class.php
index 59060e18cc13889b190615b812ab5c9b08ca7bf1..66a4bbf85925cf9eb29b61de43ff3b34bfa89ee9 100644 (file)
--- a/files/lib/system/exporter/WBB2xExporter.class.php
+++ b/files/lib/system/exporter/WBB2xExporter.class.php
@@ -288,9 +288,7 @@ class WBB2xExporter extends AbstractExporter {
                                'userTitle' => $row['title'],
                                'disableSignature' => $row['disablesignature'],
                                'banned' => $row['blocked'],
-                               'signatureEnableSmilies' => $row['allowsigsmilies'],
                                'signatureEnableHtml' => $row['allowsightml'],
-                               'signatureEnableBBCodes' => $row['allowsigbbcode'],
                                'registrationIpAddress' => (!empty($row['reg_ipaddress']) ? $row['reg_ipaddress'] : '')
                        ];
                        
@@ -521,10 +519,7 @@ class WBB2xExporter extends AbstractExporter {
                                'message' => self::fixBBCodes($row['message']),
                                'time' => $row['sendtime'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['allowsmilies'],
-                               'enableHtml' => $row['allowhtml'],
-                               'enableBBCodes' => $row['allowbbcode'],
-                               'showSignature' => $row['showsignature']
+                               'enableHtml' => $row['allowhtml']
                        ]);
                }
        }
@@ -788,10 +783,7 @@ class WBB2xExporter extends AbstractExporter {
                                'lastEditTime' => $row['edittime'],
                                'editCount' => $row['editcount'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['allowsmilies'],
                                'enableHtml' => $row['allowhtml'],
-                               'enableBBCodes' => $row['allowbbcode'],
-                               'showSignature' => $row['showsignature'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['ipaddress'])
                        ]);
                }

diff --git a/files/lib/system/exporter/WBB3xExporter.class.php b/files/lib/system/exporter/WBB3xExporter.class.php
index d597c08af9980aecea1764a794f05acfd6cd41da..e24d9e4bcb4cb61b6f9e622f2b44eac7b5f6f4f1 100644 (file)
--- a/files/lib/system/exporter/WBB3xExporter.class.php
+++ b/files/lib/system/exporter/WBB3xExporter.class.php
@@ -434,9 +434,7 @@ class WBB3xExporter extends AbstractExporter {
                                'disableAvatarReason' => (!empty($row['disableAvatarReason']) ? $row['disableAvatarReason'] : ''),
                                'enableGravatar' => ((!empty($row['gravatar']) && $row['gravatar'] == $row['email']) ? 1 : 0),
                                'signature' => $row['signature'],
-                               'signatureEnableBBCodes' => $row['enableSignatureBBCodes'],
                                'signatureEnableHtml' => $row['enableSignatureHtml'],
-                               'signatureEnableSmilies' => $row['enableSignatureSmilies'],
                                'disableSignature' => $row['disableSignature'],
                                'disableSignatureReason' => $row['disableSignatureReason'],
                                'profileHits' => $row['profileHits'],
@@ -905,10 +903,7 @@ class WBB3xExporter extends AbstractExporter {
                                'message' => self::fixBBCodes($row['message']),
                                'time' => $row['time'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enableSmilies'],
-                               'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature']
+                               'enableHtml' => $row['enableHtml']
                        ]);
                }
        }
@@ -1234,10 +1229,7 @@ class WBB3xExporter extends AbstractExporter {
                                'editCount' => $row['editCount'],
                                'editReason' => (!empty($row['editReason']) ? $row['editReason'] : ''),
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature'],
                                'ipAddress' => UserUtil::convertIPv4To6($row['ipAddress']),
                                'deleteTime' => $row['deleteTime']
                        ]);
@@ -1891,9 +1883,7 @@ class WBB3xExporter extends AbstractExporter {
                                'time' => $row['time'],
                                'attachments' => $row['attachments'],
                                'comments' => $row['comments'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
                                'views' => $row['views'],
                                'isPublished' => $row['isPublished'],
                                'publicationDate' => $row['publishingDate']
@@ -2388,10 +2378,7 @@ class WBB3xExporter extends AbstractExporter {
                                'time' => $row['time'],
                                'ipAddress' => $row['ipAddress'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature'],
                                'eventDate' => serialize($eventDateData)
                        ];
                        if ($row['participationID']) {

diff --git a/files/lib/system/exporter/WBB4xExporter.class.php b/files/lib/system/exporter/WBB4xExporter.class.php
index 5a33de37c62f67fed1ab276dbf261f419c425ddb..3b117e2b86b0182c4d0a2c991e90a9f5b5ce8302 100644 (file)
--- a/files/lib/system/exporter/WBB4xExporter.class.php
+++ b/files/lib/system/exporter/WBB4xExporter.class.php
@@ -429,9 +429,7 @@ class WBB4xExporter extends AbstractExporter {
                                'disableAvatarReason' => $row['disableAvatarReason'],
                                'enableGravatar' => $row['enableGravatar'],
                                'signature' => $row['signature'],
-                               'signatureEnableBBCodes' => $row['signatureEnableBBCodes'],
                                'signatureEnableHtml' => $row['signatureEnableHtml'],
-                               'signatureEnableSmilies' => $row['signatureEnableSmilies'],
                                'disableSignature' => $row['disableSignature'],
                                'disableSignatureReason' => $row['disableSignatureReason'],
                                'profileHits' => $row['profileHits'],
@@ -753,10 +751,7 @@ class WBB4xExporter extends AbstractExporter {
                                'message' => $row['message'],
                                'time' => $row['time'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature'],
                                'ipAddress' => $row['ipAddress']
                        ]);
                }
@@ -1041,10 +1036,7 @@ class WBB4xExporter extends AbstractExporter {
                                'editCount' => $row['editCount'],
                                'editReason' => $row['editReason'],
                                'attachments' => $row['attachments'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature'],
                                'ipAddress' => $row['ipAddress'],
                                'deleteTime' => $row['deleteTime']
                        ]);
@@ -1587,11 +1579,8 @@ class WBB4xExporter extends AbstractExporter {
                                'attachments' => $row['attachments'],
                                'comments' => $row['comments'],
                                'views' => $row['views'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
-                               'enableComments' => $row['enableBBCodes'],
-                               'showSignature' => $row['showSignature'],
+                               'enableComments' => $row['enableComments'],
                                'isDisabled' => $row['isDisabled'],
                                'isDeleted' => $row['isDeleted'],
                                'isPublished' => $row['isPublished'],
@@ -1812,9 +1801,7 @@ class WBB4xExporter extends AbstractExporter {
                        
                        if ($sourceVersion21 && $destVersion21) {
                                $images[$row['imageID']] = array_merge($images[$row['imageID']], [
-                                       'enableSmilies' => $row['enableSmilies'],
                                        'enableHtml' => $row['enableHtml'],
-                                       'enableBBCodes' => $row['enableBBCodes'],
                                        'rawExifData' => $row['rawExifData'],
                                        'hasEmbeddedObjects' => $row['hasEmbeddedObjects'],
                                        'hasMarkers' => $row['hasMarkers'],
@@ -2021,11 +2008,8 @@ class WBB4xExporter extends AbstractExporter {
                                'eventDate' => $row['eventDate'],
                                'eventColor' => $row['eventColor'],
                                'views' => $row['views'],
-                               'enableSmilies' => $row['enableSmilies'],
                                'enableHtml' => $row['enableHtml'],
-                               'enableBBCodes' => $row['enableBBCodes'],
                                'enableComments' => $row['enableComments'],
-                               'showSignature' => $row['showSignature'],
                                'isDisabled' => $row['isDisabled'],
                                'isDeleted' => $row['isDeleted'],
                                'ipAddress' => $row['ipAddress'],