WordPress.org
Get WordPress

Plugin Directory

Changeset 1554708


Ignore:
Timestamp:
12/14/2016 03:13:47 PM (9 years ago)
Author:
r3df
Message:

Replaced the deprecated function wp_get_sites()

Location:
r3df-multisite-language-indicator/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • r3df-multisite-language-indicator/trunk/r3df-multisite-language-indicator.php

    r1256248 r1554708  
    44Description:    Indicates the site language beside the site title in the toolbar to help identify sites
    55Plugin URI:     http://r3df.com/
    6 Version:        1.0.10
     6Version:        1.0.11
    77Text Domain:    r3df-multisite-language-indicator
    88Domain Path:    /lang/
    … …  
    1313*/
    1414
    15 /*  Copyright 2015 R-Cubed Design Forge
     15/*  Copyright 2017 R-Cubed Design Forge
    1616
    1717    This program is free software; you can redistribute it and/or modify
    … …  
    7676
    7777        // get plugin options - can't get user options yet, user is not identified at this point, add_action for them
    78         $this->_global_options = get_site_option( 'r3df_multisite_language_indicator_global', $this->_global_defaults );
     78        $this -> _global_options = get_site_option( 'r3df_multisite_language_indicator_global', $this -> _global_defaults );
    7979        //$this->_local_options = get_option( 'r3df_multisite_language_indicator', $this->_local_defaults );
    8080        add_action( 'plugins_loaded', array( $this, 'load_user_options' ), 0 );
    … …  
    108108     */
    109109    function load_user_options() {
    110         $this->_user_options = get_user_meta( get_current_user_id(), 'r3df_multisite_language_indicator', true );
     110        $this -> _user_options = get_user_meta( get_current_user_id(), 'r3df_multisite_language_indicator', true );
    111111
    112112        // make sure that user options are set
    113         if ( empty( $this->_user_options ) ) {
    114             $this->_user_options = $this->_user_defaults;
     113        if ( empty( $this -> _user_options ) ) {
     114            $this -> _user_options = $this -> _user_defaults;
    115115        }
    116116    }
    … …  
    130130        // if no toolbar or no indicators, bail...
    131131        if ( ( function_exists( 'is_admin_bar_showing' ) && ! is_admin_bar_showing() ) ||
    132               ( empty( $this->_user_options['enable_locale_flags']['before'] ) && empty( $this->_user_options['enable_locale_flags']['after'] ) &&
    133                 empty( $this->_user_options['enable_locale_abbreviations']['before'] ) && empty( $this->_user_options['enable_locale_abbreviations']['after'] ) &&
    134                 empty( $this->_user_options['display_language']['before'] ) && empty( $this->_user_options['display_language']['after'] )
    135               ) ) {
     132            ( empty( $this -> _user_options['enable_locale_flags']['before'] ) && empty( $this -> _user_options['enable_locale_flags']['after'] ) &&
     133                empty( $this -> _user_options['enable_locale_abbreviations']['before'] ) && empty( $this -> _user_options['enable_locale_abbreviations']['after'] ) &&
     134                empty( $this -> _user_options['display_language']['before'] ) && empty( $this -> _user_options['display_language']['after'] )
     135            )
     136        ) {
    136137            return;
    137138        }
    138139
    139140        // Add indicators to sites in My Sites list
    140         foreach ( wp_get_sites() as $site ) {
     141        foreach ( get_sites() as $site ) {
    141142            // get the site defined locale
    142             $locale = get_blog_option( $site['blog_id'], 'WPLANG' );
    143 
    144             $country_code = strtolower( $this->get_locale_country_code( $locale ) ? $this->get_locale_country_code( $locale ) : 'Unknown' );
    145             $site_name = $wp_admin_bar->get_node( 'blog-'.$site['blog_id'] );
     143            $locale = get_blog_option( $site -> blog_id, 'WPLANG' );
     144
     145            $country_code = strtolower( $this -> get_locale_country_code( $locale ) ? $this -> get_locale_country_code( $locale ) : 'Unknown' );
     146            $site_name = $wp_admin_bar -> get_node( 'blog-' . $site -> blog_id );
    146147            if ( ! empty( $site_name ) ) {
    147                 $site_name->title = str_replace( '<div class="blavatar"></div>', '', $site_name->title );
     148                $site_name -> title = str_replace( '<div class="blavatar"></div>', '', $site_name -> title );
    148149                // language
    149                 $lang = $this->get_locale_language_name( $locale, 'english' ) ? $this->get_locale_language_name( $locale, 'english' ) : 'Unknown';
    150                 if ( ! empty( $this->_user_options['display_language']['before'] ) ) {
    151                     $site_name->title = '<span class="mli_lang mli_lang-'.$lang.'">'.$this->localize_language_name( $lang ).' - ' . $site_name->title;
     150                $lang = $this -> get_locale_language_name( $locale, 'english' ) ? $this -> get_locale_language_name( $locale, 'english' ) : 'Unknown';
     151                if ( ! empty( $this -> _user_options['display_language']['before'] ) ) {
     152                    $site_name -> title = '<span class="mli_lang mli_lang-' . $lang . '">' . $this -> localize_language_name( $lang ) . ' - ' . $site_name -> title;
    152153                }
    153                 if ( ! empty( $this->_user_options['display_language']['after'] ) ) {
    154                     $site_name->title = $site_name->title . ' <span class="mli_lang mli_lang-'.$lang.'"> - '.$this->localize_language_name( $lang ).'</span>';
     154                if ( ! empty( $this -> _user_options['display_language']['after'] ) ) {
     155                    $site_name -> title = $site_name -> title . ' <span class="mli_lang mli_lang-' . $lang . '"> - ' . $this -> localize_language_name( $lang ) . '</span>';
    155156                }
    156157                // locale
    157                 if ( ! empty( $this->_user_options['enable_locale_abbreviations']['before'] ) ) {
    158                     $site_name->title = '<span class="mli_locale mli_locale-'.$locale.'">('.$locale.')</span> ' . $site_name->title;
     158                if ( ! empty( $this -> _user_options['enable_locale_abbreviations']['before'] ) ) {
     159                    $site_name -> title = '<span class="mli_locale mli_locale-' . $locale . '">(' . $locale . ')</span> ' . $site_name -> title;
    159160                }
    160                 if ( ! empty( $this->_user_options['enable_locale_abbreviations']['after'] ) ) {
    161                     $site_name->title = $site_name->title . ' <span class="mli_locale mli_locale-'.$locale.'">('.$locale.')</span>';
     161                if ( ! empty( $this -> _user_options['enable_locale_abbreviations']['after'] ) ) {
     162                    $site_name -> title = $site_name -> title . ' <span class="mli_locale mli_locale-' . $locale . '">(' . $locale . ')</span>';
    162163                }
    163164                // flags
    164                 if ( ! empty( $this->_user_options['enable_locale_flags']['before'] ) ) {
    165                     if ( ! empty( $this->_user_options['site_flag'][ $site['blog_id'] ] ) && 'auto' != $this->_user_options['site_flag'][ $site['blog_id'] ] ) {
    166                         $country_code = strtolower( $this->_user_options['site_flag'][ $site['blog_id'] ] ? $this->_user_options['site_flag'][ $site['blog_id'] ] : 'Unknown' );
     165                if ( ! empty( $this -> _user_options['enable_locale_flags']['before'] ) ) {
     166                    if ( ! empty( $this -> _user_options['site_flag'][ $site -> blog_id ] ) && 'auto' !== $this -> _user_options['site_flag'][ $site -> blog_id ] ) {
     167                        $country_code = strtolower( $this -> _user_options['site_flag'][ $site -> blog_id ] ? $this -> _user_options['site_flag'][ $site -> blog_id ] : 'Unknown' );
    167168                    }
    168                     $site_name->title = '<span class="mli-flag mli-flag-'.$country_code.( is_rtl() ? ' rtl' : '' ).'"></span>' . $site_name->title;
     169                    $site_name -> title = '<span class="mli-flag mli-flag-' . $country_code . ( is_rtl() ? ' rtl' : '' ) . '"></span>' . $site_name -> title;
    169170                } else {
    170                     $site_name->title = '<div class="blavatar"></div>' . $site_name->title;
     171                    $site_name -> title = '<div class="blavatar"></div>' . $site_name -> title;
    171172                }
    172                 $wp_admin_bar->add_node( $site_name );
     173                $wp_admin_bar -> add_node( $site_name );
    173174            }
    174175        }
    … …  
    176177        // Add indicators to site name
    177178        $locale = get_option( 'WPLANG' );
    178         $country_code = strtolower( $this->get_locale_country_code( $locale ) ? $this->get_locale_country_code( $locale ) : 'Unknown' );
    179         $site_name = $wp_admin_bar->get_node( 'site-name' );
     179        $country_code = strtolower( $this -> get_locale_country_code( $locale ) ? $this -> get_locale_country_code( $locale ) : 'Unknown' );
     180        $site_name = $wp_admin_bar -> get_node( 'site-name' );
    180181        // language
    181         $lang = $this->get_locale_language_name( $locale, 'english' ) ? $this->get_locale_language_name( $locale, 'english' ) : 'Unknown';
    182         if ( ! empty( $this->_user_options['display_language']['before'] ) ) {
    183             $site_name->title = '<span class="mli_lang mli_lang-'.$lang.'">'.$this->localize_language_name( $lang ).' - ' . $site_name->title;
    184         }
    185         if ( ! empty( $this->_user_options['display_language']['after'] ) ) {
    186             $site_name->title = $site_name->title . ' <span class="mli_lang mli_lang-'.$lang.'"> - '.$this->localize_language_name( $lang ).'</span>';
     182        $lang = $this -> get_locale_language_name( $locale, 'english' ) ? $this -> get_locale_language_name( $locale, 'english' ) : 'Unknown';
     183        if ( ! empty( $this -> _user_options['display_language']['before'] ) ) {
     184            $site_name -> title = '<span class="mli_lang mli_lang-' . $lang . '">' . $this -> localize_language_name( $lang ) . ' - ' . $site_name -> title;
     185        }
     186        if ( ! empty( $this -> _user_options['display_language']['after'] ) ) {
     187            $site_name -> title = $site_name -> title . ' <span class="mli_lang mli_lang-' . $lang . '"> - ' . $this -> localize_language_name( $lang ) . '</span>';
    187188        }
    188189        // locale
    189         if ( ! empty( $this->_user_options['enable_locale_abbreviations']['before'] ) ) {
    190             $site_name->title = '<span class="mli_locale mli_locale-'.$locale.'">('.$locale.')</span> ' . $site_name->title;
    191         }
    192         if ( ! empty( $this->_user_options['enable_locale_abbreviations']['after'] ) ) {
    193             $site_name->title = $site_name->title . ' <span class="mli_locale mli_locale-'.$locale.'">('.$locale.')</span>';
     190        if ( ! empty( $this -> _user_options['enable_locale_abbreviations']['before'] ) ) {
     191            $site_name -> title = '<span class="mli_locale mli_locale-' . $locale . '">(' . $locale . ')</span> ' . $site_name -> title;
     192        }
     193        if ( ! empty( $this -> _user_options['enable_locale_abbreviations']['after'] ) ) {
     194            $site_name -> title = $site_name -> title . ' <span class="mli_locale mli_locale-' . $locale . '">(' . $locale . ')</span>';
    194195        }
    195196        // flag
    196         if ( ! empty( $this->_user_options['enable_locale_flags']['before'] ) ) {
    197             if ( ! empty( $this->_user_options['site_flag'][ get_current_blog_id() ] ) && 'auto' != $this->_user_options['site_flag'][ get_current_blog_id() ] ) {
    198                 $country_code = strtolower( $this->_user_options['site_flag'][ get_current_blog_id() ] ? $this->_user_options['site_flag'][ get_current_blog_id() ] : 'Unknown' );
     197        if ( ! empty( $this -> _user_options['enable_locale_flags']['before'] ) ) {
     198            if ( ! empty( $this -> _user_options['site_flag'][ get_current_blog_id() ] ) && 'auto' !== $this -> _user_options['site_flag'][ get_current_blog_id() ] ) {
     199                $country_code = strtolower( $this -> _user_options['site_flag'][ get_current_blog_id() ] ? $this -> _user_options['site_flag'][ get_current_blog_id() ] : 'Unknown' );
    199200            }
    200             $site_name->title = '<span class="mli-flag mli-flag-'.$country_code.( is_rtl() ? ' rtl' : '' ).'"></span>' . $site_name->title;
    201             $site_name->meta['class'] = isset( $site_name->meta['class'] ) ? $site_name->meta['class'] . ' hide-site-name-icon' : 'hide-site-name-icon';
    202         }
    203         $wp_admin_bar->add_node( $site_name );
     201            $site_name -> title = '<span class="mli-flag mli-flag-' . $country_code . ( is_rtl() ? ' rtl' : '' ) . '"></span>' . $site_name -> title;
     202            $site_name -> meta['class'] = isset( $site_name -> meta['class'] ) ? $site_name -> meta['class'] . ' hide-site-name-icon' : 'hide-site-name-icon';
     203        }
     204        $wp_admin_bar -> add_node( $site_name );
    204205    }
    205206
    … …  
    216217     */
    217218    function user_profile_settings( $user ) {
    218         if ( get_current_user_id() == $user->ID ) {
    219             $options = $this->_user_options;
     219        if ( get_current_user_id() === $user -> ID ) {
     220            $options = $this -> _user_options;
    220221        } else {
    221             $options = get_user_meta( $user->ID, 'r3df_multisite_language_indicator', true );
     222            $options = get_user_meta( $user -> ID, 'r3df_multisite_language_indicator', true );
    222223            // make sure that user options are set
    223224            if ( empty( $options ) ) {
    224                 $options = $this->_user_defaults;
     225                $options = $this -> _user_defaults;
    225226            }
    226227        }
    … …  
    232233                <th scope="row"><?php _e( 'Choose indicators to display', 'r3df-multisite-language-indicator' ); ?></th>
    233234                <td>
    234                     <label for="enable_locale_flags[before]"><input type="checkbox" id="enable_locale_flags[before]" name="r3df_multisite_language_indicator[enable_locale_flags][before]"<?php echo checked( ! empty( $options['enable_locale_flags']['before'] ), true, false ); ?> value="true">
     235                    <label for="enable_locale_flags[before]"><input type="checkbox" id="enable_locale_flags[before]"
     236                                                                    name="r3df_multisite_language_indicator[enable_locale_flags][before]"<?php echo checked( ! empty( $options['enable_locale_flags']['before'] ), true, false ); ?>
     237                                                                    value="true">
    235238                        <?php _e( 'Country flags - before site name', 'r3df-multisite-language-indicator' ); ?></label>
    236239                    <br>
    237                     <label for="enable_locale_abbreviations[before]"><input type="checkbox" id="enable_locale_abbreviations[before]" name="r3df_multisite_language_indicator[enable_locale_abbreviations][before]"<?php echo checked( ! empty( $options['enable_locale_abbreviations']['before'] ), true, false ); ?> value="true">
     240                    <label for="enable_locale_abbreviations[before]"><input type="checkbox"
     241                                                                            id="enable_locale_abbreviations[before]"
     242                                                                            name="r3df_multisite_language_indicator[enable_locale_abbreviations][before]"<?php echo checked( ! empty( $options['enable_locale_abbreviations']['before'] ), true, false ); ?>
     243                                                                            value="true">
    238244                        <?php _e( 'Locale code - before site name', 'r3df-multisite-language-indicator' ); ?></label>
    239245                    <br>
    240                     <label for="enable_locale_abbreviations[after]"><input type="checkbox" id="enable_locale_abbreviations[after]" name="r3df_multisite_language_indicator[enable_locale_abbreviations][after]"<?php echo checked( ! empty( $options['enable_locale_abbreviations']['after'] ), true, false ); ?> value="true">
     246                    <label for="enable_locale_abbreviations[after]"><input type="checkbox"
     247                                                                           id="enable_locale_abbreviations[after]"
     248                                                                           name="r3df_multisite_language_indicator[enable_locale_abbreviations][after]"<?php echo checked( ! empty( $options['enable_locale_abbreviations']['after'] ), true, false ); ?>
     249                                                                           value="true">
    241250                        <?php _e( 'Locale code - after site name', 'r3df-multisite-language-indicator' ); ?></label>
    242251                    <br>
    243                     <label for="display_language[before]"><input type="checkbox" id="display_language[before]" name="r3df_multisite_language_indicator[display_language][before]"<?php echo checked( ! empty( $options['display_language']['before'] ), true, false ) ?> value="true">
     252                    <label for="display_language[before]"><input type="checkbox" id="display_language[before]"
     253                                                                 name="r3df_multisite_language_indicator[display_language][before]"<?php echo checked( ! empty( $options['display_language']['before'] ), true, false ) ?>
     254                                                                 value="true">
    244255                        <?php _e( 'Site language - before site name', 'r3df-multisite-language-indicator' ); ?></label>
    245256                    <br>
    246                     <label for="display_language[after]"><input type="checkbox" id="display_language[after]" name="r3df_multisite_language_indicator[display_language][after]"<?php echo checked( ! empty( $options['display_language']['after'] ), true, false ); ?> value="true">
     257                    <label for="display_language[after]"><input type="checkbox" id="display_language[after]"
     258                                                                name="r3df_multisite_language_indicator[display_language][after]"<?php echo checked( ! empty( $options['display_language']['after'] ), true, false ); ?>
     259                                                                value="true">
    247260                        <?php _e( 'Site language - after site name', 'r3df-multisite-language-indicator' ); ?></label>
    248261                </td>
    … …  
    253266                    <table class="mli-site-table">
    254267                        <tbody>
    255                             <?php
    256                             foreach ( wp_get_sites() as $site ) {
    257                                 // get the site defined locale
    258                                 $language_locale = get_blog_option( $site['blog_id'], 'WPLANG' ); ?>
    259                                 <tr valign="top">
    260                                     <td>
    261                                         <label for="site_flag[<?php echo $site['blog_id'] ?>]"><?php echo $site['domain'] . ( $site['path'] != '/' ? $site['path']: ''); ?></label>
    262                                     </td>
    263                                     <td>
    264                                         <select id="site_flag[<?php echo $site['blog_id'] ?>]" name="r3df_multisite_language_indicator[site_flag][<?php echo $site['blog_id'] ?>]">
    265                                             <?php
    266                                             $country_code = strtolower( $this->get_locale_country_code( $language_locale ) ? $this->get_locale_country_code( $language_locale ) : 'Unknown' );
    267                                             echo '<option class="mli-flag mli-flag-' . $country_code . ( is_rtl() ? ' rtl' : '' ) . '" value="auto"' . selected( $options['site_flag'][ $site['blog_id'] ], 'auto' ) . '>' . __( 'Auto detect', 'r3df-multisite-language-indicator' ) . '</option>';
    268                                             foreach ( $this->get_country_names() as $country_code => $country_name ) {
    269                                                 echo '<option class="mli-flag mli-flag-' . strtolower( $country_code ) . ( is_rtl() ? ' rtl' : '' ) . '" value="' . $country_code . '"' . selected( $options['site_flag'][ $site['blog_id'] ], $country_code ) . '>' . $country_name . '</option>';
    270                                             }
    271                                             ?>
    272                                         </select>
    273                                     </td>
    274                                 </tr>
    275                             <?php } ?>
     268                        <?php
     269                        foreach ( get_sites() as $site ) {
     270                            // get the site defined locale
     271                            $language_locale = get_blog_option( $site -> blog_id, 'WPLANG' ); ?>
     272                            <tr valign="top">
     273                                <td>
     274                                    <label for="site_flag[<?php echo $site -> blog_id ?>]"><?php echo $site -> domain . ( $site -> path != '/' ? $site -> path : '' ); ?></label>
     275                                </td>
     276                                <td>
     277                                    <select id="site_flag[<?php echo $site -> blog_id ?>]"
     278                                            name="r3df_multisite_language_indicator[site_flag][<?php echo $site -> blog_id ?>]">
     279                                        <?php
     280                                        $country_code = strtolower( $this -> get_locale_country_code( $language_locale ) ? $this -> get_locale_country_code( $language_locale ) : 'Unknown' );
     281                                        echo '<option class="mli-flag mli-flag-' . $country_code . ( is_rtl() ? ' rtl' : '' ) . '" value="auto"' . selected( $options['site_flag'][$site -> blog_id], 'auto' ) . '>' . __( 'Auto detect', 'r3df-multisite-language-indicator' ) . '</option>';
     282                                        foreach ( $this -> get_country_names() as $country_code => $country_name ) {
     283                                            echo '<option class="mli-flag mli-flag-' . strtolower( $country_code ) . ( is_rtl() ? ' rtl' : '' ) . '" value="' . $country_code . '"' . selected( $options['site_flag'][$site -> blog_id], $country_code ) . '>' . $country_name . '</option>';
     284                                        }
     285                                        ?>
     286                                    </select>
     287                                </td>
     288                            </tr>
     289                        <?php } ?>
    276290                        </tbody>
    277291                    </table>
    … …  
    284298        </table>
    285299
    286     <?php
     300        <?php
    287301    }
    288302
    … …  
    298312
    299313            $user_settings['enable_locale_flags']['before'] = ! empty( $input['enable_locale_flags']['before'] ) ? true : false;
    300             $user_settings['enable_locale_flags']['after']  = ! empty( $input['enable_locale_flags']['after'] ) ? true : false;
     314            $user_settings['enable_locale_flags']['after'] = ! empty( $input['enable_locale_flags']['after'] ) ? true : false;
    301315
    302316            $user_settings['enable_locale_abbreviations']['before'] = ! empty( $input['enable_locale_abbreviations']['before'] ) ? true : false;
    303             $user_settings['enable_locale_abbreviations']['after']  = ! empty( $input['enable_locale_abbreviations']['after'] ) ? true : false;
     317            $user_settings['enable_locale_abbreviations']['after'] = ! empty( $input['enable_locale_abbreviations']['after'] ) ? true : false;
    304318
    305319            $user_settings['display_language']['before'] = ! empty( $input['display_language']['before'] ) ? true : false;
    306             $user_settings['display_language']['after']  = ! empty( $input['display_language']['after'] ) ? true : false;
    307 
    308             $country_codes                  = array_keys( $this->get_country_names() );
    309             $country_codes[]                = 'auto';
     320            $user_settings['display_language']['after'] = ! empty( $input['display_language']['after'] ) ? true : false;
     321
     322            $country_codes = array_keys( $this -> get_country_names() );
     323            $country_codes[] = 'auto';
    310324            $user_settings['site_flag'] = array();
    311325            if ( isset( $input['site_flag'] ) && is_array( $input['site_flag'] ) ) {
    312326                foreach ( $input['site_flag'] as $blog_id => $country_code ) {
    313                     if ( in_array( $country_code, $country_codes ) ) {
    314                         $user_settings['site_flag'][ $blog_id ] = $country_code;
     327                    if ( in_array( $country_code, $country_codes, true ) ) {
     328                        $user_settings['site_flag'][$blog_id] = $country_code;
    315329                    }
    316330                }
    … …  
    335349            'r3df_mli_settings_page',
    336350        ) );
    337         add_action( 'load-'.$my_admin_page, array( $this, 'add_help_tabs' ) );
     351        add_action( 'load-' . $my_admin_page, array( $this, 'add_help_tabs' ) );
    338352    }
    339353
    … …  
    342356     *
    343357     */
    344     function r3df_mli_settings_page() { ?>
     358    function r3df_mli_settings_page() {
     359    ?>
    345360        <div class="wrap">
    346361            <div id="icon-tools" class="icon32"></div>
    347362            <h2><?php _e( 'R3DF - Multisite Language Indicator', 'r3df-multisite-language-indicator' ); ?></h2>
    348             <?php printf( __( 'Please see your %s page to select display options for site indicators.' , 'r3df-multisite-language-indicator' ), '<a href="profile.php" target="_blank">'.__( 'Profile','r3df_dashboard_language_switcher' ) .'</a>' );?>
     363            <?php printf( __( 'Please see your %s page to select display options for site indicators.', 'r3df-multisite-language-indicator' ), '<a href="profile.php" target="_blank">' . __( 'Profile', 'r3df_dashboard_language_switcher' ) . '</a>' ); ?>
    349364
    350365            <form action="options.php" method="post">
    … …  
    352367                <?php do_settings_sections( 'r3df_mli' ); ?>
    353368                <input class="button button-primary" name="Submit" type="submit"
    354                        value="<?php esc_attr_e( 'Save Changes', 'r3df-multisite-language-indicator' ); ?>"/>
     369                       value="<?php esc_attr_e( 'Save Changes', 'r3df-multisite-language-indicator' ); ?>"/>
    355370            </form>
    356371        </div>
    … …  
    392407        if ( current_user_can( 'manage_network' ) ) {
    393408            // global settings - save directly with option update
    394             $global_settings['db_version']           = $this->_global_defaults['db_version'];
     409            $global_settings['db_version'] = $this -> _global_defaults['db_version'];
    395410            $global_settings['save_settings_on_uninstall'] = ( ! empty( $input['save_settings_on_uninstall'] ) ) ? true : false;
    396411
    … …  
    412427     */
    413428    function local_options_form_section( $args ) {
    414         echo '<hr>'.__( 'The options in this section are for this site only. The settings in this section affect all users.', 'r3df-multisite-language-indicator' );
     429        echo '<hr>' . __( 'The options in this section are for this site only. The settings in this section affect all users.', 'r3df-multisite-language-indicator' );
    415430    }
    416431
    … …  
    423438    function global_options_form_section( $args ) {
    424439        echo '<hr>' . __( 'The options in this section are for ALL sites in the network.', 'r3df-multisite-language-indicator' );
    425         echo '<br><small>'.__( 'Only users who are Super Admins can see/modify these settings.', 'r3df-multisite-language-indicator' ).'</small>';
     440        echo '<br><small>' . __( 'Only users who are Super Admins can see/modify these settings.', 'r3df-multisite-language-indicator' ) . '</small>';
    426441        if ( ! current_user_can( 'manage_network' ) ) {
    427442            echo '<table class="form-table"></table>';
    … …  
    436451     */
    437452    function save_settings_on_uninstall_form_item( $args ) {
    438         echo '<input type="checkbox" id="save_settings_on_uninstall" name="r3df_multisite_language_indicator[save_settings_on_uninstall]" '. checked( $this->_global_options['save_settings_on_uninstall'], true, false ) . ' value="true" >';
    439         echo '<label for="save_settings_on_uninstall">' . __( 'Yes', 'r3df-multisite-language-indicator' ) .'</label>';
     453        echo '<input type="checkbox" id="save_settings_on_uninstall" name="r3df_multisite_language_indicator[save_settings_on_uninstall]" ' . checked( $this -> _global_options['save_settings_on_uninstall'], true, false ) . ' value="true" >';
     454        echo '<label for="save_settings_on_uninstall">' . __( 'Yes', 'r3df-multisite-language-indicator' ) . '</label>';
    440455    }
    441456
    … …  
    451466    function add_help_tabs() {
    452467        $screen = get_current_screen();
    453         $screen->add_help_tab(array(
     468        $screen -> add_help_tab( array(
    454469            'title' => __( 'Options', 'r3df-multisite-language-indicator' ),
    455470            'id' => 'options',
    456471            'content' => '',
    457             'callback' => array( $this, 'help_global_options' )
    458         ));
     472            'callback' => array( $this, 'help_global_options' ),
     473        ) );
    459474    }
    460475
    … …  
    468483        <p><?php echo __( 'TBD', 'r3df-multisite-language-indicator' ); ?></p>
    469484        <p class="r3df-help">
    470             <a href="http://wordpress.org/extend/plugins/r3df-multisite-language-indicator/" target="_blank"><?php echo __( 'Plugin Directory', 'r3df-multisite-language-indicator' ) ?></a> |
    471             <a href="http://wordpress.org/extend/plugins/r3df-multisite-language-indicator/changelog/" target="_blank"><?php echo __( 'Change Logs', 'r3df-multisite-language-indicator' ) ?></a>
    472             <span class="alignright">&copy; 2015 <?php echo __( 'by', 'r3df-multisite-language-indicator' ) ?> <a href="http://r3df.com/" target="_blank">R3DF</a></span>
     485            <a href="http://wordpress.org/extend/plugins/r3df-multisite-language-indicator/"
     486               target="_blank"><?php echo __( 'Plugin Directory', 'r3df-multisite-language-indicator' ) ?></a> |
     487            <a href="http://wordpress.org/extend/plugins/r3df-multisite-language-indicator/changelog/"
     488               target="_blank"><?php echo __( 'Change Logs', 'r3df-multisite-language-indicator' ) ?></a>
     489            <span class="alignright">&copy; 2015 <?php echo __( 'by', 'r3df-multisite-language-indicator' ) ?> <a
     490                        href="http://r3df.com/" target="_blank">R3DF</a></span>
    473491        </p>
    474492        <?php
    … …  
    507525
    508526        // Register and enqueue the plugin settings page css files
    509         if ( 'settings_page_r3df-multisite-language-indicator' == $hook ) {
     527        if ( 'settings_page_r3df-multisite-language-indicator' === $hook ) {
    510528            wp_register_style( 'r3df_mli_plugin_page_style', plugins_url( '/css/plugin-page-style.css', __FILE__ ), false, $plugin['Version'] );
    511529            wp_enqueue_style( 'r3df_mli_plugin_page_style' );
    … …  
    525543        global $wp_version;
    526544        $version_error = array();
    527         if ( ! version_compare( $wp_version, '4.1', '>=' ) ) {
     545        if ( ! version_compare( $wp_version, '4.6', '>=' ) ) {
    528546            $version_error['WordPress Version'] = array( 'required' => '4.1', 'found' => $wp_version );
    529547        }
    … …  
    531549        //  $error['PHP Version'] = array( 'required' => '4.4.3', 'found' => phpversion() );
    532550        //}
    533         if ( 0 != count( $version_error ) ) {
     551        if ( 0 !== count( $version_error ) ) {
    534552            $current = get_option( 'active_plugins' );
    535553            array_splice( $current, array_search( plugin_basename( __FILE__ ), $current ), 1 );
    536554            update_option( 'active_plugins', $current );
    537             if ( 0 != count( $version_error ) ) {
     555            if ( 0 !== count( $version_error ) ) {
    538556                echo '<table>';
    539                 echo '<tr class="r3df-header"><td><strong>'.__( 'Plugin can not be activated.', 'r3df-multisite-language-indicator' ) . '</strong></td><td> | '.__( 'required', 'r3df-multisite-language-indicator' ) . '</td><td> | '.__( 'actual', 'r3df-multisite-language-indicator' ) . '</td></tr>';
     557                echo '<tr class="r3df-header"><td><strong>' . __( 'Plugin can not be activated.', 'r3df-multisite-language-indicator' ) . '</strong></td><td> | ' . __( 'required', 'r3df-multisite-language-indicator' ) . '</td><td> | ' . __( 'actual', 'r3df-multisite-language-indicator' ) . '</td></tr>';
    540558                foreach ( $version_error as $key => $value ) {
    541                     echo '<tr><td>'.$key.'</td><td align=\"center\"> &gt;= <strong>' . $value['required'] . '</strong></td><td align="center"><span class="r3df-alert">' . $value['found'] . '</span></td></tr>';
     559                    echo '<tr><td>' . $key . '</td><td align=\"center\"> &gt;= <strong>' . $value['required'] . '</strong></td><td align="center"><span class="r3df-alert">' . $value['found'] . '</span></td></tr>';
    542560                }
    543561                echo '</table>';
    … …  
    595613     */
    596614    function get_locale_language_name( $locale, $mode = 'native' ) {
    597         if ( ! in_array( $mode, array( 'english', 'native', 'localized' ) ) ) {
     615        if ( ! in_array( $mode, array( 'english', 'native', 'localized' ), true ) ) {
    598616            $mode = 'native';
    599617        }
    600618        $localized = false;
    601         if ( 'localized' == $mode ) {
     619        if ( 'localized' === $mode ) {
    602620            $mode = 'english';
    603621            $localized = true;
    … …  
    612630        $language_name = isset( $language_names[ $locale ] ) ? $language_names[ $locale ] : false;
    613631        if ( $language_name && $localized ) {
    614             return $this->localize_language_name( $language_name );
     632            return $this -> localize_language_name( $language_name );
    615633        }
    616634        return $language_name;
    … …  
    627645     */
    628646    function localize_language_name( $language_name ) {
    629         $language_names = $this->get_language_names();
     647        $language_names = $this -> get_language_names();
    630648        return ( isset( $language_names[ $language_name ] ) ? $language_names[ $language_name ] : false );
    631649    }
    … …  
    659677     */
    660678    function get_locale_country_name_localized( $locale ) {
    661         $country_names = $this->get_country_names();
    662         $country_code = $this->get_locale_country_code( $locale );
     679        $country_names = $this -> get_country_names();
     680        $country_code = $this -> get_locale_country_code( $locale );
    663681        return ( isset( $country_names[ $country_code ] ) ? $country_names[ $country_code ] : false );
    664682    }

  • r3df-multisite-language-indicator/trunk/readme.txt

    r1256248 r1554708  
    44Tags: dashboard, multi-lingual, multilingual, language, languages, network, site tag, site indicator, site, indicator, locale, flag
    55Stable tag: 1.0.10
    6 Requires at least: 4.1
    7 Tested up to: 4.3
     6Requires at least: 4.6
     7Tested up to: 4.7
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    4848
    4949== Changelog ==
     50= Version 1.0.11 =
     51* Replaced the deprecated function wp_get_sites() - REQUIRES WordPress 4.6+
     52* No functionality changes use 1.0.10 for WP < 4.6
     53
    5054= Version 1.0.10 =
    5155* More internationalization updates
    … …  
    8892
    8993== Upgrade Notice ==
     94= Version 1.0.11 =
     95* Replaced the deprecated function wp_get_sites() - REQUIRES WordPress 4.6+
     96* No functionality changes use 1.0.10 for WP < 4.6
     97
    9098= Version 1.0.10 =
    9199* More internationalization updates
Note: See TracChangeset for help on using the changeset viewer.