svn commit: r763 - trunk/mapbender/http/php/mod_editSelf.php

Fri Sep 1 06:08:01 EDT 2006

Author: uli
Date: 2006-09-01 10:08:01+0000
New Revision: 763

Modified:
   trunk/mapbender/http/php/mod_editSelf.php

Log:
some bugs:
- use passwd instead of password
- owner_name is not required
- owner_id is user_id to edit this data

Modified: trunk/mapbender/http/php/mod_editSelf.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_editSelf.php?view=diff&rev=763&p1=trunk/mapbender/http/php/mod_editSelf.php&p2=trunk/mapbender/http/php/mod_editSelf.php&r1=762&r2=763
==============================================================================

--- trunk/mapbender/http/php/mod_editSelf.php	(original)
+++ trunk/mapbender/http/php/mod_editSelf.php	2006-09-01 10:08:01+0000
@@ -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("../../conf/mapbender.conf");
 require_once("../php/mb_validateSession.php");
 import_request_variables("PG");
@@ -121,7 +122,7 @@
 </head>
 <body>
 <?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
+$con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 
 #delete
@@ -149,7 +150,7 @@
 		$sql = "Insert INTO mb_user (mb_user_name, mb_user_password,mb_user_owner, mb_user_description,";
 		$sql .= " mb_user_email, mb_user_phone, mb_user_department, mb_user_resolution) VALUES ";
 		$sql.= "($1, $2, $3, $4, $5, $6, $7, $8)";
-		$v = array($name,md5($password),$owner_id,$description,$email,$phone,$department,$resolution);
+		$v = array($name,md5($passw),$owner_id,$description,$email,$phone,$department,$resolution);
 		$t = array('s','s','i','s','s','s','s','i');
 		$res = db_prep_query($sql,$t,$v);
 		$selected_user = db_insert_id();
@@ -166,6 +167,19 @@
 		echo "<script language='JavaScript'>alert('Username must be unique!');</script>";
 	}
 	else{
+		if($passw == ""){
+			$sql = "SELECT mb_user_password FROM mb_user WHERE mb_user_name = $1 AND mb_user_id = $2";
+			$v = array($name,$selected_user);
+			$t = array('s','i');
+			$res = db_prep_query($sql,$v,$t);
+			if($row = db_fetch_row($res)){
+				$p = $row["mb_user_password"];	
+			}
+		}
+		else{
+			$p = md5($passw);
+			$password = true;
+		}
 		$sql = "UPDATE mb_user SET mb_user_name = $1";
 		$sql .= ", mb_user_password = $2";
 		$sql .=", mb_user_description = $3";
@@ -175,7 +189,7 @@
 		$sql .=", mb_user_department = $7";
 		$sql .=", mb_user_resolution = $8";
 		$sql .=" where mb_user_id = $9";
-		$v = array($name,md5($password),$description,$login_count,$email,$phone,$department,$resolution,$selected_user);
+		$v = array($name,$p,$description,$login_count,$email,$phone,$department,$resolution,$selected_user);
 		$t = array('s','s','s','i','s','s','s','i','i');
 		$res = db_prep_query($sql,$v,$t);
 		if($password && $res){
@@ -209,17 +223,17 @@
    $v = array($_SESSION["mb_user_id"]);
    $t = array('i');
    $res = db_prep_query($sql,$v,$t);
-   if(db_fetch_row($res)){
-      $name = db_result($res,0,"mb_user_name");
-      $password = db_result($res,0,"mb_user_password");
-      $owner_id = db_result($res,0,"mb_user_owner");
-      $description = db_result($res,0,"mb_user_description");
-      $login_count = db_result($res,0,"mb_user_login_count");
-      $email = db_result($res,0,"mb_user_email");
-      $phone = db_result($res,0,"mb_user_phone");
-      $department = db_result($res,0,"mb_user_department");
-      $resolution = db_result($res,0,"mb_user_resolution");
-	   $owner_name = $_SESSION["mb_user_id"];
+   if($row = db_fetch_array($res)){
+      $name = $row["mb_user_name"];
+      $password = $row["mb_user_password"];
+      $owner_id = $row["mb_user_owner"];
+      $description = $row["mb_user_description"];
+      $login_count = $row["mb_user_login_count"];
+      $email = $row["mb_user_email"];
+      $phone = $row["mb_user_phone"];
+      $department = $row["mb_user_department"];
+      $resolution = $row["mb_user_resolution"];
+	  $owner_id = $_SESSION["mb_user_id"];
    	$edit = true;
    }
    else {
@@ -231,8 +245,8 @@
 if ($edit) {
 #name
 echo "<tr>";
-   echo "<td>Name:</td>";
-   echo "<td>";
+	echo "<td>Name:</td>";
+	echo "<td>";
       echo "<input type='text' size='30' name='name' value='".$name."'>";
    echo "</td>";
 echo "</tr>";


