Changeset 2845

Timestamp:

01/08/12 08:54:01 (4 months ago)

Author:

paparazzia

Message:

fix #635

Location:

trunk/site

Files:

• map.img.php (modified) (2 diffs)
• myboat.php (modified) (2 diffs)

trunk/site/map.img.php

@@ -37 +37 @@
 
     $maptype = htmlentities(get_cgi_var('maptype', 'compas'));
-    if ( in_array($maptype, Array("floatingcompas", "bothcompass", "compas" ) ) ) {
+    if ( in_array($maptype, Array("floatingcompas", "bothcompass", "compas", "none" ) ) ) {
         setUserPref($boat, "mapTools" , $maptype, $save);
     } else {
-        setUserPref($boat, "mapTools" , "none", $save);
+        setUserPref($boat, "mapTools" , "compas", $save);
     }
     $list= htmlentities($_GET['list']) ;
@@ -172 +172 @@
 
       $maplayers=htmlentities($_GET['maplayers']);
-      if ( $maplayers == "" ) $maplayers = "merged";
+      if ( $maplayers == "" ) $maplayers = "multi";
       setUserPref($boat, "mapLayers" , $maplayers, $save);
 

trunk/site/myboat.php

@@ -83 +83 @@
     }
 
-    // Retrive user_prefs
+    // Retrieve user_prefs
     $mapOpponents = $usersObj->getMyPref("mapOpponents");
     if ( $mapOpponents == "NULL" ) $mapOpponents="myboat";
+
     $mapTools = $usersObj->getMyPref("mapTools");
-    if ( $mapTools == "NULL" ) $mapTools="compas";
+    if ( !in_array($mapTools, Array("floatingcompas", "bothcompass", "compas", "none" )) ) $mapTools = "compas";
+
     $mapCenter = $usersObj->getMyPref("mapCenter");
-    if ( $mapCenter == "NULL" ) $mapCenter="myboat";
+    if ( !in_array($mapCenter, Array("myboat", "mywp", "roadtowp")) ) $mapCenter = "myboat";
+
     $mapArea = $usersObj->getMyPref("maparea");
     if ( $mapArea == "NULL" ) $mapArea=10;
     $mapAge = $usersObj->getMyPref("mapAge");
     if ( $mapAge == "NULL" ) $mapAge=3;
+
     $mapLayers = $usersObj->getMyPref("mapLayers");
-    if ( $mapLayers == "NULL" ) $mapLayers="merged";
+    if ( !in_array($mapLayers, Array("multi", "merged")) ) $mapLayers = "multi";
+    
     $mapMaille = $usersObj->getMyPref("mapMaille");
     if ( $mapMaille == "NULL" ) $mapMaille=3;
@@ -101 +106 @@
     if ( $mapEstime == "NULL" ) $mapEstime=50;
     $mapX = $usersObj->getMyPref("mapX");
-    if ( $mapX == "NULL" ) $mapX = 800;
+    if ( $mapX == "NULL" ) $mapX = 1024;
     $mapY = $usersObj->getMyPref("mapY");
-    if ( $mapY == "NULL" ) $mapY = 600;
+    if ( $mapY == "NULL" ) $mapY = 768;
     $mapDrawtextwp = $usersObj->getMyPref("mapDrawtextwp");
     if ( $mapDrawtextwp == "NULL" ) $mapDrawtextwp = "on";