Added function 'is_provided'.

Corrected dependency check.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10409 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index def413976a75c5dd2cca0c3457eaede9f750e475..76693ce920af2c56dc237e0e946492380b6a3a91 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -255,9 +255,11 @@ function parse_ini($file)
                        $plugin= &$tmp['gosa-plugin'];
                        if (isset($plugin['name'])&& isset($plugin['description'])){
                                $res= $plugin['name'];
-                               $provides[$res]= $plugin[$res];
                                $description[$res]= $plugin['description'];
                                $versions[$res]= $plugin['version'];
+                               if (isset($plugin['provides'])){
+                                       $provides[$res]= explode(',', preg_replace('/\s+/', '', $plugin['provides']));
+                               }
                                if (isset($plugin['depends'])){
                                        $depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
                                }
@@ -278,7 +280,7 @@ function dependency_check()
 
        foreach ($depends as $name => $pl_depends){
                foreach ($pl_depends as $pl){
-                       if (!in_array($pl, $provides)){
+                       if (!is_provided($pl, $provides)){
                                echo "! Error: plugin '$name' depends on '$pl' which is not provided by any plugin\n\n";
                                exit (1);
                        }
@@ -287,6 +289,22 @@ function dependency_check()
 }
 
 
+function is_provided($dependency)
+{
+       global $provides;
+
+       $result= FALSE;
+       foreach ($provides as $name => $pl_provides){
+               if(in_array($dependency, $pl_provides)) {
+                       $result= TRUE;
+                       continue;
+               }
+       }
+
+       return $result;
+}
+
+
 function load_plugins()
 {
        if (!is_dir(PLUGSTATE_DIR)){