Add a new dependency type phpExtension to avoid loading plugin that h…

…ave a strong dependency to one or more php extensions.
pydio · Apr 17, 2015 · ba53d8a · ba53d8a
1 parent 19d91eb
commit ba53d8a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/core/src/core/classes/class.AJXP_Plugin.php b/core/src/core/classes/class.AJXP_Plugin.php
@@ -55,6 +55,7 @@ class AJXP_Plugin implements Serializable
     protected $pluginConf; // can be passed at load time
     protected $pluginConfDefinition;
     protected $dependencies;
+    protected $extensionsDependencies;
     protected $streamData;
     protected $mixins = array();
     public $loadingState = "";
@@ -85,7 +86,7 @@ class AJXP_Plugin implements Serializable
         "contributionsLoaded",
         "mixins",
         "streamData",
-        "options", "pluginConf", "pluginConfDefinition", "dependencies", "loadingState", "manifestXML");
+        "options", "pluginConf", "pluginConfDefinition", "dependencies", "extensionsDependencies", "loadingState", "manifestXML");
 
     /**
      * Construction method
@@ -102,6 +103,7 @@ public function __construct($id, $baseDir)
         $this->name = $split[1];
         $this->actions = array();
         $this->dependencies = array();
+        $this->extensionsDependencies = array();
     }
 
     protected function getPluginWorkDir($check = false)
@@ -487,6 +489,11 @@ protected function loadDependencies()
             $value = $attr->value;
             $this->dependencies = array_merge($this->dependencies, explode("|", $value));
         }
+        $extPaths = "dependencies/phpExtension/@name";
+        $nodes = $this->xPath->query($extPaths);
+        foreach ($nodes as $attr) {
+            $this->extensionsDependencies[] = $attr->value;
+        }
     }
     /**
      * Update dependencies dynamically
@@ -644,6 +651,23 @@ public function getClassFile()
         if(!$files->length) return false;
         return $this->nodeAttrToHash($files->item(0));
     }
+
+    public function missingExtensions(){
+        $missing = array();
+        if(count($this->extensionsDependencies)){
+            foreach($this->extensionsDependencies as $ext){
+                if (!extension_loaded($ext)) {
+                    $missing[] = $ext;
+                }
+            }
+        }
+        return $missing;
+    }
+
+    public function hasMissingExtensions(){
+        return count($this->missingExtensions()) > 0;
+    }
+
     /**
      * @return bool
      */

diff --git a/core/src/core/classes/class.AJXP_PluginsService.php b/core/src/core/classes/class.AJXP_PluginsService.php
@@ -253,6 +253,10 @@ private function checkDependencies(&$arrayToSort)
         // First make sure that the given dependencies are present
         foreach ($arrayToSort as $plugId => $plugObject) {
             $plugObject->updateDependencies($this);
+            if($plugObject->hasMissingExtensions()){
+                unset($arrayToSort[$plugId]);
+                continue;
+            }
             $dependencies = $plugObject->getDependencies();
             if(!count($dependencies)) continue;// return ;
             $found = false;
@@ -399,7 +403,7 @@ public function initActivePlugins()
             $pObject->init(array());
             try {
                 $pObject->performChecks();
-                if(!$pObject->isEnabled()) continue;
+                if(!$pObject->isEnabled() || $pObject->hasMissingExtensions()) continue;
                 $this->setPluginActiveInst($pObject->getType(), $pObject->getName(), true);
             } catch (Exception $e) {
                 //$this->errors[$pName] = "[$pName] ".$e->getMessage();

diff --git a/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd b/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd
@@ -765,6 +765,7 @@
         <xs:complexType>
             <xs:choice maxOccurs="unbounded">
                 <xs:element ref="activePlugin"/>
+                <xs:element ref="phpExtension"/>
                 <xs:element ref="pluginClass"/>
                 <xs:element name="pluginResources">
                     <xs:complexType>
@@ -779,6 +780,11 @@
             <xs:attribute name="pluginName" use="required"/>
         </xs:complexType>
     </xs:element>
+    <xs:element name="phpExtension">
+        <xs:complexType>
+            <xs:attribute name="name" use="required"/>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="pluginClass">
         <xs:complexType>
             <xs:attribute name="pluginName" use="required"/>