Minor code styling.

* Added some equals-alignments and removed require_once paranthesis.
* Notice: _add_menu_page() has been renamed to add_menu_page()
This commit is contained in:
Stefan Kalscheuer 2017-11-11 21:21:05 +01:00
parent 637d5f482c
commit eb63299dfc
3 changed files with 11 additions and 13 deletions

View File

@ -48,7 +48,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist {
} elseif ( ! empty( array_diff( $given_ip, $sanitized_ip ) ) ) { } elseif ( ! empty( array_diff( $given_ip, $sanitized_ip ) ) ) {
return array( return array(
'ip' => array_diff( $given_ip, $sanitized_ip ), 'ip' => array_diff( $given_ip, $sanitized_ip ),
); );
} }
// Update database on success. // Update database on success.
@ -70,7 +70,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist {
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function _add_menu_page() { public static function add_menu_page() {
$title = __( 'Statify Blacklist', 'statify-blacklist' ); $title = __( 'Statify Blacklist', 'statify-blacklist' );
if ( self::$multisite ) { if ( self::$multisite ) {
add_submenu_page( add_submenu_page(

View File

@ -95,7 +95,7 @@ class StatifyBlacklist {
add_filter( 'plugin_row_meta', array( 'StatifyBlacklist_Admin', 'plugin_meta_link' ), 10, 2 ); add_filter( 'plugin_row_meta', array( 'StatifyBlacklist_Admin', 'plugin_meta_link' ), 10, 2 );
if ( is_multisite() ) { if ( is_multisite() ) {
add_action( 'network_admin_menu', array( 'StatifyBlacklist_Admin', '_add_menu_page' ) ); add_action( 'network_admin_menu', array( 'StatifyBlacklist_Admin', 'add_menu_page' ) );
add_filter( add_filter(
'network_admin_plugin_action_links', array( 'network_admin_plugin_action_links', array(
'StatifyBlacklist_Admin', 'StatifyBlacklist_Admin',
@ -105,7 +105,7 @@ class StatifyBlacklist {
2 2
); );
} else { } else {
add_action( 'admin_menu', array( 'StatifyBlacklist_Admin', '_add_menu_page' ) ); add_action( 'admin_menu', array( 'StatifyBlacklist_Admin', 'add_menu_page' ) );
add_filter( 'plugin_action_links', array( 'StatifyBlacklist_Admin', 'plugin_actions_links' ), 10, 2 ); add_filter( 'plugin_action_links', array( 'StatifyBlacklist_Admin', 'plugin_actions_links' ), 10, 2 );
} }
} }
@ -317,7 +317,7 @@ class StatifyBlacklist {
} }
$bytes_addr = unpack( 'n*', inet_pton( $base ) ); $bytes_addr = unpack( 'n*', inet_pton( $base ) );
$bytes_est = unpack( 'n*', inet_pton( $ip ) ); $bytes_est = unpack( 'n*', inet_pton( $ip ) );
if ( ! $bytes_addr || ! $bytes_est ) { if ( ! $bytes_addr || ! $bytes_est ) {
return false; return false;
@ -325,8 +325,8 @@ class StatifyBlacklist {
$ceil = ceil( $mask / 16 ); $ceil = ceil( $mask / 16 );
for ( $i = 1; $i <= $ceil; ++ $i ) { for ( $i = 1; $i <= $ceil; ++ $i ) {
$left = $mask - 16 * ( $i - 1 ); $left = $mask - 16 * ( $i - 1 );
$left = ( $left <= 16 ) ? $left : 16; $left = ( $left <= 16 ) ? $left : 16;
$mask_b = ~( 0xffff >> $left ) & 0xffff; $mask_b = ~( 0xffff >> $left ) & 0xffff;
if ( ( $bytes_addr[ $i ] & $mask_b ) !== ( $bytes_est[ $i ] & $mask_b ) ) { if ( ( $bytes_addr[ $i ] & $mask_b ) !== ( $bytes_est[ $i ] & $mask_b ) ) {
return false; return false;

View File

@ -67,12 +67,10 @@ function statify_blacklist_autoload( $class ) {
); );
if ( in_array( $class, $plugin_classes, true ) ) { if ( in_array( $class, $plugin_classes, true ) ) {
require_once( require_once sprintf(
sprintf( '%s/inc/class-%s.php',
'%s/inc/class-%s.php', STATIFYBLACKLIST_DIR,
STATIFYBLACKLIST_DIR, strtolower( str_replace( '_', '-', $class ) )
strtolower( str_replace( '_', '-', $class ) )
)
); );
} }
} }