X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpdatabase.php;fp=gwvplib%2Fgwvpdatabase.php;h=267a6e099cb8dd000160cdddccc16aee5bf9be12;hp=c2d37cf295695615a6f4fe4d65fe16f4d6e4192c;hb=d6d341a5742ed8021fa768c924846e04d46156e1;hpb=2d37dc712f9986265c4061d25b3107ab62cb70a3

diff --git a/gwvplib/gwvpdatabase.php b/gwvplib/gwvpdatabase.php
index c2d37cf..267a6e0 100644
--- a/gwvplib/gwvpdatabase.php
+++ b/gwvplib/gwvpdatabase.php
@@ -16,7 +16,7 @@ function gwvp_dbCreateSQLiteStructure($dbloc)
 	    "users_id" INTEGER PRIMARY KEY AUTOINCREMENT,
 	    "user_full_name" TEXT,
 	    "user_password" TEXT,
-	    "user_nickname" TEXT,
+	    "user_username" TEXT,
 	    "user_email" TEXT,
 	    "user_desc" TEXT,
 	    "user_status" INTEGER
@@ -106,19 +106,19 @@ function gwvp_ConnectDB()
 	return $DB_CONNECTION;
 }
 
-function gwvp_createUser($email, $fullname, $password, $nick, $desc, $status)
+function gwvp_createUser($email, $fullname, $password, $username, $desc, $status)
 {
 	$conn = gwvp_ConnectDB();
 	
 	// TODO: change from sha1
 	$shapass = sha1($password);
 	//error_log("Create user called with $email");
-	$conn->query("insert into users values (null, '$fullname', '$shapass', '$nick', '$email', '$desc', '$status')");
+	$conn->query("insert into users values (null, '$fullname', '$shapass', '$username', '$email', '$desc', '$status')");
 	/*
 	 * 	    "users_id" INTEGER PRIMARY KEY AUTOINCREMENT,
 	    "user_full_name" TEXT,
 	    "user_password" TEXT,
-	    "user_nickname" TEXT,
+	    "user_username" TEXT,
 	    "user_email" TEXT,
 	    "user_desc" TEXT,
 	    "user_status" INTEGER
@@ -138,7 +138,7 @@ function gwvp_getUsers()
 		$returns[$rn]["id"] = $u_res["users_id"];
 		$returns[$rn]["fullname"] = $u_res["user_full_name"];
 		$returns[$rn]["password"] = $u_res["user_password"];
-		$returns[$rn]["nickname"] = $u_res["user_nickname"];
+		$returns[$rn]["username"] = $u_res["user_username"];
 		$returns[$rn]["email"] = $u_res["user_email"];
 		$returns[$rn]["desc"] = $u_res["user_desc"];
 		$returns[$rn]["status"] = $u_res["user_status"];
@@ -423,13 +423,13 @@ function gwvp_IsUserAdmin($email)
 	return false;
 }
 
-function gwvp_ModifyUser($userid, $email=null, $fullname=null, $password=null, $nickname=null, $desc=null, $status=null)
+function gwvp_ModifyUser($userid, $email=null, $fullname=null, $password=null, $username=null, $desc=null, $status=null)
 {
 	/*
 	 * 	    "users_id" INTEGER PRIMARY KEY AUTOINCREMENT,
 	    "user_full_name" TEXT,
 	    "user_password" TEXT,
-	    "user_nickname" TEXT,
+	    "user_username" TEXT,
 	    "user_email" TEXT,
 	    "user_desc" TEXT,
 	    "user_status" INTEGER
@@ -454,8 +454,8 @@ function gwvp_ModifyUser($userid, $email=null, $fullname=null, $password=null, $
 		$conn->query($sql);
 	}
 
-	if($nickname != null) {
-		$sql = "update users set user_nickname='$nickname' where users_id='$userid'";
+	if($username != null) {
+		$sql = "update users set user_username='$username' where users_id='$userid'";
 		$conn->query($sql);
 	}