Changeset 925

Timestamp:

01/24/06 23:37:19 (7 years ago)

Author:

benoitg

Message:

* Dependencies.php: We missed yet another instance of non-unifrom code for path detection.

The Dependencies class now uses the code in include/path_defines_base.php like the rest of the system.
Also make it return more usefull error messages.

* SmartyWifidog?.php: Output the error returned by Dependencies if Smarty cannot be found for some reason.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Dependencies.php (modified) (4 diffs)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-01-24 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Dependencies.php:  We missed one more instance of non-unifrom code for path detection.  
+        The Dependencies class now uses the code in include/path_defines_base.php like the rest of the system.  
+        Also make it return more usefull error messages.
+        * SmartyWifidog.php:  Output the error returned by Dependencies if Smarty cannot be found for some reason.
+
 2006-01-23 Max Horváth <max.horvath@maxspot.de>
         * Removed compiled PHPdoc documentation

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

@@ -46 +46 @@
 
 /**
- * This class checks the existence of components required by WiFiDog
+ * This class checks the existence of components required by WiFiDog.  
+ * Note that it implicitely depends on the defines in include/path_defines_base.php
  *
  * @package    WiFiDogAuthServer
@@ -124 +125 @@
                         if (self :: $_components[$component]["localLib"])
                         {
-                                if (file_exists($_SERVER["DOCUMENT_ROOT"]. (defined('SYSTEM_PATH') ? SYSTEM_PATH : '/').self :: $_components[$component]["file"]))
+                $filepath = WIFIDOG_ABS_FILE_PATH.self :: $_components[$component]["file"]; 
+                                if (file_exists($filepath))
                                 {
                                         // The component has been found.
@@ -134 +136 @@
                                         require_once ('Locale.php');
 
-                                        $errmsg = self :: $_components[$component]["name"]._(" is not installed");
+                                        $errmsg = sprintf(_("Component %s is not installed (not found in %s)"), self :: $_components[$component]["name"], $filepath);
                                 }
                         }
@@ -149 +151 @@
                                         // The component has NOT been found. Return error message.
                                         require_once ('Locale.php');
-
-                                        $errmsg = self :: $_components[$component]["name"]._(" is not installed");
+                    $errmsg = sprintf(_("Component %s is not installed (not found in %s)"), self :: $_components[$component]["name"], get_include_path());
+                    
                                 }
                         }

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

@@ -55 +55 @@
 } else {
     // Build the system_path for the auth-server
-    print "Redirection to Wifidog web-base install since Smarty is missing <META HTTP-EQUIV=Refresh CONTENT=\"5; URL=".BASE_URL_PATH."/install.php\">";
+    print "Redirecting to Wifidog web-based install script since Smarty is missing (Error was: $errmsg)<META HTTP-EQUIV=Refresh CONTENT=\"5; URL=".BASE_URL_PATH."/install.php\">";
     exit();
 }