CleanUp

inc/statifyblacklist.class.php

@@ -13,10 +13,17 @@ class StatifyBlacklist
   /**
    * Plugin options
    *
+   * @var array
    * @since   1.0.0
    */
   public static $_options;
 
+  /**
+   * Multisite Status
+   *
+   * @var bool
+   * @since   1.0.0
+   */
   public static $multisite;
 
   /**
@@ -44,6 +51,7 @@ class StatifyBlacklist
     /* Plugin options */
     self::update_options();
 
+    /* Get multisite status */
     self::$multisite = (is_multisite() && array_key_exists(STATIFYBLACKLIST_BASE, (array)get_site_option('active_sitewide_plugins')));
 
     /* Add Filter to statify hook */
@@ -58,7 +66,7 @@ class StatifyBlacklist
       add_filter('plugin_row_meta', array('StatifyBlacklist_Admin', 'plugin_meta_link'), 10, 2);
 
       if (is_multisite()) {
-        register_deactivation_hook(__FILE__, array('StatifyBlacklist_Admin', 'single_site_deactivate'));
+        register_deactivation_hook(__FILE__, array('StatifyBlacklist_Admin', 'deactivate'));
         add_action('network_admin_menu', array('StatifyBlacklist_Admin', '_add_menu_page'));
         add_filter('network_admin_plugin_action_links', array('StatifyBlacklist_Admin', 'plugin_actions_links'), 10, 2);
       } else {

inc/statifyblacklist_admin.class.php

@@ -2,6 +2,11 @@
 
 class StatifyBlacklist_Admin extends StatifyBlacklist
 {
+  /**
+   * Add configuration page to admin menu
+   *
+   * @since   1.0.0
+   */
   public function _add_menu_page() {
     $title = __( 'Statify Blacklist', 'statify-blacklist' );
     if (self::$multisite)

inc/statifyblacklist_system.class.php

@@ -8,7 +8,6 @@ defined('ABSPATH') OR exit;
  *
  * @since 1.0.0
  */
-
 class StatifyBlacklist_System extends StatifyBlacklist
 {
   /**
@@ -43,15 +42,6 @@ class StatifyBlacklist_System extends StatifyBlacklist
     }
   }
 
-  /**
-   * Plugin deactivation actions
-   *
-   * @since   1.0.0
-   */
-
-  public static function deactivate()
-  {
-  }
 
   /**
    * Plugin uninstall handler.

statifyblacklist.php

@@ -20,41 +20,21 @@ define('STATIFYBLACKLIST_DIR', dirname(__FILE__));
 define('STATIFYBLACKLIST_BASE', plugin_basename(__FILE__));
 
 /* System Hooks */
-add_action(
+add_action('plugins_loaded', array('StatifyBlacklist', 'instance'));
-  'plugins_loaded',
-  array(
-    'StatifyBlacklist',
-    'instance'
-  )
-);
 
-register_activation_hook(
+register_activation_hook(STATIFYBLACKLIST_FILE, array('StatifyBlacklist_System', 'install'));
-  STATIFYBLACKLIST_FILE,
-  array(
-    'StatifyBlacklist_System',
-    'install'
-  )
-);
 
-register_deactivation_hook(
+register_uninstall_hook(STATIFYBLACKLIST_FILE, array('StatifyBlacklist_System', 'uninstall'));
-  STATIFYBLACKLIST_FILE,
-  array(
-    'StatifyBlacklist_System',
-    'deactivate'
-  )
-);
-
-register_uninstall_hook(
-  STATIFYBLACKLIST_FILE,
-  array(
-    'StatifyBlacklist_System',
-    'uninstall'
-  )
-);
 
 /* Autoload */
 spl_autoload_register('statifyBlacklist_autoload');
 
+/**
+ * Autoloader for StatifyBlacklist classes.
+ *
+ * @param $class
+ * @since 1.0.0
+ */
 function statifyBlacklist_autoload($class) {
   $plugin_classes = array(
     'StatifyBlacklist',
@@ -62,13 +42,7 @@ function statifyBlacklist_autoload($class) {
     'StatifyBlacklist_System'
   );
 
-  if ( in_array($class, $plugin_classes) ) {
+  if (in_array($class, $plugin_classes)) {
-    require_once(
+    require_once(sprintf('%s/inc/%s.class.php', STATIFYBLACKLIST_DIR, strtolower($class)));
-    sprintf(
-      '%s/inc/%s.class.php',
-      STATIFYBLACKLIST_DIR,
-      strtolower($class)
-    )
-    );
   }
 }