removed ID field from user table, and everything that goes with that...

3 files changed, 25 insertions, 26 deletions

diff --git a/admin/mail.php b/admin/mail.php
index 78d257a8..2d5a0802 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -39,17 +39,17 @@ $subject = stripslashes(scrub_in($_POST['subject']));
 $message = stripslashes(scrub_in($_POST['message']));
 
 if ( $action == 'send_mail' && !conf('demo_mode')) {
-  $user = new User(0,$_SESSION['userdata']['id']);
-  // do the mail mojo here
-  if ( $to == 'all' ) {
-    $sql = "SELECT * FROM user WHERE email IS NOT NULL";
-  }
-  elseif ( $to == 'users' ) {
-    $sql = "SELECT * FROM user WHERE access='users' AND email IS NOT NULL";
-  }
-  elseif ( $to == 'admins' ) {
-    $sql = "SELECT * FROM user WHERE access='admin' AND email IS NOT NULL";
-  }
+	$user = $GLOBALS['user'];
+	// do the mail mojo here
+	if ( $to == 'all' ) {
+		$sql = "SELECT * FROM user WHERE email IS NOT NULL";
+	}
+	elseif ( $to == 'users' ) {
+		$sql = "SELECT * FROM user WHERE access='users' OR access='25' AND email IS NOT NULL";
+	}
+	elseif ( $to == 'admins' ) {
+		$sql = "SELECT * FROM user WHERE access='admin' OR access='100' AND email IS NOT NULL";
+	}
   
   $db_result = mysql_query($sql, dbh());
   
diff --git a/admin/preferences.php b/admin/preferences.php
index ba381f44..c83f690e 100644
--- a/admin/preferences.php
+++ b/admin/preferences.php
@@ -20,12 +20,14 @@
 
 */
 
-/*!
-	@header Preferences page
-	Preferences page for whole site, and where
-	the admins do editing of other users preferences
-
-*/
+/**
+ * Preferences page
+ * Preferences page for whole site, and where
+ * the admins do editing of other users preferences
+ * @package Preferences
+ * @catagory Admin
+ * @author Karl Vollmer
+ */
 
 require('../modules/init.php');
 
@@ -40,8 +42,7 @@ $user_id = intval(scrub_in($_REQUEST['user_id']));
 switch(scrub_in($_REQUEST['action'])) { 
 
 	case 'user':
-		$temp_user = new User(0,$user_id);
-		$user_id = $temp_user->id;
+		$temp_user = new User($user_id);
 		$fullname = "ADMIN - " . $temp_user->fullname;
 		$preferences = $temp_user->get_preferences();
 	break;
@@ -49,7 +50,7 @@ switch(scrub_in($_REQUEST['action'])) {
 		if (conf('demo_mode')) { break; }
 		update_preferences($user_id);	
 		if ($user_id != '0') { 
-			$temp_user = new User(0,$user_id);
+			$temp_user = new User($user_id);
 			$fullname = "ADMIN - " . $temp_user->fullname;
 			$preferences = $temp_user->get_preferences();
 		}
@@ -58,7 +59,7 @@ switch(scrub_in($_REQUEST['action'])) {
 		}
 	break;
 	case 'fix_preferences':
-		$temp_user = new User(0,$user_id);
+		$temp_user = new User($user_id);
 		$temp_user->fix_preferences();
 		$preferences = $temp_user->get_preferences();
 	break;
diff --git a/admin/users.php b/admin/users.php
index fddf5333..c42c0844 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -49,8 +49,7 @@ $temp_user = new User($user_id);
 switch ($action) {
     case 'edit':
         if (conf('demo_mode')) { break; }
-	show_user_form($temp_user->id, 
-		$temp_user->username, 
+	show_user_form($temp_user->username, 
 		$temp_user->fullname,
 		$temp_user->email,
 		$temp_user->access,
@@ -82,8 +81,7 @@ switch ($action) {
 
 		/* If we've got an error then break! */
 		if ($GLOBALS['error']->error_state) { 
-		        show_user_form($temp_user->id,
-		                $thisuser->username,
+		        show_user_form($thisuser->username,
 		                $thisuser->fullname,
 		                $thisuser->email,
 		                $thisuser->access,
@@ -152,7 +150,7 @@ switch ($action) {
 	break;
     case 'show_add_user':
         if (conf('demo_mode')) { break; }
-	show_user_form('','','','','','new_user','');
+	show_user_form('','','','','new_user','');
 	break;
 
     case 'update':