Changeset 1453 for trunk/wifidog-auth/wifidog/classes/Node.php

Timestamp:

02/25/10 15:56:33 (2 years ago)

Author:

gbastien

Message:

• Added possibility to have a deployed geolocated node not show on map (quick fix) (#706)
• When producing anonymised data export, two files are produced, one for the geolocated nodes and one for the connections (#705)
• Additions and bug fixes to web service: can now logout and auth returns both error code and message
• Starting work on #707 as needed

Files:

• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (3 diffs)

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

@@ -825 +825 @@
         $this->refresh();
     }
-
+    
+    /**
+     * Returns whether the node should be shown on a map or is invisible
+     *
+     */
+
+    public function showOnMap()
+    {
+        return (($this->_row['show_node_on_map'] == 't') ? true : false);
+    }
+
+    /** Set if this node be shown on map
+     * @param $value The new value, true or false
+     * @return true on success, false on failure */
+    function setShowOnMap($value)
+    {
+        $retval = true;
+        if ($value != $this->showOnMap())
+        {
+            $db = AbstractDb::getObject();
+            $value ? $value = 'TRUE' : $value = 'FALSE';
+            $retval = $db->execSqlUpdate("UPDATE nodes SET show_node_on_map = {$value} WHERE node_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+        return $retval;
+    }
+    
     public function getCivicNumber()
     {
@@ -1307 +1333 @@
         $_data = InterfaceElements::generateInputText("node_" . $node_id . "_map_url", $this->getMapURL(), "node_map_url_input");
         $_html_node_gis_data[] = InterfaceElements::generateAdminSectionContainer("node_map_url", $_title, $_data);
+        
+        $_title = _("Show node on map");
+        $help = _("Should this node be visible on the map when deployed?");
+        $_data = InterfaceElements::generateInputCheckbox("node_" . $node_id . "_show_on_map", "", _("Yes"), $this->showOnMap(), "node_show_on_map_input");
+        $_html_node_gis_data[] = InterfaceElements::generateAdminSectionContainer("node_show_on_map", $_title, $_data, $help);
 
         // Build section
@@ -1509 +1540 @@
             $this->setGisLocation(new GisPoint($_REQUEST[$gis_lat_name], $_REQUEST[$gis_long_name], .0));
         }
+        
+        $name = "node_".$node_id."_show_on_map";
+        $this->setShowOnMap(empty ($_REQUEST[$name]) ? false : true);
 
         // Statistics