Skip to:
Content

bbPress.org

Changeset 6449


Ignore:
Timestamp:
06/01/2017 07:14:43 PM (7 years ago)
Author:
johnjamesjacoby
Message:

Converters: Fix formatting on several converter methods.

Location:
trunk/src/includes/admin/converters
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/converters/AEF.php

    r5951 r6449  
    571571     * converter.
    572572     */
    573     public function info()
    574     {
     573    public function info() {
    575574        return '';
    576575    }
     
    581580     * as one value. Array values are auto sanitized by WordPress.
    582581     */
    583     public function callback_savepass( $field, $row )
    584     {
     582    public function callback_savepass( $field, $row ) {
    585583        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    586584        return $pass_array;
     
    591589     * to a pass the user has typed in.
    592590     */
    593     public function authenticate_pass( $password, $serialized_pass )
    594     {
     591    public function authenticate_pass( $password, $serialized_pass ) {
    595592        $pass_array = unserialize( $serialized_pass );
    596593        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/Drupal7.php

    r5951 r6449  
    569569     * converter.
    570570     */
    571     public function info()
    572     {
     571    public function info() {
    573572        return '';
    574573    }
     
    579578     * as one value. Array values are auto sanitized by WordPress.
    580579     */
    581     public function callback_savepass( $field, $row )
    582     {
     580    public function callback_savepass( $field, $row ) {
    583581        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    584582        return $pass_array;
     
    589587     * to a pass the user has typed in.
    590588     */
    591     public function authenticate_pass( $password, $serialized_pass )
    592     {
     589    public function authenticate_pass( $password, $serialized_pass ) {
    593590        $pass_array = unserialize( $serialized_pass );
    594591        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/FluxBB.php

    r5951 r6449  
    591591     * converter.
    592592     */
    593     public function info()
    594     {
     593    public function info() {
    595594        return '';
    596595    }
     
    601600     * as one value. Array values are auto sanitized by WordPress.
    602601     */
    603     public function callback_savepass( $field, $row )
    604     {
     602    public function callback_savepass( $field, $row ) {
    605603        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    606604        return $pass_array;
     
    611609     * to a pass the user has typed in.
    612610     */
    613     public function authenticate_pass( $password, $serialized_pass )
    614     {
     611    public function authenticate_pass( $password, $serialized_pass ) {
    615612        $pass_array = unserialize( $serialized_pass );
    616613        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/Invision.php

    r6293 r6449  
    3030     * Sets up the field mappings
    3131     */
    32     public function setup_globals() {
     32    public function setup_globals() {
    3333
    3434        /** Forum Section *****************************************************/
  • trunk/src/includes/admin/converters/Kunena3.php

    r5951 r6449  
    701701     * converter.
    702702     */
    703     public function info()
    704     {
     703    public function info() {
    705704        return '';
    706705    }
     
    711710     * as one value. Array values are auto sanitized by WordPress.
    712711     */
    713     public function callback_savepass( $field, $row )
    714     {
     712    public function callback_savepass( $field, $row ) {
    715713        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    716714        return $pass_array;
     
    721719     * to a pass the user has typed in.
    722720     */
    723     public function authenticate_pass( $password, $serialized_pass )
    724     {
     721    public function authenticate_pass( $password, $serialized_pass ) {
    725722        $pass_array = unserialize( $serialized_pass );
    726723        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/MyBB.php

    r5951 r6449  
    517517     * converter.
    518518     */
    519     public function info()
    520     {
     519    public function info() {
    521520        return '';
    522521    }
     
    527526     * as one value. Array values are auto sanitized by WordPress.
    528527     */
    529     public function callback_savepass( $field, $row )
    530     {
     528    public function callback_savepass( $field, $row ) {
    531529        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    532530        return $pass_array;
     
    537535     * to a pass the user has typed in.
    538536     */
    539     public function authenticate_pass( $password, $serialized_pass )
    540     {
     537    public function authenticate_pass( $password, $serialized_pass ) {
    541538        $pass_array = unserialize( $serialized_pass );
    542539        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/PHPFox3.php

    r5951 r6449  
    507507     * converter.
    508508     */
    509     public function info()
    510     {
     509    public function info() {
    511510        return '';
    512511    }
     
    517516     * as one value. Array values are auto sanitized by WordPress.
    518517     */
    519     public function callback_savepass( $field, $row )
    520     {
     518    public function callback_savepass( $field, $row ) {
    521519        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    522520        return $pass_array;
     
    527525     * to a pass the user has typed in.
    528526     */
    529     public function authenticate_pass( $password, $serialized_pass )
    530     {
     527    public function authenticate_pass( $password, $serialized_pass ) {
    531528        $pass_array = unserialize( $serialized_pass );
    532529        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/PHPWind.php

    r5951 r6449  
    487487     * converter.
    488488     */
    489     public function info()
    490     {
     489    public function info() {
    491490        return '';
    492491    }
     
    497496     * as one value. Array values are auto sanitized by WordPress.
    498497     */
    499     public function callback_savepass( $field, $row )
    500     {
     498    public function callback_savepass( $field, $row ) {
    501499        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    502500        return $pass_array;
     
    507505     * to a pass the user has typed in.
    508506     */
    509     public function authenticate_pass( $password, $serialized_pass )
    510     {
     507    public function authenticate_pass( $password, $serialized_pass ) {
    511508        $pass_array = unserialize( $serialized_pass );
    512509        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/Phorum.php

    r5951 r6449  
    517517     * converter.
    518518     */
    519     public function info()
    520     {
     519    public function info() {
    521520        return '';
    522521    }
     
    527526     * as one value. Array values are auto sanitized by WordPress.
    528527     */
    529     public function callback_savepass( $field, $row )
    530     {
     528    public function callback_savepass( $field, $row ) {
    531529        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    532530        return $pass_array;
     
    537535     * to a pass the user has typed in.
    538536     */
    539     public function authenticate_pass( $password, $serialized_pass )
    540     {
     537    public function authenticate_pass( $password, $serialized_pass ) {
    541538        $pass_array = unserialize( $serialized_pass );
    542539        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/PunBB.php

    r5951 r6449  
    664664     * converter.
    665665     */
    666     public function info()
    667     {
     666    public function info() {
    668667        return '';
    669668    }
     
    674673     * as one value. Array values are auto sanitized by WordPress.
    675674     */
    676     public function callback_savepass( $field, $row )
    677     {
     675    public function callback_savepass( $field, $row ) {
    678676        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    679677        return $pass_array;
     
    684682     * to a pass the user has typed in.
    685683     */
    686     public function authenticate_pass( $password, $serialized_pass )
    687     {
     684    public function authenticate_pass( $password, $serialized_pass ) {
    688685        $pass_array = unserialize( $serialized_pass );
    689686        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/SMF.php

    r6284 r6449  
    653653     * converter.
    654654     */
    655     public function info()
    656     {
     655    public function info() {
    657656        return '';
    658657    }
     
    663662     * as one value. Array values are auto sanitized by WordPress.
    664663     */
    665     public function callback_savepass( $field, $row )
    666     {
     664    public function callback_savepass( $field, $row ) {
    667665        $pass_array = array( 'hash' => $field, 'username' => $row['member_name'] );
    668666        return $pass_array;
     
    673671     * to a pass the user has typed in.
    674672     */
    675     public function authenticate_pass( $password, $serialized_pass )
    676     {
     673    public function authenticate_pass( $password, $serialized_pass ) {
    677674        $pass_array = unserialize( $serialized_pass );
    678675        return ( $pass_array['hash'] === sha1( strtolower( $pass_array['username'] ) . $password ) ? true : false );
  • trunk/src/includes/admin/converters/XMB.php

    r5951 r6449  
    624624     * converter.
    625625     */
    626     public function info()
    627     {
     626    public function info() {
    628627        return '';
    629628    }
     
    634633     * as one value. Array values are auto sanitized by WordPress.
    635634     */
    636     public function callback_savepass( $field, $row )
    637     {
     635    public function callback_savepass( $field, $row ) {
    638636        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    639637        return $pass_array;
     
    644642     * to a pass the user has typed in.
    645643     */
    646     public function authenticate_pass( $password, $serialized_pass )
    647     {
     644    public function authenticate_pass( $password, $serialized_pass ) {
    648645        $pass_array = unserialize( $serialized_pass );
    649646        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/XenForo.php

    r6284 r6449  
    683683     * as one value. Array values are auto sanitized by wordpress.
    684684     */
    685     public function translate_savepass( $field, $row )
    686     {
     685    public function translate_savepass( $field, $row ) {
    687686        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    688687        return $pass_array;
     
    693692     * to a pass the user has typed in.
    694693     */
    695     public function authenticate_pass( $password, $serialized_pass )
    696     {
     694    public function authenticate_pass( $password, $serialized_pass ) {
    697695        $pass_array = unserialize( $serialized_pass );
    698         switch( $pass_array['hashFunc'] )
    699         {
     696        switch( $pass_array['hashFunc'] ) {
    700697            case 'sha256':
    701698                return ( $pass_array['hash'] == hash( 'sha256', hash( 'sha256', $password ) . $pass_array['salt'] ) );
  • trunk/src/includes/admin/converters/e107v1.php

    r6284 r6449  
    466466     * converter.
    467467     */
    468     public function info()
    469     {
     468    public function info() {
    470469        return '';
    471470    }
     
    476475     * as one value. Array values are auto sanitized by WordPress.
    477476     */
    478     public function callback_savepass( $field, $row )
    479     {
     477    public function callback_savepass( $field, $row ) {
    480478        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
    481479        return $pass_array;
     
    486484     * to a pass the user has typed in.
    487485     */
    488     public function authenticate_pass( $password, $serialized_pass )
    489     {
     486    public function authenticate_pass( $password, $serialized_pass ) {
    490487        $pass_array = unserialize( $serialized_pass );
    491488        return ( $pass_array['hash'] == md5( md5( $password ). $pass_array['salt'] ) );
     
    585582                $this->map_userid[ $field ] = $row->value_id;
    586583            } else {
    587                 if ( ! empty( $_POST['_bbp_converter_convert_users'] ) && ( $_POST['_bbp_converter_convert_users'] == 1 ) ) {
     584                if ( true === $this->convert_users ) {
    588585                    $this->map_userid[ $field ] = 0;
    589586                } else {
  • trunk/src/includes/admin/converters/phpBB.php

    r6284 r6449  
    777777        if ( floatval( phpversion() ) >= 5 ) {
    778778            $hash = md5( $salt . $password, true );
    779             do
    780             {
     779            do {
    781780                $hash = md5( $hash . $password, true );
    782781            }
Note: See TracChangeset for help on using the changeset viewer.