Changeset 6115

Timestamp:

11/02/2016 10:59:20 AM (7 years ago)

Author:

netweb

Message:

Indentation fixes, tabs, not spaces.

Location:

trunk/src/includes

Files:

• admin/converters/Kunena2.php (modified) (4 diffs)
• admin/converters/Mingle.php (modified) (2 diffs)
• admin/converters/Vanilla.php (modified) (1 diff)
• admin/functions.php (modified) (1 diff)
• admin/metaboxes.php (modified) (2 diffs)
• common/functions.php (modified) (1 diff)
• extend/akismet.php (modified) (1 diff)
• extend/buddypress/activity.php (modified) (1 diff)
• extend/buddypress/groups.php (modified) (1 diff)

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

@@ -30 +30 @@
      * Sets up the field mappings
      */
-    public function setup_globals() {
-
-        /** Forum Section *****************************************************/
+    public function setup_globals() {
+
+        /** Forum Section *****************************************************/
 
 
@@ -296 +296 @@
         );
 
-        /** Tags Section ******************************************************/
+        /** Tags Section ******************************************************/
 
         /**
@@ -399 +399 @@
         );
 
-        /** User Section ******************************************************/
-
-        //Note: We are importing the Joomla User details and the Kunena v2.x user profile details.
-
-        // Store old user id (Stored in usermeta)
-        $this->field_map[] = array(
-            'from_tablename' => 'users',
-            'from_fieldname' => 'id',
-            'to_type'        => 'user',
-            'to_fieldname'   => '_bbp_old_user_id'
-        );
-
-        // Store old user password (Stored in usermeta serialized with salt)
-        $this->field_map[] = array(
-            'from_tablename'  => 'users',
-            'from_fieldname'  => 'password',
-            'to_type'         => 'user',
-            'to_fieldname'    => '_bbp_password',
-            'callback_method' => 'callback_savepass'
-        );
-
-        // Store old user salt. This is only used for the SELECT row info for the above password save
-        /*
-        $this->field_map[] = array(
-            'from_tablename' => 'users',
-            'from_fieldname' => 'salt',
-            'to_type' => 'user',
-            'to_fieldname' => ''
-        );
-         */
-
-        // User password verify class. Stores in usermeta for verifying password.
-        /*
-        $this->field_map[] = array(
-            'to_type' => 'user',
-            'to_fieldname' => '_bbp_class',
-            'default' => 'Kunena2'
-        );
-         */
-
-        // User name.
-        $this->field_map[] = array(
-            'from_tablename' => 'users',
-            'from_fieldname' => 'username',
-            'to_type'        => 'user',
-            'to_fieldname'   => 'user_login'
-        );
-
-        // User email.
-        $this->field_map[] = array(
-            'from_tablename' => 'users',
-            'from_fieldname' => 'email',
-            'to_type'        => 'user',
-            'to_fieldname'   => 'user_email'
-        );
-
-        // User registered.
-        $this->field_map[] = array(
-            'from_tablename'  => 'users',
-            'from_fieldname'  => 'registerDate',
-            'to_type'         => 'user',
-            'to_fieldname'    => 'user_registered',
-            'callback_method' => 'callback_datetime'
-        );
+        /** User Section ******************************************************/
+
+        //Note: We are importing the Joomla User details and the Kunena v2.x user profile details.
+
+        // Store old user id (Stored in usermeta)
+        $this->field_map[] = array(
+            'from_tablename' => 'users',
+            'from_fieldname' => 'id',
+            'to_type'        => 'user',
+            'to_fieldname'   => '_bbp_old_user_id'
+        );
+
+        // Store old user password (Stored in usermeta serialized with salt)
+        $this->field_map[] = array(
+            'from_tablename'  => 'users',
+            'from_fieldname'  => 'password',
+            'to_type'         => 'user',
+            'to_fieldname'    => '_bbp_password',
+            'callback_method' => 'callback_savepass'
+        );
+
+        // Store old user salt. This is only used for the SELECT row info for the above password save
+        /*
+        $this->field_map[] = array(
+            'from_tablename' => 'users',
+            'from_fieldname' => 'salt',
+            'to_type' => 'user',
+            'to_fieldname' => ''
+        );
+         */
+
+        // User password verify class. Stores in usermeta for verifying password.
+        /*
+        $this->field_map[] = array(
+            'to_type' => 'user',
+            'to_fieldname' => '_bbp_class',
+            'default' => 'Kunena2'
+        );
+         */
+
+        // User name.
+        $this->field_map[] = array(
+            'from_tablename' => 'users',
+            'from_fieldname' => 'username',
+            'to_type'        => 'user',
+            'to_fieldname'   => 'user_login'
+        );
+
+        // User email.
+        $this->field_map[] = array(
+            'from_tablename' => 'users',
+            'from_fieldname' => 'email',
+            'to_type'        => 'user',
+            'to_fieldname'   => 'user_email'
+        );
+
+        // User registered.
+        $this->field_map[] = array(
+            'from_tablename'  => 'users',
+            'from_fieldname'  => 'registerDate',
+            'to_type'         => 'user',
+            'to_fieldname'    => 'user_registered',
+            'callback_method' => 'callback_datetime'
+        );
 
         // User display name.
@@ -472 +472 @@
         );
 
-    }
-
-    /**
-     * This method allows us to indicates what is or is not converted for each
-     * converter.
-     */
-    public function info() {
-        return '';
-    }
-
-    /**
-     * This method is to save the salt and password together.  That
-     * way when we authenticate it we can get it out of the database
-     * as one value. Array values are auto sanitized by WordPress.
-     */
-    public function callback_savepass($field, $row) {
-        $pass_array = array('hash' => $field, 'salt' => $row['salt']);
-        return $pass_array;
-    }
-
-    /**
-     * This method is to take the pass out of the database and compare
-     * to a pass the user has typed in.
-     */
-    public function authenticate_pass($password, $serialized_pass) {
-        $pass_array = unserialize($serialized_pass);
-        return ( $pass_array['hash'] == md5(md5($password) . $pass_array['salt']) );
-    }
+    }
+
+    /**
+     * This method allows us to indicates what is or is not converted for each
+     * converter.
+     */
+    public function info() {
+        return '';
+    }
+
+    /**
+     * This method is to save the salt and password together.  That
+     * way when we authenticate it we can get it out of the database
+     * as one value. Array values are auto sanitized by WordPress.
+     */
+    public function callback_savepass($field, $row) {
+        $pass_array = array('hash' => $field, 'salt' => $row['salt']);
+        return $pass_array;
+    }
+
+    /**
+     * This method is to take the pass out of the database and compare
+     * to a pass the user has typed in.
+     */
+    public function authenticate_pass($password, $serialized_pass) {
+        $pass_array = unserialize($serialized_pass);
+        return ( $pass_array['hash'] == md5(md5($password) . $pass_array['salt']) );
+    }
     /**
      * Translate the forum type from Kunena v2.x numeric's to WordPress's strings.

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

@@ -239 +239 @@
         /**
          * Mingle Forums do not support topic tags
-         */
+         */
 
         /** Reply Section ******************************************************/
@@ -476 +476 @@
 
     /**
-    * This callback processes any custom BBCodes with parser.php
-    */
+     * This callback processes any custom BBCodes with parser.php
+     */
     protected function callback_html( $field ) {
         require_once( bbpress()->admin->admin_dir . 'parser.php' );

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

@@ -604 +604 @@
 
     /**
-    * This callback processes any custom BBCodes with parser.php
-    */
+     * This callback processes any custom BBCodes with parser.php
+     */
     protected function callback_html( $field ) {
         require_once( bbpress()->admin->admin_dir . 'parser.php' );

trunk/src/includes/admin/functions.php

@@ -210 +210 @@
 
     // Bail if no activation redirect
-    if ( ! get_transient( '_bbp_activation_redirect' ) ) {
+    if ( ! get_transient( '_bbp_activation_redirect' ) ) {
         return;
     }

trunk/src/includes/admin/metaboxes.php

@@ -204 +204 @@
                             $link = add_query_arg( array( 'post_status' => bbp_get_spam_status_id() ), $link );
                         }
-                        $num  = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_topic_title'] ) . '">' . $num  . '</a>';
+                        $num  = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_topic_title'] ) . '">' . $num  . '</a>';
                         $text = '<a class="waiting" href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_topic_title'] ) . '">' . $text . '</a>';
                     ?>
@@ -226 +226 @@
                             $link = add_query_arg( array( 'post_status' => bbp_get_spam_status_id() ), $link );
                         }
-                        $num  = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_reply_title'] ) . '">' . $num  . '</a>';
+                        $num  = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_reply_title'] ) . '">' . $num  . '</a>';
                         $text = '<a class="waiting" href="' . esc_url( $link ) . '" title="' . esc_attr( $r['hidden_reply_title'] ) . '">' . $text . '</a>';
                     ?>

trunk/src/includes/common/functions.php

@@ -1901 +1901 @@
             // Check if this query is for a bbPress post type
             foreach ( $post_types as $bbp_pt ) {
-                if ( in_array( $bbp_pt, $qv_array, true ) ) {
-                    $post_type = $bbp_pt;
-                    break;
-                }
+                if ( in_array( $bbp_pt, $qv_array, true ) ) {
+                    $post_type = $bbp_pt;
+                    break;
+                }
             }
 

trunk/src/includes/extend/akismet.php

@@ -319 +319 @@
         // Add some reporter info
         if ( is_object( $current_user ) ) {
-            $post_data['reporter'] = $current_user->user_login;
+            $post_data['reporter'] = $current_user->user_login;
         }
 

trunk/src/includes/extend/buddypress/activity.php

@@ -612 +612 @@
     }
 
-    /**
+    /**
      * Delete the activity stream entry when a reply is spammed, trashed, or deleted
      *

trunk/src/includes/extend/buddypress/groups.php

@@ -1392 +1392 @@
      * @uses maybe_map_permalink_to_group
      * @return array
-     */
+     */
     public function topic_pagination( $args ) {
         $new = $this->maybe_map_permalink_to_group( bbp_get_forum_id() );