mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 11:20:25 +02:00
Code Issues Releases Wiki Activity

Issue #55 - don't show 'Everyone except...' class list where inappropriate

Browse Source
This commit is contained in:
SteveD
2013-03-03 11:32:28 +00:00
parent 29fc1d383a
commit 0558f43576
9 changed files with 880 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin_log.php
View File

@@ -422,7 +422,7 @@ if($action == "config")
<td>".RL_LAN_123."</td>
<td>
<select class='tbox' name='user_audit_class'>
".$e_userclass->vetted_tree('user_audit_class', array($e_userclass, 'select'), varset($pref['user_audit_class'], ''), 'nobody,admin,member,new,mods,main,classes')."
".$e_userclass->vetted_tree('user_audit_class', array($e_userclass, 'select'), varset($pref['user_audit_class'], ''), 'nobody,admin,member,new,mods,main,classes, no-excludes')."
</select>
<span class='field-help'>".RL_LAN_026."</span>
</td>

4
e107_admin/upload.php
View File

@@ -404,7 +404,7 @@ switch ($action)
$text .= "
<tr>
<td class='forumheader3'><select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin, no-excludes')."
</select></td>
<td class='forumheader3'><input type='text' name='file_type_list[]' value='{$uinfo['type']}' class='tbox' size='40' /></td>
<td class='forumheader3' style='text-align:center'><input type='text' name='file_maxupload[]' value='{$uinfo['maxupload']}' class='tbox' size='10' /></td>
@@ -415,7 +415,7 @@ switch ($action)
$text .= "
<tr>
<td class='forumheader3'><select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank, no-excludes')."
</select></td>
<td class='forumheader3'><input type='text' name='file_type_list[]' value='' class='tbox' size='40' /></td>
<td class='forumheader3' style='text-align:center'><input type='text' name='file_maxupload[]' value='".ini_get('upload_max_filesize')."' class='tbox' size='10' /></td>

7
e107_admin/userclass2.php
View File

@@ -36,6 +36,7 @@ $e_sub_cat = 'userclass';
require_once(e_HANDLER.'userclass_class.php'); // Modified class handler
$e_userclass = new user_class_admin; // Admin functions - should just obliterate any previous object created in class2.php
// @TODO: Does core object manager need to know somehow?
require_once(e_HANDLER.'form_handler.php');
@@ -496,7 +497,7 @@ switch ($action)
<tr id='userclass_type_standard' ".(UC_TYPE_GROUP == $userclass_type ? " style='display:none'" : "").">
<td>".UCSLAN_24."</td>
<td>";
$text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,'nobody,public,main,admin,classes,matchclass,member').'</select>';
$text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,'nobody,public,main,admin,classes,matchclass,member, no-excludes').'</select>';
$text .= "<div class='field-help'>".UCSLAN_32."</div></td>
</tr>
";
@@ -525,7 +526,7 @@ switch ($action)
<tr>
<td>".UCSLAN_35."</td>
<td>";
$text .= "<select name='userclass_parent' class='tbox'>".$e_userclass->vetted_tree('userclass_parent',array($e_userclass,'select'), $userclass_parent,'main,admin,nobody,public,classes,matchclass,member').'</select>';
$text .= "<select name='userclass_parent' class='tbox'>".$e_userclass->vetted_tree('userclass_parent',array($e_userclass,'select'), $userclass_parent,'main,admin,nobody,public,classes,matchclass,member, no-excludes').'</select>';
// .r_userclass("userclass_parent", $userclass_parent, "off", "admin,classes,matchclass,public,member").
$text .= "<div class='field-help'>".UCSLAN_36."</div></td>
</tr></table>
@@ -1020,7 +1021,7 @@ require_once(e_ADMIN.'footer.php');
// @TODO: Is this function still required?
// @TODO: Is this function still required? - Yes - setGroupStatus() used on class add/edit page
function headerjs()
{
$params = e107::getRegistry('pageParams');

4
e107_admin/users.php
View File

@@ -773,7 +773,7 @@ class users_admin_ui extends e_admin_ui
<tbody>
<tr>
<td>";
$text .= $e_userclass->vetted_tree('userclass', array($e_userclass,'checkbox_desc'), $sysuser->getValue('class'), 'classes');
$text .= $e_userclass->vetted_tree('userclass', array($e_userclass,'checkbox_desc'), $sysuser->getValue('class'), 'classes, no-excludes');
$text .= '
</td>
</tr>
@@ -1259,7 +1259,7 @@ class users_admin_ui extends e_admin_ui
// TODO lan above
if (!isset ($user_data['user_class'])) $user_data['user_class'] = varset($pref['initial_user_classes']);
$temp = $e_userclass->vetted_tree('class', array($e_userclass, 'checkbox_desc'), $user_data['user_class'], 'classes');
$temp = $e_userclass->vetted_tree('class', array($e_userclass, 'checkbox_desc'), $user_data['user_class'], 'classes, no-excludes');
if ($temp)
{

2
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -270,7 +270,7 @@ class signup_shortcodes extends e_shortcode
}*/
$ret = $USERCLASS_SUBSCRIBE_START;
$ret .= $e_userclass->vetted_tree('class',array($this,show_signup_class),varset($signupData['user_class'],''),'editable');
$ret .= $e_userclass->vetted_tree('class',array($this,show_signup_class),varset($signupData['user_class'],''),'editable, no-excludes');
$ret .= $USERCLASS_SUBSCRIBE_END;
return $ret;
}

2
e107_core/shortcodes/batch/usersettings_shortcodes.php
View File

@@ -175,7 +175,7 @@ class usersettings_shortcodes extends e_shortcode
$inclass = implode(',',$is_checked);
// $ret = "<table style='width:95%;margin-left:0px'><tr><td class='defaulttext'>";
$ret .= $e_userclass->vetted_tree('class',array($e_userclass,checkbox_desc),$inclass,'editable');
$ret .= $e_userclass->vetted_tree('class',array($e_userclass,checkbox_desc),$inclass,'editable, no-excludes');
// $ret .= "</td></tr></table>\n";
return $ret;

4
e107_plugins/download/admin_download.php
View File

@@ -637,7 +637,7 @@ if ($action == "uopt")
<tr>
<td>
<select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin, no-excludes')."
</select>
</td>
<td><input type='text' name='file_type_list[]' value='{$uinfo['type']}' class='tbox' size='40'/></td>
@@ -653,7 +653,7 @@ if ($action == "uopt")
</tr>
<tr>
<td><select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank, no-excludes')."
</select></td>
<td><input type='text' name='file_type_list[]' value='' class='tbox' size='40'/></td>
<td colspan='2'><input type='text' name='file_maxupload[]' value='".ini_get('upload_max_filesize')."' class='tbox' size='10'/></td>

4
e107_plugins/download/handlers/adminDownload_class.php
View File

@@ -1785,7 +1785,7 @@ class adminDownload extends download
<tr>
<td>
<select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), $uclass,'member,main,classes,admin, no-excludes')."
</select>
</td>
<td><input type='text' name='file_type_list[]' value='{$uinfo['type']}' class='tbox' size='40'/></td>
@@ -1801,7 +1801,7 @@ class adminDownload extends download
</tr>
<tr>
<td><select name='file_class_select[]' class='tbox'>
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank')."
".$e_userclass->vetted_tree('file_class_select',array($e_userclass,'select'), '','member,main,classes,admin,blank, no-excludes')."
</select></td>
<td><input type='text' name='file_type_list[]' value='' class='tbox' size='40'/></td>
<td colspan='2'><input type='text' name='file_maxupload[]' value='".ini_get('upload_max_filesize')."' class='tbox' size='10'/></td>

1730
e107_plugins/import/admin_import.php
View File

File diff suppressed because it is too large Load Diff