[fusion-commits] r2348 - in trunk: common/php layers/MapServer/php lib widgets

[svn_fusion at osgeo.org]

Author: pdeschamps
Date: 2011-03-29 07:00:46 -0700 (Tue, 29 Mar 2011)
New Revision: 2348

Modified:
   trunk/common/php/Utilities.php
   trunk/layers/MapServer/php/CreateSession.php
   trunk/layers/MapServer/php/LoadScaleRanges.php
   trunk/layers/MapServer/php/RestoreState.php
   trunk/lib/jxlib.uncompressed.js
   trunk/widgets/MapMenu.js
Log:
session and pathing issue


Modified: trunk/common/php/Utilities.php
===================================================================
--- trunk/common/php/Utilities.php	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/common/php/Utilities.php	2011-03-29 14:00:46 UTC (rev 2348)
@@ -281,6 +281,7 @@
 
 if (!function_exists('loadFusionConfig')) {
   function loadFusionConfig() {
+      error_log("loadFusionConfig");
     /* json decode only in PHP 5.2 and later */
     if (function_exists('json_decode')) {
         $configFile = realpath(dirname(__FILE__)."/../../config.json");

Modified: trunk/layers/MapServer/php/CreateSession.php
===================================================================
--- trunk/layers/MapServer/php/CreateSession.php	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/layers/MapServer/php/CreateSession.php	2011-03-29 14:00:46 UTC (rev 2348)
@@ -33,7 +33,9 @@
 include('../../../common/php/Utilities.php');
 
 $cookie = isset($_COOKIE['session'])?$_COOKIE['session']:"";
+
 initializeSession( "session", "", $cookie);
+
 $sessionId = session_id();
 loadFusionConfig();
 

Modified: trunk/layers/MapServer/php/LoadScaleRanges.php
===================================================================
--- trunk/layers/MapServer/php/LoadScaleRanges.php	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/layers/MapServer/php/LoadScaleRanges.php	2011-03-29 14:00:46 UTC (rev 2348)
@@ -36,15 +36,15 @@
 include(dirname(__FILE__).'/Common.php');
 include(dirname(__FILE__).'/Utilities.php');
 
-/*if (isset($_SESSION['maps']) && isset($_SESSION['maps'][$mapName])) {
+if (isset($_SESSION['maps']) && isset($_SESSION['maps'][$mapName])) {
     $oMap = ms_newMapObj($_SESSION['maps'][$mapName]);
-}*/
+}
 
 /* if scales are not set, these become the default values */
 define('MIN_SCALE', 1);
 define('MAX_SCALE', 1000000000);
 
-$oMap = ms_newMapObj(getSessionSavePath().$mapName.".map");
+//$oMap = ms_newMapObj(getSessionSavePath().$mapName.".map");
 
 if ($oMap) {
 	$minScale = $oMap->web->minscale == -1 ? MIN_SCALE : $oMap->web->minscale;
@@ -288,5 +288,5 @@
 header('X-JSON: true');
 
 echo var2json($scaleObj);
-exit;
-?>
\ No newline at end of file
+
+?>

Modified: trunk/layers/MapServer/php/RestoreState.php
===================================================================
--- trunk/layers/MapServer/php/RestoreState.php	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/layers/MapServer/php/RestoreState.php	2011-03-29 14:00:46 UTC (rev 2348)
@@ -1,6 +1,6 @@
 <?php
 ini_set("memory_limit","64M");
-dl('zip.so');
+//dl('zip.so');
  /* set up the session */
 include(dirname(__FILE__).'/Common.php');
 include('../../../common/php/Utilities.php');

Modified: trunk/lib/jxlib.uncompressed.js
===================================================================
--- trunk/lib/jxlib.uncompressed.js	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/lib/jxlib.uncompressed.js	2011-03-29 14:00:46 UTC (rev 2348)
@@ -39120,7 +39120,7 @@
  - tree_vert_line.png
 ...
  */
-// $Id: tree.js 1011 2011-01-24 18:18:42Z pagameba $
+// $Id: tree.js 990 2010-10-07 17:22:02Z pagameba $
 /**
  * Class: Jx.Tree
  *
@@ -39285,7 +39285,6 @@
         item.owner = this;
         this.list.add(item, position);
         this.setDirty(true);
-        this.update(true);
         return this;
     },
     /**
@@ -39306,7 +39305,6 @@
         this.list.remove(item);
         item.setSelection(null);
         this.setDirty(true);
-        this.update(true);
         return this;
     },
     /**
@@ -39327,7 +39325,6 @@
         withItem.setSelection(this.selection);
         item.setSelection(null);
         this.setDirty(true);
-        this.update(true);
         return this;
     },
 
@@ -39827,7 +39824,7 @@
 
 ...
  */
-// $Id: treefolder.js 1011 2011-01-24 18:18:42Z pagameba $
+// $Id: treefolder.js 960 2010-06-06 22:23:16Z jonlb at comcast.net $
 /**
  * Class: Jx.TreeFolder
  *
@@ -40002,7 +39999,7 @@
         /* avoid update if not attached to tree yet */
         if (!this.domObj.parentNode) return;
         
-        if (this.tree.dirty || (this.owner && this.owner.dirty)) {
+        if (this.tree.dirty) {
           if (!$defined(isLast)) {
               isLast = this.domObj.hasClass('jxTreeBranchLastOpen') ||
                        this.domObj.hasClass('jxTreeBranchLastClosed');
@@ -40101,14 +40098,6 @@
         this.tree.setSelection(selection);
         return this;
     },
-    
-    setDirty: function(state) {
-      this.parent(state);
-      if (this.tree) {
-        this.tree.setDirty(true);
-      }
-    },
-    
 });/*
 ---
 

Modified: trunk/widgets/MapMenu.js
===================================================================
--- trunk/widgets/MapMenu.js	2011-03-25 19:05:21 UTC (rev 2347)
+++ trunk/widgets/MapMenu.js	2011-03-29 14:00:46 UTC (rev 2348)
@@ -52,7 +52,7 @@
         }
         this.loadOverlaysOnly = (this.extension.LoadOverlaysOnly && this.extension.LoadOverlaysOnly[0] == 'true') ? true:false;
        
-        this.getMapLayer().registerForEvent(Fusion.Event.MAP_SESSION_CREATED, OpenLayers.Function.bind(this.loadMenu, this));
+        this.getMapLayer().registerForEvent(Fusion.Event.MAP_LOADED, OpenLayers.Function.bind(this.loadMenu, this));
         this.enable();
     },
     
@@ -88,6 +88,9 @@
     
     loadMenu: function() {
 
+        console.log("LOADMENU");
+        debugger;
+        
         //get the mapdefinitions as xml if there  is a folder specified
         //in the widget tag. All subfolders will be enumerated.
         //FIXME: this should be platform agnostic, Library:// isn't!