Changeset 3866 for branches/plugin/bbp-admin/converters/Example.php

Timestamp:

05/04/2012 06:07:26 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Converter:

• Remane 'translate' methods to 'callback' to avoid confusion with i18n functions
• Improve maps of bbPress 1 converter
• Fix incorrectly named keys in other converters
• Whitespace and phpdoc fixes
• See #1820

File:

• branches/plugin/bbp-admin/converters/Example.php (modified) (25 diffs)

branches/plugin/bbp-admin/converters/Example.php

@@ -19 +19 @@
         $this->field_map[] = array(
             'from_tablename' => 'forum', 'from_fieldname' => 'forumid',
-            'to_type' => 'forum', 'to_fieldname' => '_bbc_forum_id'
+            'to_type' => 'forum', 'to_fieldname' => '_bbp_forum_id'
         );
         
@@ -25 +25 @@
         $this->field_map[] = array(
             'from_tablename' => 'forum', 'from_fieldname' => 'parentid',
-            'to_type' => 'forum', 'to_fieldname' => '_bbc_parent_id'
+            'to_type' => 'forum', 'to_fieldname' => '_bbp_parent_id'
         );
         
@@ -38 +38 @@
             'from_tablename' => 'forum', 'from_fieldname' => 'title_clean',
             'to_type' => 'forum', 'to_fieldname' => 'post_name',
-            'translate_method' => 'translate_title'
+            'callback_method' => 'callback_slug'
         );
         
@@ -45 +45 @@
             'from_tablename' => 'forum', 'from_fieldname' => 'description',
             'to_type' => 'forum', 'to_fieldname' => 'post_content',
-            'translate_method' => 'translate_null'
+            'callback_method' => 'callback_null'
         );
         
@@ -77 +77 @@
         $this->field_map[] = array(
             'from_tablename' => 'thread', 'from_fieldname' => 'threadid',
-            'to_type' => 'topic', 'to_fieldname' => '_bbc_topic_id'
+            'to_type' => 'topic', 'to_fieldname' => '_bbp_topic_id'
         );
         
@@ -83 +83 @@
         $this->field_map[] = array(
             'from_tablename' => 'thread', 'from_fieldname' => 'forumid',
-            'to_type' => 'topic', 'to_fieldname' => '_bbc_forum_id',
-            'translate_method' => 'translate_forumid'
+            'to_type' => 'topic', 'to_fieldname' => '_bbp_forum_id',
+            'callback_method' => 'callback_forumid'
         );
                 
@@ -91 +91 @@
             'from_tablename' => 'thread', 'from_fieldname' => 'postuserid',
             'to_type' => 'topic', 'to_fieldname' => 'post_author',
-            'translate_method' => 'translate_userid'
+            'callback_method' => 'callback_userid'
         );
         
@@ -104 +104 @@
             'from_tablename' => 'thread', 'from_fieldname' => 'title',
             'to_type' => 'topic', 'to_fieldname' => 'post_name',
-            'translate_method' => 'translate_title'
+            'callback_method' => 'callback_slug'
         );
         
@@ -111 +111 @@
             'from_tablename' => 'thread', 'from_fieldname' => 'forumid',
             'to_type' => 'topic', 'to_fieldname' => 'post_parent',
-            'translate_method' => 'translate_forumid'
+            'callback_method' => 'callback_forumid'
         );
 
@@ -118 +118 @@
             'from_tablename' => 'thread', 'from_fieldname' => 'dateline',
             'to_type' => 'topic', 'to_fieldname' => 'post_date',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'thread', 'from_fieldname' => 'dateline',
             'to_type' => 'topic', 'to_fieldname' => 'post_date_gmt',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'thread', 'from_fieldname' => 'dateline',
             'to_type' => 'topic', 'to_fieldname' => 'post_modified',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'thread', 'from_fieldname' => 'dateline',
             'to_type' => 'topic', 'to_fieldname' => 'post_modified_gmt',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
 
@@ -142 +142 @@
             'from_tablename' => 'tagcontent', 'from_fieldname' => 'contentid',
             'to_type' => 'tags', 'to_fieldname' => 'objectid',
-            'translate_method' => 'translate_topicid'
+            'callback_method' => 'callback_topicid'
         );
         
@@ -157 +157 @@
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'postid',
-            'to_type' => 'reply', 'to_fieldname' => '_bbc_post_id'
+            'to_type' => 'reply', 'to_fieldname' => '_bbp_post_id'
         );
         
@@ -163 +163 @@
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'threadid',
-            'to_type' => 'reply', 'to_fieldname' => '_bbc_forum_id',
-            'translate_method' => 'translate_topicid_to_forumid'
+            'to_type' => 'reply', 'to_fieldname' => '_bbp_forum_id',
+            'callback_method' => 'callback_topicid_to_forumid'
         );
         
@@ -170 +170 @@
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'threadid',
-            'to_type' => 'reply', 'to_fieldname' => '_bbc_topic_id',
-            'translate_method' => 'translate_topicid'
+            'to_type' => 'reply', 'to_fieldname' => '_bbp_topic_id',
+            'callback_method' => 'callback_topicid'
         );
         
@@ -177 +177 @@
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'ipaddress',
-            'to_type' => 'reply', 'to_fieldname' => '__bbc_author_ip'
+            'to_type' => 'reply', 'to_fieldname' => '__bbp_author_ip'
         );  
             
@@ -184 +184 @@
             'from_tablename' => 'post', 'from_fieldname' => 'userid',
             'to_type' => 'reply', 'to_fieldname' => 'post_author',
-            'translate_method' => 'translate_userid'
+            'callback_method' => 'callback_userid'
         );
         
@@ -197 +197 @@
             'from_tablename' => 'post', 'from_fieldname' => 'title',
             'to_type' => 'reply', 'to_fieldname' => 'post_name',
-            'translate_method' => 'translate_title'
+            'callback_method' => 'callback_slug'
         );
         
@@ -204 +204 @@
             'from_tablename' => 'post', 'from_fieldname' => 'pagetext',
             'to_type' => 'reply', 'to_fieldname' => 'post_content',
-            'translate_method' => 'translate_html'
+            'callback_method' => 'callback_html'
         );
         
@@ -211 +211 @@
             'from_tablename' => 'post', 'from_fieldname' => 'threadid',
             'to_type' => 'reply', 'to_fieldname' => 'post_parent',
-            'translate_method' => 'translate_topicid'
+            'callback_method' => 'callback_topicid'
         );
 
@@ -218 +218 @@
             'from_tablename' => 'post', 'from_fieldname' => 'dateline',
             'to_type' => 'reply', 'to_fieldname' => 'post_date',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'dateline',
             'to_type' => 'reply', 'to_fieldname' => 'post_date_gmt',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'dateline',
             'to_type' => 'reply', 'to_fieldname' => 'post_modified',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         $this->field_map[] = array(
             'from_tablename' => 'post', 'from_fieldname' => 'dateline',
             'to_type' => 'reply', 'to_fieldname' => 'post_modified_gmt',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
 
@@ -241 +241 @@
         $this->field_map[] = array(
             'from_tablename' => 'user', 'from_fieldname' => 'userid',
-            'to_type' => 'user', 'to_fieldname' => '_bbc_user_id'
+            'to_type' => 'user', 'to_fieldname' => '_bbp_user_id'
         );
         
@@ -247 +247 @@
         $this->field_map[] = array(
             'from_tablename' => 'user', 'from_fieldname' => 'password',
-            'to_type' => 'user', 'to_fieldname' => '_bbc_password',
-            'translate_method' => 'translate_savepass'
+            'to_type' => 'user', 'to_fieldname' => '_bbp_password',
+            'callback_method' => 'callback_savepass'
         );
 
@@ -259 +259 @@
         // User password verify class. Stores in usermeta for verifying password.
         $this->field_map[] = array(
-            'to_type' => 'user', 'to_fieldname' => '_bbc_class',
+            'to_type' => 'user', 'to_fieldname' => '_bbp_class',
             'default' => 'Vbulletin'
         );
@@ -285 +285 @@
             'from_tablename' => 'user', 'from_fieldname' => 'joindate',
             'to_type' => 'user', 'to_fieldname' => 'user_registered',
-            'translate_method' => 'translate_datetime'
+            'callback_method' => 'callback_datetime'
         );
         
@@ -315 +315 @@
      * as one value. Array values are auto sanitized by wordpress.
      */
-    public function translate_savepass( $field, $row )
+    public function callback_savepass( $field, $row )
     {
         $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );