From 5ebd168620c3da17c9c0104f89e0b60e4e266dcc Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Tue, 4 Aug 2009 14:36:56 +0000 Subject: [PATCH] Userclass exclusion added to default drop-down menu. --- e107_handlers/userclass_class.php | 25 +++++++++++++++---- .../English/admin/lan_userclass.php | 19 +++----------- .../English/admin/lan_userclass2.php | 16 ++++++------ e107_languages/English/lan_userclass.php | 9 ++++--- 4 files changed, 38 insertions(+), 31 deletions(-) diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index e1b2641a3..27296944e 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.36 $ -| $Date: 2009-07-16 08:15:35 $ +| $Revision: 1.37 $ +| $Date: 2009-08-04 14:36:54 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -333,10 +333,25 @@ class user_class else { $s = ($curval == $k && $curval !== '') ? "selected='selected'" : ""; - $text .= "\n"; + $text .= "\n"; } } + // Inverted Classes + if(strpos($optlist, "no-excludes") !== TRUE) + { + $text .= "\n\n"; + foreach ($show_classes as $k => $v) + { + if($k != '0' && $k!=255 && $k !=251) // remove everyone, nobody and readonly from list. + { + $s = ($curval == ('-'.$k) && $curval !== '') ? "selected='selected'" : ""; + $text .= "\n"; + } + } + $text .= "\n"; + } + if (strpos($optlist, "language") !== FALSE && $pref['multilanguage']) { $text .= "\n"; @@ -349,8 +364,8 @@ class user_class } // Only return the select box if we've ended up with some options - if ($text) $text = "\n"; - return $text; + if ($text) $text = "\n\n"; + return $text.$curVal; } diff --git a/e107_languages/English/admin/lan_userclass.php b/e107_languages/English/admin/lan_userclass.php index fa8a02a44..5647381f8 100644 --- a/e107_languages/English/admin/lan_userclass.php +++ b/e107_languages/English/admin/lan_userclass.php @@ -4,23 +4,12 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_userclass.php,v $ -| $Revision: 1.3 $ -| $Date: 2008-04-04 21:03:37 $ -| $Author: e107steved $ +| $Revision: 1.4 $ +| $Date: 2009-08-04 14:36:55 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ -define("UCSLAN_1", "Sending notification email to"); -define("UCSLAN_2", "Updated Privileges"); -define("UCSLAN_3", "Dear"); -define("UCSLAN_4", "Your privileges have been updated at"); -define("UCSLAN_5", "You now have access to the following area(s)"); -define("UCSLAN_6", "Set class for user"); -define("UCSLAN_7", "Set Classes"); -define("UCSLAN_8", "Notify User"); -define("UCSLAN_9", "Classes Updated."); -define("UCSLAN_10", "Regards,"); -define('UCSLAN_11', 'Class membership for user ID --UID-- changed to --CLASSES--'); -define('UCSLAN_12', 'Member privileges only'); + ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_userclass2.php b/e107_languages/English/admin/lan_userclass2.php index 2667b6241..03e4d7e63 100644 --- a/e107_languages/English/admin/lan_userclass2.php +++ b/e107_languages/English/admin/lan_userclass2.php @@ -4,9 +4,9 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_userclass2.php,v $ -| $Revision: 1.8 $ -| $Date: 2009-04-29 21:15:57 $ -| $Author: e107steved $ +| $Revision: 1.9 $ +| $Date: 2009-08-04 14:36:56 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ define("UCSLAN_1", "Cleared all users from class."); @@ -32,7 +32,7 @@ define("UCSLAN_20", "class"); define("UCSLAN_21", "User Class Settings"); define("UCSLAN_22", "Users - click to move ..."); define("UCSLAN_23", "Users in this class ..."); -define("UCSLAN_24", "Who can manage class"); +define("UCSLAN_24", "Class Manager"); define("UCSLAN_25", 'Define/Edit Classes'); define("UCSLAN_26", 'Class Membership'); define("UCSLAN_27", 'Debug Help'); @@ -42,8 +42,8 @@ define("UCSLAN_30", 'Short name displayed in selectors'); define("UCSLAN_31", 'Information about applicability of class'); define("UCSLAN_32", 'Users in this class can add/remove themselves from the class being edited'); define("UCSLAN_33", 'Determines which users can see this class in drop-down lists'); -define("UCSLAN_34", 'Class visibility'); -define("UCSLAN_35", 'Class parent'); +define("UCSLAN_34", 'Class Visibility'); +define("UCSLAN_35", 'Class Parent'); define("UCSLAN_36", 'If the top of the tree is \'No One\', permissions increase towards the top of the tree
If the top of the tree is \'Everyone\', permissions increase as you go down the tree'); define("UCSLAN_37", 'You must enter a name for the class'); define("UCSLAN_38", 'Initial User Class'); @@ -76,7 +76,7 @@ define("UCSLAN_64", 'completed'); define("UCSLAN_65", 'Flatten user class hierarchy: '); define("UCSLAN_66", 'Confirm flatten user class hierarchy'); define("UCSLAN_67", 'Confirm set default user class hierarchy'); -define("UCSLAN_68", 'Class icon'); +define("UCSLAN_68", 'Class Icon'); define("UCSLAN_69", 'Optional icon associated with class - directory '); define("UCSLAN_70", 'Rebuilding class hierarchy: '); define("UCSLAN_71", 'User Class Maintenance'); @@ -87,7 +87,7 @@ define('UCSLAN_75', 'Registered and logged in members'); define('UCSLAN_76', 'Site Administrators'); define('UCSLAN_77', 'Main site Administrators'); define('UCSLAN_78', 'Moderators for Forums and other areas'); -define('UCSLAN_79', 'Class type'); +define('UCSLAN_79', 'Class Type'); define('UCSLAN_80', 'Standard'); define('UCSLAN_81', 'Group'); define('UCSLAN_82', 'A group brings together a number of individual classes'); diff --git a/e107_languages/English/lan_userclass.php b/e107_languages/English/lan_userclass.php index 4611d42b6..1b7cb47aa 100644 --- a/e107_languages/English/lan_userclass.php +++ b/e107_languages/English/lan_userclass.php @@ -4,9 +4,9 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_userclass.php,v $ -| $Revision: 1.3 $ -| $Date: 2008-12-21 11:07:58 $ -| $Author: e107steved $ +| $Revision: 1.4 $ +| $Date: 2009-08-04 14:36:56 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ define("UC_LAN_0", "Everyone (public)"); @@ -19,5 +19,8 @@ define("UC_LAN_6", "Main Admin"); define('UC_LAN_7', 'Forum Moderators'); define('UC_LAN_8','Admins and Mods'); define('UC_LAN_9','New Users'); +define('UC_LAN_INVERT', "Not --CLASS--"); +define('UC_LAN_INVERTLABEL', "Everyone but.."); + ?> \ No newline at end of file