[Mapbender-commits] r9944 - in trunk/mapbender: core http/classes http/classes/phpmailer-6.0.2/src http/geoportal http/include http/javascripts http/php http/plugins lib resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Aug 10 05:30:19 PDT 2018
Author: armin11
Date: 2018-08-10 05:30:18 -0700 (Fri, 10 Aug 2018)
New Revision: 9944
Modified:
trunk/mapbender/core/system.php
trunk/mapbender/http/classes/class.pdf.php
trunk/mapbender/http/classes/class_wms.php
trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php
trunk/mapbender/http/geoportal/mod_allow_publishing_metadata.php
trunk/mapbender/http/include/dyn_css.php
trunk/mapbender/http/include/dyn_php.php
trunk/mapbender/http/javascripts/mod_coordsLookup.php
trunk/mapbender/http/php/mb_validateSession.php
trunk/mapbender/http/php/mod_changePassword.php
trunk/mapbender/http/php/mod_createUser.php
trunk/mapbender/http/php/mod_editElementVars.php
trunk/mapbender/http/php/mod_editElements.php
trunk/mapbender/http/php/mod_editGroup.php
trunk/mapbender/http/php/mod_editSelf.php
trunk/mapbender/http/php/mod_editUser.php
trunk/mapbender/http/php/mod_filteredGroup_Gui.php
trunk/mapbender/http/php/mod_filteredGroup_User.php
trunk/mapbender/http/php/mod_filteredGui_User.php
trunk/mapbender/http/php/mod_filteredGui_group.php
trunk/mapbender/http/php/mod_filteredUser_Group.php
trunk/mapbender/http/php/mod_filteredUser_Gui.php
trunk/mapbender/http/php/mod_filteredWms_topic.php
trunk/mapbender/http/php/mod_forgottenPassword.php
trunk/mapbender/http/php/mod_group_filteredGui.php
trunk/mapbender/http/php/mod_group_filteredUser.php
trunk/mapbender/http/php/mod_group_gui.php
trunk/mapbender/http/php/mod_group_user.php
trunk/mapbender/http/php/mod_group_user_role.php
trunk/mapbender/http/php/mod_gui_filteredGroup.php
trunk/mapbender/http/php/mod_gui_filteredUser.php
trunk/mapbender/http/php/mod_gui_group.php
trunk/mapbender/http/php/mod_gui_user.php
trunk/mapbender/http/php/mod_ownedGui_User.php
trunk/mapbender/http/php/mod_ownedGui_group.php
trunk/mapbender/http/php/mod_user_filteredGroup.php
trunk/mapbender/http/php/mod_user_filteredGui.php
trunk/mapbender/http/php/mod_user_group.php
trunk/mapbender/http/php/mod_user_gui.php
trunk/mapbender/http/plugins/mod_WMSpreferencesDiv.php
trunk/mapbender/lib/class_Mapbender.php
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.8_pgsql_UTF-8.sql
Log:
Some more fixes for compatibility with php7
Modified: trunk/mapbender/core/system.php
===================================================================
--- trunk/mapbender/core/system.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/core/system.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,9 +25,9 @@
#
# mapbender version
#
-define("MB_VERSION_NUMBER", "2.7.8trunk");
+define("MB_VERSION_NUMBER", "2.8trunk");
define("MB_VERSION_APPENDIX", "");
-define("MB_RELEASE_DATE", mktime(0,0,0,01,31,2014));//h, min,sec,month,day,year
+define("MB_RELEASE_DATE", mktime(0,0,0,8,15,2018));//h, min,sec,month,day,year
#
# constants from map.js
@@ -119,7 +119,7 @@
--------------------------------------------------------
$postvars = explode(",", "'.implode(",",array_keys($_POST)).'");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
--------------------------------------------------------';
fwrite($h,"\n".date("Y.m.d H:i")." FILE : ".$file." | LINE : ".$line." | POST : ".implode(",",array_keys($_POST))." | GET : ".implode(",",array_keys($_GET))." | FILE : ".implode(",",array_keys($_FILE))." |\n".$post_out);
Modified: trunk/mapbender/http/classes/class.pdf.php
===================================================================
--- trunk/mapbender/http/classes/class.pdf.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/classes/class.pdf.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -2084,7 +2084,7 @@
switch($rk){
case 'x':
case 'y':
- $$rk=$rv;
+ ${$rk}=$rv;
break;
}
}
@@ -2155,7 +2155,7 @@
switch($rk){
case 'x':
case 'y':
- $$rk=$rv;
+ ${$rk}=$rv;
break;
}
}
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/classes/class_wms.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -2452,7 +2452,7 @@
if(in_array(strtoupper($srs),$confSrsArray)) {
array_push($supportedSrsArray, strtoupper($srs));
-// //$n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".$$layerParentArray[$j]['layer_id']);
+// //$n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".${$layerParentArray}[$j]['layer_id']);
//for compatibility reasons (PHP 5 -> 7) changed to
$n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".${$layerParentArray[$j]['layer_id']});
}
Modified: trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -4246,8 +4246,8 @@
$date_header = $header;
$current = 'date_header';
} else {
- if (!empty($$current) and strpos($header, ' =?') === 0) {
- $$current .= $header;
+ if (!empty(${$current}) and strpos($header, ' =?') === 0) {
+ ${$current} .= $header;
} else {
$current = '';
}
Modified: trunk/mapbender/http/geoportal/mod_allow_publishing_metadata.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_allow_publishing_metadata.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/geoportal/mod_allow_publishing_metadata.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -66,7 +66,7 @@
$postvars = explode(",", "filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/include/dyn_css.php
===================================================================
--- trunk/mapbender/http/include/dyn_css.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/include/dyn_css.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -87,7 +87,7 @@
echo "\n";
while($row = db_fetch_array($res))
{
- $$row["var_name"] = stripslashes($row["var_value"]);
+ ${$row["var_name"]} = stripslashes($row["var_value"]);
echo "\n";
}
@@ -134,4 +134,4 @@
echo "// -->\n";
echo "</script>\n";
}
- ?>
\ No newline at end of file
+ ?>
Modified: trunk/mapbender/http/include/dyn_php.php
===================================================================
--- trunk/mapbender/http/include/dyn_php.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/include/dyn_php.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -24,17 +24,18 @@
$t = array('s', 's');
$res = db_prep_query($sql,$v,$t);
- # there used to be a echo "\n"; here, but that doesn't make any common sense (problem with return value of printFactory.php)
+ // there used to be a echo "\n"; here, but that doesn't make any common sense (problem with return value of printFactory.php)
//echo "\n";
while($row = db_fetch_array($res))
{
+ //$e = new mb_exception("found element var: ".$row["var_name"]." - ".$row["var_value"]);
if (preg_match("/\w+\[\d+\]/", $row["var_name"])) {
$varname = mb_substr($row["var_name"], 0, mb_strpos($row["var_name"], "["));
- array_push($$varname, stripslashes($row["var_value"]));
+ array_push(${$varname}, stripslashes($row["var_value"])); //php7!!!
}
else {
- $$row["var_name"] = stripslashes($row["var_value"]);
+ ${$row["var_name"]} = stripslashes($row["var_value"]);
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/javascripts/mod_coordsLookup.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_coordsLookup.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/javascripts/mod_coordsLookup.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -56,7 +56,7 @@
<?php
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include '../include/dyn_php.php';
-//generate array
+
$projections = explode(',',$projections);
$projectionsValue = array();
$projectionsName = array();
Modified: trunk/mapbender/http/php/mb_validateSession.php
===================================================================
--- trunk/mapbender/http/php/mb_validateSession.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mb_validateSession.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -42,21 +42,26 @@
//
// set the global var gui_id
//
+
if (!isset($gui_id)) {
$e = new mb_notice("gui id not set");
if (isset($_REQUEST["guiID"])) {
//TODO validate guiID & mb_user_myGui
- $gui_id = $_REQUEST["guiID"];
+ //$gui_id = $_REQUEST["guiID"];
+ $gui_id = Mapbender::parseGuiRequestParameter($_REQUEST["guiID"]);
$e = new mb_notice("gui id set to guiID: " . $gui_id);
}
//set this to hold the get parameters for login.php in sync
elseif (isset($_REQUEST["mb_user_myGui"])) {
//TODO validate guiID & mb_user_myGui
- $gui_id = $_REQUEST["mb_user_myGui"];
+ //$gui_id = $_REQUEST["mb_user_myGui"];
+ $gui_id = Mapbender::parseGuiRequestParameter($_REQUEST["mb_user_myGui"]);
$e = new mb_notice("gui id set to gui_id: " . $gui_id);
}
elseif (isset($_REQUEST["gui_id"])) {
- $gui_id = $_REQUEST["gui_id"];
+ //TODO validate guiID & mb_user_myGui
+ //$gui_id = $_REQUEST["gui_id"];
+ $gui_id = Mapbender::parseGuiRequestParameter($_REQUEST["gui_id"]);
$e = new mb_notice("gui id set to gui_id: " . $gui_id);
}
elseif (Mapbender::session()->get("mb_user_gui") !== false) {
Modified: trunk/mapbender/http/php/mod_changePassword.php
===================================================================
--- trunk/mapbender/http/php/mod_changePassword.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_changePassword.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -28,7 +28,7 @@
$postvars = explode(",", "oldpassword,newpassword,confirmpassword,profile_id,upd");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_createUser.php
===================================================================
--- trunk/mapbender/http/php/mod_createUser.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_createUser.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -35,7 +35,7 @@
$postvars = explode(",", "name,password,v_password,description,email,phone,department,action");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
@@ -296,4 +296,4 @@
<input type='hidden' name='action' value=''>
</form>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_editElementVars.php
===================================================================
--- trunk/mapbender/http/php/mod_editElementVars.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_editElementVars.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
security_patch_log(__FILE__,__LINE__);
$postvars=array("myElement","var_name","var_value","context","var_type","fkey_gui_id","fkey_e_id","myDelete","mySave");
foreach($postvars as $value){
- $$value=$_POST[$value];
+ ${$value}=$_POST[$value];
}
if ($_SERVER['REQUEST_METHOD'] === 'GET'){
if (isset($_GET["fkey_gui_id"])){
Modified: trunk/mapbender/http/php/mod_editElements.php
===================================================================
--- trunk/mapbender/http/php/mod_editElements.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_editElements.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -29,7 +29,7 @@
"e_content","e_closetag","e_js_file","e_mb_mod","e_target","e_requires","e_url",
"originGuiOfSelectedElement","myDelete","myDuplicate","mySave","myShow","all");
foreach($postvars as $value){
- $$value=$_POST[$value];
+ ${$value}=$_POST[$value];
}
if ($_SERVER['REQUEST_METHOD'] === 'GET'){
if (isset($_GET["guiList1"])){
Modified: trunk/mapbender/http/php/mod_editGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_editGroup.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_editGroup.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -28,7 +28,7 @@
$postvars = explode(",", "selected_group,name,title,owner_name,owner_id,description,address,postcode,city,stateorprovince,country,voicetelephone,facsimiletelephone,email,logo_path,homepage,adminCode,action");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
Modified: trunk/mapbender/http/php/mod_editSelf.php
===================================================================
--- trunk/mapbender/http/php/mod_editSelf.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_editSelf.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_user,name,firstname,lastname,academic_title,password,password_plain,v_password,description,email,phone,facsimile,street,housenumber,delivery_point,postal_code,city,organization,department,position,country,owner_name,owner_id,login_count,resolution,action");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
require_once(dirname(__FILE__)."/../classes/class_user.php");
@@ -34,4 +34,4 @@
$selected_user = Mapbender::session()->get("mb_user_id");
include "../../lib/editUser.php";
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/php/mod_editUser.php
===================================================================
--- trunk/mapbender/http/php/mod_editUser.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_editUser.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -29,7 +29,7 @@
$postvars = explode(",", "selected_user,name,firstname,lastname,academic_title,password,password_plain,v_password,description,email,phone,facsimile,street,housenumber,delivery_point,postal_code,city,organization,department,position,country,owner_name,owner_id,login_count,resolution,action");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
@@ -37,4 +37,4 @@
require_once(dirname(__FILE__)."/../classes/class_user.php");
include "../../lib/editUser.php";
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/php/mod_filteredGroup_Gui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_Gui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredGroup_Gui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_group,insert,remove,remove_gui,selected_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -216,4 +216,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_filteredGroup_User.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_User.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredGroup_User.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_group,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: trunk/mapbender/http/php/mod_filteredGui_User.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_User.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredGui_User.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_gui,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_filteredGui_group.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_group.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredGui_group.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_gui,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_filteredUser_Group.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_Group.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredUser_Group.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -28,7 +28,7 @@
//import_request_variables("PG");
$postvars = explode(",", "filter1,selected_user,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_filteredUser_Gui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_Gui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredUser_Gui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
//import_request_variables("PG");
$postvars = explode(",", "filter1,selected_user,selected_gui,insert,remove,remove_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -274,4 +274,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_filteredWms_topic.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredWms_topic.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_filteredWms_topic.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_wms,selected_topic,insert,remove,remove_topic");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
require_once(dirname(__FILE__) . "/../classes/class_administration.php");
@@ -191,4 +191,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_forgottenPassword.php
===================================================================
--- trunk/mapbender/http/php/mod_forgottenPassword.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_forgottenPassword.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
$postvars = explode(",", "username,email,upd,sendnew");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
require_once(dirname(__FILE__)."/../classes/class_administration.php");
Modified: trunk/mapbender/http/php/mod_group_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_group_filteredGui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_group_filteredGui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
$postvars = explode(",", "selected_group,selected_gui,insert,remove,remove_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -229,4 +229,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_group_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_group_filteredUser.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_group_filteredUser.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
$postvars = explode(",", "selected_group,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_group_gui.php
===================================================================
--- trunk/mapbender/http/php/mod_group_gui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_group_gui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
$postvars = explode(",", "selected_group,selected_gui,insert,remove,remove_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -194,4 +194,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_group_user.php
===================================================================
--- trunk/mapbender/http/php/mod_group_user.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_group_user.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -27,7 +27,7 @@
$postvars = explode(",", "selected_group,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_group_user_role.php
===================================================================
--- trunk/mapbender/http/php/mod_group_user_role.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_group_user_role.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -29,7 +29,7 @@
$postvars = explode(",", "selected_group,filter2,insert,remove,filter3,remove_user,selected_user,select_role,alterrole");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_gui_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_filteredGroup.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_gui_filteredGroup.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
$postvars = explode(",", "selected_gui,selected_group,insert,remove,remove_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -202,4 +202,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_gui_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_filteredUser.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_gui_filteredUser.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
$postvars = explode(",", "selected_gui,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -282,4 +282,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_gui_group.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_group.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_gui_group.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
$postvars = explode(",", "selected_gui,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -188,4 +188,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_gui_user.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_user.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_gui_user.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
$postvars = explode(",", "selected_gui,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -272,4 +272,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_ownedGui_User.php
===================================================================
--- trunk/mapbender/http/php/mod_ownedGui_User.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_ownedGui_User.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_gui,filter2,insert,remove,filter3,remove_user,selected_user");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_ownedGui_group.php
===================================================================
--- trunk/mapbender/http/php/mod_ownedGui_group.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_ownedGui_group.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -26,7 +26,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "selected_gui,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
Modified: trunk/mapbender/http/php/mod_user_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_user_filteredGroup.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_user_filteredGroup.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "filter1,selected_user,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
Modified: trunk/mapbender/http/php/mod_user_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_user_filteredGui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_user_filteredGui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "filter1,selected_user,selected_gui,insert,remove,remove_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
require_once(dirname(__FILE__)."/../classes/class_wms.php");
@@ -313,4 +313,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_user_group.php
===================================================================
--- trunk/mapbender/http/php/mod_user_group.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_user_group.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -25,7 +25,7 @@
//security_patch_log(__FILE__,__LINE__);
$postvars = explode(",", "filter1,selected_user,insert,remove,remove_group,selected_group");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
Modified: trunk/mapbender/http/php/mod_user_gui.php
===================================================================
--- trunk/mapbender/http/php/mod_user_gui.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/php/mod_user_gui.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -28,7 +28,7 @@
$postvars = explode(",", "filter1,selected_user,insert,remove,remove_gui,selected_gui");
foreach ($postvars as $value) {
- $$value = $_POST[$value];
+ ${$value} = $_POST[$value];
}
?>
@@ -265,4 +265,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/plugins/mod_WMSpreferencesDiv.php
===================================================================
--- trunk/mapbender/http/plugins/mod_WMSpreferencesDiv.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/http/plugins/mod_WMSpreferencesDiv.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -54,7 +54,7 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
$e_id = 'WMS_preferencesDiv';
-$gui_id = array(Mapbender::session()->get("mb_user_gui"));
+//$gui_id = array(Mapbender::session()->get("mb_user_gui"));
//include all element vars from the given element
include '../include/dyn_js.php';
Modified: trunk/mapbender/lib/class_Mapbender.php
===================================================================
--- trunk/mapbender/lib/class_Mapbender.php 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/lib/class_Mapbender.php 2018-08-10 12:30:18 UTC (rev 9944)
@@ -29,5 +29,24 @@
}
return false;
}
+
+ public static function parseGuiRequestParameter($parameter) {
+ if (is_array($parameter)) {
+ if (count($parameter) == 1) {
+ return $parameter[0];
+ } else {
+ $e = new mb_exception("php/mb_validateSession.php: REQUEST parameter is an array with length > 1!");
+ return false;
+ }
+ } else {
+ if (is_string($parameter)) {
+ return $parameter;
+ } else {
+ $e = new mb_exception("php/mb_validateSession.php: REQUEST parameter is neither an array with length 1 nor a string!");
+ return false;
+ }
+ }
+ }
+
}
?>
Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.8_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.8_pgsql_UTF-8.sql 2018-08-09 15:57:01 UTC (rev 9943)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.8_pgsql_UTF-8.sql 2018-08-10 12:30:18 UTC (rev 9944)
@@ -54,7 +54,7 @@
--recreate them via psql
--psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_
-psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_Geoportal-RLP.sql
+psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_Geoportal-RLP.sql -- problem: too long entry ...
psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_Owsproxy_csv.sql
psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_admin_wms_metadata.sql
psql -d mapbender -f /home/armin/GDI-RP/devel/Geoportal/mapbender_trunk/resources/db/gui_admin_wfs_metadata.sql
More information about the Mapbender_commits
mailing list