[Pureuseradmin-cvs] PureUserAdmin pureuserclass.php,1.2,1.3

[Michiel v. B. <mva...@us...>]

Update of /cvsroot/pureuseradmin/PureUserAdmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11056

Modified Files:
	pureuserclass.php 
Log Message:
made some extra settings so the database field names are stored on one place.
It should be easier to deploy now cause you don't need my exact database shema

Index: pureuserclass.php
===================================================================
RCS file: /cvsroot/pureuseradmin/PureUserAdmin/pureuserclass.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pureuserclass.php	3 Oct 2004 16:06:33 -0000	1.2
--- pureuserclass.php	3 Oct 2004 19:35:57 -0000	1.3
***************
*** 166,169 ****
--- 166,174 ----
  		$this->settings["sql_dbase"]   = "ftp_users";
  		$this->settings["sql_table"]   = "logins";
+ 		$this->settings["field_uid"]   = "uid";
+ 		$this->settings["field_gid"]   = "gid";
+ 		$this->settings["field_pass"]  = "password";
+ 		$this->settings["field_user"]  = "username";
+ 		$this->settings["field_dir"]   = "dir";
  
  		/* user settings */
***************
*** 210,233 ****
  		if ($userinfo["update"]) {
  			$sql = "UPDATE ".$this->settings["sql_table"]." SET ";
! 			$sql .= "uid=".$userinfo["uid"];
! 			$sql .= ", gid=".$userinfo["gid"];
! 			$sql .= ", dir='".$userinfo["dir"]."'";
  			// are we going to reset the password ?
  			if ($userinfo["password"]) {
  				if ($userinfo["password"] == $userinfo["password1"]) {
! 					$sql .= ", password=".self::mkpass($userinfo["password"]);
  				}
  			}
! 			$sql .= " WHERE username='".$userinfo["username"]."'";
  		} else {
  			// check if name is already in DB.
! 			$sql = "SELECT COUNT(*) FROM ".$this->settings["sql_table"]." WHERE username='".$userinfo["username"]."'";
! 			//$res = sql_query($sql);
! 			//$aantal = sql_result($res,0);
  			if ($aantal) {
  				return false;
  				//error
  			} else {
! 				$sql = "INSERT INTO ".$this->settings["sql_table"]." (username,password,uid,gid,dir) VALUES (";
  				$sql .= "'".$userinfo["username"]."', ";
  				$sql .= self::mkpass($userinfo["password"]).", ";
--- 215,238 ----
  		if ($userinfo["update"]) {
  			$sql = "UPDATE ".$this->settings["sql_table"]." SET ";
! 			$sql .= $this->settings["field_uid"]."=".$userinfo["uid"];
! 			$sql .= ", ".$this->settings["field_gid"]."=".$userinfo["gid"];
! 			$sql .= ", ".$this->settings["field_dir"]."='".$userinfo["dir"]."'";
  			// are we going to reset the password ?
  			if ($userinfo["password"]) {
  				if ($userinfo["password"] == $userinfo["password1"]) {
! 					$sql .= ", ".$this->settings["field_pass"]."=".self::mkpass($userinfo["password"]);
  				}
  			}
! 			$sql .= " WHERE ".$this->settings["field_user"]."='".$userinfo["username"]."'";
  		} else {
  			// check if name is already in DB.
! 			$sql = "SELECT COUNT(*) FROM ".$this->settings["sql_table"]." WHERE ".$this->settings["field_user"]."='".$userinfo["username"]."'";
! 			$res = sql_query($sql);
! 			$aantal = sql_result($res,0);
  			if ($aantal) {
  				return false;
  				//error
  			} else {
! 				$sql = "INSERT INTO ".$this->settings["sql_table"]." (".$this->settings["field_user"].",".$this->settings["field_pass"].",".$this->settings["field_uid"].",".$this->settings["field_gid"].",".$this->settings["field_dir"].") VALUES (";
  				$sql .= "'".$userinfo["username"]."', ";
  				$sql .= self::mkpass($userinfo["password"]).", ";
***************
*** 259,263 ****
  	 */
  	public function delete_user($userinfo) {
! 		$sql = "DELETE FROM ".$this->settings["sql_table"]." WHERE username='".$userinfo["username"]."'";
  		$res = sql_query($sql);
  		return true;
--- 264,268 ----
  	 */
  	public function delete_user($userinfo) {
! 		$sql = "DELETE FROM ".$this->settings["sql_table"]." WHERE ".$this->settings["field_user"]."='".$userinfo["username"]."'";
  		$res = sql_query($sql);
  		return true;
***************
*** 272,276 ****
  	 */
  	public function get_user($userinfo) {
! 		$sql = "SELECT * FROM ".$this->settings["sql_table"]." WHERE username='".$userinfo["username"]."'";
  		$res = sql_query($sql);
  		$userinfo = sql_fetch_assoc($res);
--- 277,281 ----
  	 */
  	public function get_user($userinfo) {
! 		$sql = "SELECT * FROM ".$this->settings["sql_table"]." WHERE ".$this->settings["field_user"]."='".$userinfo["username"]."'";
  		$res = sql_query($sql);
  		$userinfo = sql_fetch_assoc($res);
***************
*** 285,289 ****
  	 */
  	public function get_all_users() {
! 		$sql = "SELECT * FROM ".$this->settings["sql_table"]." ORDER BY username";
  		$res = sql_query($sql);
  		$users = Array();
--- 290,294 ----
  	 */
  	public function get_all_users() {
! 		$sql = "SELECT * FROM ".$this->settings["sql_table"]." ORDER BY ".$this->settings["field_user"];
  		$res = sql_query($sql);
  		$users = Array();