Improve code readability

Author: Valair

API.php

@@ -3,7 +3,6 @@
 namespace Piwik\Plugins\DisableTracking;
 
 use Exception;
-use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 use Piwik\Plugin\API as BaseAPI;
 
@@ -12,44 +11,18 @@
  */
 class API extends BaseAPI
 {
-    private static $instance = null;
-
-    /**
-     * Get Disable Tracking API instance.
-     *
-     * @throws \Exception if unable to bind to the container
-     *
-     * @return API the class instance
-     */
-    public static function getInstance()
-    {
-        try {
-            $instance = StaticContainer::get('DisableTracking_API');
-            if (!($instance instanceof API)) {
-                // Exception is caught below and corrected
-                throw new Exception('DisableTracking_API must inherit API');
-            }
-            self::$instance = $instance;
-        } catch (Exception $e) {
-            self::$instance = StaticContainer::get('Piwik\Plugins\DisableTracking\API');
-            StaticContainer::getContainer()->set('DisableTracking_API', self::$instance);
-        }
-
-        return self::$instance;
-    }
-
     /**
-     * Change archive status for websites.
+     * Change disabled status for websites.
      *
      * @param string $idSites the list of comma separated websites IDs
-     * @param $archive 'on' to archive, 'off' to re-enable
+     * @param $disable 'on' to disable, 'off' to re-enable
      *
      * @throws Exception if an error occurred
      */
-    public function changeArchiveState($idSites, $archive)
+    public function changeDisableState($idSites, $disable)
     {
         Piwik::checkUserHasAdminAccess($idSites);
 
-        DisableTracking::changeArchiveState(explode(',', $idSites), $archive);
+        DisableTracking::changeDisableState(explode(',', $idSites), $disable);
     }
 }

Controller.php

@@ -21,7 +21,7 @@ public function index()
     {
         Piwik::checkUserHasSuperUserAccess();
 
-        if (true === isset($_POST) && true === isset($_POST['saveDisabledSitesState'])) {
+        if (isset($_POST['saveDisabledSitesState'])) {
             DisableTracking::save();
         }
 

DisableTracking.php

@@ -80,7 +80,7 @@ public function registerEvents()
      */
     public function newTrackingRequest()
     {
-        if (true === isset($_GET['idsite'])) {
+        if (isset($_GET['idsite'])) {
             $siteId = (int) $_GET['idsite'];
             if (Manager::getInstance()->isPluginActivated('ProtectTrackID')) {
                 $settings = StaticContainer::get('Piwik\Plugins\ProtectTrackID\SystemSettings');
@@ -169,14 +169,14 @@ public static function save()
     }
 
     /**
-     * Change archiving status for the websites.
+     * Change disabled status for the websites.
      *
      * @param array $idSites the list of websites
      * @param string $disabled 'on' to archive, 'off' to re-enable
      *
      * @throws \Exception if an error occurred
      */
-    public static function changeArchiveState($idSites, $disabled)
+    public static function changeDisableState($idSites, $disabled)
     {
         Piwik::checkUserHasAdminAccess($idSites);
 
@@ -208,7 +208,7 @@ public static function changeArchiveState($idSites, $disabled)
      */
     private static function disableSiteTracking($id)
     {
-        if (false === self::isSiteTrackingDisabled($id)) {
+        if (!self::isSiteTrackingDisabled($id)) {
             $sql = '
                     INSERT INTO `' . Common::prefixTable(self::TABLE_DISABLE_TRACKING_MAP) . '`
                         (siteId, created_at)

Menu.php

@@ -14,7 +14,7 @@ class Menu extends \Piwik\Plugin\Menu
      */
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        if (true === Piwik::hasUserSuperUserAccess()) {
+        if (Piwik::hasUserSuperUserAccess()) {
             $menu->addMeasurableItem('Disable Tracking', $this->urlForDefaultAction());
         }
     }