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

- first try to break things...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5108 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-03-21 22:43:07 +00:00
parent 68b7397da8
commit a4e51c9699
32 changed files with 260 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
phpBB/adm/admin_icons.php
View file

@ -19,7 +19,7 @@ if (!empty($setmodules))
} }
$filename = basename(__FILE__); $filename = basename(__FILE__);
$module['POST']['SMILE'] = "$filename$SID&mode=emoticons"; $module['POST']['SMILIES'] = "$filename$SID&mode=smilies";
$module['POST']['ICONS'] = "$filename$SID&mode=icons"; $module['POST']['ICONS'] = "$filename$SID&mode=icons";
return; return;
@ -47,10 +47,10 @@ $id = request_var('id', 0);
// What are we working on? // What are we working on?
switch ($mode) switch ($mode)
{ {
case 'emoticons': case 'smilies':
$table = SMILIES_TABLE; $table = SMILIES_TABLE;
$lang = 'SMILE'; $lang = 'SMILIES';
$fields = 'smile'; $fields = 'smiley';
$img_path = $config['smilies_path']; $img_path = $config['smilies_path'];
break; break;
@ -141,7 +141,7 @@ switch ($action)
$after = FALSE; $after = FALSE;
} }
$after_txt = ($mode == 'emoticons') ? $row['code'] : $row['icons_url']; $after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url'];
$order_list = '<option value="' . ($row[$fields . '_order']) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -&gt; ' . htmlspecialchars($after_txt)) . '</option>' . $order_list; $order_list = '<option value="' . ($row[$fields . '_order']) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -&gt; ' . htmlspecialchars($after_txt)) . '</option>' . $order_list;
} }
} }
@ -156,7 +156,7 @@ switch ($action)
$data = $_images; $data = $_images;
} }
$colspan = (($mode == 'emoticons') ? '7' : '5'); $colspan = (($mode == 'smilies') ? '7' : '5');
$colspan += ($id) ? 1 : 0; $colspan += ($id) ? 1 : 0;
$colspan += ($action == 'add') ? 2 : 0; $colspan += ($action == 'add') ? 2 : 0;
@ -177,7 +177,7 @@ switch ($action)
<td class="cat"><?php echo $user->lang[$lang . '_URL'] ?></td> <td class="cat"><?php echo $user->lang[$lang . '_URL'] ?></td>
<td class="cat"><?php echo $user->lang[$lang . '_LOCATION'] ?></td> <td class="cat"><?php echo $user->lang[$lang . '_LOCATION'] ?></td>
<?php <?php
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
?> ?>
<td class="cat"><?php echo $user->lang[$lang . '_CODE'] ?></td> <td class="cat"><?php echo $user->lang[$lang . '_CODE'] ?></td>
@ -216,12 +216,12 @@ switch ($action)
<td valign="top" class="<?php echo $row_class; ?>">[<?php echo $img; ?>]</td> <td valign="top" class="<?php echo $row_class; ?>">[<?php echo $img; ?>]</td>
<?php <?php
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
?> ?>
<td class="<?php echo $row_class; ?>"><input class="post" type="text" name="code[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['code'])) ? $img_row['code'] : '' ?>" size="10" /></td> <td class="<?php echo $row_class; ?>"><input class="post" type="text" name="code[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['code'])) ? $img_row['code'] : '' ?>" size="10" /></td>
<td class="<?php echo $row_class; ?>"><input class="post" type="text" name="emotion[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['emoticon'])) ? $img_row['emoticon'] : '' ?>" size="10" /></td> <td class="<?php echo $row_class; ?>"><input class="post" type="text" name="emotion[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['smiley'])) ? $img_row['smiley'] : '' ?>" size="10" /></td>
<?php <?php
} }
@ -286,7 +286,7 @@ switch ($action)
foreach ($images as $image) foreach ($images as $image)
{ {
if (($mode == 'emoticons' && ($image_emotion[$image] == '' || $image_code[$image] == '')) || if (($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == '')) ||
($action == 'create' && !isset($image_add[$image]))) ($action == 'create' && !isset($image_add[$image])))
{ {
} }
@ -306,10 +306,10 @@ switch ($action)
'display_on_posting'=> (isset($image_display_on_posting[$image])) ? 1 : 0, 'display_on_posting'=> (isset($image_display_on_posting[$image])) ? 1 : 0,
); );
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
$img_sql = array_merge($img_sql, array( $img_sql = array_merge($img_sql, array(
'emoticon' => $image_emotion[$image], 'smiley' => $image_emotion[$image],
'code' => $image_code[$image]) 'code' => $image_code[$image])
); );
} }
@ -403,7 +403,7 @@ switch ($action)
switch ($mode) switch ($mode)
{ {
case 'emoticons': case 'smilies':
break; break;
case 'icons': case 'icons':
@ -419,7 +419,7 @@ switch ($action)
{ {
$cur_img = array(); $cur_img = array();
$field_sql = ($mode == 'emoticons') ? 'code' : 'icons_url'; $field_sql = ($mode == 'smilies') ? 'code' : 'icons_url';
$result = $db->sql_query("SELECT $field_sql FROM $table"); $result = $db->sql_query("SELECT $field_sql FROM $table");
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -441,7 +441,7 @@ switch ($action)
if (preg_match_all("#'(.*?)', #", $pak_entry, $data)) if (preg_match_all("#'(.*?)', #", $pak_entry, $data))
{ {
if ((sizeof($data[1]) != 3 && $mode == 'icons') || if ((sizeof($data[1]) != 3 && $mode == 'icons') ||
(sizeof($data[1]) != 5 && $mode == 'emoticons')) (sizeof($data[1]) != 5 && $mode == 'smilies'))
{ {
trigger_error($user->lang['WRONG_PAK_TYPE']); trigger_error($user->lang['WRONG_PAK_TYPE']);
} }
@ -456,19 +456,19 @@ switch ($action)
} }
if ($current == 'replace' && if ($current == 'replace' &&
(($mode == 'emoticons' && !empty($cur_img[$code])) || (($mode == 'smilies' && !empty($cur_img[$code])) ||
($mode == 'icons' && !empty($cur_img[$img])))) ($mode == 'icons' && !empty($cur_img[$img]))))
{ {
$replace_sql = ($mode == 'emoticons') ? $code : $img; $replace_sql = ($mode == 'smilies') ? $code : $img;
$sql = array( $sql = array(
$fields . '_url' => $img, $fields . '_url' => $img,
$fields . '_height' => (int) $height, $fields . '_height' => (int) $height,
$fields . '_width' => (int) $width, $fields . '_width' => (int) $width,
); );
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
$sql = array_merge($sql, array( $sql = array_merge($sql, array(
'emoticon' => $emotion 'smiley' => $emotion
)); ));
} }
@ -486,11 +486,11 @@ switch ($action)
$fields . '_order' => (int) $order, $fields . '_order' => (int) $order,
); );
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
$sql = array_merge($sql, array( $sql = array_merge($sql, array(
'code' => $code, 'code' => $code,
'emoticon' => $emotion 'smiley' => $emotion
)); ));
} }
$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql)); $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql));
@ -581,9 +581,9 @@ switch ($action)
$pak .= "'" . addslashes($row[$fields . '_url']) . "', "; $pak .= "'" . addslashes($row[$fields . '_url']) . "', ";
$pak .= "'" . addslashes($row[$fields . '_height']) . "', "; $pak .= "'" . addslashes($row[$fields . '_height']) . "', ";
$pak .= "'" . addslashes($row[$fields . '_width']) . "', "; $pak .= "'" . addslashes($row[$fields . '_width']) . "', ";
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
$pak .= "'" . addslashes($row['emoticon']) . "', "; $pak .= "'" . addslashes($row['smiley']) . "', ";
$pak .= "'" . addslashes($row['code']) . "', "; $pak .= "'" . addslashes($row['code']) . "', ";
} }
$pak .= "\n"; $pak .= "\n";
@ -612,7 +612,7 @@ switch ($action)
switch ($mode) switch ($mode)
{ {
case 'emoticons': case 'smilies':
break; break;
case 'icons': case 'icons':
@ -704,7 +704,7 @@ switch ($action)
<tr> <tr>
<th><?php echo $user->lang[$lang]; ?></th> <th><?php echo $user->lang[$lang]; ?></th>
<?php <?php
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
?> ?>
<th><?php echo $user->lang['CODE']; ?></th> <th><?php echo $user->lang['CODE']; ?></th>
@ -730,23 +730,23 @@ switch ($action)
$spacer = TRUE; $spacer = TRUE;
?> ?>
<tr> <tr>
<td class="row3" colspan="<?php echo ($mode == 'emoticons') ? 5 : 3; ?>" align="center"><?php echo $user->lang[$lang . '_NOT_DISPLAYED'] ?></td> <td class="row3" colspan="<?php echo ($mode == 'smilies') ? 5 : 3; ?>" align="center"><?php echo $user->lang[$lang . '_NOT_DISPLAYED'] ?></td>
</tr> </tr>
<?php <?php
} }
$row_class = ($row_class != 'row1') ? 'row1' : 'row2'; $row_class = ($row_class != 'row1') ? 'row1' : 'row2';
$alt_text = ($mode == 'emoticon') ? htmlspecialchars($row['code']) : ''; $alt_text = ($mode == 'smilies') ? htmlspecialchars($row['code']) : '';
?> ?>
<tr> <tr>
<td class="<?php echo $row_class; ?>" align="center"><img src="<?php echo $phpbb_root_path . $img_path . '/' . $row[$fields . '_url']; ?>" width="<?php echo $row[$fields . '_width']; ?>" height="<?php echo $row[$fields . '_height']; ?>" alt="<?php echo $alt_text; ?>" title="<?php echo $alt_text; ?>" /></td> <td class="<?php echo $row_class; ?>" align="center"><img src="<?php echo $phpbb_root_path . $img_path . '/' . $row[$fields . '_url']; ?>" width="<?php echo $row[$fields . '_width']; ?>" height="<?php echo $row[$fields . '_height']; ?>" alt="<?php echo $alt_text; ?>" title="<?php echo $alt_text; ?>" /></td>
<?php <?php
if ($mode == 'emoticons') if ($mode == 'smilies')
{ {
?> ?>
<td class="<?php echo $row_class; ?>" align="center"><?php echo htmlspecialchars($row['code']); ?></td> <td class="<?php echo $row_class; ?>" align="center"><?php echo htmlspecialchars($row['code']); ?></td>
<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['emoticon']; ?></td> <td class="<?php echo $row_class; ?>" align="center"><?php echo $row['smiley']; ?></td>
<?php <?php
} }
?> ?>
@ -760,7 +760,7 @@ switch ($action)
?> ?>
<tr> <tr>
<td class="cat" colspan="<?php echo ($mode == 'emoticons') ? 5 : 3; ?>" align="center"><input type="submit" name="add" value="<?php echo $user->lang['ADD_' . $lang]; ?>" class="btnmain" />&nbsp;<input type="submit" name="edit" value="<?php echo $user->lang['EDIT_' . $lang]; ?>" class="btnmain" /></td> <td class="cat" colspan="<?php echo ($mode == 'smilies') ? 5 : 3; ?>" align="center"><input type="submit" name="add" value="<?php echo $user->lang['ADD_' . $lang]; ?>" class="btnmain" />&nbsp;<input type="submit" name="edit" value="<?php echo $user->lang['EDIT_' . $lang]; ?>" class="btnmain" /></td>
</tr> </tr>
</table> </table>
</td> </td>

2
phpBB/adm/admin_profile.php
View file

@ -376,7 +376,7 @@ if ($mode == 'create' || $mode == 'edit')
$error[] = $user->lang['EMPTY_FIELD_IDENT']; $error[] = $user->lang['EMPTY_FIELD_IDENT'];
} }
if(!preg_match('/^[a-z_]$/', $cp->vars['field_ident'])) if (!preg_match('/^[a-z_]+$/', $cp->vars['field_ident']))
{ {
$error[] = $user->lang['INVALID_CHARS_FIELD_IDENT']; $error[] = $user->lang['INVALID_CHARS_FIELD_IDENT'];
} }

5
phpBB/adm/admin_styles.php
View file

@ -2521,7 +2521,7 @@ function install_style($action, &$error, $name, $copyright, $active, $default, $
// and do the install if necessary // and do the install if necessary
if (!${$element . '_id'}) if (!${$element . '_id'})
{ {
$error = install_element($element, $action, $root_path, ${$element . '_id'}, ${$element . '_name'}, ${$element . '_copyright'}); $error = install_element($element, $error, $action, $root_path, ${$element . '_id'}, ${$element . '_name'}, ${$element . '_copyright'});
} }
} }
@ -3051,7 +3051,8 @@ function install($type, $action, $id)
<tr> <tr>
<td class="row1" width="40%"><b><?php echo $user->lang[$l_type . '_NAME']; ?>:</b></td> <td class="row1" width="40%"><b><?php echo $user->lang[$l_type . '_NAME']; ?>:</b></td>
<td class="row2"><?php <td class="row2"><?php
$style_name = 'proSilver';
$style_copyright = '(c) 2004 Tom Beddard';
echo ($action == 'add') ? '<input class="post" type="text" name="name" maxlength="30" size="30" value="' . $name . '" />' : '<b>' . ${$type . '_name'} . '</b>'; echo ($action == 'add') ? '<input class="post" type="text" name="name" maxlength="30" size="30" value="' . $name . '" />' : '<b>' . ${$type . '_name'} . '</b>';
?></td> ?></td>

10
phpBB/adm/admin_users.php
View file

@ -1058,7 +1058,7 @@ function marklist(match, status)
'viewcensors' => false, 'viewcensors' => false,
'bbcode' => true, 'bbcode' => true,
'html' => false, 'html' => false,
'smile' => true, 'smilies' => true,
'attachsig' => true, 'attachsig' => true,
); );
@ -1081,7 +1081,7 @@ function marklist(match, status)
unset($data); unset($data);
// Set the popuppm option // Set the popuppm option
$option_ary = array('popuppm', 'viewimg', 'viewflash', 'viewsmilies', 'viewsigs', 'viewavatars', 'viewcensors', 'bbcode', 'html', 'smile', 'attachsig'); $option_ary = array('popuppm', 'viewimg', 'viewflash', 'viewsmilies', 'viewsigs', 'viewavatars', 'viewcensors', 'bbcode', 'html', 'smilies', 'attachsig');
foreach ($option_ary as $option) foreach ($option_ary as $option)
{ {
@ -1133,7 +1133,7 @@ function marklist(match, status)
} }
unset($option_ary); unset($option_ary);
$option_ary = array('popuppm', 'viewimg', 'viewflash', 'viewsmilies', 'viewsigs', 'viewavatars', 'viewcensors', 'bbcode', 'html', 'smile', 'attachsig'); $option_ary = array('popuppm', 'viewimg', 'viewflash', 'viewsmilies', 'viewsigs', 'viewavatars', 'viewcensors', 'bbcode', 'html', 'smilies', 'attachsig');
foreach ($option_ary as $option) foreach ($option_ary as $option)
{ {
@ -1210,8 +1210,8 @@ function marklist(match, status)
<td class="row2"><input type="radio" name="html" value="1"<?php echo $html_yes; ?> /><span class="gen"><?php echo $user->lang['YES']; ?></span>&nbsp;&nbsp;<input type="radio" name="html" value="0"<?php echo $html_no; ?> /><span class="gen"><?php echo $user->lang['NO']; ?></span></td> <td class="row2"><input type="radio" name="html" value="1"<?php echo $html_yes; ?> /><span class="gen"><?php echo $user->lang['YES']; ?></span>&nbsp;&nbsp;<input type="radio" name="html" value="0"<?php echo $html_no; ?> /><span class="gen"><?php echo $user->lang['NO']; ?></span></td>
</tr> </tr>
<tr> <tr>
<td class="row1"><b><?php echo $user->lang['DEFAULT_SMILE']; ?>:</b></td> <td class="row1"><b><?php echo $user->lang['DEFAULT_SMILIES']; ?>:</b></td>
<td class="row2"><input type="radio" name="smile" value="1"<?php echo $smile_yes; ?> /><span class="gen"><?php echo $user->lang['YES']; ?></span>&nbsp;&nbsp;<input type="radio" name="smile" value="0"<?php echo $smile_no; ?> /><span class="gen"><?php echo $user->lang['NO']; ?></span></td> <td class="row2"><input type="radio" name="smilies" value="1"<?php echo $smilies_yes; ?> /><span class="gen"><?php echo $user->lang['YES']; ?></span>&nbsp;&nbsp;<input type="radio" name="smilies" value="0"<?php echo $smilies_no; ?> /><span class="gen"><?php echo $user->lang['NO']; ?></span></td>
</tr> </tr>
<tr> <tr>
<td class="row1"><b><?php echo $user->lang['DEFAULT_ADD_SIG']; ?>:</b></td> <td class="row1"><b><?php echo $user->lang['DEFAULT_ADD_SIG']; ?>:</b></td>

2
phpBB/adm/editor.js
View file

@ -47,7 +47,7 @@ function arraypop(thearray) {
return retval; return retval;
} }
function emoticon(text) { function smiley(text) {
text = ' ' + text + ' '; text = ' ' + text + ' ';
if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
var caretPos = document.forms[form_name].elements[text_name].caretPos; var caretPos = document.forms[form_name].elements[text_name].caretPos;

3
phpBB/common.php
View file

@ -251,6 +251,9 @@ $db = new sql_db();
// Connect to DB // Connect to DB
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
// We do not need this any longer, unset for safety purposes
unset($dbpasswd);
// Grab global variables, re-cache if necessary // Grab global variables, re-cache if necessary
if ($config = $cache->get('config')) if ($config = $cache->get('config'))
{ {

6
phpBB/download.php
View file

@ -130,16 +130,16 @@ else
// Determine the 'presenting'-method // Determine the 'presenting'-method
if ($download_mode == PHYSICAL_LINK) if ($download_mode == PHYSICAL_LINK)
{ {
if (!@is_dir($phpbb_root_path . $config['upload_dir'])) if (!@is_dir($phpbb_root_path . $config['upload_path']))
{ {
trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']); trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
} }
redirect($phpbb_root_path . $config['upload_dir'] . '/' . $attachment['physical_filename']); redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
} }
else else
{ {
send_file_to_browser($attachment, $config['upload_dir'], $extensions[$attachment['extension']]['display_cat']); send_file_to_browser($attachment, $config['upload_path'], $extensions[$attachment['extension']]['display_cat']);
exit; exit;
} }

3
phpBB/index.php
View file

@ -56,7 +56,8 @@ if ($config['load_birthdays'])
$now = getdate(); $now = getdate();
$sql = 'SELECT user_id, username, user_colour, user_birthday $sql = 'SELECT user_id, username, user_colour, user_birthday
FROM ' . USERS_TABLE . " FROM ' . USERS_TABLE . "
WHERE user_birthday LIKE '" . sprintf('%2d-%2d-', $now['mday'], $now['mon']) . "%'"; WHERE user_birthday LIKE '" . sprintf('%2d-%2d-', $now['mday'], $now['mon']) . "%'
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))

22
phpBB/install/schemas/firebird_schema.sql
View file

@ -528,13 +528,13 @@ CREATE TABLE phpbb_sitelist (
# phpbb_smilies # phpbb_smilies
CREATE TABLE phpbb_smilies ( CREATE TABLE phpbb_smilies (
smile_id INTEGER NOT NULL, smiley_id INTEGER NOT NULL,
code VARCHAR(10), code VARCHAR(10),
emoticon VARCHAR(50), smiley VARCHAR(50),
smile_url VARCHAR(50), smiley_url VARCHAR(50),
smile_width INTEGER DEFAULT 0 NOT NULL, smiley_width INTEGER DEFAULT 0 NOT NULL,
smile_height INTEGER DEFAULT 0 NOT NULL, smiley_height INTEGER DEFAULT 0 NOT NULL,
smile_order INTEGER DEFAULT 0 NOT NULL, smiley_order INTEGER DEFAULT 0 NOT NULL,
display_on_posting INTEGER DEFAULT 1 NOT NULL display_on_posting INTEGER DEFAULT 1 NOT NULL
);; );;
@ -1275,7 +1275,7 @@ ADD PRIMARY KEY (
ALTER TABLE phpbb_smilies ALTER TABLE phpbb_smilies
ADD PRIMARY KEY ( ADD PRIMARY KEY (
smile_id smiley_id
);; );;
ALTER TABLE phpbb_styles ALTER TABLE phpbb_styles
@ -1530,9 +1530,9 @@ CREATE GENERATOR G_phpbb_sitelistsite_idGen24;;
SET GENERATOR G_phpbb_sitelistsite_idGen24 TO 0;; SET GENERATOR G_phpbb_sitelistsite_idGen24 TO 0;;
CREATE GENERATOR G_phpbb_smiliessmile_idGen25;; CREATE GENERATOR G_phpbb_smiliessmiley_idGen25;;
SET GENERATOR G_phpbb_smiliessmile_idGen25 TO 0;; SET GENERATOR G_phpbb_smiliessmiley_idGen25 TO 0;;
CREATE GENERATOR G_phpbb_stylesstyle_idGen26;; CREATE GENERATOR G_phpbb_stylesstyle_idGen26;;
@ -1737,11 +1737,11 @@ BEGIN
NEW.site_id = GEN_ID(G_phpbb_sitelistsite_idGen24, 1); NEW.site_id = GEN_ID(G_phpbb_sitelistsite_idGen24, 1);
END;; END;;
CREATE TRIGGER NextG_phpbb_smiliessmile_idGen2 FOR phpbb_smilies CREATE TRIGGER NextG_phpbb_smiliessmiley_idGen2 FOR phpbb_smilies
BEFORE INSERT BEFORE INSERT
AS AS
BEGIN BEGIN
NEW.smile_id = GEN_ID(G_phpbb_smiliessmile_idGen25, 1); NEW.smiley_id = GEN_ID(G_phpbb_smiliessmiley_idGen25, 1);
END;; END;;
CREATE TRIGGER tNextG_phpbb_stylesstyle_idGen2 FOR phpbb_styles CREATE TRIGGER tNextG_phpbb_stylesstyle_idGen2 FOR phpbb_styles

20
phpBB/install/schemas/mssql_schema.sql
View file

@ -533,13 +533,13 @@ CREATE TABLE [phpbb_sitelist] (
GO GO
CREATE TABLE [phpbb_smilies] ( CREATE TABLE [phpbb_smilies] (
[smile_id] [int] IDENTITY (1, 1) NOT NULL , [smiley_id] [int] IDENTITY (1, 1) NOT NULL ,
[code] [varchar] (10) NULL , [code] [varchar] (10) NULL ,
[emoticon] [varchar] (50) NULL , [smiley] [varchar] (50) NULL ,
[smile_url] [varchar] (50) NULL , [smiley_url] [varchar] (50) NULL ,
[smile_width] [int] NOT NULL , [smiley_width] [int] NOT NULL ,
[smile_height] [int] NOT NULL , [smiley_height] [int] NOT NULL ,
[smile_order] [int] NOT NULL , [smiley_order] [int] NOT NULL ,
[display_on_posting] [int] NOT NULL [display_on_posting] [int] NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
@ -1073,7 +1073,7 @@ GO
ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY CLUSTERED
( (
[smile_id] [smiley_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
@ -1463,9 +1463,9 @@ ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD
GO GO
ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
CONSTRAINT [DF_smilie_smile_width] DEFAULT (0) FOR [smile_width], CONSTRAINT [DF_smilie_smiley_width] DEFAULT (0) FOR [smiley_width],
CONSTRAINT [DF_smilie_smile_height] DEFAULT (0) FOR [smile_height], CONSTRAINT [DF_smilie_smiley_height] DEFAULT (0) FOR [smiley_height],
CONSTRAINT [DF_smilie_smile_order] DEFAULT (0) FOR [smile_order], CONSTRAINT [DF_smilie_smiley_order] DEFAULT (0) FOR [smiley_order],
CONSTRAINT [DF_smilie_display_on_posting] DEFAULT (1) FOR [display_on_posting] CONSTRAINT [DF_smilie_display_on_posting] DEFAULT (1) FOR [display_on_posting]
GO GO

14
phpBB/install/schemas/mysql_schema.sql
View file

@ -622,15 +622,15 @@ CREATE TABLE phpbb_sitelist (
# Table: 'phpbb_smilies' # Table: 'phpbb_smilies'
CREATE TABLE phpbb_smilies ( CREATE TABLE phpbb_smilies (
smile_id tinyint(4) UNSIGNED NOT NULL auto_increment, smiley_id tinyint(4) UNSIGNED NOT NULL auto_increment,
code char(10), code char(10),
emoticon char(50), smiley char(50),
smile_url char(50), smiley_url char(50),
smile_width tinyint(4) UNSIGNED NOT NULL, smiley_width tinyint(4) UNSIGNED NOT NULL,
smile_height tinyint(4) UNSIGNED NOT NULL, smiley_height tinyint(4) UNSIGNED NOT NULL,
smile_order tinyint(4) UNSIGNED NOT NULL, smiley_order tinyint(4) UNSIGNED NOT NULL,
display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
PRIMARY KEY (smile_id) PRIMARY KEY (smiley_id)
); );
# Table: 'phpbb_styles' # Table: 'phpbb_styles'

24
phpBB/install/schemas/postgres_schema.sql
View file

@ -847,25 +847,25 @@ CREATE TABLE phpbb_sitelist (
SELECT SETVAL('phpbb_sitelist_site_id_seq',(select case when max(site_id)>0 then max(site_id)+1 else 1 end from phpbb_sitelist)); SELECT SETVAL('phpbb_sitelist_site_id_seq',(select case when max(site_id)>0 then max(site_id)+1 else 1 end from phpbb_sitelist));
/* Table: phpbb_smilies */ /* Table: phpbb_smilies */
CREATE SEQUENCE phpbb_smilies_smile_id_seq; CREATE SEQUENCE phpbb_smilies_smiley_id_seq;
CREATE TABLE phpbb_smilies ( CREATE TABLE phpbb_smilies (
smile_id INT2 DEFAULT nextval('phpbb_smilies_smile_id_seq'), smiley_id INT2 DEFAULT nextval('phpbb_smilies_smiley_id_seq'),
code char(10), code char(10),
emoticon char(50), smiley char(50),
smile_url char(50), smiley_url char(50),
smile_width INT2 NOT NULL, smiley_width INT2 NOT NULL,
smile_height INT2 NOT NULL, smiley_height INT2 NOT NULL,
smile_order INT2 NOT NULL, smiley_order INT2 NOT NULL,
display_on_posting INT2 DEFAULT '1' NOT NULL, display_on_posting INT2 DEFAULT '1' NOT NULL,
PRIMARY KEY (smile_id), PRIMARY KEY (smiley_id),
CHECK (smile_width>=0), CHECK (smiley_width>=0),
CHECK (smile_height>=0), CHECK (smiley_height>=0),
CHECK (smile_order>=0), CHECK (smiley_order>=0),
CHECK (display_on_posting>=0) CHECK (display_on_posting>=0)
); );
SELECT SETVAL('phpbb_smilies_smile_id_seq',(select case when max(smile_id)>0 then max(smile_id)+1 else 1 end from phpbb_smilies)); SELECT SETVAL('phpbb_smilies_smiley_id_seq',(select case when max(smiley_id)>0 then max(smiley_id)+1 else 1 end from phpbb_smilies));
/* Table: phpbb_styles */ /* Table: phpbb_styles */
CREATE SEQUENCE phpbb_styles_style_id_seq; CREATE SEQUENCE phpbb_styles_style_id_seq;

62
phpBB/install/schemas/schema_data.sql
View file

@ -55,10 +55,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','
INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smilies');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path','images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path','images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path','images/ranks'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path','images/ranks');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
@ -146,7 +147,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_dir', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
@ -496,42 +496,42 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post
# -- Smilies # -- Smilies
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15); INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15);
# -- icons ... these are just some of those in CVS # -- icons ... these are just some of those in CVS
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/arrow_bold_rgt.gif', 19, 19, 1, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/arrow_bold_rgt.gif', 19, 19, 1, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface_anim.gif', 19, 19, 9, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/redface_anim.gif', 19, 19, 9, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mr_green.gif', 19, 19, 10, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/mr_green.gif', 19, 19, 10, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/musical.gif', 19, 19, 4, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/musical.gif', 19, 19, 4, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/asterix.gif', 19, 19, 2, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/asterix.gif', 19, 19, 2, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/square.gif', 19, 19, 3, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/square.gif', 19, 19, 3, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alien_grn.gif', 19, 19, 5, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/alien_grn.gif', 19, 19, 5, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/idea.gif', 19, 19, 8, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/idea.gif', 19, 19, 8, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 19, 19, 6, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/question.gif', 19, 19, 6, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/exclaim.gif', 19, 19, 7, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/exclaim.gif', 19, 19, 7, 1);
# MSSQL IDENTITY phpbb_search_wordlist ON # # MSSQL IDENTITY phpbb_search_wordlist ON #

71
phpBB/language/en/admin.php
View file

@ -91,7 +91,7 @@ $lang += array(
'GROUP_PERMS' => 'Group permissions', 'GROUP_PERMS' => 'Group permissions',
'POST_CAT' => 'Posting', 'POST_CAT' => 'Posting',
'SMILE' => 'Smilies', 'SMILIES' => 'Smilies',
'ICONS' => 'Icons', 'ICONS' => 'Icons',
'WORD_CENSOR' => 'Word Censors', 'WORD_CENSOR' => 'Word Censors',
@ -439,7 +439,7 @@ $lang += array(
'acl_a_cookies' => 'Can alter cookie settings', 'acl_a_cookies' => 'Can alter cookie settings',
'acl_a_names' => 'Can alter disallowed names', 'acl_a_names' => 'Can alter disallowed names',
'acl_a_words' => 'Can alter word censors', 'acl_a_words' => 'Can alter word censors',
'acl_a_icons' => 'Can alter topic icons and emoticons', 'acl_a_icons' => 'Can alter topic icons and smilies',
'acl_a_search' => 'Can re-index search tables', 'acl_a_search' => 'Can re-index search tables',
'acl_a_prune' => 'Can prune forums', 'acl_a_prune' => 'Can prune forums',
'acl_a_bbcode' => 'Can define BBCode tags', 'acl_a_bbcode' => 'Can define BBCode tags',
@ -704,7 +704,7 @@ $lang += array(
'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session inproving security.', 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session inproving security.',
'ENABLE_GZIP' => 'Enable GZip Compression', 'ENABLE_GZIP' => 'Enable GZip Compression',
'SMILIES_PATH' => 'Smilies storage path', 'SMILIES_PATH' => 'Smilies storage path',
'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/smiles', 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/smilies',
'ICONS_PATH' => 'Post icons storage path', 'ICONS_PATH' => 'Post icons storage path',
'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/icons', 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/icons',
'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path',
@ -1028,60 +1028,71 @@ $lang += array(
// Smiley and topic icons // Smiley and topic icons
$lang += array( $lang += array(
'ICONS_EXPLAIN' => 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.', 'ICONS_EXPLAIN' => 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
'SMILE_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.', 'SMILIES_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
'IMPORT_SMILE' => 'Install smilies pak', 'IMPORT_SMILIES' => 'Install smilies pak',
'EXPORT_SMILE' => 'Create smilies pak', 'EXPORT_SMILIES' => 'Create smilies pak',
'IMPORT_ICONS' => 'Install icons pak', 'IMPORT_ICONS' => 'Install icons pak',
'EXPORT_ICONS' => 'Create icons pak', 'EXPORT_ICONS' => 'Create icons pak',
'MASS_ADD_SMILE'=> 'Add multiple smilies', 'MASS_ADD_SMILIES'=> 'Add multiple smilies',
'ADD_SMILE' => 'Add single smilie', 'ADD_SMILIES' => 'Add single smiley',
'ADD_ICONS' => 'Add single icon', 'ADD_ICONS' => 'Add single icon',
'ADD_ICONS' => 'Add multiple icons', 'ADD_ICONS' => 'Add multiple icons',
'EDIT_SMILE' => 'Edit smilies', 'EDIT_SMILIES' => 'Edit smilies',
'EDIT_ICONS' => 'Edit Icons', 'EDIT_ICONS' => 'Edit Icons',
'SMILE_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page', 'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page', 'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page',
'CODE' => 'Code',
'EMOTION' => 'Emotion', 'EMOTION' => 'Emotion',
'REORDER' => 'Reorder', 'REORDER' => 'Reorder',
'DISPLAY' => 'Display', 'DISPLAY' => 'Display',
'DIMENSIONS' => 'Dimensions', 'DIMENSIONS' => 'Dimensions',
'FIRST' => 'First', 'FIRST' => 'First',
'AFTER_SMILE' => 'After %s', 'AFTER_SMILIES' => 'After %s',
'AFTER_ICONS' => 'After %s', 'AFTER_ICONS' => 'After %s',
'SMILE_CONFIG' => 'Smilie configuration',
'SMILE_IMAGE' => 'Smilie image', 'SMILIES_CONFIG' => 'Smiley configuration',
'SMILE_CODE' => 'Smilie code', 'SMILIES_IMAGE' => 'Smiley image',
'SMILE_URL' => 'Smilie image file', 'SMILIES_CODE' => 'Smiley code',
'SMILE_ORDER' => 'Smilie order', 'SMILIES_URL' => 'Smiley image file',
'SMILE_EMOTION' => 'Emotion', 'SMILIES_ORDER' => 'Smiley order',
'SMILE_ADD' => 'Add a new Smilie', 'SMILIES_EMOTION' => 'Emotion',
'SMILE_EDIT' => 'Edit Smilie', 'SMILIES_ADD' => 'Add a new Smiley',
'SMILE_LOCATION'=> 'Smilie location', 'SMILIES_EDIT' => 'Edit Smiley',
'SMILIES_LOCATION' => 'Smiley location',
'SMILIES_WIDTH' => 'Smiley width',
'SMILIES_HEIGHT' => 'Smiley height',
'ICONS_CONFIG' => 'Icon configuration', 'ICONS_CONFIG' => 'Icon configuration',
'ICONS_IMAGE' => 'Icon image', 'ICONS_IMAGE' => 'Icon image',
'ICONS_ORDER' => 'Icon order',
'ICONS_LOCATION' => 'Icon location', 'ICONS_LOCATION' => 'Icon location',
'ICONS_URL' => 'Icon image file',
'ICONS_ORDER' => 'Icon order',
'ICONS_ADD' => 'Add a new Icon', 'ICONS_ADD' => 'Add a new Icon',
'ICONS_EDIT' => 'Edit Icon', 'ICONS_EDIT' => 'Edit Icon',
'EXPORT_SMILE_EXPLAIN' => 'To create a package of your currently installed smilies, click %sHERE%s to download the emoticons.pak file. Once downloaded create a zip or tgz file containing all of your smilies plus this .pak configuration file.', 'ICONS_WIDTH' => 'Icon width',
'ICONS_HEIGHT' => 'Icon height',
'EXPORT_SMILIES_EXPLAIN' => 'To create a package of your currently installed smilies, click %sHERE%s to download the smilies.pak file. Once downloaded create a zip or tgz file containing all of your smilies plus this .pak configuration file.',
'EXPORT_ICONS_EXPLAIN' => 'To create a package of your currently installed icons, click %sHERE%s to download the icons package file. Once downloaded create a zip or tgz file containing all of your icons plus this .pak configuration file.', 'EXPORT_ICONS_EXPLAIN' => 'To create a package of your currently installed icons, click %sHERE%s to download the icons package file. Once downloaded create a zip or tgz file containing all of your icons plus this .pak configuration file.',
'NO_SMILE_EXPORT' => 'You have no smilies with which to create a package.', 'NO_SMILIES_EXPORT' => 'You have no smilies with which to create a package.',
'NO_ICONS_EXPORT' => 'You have no icons with which to create a package.', 'NO_ICONS_EXPORT' => 'You have no icons with which to create a package.',
'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.', 'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.',
'SELECT_PACKAGE' => 'Select a package file', 'SELECT_PACKAGE' => 'Select a package file',
'DELETE_ALL' => 'Delete all', 'DELETE_ALL' => 'Delete all',
'KEEP_ALL' => 'Keep all', 'KEEP_ALL' => 'Keep all',
'REPLACE_MATCHES' => 'Replace matches', 'REPLACE_MATCHES' => 'Replace matches',
'NO_SMILE_PAK' => 'No smilie packages found.', 'NO_SMILIES_PAK' => 'No smiley packages found.',
'CURRENT_SMILE' => 'Current smilies', 'CURRENT_SMILIES' => 'Current smilies',
'SMILE_IMPORT_SUCCESS' => 'The smilies pack was imported successfully', 'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully',
'NO_ICONS_PAK' => 'No icon packages found.', 'NO_ICONS_PAK' => 'No icon packages found.',
'CURRENT_ICONS' => 'Current icons', 'CURRENT_ICONS' => 'Current icons',
'DISPLAY_ON_POSTING' => 'Display on posting',
'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully', 'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully',
'SMILE_DELETED' => 'The smilie has been removed successfully.', 'SMILIES_DELETED' => 'The smiley has been removed successfully.',
'SMILE_EDITED' => 'The smilie has been updated successfully.', 'SMILIES_EDITED' => 'The smiley has been updated successfully.',
'SMILE_ADDED' => 'The smilie has been added successfully.', 'SMILIES_ADDED' => 'The smiley has been added successfully.',
'SMILE_IMPORTED' => 'The smilies pack has been installed successfully.', 'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.',
'ICONS_DELETED' => 'The icon has been removed successfully.', 'ICONS_DELETED' => 'The icon has been removed successfully.',
'ICONS_EDITED' => 'The icon has been updated successfully.', 'ICONS_EDITED' => 'The icon has been updated successfully.',
'ICONS_ADDED' => 'The icon has been added successfully.', 'ICONS_ADDED' => 'The icon has been added successfully.',

7
phpBB/language/en/common.php
View file

@ -58,10 +58,15 @@ $lang += array(
'ASCENDING' => 'Ascending', 'ASCENDING' => 'Ascending',
'ATTACHMENTS' => 'Attachments', 'ATTACHMENTS' => 'Attachments',
'AUTHOR' => 'Author', 'AUTHOR' => 'Author',
'AVATAR_DISALLOWED_EXTENSION' => 'The Extension %s is not allowed',
'AVATAR_EMPTY_REMOTE_DATA' => 'Avatar could not be uploaded, please try uploading the file manually.',
'AVATAR_INVALID_FILENAME' => '%s is an invalid filename',
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.', 'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.', 'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.',
'AVATAR_PHP_SIZE_NA' => 'The avatar is too huge in filesize.<br />Could not determine the maximum size defined by PHP in php.ini.',
'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar is too huge in filesize, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.',
'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %d bytes.', 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %1d %2s.',
'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.', 'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.',
'BACK_TO_TOP' => 'Top', 'BACK_TO_TOP' => 'Top',

18
phpBB/language/en/posting.php
View file

@ -34,9 +34,6 @@ $lang += array(
'ADD_POLL' => 'Add Poll', 'ADD_POLL' => 'Add Poll',
'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank', 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank',
'ALREADY_DELETED' => 'Sorry but this message is already deleted.', 'ALREADY_DELETED' => 'Sorry but this message is already deleted.',
'ATTACHMENT_PHP_SIZE_NA' => 'The attachment is too big.<br />Could not get determine the maximum size defined by PHP in php.ini.',
'ATTACHMENT_PHP_SIZE_OVERRUN' => 'The attachment is too big, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
'ATTACHMENT_TOO_BIG' => 'The attachment is too big, maximum allowed size is %1d %2s',
'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.', 'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.',
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)', 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',
@ -87,9 +84,9 @@ $lang += array(
'EDIT_POST' => 'Edit Post', 'EDIT_POST' => 'Edit Post',
'EDIT_REASON' => 'Reason for editing this post', 'EDIT_REASON' => 'Reason for editing this post',
'EMOTICONS' => 'Emoticons', 'SMILIES' => 'Smilies',
'EMPTY_MESSAGE' => 'You must enter a message when posting.', 'EMPTY_MESSAGE' => 'You must enter a message when posting.',
'ERROR_IMAGESIZE' => 'The Image you tried to attach is too big, maximum allowed dimensions are %1d px X %2d px.', 'EMPTY_REMOTE_DATA' => 'File could not be uploaded, please try uploading the file manually.',
'FLASH_IS_OFF' => '[flash] is <u>OFF</u>', 'FLASH_IS_OFF' => '[flash] is <u>OFF</u>',
'FLASH_IS_ON' => '[flash] is <u>ON</u>', 'FLASH_IS_ON' => '[flash] is <u>ON</u>',
@ -119,14 +116,17 @@ $lang += array(
'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than <b>%d</b> characters.', 'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than <b>%d</b> characters.',
'MESSAGE_DELETED' => 'Your message has been deleted successfully', 'MESSAGE_DELETED' => 'Your message has been deleted successfully',
'MORE_EMOTICONS' => 'View more Emoticons', 'MORE_SMILIES' => 'View more smilies',
'NOTIFY_REPLY' => 'Send me an email when a reply is posted', 'NOTIFY_REPLY' => 'Send me an email when a reply is posted',
'NOT_UPLOADED' => 'File could not be uploaded.',
'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options', 'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options',
'NO_POLL_TITLE' => 'You have to enter a poll title', 'NO_POLL_TITLE' => 'You have to enter a poll title',
'NO_POST' => 'The requested post does not exist.', 'NO_POST' => 'The requested post does not exist.',
'NO_POST_MODE' => 'No post mode specified', 'NO_POST_MODE' => 'No post mode specified',
'PHP_SIZE_NA' => 'The attachment is too big.<br />Could not determine the maximum size defined by PHP in php.ini.',
'PHP_SIZE_OVERRUN' => 'The attachment is too big, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
'PLACE_INLINE' => 'Place Inline', 'PLACE_INLINE' => 'Place Inline',
'POLL_DELETE' => 'Delete Poll', 'POLL_DELETE' => 'Delete Poll',
'POLL_FOR' => 'Run poll for', 'POLL_FOR' => 'Run poll for',
@ -169,7 +169,7 @@ $lang += array(
'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maxmimum.', 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maxmimum.',
'TOO_MANY_CHARS' => 'Your message contains too many characters.', 'TOO_MANY_CHARS' => 'Your message contains too many characters.',
'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options', 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options',
'TOO_MANY_SMILIES' => 'Your message contains too many emoticons. A maximum of %d emoticons are allowed.', 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. A maximum of %d smilies are allowed.',
'TOO_MANY_URLS' => 'Your message contains too many urls. A maximum of %d urls are allowed.', 'TOO_MANY_URLS' => 'Your message contains too many urls. A maximum of %d urls are allowed.',
'TOO_MANY_USER_OPTIONS' => 'You cannot specify more Options per User than existing poll options', 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more Options per User than existing poll options',
'TOPIC_BUMPED' => 'Topic has been bumped successfully', 'TOPIC_BUMPED' => 'Topic has been bumped successfully',
@ -177,6 +177,7 @@ $lang += array(
'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ',
'UPDATE_COMMENT' => 'Update comment', 'UPDATE_COMMENT' => 'Update comment',
'URL_INVALID' => 'The URL you specified is invalid.',
'USER_CANNOT_BUMP' => 'You cannot bump topics in this forum', 'USER_CANNOT_BUMP' => 'You cannot bump topics in this forum',
'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum', 'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum',
'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum', 'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum',
@ -184,6 +185,9 @@ $lang += array(
'USER_CANNOT_REPLY' => 'You cannot reply in this forum', 'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
'VIEW_MESSAGE' => 'Click %sHere%s to view your message', 'VIEW_MESSAGE' => 'Click %sHere%s to view your message',
'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s',
'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.',
); );
?> ?>

30
phpBB/language/en/ucp.php
View file

@ -99,7 +99,7 @@ $lang += array(
'DEFAULT_BBCODE' => 'Enable BBCode by default', 'DEFAULT_BBCODE' => 'Enable BBCode by default',
'DEFAULT_HTML' => 'Enable HTML by default', 'DEFAULT_HTML' => 'Enable HTML by default',
'DEFAULT_NOTIFY' => 'Notify me upon replies by default', 'DEFAULT_NOTIFY' => 'Notify me upon replies by default',
'DEFAULT_SMILE' => 'Enable smilies by default', 'DEFAULT_SMILIES' => 'Enable smilies by default',
'DEFINED_RULES' => 'Defined Rules', 'DEFINED_RULES' => 'Defined Rules',
'DELETE_ALL' => 'Delete all', 'DELETE_ALL' => 'Delete all',
'DELETE_ATTACHMENT' => 'Delete Attachment', 'DELETE_ATTACHMENT' => 'Delete Attachment',
@ -320,29 +320,35 @@ $lang += array(
'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will recieve an email at the address you provide that contains an account activation link.', 'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will recieve an email at the address you provide that contains an account activation link.',
'UCP_ICQ' => 'ICQ Number', 'UCP_ICQ' => 'ICQ Number',
'UCP_JABBER' => 'Jabber Address', 'UCP_JABBER' => 'Jabber Address',
'UCP_MAIN' => 'Overview', 'UCP_MAIN' => 'Overview',
'UCP_BOOKMARKS' => 'Bookmarks', 'UCP_MAIN_BOOKMARKS' => 'Bookmarks',
'UCP_DRAFTS' => 'Saved drafts', 'UCP_MAIN_DRAFTS' => 'Saved drafts',
'UCP_FRONT' => 'Front page', 'UCP_MAIN_FRONT' => 'Front page',
'UCP_SUBSCRIBED' => 'Subscribed', 'UCP_MAIN_SUBSCRIBED' => 'Subscribed',
'UCP_MSNM' => 'MSN Messenger', 'UCP_MSNM' => 'MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files', 'UCP_NO_ATTACHMENTS' => 'You have posted no files',
'UCP_PREFS' => 'Preferences', 'UCP_PREFS' => 'Preferences',
'UCP_PERSONAL' => 'Personal Settings', 'UCP_PREFS_PERSONAL' => 'Personal Settings',
'UCP_POST' => 'Posting Messages', 'UCP_PREFS_POST' => 'Posting Messages',
'UCP_VIEW' => 'Viewing Posts', 'UCP_PREFS_VIEW' => 'Viewing Posts',
'UCP_PM' => 'Private Messages', 'UCP_PM' => 'Private Messages',
'UCP_PM_COMPOSE' => 'Compose Message', 'UCP_PM_COMPOSE' => 'Compose Message',
'UCP_PM_DRAFTS' => 'PM Drafts', 'UCP_PM_DRAFTS' => 'PM Drafts',
'UCP_PM_OPTIONS' => 'Options', 'UCP_PM_OPTIONS' => 'Options',
'UCP_PM_UNREAD' => 'Unread Messages', 'UCP_PM_UNREAD' => 'Unread Messages',
'UCP_PM_VIEW_MESSAGES' => 'View Messages', 'UCP_PM_VIEW_MESSAGES' => 'View Messages',
'UCP_PROFILE' => 'Profile', 'UCP_PROFILE' => 'Profile',
'UCP_AVATAR' => 'Your avatar', 'UCP_PROFILE_AVATAR' => 'Your avatar',
'UCP_PROFILE_INFO' => 'Your Profile', 'UCP_PROFILE_PROFILE_INFO' => 'Your Profile',
'UCP_REG_DETAILS' => 'Registration details', 'UCP_PROFILE_REG_DETAILS' => 'Registration details',
'UCP_PROFILE_SIGNATURE' => 'Your signature',
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
'UCP_SIGNATURE' => 'Your signature',
'UCP_REMIND' => 'Send password', 'UCP_REMIND' => 'Send password',
'UCP_WATCHED' => 'Watched items', 'UCP_WATCHED' => 'Watched items',
'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',

12
phpBB/memberlist.php
View file

@ -135,7 +135,8 @@ switch ($mode)
// Grab relevant data // Grab relevant data
$sql = "SELECT user_id, username, user_email, user_lang, $sql_field $sql = "SELECT user_id, username, user_email, user_lang, $sql_field
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id = $user_id"; WHERE user_id = $user_id
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result))) if (!($row = $db->sql_fetchrow($result)))
@ -227,9 +228,10 @@ switch ($mode)
} }
// We left join on the session table to see if the user is currently online // We left join on the session table to see if the user is currently online
$sql = 'SELECT username, user_id, user_colour, user_permissions, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit $sql = 'SELECT username, user_id, user_type, user_colour, user_permissions, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit
FROM ' . USERS_TABLE . " FROM ' . USERS_TABLE . "
WHERE user_id = $user_id"; WHERE user_id = $user_id
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!($member = $db->sql_fetchrow($result))) if (!($member = $db->sql_fetchrow($result)))
@ -358,7 +360,7 @@ switch ($mode)
if ($member['user_sig']) if ($member['user_sig'])
{ {
$member['user_sig'] = censor_text(smilie_text($member['user_sig'])); $member['user_sig'] = censor_text(smiley_text($member['user_sig']));
} }
$poster_avatar = ''; $poster_avatar = '';
@ -818,7 +820,7 @@ switch ($mode)
{ {
$sql = 'SELECT COUNT(u.user_id) AS total_users $sql = 'SELECT COUNT(u.user_id) AS total_users
FROM ' . USERS_TABLE . " u$sql_from FROM ' . USERS_TABLE . " u$sql_from
WHERE u.user_type <> " . USER_IGNORE . " WHERE u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ")
$sql_where"; $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

32
phpBB/posting.php
View file

@ -238,7 +238,7 @@ if ($sql)
if (!in_array($mode, array('quote', 'edit', 'delete'))) if (!in_array($mode, array('quote', 'edit', 'delete')))
{ {
$enable_sig = ($config['allow_sig'] && $user->optionget('attachsig')); $enable_sig = ($config['allow_sig'] && $user->optionget('attachsig'));
$enable_smilies = ($config['allow_smilies'] && $user->optionget('smile')); $enable_smilies = ($config['allow_smilies'] && $user->optionget('smilies'));
$enable_bbcode = ($config['allow_bbcode'] && $user->optionget('bbcode')); $enable_bbcode = ($config['allow_bbcode'] && $user->optionget('bbcode'));
$enable_urls = true; $enable_urls = true;
} }
@ -437,11 +437,9 @@ else if ($mode == 'bump')
// Save Draft // Save Draft
if ($save && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts')) if ($save && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts'))
{ {
$subject = preg_replace('#&amp;(\#[0-9]+;)#', '&\1', request_var('subject', '')); $subject = request_var('subject', '', true);
$subject = (!$subject && $mode != 'post') ? $topic_title : $subject; $subject = (!$subject && $mode != 'post') ? $topic_title : $subject;
$message = (isset($_POST['message'])) ? htmlspecialchars(trim(str_replace(array('\\\'', '\\"', '\\0', '\\\\'), array('\'', '"', '\0', '\\'), $_POST['message']))) : ''; $message = request_var('message', '', true);
$message = preg_replace('#&amp;(\#[0-9]+;)#', '&\1', $message);
// $message = request_var('message', '', true, true);
if ($subject && $message) if ($subject && $message)
{ {
@ -500,15 +498,14 @@ if ($load && $drafts)
if ($submit || $preview || $refresh) if ($submit || $preview || $refresh)
{ {
$topic_cur_post_id = request_var('topic_cur_post_id', 0); $topic_cur_post_id = request_var('topic_cur_post_id', 0);
$subject = preg_replace('#&amp;(\#[0-9]+;)#', '&\1', request_var('subject', '')); $subject = request_var('subject', '', true);
if (strcmp($subject, strtoupper($subject)) == 0 && $subject) if (strcmp($subject, strtoupper($subject)) == 0 && $subject)
{ {
$subject = strtolower($subject); $subject = strtolower($subject);
} }
$message_parser->message = (isset($_POST['message'])) ? htmlspecialchars(str_replace(array('\\\'', '\\"', '\\0', '\\\\'), array('\'', '"', '\0', '\\'), $_POST['message'])) : ''; $message_parser->message = request_var('message', '', true);
$message_parser->message = preg_replace('#&amp;(\#[0-9]+;)#', '&\1', $message_parser->message);
$username = (isset($_POST['username'])) ? request_var('username', '') : $username; $username = (isset($_POST['username'])) ? request_var('username', '') : $username;
$post_edit_reason = (isset($_POST['edit_reason']) && !empty($_POST['edit_reason']) && $mode == 'edit' && $user->data['user_id'] != $poster_id) ? request_var('edit_reason', '') : ''; $post_edit_reason = (isset($_POST['edit_reason']) && !empty($_POST['edit_reason']) && $mode == 'edit' && $user->data['user_id'] != $poster_id) ? request_var('edit_reason', '') : '';
@ -601,7 +598,7 @@ if ($submit || $preview || $refresh)
} }
// Parse Attachments - before checksum is calculated // Parse Attachments - before checksum is calculated
$message_parser->parse_attachments($mode, $post_id, $submit, $preview, $refresh); $message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh);
// Grab md5 'checksum' of new message // Grab md5 'checksum' of new message
$message_md5 = md5($message_parser->message); $message_md5 = md5($message_parser->message);
@ -983,7 +980,7 @@ unset($message_parser);
// Forum moderators? // Forum moderators?
get_moderators($moderators, $forum_id); get_moderators($moderators, $forum_id);
// Generate smilie listing // Generate smiley listing
generate_smilies('inline', $forum_id); generate_smilies('inline', $forum_id);
// Generate inline attachment select box // Generate inline attachment select box
@ -1006,7 +1003,7 @@ if ($enable_icons)
$html_checked = (isset($enable_html)) ? !$enable_html : (($config['allow_html']) ? !$user->optionget('html') : 1); $html_checked = (isset($enable_html)) ? !$enable_html : (($config['allow_html']) ? !$user->optionget('html') : 1);
$bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode']) ? !$user->optionget('bbcode') : 1); $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode']) ? !$user->optionget('bbcode') : 1);
$smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies']) ? !$user->optionget('smile') : 1); $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1);
$urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0;
$sig_checked = $enable_sig; $sig_checked = $enable_sig;
$notify_checked = (isset($notify)) ? $notify : ((!$notify_set) ? (($user->data['user_id'] != ANONYMOUS) ? $user->data['user_notify'] : 0) : 1); $notify_checked = (isset($notify)) ? $notify : ((!$notify_set) ? (($user->data['user_id'] != ANONYMOUS) ? $user->data['user_notify'] : 0) : 1);
@ -1364,7 +1361,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
'post_text' => $data['message'], 'post_text' => $data['message'],
'post_checksum' => $data['message_md5'], 'post_checksum' => $data['message_md5'],
'post_encoding' => $user->lang['ENCODING'], 'post_encoding' => $user->lang['ENCODING'],
'post_attachment' => (isset($data['filename_data']['physical_filename']) && sizeof($data['filename_data']['physical_filename'])) ? 1 : 0, // sizeof($data['filename_data']['physical_filename']) 'post_attachment' => (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0, // sizeof($data['filename_data']['physical_filename'])
'bbcode_bitfield' => $data['bbcode_bitfield'], 'bbcode_bitfield' => $data['bbcode_bitfield'],
'bbcode_uid' => $data['bbcode_uid'], 'bbcode_uid' => $data['bbcode_uid'],
'post_edit_locked' => $data['post_edit_locked'] 'post_edit_locked' => $data['post_edit_locked']
@ -1416,7 +1413,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
'post_edit_user' => (int) $data['post_edit_user'], 'post_edit_user' => (int) $data['post_edit_user'],
'post_checksum' => $data['message_md5'], 'post_checksum' => $data['message_md5'],
'post_encoding' => $user->lang['ENCODING'], 'post_encoding' => $user->lang['ENCODING'],
'post_attachment' => (isset($data['filename_data']['physical_filename']) && sizeof($data['filename_data']['physical_filename'])) ? 1 : 0, 'post_attachment' => (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0,
'bbcode_bitfield' => $data['bbcode_bitfield'], 'bbcode_bitfield' => $data['bbcode_bitfield'],
'bbcode_uid' => $data['bbcode_uid'], 'bbcode_uid' => $data['bbcode_uid'],
'post_edit_locked' => $data['post_edit_locked']) 'post_edit_locked' => $data['post_edit_locked'])
@ -1444,7 +1441,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
'topic_first_poster_name' => ($user->data['user_id'] == ANONYMOUS && $username) ? stripslashes($username) : $user->data['username'], 'topic_first_poster_name' => ($user->data['user_id'] == ANONYMOUS && $username) ? stripslashes($username) : $user->data['username'],
'topic_type' => $topic_type, 'topic_type' => $topic_type,
'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0,
'topic_attachment' => (isset($data['filename_data']['physical_filename']) && sizeof($data['filename_data']['physical_filename'])) ? 1 : 0 'topic_attachment' => (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0
); );
if (isset($poll['poll_options']) && !empty($poll['poll_options'])) if (isset($poll['poll_options']) && !empty($poll['poll_options']))
@ -1497,7 +1494,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
'poll_length' => ($poll['poll_options']) ? ($poll['poll_length'] * 86400) : 0, 'poll_length' => ($poll['poll_options']) ? ($poll['poll_length'] * 86400) : 0,
'poll_vote_change' => $poll['poll_vote_change'], 'poll_vote_change' => $poll['poll_vote_change'],
'topic_attachment' => ($post_mode == 'edit_topic') ? ((isset($data['filename_data']['physical_filename']) && sizeof($data['filename_data']['physical_filename'])) ? 1 : 0) : $data['topic_attachment'] 'topic_attachment' => ($post_mode == 'edit_topic') ? ((isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0) : $data['topic_attachment']
); );
break; break;
} }
@ -1674,6 +1671,11 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
else else
{ {
// insert attachment into db // insert attachment into db
if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . basename($attach_row['physical_filename'])))
{
continue;
}
$attach_sql = array( $attach_sql = array(
'post_msg_id' => $data['post_id'], 'post_msg_id' => $data['post_id'],
'topic_id' => $data['topic_id'], 'topic_id' => $data['topic_id'],

5
phpBB/search.php
View file

@ -139,7 +139,8 @@ if ($search_keywords || $search_author || $search_id)
$sql_where = (strstr($search_author, '*') !== false) ? ' LIKE ' : ' = '; $sql_where = (strstr($search_author, '*') !== false) ? ' LIKE ' : ' = ';
$sql = 'SELECT user_id $sql = 'SELECT user_id
FROM ' . USERS_TABLE . " FROM ' . USERS_TABLE . "
WHERE username $sql_where '" . $db->sql_escape(preg_replace('#\*+#', '%', $search_author)) . "'"; WHERE username $sql_where '" . $db->sql_escape(preg_replace('#\*+#', '%', $search_author)) . "'
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$row = $db->sql_fetchrow($result)) if (!$row = $db->sql_fetchrow($result))
@ -758,7 +759,7 @@ if ($search_keywords || $search_author || $search_id)
// via php.net's annotated manual // via php.net's annotated manual
$row['post_text'] = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $hilit . ")\b#i', '<span class=\"posthilit\">\\\\1</span>', '\\0')", '>' . $row['post_text'] . '<'), 1, -1)); $row['post_text'] = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $hilit . ")\b#i', '<span class=\"posthilit\">\\\\1</span>', '\\0')", '>' . $row['post_text'] . '<'), 1, -1));
$row['post_text'] = smilie_text($row['post_text']); $row['post_text'] = smiley_text($row['post_text']);
$tpl_ary = array( $tpl_ary = array(
'POSTER_NAME' => ($row['poster_id'] == ANONYMOUS) ? ((!empty($row['post_username'])) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'], 'POSTER_NAME' => ($row['poster_id'] == ANONYMOUS) ? ((!empty($row['post_username'])) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'],

11
phpBB/styles/subSilver/template/bbcode.html
View file

@ -65,4 +65,13 @@
<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email --> <!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email -->
<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}"><param name="play" value="1"><param name="loop" value="1"><param name="quality" value="high"><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="1" loop="1" quality="high"></embed></object><!-- END flash --> <!-- BEGIN flash -->
<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}">
<param name="movie" value="{URL}">
<param name="play" value="1">
<param name="loop" value="1">
<param name="quality" value="high">
<param name="allowScriptAccess" value="never">
<embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="1" loop="1" quality="high" allowscriptaccess="never"></embed>
</object>
<!-- END flash -->

2
phpBB/styles/subSilver/template/editor.js
View file

@ -47,7 +47,7 @@ function arraypop(thearray) {
return retval; return retval;
} }
function emoticon(text) { function smiley(text) {
text = ' ' + text + ' '; text = ' ' + text + ' ';
if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
var caretPos = document.forms[form_name].elements[text_name].caretPos; var caretPos = document.forms[form_name].elements[text_name].caretPos;

20
phpBB/styles/subSilver/template/posting_attach_body.html
View file

@ -10,24 +10,6 @@
//--> //-->
</script> </script>
<!-- IF S_CLOSE_PROGRESS_WINDOW -->
<script language="javascript" type="text/javascript">
<!--
close_waitscreen = 1;
//-->
</script>
<!-- ENDIF -->
<script language="javascript" type="text/javascript">
<!--
function popup_progress_bar()
{
close_waitscreen = 0;
window.open('{U_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400');
}
//-->
</script>
<!-- IF S_CLOSE_PROGRESS_WINDOW --> <!-- IF S_CLOSE_PROGRESS_WINDOW -->
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
<!-- <!--
@ -45,7 +27,7 @@
<tr> <tr>
<td class="row1"><b class="genmed">{L_FILENAME}</b></td> <td class="row1"><b class="genmed">{L_FILENAME}</b></td>
<td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="{FILENAME}" class="btnlite" /></td> <td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="" class="btnlite" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> <td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td>

8
phpBB/styles/subSilver/template/posting_body.html
View file

@ -215,15 +215,15 @@ function checkForm()
<tr> <tr>
<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /><table width="80%" cellspacing="5" cellpadding="0" border="0" align="center"> <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /><table width="80%" cellspacing="5" cellpadding="0" border="0" align="center">
<tr> <tr>
<td class="gensmall" align="center"><b>{L_EMOTICONS}</b></td> <td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
</tr> </tr>
<tr> <tr>
<td align="center"><!-- BEGIN emoticon --><a href="javascript:emoticon('{emoticon.SMILEY_CODE}')"><img src="{emoticon.SMILEY_IMG}" width="{emoticon.SMILEY_WIDTH}" height="{emoticon.SMILEY_HEIGHT}" border="0" alt="{emoticon.SMILEY_DESC}" title="{emoticon.SMILEY_DESC}" onclick="emoticon('{emoticon.SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END emoticon --></td> <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td>
</tr> </tr>
<!-- IF S_SHOW_EMOTICON_LINK --> <!-- IF S_SHOW_SMILEY_LINK -->
<tr> <tr>
<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_EMOTICONS}</a></td> <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_SMILIES}</a></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->

6
phpBB/styles/subSilver/template/posting_smilies.html
View file

@ -4,7 +4,7 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
<!-- <!--
function emoticon(text) { function smiley(text) {
text = ' ' + text + ' '; text = ' ' + text + ' ';
if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) { if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) {
@ -23,10 +23,10 @@ function emoticon(text) {
<tr> <tr>
<td><table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0"> <td><table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0">
<tr> <tr>
<th height="28">{L_EMOTICONS}</th> <th height="28">{L_SMILIES}</th>
</tr> </tr>
<tr> <tr>
<td class="row1" align="center" valign="middle"><!-- BEGIN emoticon --> <a href="javascript:emoticon('{emoticon.SMILEY_CODE}')"><img src="{emoticon.SMILEY_IMG}" width="{emoticon.SMILEY_WIDTH}" height="{emoticon.SMILEY_HEIGHT}" border="0" alt="{emoticon.SMILEY_DESC}" title="{emoticon.SMILEY_DESC}" hspace="2" vspace="2" onclick="emoticon('{emoticon.SMILEY_CODE}');return false" /></a> <!-- END emoticon --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

2
phpBB/styles/subSilver/template/ucp_prefs_post.html
View file

@ -20,7 +20,7 @@
<td class="row2"><input type="radio" name="html" value="1"{DEFAULT_HTML_YES} /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" name="html" value="0"{DEFAULT_HTML_NO} /><span class="gen">{L_NO}</span></td> <td class="row2"><input type="radio" name="html" value="1"{DEFAULT_HTML_YES} /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" name="html" value="0"{DEFAULT_HTML_NO} /><span class="gen">{L_NO}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILE}:</b></td> <td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILIES}:</b></td>
<td class="row2"><input type="radio" name="smilies" value="1"{DEFAULT_SMILIES_YES} /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" name="smilies" value="0"{DEFAULT_SMILIES_NO} /><span class="gen">{L_NO}</span></td> <td class="row2"><input type="radio" name="smilies" value="1"{DEFAULT_SMILIES_YES} /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" name="smilies" value="0"{DEFAULT_SMILIES_NO} /><span class="gen">{L_NO}</span></td>
</tr> </tr>
<tr> <tr>

5
phpBB/styles/subSilver/template/viewtopic_body.html
View file

@ -143,9 +143,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<td valign="top"> <td valign="top">
<div align="center"> <table cellspacing="4" align="center" width="150">
<table cellspacing="4" align="center">
<!-- IF postrow.ONLINE_IMG --> <!-- IF postrow.ONLINE_IMG -->
<tr> <tr>
<td>{postrow.ONLINE_IMG}</td> <td>{postrow.ONLINE_IMG}</td>
@ -175,7 +173,6 @@
<!-- IF postrow.S_PROFILE_FIELD_1 --><br /><b>{postrow.PROFILE_FIELD_1_NAME}:</b> {postrow.PROFILE_FIELD_1_VALUE}<!-- ENDIF --> <!-- IF postrow.S_PROFILE_FIELD_1 --><br /><b>{postrow.PROFILE_FIELD_1_NAME}:</b> {postrow.PROFILE_FIELD_1_VALUE}<!-- ENDIF -->
</span> </span>
</div>
</td> </td>
<td valign="top"><table width="100%" cellspacing="5"> <td valign="top"><table width="100%" cellspacing="5">
<tr> <tr>

2
phpBB/viewforum.php
View file

@ -358,7 +358,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
// Obtain other topics // Obtain other topics
// $sql_rownum = (SQL_LAYER != 'oracle') ? '' : ', ROWNUM rnum '; // $sql_rownum = (SQL_LAYER != 'oracle') ? '' : ', ROWNUM rnum ';
$sql_rownum = ''; $sql_rownum = '';
$sql_where = ($forum_data['forum_type'] == FORUM_POST) ? "= $forum_id" : 'IN (' . implode(', ', $active_forum_ary['forum_id']) . ')'; $sql_where = ($forum_data['forum_type'] == FORUM_POST || !sizeof($active_forum_ary)) ? "= $forum_id" : 'IN (' . implode(', ', $active_forum_ary['forum_id']) . ')';
$sql = "SELECT t.* $sql_select$sql_rownum $sql = "SELECT t.* $sql_select$sql_rownum
FROM $sql_from FROM $sql_from
WHERE t.forum_id $sql_where WHERE t.forum_id $sql_where

9
phpBB/viewtopic.php
View file

@ -648,12 +648,12 @@ if (!empty($poll_start))
for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)
{ {
$poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']); $poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']);
$poll_info[$i]['poll_option_text'] = smilie_text($poll_info[$i]['poll_option_text']); $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']);
$poll_info[$i]['poll_option_text'] = str_replace("\n", '<br />', censor_text($poll_info[$i]['poll_option_text'])); $poll_info[$i]['poll_option_text'] = str_replace("\n", '<br />', censor_text($poll_info[$i]['poll_option_text']));
} }
$poll_bbcode->bbcode_second_pass($poll_title, $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']); $poll_bbcode->bbcode_second_pass($poll_title, $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']);
$poll_title = smilie_text($poll_title); $poll_title = smiley_text($poll_title);
$poll_title = str_replace("\n", '<br />', censor_text($poll_title)); $poll_title = str_replace("\n", '<br />', censor_text($poll_title));
unset($poll_bbcode); unset($poll_bbcode);
@ -742,6 +742,7 @@ while ($row = $db->sql_fetchrow($result))
$post_list[$i] = $row['post_id']; $post_list[$i] = $row['post_id'];
($store_reverse) ? --$i : ++$i; ($store_reverse) ? --$i : ++$i;
} }
$db->sql_freeresult($result);
if (empty($post_list)) if (empty($post_list))
{ {
@ -1118,7 +1119,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
$bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']); $bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']);
} }
$user_cache[$poster_id]['sig'] = smilie_text($user_cache[$poster_id]['sig']); $user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']);
$user_cache[$poster_id]['sig'] = str_replace("\n", '<br />', censor_text($user_cache[$poster_id]['sig'])); $user_cache[$poster_id]['sig'] = str_replace("\n", '<br />', censor_text($user_cache[$poster_id]['sig']));
$user_cache[$poster_id]['sig_parsed'] = TRUE; $user_cache[$poster_id]['sig_parsed'] = TRUE;
} }
@ -1139,7 +1140,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
} }
// Always process smilies after parsing bbcodes // Always process smilies after parsing bbcodes
$message = smilie_text($message); $message = smiley_text($message);
if (isset($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']])) if (isset($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']]))
{ {