[Mapbender-commits] r7642 - in trunk/mapbender/http: geoportal
javascripts php plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Feb 24 05:03:49 EST 2011
Author: armin11
Date: 2011-02-24 02:03:49 -0800 (Thu, 24 Feb 2011)
New Revision: 7642
Modified:
trunk/mapbender/http/geoportal/authentication.php
trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings_server.php
trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php
trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php
trunk/mapbender/http/php/mod_UsageShow.php
trunk/mapbender/http/php/mod_callMetadata.php
trunk/mapbender/http/php/mod_customTree_server.php
trunk/mapbender/http/php/mod_deleteWfsConf_server.php
trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php
trunk/mapbender/http/php/tagCloud.php
trunk/mapbender/http/plugins/mb_extendedSearch_server.php
Log:
Exchange access to session from $_SESSION to Mapbender::session()->set/get methods.
Modified: trunk/mapbender/http/geoportal/authentication.php
===================================================================
--- trunk/mapbender/http/geoportal/authentication.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/geoportal/authentication.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -1,24 +1,21 @@
<?php
include_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/../../lib/class_Mapbender_session.php");
-#$_SESSION["mb_wmc"] = "";
+
$pw = $_REQUEST['password'];
$name = $_REQUEST['name'];
-$e = new mb_exception('SESSION[mb_user_name]: '.$_SESSION['mb_user_name']);
+$e = new mb_exception('SESSION[mb_user_name]: '.Mapbender::session()->get("mb_user_name"));
-
# Q4U - Michael Spitz - 16.08.2006 - Falls Cookies deaktiviert sind, muss die Session-ID an die Folgeseiten weitergereicht werden
$URLAdd="";
if($_COOKIE[session_name()]=="") {
$URLAdd="?".session_name()."=".$_REQUEST[session_name()];
}
-$isAuthenticated = authenticate ($name,$pw);
+$isAuthenticated = authenticate($name,$pw);
if($isAuthenticated != false) {
setSession();
- #$_SESSION = array();
Mapbender::session()->set("mb_user_password",$pw);
Mapbender::session()->set("mb_user_id",$isAuthenticated["mb_user_id"]);
Mapbender::session()->set("mb_user_name",$isAuthenticated["mb_user_name"]);
@@ -33,15 +30,8 @@
Mapbender::session()->set("mb_user_description",$isAuthenticated["mb_user_description"]);
Mapbender::session()->set("mb_user_city",$isAuthenticated["mb_user_city"]);
Mapbender::session()->set("mb_user_postal_code",$isAuthenticated["mb_user_postal_code"]);
-#if(!isset($_SESSION["mb_wmc"]))
-#{
-#$_SESSION["mb_wmc"] = NULL;
-#}
Mapbender::session()->set("epsg","EPSG:31466");
Mapbender::session()->set("HTTP_HOST",$_SERVER["HTTP_HOST"]);
- #Mapbender::session()->set("layer_preview",0);
-#$_SESSION["mb_myBBOX"] = "";
-
//INSERT LAST LOGIN DATE AND TIME
//NEW Filed required "ALTER TABLE mapbender.mb_user ADD COLUMN mb_user_last_login_date date;"
$sql = "UPDATE mb_user SET";
@@ -60,13 +50,12 @@
header ("Location: http://".$_SERVER['HTTP_HOST']."/portal/failed.html".$URLAdd);
}
-
function authenticate ($name,$pw){
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
$sql = "SELECT * FROM mb_user WHERE mb_user_name = $1 AND mb_user_password = $2";
- $v = array($name,md5($pw)); // wird in unserer Lösung immer md5 genutzt?
+ $v = array($name,md5($pw)); // is md5 used really?
$t = array('s','s');
$res = db_prep_query($sql,$v,$t);
@@ -80,14 +69,10 @@
}
}
function setSession(){
- session_start();
+ session_start(); //function is ok cause the session will be closed directly after starting it!
session_write_close();
}
function killSession(){
Mapbender::session()->kill();
}
-
-
-
-
?>
Modified: trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings_server.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings_server.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings_server.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -16,11 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include("../classes/class_mb_exception.php");
-session_start();
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
$e = new mb_exception("revert GUI session settings:");
-$e = new mb_exception("curr: " . $_SESSION["mb_user_gui"]);
-$e = new mb_exception("prev: " . $_SESSION["previous_gui"]);
-$_SESSION["mb_user_gui"] = $_SESSION["previous_gui"];
-session_write_close();
+$e = new mb_exception("curr: " . Mapbender::session()->get("mb_user_gui"));
+$e = new mb_exception("prev: " . Mapbender::session()->get("previous_gui"));
+Mapbender::session()->set("mb_user_gui", Mapbender::session()->get("previous_gui"));
?>
Modified: trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -17,14 +17,12 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-session_start();
-$gui_id = $_SESSION["mb_user_gui"];
+$gui_id = Mapbender::session()->get("mb_user_gui");
$e_target = $_REQUEST["e_target"];
$e_id_css = $_REQUEST["e_id_css"];
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
-
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
?>
@@ -365,4 +363,4 @@
<p id = "wfs_messages">
</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -17,15 +17,12 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+$gui_id = Mapbender::session()->get("mb_user_gui");
-session_start();
-$gui_id = $_SESSION["mb_user_gui"];
-
$target = $_REQUEST["target"];
//$e_id_css = $_REQUEST["e_id_css"];
-require_once("../../conf/mapbender.conf");
-
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
@@ -67,4 +64,4 @@
}
}
-mb_registerloadWmcSubFunctions("setWfsConfString()");
\ No newline at end of file
+mb_registerloadWmcSubFunctions("setWfsConfString()");
Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -17,15 +17,13 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-session_start();
-$gui_id = $_SESSION["mb_user_gui"];
+$gui_id = Mapbender::session()->get("mb_user_gui");
$target = $_REQUEST["e_target"];
$e_id_css = $_REQUEST["e_id_css"];
$isLoaded = $_REQUEST["isLoaded"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -16,16 +16,12 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-session_start();
-
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_gml2.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_wfs_conf.php");
require_once(dirname(__FILE__)."/../classes/class_connector.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
@@ -40,7 +36,7 @@
/**
* checks if a variable name is valid.
- * Currently a valid name would be sth. like $_SESSION["mb_user_id"]
+ * Currently a valid name would be sth. like Mapbender::session()->get("mb_user_id")
* TODO: this function is also in mod_wfs_result!! Maybe merge someday.
*/
function isValidVarName ($varname) {
Modified: trunk/mapbender/http/php/mod_UsageShow.php
===================================================================
--- trunk/mapbender/http/php/mod_UsageShow.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/mod_UsageShow.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -14,10 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-session_start();
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
@@ -64,13 +62,13 @@
//get owners of the wms:
$wmsOwners = $admin->getOwnerByWms($wms_id);
echo $wmsOwners;
-if (!(in_array($_SESSION['mb_user_id'], $wmsOwners))) {
- echo "User with ID: ".$_SESSION['mb_user_id']." - You have no rights to see the requested pages!";
+if (!(in_array(Mapbender::session()->get("mb_user_id"), $wmsOwners))) {
+ echo "User with ID: ".Mapbender::session()->get("mb_user_id")." - You have no rights to see the requested pages!";
//echo "<br> You are: ".$admin->getOwnerByWms($wms_id);
die;
}
else {
- echo "OwnerID: ".$_SESSION['mb_user_id']."<br>";
+ echo "OwnerID: ".Mapbender::session()->get("mb_user_id")."<br>";
}
@@ -192,4 +190,4 @@
echo $str;
?>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: trunk/mapbender/http/php/mod_callMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callMetadata.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/mod_callMetadata.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -17,7 +17,7 @@
require_once(dirname(__FILE__)."/../../conf/geoportal.conf");#???
require_once(dirname(__FILE__)."/../classes/class_metadata_new.php");
require_once(dirname(__FILE__)."/../classes/class_json.php");
-session_start();
+
//initialize request parameters:
$searchId = "dummysearch";
$searchText = "*";
@@ -321,18 +321,16 @@
$testMatch = NULL;
} else {
-if (!isset($_SESSION['mb_user_id']) ) {
- $userId = ANONYMOUS_USER;
+if (!isset(Mapbender::session()->get("mb_user_id")) ) {
+ $userId = PUBLIC_USER;
}
else
{
- $userId = $_SESSION['mb_user_id'];
+ $userId = Mapbender::session()->get("mb_user_id");
}
}
-
-
#$searchResources = array('wms','wfs','wmc','georss');
#$searchPages = array(1,1,1,1);
Modified: trunk/mapbender/http/php/mod_customTree_server.php
===================================================================
--- trunk/mapbender/http/php/mod_customTree_server.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/mod_customTree_server.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -8,6 +8,7 @@
session_name($queryObj->sessionName);
session_id($queryObj->sessionId);
session_start();
+ session_write_close();
}
require_once dirname(__FILE__) . "/../classes/class_user.php";
Modified: trunk/mapbender/http/php/mod_deleteWfsConf_server.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteWfsConf_server.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/mod_deleteWfsConf_server.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -1,8 +1,6 @@
<?php
-session_start();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_wfs.php");
include_once(dirname(__FILE__)."/../extensions/JSON.php");
@@ -47,7 +45,7 @@
$services['id'] = array();
$services['title'] = array();
$adm = new administration();
- $serviceList = $adm->getWfsByOwner($_SESSION['mb_user_id']);
+ $serviceList = $adm->getWfsByOwner(Mapbender::session()->get("mb_user_id"));
if(count($serviceList) == 0){
return false;
}
@@ -69,7 +67,7 @@
global $con;
// re-check permission
$adm = new administration();
- $serviceList = $adm->getWfsByOwner($_SESSION['mb_user_id']);
+ $serviceList = $adm->getWfsByOwner(Mapbender::session()->get("mb_user_id"));
if(in_array($wfsID, $serviceList)){
$wfsConf = array();
$wfsConf['id'] = array();
@@ -95,7 +93,7 @@
// $wfsConf = array();
// $wfsConf['id'] = array();
// $wfsConf['abstract'] = array();
-// $wfsConf['id'] = $adm->getWfsConfByPermission($_SESSION['mb_user_id']);
+// $wfsConf['id'] = $adm->getWfsConfByPermission(Mapbender::session()->get("mb_user_id"));
// $cnt = 0;
// foreach($wfsConf['id'] as $wfscid){
// $sql = "SELECT wfs_conf_abstract FROM wfs_conf WHERE wfs_conf_id = $1";
@@ -187,4 +185,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -17,10 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-session_start();
/*
* @security_patch irv done
Modified: trunk/mapbender/http/php/tagCloud.php
===================================================================
--- trunk/mapbender/http/php/tagCloud.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/php/tagCloud.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -1,8 +1,6 @@
<?php
-#session_start();
require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_json.php");
-#include(dirname(__FILE__)."/../php/mb_validateSession.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
$pathToSearchScript = '/portal/servicebereich/suche.html?cat=dienste&searchfilter=';
Modified: trunk/mapbender/http/plugins/mb_extendedSearch_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_extendedSearch_server.php 2011-02-24 08:20:49 UTC (rev 7641)
+++ trunk/mapbender/http/plugins/mb_extendedSearch_server.php 2011-02-24 10:03:49 UTC (rev 7642)
@@ -1,5 +1,4 @@
<?php
-session_start();
require_once(dirname(__FILE__)."/../../core/globalSettings.php");
include_once(dirname(__FILE__)."/../extensions/JSON.php");
@@ -10,11 +9,10 @@
//Define JSON object
$json = new Services_JSON();
$obj = $json->decode(stripslashes($_REQUEST['obj']));
-
//get language parameter out of mapbender session if it is set else set default language to de_DE
-if (isset($_SESSION['mb_lang']) and $_SESSION['mb_lang']!='') {
- $e = new mb_exception("mb_extentedSearch_server.php: language in session: ".$_SESSION['mb_lang']);
- $language = $_SESSION["mb_lang"];
+if (isset(Mapbender::session()->get("mb_lang")) and Mapbender::session()->get("mb_lang")!='') {
+ $e = new mb_exception("mb_extentedSearch_server.php: language in session: ".Mapbender::session()->get("mb_lang"));
+ $language = Mapbender::session()->get("mb_lang");
} else {
$language = "de_DE";//use locale for compatibility with later mapbender version
}
More information about the Mapbender_commits
mailing list