finished up the registration mojo... think it all works famous last words..

2 files changed, 34 insertions, 5 deletions

diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 49f9f1a9..12c1f328 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -389,12 +389,12 @@ class User {
 			
 		} 
 		elseif ($new_access == 'disabled') {
-			$new_access = sql_escape($new_access);
 			$sql = "UPDATE user SET disabled='1' WHERE username='$this->username'";
 			$db_results = mysql_query($sql, dbh());
 			$sql = "DELETE FROM session WHERE username='" . sql_escape($this->username) . "'";
 			$db_results = mysql_query($sql, dbh());
-		} else {
+		} 
+		else {
 			$new_access = sql_escape($new_access);
 			$sql = "UPDATE user SET access='$new_access' WHERE username='$this->username'";
 			$db_results = mysql_query($sql, dbh());
@@ -768,12 +768,18 @@ class User {
 		@function get_user_validation
 		@check if user exists before activation can be done.
 	*/
-	function get_user_validation($username,$validation){
+	function get_user_validation($username,$validation) {
+	
+		$usename = sql_escape($username);
+	
 		$sql = "SELECT validation FROM user where username='$username'";
 		$db_results = mysql_query($sql, dbh());
-		$row = mysql_fetch_array($db_results);
-		$val = $row[validation];
+		
+		$row = mysql_fetch_assoc($db_results);
+		$val = $row['validation'];
+
 		return $val;
+
 	} // get_user_validation
 
 	/*!
@@ -781,9 +787,14 @@ class User {
 		@activates the user from public_registration
 	*/
 	function activate_user($username) {
+	
+		$username = sql_escape($username);
+	
 		$sql = "UPDATE user SET disabled='0' WHERE username='$username'";
 		$db_results = mysql_query($sql, dbh());
+		
 	} // activate_user
+	
 } //end class
 
 ?>
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index c5db1a16..6862ce57 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -1192,7 +1192,25 @@ mail($email, "Welcome to $title" , $body, $from);
 
 } //send_confirmation
 
+/**
+ * show_registration_agreement
+ * This function reads in /config/registration_agreement.php
+ * Plaintext Only
+ */
+function show_registration_agreement() { 
+
+	$filename = conf('prefix') . '/config/registration_agreement.php';
 
+	/* Check for existance */
+	$fp = fopen($filename,'r');
 
+	if (!$fp) { return false; }
+
+	$data = fread($fp,filesize($filename));
+
+	/* Scrub and show */
+	echo scrub_out($data);
+		
+} // show_registration_agreement
 
 ?>