mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 08:47:45 +02:00
Various updates, forum links, "improve" forum management, cleanups, blah blah, note the schema changes, note also that forum management may misbehave ... reports on wrong doings are welcome ... seem to be having problems with some mcp functions under apache/win32
git-svn-id: file:///svn/phpbb/trunk@3961 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -272,7 +272,7 @@ if (isset($_REQUEST['bansubmit']))
|
||||
{
|
||||
$sql = "INSERT INTO " . BANLIST_TABLE . " ($type, ban_start, ban_end, ban_exclude, ban_reason)
|
||||
VALUES $sql";
|
||||
$result = $db->sql_query($sql);
|
||||
$db->sql_query($sql);
|
||||
}
|
||||
|
||||
if (!$ban_exclude)
|
||||
|
@@ -439,17 +439,17 @@ switch ($mode)
|
||||
<td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?> <input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><?php echo $user->lang['ADMIN_EMAIL']; ?>: </td>
|
||||
<td class="row1" width="50%"><?php echo $user->lang['CONTACT_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td>
|
||||
<td class="row2"><input type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><?php echo $user->lang['ADMIN_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ADMIN_EMAIL_EXPLAIN']; ?></span></td>
|
||||
<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="<?php echo $new['board_email']; ?>" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><?php echo $user->lang['EMAIL_SIG']; ?>: <br /><span class="gensmall"><?php echo $user->lang['EMAIL_SIG_EXPLAIN']; ?></span></td>
|
||||
<td class="row2"><textarea name="board_email_sig" rows="5" cols="30"><?php echo $new['board_email_sig']; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><?php echo $user->lang['CONTACT_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td>
|
||||
<td class="row2"><input type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><?php echo $user->lang['USE_SMTP']; ?>: <br /><span class="gensmall"><?php echo $user->lang['USE_SMTP_EXPLAIN']; ?></span></td>
|
||||
<td class="row2"><input type="radio" name="smtp_delivery" value="1" <?php echo $smtp_yes; ?> /> <?php echo $user->lang['YES']; ?> <input type="radio" name="smtp_delivery" value="0" <?php echo $smtp_no; ?> /> <?php echo $user->lang['NO']; ?></td>
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -46,7 +46,7 @@ require('pagestart.' . $phpEx);
|
||||
$mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
|
||||
$submode = (isset($_REQUEST['submode'])) ? htmlspecialchars($_REQUEST['submode']) : '';
|
||||
$which_mode = (!empty($submode) && $submode != $mode) ? $submode : $mode;
|
||||
$submit = array_values(preg_grep('#^submit_(.*)$#i', array_keys($_POST)));
|
||||
$submit = array_values(preg_grep('#^submit_(.*)$#i', array_keys($_REQUEST)));
|
||||
$submit = (sizeof($submit)) ? substr($submit[0], strpos($submit[0], '_') + 1) : '';
|
||||
|
||||
|
||||
|
@@ -74,7 +74,7 @@ if (isset($_POST['doprune']))
|
||||
// NOTE: this query will conceal all forum names, even those the user isn't authed for
|
||||
$sql = 'SELECT forum_id, forum_name
|
||||
FROM ' . FORUMS_TABLE . '
|
||||
WHERE forum_postable = 1' . (($forum_id) ? ' AND forum_id = ' . $forum_id : '') . '
|
||||
WHERE forum_type = ' . FORUM_POST . ' ' . (($forum_id) ? ' AND forum_id = ' . $forum_id : '') . '
|
||||
ORDER BY left_id ASC';
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
|
@@ -28,22 +28,10 @@ if (!$auth->acl_get('a_styles'))
|
||||
trigger_error($user->lang['No_admin']);
|
||||
}
|
||||
|
||||
/*
|
||||
$dp = opendir($phpbb_root_path . 'templates/cache/');
|
||||
while ($file = readdir($dp))
|
||||
{
|
||||
if (!is_file($phpbb_root_path . 'templates/cache/' . $file) && !is_link($phpbb_root_path . 'templates/cache/' . $file) && $file != '.' && $file != '..')
|
||||
{
|
||||
$selected = ($tplroot == $file) ? ' selected="selected"' : '';
|
||||
$tplroot_options .= '<option name="' . $file . '"' . $selected . '>' . $file . '</option>';
|
||||
}
|
||||
}
|
||||
closedir($dp);
|
||||
*/
|
||||
|
||||
//
|
||||
$mode = (isset($_GET['mode'])) ? $_GET['mode'] : $_POST['mode'];
|
||||
|
||||
|
||||
switch ($mode)
|
||||
{
|
||||
case 'editimageset':
|
||||
@@ -157,7 +145,7 @@ switch ($mode)
|
||||
{
|
||||
$str = "<?php\n" . $template->compile(stripslashes($_POST['decompile'])) . "\n?".">";
|
||||
|
||||
$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'w+');
|
||||
$fp = fopen($phpbb_root_path . 'cache/templates/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'w+');
|
||||
fwrite ($fp, $str);
|
||||
fclose($fp);
|
||||
|
||||
@@ -169,14 +157,32 @@ switch ($mode)
|
||||
}
|
||||
else if (!empty($tplname) && isset($_POST['tpl_name']))
|
||||
{
|
||||
$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'r');
|
||||
$fp = fopen($phpbb_root_path . 'cache/templates/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'r');
|
||||
while (!feof($fp))
|
||||
{
|
||||
$str .= fread($fp, 4096);
|
||||
}
|
||||
@fclose($fp);
|
||||
|
||||
$template->decompile($str);
|
||||
$match_preg = array(
|
||||
'#\$this\->_tpl_include\(\'(.*?)\'\);#',
|
||||
'#echo \$this->_tpldata\[\'\.\'\]\[0\]\[\'(.*?)\'\];#',
|
||||
'#echo \(\(isset\(\$this\->_tpldata\[\'\.\'\]\[0\]\[\'(.*?)\'\]\)\).*?;#',
|
||||
'#if \(.*?\[\'\.\'\]\[0\]\[\'(.*?)\'\]\) \{ #',
|
||||
'#\$_(.*?)_count.*?;if \(.*?\)\{#',
|
||||
);
|
||||
|
||||
$replace_preg = array(
|
||||
'<!-- INCLUDE $1 -->',
|
||||
'{$1}',
|
||||
'{$1}',
|
||||
'<!-- IF \1 -->',
|
||||
'<!-- BEGIN \1 -->',
|
||||
);
|
||||
|
||||
$str = preg_replace($match_preg, $replace_preg, $str);
|
||||
$str = str_replace('<?php ', '', $str);
|
||||
$str = str_replace(' ?>', '', $str);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -195,10 +201,10 @@ switch ($mode)
|
||||
$tplroot_options = get_templates($tplroot);
|
||||
|
||||
$tplname_options = '';
|
||||
$dp = @opendir($phpbb_root_path . 'templates/cache/' . $tplroot . '/');
|
||||
$dp = @opendir($phpbb_root_path . 'cache/templates/' . $tplroot . '/');
|
||||
while ($file = readdir($dp))
|
||||
{
|
||||
if (strstr($file, '.html.' . $phpEx) && is_file($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $file))
|
||||
if (strstr($file, '.html.' . $phpEx) && is_file($phpbb_root_path . 'cache/templates/' . $tplroot . '/' . $file))
|
||||
{
|
||||
$tpl = substr($file, 0, strpos($file, '.'));
|
||||
$selected = ($tplname == $tpl) ? ' selected="selected"' : '';
|
||||
|
@@ -114,7 +114,7 @@ page_header($l_title);
|
||||
if ($mode == 'mod')
|
||||
{
|
||||
|
||||
$forum_box = '<option value="0">' . $user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id, false, false);
|
||||
$forum_box = '<option value="0">' . $user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id);
|
||||
|
||||
?>
|
||||
<table width="100%" cellpadding="1" cellspacing="1" border="0">
|
||||
@@ -130,7 +130,7 @@ if ($mode == 'mod')
|
||||
|
||||
<table class="bg" width="100%" cellpadding="4" cellspacing="1" border="0">
|
||||
<tr>
|
||||
<td class="cat" colspan="5" height="28" align="center"><span class="gensmall"><?php echo $user->lang['DISPLAY_LOG']; ?>: <?php echo $s_limit_days; ?> <?php echo $user->lang['SORT_BY']; ?> <?php echo $s_sort_key; ?> <?php echo $s_sort_dir; ?> <input class="liteoption" type="submit" value="<?php echo $user->lang['GO']; ?>" name="sort" /></span></td>
|
||||
<td class="cat" colspan="5" height="28" align="center"><?php echo $user->lang['DISPLAY_LOG']; ?>: <?php echo $s_limit_days; ?> <?php echo $user->lang['SORT_BY']; ?>: <?php echo $s_sort_key; ?> <?php echo $s_sort_dir; ?> <input class="liteoption" type="submit" value="<?php echo $user->lang['GO']; ?>" name="sort" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th width="15%" height="25" nowrap="nowrap"><?php echo $user->lang['USERNAME']; ?></th>
|
||||
@@ -193,19 +193,17 @@ else
|
||||
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left" valign="top"> <span class="nav"><?php echo on_page($log_count, $config['topics_per_page'], $start); ?></span></td>
|
||||
<td align="right" valign="top" nowrap="nowrap"><?php
|
||||
<td align="right" valign="top" nowrap="nowrap"><span class="nav"><?php
|
||||
|
||||
if ($auth->acl_get('a_clearlogs'))
|
||||
{
|
||||
|
||||
|
||||
?><b><span class="gensmall"><a href="javascript:marklist(true);" class="gensmall"><?php echo $user->lang['MARK_ALL']; ?></a> :: <a href="javascript:marklist(false);" class="gensmall"><?php echo $user->lang['UNMARK_ALL']; ?></a></span></b> <br /><br /><?php
|
||||
?><b><a href="javascript:marklist(true);"><?php echo $user->lang['MARK_ALL']; ?></a> :: <a href="javascript:marklist(false);"><?php echo $user->lang['UNMARK_ALL']; ?></a></b> <br /><br /><?php
|
||||
|
||||
}
|
||||
|
||||
$pagination = generate_pagination("admin_viewlogs.$phpEx$SID&mode=$mode&sort_days=$sort_days&sort_key=$sort_key&sort_dir=$sort_dir", $log_count, $config['topics_per_page'], $start);
|
||||
|
||||
?><span class="nav"><?php echo $pagination; ?></span></td>
|
||||
echo generate_pagination("admin_viewlogs.$phpEx$SID&mode=$mode&st=$sort_days&sk=$sort_key&sd=$sort_dir", $log_count, $config['topics_per_page'], $start); ?></span></td>
|
||||
</tr>
|
||||
</table></form>
|
||||
|
||||
|
BIN
phpBB/adm/images/icon_folder_link.gif
Normal file
BIN
phpBB/adm/images/icon_folder_link.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 714 B |
Binary file not shown.
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 705 B |
@@ -411,7 +411,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
|
||||
}
|
||||
else
|
||||
{
|
||||
$dbsize = $user->lang['Not_available'];
|
||||
$dbsize = $user->lang['NOT_AVAILABLE'];
|
||||
}
|
||||
|
||||
if (is_int($dbsize))
|
||||
|
@@ -114,6 +114,11 @@ function page_footer($copyright_html = true)
|
||||
// Close our DB connection.
|
||||
$db->sql_close();
|
||||
|
||||
if (!empty($cache))
|
||||
{
|
||||
$cache->unload();
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
</td>
|
||||
@@ -126,7 +131,7 @@ function page_footer($copyright_html = true)
|
||||
|
||||
?>
|
||||
|
||||
<div align="center"><span class="copyright">Powered by phpBB <?php echo $config['version']; ?> © 2002 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a></span></div>
|
||||
<div class="copyright" align="center">Powered by phpBB <?php echo $config['version']; ?> © 2002 <a href="http://www.phpbb.com/" target="_phpbb">phpBB Group</a></div>
|
||||
|
||||
<br clear="all" />
|
||||
|
||||
@@ -136,11 +141,6 @@ function page_footer($copyright_html = true)
|
||||
|
||||
}
|
||||
|
||||
if (!empty($cache))
|
||||
{
|
||||
$cache->unload();
|
||||
}
|
||||
|
||||
exit;
|
||||
}
|
||||
|
||||
|
@@ -49,35 +49,21 @@ p {
|
||||
*/
|
||||
a:link, a:active, a:visited {
|
||||
color: #006699;
|
||||
}
|
||||
a.gen, a.genmed, a.gensmall {
|
||||
color: #006699;
|
||||
text-decoration: none;
|
||||
}
|
||||
a.nav {
|
||||
color: #006699;
|
||||
text-decoration: none;
|
||||
}
|
||||
a.copyright {
|
||||
color: #444444;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a.gen:hover, a.genmed:hover, a.gensmall:hover {
|
||||
color: #DD6900;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a:hover {
|
||||
color: #DD6900;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a.nav {
|
||||
color: #006699;
|
||||
text-decoration: none;
|
||||
}
|
||||
a.nav:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
a.copyright:hover {
|
||||
color: #DD6900;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Non-tag specific
|
||||
@@ -95,6 +81,9 @@ a.copyright:hover {
|
||||
color: black;
|
||||
font: bold 11px;
|
||||
}
|
||||
.forumlink {
|
||||
font: bold 120% Verdana, Arial, Helvetica, sans-serif;
|
||||
}
|
||||
.name {
|
||||
color: black;
|
||||
font-size: 11px;
|
||||
|
Reference in New Issue
Block a user