Changeset 1409

Timestamp:

07/26/09 12:25:29 (3 years ago)

Author:

networkfusion

Message:

* Addded New Geocoders Yahoo and Google.
* Geocoder now defaults to google if no country specific
Geocoder is found (in future, this will be made selectable by network)
* Fixed Postcode search on Find Hotspot Map #436
* Added search for user by email closes #417
* Added validation to networkID to stop database errors, closes
#458

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/AbstractGeocoder.php (modified) (2 diffs)
• wifidog/classes/Network.php (modified) (2 diffs)
• wifidog/classes/Node.php (modified) (2 diffs)
• wifidog/classes/User.php (modified) (4 diffs)
• wifidog/geocoder.php (modified) (1 diff)
• wifidog/js/hotspots_status_map.js (modified) (9 diffs)
• wifidog/templates/sites/hotspots_map.tpl (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
+
+2009-07-26 Robin Jones
+        * Addded New Geocoders Yahoo and Google.
+        * Geocoder now defaults to google if no country specific Geocoder is found (in future, this will be made selectable by network)
+        * Fixed Postcode search on Find Hotspot Map #436
+        * Added search for user by email closes #417
+        * Added validation to networkID to stop database errors, closes #458
+        
 
 2009-07-10 Benoit Grégoire <benoitg@coeus.ca>

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

@@ -68 +68 @@
     // Implementation attributes
     private $endpoint_url;
+    private $APIKey;
     // This value is only used to prevent from running to same query twice
     private $execute_query = true;
 
     // Factory method hash map
-    private static $implementations_map = array ("Canada" => "GeocoderCanada", "USA" => "GeocoderUsa");
+    private static $implementations_map = array ("Canada" => "GeocoderCanada", "USA" => "GeocoderUsa", "UK" => "GeocoderYahooGlobal", "Earth" => "GeocoderGoogleGlobal");
 
     /** Returns a list of countries for which we provide a geocoder implementation
@@ -205 +206 @@
         $this->execute_query = false;
     }
+
+    protected function setAPIKey($APIKey)
+    {
+        $this->APIKey = $APIKey;
+    }
+
+    public function getAPIKey()
+    {
+        return $this->APIKey;
+    }
+
 
     abstract public function validateAddress();

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

@@ -329 +329 @@
         $name = "new_network_id";
         $html .= "<input type='text' size='10' name='{$name}'>\n";
-
         return $html;
     }
@@ -352 +351 @@
         if (!empty($_REQUEST[$name])) {
             $network_id = $_REQUEST[$name];
+
+            if (!preg_match('/^[0-9a-zA-Z_-]+$/', $network_id)) {
+            throw new Exception(_("The Network ID entered was not valid. It must only contain Alphanumerical Characters, Hyphens and Underscores e.g. My_Network-6"));
+            return;
+            }
 
             if ($network_id) {

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

@@ -1477 +1477 @@
         if (!empty ($_REQUEST['geocode_only']))
         {
-            $geocoder = AbstractGeocoder :: getGeocoder($this->getCountry());
+            if ($geocoder = AbstractGeocoder :: getGeocoder($this->getCountry()) != null)
+                $geocoder = AbstractGeocoder :: getGeocoder($this->getCountry());          
+            else
+                $geocoder = AbstractGeocoder :: getGeocoder('Earth');
+
             if ($geocoder != null)
             {
@@ -1485 +1489 @@
                 $geocoder->setProvince($this->getProvince());
                 $geocoder->setPostalCode($this->getPostalCode());
-                if ($geocoder->validateAddress() === true)
+                if ($geocoder->validateAddress() == true)
                 {
                     if (($point = $geocoder->getGisLocation()) !== null)

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

@@ -173 +173 @@
 
     /** Instantiate a user object
+     * @param $usernameOrEmail The username or the email address of the user
+     * @param &$errMsg An error message will be appended to this if the username is not empty, but the user doesn't exist.
+     * @return a User object, or null if there was an error
+     */
+    public static function getUserByUsernameOrEmail($usernameOrEmail, &$errMsg = null) {
+        $db = AbstractDb::getObject();
+        $object = null;
+
+        $usernameOrEmail_str = $db->escapeString($usernameOrEmail);
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE username ILike '$usernameOrEmail_str' OR email ILike '$usernameOrEmail_str'", $user_info, false);
+
+        if ($user_info != null) {
+            $object = self::getObject($user_info['user_id']);
+        }
+        else if (!empty($usernameOrEmail)) {
+            $errMsg .= sprintf(_("There is no user with username or email %s"),$usernameOrEmail);
+        }
+        return $object;
+    }
+ 
+
+   /** Instantiate a user object
      * @param $url The OpenId url
      * @return a User object, or null if none matched
@@ -813 +835 @@
             $userSelector .= InterfaceElements :: generateInputSubmit($add_button_name, $add_button_value);
         } else {
-            $userSelector = _("Username") . ": " . InterfaceElements :: generateInputText("select_user_" . $user_prefix . "_username");
-        }
-        $html = "<div class='user_select_user_ui_container'>".$networkSelector . $userSelector . "</div>\n";
+            $userSelector = _("Search for Username or Email Address") . ": " . InterfaceElements :: generateInputText("select_user_" . $user_prefix . "_username");
+        }
+        $html = "<div class='user_select_user_ui_container'>".$networkSelector . "<br>" . $userSelector . "</div>\n";
         return $html;
     }
@@ -831 +853 @@
             if (!empty ($_REQUEST[$name])) {
                 $username = $_REQUEST[$name];
-                return self :: getUserByUsernameAndOrigin($username, $network, $errMsg);
+                return self :: getUserByUsernameOrEmail($username, $errMsg);
             } else
             return null;
@@ -865 +887 @@
             $name = "user_" . $this->getId() . "_username";
             $content = "<input type='text' name='$name' value='" . htmlentities($this->getUsername()) . "' size=30><br/>\n";
-            $content .= _("Be carefull when changing this: it's the username you use to log in!");
+            $content .= _("Be careful when changing this: it's the username you use to log in!");
             $userPreferencesItems[] = InterfaceElements::genSectionItem($content, $title);
+
+
+            /* Email */
+            $title = _("Email");
+            $name = "email_" . $this->getId() . "_email";
+            $content = "<input type='text' name='$name' disabled='disabled' value='" . htmlentities($this->getEmail()) . "' size=30><br/>\n";
+            $content .= _("If you wish to change this address, please Email Support!");
+            $userPreferencesItems[] = InterfaceElements::genSectionItem($content, $title);
+
+
 
             /* Change password */

trunk/wifidog-auth/wifidog/geocoder.php

@@ -55 +55 @@
 if(!empty($_REQUEST["postal_code"]))
 {
-    $geocoder = AbstractGeocoder::getGeocoder("Canada");
+    $geocoder = AbstractGeocoder::getGeocoder("Earth");
     $geocoder->setPostalCode($_REQUEST["postal_code"]);
     $long = $geocoder->getLongitude();

trunk/wifidog-auth/wifidog/js/hotspots_status_map.js

@@ -42 +42 @@
  */
 
+// Create a Global array that will contain refs to markers
+var markers = new Array();
+
 // Translations
 function HotspotsMapTranslations(browser_support, homepage, show_on_map, loading)
@@ -64 +67 @@
 
         // Create the array that will contain refs to markers
-        this.markers = Array();
+        //markers = Array();
 
         // Init source url
@@ -85 +88 @@
     var self = this;
     GDownloadUrl("geocoder.php?postal_code=" + postal_code, function(data, responseCode) {
-            var root_node = GXml.parse(data).documentElement
+        // To ensure against HTTP errors that result in null or bad data,
+        // always check status code is equal to 200 before processing the data
+        if(responseCode == 200) {
+                var root_node = GXml.parse(data).documentElement
                 self.findClosestHotspotByCoords(new GLatLng(GXml.value(root_node.getElementsByTagName("lat")[0]), GXml.value(root_node.getElementsByTagName("long")[0])));
+        }else if(responseCode == -1) {
+    alert("Data request timed out. Please try later.");
+  } else { 
+    alert("Request resulted in error. Check XML file is retrievable.");
+  }
+
         });
 }
 
+
 HotspotsMap.prototype.findClosestHotspotByPostalCode = function(postal_code)
 {
-    if (postal_code != undefined && this.markers.length > 0) {
+    if (postal_code != undefined && markers.length > 0) {
         this.getGPointFromPostalCode(postal_code);
     }
@@ -99 +112 @@
 HotspotsMap.prototype.findClosestHotspotByCoords = function(coord)
 {
-    if (coord != null && this.markers.length > 0) {
+    if (coord != null && markers.length > 0) {
         // Init values
         var dist = null;
@@ -105 +118 @@
 
         // For each registered markers
-        for(i in this.markers) {
-                   if(this.markers[i] && this.markers[i].getPoint) {
+        for(i in markers) {
+                   if(markers[i] && markers[i].getPoint) {
                     // Compute the distance in meters between the two points
-                    tmp = coord.distanceFrom( this.markers[i].getPoint());
-
+                    tmp = coord.distanceFrom( markers[i].getPoint());
                     if(dist == null || tmp < dist) {
                         dist = tmp
@@ -261 +273 @@
 {
     // Trigger click ( NB. markers is a global var )
-    GEvent.trigger(this.markers[bubbleId], "click");
+    GEvent.trigger(markers[bubbleId], "click");
 }
 
@@ -335 +347 @@
             // Prepare fragment that will go in the sidebar
             var html = this.buildHtmlFromHotspot(hotspots[i], markerIcon);
-            html_list += html + "<br /><br /><a href=\"javascript:" + this.external_object_name +".openInfoBubble('" + GXml.value(hotspotId[0]) + "');\">" + this.translations.show_on_map + "</a><hr width='95%'/>";
+            html_list += html + "<br /><br /><a href=\"javascript:" + this.external_object_name +".openInfoBubble('" + markers.length + "');\">" + this.translations.show_on_map + "</a><hr width='95%'/>";
 
             // Create, save as ID and add the marker
@@ -341 +353 @@
 
             // markers is a global var
-            this.markers[GXml.value(hotspotId[0])] = marker;
+            //markers[GXml.value(hotspotId[0])] = marker;
+            markers[markers.length] = marker;
             this.map.addOverlay(marker);
         }
@@ -352 +365 @@
 HotspotsMap.prototype.redraw = function()
 {
-    for (i = 0;i < this.markers.length;i++) {
-        this.map.removeOverlay(this.markers[i]);
+    for (i = 0;i < markers.length;i++) {
+        this.map.removeOverlay(markers[i]);
     }
 

trunk/wifidog-auth/wifidog/templates/sites/hotspots_map.tpl

@@ -62 +62 @@
                 {"Enter your postal code"|_}:<br/>
                 <input type="text" id="postal_code" size="10"><p/>
-                <input type="button" value="{"Show"|_}" onclick="toggleOverlay('map_postalcode_overlay'); p = document.getElementById('postal_code'); hotspots_map.findClosestHotspotByPostalCode(p.value);">
+                <input type="button" value="{"Show"|_}" onclick="toggleOverlay('map_postalcode_overlay'); p = document.getElementById('postal_code'); HotspotsMap.prototype.findClosestHotspotByPostalCode(p.value);">
             </div>