Changeset 2881
- Timestamp:
- 01/14/12 12:30:54 (4 months ago)
- Location:
- branches/V_0_19
- Files:
-
- 69 modified
-
. (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)
Legend:
- Unmodified
- Added
- Removed
-
branches/V_0_19
-
branches/V_0_19/base
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/base/schemas/boat_tables.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/base/schemas/gshhs_tables.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/base/schemas/races_tables.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/base/schemas/schema.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/externals
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/externals/jscalendar
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/grib/crontab.example
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/guest_map
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/hosting/INSTALL
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/hosting/UPGRADE
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/hosting/conf/conf_htaccess_site.dist
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/hosting/conf/param.php.dist
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/hosting/scripts/maj_php.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lib/phpcommon
- Property svn:mergeinfo changed
/trunk/lib/phpcommon merged: 2877-2879
- Property svn:mergeinfo changed
-
branches/V_0_19/lib/phpcommon/functions.php
r2832 r2881 1317 1317 } elseif (isset($_SERVER["HTTP_FORWARDED"]) && validip($_SERVER["HTTP_FORWARDED"])) { 1318 1318 return $_SERVER["HTTP_FORWARDED"]; 1319 } elseif (isset($_SERVER["REMOTE_ADDR"])) { 1320 return $_SERVER["REMOTE_ADDR"]; 1319 1321 } else { 1320 return $_SERVER["REMOTE_ADDR"]; 1321 } 1322 return "127.0.0.1"; 1322 1323 } 1323 1324 … … 1997 1998 if (isset($_SERVER["HTTP_VLM_PROXY_AGENT"])) { 1998 1999 $ua = $_SERVER["HTTP_VLM_PROXY_AGENT"]." ".$_SERVER["HTTP_USER_AGENT"]; 2000 } elseif(isset($_SERVER['HTTP_USER_AGENT'])) { 2001 $ua = $_SERVER["HTTP_USER_AGENT"]; 1999 2002 } else { 2000 $ua = $_SERVER["HTTP_USER_AGENT"];2003 $ua = "VlmEngine"; 2001 2004 } 2002 2005 $idusers = is_null($idusers) ? -1 : $idusers; -
branches/V_0_19/lib/phpcommon/users.class.php
r2739 r2881 184 184 // FIXME sanity check 185 185 $query .= ", targetlat=$tlat, targetlong=$tlon "; 186 if ( $values[1] >= 0 ) {186 if ( isset($values[1]) && $values[1] >= 0 ) { 187 187 $query .= ", targetandhdg=" . $values[1] ; 188 188 // Setup the userclass for immediate use -
branches/V_0_19/lostAndFound/images/Afficheur-VentApp.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/images/baneer.jpg
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/images/baneer.orig.jpg
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/images/baneer.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/images/banniere_haut.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/images/compass-small-complete.gif
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/002.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/NEWadmin.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/calcul_distances.htm
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/carte.img.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/deprecated.GETGRIBNOAA.txt
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/deprecated.MAILASAIL.txt
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/deprecated.SAILDOCS.txt
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/fw
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/googlemaptest.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/gribfile.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/gribfile.class.php.bak
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/mapFillCoordinates.dat
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/new-update-wind.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/taille.html
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/lostAndFound/scripts/update-wind.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/maps
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/maps/init-gshhs.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/medias
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/medias/images/site/compass-small-complete.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/medias/images/site/deck-small.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/medias/images/site/favicon-classic.png
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/GetPositions.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/VDGPos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/VlmHttp.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/VlmObject.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/VolvoPos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/ag2r2008.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/ag2rpos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/artemispos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/artemispos.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/btobpos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/bwrpos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/g3pos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/getpos_transquadra2009.py
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/idecpos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/oepos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/moteur/posscripts/sodebopos.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/sandbox
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site/RELEASE
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site/status/phpinfo-status.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site/style/base-style.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site/style/bateaux
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/V_0_19/site/style/blue_1
- Property svn:mergeinfo changed (with no actual effect on merging)
