[Mapbender-commits] r4113 - in trunk/mapbender: . conf core
http/classes http/extensions http/frames http/html
http/javascripts http/php lib
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jun 24 06:15:23 EDT 2009
Author: uli
Date: 2009-06-24 06:15:22 -0400 (Wed, 24 Jun 2009)
New Revision: 4113
Added:
trunk/mapbender/lib/class_Mapbender.php
trunk/mapbender/lib/class_Singleton.php
Modified:
trunk/mapbender/
trunk/mapbender/conf/session.conf
trunk/mapbender/core/globalSettings.php
trunk/mapbender/core/i18n.php
trunk/mapbender/http/classes/class_element.php
trunk/mapbender/http/classes/class_gui.php
trunk/mapbender/http/classes/class_kml_ows.php
trunk/mapbender/http/classes/class_locale.php
trunk/mapbender/http/classes/class_log.php
trunk/mapbender/http/classes/class_wfsToDb.php
trunk/mapbender/http/classes/class_wfs_conf.php
trunk/mapbender/http/classes/class_wfs_configuration.php
trunk/mapbender/http/classes/class_wfs_deprecated.php
trunk/mapbender/http/classes/class_wmc.php
trunk/mapbender/http/classes/class_wms.php
trunk/mapbender/http/extensions/ext_weldMaps.php
trunk/mapbender/http/frames/index.php
trunk/mapbender/http/frames/login.php
trunk/mapbender/http/html/mod_treefolder2.php
trunk/mapbender/http/html/mod_treefolder2_multiple.php
trunk/mapbender/http/html/mod_treefolderPlain.php
trunk/mapbender/http/javascripts/initOpenLayersWms.php
trunk/mapbender/http/javascripts/map.php
trunk/mapbender/http/javascripts/mod_addWMSfromList.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
trunk/mapbender/http/javascripts/mod_add_vendorspecific.php
trunk/mapbender/http/php/mb_validateSession.php
trunk/mapbender/lib/class_mapbender_session.php
Log:
changed to singleton model
class singleton is extended with class Mapbender and Mapbender_session
Property changes on: trunk/mapbender
___________________________________________________________________
Added: svn:ignore
+ .project
Modified: trunk/mapbender/conf/session.conf
===================================================================
--- trunk/mapbender/conf/session.conf 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/conf/session.conf 2009-06-24 10:15:22 UTC (rev 4113)
@@ -3,16 +3,16 @@
require_once(dirname(__FILE__)."/../lib/class_mapbender_session.php");
new mb_notice("sessionConf.class.loading...");
-$mapbender_session->set("mb_user_password",$password);
-$mapbender_session->set("mb_user_id",$row["mb_user_id"]);
-$mapbender_session->set("mb_user_name",$name);
-$mapbender_session->set("mb_user_ip",$_SERVER['REMOTE_ADDR']);
-$mapbender_session->set("mb_myBBOX",$_REQUEST["mb_myBBOX"]);
-$mapbender_session->set("mb_myKml",$_REQUEST["kml_id"]);
-$mapbender_session->set("mb_myPOI",$_REQUEST["mb_myPOI"]);
-$mapbender_session->set("mb_myPOI2SCALE",$_REQUEST["mb_myPOI2SCALE"]);
-$mapbender_session->set("mb_lang",$_REQUEST["lang"]);
-$mapbender_session->set("command",strtoupper($_REQUEST["COMMAND"]));
+Mapbender::session()->set("mb_user_password",$password);
+Mapbender::session()->set("mb_user_id",$row["mb_user_id"]);
+Mapbender::session()->set("mb_user_name",$name);
+Mapbender::session()->set("mb_user_ip",$_SERVER['REMOTE_ADDR']);
+Mapbender::session()->set("mb_myBBOX",$_REQUEST["mb_myBBOX"]);
+Mapbender::session()->set("mb_myKml",$_REQUEST["kml_id"]);
+Mapbender::session()->set("mb_myPOI",$_REQUEST["mb_myPOI"]);
+Mapbender::session()->set("mb_myPOI2SCALE",$_REQUEST["mb_myPOI2SCALE"]);
+Mapbender::session()->set("mb_lang",$_REQUEST["lang"]);
+Mapbender::session()->set("command",strtoupper($_REQUEST["COMMAND"]));
$i = 1;
$arr_wms = array();
@@ -20,22 +20,22 @@
array_push($arr_wms, urldecode($_REQUEST["wms".$i]));
$i++;
}
-$mapbender_session->set("wms",$arr_wms);
+Mapbender::session()->set("wms",$arr_wms);
unset($i);
-$mapbender_session->set("mb_myWmc","");
-$mapbender_session->set("mb_myWmc_action","");
+Mapbender::session()->set("mb_myWmc","");
+Mapbender::session()->set("mb_myWmc_action","");
if ($_REQUEST["wmc_id"]) {
- $mapbender_session->set("mb_myWmc",$_REQUEST["wmc_id"]);
- $mapbender_session->set("mb_myWmc_action","load");
+ Mapbender::session()->set("mb_myWmc",$_REQUEST["wmc_id"]);
+ Mapbender::session()->set("mb_myWmc_action","load");
}
else if ($_REQUEST["merge_wmc_id"]) {
- $mapbender_session->set("mb_myWmc",$_REQUEST["merge_wmc_id"]);
- $mapbender_session->set("mb_myWmc_action","merge");
+ Mapbender::session()->set("mb_myWmc",$_REQUEST["merge_wmc_id"]);
+ Mapbender::session()->set("mb_myWmc_action","merge");
}
else if ($_REQUEST["append_wmc_id"]) {
- $mapbender_session->set("mb_myWmc",$_REQUEST["append_wmc_id"]);
- $mapbender_session->set("mb_myWmc_action","append");
+ Mapbender::session()->set("mb_myWmc",$_REQUEST["append_wmc_id"]);
+ Mapbender::session()->set("mb_myWmc_action","append");
}
?>
Modified: trunk/mapbender/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/core/globalSettings.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -19,8 +19,7 @@
//
// initiates the session-handling
//
-require_once(dirname(__FILE__)."/../lib/class_mapbender_session.php");
-$mapbender_session = new mapbender_session();
+require_once(dirname(__FILE__)."/../lib/class_Mapbender.php");
//
// define LC_MESSAGES if unknown
@@ -62,7 +61,7 @@
//
require_once(dirname(__FILE__) . "/../core/i18n.php");
require_once(dirname(__FILE__) . "/../http/classes/class_locale.php");
-$localeObj = new Mb_locale($mapbender_session->get("mb_lang"));
+$localeObj = new Mb_locale(Mapbender::session()->get("mb_lang"));
//
// establish database connection
Modified: trunk/mapbender/core/i18n.php
===================================================================
--- trunk/mapbender/core/i18n.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/core/i18n.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -18,7 +18,7 @@
function _mb ($someString) {
if (USE_I18N) {
-// $e = new mb_notice("Translating '" . $someString . "' to language " . $mapbender_session->get("mb_locale") . ": '" . _($someString) . "'");
+// $e = new mb_notice("Translating '" . $someString . "' to language " . Mapbender::session()->get("mb_locale") . ": '" . _($someString) . "'");
return _($someString);
}
return $someString;
Modified: trunk/mapbender/http/classes/class_element.php
===================================================================
--- trunk/mapbender/http/classes/class_element.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_element.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -58,7 +58,7 @@
"e_content, e_closetag, e_js_file, e_mb_mod, e_target, " .
"e_requires, e_url FROM gui_element WHERE e_id = $2 AND " .
"fkey_gui_id = $3 LIMIT 1";
- $v = array ($_SESSION["mb_lang"], $id, $applicationId);
+ $v = array (Mapbender::session()->get("mb_lang"), $id, $applicationId);
$t = array ("s", "s", "s");
$res = db_prep_query($sql, $v, $t);
$row = db_fetch_array($res);
Modified: trunk/mapbender/http/classes/class_gui.php
===================================================================
--- trunk/mapbender/http/classes/class_gui.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_gui.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -246,7 +246,7 @@
else {
// users of original gui are not copied, the current user is set as owner
array_push($sql, "INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) VALUES ($1, $2, 'owner')");
- array_push($v, array($newGuiName, $mapbender_session("mb_user_id")));
+ array_push($v, array($newGuiName, Mapbender::session()->get("mb_user_id")));
array_push($t, array('s', 'i'));
}
array_push($sql, "INSERT INTO gui_treegde (fkey_gui_id, fkey_layer_id, id, lft, rgt, my_layer_title, layer, wms_id) SELECT $1, fkey_layer_id, id, lft, rgt, my_layer_title, layer, wms_id FROM gui_treegde WHERE fkey_gui_id = $2;");
Modified: trunk/mapbender/http/classes/class_kml_ows.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_ows.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_kml_ows.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -430,7 +430,7 @@
* @return boolean true, if the KML could be stored in the database; else false.
*/
private function storeInDb () {
- if ($mapbender_session->get("mb_user_id") && $mapbender_session->get("mb_user_gui")) {
+ if (Mapbender::session()->get("mb_user_id") && Mapbender::session()->get("mb_user_gui")) {
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
@@ -438,7 +438,7 @@
$sql .= "(fkey_mb_user_id, fkey_gui_id, kml_doc, kml_name, kml_description, kml_timestamp) ";
$sql .= "VALUES ";
$sql .= "($1, $2, $3, $4, $5, $6)";
- $v = array ($mapbender_session->get("mb_user_id"), $mapbender_session->get("mb_user_gui"), $this->kml, "name", "description", time());
+ $v = array (Mapbender::session()->get("mb_user_id"), Mapbender::session()->get("mb_user_gui"), $this->kml, "name", "description", time());
$t = array ("i", "s", "s", "s", "s", "s");
$res = db_prep_query($sql, $v, $t);
if (!$res) {
@@ -466,7 +466,7 @@
# for now, do not restrict access
# $sql = "SELECT kml_doc FROM gui_kml WHERE kml_id = $1 AND fkey_mb_user_id = $2 AND fkey_gui_id = $3 LIMIT 1";
-# $v = array($kmlId, $mapbender_session->get("mb_user_id"), $mapbender_session->get("mb_user_gui"));
+# $v = array($kmlId, Mapbender::session()->get("mb_user_id"), Mapbender::session()->get("mb_user_gui"));
# $t = array("i", "i", "s");
$sql = "SELECT kml_doc FROM gui_kml WHERE kml_id = $1 LIMIT 1";
Modified: trunk/mapbender/http/classes/class_locale.php
===================================================================
--- trunk/mapbender/http/classes/class_locale.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_locale.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -104,8 +104,8 @@
if ($selectedLocale) {
$this->name = $selectedLocale;
- $mapbender_session->set("mb_lang",$languageId);
- $mapbender_session->set("mb_locale",$this->name);
+ Mapbender::session()->set("mb_lang",$languageId);
+ Mapbender::session()->set("mb_locale",$this->name);
$e = new Mb_notice("locale " . $this->name . " ok on " . $this->os);
// from http://de3.php.net/manual/de/function.gettext.php
Modified: trunk/mapbender/http/classes/class_log.php
===================================================================
--- trunk/mapbender/http/classes/class_log.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_log.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -50,13 +50,13 @@
for($i = 0; $i < count($this->url); $i++){
$content = strtotime("now")." ";
$content .= "[".date("d/M/Y:H:i:s O")."]";
- $content .= " " . $mapbender_session->get("mb_user_ip");
+ $content .= " " . Mapbender::session()->get("mb_user_ip");
$content .= ' "';
if($this->log_username == true){
- $content .= $mapbender_session->get("mb_user_name");
+ $content .= Mapbender::session()->get("mb_user_name");
}
$content .= '"';
- $content .= " " . $mapbender_session->get("mb_user_id");
+ $content .= " " . Mapbender::session()->get("mb_user_id");
$content .= " " . $module;
$content .= ' "' . $this->url[$i] . '"';
$content .= chr(13).chr(10);
@@ -80,7 +80,7 @@
$sql .= "gui, module, ip, username, userid, request";
$sql .= ") VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)";
- $v = array($time_client, strtotime("now"), "[".date("d/M/Y:H:i:s O")."]", SID, $mapbender_session->get("mb_user_gui"), $module, $mapbender_session->get("mb_user_ip"), $_SESSION["mb_user_name"], $mapbender_session->get("mb_user_id"), $this->url[$i]);
+ $v = array($time_client, strtotime("now"), "[".date("d/M/Y:H:i:s O")."]", SID, Mapbender::session()->get("mb_user_gui"), $module, Mapbender::session()->get("mb_user_ip"), $_SESSION["mb_user_name"], Mapbender::session()->get("mb_user_id"), $this->url[$i]);
$t = array("s", "s", "s", "s", "s", "s", "s", "s", "s", "s");
$res = db_prep_query($sql, $v, $t)or die(db_error());
Modified: trunk/mapbender/http/classes/class_wfsToDb.php
===================================================================
--- trunk/mapbender/http/classes/class_wfsToDb.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wfsToDb.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -65,7 +65,7 @@
$aWfs->transaction,
$aWfs->fees,
$aWfs->accessconstraints,
- $_SESSION["mb_user_id"],
+ Mapbender::session()->get("mb_user_id"),
strtotime("now")
);
Modified: trunk/mapbender/http/classes/class_wfs_conf.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_conf.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wfs_conf.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -64,8 +64,8 @@
}
// If a user ID is given, remove the ones the user has no access to
- if ($mapbender_session->get("mb_user_id")) {
- $user = new User($mapbender_session->get("mb_user_id"));
+ if (Mapbender::session()->get("mb_user_id")) {
+ $user = new User(Mapbender::session()->get("mb_user_id"));
$idArray = array_intersect($idArray, $user->getWfsConfByPermission());
}
Modified: trunk/mapbender/http/classes/class_wfs_configuration.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_configuration.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wfs_configuration.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -207,8 +207,8 @@
* @return Boolean
*/
private function accessAllowed () {
- if ($mapbender_session->get("mb_user_id")) {
- $user = new User($mapbender_session->get("mb_user_id"));
+ if (Mapbender::session()->get("mb_user_id")) {
+ $user = new User(Mapbender::session()->get("mb_user_id"));
$allowedWfsConfIds = $user->getWfsConfByWfsOwner();
@@ -218,7 +218,7 @@
return true;
}
}
- $e = new mb_exception("User '" . $mapbender_session->get("mb_user_id") . "' is not allowed to access Wfs conf " . $this->id . ".");
+ $e = new mb_exception("User '" . Mapbender::session()->get("mb_user_id") . "' is not allowed to access Wfs conf " . $this->id . ".");
return false;
}
Modified: trunk/mapbender/http/classes/class_wfs_deprecated.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_deprecated.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wfs_deprecated.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -273,7 +273,7 @@
$this->wfs_abstract, $this->wfs_getcapabilities, $this->wfs_getcapabilities_doc,
$this->wfs_upload_url, $this->wfs_describefeaturetype, $this->wfs_getfeature,
$this->wfs_transaction, $this->fees, $this->accessconstraints,
- $mapbender_session->get("mb_user_id"), strtotime("now"));
+ Mapbender::session()->get("mb_user_id"), strtotime("now"));
$t = array('s', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 'i', 'i');
@@ -304,7 +304,7 @@
$v = array($this->wfs_version, $this->wfs_name, $this->wfs_title, $this->wfs_abstract,
$this->wfs_getcapabilities, $this->wfs_getcapabilities_doc, $this->wfs_upload_url,
$this->wfs_describefeaturetype, $this->wfs_getfeature, $this->wfs_transaction,
- $this->fees, $this->accessconstraints, $mapbender_session->get("mb_user_id"),strtotime("now"),
+ $this->fees, $this->accessconstraints, Mapbender::session()->get("mb_user_id"),strtotime("now"),
$this->wfs_id);
$t = array('s', 's', 's', 's', 's', 's', 's', 's' ,'s' ,'s' ,'s' ,'s' ,'i' ,'i' ,'i');
Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wmc.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -120,7 +120,7 @@
var $wmc_descriptionurl_type;
public function __construct () {
- $this->userId = $_SESSION["mb_user_id"];
+ $this->userId = Mapbender::session()->get("mb_user_id");
$this->wmc_id = time();
}
@@ -252,7 +252,7 @@
*/
public static function delete ($wmcId, $userId) {
if (!isset($userId) || $userId === null) {
- $userId = $_SESSION["mb_user_id"];
+ $userId = Mapbender::session()->get("mb_user_id");
}
$sql = "DELETE FROM mb_user_wmc ";
@@ -273,7 +273,7 @@
*/
public static function getDocument ($id) {
$sql = "SELECT wmc FROM mb_user_wmc WHERE wmc_id = $1 AND fkey_user_id = $2";
- $v = array($id, $_SESSION["mb_user_id"]);
+ $v = array($id, Mapbender::session()->get("mb_user_id"));
$t = array('s', 'i');
$res = db_prep_query($sql,$v,$t);
$row = db_fetch_array($res);
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/classes/class_wms.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -1165,7 +1165,7 @@
$this->wms_upload_url,$this->fees,$this->accessconstraints,$this->contactperson,$this->contactposition,
$this->contactorganization,$this->address,$this->city,$this->stateorprovince,$this->postcode,$this->country,
$this->contactvoicetelephone,$this->contactfacsimiletelephone,$this->contactelectronicmailaddress,
- $_SESSION['mb_user_id'],strtotime("now"),
+ Mapbender::session()->get('mb_user_id'),strtotime("now"),
$this->wms_supportsld,$this->wms_userlayer,$this->wms_userstyle,$this->wms_remotewfs );
$t = array('s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s','i','i','s','s','s','s');
$res = db_prep_query($sql,$v,$t);
@@ -1501,7 +1501,7 @@
$v = array($this->wms_version,$this->wms_getcapabilities,
$this->wms_getmap,$this->wms_getfeatureinfo,$this->wms_getlegendurl,
- $admin->char_encode($this->wms_getcapabilities_doc),$this->wms_upload_url,$_SESSION["mb_user_id"],strtotime("now"),
+ $admin->char_encode($this->wms_getcapabilities_doc),$this->wms_upload_url,Mapbender::session()->get("mb_user_id"),strtotime("now"),
$this->wms_supportsld,$this->wms_userlayer,$this->wms_userstyle,$this->wms_remotewfs,$myWMS);
$t = array('s','s','s','s','s','s','s','i','i','s','s','s','s','i');
@@ -2178,7 +2178,7 @@
*/
public static function selectMyWmsByApplication ($appId) {
// check if user is permitted to access the application
- $currentUser = new User($_SESSION["mb_user_id"]);
+ $currentUser = new User(Mapbender::session()->get("mb_user_id"));
$appArray = $currentUser->getApplicationsByPermission(false);
if (!in_array($appId, $appArray)) {
$e = new mb_warning("class_wms.php: selectMyWmsByApplication(): User '" . $currentUser . "' is not allowed to acces application '" . $appId . "'.");
Modified: trunk/mapbender/http/extensions/ext_weldMaps.php
===================================================================
--- trunk/mapbender/http/extensions/ext_weldMaps.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/extensions/ext_weldMaps.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -19,8 +19,8 @@
/*
* extension weldMaps
-* expects an array $_SESSION["mb_print_urls"] containing the mapRequests
-* expects $_SESSION["mb_print_resolution"]
+* expects an array Mapbender::session()->get("mb_print_urls") containing the mapRequests
+* expects Mapbender::session()->get("mb_print_resolution")
* **/
require(dirname(__FILE__)."/../php/mb_validateSession.php");
@@ -115,6 +115,6 @@
}
}
session_start();
-$map_urls = explode("###",$_SESSION["mb_print_url"]);
-$output = new weldMaps($map_urls, $_SESSION["mb_print_resolution"]);
+$map_urls = explode("###",Mapbender::session()->get("mb_print_url"));
+$output = new weldMaps($map_urls, Mapbender::session()->get("mb_print_resolution"));
?>
\ No newline at end of file
Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/frames/index.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -23,14 +23,14 @@
require_once(dirname(__FILE__)."/../classes/class_gui.php");
-$mapbender_session->set("mb_user_gui",$gui_id);
+Mapbender::session()->set("mb_user_gui",$gui_id);
//
// check if user is allowed to access current GUI;
// if not, return to login screen
//
-if (!in_array($gui_id, $mapbender_session->get("mb_user_guis"))) {
- $e = new mb_exception("mb_validateSession.php: User: " . $mapbender_session->get("mb_user_id") . " not allowed to access GUI " . $gui_id);
+if (!in_array($gui_id, Mapbender::session()->get("mb_user_guis"))) {
+ $e = new mb_exception("mb_validateSession.php: User: " . Mapbender::session()->get("mb_user_id") . " not allowed to access GUI " . $gui_id);
session_write_close();
header("Location: ".LOGIN);
die();
Modified: trunk/mapbender/http/frames/login.php
===================================================================
--- trunk/mapbender/http/frames/login.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/frames/login.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -60,8 +60,7 @@
session_start();
}
function killSession(){
- global $mapbender_session;
- $mapbender_session->kill();
+ Mapbender::session()->kill();
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -144,22 +143,22 @@
setSession();
include(dirname(__FILE__)."/../../conf/session.conf");
}
- if($mapbender_session->get("mb_user_id")){
+ if(Mapbender::session()->get("mb_user_id")){
if($row["mb_user_login_count"] <= MAXLOGIN){
$sql_del_cnt = "UPDATE mb_user SET mb_user_login_count = 0 WHERE mb_user_id = $1";
- $v = array($mapbender_session->get('mb_user_id'));
+ $v = array(Mapbender::session()->get('mb_user_id'));
$t = array("i");
db_prep_query($sql_del_cnt, $v, $t);
require_once(dirname(__FILE__)."/../php/mb_getGUIs.php");
$arrayGUIs = mb_getGUIs($row["mb_user_id"]);
new mb_notice("login.setSession.mb_user_guis: ".serialize($arrayGUIs)." in session: " .session_id());
- $mapbender_session->set("mb_user_guis",$arrayGUIs);
- $mapbender_session->set("mb_login",$login);
+ Mapbender::session()->set("mb_user_guis",$arrayGUIs);
+ Mapbender::session()->set("mb_login",$login);
# a gui is explicitly ordered
- if((isset($_REQUEST["mb_user_myGui"]) || $mapbender_session->get("mb_user_myGui")) && in_array($_REQUEST["mb_user_myGui"], $arrayGUIs)){
+ if((isset($_REQUEST["mb_user_myGui"]) || Mapbender::session()->get("mb_user_myGui")) && in_array($_REQUEST["mb_user_myGui"], $arrayGUIs)){
unset($arrayGUIs);
if(isset($_REQUEST["mb_user_myGui"])){ $arrayGUIs[0] = $_REQUEST["mb_user_myGui"];}
- else{ $arrayGUIs[0] = $mapbender_session->set("mb_user_myGui");}
+ else{ $arrayGUIs[0] = Mapbender::session()->set("mb_user_myGui");}
}
#only one gui is provided
if(count($arrayGUIs) == 1){
Modified: trunk/mapbender/http/html/mod_treefolder2.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolder2.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/html/mod_treefolder2.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$gui_id = $_SESSION["mb_user_gui"];
+$gui_id = Mapbender::session()->get("mb_user_gui");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
@@ -41,7 +41,7 @@
<?php
echo "<script language='JavaScript'>";
$sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
- $v = array($_REQUEST['e_id_css'],$_SESSION["mb_user_gui"]);
+ $v = array($_REQUEST['e_id_css'],Mapbender::session()->get("mb_user_gui"));
$t = array('s','s');
$res = db_prep_query($sql,$v,$t);
$e_target = db_result($res,0,"e_target");
@@ -78,7 +78,7 @@
<?php
//load structure
$sql = "SELECT * FROM gui_treegde WHERE fkey_gui_id = $1 AND NOT lft = 1 ORDER BY lft;";
-$v = array($_SESSION["mb_user_gui"]);
+$v = array(Mapbender::session()->get("mb_user_gui"));
$t = array("s");
$res = db_prep_query($sql, $v, $t);
Modified: trunk/mapbender/http/html/mod_treefolder2_multiple.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolder2_multiple.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/html/mod_treefolder2_multiple.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -26,7 +26,7 @@
*************************************************************************** */
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$gui_id = $_SESSION["mb_user_gui"];
+$gui_id = Mapbender::session()->get("mb_user_gui");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
@@ -49,7 +49,7 @@
<?php
echo "<script language='JavaScript'>";
$sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
- $v = array($_REQUEST['e_id_css'],$_SESSION["mb_user_gui"]);
+ $v = array($_REQUEST['e_id_css'],Mapbender::session()->get("mb_user_gui"));
$t = array('s','s');
$res = db_prep_query($sql,$v,$t);
$e_target = db_result($res,0,"e_target");
@@ -98,7 +98,7 @@
//load structure
$sql = "SELECT * FROM gui_treegde WHERE fkey_gui_id = $1 AND NOT lft = 1 ORDER BY lft;";
-$v = array($_SESSION["mb_user_gui"]);
+$v = array(Mapbender::session()->get("mb_user_gui"));
$t = array("s");
$res = db_prep_query($sql, $v, $t);
Modified: trunk/mapbender/http/html/mod_treefolderPlain.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolderPlain.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/html/mod_treefolderPlain.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -55,7 +55,7 @@
<?php
//load structure
$sql = "SELECT * FROM gui_treegde WHERE fkey_gui_id = $1 AND NOT lft = 1 ORDER BY lft;";
-$v = array($_SESSION["mb_user_gui"]);
+$v = array(Mapbender::session()->get("mb_user_gui"));
$t = array("s");
$res = db_prep_query($sql, $v, $t);
Modified: trunk/mapbender/http/javascripts/initOpenLayersWms.php
===================================================================
--- trunk/mapbender/http/javascripts/initOpenLayersWms.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/initOpenLayersWms.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -21,14 +21,14 @@
require_once(dirname(__FILE__)."/../classes/class_wms.php");
$sql = "SELECT fkey_wms_id FROM gui_wms WHERE fkey_gui_id = $1 ORDER BY gui_wms_position";
-$v = array($_SESSION["mb_user_gui"]);
+$v = array(Mapbender::session()->get("mb_user_gui"));
$t = array('s');
$res = db_prep_query($sql,$v,$t);
$cnt=0;
while($row = db_fetch_array($res)){
$mywms = new wms();
- $mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
+ $mywms->createObjFromDB(Mapbender::session()->get("mb_user_gui"),$row["fkey_wms_id"]);
$mywms->createOlObjFromWMS($cnt==0);
$cnt++;
}?>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/map.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -31,22 +31,22 @@
$gui_changed=0;
$new_wmc=0;
-if (!$_REQUEST["layer_preview"] && isset($_SESSION["mb_user_gui"]) && $_SESSION["mb_user_gui"] != $_REQUEST["gui_id"]) {
+if (!$_REQUEST["layer_preview"] && Mapbender::session()->get("mb_user_gui") && Mapbender::session()->get("mb_user_gui") != $_REQUEST["gui_id"]) {
$gui_changed=1;
}
-if (!isset($_SESSION['mb_wmc']) || ($gui_changed==1) || ($_REQUEST['layer_preview'] && $_REQUEST['portal_services'])) {
+if (!Mapbender::session()->get('mb_wmc') || ($gui_changed==1) || ($_REQUEST['layer_preview'] && $_REQUEST['portal_services'])) {
$new_wmc=1;
}
if (isset($_REQUEST['layer_preview']) && $_REQUEST['layer_preview'] != 0) {
- $_SESSION['layer_preview'] = $_REQUEST['portal_services'];
+ Mapbender::session()->set('layer_preview',$_REQUEST['portal_services');
}
else {
- $_SESSION['layer_preview'] = 0;
+ Mapbender::session()->set('layer_preview',0);
}
*/
-$_SESSION["mb_user_gui"] = $gui_id;
+Mapbender::session()->set("mb_user_gui", $gui_id);
ob_start();
header('Content-type: application/x-javascript');
@@ -55,11 +55,11 @@
//
echo "var mb_nr = '".session_id()."';";
echo "var mb_session_name = '".session_name()."';";
-echo "var mb_myLogin = '".$_SESSION["mb_login"]."';";
-echo "var mb_styleID = '".md5($_SESSION["mb_user_name"])."';";
-echo "var mb_myBBOX = '".$_SESSION["mb_myBBOX"]."';";
-echo "Mapbender.locale = '" . $_SESSION["mb_locale"] . "';";
-echo "Mapbender.languageId = '" . $_SESSION["mb_lang"] . "';";
+echo "var mb_myLogin = '".Mapbender::session()->get("mb_login")."';";
+echo "var mb_styleID = '".md5(Mapbender::session()->get("mb_user_name"))."';";
+echo "var mb_myBBOX = '".Mapbender::session()->get("mb_myBBOX")."';";
+echo "Mapbender.locale = '" . Mapbender::session()->get("mb_locale") . "';";
+echo "Mapbender.languageId = '" . Mapbender::session()->get("mb_lang") . "';";
echo "Mapbender.versionNumber = '" . MB_VERSION_NUMBER . "';";
echo "Mapbender.versionAppendix = '" . MB_VERSION_APPENDIX . "';";
echo "Mapbender.releaseDate = new Date(".date("Y",MB_RELEASE_DATE).",".date("n",MB_RELEASE_DATE).",".date("j",MB_RELEASE_DATE).");";
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromList.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromList.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromList.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -74,9 +74,9 @@
$exists = false;
-$logged_user_name=$_SESSION["mb_user_name"];
-$logged_user_id=$_SESSION["mb_user_id"];
-$logged_gui_id=$_SESSION["mb_user_gui"];
+$logged_user_name=Mapbender::session()->get("mb_user_name");
+$logged_user_id=Mapbender::session()->get("mb_user_id");
+$logged_gui_id=Mapbender::session()->get("mb_user_gui");
/*get infos from gui_element ********************************************************************************************/
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -195,9 +195,9 @@
$cnt_group_name = 0;
$cnt_gui_table = 0;
$exists = false;
-$logged_user_name=$_SESSION["mb_user_name"];
-$logged_user_id=$_SESSION["mb_user_id"];
-$logged_gui_id=$_SESSION["mb_user_gui"];
+$logged_user_name=Mapbender::session()->get("mb_user_name");
+$logged_user_id=Mapbender::session()->get("mb_user_id");
+$logged_gui_id=Mapbender::session()->get("mb_user_gui");
###### SQL #####################################################################################
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -88,9 +88,9 @@
$cnt_group_name = 0;
$cnt_gui_table = 0;
$exists = false;
-$logged_user_name=$_SESSION["mb_user_name"];
-$logged_user_id=$_SESSION["mb_user_id"];
-$logged_gui_id=$_SESSION["mb_user_gui"];
+$logged_user_name=Mapbender::session()->get("mb_user_name");
+$logged_user_id=Mapbender::session()->get("mb_user_id");
+$logged_gui_id=Mapbender::session()->get("mb_user_gui");
/*get allocated gui ********************************************************************************************/
Modified: trunk/mapbender/http/javascripts/mod_add_vendorspecific.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_add_vendorspecific.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/javascripts/mod_add_vendorspecific.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -22,7 +22,7 @@
?>
mb_registerVendorSpecific("mod_vs_init()");
function mod_vs_init(){
- var re = "vendorspecific=<?php echo $_SESSION['mb_user_name'] ?>";
+ var re = "vendorspecific=<?php echo Mapbender::session()->get('mb_user_name') ?>";
return re;
}
Modified: trunk/mapbender/http/php/mb_validateSession.php
===================================================================
--- trunk/mapbender/http/php/mb_validateSession.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/http/php/mb_validateSession.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -24,11 +24,11 @@
//
// check if user data is valid; if not, return to login screen
//
-if (!$mapbender_session->get("mb_user_id") ||
- !$mapbender_session->get("mb_user_ip") ||
- $mapbender_session->get('mb_user_ip') != $_SERVER['REMOTE_ADDR']) {
+if (!Mapbender::session()->get("mb_user_id") ||
+ !Mapbender::session()->get("mb_user_ip") ||
+ Mapbender::session()->get('mb_user_ip') != $_SERVER['REMOTE_ADDR']) {
- $e = new mb_exception("mb_validateSession.php: Invalid user: " . $mapbender_session->get("mb_user_id"));
+ $e = new mb_exception("mb_validateSession.php: Invalid user: " . Mapbender::session()->get("mb_user_id"));
header("Location: " . LOGIN);
die();
}
Added: trunk/mapbender/lib/class_Mapbender.php
===================================================================
--- trunk/mapbender/lib/class_Mapbender.php (rev 0)
+++ trunk/mapbender/lib/class_Mapbender.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -0,0 +1,25 @@
+<?php
+/*
+ * Created on 24.06.2009
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+require_once(dirname(__FILE__)."/class_mapbender_session.php");
+require_once(dirname(__FILE__)."/class_Singleton.php");
+
+ class Mapbender extends Singleton{
+
+ protected function __construct() {
+ }
+
+ public static function session(){
+ return Mapbender_session::singleton();
+ }
+
+ public static function singleton()
+ {
+ return parent::singleton(__CLASS__);
+ }
+ }
+?>
Added: trunk/mapbender/lib/class_Singleton.php
===================================================================
--- trunk/mapbender/lib/class_Singleton.php (rev 0)
+++ trunk/mapbender/lib/class_Singleton.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -0,0 +1,23 @@
+<?php
+class Singleton
+{
+ // Hold an instance of the class
+ private static $instance;
+
+ // A private constructor; prevents direct creation of object
+ private function __construct()
+ {
+ echo 'I am constructed';
+ }
+
+ // The singleton method
+ public static function singleton($classname)
+ {
+ if (!isset(self::$instance)) {
+ self::$instance = new $classname;
+ }
+
+ return self::$instance;
+ }
+}
+?>
\ No newline at end of file
Modified: trunk/mapbender/lib/class_mapbender_session.php
===================================================================
--- trunk/mapbender/lib/class_mapbender_session.php 2009-06-24 09:17:15 UTC (rev 4112)
+++ trunk/mapbender/lib/class_mapbender_session.php 2009-06-24 10:15:22 UTC (rev 4113)
@@ -5,18 +5,23 @@
*/
require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
-
- class mapbender_session{
+ require_once(dirname(__FILE__)."/class_Singleton.php");
+ class Mapbender_session extends Singleton{
private $id ;
/**
* @constructor
*/
- public function __construct() {
+ protected function __construct() {
$id = false;
new mb_notice("session.mapbender_session.instantiated ... ");
}
+
+ public static function singleton()
+ {
+ return parent::singleton(__CLASS__);
+ }
/**
* sets the value of the session-variable
@@ -64,8 +69,7 @@
}
/**
- * sets a new session-id
- * @param String id the new id of the session
+ * starts the new session
*/
private function start(){
if(session_id() == ''){
More information about the Mapbender_commits
mailing list