Changeset 747

Timestamp:

09/11/05 02:39:23 (8 years ago)

Author:

fproulx

Message:

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

• Fixed dependency check

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/graph_common.inc.php (modified) (1 diff)
• wifidog/classes/Dependencies.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-10 Francois Proulx <francois.proulx@gmail.com>
+        * Fixed dependency check
+        
 2005-09-10 Francois Proulx <francois.proulx@gmail.com>
         * Removed many blank lines after php tags

trunk/wifidog-auth/wifidog/admin/graph_common.inc.php

@@ -25 +25 @@
 require_once BASEPATH.'admin/admin_common.php';
 
-if (!$_REQUEST["date_from"])
-    $_REQUEST["date_from"] = strftime("%Y-%m-%d 00:00");
-if (!$_REQUEST["date_to"])
-    $_REQUEST["date_to"] = strftime("%Y-%m-%d 11:59");
-
-$date_constraint = "AND timestamp_in >= '{$_REQUEST['date_from']}' AND timestamp_in <= '{$_REQUEST['date_to']}'";
-
-$node_id = isset($_REQUEST["node_id"]) ? $db->EscapeString($_REQUEST["node_id"]) : null;
-$user_id = isset($_REQUEST["user_id"]) ? $db->EscapeString($_REQUEST["user_id"]) : null;
-$network_id = isset($_REQUEST["network_id"]) ? $db->EscapeString($_REQUEST["network_id"]) : null;
+// Make sure the depency is met
+if (Dependencies::check("ImageGraph", $errmsg)) {
+        if (!$_REQUEST["date_from"])
+            $_REQUEST["date_from"] = strftime("%Y-%m-%d 00:00");
+        if (!$_REQUEST["date_to"])
+            $_REQUEST["date_to"] = strftime("%Y-%m-%d 11:59");
+        
+        $date_constraint = "AND timestamp_in >= '{$_REQUEST['date_from']}' AND timestamp_in <= '{$_REQUEST['date_to']}'";
+        
+        $node_id = isset($_REQUEST["node_id"]) ? $db->EscapeString($_REQUEST["node_id"]) : null;
+        $user_id = isset($_REQUEST["user_id"]) ? $db->EscapeString($_REQUEST["user_id"]) : null;
+        $network_id = isset($_REQUEST["network_id"]) ? $db->EscapeString($_REQUEST["network_id"]) : null;
+}
 
 ?>

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

@@ -1 +1 @@
 <?php
+
+
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
@@ -25 +27 @@
 class Dependencies
 {
-    static public function check($component, & $errmsg) {
-        $components = array(
-            "ImageGraph" => array(
-                "name" => "PEAR::Image_Graph",
-                "file" => "Image/Graph.php"
-            )
-        );
+        static public function check($component, & $errmsg)
+        {
+                $components = array ("ImageGraph" => array ("name" => "PEAR::Image_Graph", "file" => "Image/Graph.php"));
 
-        if (isset($components[$component])) {
-            $component_info = $components[$component];
-
-            if (file_exists($component_info["file"])) {
-
-                if (include_once($component_info["file"])) {
-                    return true;
-                } else {
-                    $errmsg = $component_info["name"] . _(" is not working properly");
-                    return false;
-                }
-
-            } else {
-                $errmsg = $component_info["name"] . _(" is not installed");
-                return false;
-            }
-        } else {
-            throw new Exception("Component not found");
-        }
-    }
+                if (isset ($components[$component]))
+                {
+                        $component_info = $components[$component];
+                        if (include_once ($component_info["file"]))
+                                return true;
+                        else
+                        {
+                                $errmsg = $component_info["name"]._(" is not installed");
+                                return false;
+                        }
+                }
+                else
+                        throw new Exception("Component not found");
+        }
 
 } // End class