Fix - Quota messages unstyled in dashboard

Fix - NoQuota message on Bulk now working

Author: bschuiling

class/Controller/AdminNoticesController.php

@@ -128,7 +128,13 @@ public function displayNotices()
         if (! \wpSPIO()->env()->is_screen_to_use)
         {
             if(get_current_screen()->base !== 'dashboard') // ugly exception for dashboard.
+            {
                 return; // suppress all when not our screen.
+            }
+            else {
+              \wpSPIO()->load_style('shortpixel-notices');
+              \wpSPIO()->load_style('notices-module');
+            }
         }
 
         $access = AccessModel::getInstance();
@@ -161,10 +167,10 @@ public function displayNotices()
                         continue;
                     }
 
-                    // @Todo change this to new keys
-                    if ($notice->getID() == 'MSG_QUOTA_REACHED' || $notice->getID() == 'MSG_UPGRADE_MONTH') //|| $notice->getID() == AdminNoticesController::MSG_UPGRADE_BULK
+
+                    if ($notice->getID() == 'MSG_QUOTA_REACHED' || $notice->getID() == 'MSG_UPGRADE_MONTH')
                     {
-                        // @todo check if this is still needed.
+                        // This is still needed
                         wp_enqueue_script('jquery.knob.min.js');
                         wp_enqueue_script('shortpixel');
                     }

class/Controller/AjaxController.php

@@ -1045,6 +1045,7 @@ public function ajax_proposeQuotaUpgrade()
 
     public function ajax_checkquota()
     {
+
          $this->checkNonce('ajax_request');
 				 $action = 'check_quota';
 				 $this->checkActionAccess($action, 'is_author');

class/Controller/Front/CDNController.php

@@ -26,11 +26,9 @@ class CDNController extends \ShortPixel\Controller\Front\PageConverter
 		public function __construct()
 		{
 				parent::__construct();
-        //Log::addTemp("DOING: ", $_SERVER['REQUEST_URI']);
 
 				if (false === $this->shouldConvert())
 				{
-           Log::addTemp("not Converting", $_SERVER['REQUEST_URI']);
 					 return false;
 				}
 
@@ -190,12 +188,9 @@ protected function processFront($content)
         // If the items didn't survive the filters.
         if (count($replaceBlocks) == 0)
         {
-           Log::addTemp('No Replace Blocks', $_SERVER['REQUEST_URI']);
            return $original_content;
         }
 
-        //Log::addTemp('ReplaceBlcoks', $replaceBlocks);
-
         $replaceBlocks = $this->createReplacements($replaceBlocks);
 
       //  $replace_function = ($this->replace_method == 'preg') ? 'pregReplaceContent' : 'stringReplaceContent';
@@ -204,7 +199,7 @@ protected function processFront($content)
         $urls = array_column($replaceBlocks, 'raw_url');
 				$replace_urls = array_column($replaceBlocks, 'replace_url');
 
-        Log::addTemp('Array result', [$urls, $replace_urls]);
+      //  Log::addDebug('Array result', [$urls, $replace_urls]);
 
         $content = $this->$replace_function($original_content, $urls, $replace_urls);
 
@@ -325,7 +320,6 @@ protected function checkDomain($replaceBlock)
 						$url = $site_url . $original_url;
 						$replaceBlock->parsed = parse_url($url); // parse the new URL
             $replaceBlock->url = $url;
-            Log::addTemp("URL from $original_url changed to $url");
 
             return true;
         }

class/Controller/Front/PageConverter.php

@@ -135,11 +135,6 @@ protected function filterRegexExclusions($replaceBlocks)
 
        }
 
-       if (count($allMatches) > 0)
-       {
-         Log::addTEmp('RegexExclusions: ', $allMatches);
-       }
-
 			 $replaceBlocks = array_filter($replaceBlocks, function ($replaceBlock) use ($allMatches) {
 							if (in_array($replaceBlock->raw_url, $allMatches))
 							{

class/Controller/QuotaController.php

@@ -57,7 +57,7 @@ protected function getQuotaData()
         if (! $cacheData->exists() )
         {
             $quotaData = $this->getRemoteQuota();
-						if (! $this->hasQuota())
+            if (false === $this->hasQuota())
 							$timeout = MINUTE_IN_SECONDS;
 						else {
 							$timeout = HOUR_IN_SECONDS;
@@ -173,7 +173,6 @@ private function resetQuotaExceeded()
 				{
 						AdminNoticesController::resetQuotaNotices();
 				}
-		//		Log::addDebug('Reset Quota Exceeded and reset Notices');
        	$settings->quotaExceeded = 0;
     }
 

class/Model/AdminNoticeModel.php

@@ -40,6 +40,7 @@ public function load()
 		 $noticeController = Notices::getInstance();
 		 $notice = $noticeController->getNoticeByID($this->key);
 
+
 		 if (is_object($notice))
 		 {
 		 	$this->notice = $notice;
@@ -57,7 +58,9 @@ public function load()
 		 elseif ( is_object($this->notice) && $this->checkReset() === true)
 		 {
 			  $this->reset();
+        return false;
 		 }
+     return true;
 	 }
 
 	 public function getKey()
@@ -69,6 +72,7 @@ public function reset($key = null)
 	 {
 		  $key = (is_null($key)) ? $this->key : $key;
 		 	Notices::removeNoticeByID($key);
+      $this->notice = null;
 	 }
 
 	 protected function checkReset()
@@ -131,6 +135,7 @@ protected function add()
 			 $notice->limitScreens('include', $this->include_screens);
 		 }
 
+
 		 if (! is_null($this->callback))
 		 	Notices::makePersistent($notice, $this->key, $this->suppress_delay, $this->callback);
 		 else

class/Model/AdminNotices/QuotaNoticeMonth.php

@@ -15,8 +15,14 @@ class QuotaNoticeMonth extends \ShortPixel\Model\AdminNoticeModel
 
 	public function load()
 	{
-		 $this->callback = array(AdminNoticesController::getInstance(), 'proposeUpgradePopup');
-		 parent::load();
+    $bool = parent::load();
+
+  //	 $this->callback = array(AdminNoticesController::getInstance(), 'proposeUpgradePopup');
+    if (true === $bool && is_object($this->notice))
+    {
+       AdminNoticesController::getInstance()->proposeUpgradePopup();
+    }
+
 	}
 
 	protected function checkTrigger()

class/Model/AdminNotices/QuotaNoticeReached.php

@@ -19,8 +19,12 @@ class QuotaNoticeReached extends \ShortPixel\Model\AdminNoticeModel
 
 	public function load()
 	{
-		 $this->callback = array(AdminNoticesController::getInstance(), 'proposeUpgradePopup');
-		 parent::load();
+    // $this->callback = array(AdminNoticesController::getInstance(), 'proposeUpgradePopup');
+     $bool = parent::load();
+     if (true === $bool && is_object($this->notice))
+     {
+        AdminNoticesController::getInstance()->proposeUpgradePopup();
+     }
 	}
 
 	protected function checkTrigger()
@@ -30,8 +34,6 @@ protected function checkTrigger()
 			if ($quotaController->hasQuota() === true)
 				return false;
 
-//			$quotaData = $quotaController->getQuota();
-
 		  $this->reset('MSG_UPGRADE_MONTH');
 			$this->reset('MSG_UPGRADE_BULK');
 	    return true;

res/js/screens/screen-bulk.js

@@ -596,6 +596,13 @@ class ShortPixelScreen extends ShortPixelScreenBase
           data.http_text = this.strings.fatalError500;
           super.HandleError(data);
       }
+      else if(data.error) { // If this happens on the processor - checkResponse level instead of item.
+        var error = this.processor.aStatusError[data.error];
+        if (error == 'NOQUOTA')
+        {
+              this.ToggleOverQuotaNotice(true);
+        }
+      }
   }
 
 
@@ -627,12 +634,21 @@ class ShortPixelScreen extends ShortPixelScreenBase
 					{
 						var info = '<span class="kbinfo"><a href="' + result.kblink + '" target="_blank" ><span class="dashicons dashicons-editor-help">&nbsp;</span></a></span>';
 					}
+
+          // Error can be passed here, get it.
+          if (item.error)
+          {
+                var error = this.processor.aStatusError[item.error];
+          }
 			 }
 
-			 var error = this.processor.aStatusError[result.error];
+       if (typeof error === 'undefined')
+       {
+            var error = this.processor.aStatusError[result.error];
+       }
+
 			 if (error == 'NOQUOTA')
 			 {
-
 						 this.ToggleOverQuotaNotice(true);
 			 }
 
@@ -1185,7 +1201,7 @@ class ShortPixelScreen extends ShortPixelScreenBase
      var target = event.target;
      var settingParent = target.closest('.optiongroup');
      var warningEl = settingParent.querySelector('.warning');
-     //console.log(settingParent, warningEl);
+
      if (true === target.checked)
      {
         warningEl.classList.remove('hidden');

res/js/shortpixel-processor.js

@@ -614,6 +614,7 @@ window.ShortPixelProcessor =
 
     HandleItemError : function(result, type)
     {
+        
         console.log('Handle Item Error', result, type);
         var error = this.aStatusError[result.error];