Changeset 751

Timestamp:

09/11/05 23:23:40 (8 years ago)

Author:

fproulx

Message:

2005-09-11 Francois Proulx <francois.proulx@…>

• Fixed dependency check, found a workaround for the file_exists problem

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/classes/Dependencies.php (modified) (1 diff)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-11 Francois Proulx <francois.proulx@gmail.com>
+        * Fixed dependency check, found a workaround for the file_exists problem
+        
 2005-09-11 Francois Proulx <francois.proulx@gmail.com>
         * Added dependency check for Phlickr

trunk/wifidog-auth/wifidog/classes/Dependencies.php

@@ -32 +32 @@
                 $components["ImageGraph"] = array ("name" => "PEAR::Image_Graph", "file" => "Image/Graph.php");
                 $components["Phlickr"] = array ("name" => "PEAR::Phlickr", "file" => "Phlickr/Api.php");
-
+                
                 if (isset ($components[$component]))
                 {
+                        // Since file_exists does not take in account the include_path
+                        // Explode paths of include path
+                        $path_array = explode( PATH_SEPARATOR, get_include_path());
                         $component_info = $components[$component];
-                        if (include_once ($component_info["file"]))
-                                return true;
-                        else
-                        {
-                                $errmsg = $component_info["name"]._(" is not installed");
-                                return false;
-                        }
+                        
+                        // For each path or the include path, check if the file exists
+                        foreach($path_array as $path)
+                                if (file_exists ($path."/".$component_info["file"]))
+                                        return true;
+                                        
+                        // Otherwise, the requirement is not met
+                        $errmsg = $component_info["name"]._(" is not installed");
+                        return false;
                 }
                 else