mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-11-29 09:44:28 +01:00
wildcard option ("*") for per-board mods
This commit is contained in:
parent
ca8e74cf10
commit
e205a0c636
@ -25,7 +25,10 @@
|
|||||||
if(isset($action) && $mod['type'] < $action)
|
if(isset($action) && $mod['type'] < $action)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if(isset($board) && !$config['mod']['skip_per_board'] && !in_array($board, $mod['boards']))
|
if(!isset($board))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if(!$config['mod']['skip_per_board'] && !in_array('*', $mod['boards']) && !in_array($board, $mod['boards']))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -75,6 +75,7 @@
|
|||||||
query("ALTER TABLE `theme_settings` DROP INDEX `name`") or error(db_error());
|
query("ALTER TABLE `theme_settings` DROP INDEX `name`") or error(db_error());
|
||||||
case 'v0.9.3-dev-1':
|
case 'v0.9.3-dev-1':
|
||||||
query("ALTER TABLE `mods` ADD `boards` TEXT NOT NULL") or error(db_error());
|
query("ALTER TABLE `mods` ADD `boards` TEXT NOT NULL") or error(db_error());
|
||||||
|
query("UPDATE `mods` SET `boards` = '*'") or error(db_error());
|
||||||
case false:
|
case false:
|
||||||
// Update version number
|
// Update version number
|
||||||
file_write($config['has_installed'], VERSION);
|
file_write($config['has_installed'], VERSION);
|
||||||
|
@ -113,8 +113,8 @@ CREATE TABLE IF NOT EXISTS `mods` (
|
|||||||
-- Dumping data for table `mods`
|
-- Dumping data for table `mods`
|
||||||
--
|
--
|
||||||
|
|
||||||
INSERT INTO `mods` (`id`, `username`, `password`, `type`) VALUES
|
INSERT INTO `mods` (`id`, `username`, `password`, `type`, `boards`) VALUES
|
||||||
(1, 'admin', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 2);
|
(1, 'admin', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 2, '*');
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
||||||
|
32
mod.php
32
mod.php
@ -1008,7 +1008,7 @@
|
|||||||
|
|
||||||
$boards = Array();
|
$boards = Array();
|
||||||
foreach($_POST as $name => $null) {
|
foreach($_POST as $name => $null) {
|
||||||
if(preg_match('/^board_(\w+)/', $name, $m))
|
if(preg_match('/^board_(.+)$/', $name, $m))
|
||||||
$boards[] = $m[1];
|
$boards[] = $m[1];
|
||||||
}
|
}
|
||||||
$boards = implode(',', $boards);
|
$boards = implode(',', $boards);
|
||||||
@ -1021,20 +1021,26 @@
|
|||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
|
|
||||||
modLog('Create a new user: "' . $_POST['username'] . '"');
|
modLog('Create a new user: "' . $_POST['username'] . '"');
|
||||||
}
|
header('Location: ?/users', true, $config['redirect_http']);
|
||||||
|
} else {
|
||||||
|
|
||||||
$__boards = '<ul style="list-style:none;padding:2px 5px">';
|
$__boards = '<ul style="list-style:none;padding:2px 5px">';
|
||||||
$boards = listBoards();
|
$boards = array_merge(
|
||||||
|
Array(Array('uri' => '*', 'title' => 'All')
|
||||||
|
), listBoards());
|
||||||
foreach($boards as &$_board) {
|
foreach($boards as &$_board) {
|
||||||
$__boards .= '<li>' .
|
$__boards .= '<li>' .
|
||||||
'<input type="checkbox" name="board_' . $_board['uri'] . '" id="board_' . $_board['uri'] . '"/> ' .
|
'<input type="checkbox" name="board_' . $_board['uri'] . '" id="board_' . $_board['uri'] . '"' .
|
||||||
'<label style="display:inline" for="board_' . $_board['uri'] . '">' .
|
'<label style="display:inline" for="board_' . $_board['uri'] . '">' .
|
||||||
sprintf($config['board_abbreviation'], $_board['uri']) .
|
($_board['uri'] == '*' ?
|
||||||
|
'<em>"*"</em>'
|
||||||
|
:
|
||||||
|
sprintf($config['board_abbreviation'], $_board['uri'])
|
||||||
|
) .
|
||||||
' - ' . $_board['title'] .
|
' - ' . $_board['title'] .
|
||||||
'</label>' .
|
'</label>' .
|
||||||
'</li>';
|
'</li>';
|
||||||
}
|
}
|
||||||
$__boards .= '</ul>';
|
|
||||||
|
|
||||||
$body = '<fieldset><legend>New user</legend>' .
|
$body = '<fieldset><legend>New user</legend>' .
|
||||||
|
|
||||||
@ -1065,6 +1071,7 @@
|
|||||||
,'mod'=>true
|
,'mod'=>true
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
} elseif(preg_match('/^\/users\/(\d+)(\/(promote|demote|delete))?$/', $query, $matches)) {
|
} elseif(preg_match('/^\/users\/(\d+)(\/(promote|demote|delete))?$/', $query, $matches)) {
|
||||||
$modID = &$matches[1];
|
$modID = &$matches[1];
|
||||||
|
|
||||||
@ -1112,7 +1119,7 @@
|
|||||||
if(!isset($change_password_only)) {
|
if(!isset($change_password_only)) {
|
||||||
$boards = Array();
|
$boards = Array();
|
||||||
foreach($_POST as $name => $null) {
|
foreach($_POST as $name => $null) {
|
||||||
if(preg_match('/^board_(\w+)/', $name, $m))
|
if(preg_match('/^board_(.+)$/', $name, $m))
|
||||||
$boards[] = $m[1];
|
$boards[] = $m[1];
|
||||||
}
|
}
|
||||||
$boards = implode(',', $boards);
|
$boards = implode(',', $boards);
|
||||||
@ -1149,7 +1156,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$__boards = '<ul style="list-style:none;padding:2px 5px">';
|
$__boards = '<ul style="list-style:none;padding:2px 5px">';
|
||||||
$boards = listBoards();
|
$boards = array_merge(
|
||||||
|
Array(Array('uri' => '*', 'title' => 'All')
|
||||||
|
), listBoards());
|
||||||
|
|
||||||
$_mod['boards'] = explode(',', $_mod['boards']);
|
$_mod['boards'] = explode(',', $_mod['boards']);
|
||||||
foreach($boards as &$_board) {
|
foreach($boards as &$_board) {
|
||||||
$__boards .= '<li>' .
|
$__boards .= '<li>' .
|
||||||
@ -1159,7 +1169,11 @@
|
|||||||
: '') .
|
: '') .
|
||||||
'/> ' .
|
'/> ' .
|
||||||
'<label style="display:inline" for="board_' . $_board['uri'] . '">' .
|
'<label style="display:inline" for="board_' . $_board['uri'] . '">' .
|
||||||
sprintf($config['board_abbreviation'], $_board['uri']) .
|
($_board['uri'] == '*' ?
|
||||||
|
'<em>"*"</em>'
|
||||||
|
:
|
||||||
|
sprintf($config['board_abbreviation'], $_board['uri'])
|
||||||
|
) .
|
||||||
' - ' . $_board['title'] .
|
' - ' . $_board['title'] .
|
||||||
'</label>' .
|
'</label>' .
|
||||||
'</li>';
|
'</li>';
|
||||||
|
Loading…
Reference in New Issue
Block a user