Changeset 2881

Timestamp:

01/14/12 12:30:54 (4 months ago)

Author:

paparazzia

Message:

fix #664

Location:

branches/V_0_19

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/schemas/boat_tables.sql (modified) (1 prop)
• base/schemas/gshhs_tables.sql (modified) (1 prop)
• base/schemas/races_tables.sql (modified) (1 prop)
• base/schemas/schema.sql (modified) (1 prop)
• externals (modified) (1 prop)
• externals/jscalendar (modified) (1 prop)
• grib/crontab.example (modified) (1 prop)
• guest_map (modified) (1 prop)
• hosting/INSTALL (modified) (1 prop)
• hosting/UPGRADE (modified) (1 prop)
• hosting/conf/conf_htaccess_site.dist (modified) (1 prop)
• hosting/conf/param.php.dist (modified) (1 prop)
• hosting/scripts/maj_php.sh (modified) (1 prop)
• lib/phpcommon (modified) (1 prop)
• lib/phpcommon/functions.php (modified) (2 diffs)
• lib/phpcommon/users.class.php (modified) (1 diff)
• lostAndFound/images/Afficheur-VentApp.png (modified) (1 prop) (previous)
• lostAndFound/images/baneer.jpg (modified) (1 prop) (previous)
• lostAndFound/images/baneer.orig.jpg (modified) (1 prop) (previous)
• lostAndFound/images/baneer.png (modified) (1 prop) (previous)
• lostAndFound/images/banniere_haut.png (modified) (1 prop) (previous)
• lostAndFound/images/compass-small-complete.gif (modified) (1 prop) (previous)
• lostAndFound/scripts/002.css (modified) (1 prop)
• lostAndFound/scripts/NEWadmin.php (modified) (1 prop)
• lostAndFound/scripts/calcul_distances.htm (modified) (1 prop)
• lostAndFound/scripts/carte.img.php (modified) (1 prop)
• lostAndFound/scripts/deprecated.GETGRIBNOAA.txt (modified) (1 prop)
• lostAndFound/scripts/deprecated.MAILASAIL.txt (modified) (1 prop)
• lostAndFound/scripts/deprecated.SAILDOCS.txt (modified) (1 prop)
• lostAndFound/scripts/fw (modified) (1 prop)
• lostAndFound/scripts/googlemaptest.php (modified) (1 prop)
• lostAndFound/scripts/gribfile.class.php (modified) (1 prop)
• lostAndFound/scripts/gribfile.class.php.bak (modified) (1 prop)
• lostAndFound/scripts/mapFillCoordinates.dat (modified) (1 prop)
• lostAndFound/scripts/new-update-wind.php (modified) (1 prop)
• lostAndFound/scripts/taille.html (modified) (1 prop)
• lostAndFound/scripts/update-wind.php (modified) (1 prop)
• maps (modified) (1 prop)
• maps/init-gshhs.sh (modified) (1 prop)
• medias (modified) (1 prop)
• medias/images/site/compass-small-complete.png (modified) (1 prop) (previous)
• medias/images/site/deck-small.png (modified) (1 prop) (previous)
• medias/images/site/favicon-classic.png (modified) (1 prop) (previous)
• moteur (modified) (1 prop)
• moteur/posscripts/GetPositions.py (modified) (1 prop)
• moteur/posscripts/VDGPos.php (modified) (1 prop)
• moteur/posscripts/VlmHttp.py (modified) (1 prop)
• moteur/posscripts/VlmObject.py (modified) (1 prop)
• moteur/posscripts/VolvoPos.php (modified) (1 prop)
• moteur/posscripts/ag2r2008.py (modified) (1 prop)
• moteur/posscripts/ag2rpos.php (modified) (1 prop)
• moteur/posscripts/artemispos.php (modified) (1 prop)
• moteur/posscripts/artemispos.py (modified) (1 prop)
• moteur/posscripts/btobpos.php (modified) (1 prop)
• moteur/posscripts/bwrpos.php (modified) (1 prop)
• moteur/posscripts/g3pos.php (modified) (1 prop)
• moteur/posscripts/getpos_transquadra2009.py (modified) (1 prop)
• moteur/posscripts/idecpos.php (modified) (1 prop)
• moteur/posscripts/oepos.php (modified) (1 prop)
• moteur/posscripts/sodebopos.php (modified) (1 prop)
• sandbox (modified) (1 prop)
• site (modified) (1 prop)
• site/RELEASE (modified) (1 prop)
• site/status/phpinfo-status.php (modified) (1 prop)
• site/style/base-style.css (modified) (1 prop)
• site/style/bateaux (modified) (1 prop)
• site/style/blue_1 (modified) (1 prop)

branches/V_0_19/lib/phpcommon/functions.php

@@ -1317 +1317 @@
     } elseif (isset($_SERVER["HTTP_FORWARDED"]) && validip($_SERVER["HTTP_FORWARDED"])) {
         return $_SERVER["HTTP_FORWARDED"];
+    } elseif (isset($_SERVER["REMOTE_ADDR"])) {
+        return $_SERVER["REMOTE_ADDR"];
     } else {
-        return $_SERVER["REMOTE_ADDR"];
-    }
+        return "127.0.0.1";
 }
 
@@ -1997 +1998 @@
     if (isset($_SERVER["HTTP_VLM_PROXY_AGENT"])) {
         $ua = $_SERVER["HTTP_VLM_PROXY_AGENT"]." ".$_SERVER["HTTP_USER_AGENT"];
+    } elseif(isset($_SERVER['HTTP_USER_AGENT'])) {
+        $ua = $_SERVER["HTTP_USER_AGENT"];
     } else {
-        $ua = $_SERVER["HTTP_USER_AGENT"];
+        $ua = "VlmEngine";
     }
     $idusers = is_null($idusers) ? -1 : $idusers;

branches/V_0_19/lib/phpcommon/users.class.php

@@ -184 +184 @@
                     // FIXME sanity check
                     $query .= ", targetlat=$tlat, targetlong=$tlon ";
-                    if ( $values[1] >= 0 ) {
+                    if ( isset($values[1]) && $values[1] >= 0 ) {
                         $query .= ", targetandhdg=" . $values[1] ;
                         // Setup the userclass for immediate use