Skip to content

Commit

Permalink
Minor code styling.
Browse files Browse the repository at this point in the history
* Added some equals-alignments and removed require_once paranthesis.
* Notice: _add_menu_page() has been renamed to add_menu_page()
  • Loading branch information
stklcode committed Nov 12, 2017
1 parent 637d5f4 commit eb63299
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions inc/class-statifyblacklist-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function update_options( $options = null ) {
} elseif ( ! empty( array_diff( $given_ip, $sanitized_ip ) ) ) {
return array(
'ip' => array_diff( $given_ip, $sanitized_ip ),
);
);
}

// Update database on success.
Expand All @@ -70,7 +70,7 @@ public static function update_options( $options = null ) {
*
* @since 1.0.0
*/
public static function _add_menu_page() {
public static function add_menu_page() {
$title = __( 'Statify Blacklist', 'statify-blacklist' );
if ( self::$multisite ) {
add_submenu_page(
Expand Down
10 changes: 5 additions & 5 deletions inc/class-statifyblacklist.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function init() {
add_filter( 'plugin_row_meta', array( 'StatifyBlacklist_Admin', 'plugin_meta_link' ), 10, 2 );

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(
'network_admin_plugin_action_links', array(
'StatifyBlacklist_Admin',
Expand All @@ -105,7 +105,7 @@ public static function init() {
2
);
} 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 );
}
}
Expand Down Expand Up @@ -317,16 +317,16 @@ private static function cidr_match( $ip, $net ) {
}

$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 ) {
return false;
}

$ceil = ceil( $mask / 16 );
for ( $i = 1; $i <= $ceil; ++ $i ) {
$left = $mask - 16 * ( $i - 1 );
$left = ( $left <= 16 ) ? $left : 16;
$left = $mask - 16 * ( $i - 1 );
$left = ( $left <= 16 ) ? $left : 16;
$mask_b = ~( 0xffff >> $left ) & 0xffff;
if ( ( $bytes_addr[ $i ] & $mask_b ) !== ( $bytes_est[ $i ] & $mask_b ) ) {
return false;
Expand Down
10 changes: 4 additions & 6 deletions statify-blacklist.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@ function statify_blacklist_autoload( $class ) {
);

if ( in_array( $class, $plugin_classes, true ) ) {
require_once(
sprintf(
'%s/inc/class-%s.php',
STATIFYBLACKLIST_DIR,
strtolower( str_replace( '_', '-', $class ) )
)
require_once sprintf(
'%s/inc/class-%s.php',
STATIFYBLACKLIST_DIR,
strtolower( str_replace( '_', '-', $class ) )
);
}
}

0 comments on commit eb63299

Please sign in to comment.