From ac7f0ddf36557844fee8e42cb07766e3fbeba081 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sat, 29 Dec 2007 22:32:58 +0000
Subject: [PATCH] Userclass display on log options

---
 e107_admin/admin_log.php          | 20 ++++++++++----------
 e107_handlers/userclass_class.php |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 767cf0e3f..d860d283a 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2007-12-29 22:07:42 $
+|     $Revision: 1.8 $
+|     $Date: 2007-12-29 22:32:58 $
 |     $Author: e107steved $
 |
 | Preferences:
@@ -375,11 +375,11 @@ $audit_checkboxes = array(
 );
 
 //Uncomment once inherited user classes
-//	if (!isset($e_userclass) && !is_object($e_userclass)) 
-//	{
+	if (!isset($e_userclass) && !is_object($e_userclass)) 
+	{
 	  require_once(e_HANDLER."userclass_class.php");
-//	  $e_userclass = new user_class;
-//	}
+	  $e_userclass = new user_class;
+	}
 
 	$user_signup_opts = array_flip(explode(',',varset($pref['user_audit_opts'],'')));
 	$text = "<div style='text-align:center'>
@@ -390,10 +390,10 @@ $audit_checkboxes = array(
 		<td style='width:60%;vertical-align:top;' class='forumheader3'>";
 
 // Uncomment once inherited userclasses		
-//	$text .= "<select name='class_select'>\n";
-//	$text .= $e_userclass->vetted_tree('user_audit_class',array($e_userclass,'select'), varset($pref['user_audit_class'],''),'force');
-//	$text .= "</select>\n";
-	$text .= r_userclass('user_audit_class', varset($pref['user_audit_class'],''),'off','nobody,admin,user,classes');
+	$text .= "<select class='tbox' name='class_select'>\n";
+	$text .= $e_userclass->vetted_tree('user_audit_class',array($e_userclass,'select'), varset($pref['user_audit_class'],''),'force');
+	$text .= "</select>\n";
+//	$text .= r_userclass('user_audit_class', varset($pref['user_audit_class'],''),'off','nobody,admin,user,classes');
 	$text .= "</td>
 	</tr>
 
diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php
index 81927fe5a..04c08941e 100644
--- a/e107_handlers/userclass_class.php
+++ b/e107_handlers/userclass_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2007-12-22 12:39:24 $
+|     $Revision: 1.7 $
+|     $Date: 2007-12-29 22:32:58 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -254,14 +254,14 @@ class user_class
 	  // Do the 'fixed' classes next
 	  foreach ($this->text_class_link as $k => $v)
 	  {
-		if (isset($opt_arr[$k]))
+		if (isset($opt_arr[$k]) || isset($opt_arr['force']))
 		{
 		  $ret[$v] = $just_ids ? '1' : $this->fixed_classes[$v];
 	    }
 	  }
 
 	  // Now do the user-defined classes
-	  if (isset($opt_arr['classes']))
+	  if (isset($opt_arr['classes']) || isset($opt_arr['force']))
 	  {	// Display those classes the user is allowed to:
 		//	Main admin always sees the lot
 		//	a) Mask the 'fixed' user classes which have already been processed