svn commit: r134 - trunk/mapbender/http/php
arnulf at osgeo.org
arnulf at osgeo.org
Sun Apr 23 15:59:59 EDT 2006
Author: arnulf
Date: 2006-04-23 19:59:59+0000
New Revision: 134
Modified:
trunk/mapbender/http/php/mod_changePassword.php (contents, props changed)
trunk/mapbender/http/php/mod_createJSObjFromDB.php (contents, props changed)
Log:
cleaned, added SVN headers
Modified: trunk/mapbender/http/php/mod_changePassword.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_changePassword.php?view=diff&rev=134&p1=trunk/mapbender/http/php/mod_changePassword.php&p2=trunk/mapbender/http/php/mod_changePassword.php&r1=133&r2=134
==============================================================================
--- trunk/mapbender/http/php/mod_changePassword.php (original)
+++ trunk/mapbender/http/php/mod_changePassword.php 2006-04-23 19:59:59+0000
@@ -1,6 +1,7 @@
<?php
-# $Id: mod_changePassword.php,v 1.12 2006/03/09 10:38:10 uli_rothstein Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mod_changePassword.php,v 1.12 2006/03/09 10:38:10 uli_rothstein Exp $
+# $Id$
+# http://www.mapbender.org/index.php/ChangePassword
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -16,6 +17,7 @@
# 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("../php/mb_validateSession.php");
require_once("../../conf/mapbender.conf");
import_request_variables("PG");
@@ -27,10 +29,9 @@
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
-<title>Password</title>
+<title>Change Password</title>
<style type="text/css">
<!--
-
body{
font-family: Arial, Helvetica, sans-serif;
font-size: 10px;
@@ -40,65 +41,64 @@
font-size: 9px;
}
.myButton{
- font-family: Arial, Helvetica, sans-serif;
- width : 150px;
+ font-family: Arial, Helvetica, sans-serif;
+ width : 150px;
}
-->
</style>
<script language="JavaScript">
function validate(wert){
- if(wert == 'newpassword'){
- if(document.form1.newpassword.value == ""){
- //alert("Bitte geben Sie ein neues Passwort an.");
- alert("Please enter a new password.");
- document.form1.newpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
- if(document.form1.newpassword.value.length < 6 || document.form1.newpassword.value.search(/\d/) == -1 || document.form1.newpassword.value.search(/\D/) == -1 ){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
- alert("Please note the rules for choosing a password below!");
- document.form1.newpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
- var letter = document.form1.newpassword.value.match(/\D/);
- if(eval("document.form1.newpassword.value.match(/" + letter + "/gi).length") > 4){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
- alert("Please note the rules for choosing a password below!");
- document.form1.newpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
- var integer = document.form1.newpassword.value.match(/\d/);
- if(eval("document.form1.newpassword.value.match(/" + integer + "/gi).length") > 4){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
- alert("Please note the rules for choosing a password below!");
- document.form1.newpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
- if(document.form1.confirmpassword.value == ""){
- //alert("Bitte bestätigen Sie das Passwort.");
- alert("Please confirm the password.");
- document.form1.confirmpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
- if(document.form1.newpassword.value!=document.form1.confirmpassword.value) {
- //alert("Die Passwörter stimmen nicht überein.");
- alert("The password entries do not match.");
- document.form1.confirmpassword.value='';
- document.form1.confirmpassword.focus();
- document.form1.upd.value='false';
- return false;
- }
-
- else{
- document.form1.upd.value='true';
- document.form1.submit();
- }
- }
+ if(wert == 'newpassword'){
+ if(document.form1.newpassword.value == ""){
+ //alert("Bitte geben Sie ein neues Passwort an.");
+ alert("Please enter a new password.");
+ document.form1.newpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ if(document.form1.newpassword.value.length < 6 || document.form1.newpassword.value.search(/\d/) == -1 || document.form1.newpassword.value.search(/\D/) == -1 ){
+ //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ alert("Please note the rules for choosing a password below!");
+ document.form1.newpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ var letter = document.form1.newpassword.value.match(/\D/);
+ if(eval("document.form1.newpassword.value.match(/" + letter + "/gi).length") > 4){
+ //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ alert("Please note the rules for choosing a password below!");
+ document.form1.newpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ var integer = document.form1.newpassword.value.match(/\d/);
+ if(eval("document.form1.newpassword.value.match(/" + integer + "/gi).length") > 4){
+ //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ alert("Please note the rules for choosing a password below!");
+ document.form1.newpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ if(document.form1.confirmpassword.value == ""){
+ //alert("Bitte bestätigen Sie das Passwort.");
+ alert("Please confirm the password.");
+ document.form1.confirmpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ if(document.form1.newpassword.value!=document.form1.confirmpassword.value) {
+ //alert("Die Passwörter stimmen nicht überein.");
+ alert("The password entries do not match.");
+ document.form1.confirmpassword.value='';
+ document.form1.confirmpassword.focus();
+ document.form1.upd.value='false';
+ return false;
+ }
+ else{
+ document.form1.upd.value='true';
+ document.form1.submit();
+ }
+ }
}
</script>
</head>
@@ -111,56 +111,46 @@
$logged_user_name=$_SESSION["mb_user_name"];
$logged_user_id=$_SESSION["mb_user_id"];
-/*handle INSERT and DELETE************************************************************************************/
+/* handle INSERT and DELETE */
if($upd){
- $sql_user_id = "SELECT mb_user_id FROM mb_user WHERE mb_user_id='".$logged_user_id."';";
- $res_user_id = db_query($sql_user_id);
- $real_user_id = db_result($res_user_id,0,"mb_user_id");
-
- $sql_password = "SELECT mb_user_password,mb_user_password='".$newpassword."' as new FROM mb_user where mb_user_id='".$real_user_id."'";
- $res_password = db_query($sql_password);
- if(db_result($res_password,0,"mb_user_password") != db_result($res_password,0,"new")){
-
- $sql_update = "UPDATE mb_user SET mb_user_password=";
-
-
- if (SYS_DBTYPE=="mysql"){
- $sql_update.= "password('".$newpassword."')";
- }else{
+ $sql_user_id = "SELECT mb_user_id FROM mb_user WHERE mb_user_id='".$logged_user_id."';";
+ $res_user_id = db_query($sql_user_id);
+ $real_user_id = db_result($res_user_id,0,"mb_user_id");
+ $sql_password = "SELECT mb_user_password,mb_user_password='".$newpassword."' as new FROM mb_user where mb_user_id='".$real_user_id."'";
+ $res_password = db_query($sql_password);
+ if(db_result($res_password,0,"mb_user_password") != db_result($res_password,0,"new")){
+ $sql_update = "UPDATE mb_user SET mb_user_password=";
+ if (SYS_DBTYPE=="mysql"){
+ $sql_update.= "password('".$newpassword."')";
+ }
+ else{
if (MD5 == 'false'){
$sql_update .= "'".$newpassword."'";
- }else{
+ }
+ else{
$sql_update .= "md5('".$newpassword."')";
}
+ }
+ $sql_update .= " WHERE mb_user_id='".$real_user_id."'";
+ db_query($sql_update);
+ echo "<script language='javascript'>";
+ //echo "alert('Passwort wurde geändert!');";
+ echo "alert('Password has been updated!');";
+ echo "</script>";
+ }
+ else{
+ echo "<script language='javascript'>";
+ //echo "alert('Bitte beachten Sie die unten aufgeführten Passwortregeln!');";
+ echo "alert('Please note the rules for choosing a password below!');";
+ echo "</script>";
}
-
- $sql_update .= " WHERE mb_user_id='".$real_user_id."'";
- #echo $sql_update;
-
- db_query($sql_update);
- echo "<script language='javascript'>";
- //echo "alert('Passwort wurde geändert!');";
- echo "alert('Password has been updated!');";
- echo "</script>";
- }
- else{
- echo "<script language='javascript'>";
- //echo "alert('Bitte beachten Sie die unten aufgeführten Passwortregeln!');";
- echo "alert('Please note the rules for choosing a password below!');";
- echo "</script>";
- }
}
-
-/*HTML*****************************************************************************************************/
-
-//echo "<fieldset><legend>Passwort ändern:</legend>";
+/* HTML */
echo "<fieldset><legend>Change password:</legend>";
-#echo "<form name='form1' action='" . $PHP_SELF . "' method='post'>";
echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
echo "<table cellpadding='5' cellspacing='0' border='0'>";
echo "<td>";
-//echo "neues Passwort:";
echo "new password:";
echo "</td>";
echo "<td>";
@@ -169,7 +159,6 @@
echo"</tr>";
echo"<tr>";
echo "<td>";
-//echo "Passwort bestätigen:";
echo "confirm:";
echo "</td>";
echo "<td>";
@@ -184,32 +173,21 @@
echo "</td>";
echo"<td></tr></table>";
echo "<input type='hidden' name='upd' value=''>";
-//echo "<center><input class='myButton' type='button' name='update' value='ändern' onClick='validate(\"newpassword\")'></center>";
echo "<center><input class='myButton' type='button' name='update' value='update' onClick='validate(\"newpassword\")'></center>";
echo "</form>";
-/*********************************************************************/
?>
</fieldset><br />
<div class='desc'>
-
Please note: <br />
-- the password has to be different from the old one<br />
-- the minimum length is six characters<br />
-- it must contain a digit<br />
-- it must not be composed entirely of digits<br />
-- no character may be used more than four times<br />
-
-<!--
-Bitte beachten Sie:<br>
-- Das Passwort muss sich von dem alten Passwort unterscheiden<br />
-- Das Passwort muss mindestens 6 Zeichen lang sein<br />
-- Das Passwort muss mindestens eine Zahl enthalten<br />
-- Das Passwort darf nicht ausschließlich aus Zahlen bestehen<br />
-- Kein Zeichen darf mehr als vier mal vorkommen
--->
+<ul>
+<li>the password has to be different from the old one</li>
+<li>the minimum length is six characters</li>
+<li>it must contain a number</li>
+<li>it must not be composed entirely of numbers</li>
+<li>no character may be used more than four times</li>
+</ul>
</div>
-
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_createJSObjFromDB.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_createJSObjFromDB.php?view=diff&rev=134&p1=trunk/mapbender/http/php/mod_createJSObjFromDB.php&p2=trunk/mapbender/http/php/mod_createJSObjFromDB.php&r1=133&r2=134
==============================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromDB.php (original)
+++ trunk/mapbender/http/php/mod_createJSObjFromDB.php 2006-04-23 19:59:59+0000
@@ -1,6 +1,6 @@
<?php
-# $Id: mod_createJSObjFromDB.php,v 1.9 2005/10/04 10:25:09 uli_rothstein Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mod_createJSObjFromDB.php,v 1.9 2005/10/04 10:25:09 uli_rothstein Exp $
+# $Id$
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,7 @@
# 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("mb_validateSession.php");
require_once("../../conf/mapbender.conf");
require_once("../classes/class_wms.php");
@@ -27,9 +28,9 @@
$res = db_query($sql);
$cnt = 0;
while($row = db_fetch_array($res)){
- $mywms = new wms();
- $mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
- $mywms->createJsObjFromWMS();
- $cnt++;
-}
-?>
+ $mywms = new wms();
+ $mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
+ $mywms->createJsObjFromWMS();
+ $cnt++;
+}
+?>
\ No newline at end of file
More information about the Mapbender_commits
mailing list