makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

specialchars data in swatch, rejiggle index variable setting and comparisons, replace .php with $phpEx in styles for swatch

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4416 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-22 00:28:45 +00:00
parent b9e00bba7d
commit 61a19df599
3 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/admin_styles.php
View file

@ -1073,7 +1073,7 @@ function csspreview()
</tr> </tr>
<tr> <tr>
<td class="row1" width="40%"><b><?php echo $user->lang['BACKGROUND_COLOUR']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['COLOUR_EXPLAIN']; ?></span></td> <td class="row1" width="40%"><b><?php echo $user->lang['BACKGROUND_COLOUR']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['COLOUR_EXPLAIN']; ?></span></td>
<td class="row2"><table cellspacing="0" cellpadding="0" border="0"><tr><td><input class="post" type="text" name="background_color" value="<?php echo $background_color; ?>" size="8" maxlength="14" onchange="document.all.stylebgcolor.bgColor=this.form.background_color.value" /></td><td>&nbsp;</td><td bgcolor="<?php echo $background_color; ?>" id="stylebgcolor" style="border:solid 1px black;"><img src="../images/spacer.gif" width="45" height="15" alt="" /></td><td class="gensmall"> &nbsp; [ <a href="swatch.php" onclick="swatch('background_color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a> ]</td></tr></table></td> <td class="row2"><table cellspacing="0" cellpadding="0" border="0"><tr><td><input class="post" type="text" name="background_color" value="<?php echo $background_color; ?>" size="8" maxlength="14" onchange="document.all.stylebgcolor.bgColor=this.form.background_color.value" /></td><td>&nbsp;</td><td bgcolor="<?php echo $background_color; ?>" id="stylebgcolor" style="border:solid 1px black;"><img src="../images/spacer.gif" width="45" height="15" alt="" /></td><td class="gensmall"> &nbsp; [ <a href="swatch.<?php echo $phpEx; ?>" onclick="swatch('background_color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a> ]</td></tr></table></td>
</tr> </tr>
<tr> <tr>
<td class="row1"><b><?php echo $user->lang['BACKGROUND_IMAGE']; ?>:</b></td> <td class="row1"><b><?php echo $user->lang['BACKGROUND_IMAGE']; ?>:</b></td>
@ -1096,8 +1096,8 @@ function csspreview()
<td class="row3" colspan="2"><b><?php echo $user->lang['FOREGROUND']; ?></b></td> <td class="row3" colspan="2"><b><?php echo $user->lang['FOREGROUND']; ?></b></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="40%"><b><?php echo $user->lang['FONT_COLOUR']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['COLOUR_EXPLAIN']; ?> <a href="swatch.php" onclick="swatch('color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a></span></td> <td class="row1" width="40%"><b><?php echo $user->lang['FONT_COLOUR']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['COLOUR_EXPLAIN']; ?> <a href="swatch.<?php echo $phpEx; ?>" onclick="swatch('color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a></span></td>
<td class="row2"><table cellspacing="0" cellpadding="0" border="0"><tr><td><input class="post" type="text" name="color" value="<?php echo $color; ?>" size="8" maxlength="14" onchange="document.all.stylecolor.bgColor=this.form.color.value" /></td><td>&nbsp;</td><td bgcolor="<?php echo $color; ?>" id="stylecolor" style="border:solid 1px black;"><img src="../images/spacer.gif" width="45" height="15" alt="" /></td><td class="gensmall"> &nbsp; [ <a href="swatch.php" onclick="swatch('color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a> ]</td></tr></table></td> <td class="row2"><table cellspacing="0" cellpadding="0" border="0"><tr><td><input class="post" type="text" name="color" value="<?php echo $color; ?>" size="8" maxlength="14" onchange="document.all.stylecolor.bgColor=this.form.color.value" /></td><td>&nbsp;</td><td bgcolor="<?php echo $color; ?>" id="stylecolor" style="border:solid 1px black;"><img src="../images/spacer.gif" width="45" height="15" alt="" /></td><td class="gensmall"> &nbsp; [ <a href="swatch.<?php echo $phpEx; ?>" onclick="swatch('color');return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a> ]</td></tr></table></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="40%"><b><?php echo $user->lang['FONT_FACE']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['FONT_FACE_EXPLAIN']; ?></span></td> <td class="row1" width="40%"><b><?php echo $user->lang['FONT_FACE']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['FONT_FACE_EXPLAIN']; ?></span></td>

53
phpBB/adm/index.php
View file

@ -1,29 +1,23 @@
<?php <?php
/*************************************************************************** // -------------------------------------------------------------
* index.php [ adm/ ] //
* ------------------- // $Id$
* begin : Saturday, Feb 13, 2001 //
* copyright : (C) 2001 The phpBB Group // FILENAME : adm/index.php
* email : support@phpbb.com // STARTED : Sat Feb 13, 2001
* // COPYRIGHT : © 2003 phpBB Group
* $Id$ // WWW : http://www.phpbb.com/
* // LICENCE : GPL vs2.0 [ see /docs/COPYING ]
***************************************************************************/ //
// -------------------------------------------------------------
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
// Define some vars
$pane = (isset($_GET['pane'])) ? $_GET['pane'] : '';
$update = ($pane == 'right') ? true : false;
define('IN_PHPBB', 1); define('IN_PHPBB', 1);
// Define some vars
$pane = (!empty($_GET['pane'])) ? htmlspecialchars($_GET['pane']) : '';
$update = ($pane == 'right') ? true : false;
// Include files // Include files
$phpbb_root_path = '../'; $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc'); require($phpbb_root_path . 'extension.inc');
@ -35,8 +29,9 @@ if (!$auth->acl_get('a_'))
trigger_error($user->lang['NO_ADMIN']); trigger_error($user->lang['NO_ADMIN']);
} }
// Generate relevant output // Generate relevant output
if (isset($_GET['pane']) && $_GET['pane'] == 'top') if ($pane == 'top')
{ {
adm_page_header('', '', false); adm_page_header('', '', false);
@ -44,7 +39,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'top')
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td><a href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td> <td><a href="<?php echo "../index.$phpEx$SID"; ?>" target="_top"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
<td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $user->lang['ADMIN_TITLE']; ?></span> &nbsp; &nbsp; &nbsp;</td> <td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $user->lang['ADMIN_TITLE']; ?></span> &nbsp; &nbsp; &nbsp;</td>
</tr> </tr>
</table> </table>
@ -54,7 +49,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'top')
adm_page_footer(false); adm_page_footer(false);
} }
else if (isset($_GET['pane']) && $_GET['pane'] == 'left') else if ($pane == 'left')
{ {
// Cheat and use the meta tag to change some stylesheet info // Cheat and use the meta tag to change some stylesheet info
adm_page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false); adm_page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false);
@ -84,10 +79,10 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
<th class="menu" height="25">&#0187; <?php echo $user->lang['RETURN_TO']; ?></th> <th class="menu" height="25">&#0187; <?php echo $user->lang['RETURN_TO']; ?></th>
</tr> </tr>
<tr> <tr>
<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $user->lang['ADMIN_INDEX']; ?></a></td> <td class="row1"><a class="genmed" href="<?php echo "index.$phpEx$SID"; ?>&amp;pane=right" target="main"><?php echo $user->lang['ADMIN_INDEX']; ?></a></td>
</tr> </tr>
<tr> <tr>
<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $user->lang['FORUM_INDEX']; ?></a></td> <td class="row2"><a class="genmed" href="<?php echo "../index.$phpEx$SID"; ?>" target="_top"><?php echo $user->lang['FORUM_INDEX']; ?></a></td>
</tr> </tr>
<?php <?php
@ -137,7 +132,7 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
adm_page_footer(false); adm_page_footer(false);
} }
elseif (isset($_GET['pane']) && $_GET['pane'] == 'right') elseif ($pane == 'right')
{ {
if ((isset($_POST['activate']) || isset($_POST['delete'])) && !empty($_POST['mark'])) if ((isset($_POST['activate']) || isset($_POST['delete'])) && !empty($_POST['mark']))
{ {
@ -546,7 +541,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
?> ?>
<tr> <tr>
<td class="<?php echo $row_class; ?>"><a href="<?php echo 'admin_users.' . $phpEx . $SID . '&amp;u=' . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td> <td class="<?php echo $row_class; ?>"><a href="<?php echo "admin_users.$phpEx$SID&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td>
<td class="<?php echo $row_class; ?>"><?php echo $user->format_date($row['user_regdate']); ?></td> <td class="<?php echo $row_class; ?>"><?php echo $user->format_date($row['user_regdate']); ?></td>
<td class="<?php echo $row_class; ?>">&nbsp;<input type="checkbox" name="mark[]" value="<?php echo $row['user_id']; ?>" />&nbsp;</td> <td class="<?php echo $row_class; ?>">&nbsp;<input type="checkbox" name="mark[]" value="<?php echo $row['user_id']; ?>" />&nbsp;</td>
</tr> </tr>

2
phpBB/adm/swatch.php
View file

@ -47,7 +47,7 @@ td {
function cell(color) function cell(color)
{ {
opener.document.forms['<?php echo $_GET['form']; ?>'].<?php echo $_GET['name']; ?>.value = '#' + color; opener.document.forms['<?php echo htmlspecialchars($_GET['form']); ?>'].<?php echo htmlspecialchars($_GET['name']); ?>.value = '#' + color;
} }
//--> //-->
</script> </script>