Changeset 705

Timestamp:

08/31/05 22:41:44 (8 years ago)

Author:

benoitg

Message:

2005-08-31 Benoit Gr�goire <bock@…>

• Node.php: Fix node creation

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/classes/GenericObject.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/classes/Node.php (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-08-31 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Node.php:  Fix node creation
+
 2005-08-31 Francois Proulx <francois.proulx@gmail.com>
         * Fixed new node creation bug
-        
+
 2005-08-29 Philippe April <philippe@ilesansfil.org>
         * js/gmaps_hotspots_status_map.js: Fixed small bug in that makes prevents

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

@@ -27 +27 @@
 require_once BASEPATH.'include/common.php';
 require_once BASEPATH.'classes/Content.php';
-/*function __autoload($class_name) {
-   require_once BASEPATH.'classes/'.$class_name . '.php';
-}*/
 
 /** Any object that implement this interface can be administered in a generic way. */

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

@@ -262 +262 @@
                 if(!empty ($_REQUEST[$new_node_id]))
                 {
-                                Node::createNode($_REQUEST[$new_node_id], _("Default node name"));
+                                Node::createNewNode($_REQUEST[$new_node_id], $this);
                                 $url = GENERIC_OBJECT_ADMIN_ABS_HREF."?".http_build_query(array("object_class" => "Node", "action" => "edit", "object_id" => $_REQUEST[$new_node_id]));
                                 header("Location: {$url}");

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

@@ -144 +144 @@
 
         /** Create a new Node in the database
-         * @deprecated version - 18-Apr-2005
          * @param $id The id to be given to the new node
          * @return the newly created Node object, or null if there was an error
@@ -153 +152 @@
 
                 $node_id = $db->EscapeString(get_guid());
-                $name = $db->EscapeString('New node');
-
-                $sql = "INSERT INTO nodes (node_id, name) VALUES ('$node_id','$name')";
-
-                if (!$db->ExecSqlUpdate($sql, false))
-                {
-                        throw new Exception(_('Unable to insert new node into database!'));
-                }
-                $object = new self($node_id);
+                $object = self::createNewNode($node_id, Network::getCurrentNetwork());
                 return $object;
         }
 
         /** Create a new Node in the database 
-         * @deprecated version - 18-Apr-2005
-         * @param $id The id to be given to the new node
+         * @param $node_id The id to be given to the new node
+         * @param $network Network object.  The node's network 
+         * @todo Implement network 
          * @return the newly created Node object, or null if there was an error
          */
-        static function createNode($node_id, $name, $home_page_url = "", $description = "", $map_url = "", $street_name = "", $public_phone_number = "", $public_email = "", $mass_transit_info = "", $node_deployment_status = "IN_PLANNING")
-        {
-                global $db;
-
+        static function createNewNode($node_id, Network $network)
+        {
+                global $db;
                 $node_id = $db->EscapeString($node_id);
-                $name = $db->EscapeString($name);
-                $home_page_url = $db->EscapeString($home_page_url);
-                $description = $db->EscapeString($description);
-                $map_url = $db->EscapeString($map_url);
-                $street_name = $db->EscapeString($street_name);
-                $public_phone_number = $db->EscapeString($public_phone_number);
-                $public_email = $db->EscapeString($public_email);
-                $mass_transit_info = $db->EscapeString($mass_transit_info);
-                $node_deployment_status = $db->EscapeString($node_deployment_status);
-
+                $node_deployment_status = $db->EscapeString("IN_PLANNING");
+                $node_name = _("New node");
                 if (Node :: nodeExists($node_id))
                         throw new Exception(_('This node already exists.'));
 
-                $sql = "INSERT INTO nodes (node_id, name, creation_date, home_page_url, description, map_url, street_name, public_phone_number, public_email, mass_transit_info, node_deployment_status) VALUES ('$node_id','$name', NOW(),'$home_page_url','$description','$map_url','$street_name','$public_phone_number','$public_email','$mass_transit_info','$node_deployment_status')";
+                $sql = "INSERT INTO nodes (node_id, creation_date, node_deployment_status, name) VALUES ('$node_id', NOW(),'$node_deployment_status', '$node_name')";
 
                 if (!$db->ExecSqlUpdate($sql, false))
@@ -1246 +1229 @@
         }
 
-        function nodeExists($id)
-        {
-                global $db;
+        /** Check if an node exists */
+        private function nodeExists($id)
+        {
+                global $db;
+                $retval = false;
                 $id_str = $db->EscapeString($id);
                 $sql = "SELECT * FROM nodes WHERE node_id='{$id_str}'";
                 $db->ExecSqlUniqueRes($sql, $row, false);
-                return $row;
+                if($row!=null)
+                {
+                        $retval = true;
+                }
+                return $retval;
         }