Screenshots added and autoloader improved

Author: kkMatt

Screenshots/1. Envato Toolkit - Search Input.png

@@ -197,7 +197,7 @@ protected function checkRequirements()
      */
     protected function loadDependencies()
     {
-        $objAutoload = new AutoLoad();
+        $objAutoload = new AutoLoad($this->conf);
         spl_autoload_register(array(&$objAutoload, 'includeClassFile'));
     }
 

Screenshots/2. Envato Toolkit - Search Results.png

@@ -12,11 +12,12 @@
 
 class AutoLoad
 {
-    private $debugMode = 0;
+    protected $debugMode = 0;
+    protected $conf = NULL;
 
-    public function __construct()
+    public function __construct(Configuration &$paramConf)
     {
-        // Nothing here
+        $this->conf = $paramConf;
     }
 
     /**
@@ -83,8 +84,13 @@ private function getFilePathAndNameFromNamespaceAndClass($paramClassOrInterface)
         {
             // Then separate namespace and class name
             $namespace = substr($className, 0, $lastNamespacePosition);
+
+            // Replace 'EnvatoToolkit' folder name with $this->pluginDirname
+            // Note: we need that for the scenario in case if the plugin stays in 'plugins/envato-toolkit' folder instead of 'plugins/EnvatoToolkit'
+            $namespace = str_replace('EnvatoToolkit\\', $this->conf->getPluginDirname().'\\', $namespace);
+
             $className = substr($className, $lastNamespacePosition + 1);
-            $filePath  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+            $filePath  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
         }
 
         // Check if this is an interface or a class and set specific prefix to it

WordPress Plugin/EnvatoToolkit/Controllers/class.MainController.php

@@ -1,6 +1,7 @@
 === Envato Toolkit ===
 Contributors: KestutisIT
-Website Link: https://profiles.wordpress.org/KestutisIT
+Donate link: https://profiles.wordpress.org/KestutisIT
+Website link: https://profiles.wordpress.org/KestutisIT
 Tags: Envato Toolkit, Purchase code validation, update checker, Envato API
 Requires at least: 4.6
 Tested up to: 4.8