mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-17 13:00:20 +02:00
Code Issues Releases Wiki Activity

Enable presets

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3290 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-01-09 15:12:11 +00:00
parent 6af4750b4c
commit 05bc60b26d
3 changed files with 189 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
phpBB/admin/admin_permissions.php
View File

@ -19,6 +19,13 @@
* *
***************************************************************************/ ***************************************************************************/
// NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
//
// Problem appears to exist with super moderators ...
// possibly related to general global issues
//
// NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
if (!empty($setmodules)) if (!empty($setmodules))
{ {
$filename = basename(__FILE__); $filename = basename(__FILE__);
@ -59,24 +66,28 @@ switch ($mode)
$l_title = $user->lang['PERMISSIONS']; $l_title = $user->lang['PERMISSIONS'];
$l_title_explain = $user->lang['PERMISSIONS_EXPLAIN']; $l_title_explain = $user->lang['PERMISSIONS_EXPLAIN'];
$which_acl = 'a_auth'; $which_acl = 'a_auth';
$type_sql = 'f';
break; break;
case 'moderators': case 'moderators':
$l_title = $user->lang['MODERATORS']; $l_title = $user->lang['MODERATORS'];
$l_title_explain = $user->lang['MODERATORS_EXPLAIN']; $l_title_explain = $user->lang['MODERATORS_EXPLAIN'];
$which_acl = 'a_authmods'; $which_acl = 'a_authmods';
$type_sql = 'm';
break; break;
case 'supermoderators': case 'supermoderators':
$l_title = $user->lang['SUPER_MODERATORS']; $l_title = $user->lang['SUPER_MODERATORS'];
$l_title_explain = $user->lang['SUPER_MODERATORS_EXPLAIN']; $l_title_explain = $user->lang['SUPER_MODERATORS_EXPLAIN'];
$which_acl = 'a_authmods'; $which_acl = 'a_authmods';
$type_sql = 'm';
break; break;
case 'administrators': case 'administrators':
$l_title = $user->lang['ADMINISTRATORS']; $l_title = $user->lang['ADMINISTRATORS'];
$l_title_explain = $user->lang['ADMINISTRATORS_EXPLAIN']; $l_title_explain = $user->lang['ADMINISTRATORS_EXPLAIN'];
$which_acl = 'a_authadmins'; $which_acl = 'a_authadmins';
$type_sql = 'a';
break; break;
} }
@ -141,6 +152,53 @@ else if (isset($_POST['delete']))
trigger_error('Permissions updated successfully'); trigger_error('Permissions updated successfully');
} }
else if (isset($_POST['presetsave']))
{
print_r($_POST['option']);
$holding_ary = array();
foreach ($_POST['option'] as $acl_option => $allow_deny)
{
switch ($allow_deny)
{
case ACL_ALLOW:
$holding_ary['allow'][] = $acl_option;
break;
case ACL_DENY:
$holding_ary['deny'][] = $acl_option;
break;
case ACL_INHERIT:
$holding_ary['inherit'][] = $acl_option;
break;
}
}
$sql = array(
'preset_user_id' => $user->data['user_id'],
'preset_type' => $type_sql,
'preset_data' => $db->sql_escape(serialize($holding_ary))
);
if (!empty($_POST['presetname']))
{
$sql['preset_name'] = $db->sql_escape($_POST['presetname']);
}
if (!empty($_POST['presetname']) || $_POST['presetoption'] != -1)
{
$sql = ($_POST['presetoption'] == -1) ? 'INSERT INTO ' . ACL_PRESETS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql) : 'UPDATE ' . ACL_PRESETS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql) . ' WHERE preset_id =' . $_POST['presetoption'];
$db->sql_query($sql);
}
}
else if (isset($_POST['presetdel']))
{
if (!empty($_POST['presetoption']))
{
$sql = "DELETE FROM " . ACL_PRESETS_TABLE . "
WHERE preset_id = " . intval($_POST['presetoption']);
$db->sql_query($sql);
}
}
// Get required information, either all forums if no id was // Get required information, either all forums if no id was
// specified or just the requsted if it was // specified or just the requsted if it was
@ -174,22 +232,18 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
switch ($mode) switch ($mode)
{ {
case 'forums': case 'forums':
$type_sql = 'f';
$forum_sql = "AND a.forum_id = $forum_id"; $forum_sql = "AND a.forum_id = $forum_id";
break; break;
case 'moderators': case 'moderators':
$type_sql = 'm';
$forum_sql = "AND a.forum_id = $forum_id"; $forum_sql = "AND a.forum_id = $forum_id";
break; break;
case 'supermoderators': case 'supermoderators':
$type_sql = 'm';
$forum_sql = ''; $forum_sql = '';
break; break;
case 'administrators': case 'administrators':
$type_sql = 'a';
$forum_sql = ''; $forum_sql = '';
break; break;
} }
@ -379,29 +433,61 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Look for presets
$sql = "SELECT preset_id, preset_name, preset_data
FROM " . ACL_PRESETS_TABLE . "
WHERE preset_type = '$type_sql'
ORDER BY preset_id ASC";
$result = $db->sql_query($sql);
$preset_options = $preset_js = '';
$holding = $preset_ary = array();
if ($row = $db->sql_fetchrow($result))
{
do
{
$preset_ary[$row['preset_id']] = $row['preset_name'];
$preset_options .= '<option value="preset_' . $row['preset_id'] . '">* ' . $row['preset_name'] . '</option>';
$preset_data = unserialize($row['preset_data']);
foreach ($preset_data as $preset_type => $preset_type_ary)
{
$holding[$preset_type] = '';
foreach ($preset_type_ary as $preset_option)
{
$holding[$preset_type] .= "$preset_option, ";
}
}
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
}
while ($row = $db->sql_fetchrow($result));
}
unset($holding);
?> ?>
<script language="Javascript" type="text/javascript"> <script language="Javascript" type="text/javascript">
<!-- <!--
// NEEDS COMPLETING ... OR SCRAPPING :D var presets = new Array();
quick_options = new Array(); <?php
quick_options['basic'] = new Array();
quick_options['basic']['allow'] = '';
quick_options['basic']['deny'] = '';
quick_options['basic']['inherit'] = '';
quick_options['advanced'] = new Array();
function marklist(match, status) echo $preset_js;
?>
function preset_obj(allow, deny, inherit)
{ {
for (i = 0; i < document.acl.length; i++) this.allow = allow;
{ this.deny = deny;
if (document.acl.elements[i].name.indexOf(match) == 0) this.inherit = inherit;
document.acl.elements[i].checked = status;
}
} }
function quick_set(option) function use_preset(option)
{ {
if (option) if (option)
{ {
@ -427,12 +513,13 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
elem.checked = true; elem.checked = true;
break; break;
default: default:
option_id = elem.name.match(expr)[0]; option_name = elem.name.substr(7, elem.name.length - 8);
if (quick_options[option]['allow'].indexOf(option_id + ',') != -1 && elem.value == <?php echo ACL_ALLOW; ?>)
if (presets[option].allow.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_ALLOW; ?>)
elem.checked = true; elem.checked = true;
else if (quick_options[option]['deny'].indexOf(option_id + ',') != -1 && elem.value == <?php echo ACL_DENY; ?>) else if (presets[option].deny.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_DENY; ?>)
elem.checked = true; elem.checked = true;
else if (quick_options[option]['inherit'].indexOf(option_id + ',') != -1 && elem.value == <?php echo ACL_INHERIT; ?>) else if (presets[option].inherit.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_INHERIT; ?>)
elem.checked = true; elem.checked = true;
break; break;
} }
@ -440,17 +527,26 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
} }
} }
} }
function marklist(match, status)
{
for (i = 0; i < document.acl.length; i++)
{
if (document.acl.elements[i].name.indexOf(match) == 0)
document.acl.elements[i].checked = status;
}
}
//--> //-->
</script> </script>
<p><?php echo $user->lang['ACL_EXPLAIN']; ?></p> <p><?php echo $user->lang['ACL_EXPLAIN']; ?></p>
<form method="post" name="acl" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table cellspacing="1" cellpadding="0" border="0" align="center"> <form method="post" name="acl" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table cellspacing="2" cellpadding="0" border="0" align="center">
<tr> <tr>
<td align="right">Quick settings: <select name="set" onchange="quick_set(this.options[this.selectedIndex].value);"><option><?php echo '-- ' . $user->lang['Select'] . ' --'; ?></option><option value="all_allow"><?php echo $user->lang['All_Allow']; ?></option><option value="all_deny"><?php echo $user->lang['All_Deny']; ?></option><option value="all_inherit"><?php echo $user->lang['All_Inherit']; ?></option><option value="basic"><?php echo $user->lang['Basic']; ?></option><option value="advanced"><?php echo $user->lang['Advanced']; ?></option></select></td> <td align="right">Quick settings: <select name="set" onchange="use_preset(this.options[this.selectedIndex].value);"><option><?php echo '-- ' . $user->lang['Select'] . ' --'; ?></option><option value="all_allow"><?php echo $user->lang['All_Allow']; ?></option><option value="all_deny"><?php echo $user->lang['All_Deny']; ?></option><option value="all_inherit"><?php echo $user->lang['All_Inherit']; ?></option><?php echo $preset_options; ?></select></td>
</tr> </tr>
<tr> <tr>
<td><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center"> <td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th>&nbsp;<?php echo $user->lang['Option']; ?>&nbsp;</th> <th>&nbsp;<?php echo $user->lang['Option']; ?>&nbsp;</th>
<th>&nbsp;<?php echo $user->lang['Allow']; ?>&nbsp;</th> <th>&nbsp;<?php echo $user->lang['Allow']; ?>&nbsp;</th>
@ -465,9 +561,20 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
$l_can_cell = (!empty($user->lang['acl_' . $auth_options[$i]['auth_value']])) ? $user->lang['acl_' . $auth_options[$i]['auth_value']] : ucfirst(preg_replace('#.*?_#', '', $auth_options[$i]['auth_value'])); $l_can_cell = (!empty($user->lang['acl_' . $auth_options[$i]['auth_value']])) ? $user->lang['acl_' . $auth_options[$i]['auth_value']] : ucfirst(preg_replace('#.*?_#', '', $auth_options[$i]['auth_value']));
if (!empty($_POST['presetsave']) || !empty($_POST['presetdel']))
{
$allow_type = ($_POST['option'][$auth_options[$i]['auth_value']] == ACL_ALLOW) ? ' checked="checked"' : '';
$deny_type = ($_POST['option'][$auth_options[$i]['auth_value']] == ACL_DENY) ? ' checked="checked"' : '';
$inherit_type = ($_POST['option'][$auth_options[$i]['auth_value']] == ACL_INHERIT) ? ' checked="checked"' : '';
}
else
{
$allow_type = ($auth[$auth_options[$i]['auth_value']] == ACL_ALLOW) ? ' checked="checked"' : ''; $allow_type = ($auth[$auth_options[$i]['auth_value']] == ACL_ALLOW) ? ' checked="checked"' : '';
$deny_type = ($auth[$auth_options[$i]['auth_value']] == ACL_DENY) ? ' checked="checked"' : ''; $deny_type = ($auth[$auth_options[$i]['auth_value']] == ACL_DENY) ? ' checked="checked"' : '';
$inherit_type = ($auth[$auth_options[$i]['auth_value']] == ACL_INHERIT) ? ' checked="checked"' : ''; $inherit_type = ($auth[$auth_options[$i]['auth_value']] == ACL_INHERIT) ? ' checked="checked"' : '';
}
?> ?>
<tr> <tr>
@ -520,7 +627,42 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators'
?> ?>
<tr> <tr>
<td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="update" value="<?php echo $user->lang['Update']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="CANCEL" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="type" value="<?php echo $_POST['type']; ?>" /><?php echo $ug_hidden; ?></td> <td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="update" value="<?php echo $user->lang['Update']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="type" value="<?php echo $_POST['type']; ?>" /><?php echo $ug_hidden; ?></td>
</tr>
<tr>
<th colspan="4"><?php echo $user->lang['PRESETS']; ?></th>
</tr>
<td class="row1" colspan="4"><table width="100%" cellspacing="1" cellpadding="0" border="0">
<tr>
<td colspan="2" height="16"><span class="gensmall"><?php echo $user->lang['PRESETS_EXPLAIN']; ?></span></td>
</tr>
<tr>
<td nowrap="nowrap"><?php echo $user->lang['SELECT_PRESET']; ?>: </td>
<td><select name="presetoption"><option value="-1"><?php echo '-- ' . $user->lang['Select'] . ' --'; ?></option><?php
$preset_options = '';
foreach ($preset_ary as $preset_id => $preset_name)
{
$preset_options .= '<option value="' . $preset_id . '">' . $preset_name . '</option>';
}
for ($i = 0; $i < 10 - sizeof($preset_ary); $i++)
{
$preset_options .= '<option value="-1">-- ' . $user->lang['EMPTY'] . ' --</option>';
}
echo $preset_options;
?></select></td>
</tr>
<tr>
<td nowrap="nowrap"><?php echo $user->lang['PRESET_NAME']; ?>: </td>
<td><input type="text" name="presetname" maxlength="25" /> </td>
</tr>
</table></td>
</tr>
<tr>
<td class="cat" colspan="4" align="center"><input class="liteoption" type="submit" name="presetsave" value="<?php echo $user->lang['SAVE']; ?>" /> &nbsp;<input class="liteoption" type="submit" name="presetdel" value="<?php echo $user->lang['DELETE']; ?>" /><input type="hidden" name="advanced" value="true" /></span></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

2
phpBB/install/schemas/mysql_basic.sql
View File

@ -116,6 +116,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_rate', 1);
INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_print', 1); INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_print', 1);
INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_ignoreflood', 1); INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_ignoreflood', 1);
INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_ignorequeue', 1); INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_ignorequeue', 1);
INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_viewonline', 1);
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_', 1, 1); INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_', 1, 1);
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_edit', 1, 1); INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_edit', 1, 1);
@ -127,6 +128,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_merg
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_approve', 1, 1); INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_approve', 1, 1);
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_unrate', 1, 1); INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_unrate', 1, 1);
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_auth', 1, 1); INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_auth', 1, 1);
INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_ip', 1, 1);
INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_', 1); INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_', 1);
INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_server', 1); INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_server', 1);

16
phpBB/install/schemas/mysql_schema.sql
View File

@ -34,6 +34,7 @@ CREATE TABLE phpbb_auth_groups (
); );
# --------------------------------------------------------
# #
# Table structure for table `phpbb_auth_options` # Table structure for table `phpbb_auth_options`
# #
@ -48,6 +49,21 @@ CREATE TABLE phpbb_auth_options (
); );
# --------------------------------------------------------
#
# Table structure for table phpbb_auth_presets
#
CREATE TABLE phpbb_auth_presets (
preset_id tinyint(4) NOT NULL auto_increment,
preset_name varchar(50) NOT NULL,
preset_user_id mediumint(5) UNSIGNED NOT NULL,
preset_type varchar(2) NOT NULL,
preset_data text,
PRIMARY KEY (preset_id),
KEY preset_type (preset_type)
);
# -------------------------------------------------------- # --------------------------------------------------------
# #
# Table structure for table `phpbb_auth_users` # Table structure for table `phpbb_auth_users`