Release version 2.4.0 (#7)

Merge pull request #7 from short-pixel-optimizer/release-2.4.0

Author: pdobrescu

build/shortpixel/PackageLoader.php

@@ -3,31 +3,33 @@
 
 class PackageLoader
 {
-    public $dir;
-    public $composerFile  = false;
+  public $dir;
+  public $composerFile  = false;
 
-    public function __construct()
-    {
+  public function __construct()
+  {
 
-    }
+  }
 
-    public function setComposerFile($filePath)
-    {
-      $this->composerFile = json_decode(file_get_contents($filePath),1);
-    }
+  public function setComposerFile($filePath)
+  {
+    $this->composerFile = json_decode(file_get_contents($filePath),1);
+  }
 
-    public function getComposerFile($filePath = false )
-    {
-      if (! $this->composerFile)
-        $this->composerFile = json_decode(file_get_contents($this->dir."/composer.json"), 1);
+  public function getComposerFile($filePath = false )
+  {
+    if (! $this->composerFile)
+      $this->composerFile = json_decode(file_get_contents($this->dir."/composer.json"), 1);
 
-        return $this->composerFile;
-    }
+      return $this->composerFile;
+  }
 
     public function load($dir)
     {
         $this->dir = $dir;
         $composer = $this->getComposerFile();
+
+
         if(isset($composer["autoload"]["psr-4"])){
             $this->loadPSR4($composer['autoload']['psr-4']);
         }
@@ -61,13 +63,11 @@ public function loadPSR0($namespaces)
     public function loadPSR($namespaces, $psr4)
     {
         $dir = $this->dir;
-
         // Foreach namespace specified in the composer, load the given classes
         foreach ($namespaces as $namespace => $classpaths) {
             if (!is_array($classpaths)) {
                 $classpaths = array($classpaths);
             }
-
             spl_autoload_register(function ($classname) use ($namespace, $classpaths, $dir, $psr4) {
                 // Check if the namespace matches the class we are looking for
                 if (preg_match("#^".preg_quote($namespace)."#", $classname)) {
@@ -76,7 +76,6 @@ public function loadPSR($namespaces, $psr4)
                         $classname = str_replace($namespace, "", $classname);
                     }
 
-
                     //  $filename = preg_replace("#\\\\#", "", $classname).".php";
                     // This is fix for nested classes which were losing a /
                     $filename = ltrim($classname .'.php', '\\');

build/shortpixel/log/src/ShortPixelLogger.php

@@ -138,6 +138,17 @@ protected function addLog($message, $level, $data = array())
        return;
      }
 
+     // Force administrator on manuals.
+     if ( $this->is_manual_request )
+     {
+        if (! function_exists('wp_get_current_user')) // not loaded yet
+          return false;
+
+        $user_is_administrator = (current_user_can('manage_options')) ? true : false;
+        if (! $user_is_administrator)
+          return false;
+     }
+
      // Check where to log to.
      if ($this->logPath === false)
      {
@@ -237,6 +248,11 @@ public static function addWarn($message, $args = array())
      $log = self::getInstance();
      $log->addLog($message, $level, $args);
    }
+   // Alias, since it goes wrong so often.
+   public static function addWarning($message, $args = array())
+   {
+      self::addWarn($message, $args);
+   }
    public static function addInfo($message, $args = array())
    {
      $level = DebugItem::LEVEL_INFO;
@@ -321,6 +337,7 @@ public function loadView()
        $controller = $this;
 
        $template_path = __DIR__ . '/' . $this->template  . '.php';
+      // var_dump( $template_path);
        if (file_exists($template_path))
        {
 

build/shortpixel/notices/src/NoticeController.php

@@ -19,7 +19,6 @@ class NoticeController //extends ShortPixelController
   /** For backward compat. Never call constructor directly. */
   public function __construct()
   {
-  //    $this->loadModel('notice');
       $ns = __NAMESPACE__;
       $ns = substr($ns, 0, strpos($ns, '\\')); // try to get first part of namespace
       $this->notice_option = $ns . '-notices';
@@ -40,6 +39,14 @@ public static function getInstance()
      return self::$instance;
   }
 
+  /** Reset all notices, before loading them, to ensure on updates / activations one starts fresh */
+  public static function resetNotices()
+  {
+    $ns = __NAMESPACE__;
+    $ns = substr($ns, 0, strpos($ns, '\\')); // try to get first part of namespace
+    $result = delete_option($ns . '-notices');
+  }
+
   /** Load Notices Config File, if any
   *
   * [ Future Use ]
@@ -68,7 +75,15 @@ protected function loadNotices()
 
     if ($notices !== false && is_array($notices))
     {
-      self::$notices = $notices;
+      $checked = array();
+      foreach($notices as $noticeObj)
+      {
+        if (is_object($noticeObj) && $noticeObj instanceOf NoticeModel)
+        {
+          $checked[] = $noticeObj;
+        }
+      }
+      self::$notices = $checked;
       $this->has_stored = true;
     }
     else {
@@ -183,7 +198,7 @@ public static function removeNoticeByID($id)
     for($i = 0; $i < count(self::$notices); $i++)
     {
       $item = self::$notices[$i];
-      if ($item->getID() == $id)
+      if (is_object($item) && $item->getID() == $id)
       {
         Log::addDebug('Removing notice with ID ' . $id);
         unset(self::$notices[$i]);

build/shortpixel/notices/src/NoticeModel.php

@@ -134,6 +134,11 @@ public static function setIcon($notice_type, $icon)
     self::$icons[$type] = $icon;
   }
 
+  private function checkIncomplete($var)
+  {
+     return ($var instanceof \__PHP_Incomplete_Class);
+  }
+
   public function getForDisplay()
   {
     $this->viewed = true;
@@ -143,6 +148,21 @@ public function getForDisplay()
 
     if ($this->callback)
     {
+      if (is_array($this->callback))
+      {
+        foreach($this->callback as $part)
+        {
+          if ($this->checkIncomplete($part) === true)
+          {
+              return false;
+          }
+        }
+      } elseif (is_object($this->callback))
+      {
+            if ($this->checkIncomplete($part) === true)
+              return false;
+      }
+
        $return = call_user_func($this->callback, $this);
        if ($return === false) // don't display is callback returns false explicitly.
         return;

build/shortpixel/shortq/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "shortpixel/shortq",
     "description": "Simple Queue",
-    "version": 0.5,
+    "version": 1.1,
     "type": "library",
     "license": "MIT",
     "authors": [

build/shortpixel/shortq/src/DataProvider/DataProvider.php

@@ -10,14 +10,17 @@
 */
 interface DataProvider
 {
-  
+
   function __construct($pluginSlug, $queueName);
 
   //function add($items);
   function enqueue($items);
   function dequeue($args); // @return Items removed from queue and set to status. Returns Item Object
-  function alterqueue($args); // @return Item Count / Boolean . Mass alteration of queue.
+  function alterQueue($changes, $conditions, $operators); // @return Item Count / Boolean . Mass alteration of queue. ( changes, what to change, conditions, basically where statement)
   function itemUpdate(Item $item, $new_status);
+  function getItem($item_id);
+  function getItems($args); // get items on basis of status / updated date /etc 
+
 
   // Returns number of items left in Queue.
   function itemCount($mode = 'waiting');