Changeset 5544

Timestamp:

10/10/2014 06:44:33 AM (12 years ago)

Author:

netweb

Message:

Move callback callback_check_anonymous from individual importers to BBP_Converter_Base in converter.php.

• Allows us to lean on callback_userid to determine multiple anonymous or guest topic and reply authors during import and reduces code duplication

Props netweb. See #2347

Location:

trunk/src/includes/admin

Files:

• converter.php (modified) (1 diff)
• converters/Drupal7.php (modified) (1 diff)
• converters/SMF.php (modified) (1 diff)
• converters/Vanilla.php (modified) (1 diff)
• converters/phpBB.php (modified) (1 diff)

trunk/src/includes/admin/converter.php

@@ -1572 +1572 @@
 
         /**
+         * Check if the topic or reply author is anonymous
+         *
+         * @since  (r5544)
+         *
+         * @param  string $field
+         * @return string
+         */
+        private function callback_check_anonymous( $field ) {
+
+                if ( $this->callback_userid( $field ) == 0 ) {
+                        $field = 'true';
+                } else {
+                        $field = 'false';
+                }
+
+                return $field;
+        }
+
+        /**
          * A mini cache system to reduce database calls map topics ID's to forum ID's
          *

trunk/src/includes/admin/converters/Drupal7.php

@@ -657 +657 @@
                 return $count;
         }
-
-        /**
-         * Check the anonymous topic or reply status
-         *
-         * @since  (r5539)
-         *
-         * @param int $status Drupal v7.x anonymous topic/reply status
-         * @return string WordPress safe
-         */
-        public function callback_check_anonymous( $status = 0 ) {
-                if ( $status == 0 ) {
-                        $status = 'true';
-                } else {
-                        $status = 'false';
-                }
-                return $status;
-        }
 }

trunk/src/includes/admin/converters/SMF.php

@@ -678 +678 @@
                 $count = absint( (int) $count - 1 );
                 return $count;
-        }
-
-        /**
-         * Check the anonymous topic or reply status
-         *
-         * @since  (r5539)
-         *
-         * @param int $status SMF v2.x anonymous topic/reply status
-         * @return string WordPress safe
-         */
-        public function callback_check_anonymous( $status = 0 ) {
-                if ( $status == 0 ) {
-                        $status = 'true';
-                } else {
-                        $status = 'false';
-                }
-                return $status;
         }
 

trunk/src/includes/admin/converters/Vanilla.php

@@ -576 +576 @@
                 $count = absint( (int) $count - 1 );
                 return $count;
-        }
-
-        /**
-         * Check the anonymous topic or reply status.
-         *
-         * This method checks each imported topic or reply if the author user ID
-         * was imported to determine if the topic or reply author is anonymous as
-         * Vanilla v2.x does not store a topic or reply status for deleted users.
-         *
-         * @since  (r5541)
-         *
-         * @param string $is_user_anonymous Vanilla v2.x numeric topic status
-         * @return string WordPress safe
-         */
-        public function callback_check_anonymous( $is_user_anonymous = 0 ) {
-                if ( !empty( $this->sync_table ) ) {
-                        $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%d" LIMIT 1', $is_user_anonymous ) );
-                } else {
-                        $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT meta_value FROM ' . $this->wpdb->usermeta .  ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%d" LIMIT 1', $is_user_anonymous ) );
-                }
-
-                // An imported user ID exists therefore the topic/reply is not anonymous
-                if ( !is_null( $row ) ) {
-                        $is_user_anonymous = 'false';
-                // No imported user ID there the topic/reply is anonymous
-                } else {
-                        $is_user_anonymous = 'true';
-                }
-
-                return $is_user_anonymous;
         }
 

trunk/src/includes/admin/converters/phpBB.php

@@ -826 +826 @@
 
         /**
-         * Check the anonymous topic or reply status
-         *
-         * @since  (r5539)
-         *
-         * @param int $status phpBB v3.x anonymous topic/reply status
-         * @return string WordPress safe
-         */
-        public function callback_check_anonymous( $status = 0 ) {
-                if ( $status == 1 ) {
-                        $status = 'true';
-                } else {
-                        $status = 'false';
-                }
-                return $status;
-        }
-
-        /**
          * This callback processes any custom parser.php attributes and custom code with preg_replace
          */