aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-11-01 12:23:08 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-11-01 12:23:08 +0000
commit6fa38a1181b25d85a37095026cc9e0a8cedc4e43 (patch)
tree8d5f9fe8f503e6b9382a22d4d4754e63355ac602 /phpBB
parent1a67029fcd2e9480bcc5d90992700d93974c983a (diff)
downloadforums-6fa38a1181b25d85a37095026cc9e0a8cedc4e43.tar
forums-6fa38a1181b25d85a37095026cc9e0a8cedc4e43.tar.gz
forums-6fa38a1181b25d85a37095026cc9e0a8cedc4e43.tar.bz2
forums-6fa38a1181b25d85a37095026cc9e0a8cedc4e43.tar.xz
forums-6fa38a1181b25d85a37095026cc9e0a8cedc4e43.zip
Various, typically posting related updates
git-svn-id: file:///svn/phpbb/trunk@2997 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/bbcode.php61
-rw-r--r--phpBB/includes/functions.php29
-rw-r--r--phpBB/includes/session.php181
-rw-r--r--phpBB/posting.php48
-rw-r--r--phpBB/privmsg.php4
-rw-r--r--phpBB/templates/subSilver/subSilver.css2
-rw-r--r--phpBB/templates/subSilver/viewtopic_body.html2
-rw-r--r--phpBB/viewforum.php127
-rw-r--r--phpBB/viewtopic.php183
9 files changed, 308 insertions, 329 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 0111a4d446..21a1a8f895 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -434,7 +434,7 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
// We have an opening tag.
// Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right.
$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
- bbcode_array_push($stack, $match);
+ array_push($stack, $match);
//
// Rather than just increment $curr_pos
// Set it to the ending of the tag we just found
@@ -456,7 +456,7 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
// There exists a starting tag.
$curr_nesting_depth = sizeof($stack);
// We need to do 2 replacements now.
- $match = bbcode_array_pop($stack);
+ $match = array_pop($stack);
$start_index = $match['pos'];
$start_tag = $match['tag'];
$start_length = strlen($start_tag);
@@ -522,9 +522,9 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
// otherwise, we go back to the start.
if (sizeof($stack) > 0)
{
- $match = bbcode_array_pop($stack);
+ $match = array_pop($stack);
$curr_pos = $match['pos'];
- bbcode_array_push($stack, $match);
+ array_push($stack, $match);
++$curr_pos;
}
else
@@ -643,21 +643,6 @@ function make_clickable($text)
}
/**
- * Nathan Codding - Feb 6, 2001
- * Reverses the effects of make_clickable(), for use in editpost.
- * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs.
- *
- */
-function undo_make_clickable($text)
-{
- $text = preg_replace("#<!-- BBCode auto-link start --><a href=\"(.*?)\" target=\"_blank\">.*?</a><!-- BBCode auto-link end -->#i", "\\1", $text);
- $text = preg_replace("#<!-- BBcode auto-mailto start --><a href=\"mailto:(.*?)\">.*?</a><!-- BBCode auto-mailto end -->#i", "\\1", $text);
-
- return $text;
-
-}
-
-/**
* Nathan Codding - August 24, 2000.
* Takes a string, and does the reverse of the PHP standard function
* htmlspecialchars().
@@ -696,44 +681,6 @@ function escape_slashes($input)
return $output;
}
-/**
- * This function does exactly what the PHP4 function array_push() does
- * however, to keep phpBB compatable with PHP 3 we had to come up with our own
- * method of doing it.
- */
-function bbcode_array_push(&$stack, $value)
-{
- $stack[] = $value;
- return(sizeof($stack));
-}
-
-/**
- * This function does exactly what the PHP4 function array_pop() does
- * however, to keep phpBB compatable with PHP 3 we had to come up with our own
- * method of doing it.
- */
-function bbcode_array_pop(&$stack)
-{
- $arrSize = count($stack);
- $x = 1;
-
- while(list($key, $val) = each($stack))
- {
- if($x < count($stack))
- {
- $tmpArr[] = $val;
- }
- else
- {
- $return_val = $val;
- }
- $x++;
- }
- $stack = $tmpArr;
-
- return($return_val);
-}
-
//
// Smilies code ... would this be better tagged on to the end of bbcode.php?
// Probably so and I'll move it before B2
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c85f2c0c61..970c727d4d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -75,7 +75,7 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl
return $rows;
}
-function forum_nav_links(&$forum_id, &$forum_name)
+function forum_nav_links(&$forum_id, &$forum_data)
{
global $SID, $template, $phpEx, $auth;
@@ -104,8 +104,6 @@ function forum_nav_links(&$forum_id, &$forum_name)
$branch_root_id = 0;
$forum_data = $row;
$type = 'child';
-
- $forum_name = $row['forum_name'];
}
}
else
@@ -813,7 +811,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
global $db, $auth, $template, $config, $user, $nav_links;
global $phpEx, $phpbb_root_path, $starttime;
- switch ( $errno )
+ switch ($errno)
{
case E_WARNING:
// if (defined('DEBUG'))
@@ -830,7 +828,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
break;
case E_USER_ERROR:
- if ( isset($db) )
+ if (isset($db))
{
$db->sql_close();
}
@@ -845,11 +843,20 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
break;
case E_USER_NOTICE:
- $msg_text = ( !empty($user->lang[$msg_text]) ) ? $user->lang[$msg_text] : $msg_text;
+ if (empty($user->session_id))
+ {
+ $user->start();
+ }
+ if (empty($user->lang))
+ {
+ $user->setup();
+ }
- if ( !defined('HEADER_INC') )
+ $msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text;
+
+ if (!defined('HEADER_INC'))
{
- if ( defined('IN_ADMIN') )
+ if (defined('IN_ADMIN'))
{
page_header('', '', false);
}
@@ -859,7 +866,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
}
}
- if ( defined('IN_ADMIN') )
+ if (defined('IN_ADMIN'))
{
page_message($msg_title, $msg_text, $display_header);
page_footer();
@@ -871,8 +878,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
);
$template->assign_vars(array(
- 'MESSAGE_TITLE' => $msg_title,
- 'MESSAGE_TEXT' => $msg_text)
+ 'MESSAGE_TITLE' => $msg_title,
+ 'MESSAGE_TEXT' => $msg_text)
);
include($phpbb_root_path . 'includes/page_tail.' . $phpEx);
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 845537962f..f642855dc1 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -34,11 +34,11 @@ class session
global $SID, $db, $config;
$current_time = time();
- $this->browser = ( !empty($_SERVER['HTTP_USER_AGENT']) ) ? $_SERVER['HTTP_USER_AGENT'] : $_ENV['HTTP_USER_AGENT'];
- $this->page = ( !empty($_SERVER['PHP_SELF']) ) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
- $this->page .= '&' . ( ( !empty($_SERVER['QUERY_STRING']) ) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING'] );
+ $this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : $_ENV['HTTP_USER_AGENT'];
+ $this->page = (!empty($_SERVER['PHP_SELF']) ) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
+ $this->page .= '&' . ((!empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING']);
- if ( isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_data']) )
+ if (isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_data']))
{
$sessiondata = ( isset($_COOKIE[$config['cookie_name'] . '_data']) ) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_data'])) : '';
$this->session_id = ( isset($_COOKIE[$config['cookie_name'] . '_sid']) ) ? $_COOKIE[$config['cookie_name'] . '_sid'] : '';
@@ -52,11 +52,11 @@ class session
}
// Obtain users IP
- $this->ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
+ $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
{
- if ( preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/', $_SERVER['HTTP_X_FORWARDED_FOR'], $ip_list) )
+ if (preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/', $_SERVER['HTTP_X_FORWARDED_FOR'], $ip_list))
{
$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10\..*/', '/^224\..*/', '/^240\..*/');
$this->ip = preg_replace($private_ip, $this->ip, $ip_list[1]);
@@ -64,13 +64,13 @@ class session
}
// Load limit check (if applicable)
- if ( doubleval($config['limit_load']) && file_exists('/proc/loadavg') )
+ if (doubleval($config['limit_load']) && file_exists('/proc/loadavg'))
{
- if ( $load = @file('/proc/loadavg') )
+ if ($load = @file('/proc/loadavg'))
{
list($this->load) = explode(' ', $load[0]);
- if ( $this->load > doubleval($config['limit_load']) )
+ if ($this->load > doubleval($config['limit_load']))
{
trigger_error('Board_unavailable');
}
@@ -78,7 +78,7 @@ class session
}
// session_id exists so go ahead and attempt to grab all data in preparation
- if ( !empty($this->session_id) )
+ if (!empty($this->session_id))
{
$sql = "SELECT u.*, s.*
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
@@ -90,16 +90,16 @@ class session
$db->sql_freeresult($result);
// Did the session exist in the DB?
- if ( isset($this->data['user_id']) )
+ if (isset($this->data['user_id']))
{
// Validate IP length according to admin ... has no effect on IPv6
$s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check']));
$u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check']));
- if ( $u_ip == $s_ip )
+ if ($u_ip == $s_ip)
{
// Only update session DB a minute or so after last update or if page changes
- if ( ( $current_time - $this->data['session_time'] > 60 || $this->data['session_page'] != $user_page ) && $update )
+ if (($current_time - $this->data['session_time'] > 60 || $this->data['session_page'] != $user_page) && $update)
{
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_time = $current_time, session_page = '$this->page'
@@ -114,8 +114,8 @@ class session
// If we reach here then no (valid) session exists. So we'll create a new one,
// using the cookie user_id if available to pull basic user prefs.
- $autologin = ( isset($sessiondata['autologinid']) ) ? $sessiondata['autologinid'] : '';
- $user_id = ( isset($sessiondata['userid']) ) ? intval($sessiondata['userid']) : ANONYMOUS;
+ $autologin = (isset($sessiondata['autologinid'])) ? $sessiondata['autologinid'] : '';
+ $user_id = (isset($sessiondata['userid'])) ? intval($sessiondata['userid']) : ANONYMOUS;
return $this->create($user_id, $autologin);
}
@@ -128,26 +128,26 @@ class session
$sessiondata = array();
$current_time = time();
- if ( intval($config['active_sessions']) )
+ if (intval($config['active_sessions']))
{
// Limit sessions in 1 minute period
$sql = "SELECT COUNT(*) AS sessions
FROM " . SESSIONS_TABLE . "
- WHERE session_time >= " . ( $current_time - 60 );
+ WHERE session_time >= " . ($current_time - 60);
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
- if ( intval($row['sessions']) > intval($config['active_sessions']) )
+ if (intval($row['sessions']) > intval($config['active_sessions']))
{
trigger_error('Board_unavailable');
}
}
// Garbage collection ... remove old sessions updating user information
- // if necessary. It means (potentially) 22 queries but only infrequently
- if ( $current_time - $config['session_gc'] > $config['session_last_gc'] )
+ // if necessary. It means (potentially) 11 queries but only infrequently
+ if ($current_time - $config['session_gc'] > $config['session_last_gc'])
{
$this->gc($current_time);
}
@@ -164,7 +164,7 @@ class session
$db->sql_freeresult($result);
// Check autologin request, is it valid?
- if ( $this->data['user_password'] != $autologin || !$this->data['user_active'] || !$user_id )
+ if ($this->data['user_password'] != $autologin || !$this->data['user_active'] || !$user_id)
{
$autologin = '';
$this->data['user_id'] = $user_id = ANONYMOUS;
@@ -176,12 +176,12 @@ class session
OR ban_end = 0";
$result = $db->sql_query($sql);
- while ( $row = $db->sql_fetchrow($result) )
+ while ($row = $db->sql_fetchrow($result))
{
- if ( ( $row['user_id'] == $this->data['user_id'] ||
- ( $row['ban_ip'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $this->ip) ) ||
- ( $row['ban_email'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#i', $this->data['user_email']) ) )
- && !$this->data['user_founder'] )
+ if (( $row['user_id'] == $this->data['user_id'] ||
+ ($row['ban_ip'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $this->ip)) ||
+ ($row['ban_email'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#i', $this->data['user_email'])))
+ && !$this->data['user_founder'])
{
trigger_error('You_been_banned');
}
@@ -189,7 +189,7 @@ class session
$db->sql_freeresult($result);
// Is there an existing session? If so, grab last visit time from that
- $this->data['session_last_visit'] = ( $this->data['session_time'] ) ? $this->data['session_time'] : ( ( $this->data['user_lastvisit'] ) ? $this->data['user_lastvisit'] : time() );
+ $this->data['session_last_visit'] = ($this->data['session_time']) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : time());
// Create or update the session
$db->sql_return_on_error(true);
@@ -197,7 +197,7 @@ class session
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_last_visit = " . $this->data['session_last_visit'] . ", session_start = $current_time, session_time = $current_time, session_browser = '$this->browser', session_page = '$this->page'
WHERE session_id = '" . $this->session_id . "'";
- if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
+ if (!$db->sql_query($sql) || !$db->sql_affectedrows())
{
$db->sql_return_on_error(false);
$this->session_id = md5(uniqid($user_ip));
@@ -211,14 +211,14 @@ class session
$this->data['session_id'] = $this->session_id;
- $sessiondata['autologinid'] = ( $autologin && $user_id ) ? $autologin : '';
+ $sessiondata['autologinid'] = ($autologin && $user_id) ? $autologin : '';
$sessiondata['userid'] = $user_id;
$this->set_cookie('data', serialize($sessiondata), $current_time + 31536000);
$this->set_cookie('sid', $this->session_id, 0);
$SID = '?sid=' . $this->session_id;
- if ( $this->data['user_id'] )
+ if ($this->data['user_id'] != ANONYMOUS)
{
// Events ... ?
// do_events('days');
@@ -275,9 +275,9 @@ class session
$del_user_id = '';
$del_sessions = 0;
- while ( $row = $db->sql_fetchrow($result) )
+ while ($row = $db->sql_fetchrow($result))
{
- if ( $row['session_user_id'] )
+ if ($row['session_user_id'])
{
$sql = "UPDATE " . USERS_TABLE . "
SET user_lastvisit = " . $row['recent_time'] . "
@@ -285,11 +285,11 @@ class session
$db->sql_query($sql);
}
- $del_user_id .= ( ( $del_user_id != '' ) ? ', ' : '' ) . ' \'' . $row['session_user_id'] . '\'';
+ $del_user_id .= (($del_user_id != '') ? ', ' : '') . ' \'' . $row['session_user_id'] . '\'';
$del_sessions++;
}
- if ( $del_user_id != '' )
+ if ($del_user_id != '')
{
// Delete expired sessions
$sql = "DELETE FROM " . SESSIONS_TABLE . "
@@ -298,7 +298,7 @@ class session
$db->sql_query($sql);
}
- if ( $del_sessions < 5 )
+ if ($del_sessions < 5)
{
// Less than 5 sessions, update gc timer ... else we want gc
// called again to delete other sessions
@@ -338,9 +338,9 @@ class user extends session
{
global $db, $template, $config, $phpEx, $phpbb_root_path;
- if ( $this->data['user_id'] != ANONYMOUS )
+ if ($this->data['user_id'] != ANONYMOUS)
{
- $this->lang_name = ( file_exists($phpbb_root_path . 'language/' . $this->data['user_lang']) ) ? $this->data['user_lang'] : $config['default_lang'];
+ $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->data['user_lang'])) ? $this->data['user_lang'] : $config['default_lang'];
$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
$this->date_format = $this->data['user_dateformat'];
@@ -355,14 +355,14 @@ class user extends session
$this->timezone = $config['board_timezone'] * 3600;
$this->dst = 0;
- if ( isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) )
+ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
{
$accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
- foreach ( $accept_lang_ary as $accept_lang )
+ foreach ($accept_lang_ary as $accept_lang)
{
// Set correct format ... guess full xx_YY form
$accept_lang = substr($accept_lang, 0, 2) . '_' . strtoupper(substr($accept_lang, 3, 2));
- if ( file_exists($phpbb_root_path . 'language/' . $accept_lang) )
+ if (file_exists($phpbb_root_path . 'language/' . $accept_lang))
{
$this->lang_name = $accept_lang;
$this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/';
@@ -372,7 +372,7 @@ class user extends session
{
// No match on xx_YY so try xx
$accept_lang = substr($accept_lang, 0, 2);
- if ( file_exists($phpbb_root_path . 'language/' . $accept_lang) )
+ if (file_exists($phpbb_root_path . 'language/' . $accept_lang))
{
$this->lang_name = $accept_lang;
$this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/';
@@ -384,7 +384,7 @@ class user extends session
}
include($this->lang_path . 'lang_main.' . $phpEx);
- if ( defined('IN_ADMIN') )
+ if (defined('IN_ADMIN'))
{
include($this->lang_path . 'lang_admin.' . $phpEx);
}
@@ -409,7 +409,7 @@ class user extends session
}
*/
// Set up style
- $style = ( $style ) ? $style : ( ( !$config['override_user_style'] && $this->data['user_id'] ) ? $this->data['user_style'] : $config['default_style'] );
+ $style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']);
$sql = "SELECT t.template_path, t.poll_length, t.pm_box_length, c.css_data, c.css_external, i.*
FROM " . STYLES_TABLE . " s, " . STYLES_TPL_TABLE . " t, " . STYLES_CSS_TABLE . " c, " . STYLES_IMAGE_TABLE . " i
@@ -419,14 +419,14 @@ class user extends session
AND i.imageset_id = s.imageset_id";
$result = $db->sql_query($sql);
- if ( !($this->theme = $db->sql_fetchrow($result)) )
+ if (!($this->theme = $db->sql_fetchrow($result)))
{
message_die(ERROR, 'Could not get style data');
}
$template->set_template($this->theme['template_path']);
- $this->img_lang = ( file_exists($phpbb_root_path . 'imagesets/' . $this->theme['imageset_path'] . '/' . $this->lang_name) ) ? $this->lang_name : $config['default_lang'];
+ $this->img_lang = (file_exists($phpbb_root_path . 'imagesets/' . $this->theme['imageset_path'] . '/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
return;
}
@@ -435,15 +435,14 @@ class user extends session
{
static $lang_dates;
- if ( empty($lang_dates) )
+ if (empty($lang_dates))
{
- foreach ( $this->lang['datetime'] as $match => $replace )
+ foreach ($this->lang['datetime'] as $match => $replace)
{
$lang_dates[$match] = $replace;
}
}
-
- $format = ( !$format ) ? $this->date_format : $format;
+ $format = (!$format) ? $this->date_format : $format;
return strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates);
}
@@ -453,10 +452,9 @@ class user extends session
if (empty($imgs[$img]) || $no_cache)
{
- $width = ( $width ) ? 'width="' . $width . '" ' : '';
+ $width = ($width) ? 'width="' . $width . '" ' : '';
$imgs[$img] = '<img src=' . str_replace('{LANG}', $this->img_lang, $this->theme[$img]) . '" ' . $width . 'alt="' . $this->lang[$alt] . '" title="' . $this->lang[$alt] . '" />';
}
-
return $imgs[$img];
}
}
@@ -469,7 +467,7 @@ class auth
var $acl = array();
var $acl_options = array();
- function acl(&$userdata, $forum_id = false)
+ function acl(&$userdata)
{
global $db, $acl_options;
@@ -477,15 +475,11 @@ class auth
if (!$this->founder = $userdata['user_founder'])
{
-// $mtime = explode(' ', microtime());
-// $starttime = $mtime[1] + $mtime[0];
-
- if ( empty($userdata['user_permissions']) )
+ if (empty($userdata['user_permissions']))
{
$this->acl_cache($userdata);
}
- // This is preliminary and can no doubt be improved
$global_chars = ceil(sizeof($this->acl_options['global']) / 8);
$local_chars = ceil(sizeof($this->acl_options['local']) / 8) + 2;
$globals = substr($userdata['user_permissions'], 0, $global_chars);
@@ -498,7 +492,7 @@ class auth
$forums = explode("\r\n", chunk_split($locals, $local_chars));
array_pop($forums);
- foreach ( $forums as $forum )
+ foreach ($forums as $forum)
{
$forum_id = bindec(decbin(ord(substr($forum, 0, 1))) . str_pad(decbin(ord(substr($forum, 1, 1))), 8, 0, STR_PAD_LEFT));
@@ -510,9 +504,6 @@ class auth
unset($forums);
}
-// $mtime = explode(' ', microtime());
-// echo $mtime[1] + $mtime[0] - $starttime . " :: ";
-
return;
}
@@ -521,19 +512,43 @@ class auth
{
static $acl_cache;
- if ( !isset($acl_cache[$forum_id][$option]) && !$this->founder )
+ if (!isset($acl_cache[$forum_id][$option]) && !$this->founder)
{
- if ( isset($this->acl_options['global'][$option]) )
+ if (isset($this->acl_options['global'][$option]) )
{
$acl_cache[$forum_id][$option] = substr($this->acl['global'], $this->acl_options['global'][$option], 1);
}
- if ( isset($this->acl_options['local'][$option]) )
+ if (isset($this->acl_options['local'][$option]))
{
$acl_cache[$forum_id][$option] |= substr($this->acl['local'][$forum_id], $this->acl_options['local'][$option], 1);
}
}
+ return ($this->founder) ? true : $acl_cache[$forum_id][$option];
+ }
+
+ function acl_gets()
+ {
+ if ($this->founder)
+ {
+ return true;
+ }
+
+ $arguments = func_get_args();
+ $forum_id = array_pop($arguments);
+
+ if (!is_int($forum_id))
+ {
+ $arguments[] = $forum_id;
+ $forum_id = false;
+ }
+
+ $acl = 0;
+ foreach ($arguments as $option)
+ {
+ $acl |= $this->acl_get($option, $forum_id);
+ }
- return ( $this->founder ) ? true : $acl_cache[$forum_id][$option];
+ return $acl;
}
// Cache data
@@ -550,7 +565,7 @@ class auth
AND ao.auth_option_id = a.auth_option_id";
$result = $db->sql_query($sql);
- while ( $row = $db->sql_fetchrow($result) )
+ while ($row = $db->sql_fetchrow($result))
{
$acl_db[] = $row;
}
@@ -562,19 +577,19 @@ class auth
AND ao.auth_option_id = a.auth_option_id";
$result = $db->sql_query($sql);
- while ( $row = $db->sql_fetchrow($result) )
+ while ($row = $db->sql_fetchrow($result))
{
$acl_db[] = $row;
}
$db->sql_freeresult($result);
- if ( is_array($acl_db) )
+ if (is_array($acl_db))
{
sort($acl_db);
- foreach ( $acl_db as $row )
+ foreach ($acl_db as $row)
{
- if ( $row['auth_allow_deny'] != ACL_INHERIT && $this->acl[$row['forum_id']][$row['auth_value']] !== ACL_DENY )
+ if ($row['auth_allow_deny'] != ACL_INHERIT && $this->acl[$row['forum_id']][$row['auth_value']] !== ACL_DENY)
{
$this->acl[$row['forum_id']][$row['auth_value']] = intval($row['auth_allow_deny']);
}
@@ -586,12 +601,12 @@ class auth
$local_hold = '';
$global_hold = '';
- foreach ( $this->acl as $forum_id => $auth_ary )
+ foreach ($this->acl as $forum_id => $auth_ary)
{
$holding = array();
$option_set = array();
- if ( !$forum_id )
+ if (!$forum_id)
{
$fill = $global_bits;
$ary_key = 'global';
@@ -609,32 +624,32 @@ class auth
$holding[$i] = 0;
}
- foreach ( $auth_ary as $option => $allow )
+ foreach ($auth_ary as $option => $allow)
{
- if ( $allow )
+ if ($allow)
{
$holding[$this->acl_options[$ary_key][$option]] = 1;
$option_key = substr($option, 0, strpos($option, '_') + 1);
- if ( empty($holding[$this->acl_options[$ary_key][$option_key]]) )
+ if (empty($holding[$this->acl_options[$ary_key][$option_key]]))
{
$holding[$this->acl_options[$ary_key][$option_key]] = 1;
}
}
}
- $forum_id = ( $forum_id ) ? str_pad(decbin($forum_id), 16, 0, STR_PAD_LEFT) : '';
+ $forum_id = ($forum_id) ? str_pad(decbin($forum_id), 16, 0, STR_PAD_LEFT) : '';
$bitstring = explode("\r\n", chunk_split($forum_id . implode('', $holding), 8));
array_pop($bitstring);
- foreach ( $bitstring as $byte )
+ foreach ($bitstring as $byte)
{
$$hold_str .= chr(bindec($byte));
}
}
unset($holding);
- if ( $global_hold == '' )
+ if ($global_hold == '')
{
for($i = 0; $i < $global_bits; $i++)
{
@@ -662,20 +677,20 @@ class auth
$method = trim($config['auth_method']);
- if ( file_exists('includes/auth/auth_' . $method . '.' . $phpEx) )
+ if (file_exists('includes/auth/auth_' . $method . '.' . $phpEx))
{
include_once('includes/auth/auth_' . $method . '.' . $phpEx);
$method = 'login_' . $method;
- if ( function_exists($method) )
+ if (function_exists($method))
{
- if ( !($login = $method($username, $password)) )
+ if (!($login = $method($username, $password)))
{
return false;
}
- $autologin = ( isset($autologin) ) ? md5($password) : '';
- return ( $login['user_active'] ) ? $user->create($login['user_id'], $autologin) : false;
+ $autologin = (isset($autologin)) ? md5($password) : '';
+ return ($login['user_active']) ? $user->create($login['user_id'], $autologin) : false;
}
}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 9f6ba8c689..e8a7d06304 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -58,7 +58,7 @@ switch ($mode)
trigger_error($user->lang['No_forum_id']);
}
- $sql = 'SELECT forum_id, post_count_inc
+ $sql = 'SELECT forum_id, forum_status, post_count_inc
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . intval($f);
break;
@@ -69,7 +69,7 @@ switch ($mode)
trigger_error($user->lang['No_topic_id']);
}
- $sql = 'SELECT t.*, f.post_count_inc
+ $sql = 'SELECT t.*, f.forum_status, f.post_count_inc
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f
WHERE t.topic_id = ' . intval($t) . '
AND f.forum_id = t.forum_id';
@@ -83,7 +83,7 @@ switch ($mode)
trigger_error($user->lang['No_post_id']);
}
- $sql = 'SELECT t.*, p.*, pt.*, f.post_count_inc
+ $sql = 'SELECT t.*, p.*, pt.*, f.forum_status, f.post_count_inc
FROM ' . POSTS_TABLE . ' p, ' . POSTS_TEXT_TABLE . ' pt, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f
WHERE p.post_id = ' . intval($p) . '
AND t.topic_id = p.topic_id
@@ -142,17 +142,21 @@ if ($mode == 'edit' && !empty($poll_start))
// POST INFO
// ---------
-
-
-
// Basic mode related permission check
if (!$auth->acl_get('f_' . $mode, $forum_id))
{
trigger_error($user->lang['User_cannot_' . $mode]);
}
+// Forum/Topic locked?
+if ((intval($forum_status) == ITEM_LOCKED || intval($topic_status) == ITEM_LOCKED) && !$auth->acl_gets('m_', 'a_', $forum_id))
+{
+ $message = (intval($forum_status) == FORUM_LOCKED) ? 'Forum_locked' : 'Topic_locked';
+ trigger_error($user->lang[$message]);
+}
+
// Can we edit this post?
-if (($mode == 'edit' || $mode == 'delete') && !empty($config['edit_time']) && $post_time < time() - $config['edit_time'] && !$auth->acl_get('m_', $forum_id) && !$auth->acl_get('a_'))
+if (($mode == 'edit' || $mode == 'delete') && !empty($config['edit_time']) && $post_time < time() - $config['edit_time'] && !$auth->acl_gets('m_', 'a_', $forum_id))
{
trigger_error($user->lang['Cannot_edit_time']);
}
@@ -556,29 +560,29 @@ if ($row = $db->sql_fetchrow($result))
$topic_type_toggle = '';
if ($mode == 'post' || $mode == 'edit')
{
- if ( $auth->acl_get('f_sticky', $forum_id) )
+ if ($auth->acl_gets('f_sticky', 'm_sticky', 'a_', intval($forum_id)))
{
$topic_type_toggle .= '<input type="radio" name="type" value="' . POST_STICKY . '"';
- if ($topic_type == POST_STICKY)
+ if (intval($topic_type) == POST_STICKY)
{
$topic_type_toggle .= ' checked="checked"';
}
$topic_type_toggle .= ' /> ' . $user->lang['Post_Sticky'] . '&nbsp;&nbsp;';
}
- if ( $auth->acl_get('f_announce', $forum_id) )
+ if ($auth->acl_gets('f_announce', 'm_announce', 'a_', intval($forum_id)))
{
$topic_type_toggle .= '<input type="radio" name="type" value="' . POST_ANNOUNCE . '"';
- if ($topic_type == POST_ANNOUNCE)
+ if (intval($topic_type) == POST_ANNOUNCE)
{
$topic_type_toggle .= ' checked="checked"';
}
$topic_type_toggle .= ' /> ' . $user->lang['Post_Announcement'] . '&nbsp;&nbsp;';
}
- if ( $topic_type_toggle != '' )
+ if ($topic_type_toggle != '')
{
- $topic_type_toggle = $user->lang['Post_topic_as'] . ': <input type="radio" name="type" value="' . POST_NORMAL .'"' . ( ($topic_type == POST_NORMAL) ? ' checked="checked"' : '' ) . ' /> ' . $user->lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
+ $topic_type_toggle = $user->lang['Post_topic_as'] . ': <input type="radio" name="type" value="' . POST_NORMAL .'"' . ((intval($topic_type) == POST_NORMAL) ? ' checked="checked"' : '') . ' /> ' . $user->lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
}
}
@@ -616,11 +620,11 @@ switch ($mode)
}
// Nav links for forum
-forum_nav_links($forum_id, $forum_name);
+forum_nav_links($forum_id, $forum_data);
// Start assigning vars for main posting page ...
$template->assign_vars(array(
- 'FORUM_NAME' => $forum_name,
+ 'FORUM_NAME' => $forum_data['forum_name'],
'TOPIC_TITLE' => ($mode != 'post') ? $topic_title : '',
'USERNAME' => $post_username,
'SUBJECT' => (!empty($topic_title)) ? $topic_title : $post_subject,
@@ -677,9 +681,9 @@ $template->assign_vars(array(
'L_FONT_LARGE' => $user->lang['font_large'],
'L_FONT_HUGE' => $user->lang['font_huge'],
- 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=$forum_id",
- 'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&amp;t=$topic_id" : '',
- 'U_REVIEW_TOPIC' => ($mode != 'post') ? "posting.$phpEx$SID&amp;mmode=topicreview&amp;t=$topic_id" : '',
+ 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=" . intval($forum_id),
+ 'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&amp;t=" . intval($topic_id) : '',
+ 'U_REVIEW_TOPIC' => ($mode != 'post') ? "posting.$phpEx$SID&amp;mmode=topicreview&amp;t=" . intval($topic_id) : '',
'U_VIEW_MODERATORS' => 'memberslist.' . $phpEx . $SID . '&amp;mode=moderators&amp;f=' . intval($forum_id),
'S_SHOW_TOPIC_ICONS' => $s_topic_icons,
@@ -697,7 +701,7 @@ $template->assign_vars(array(
'S_SMILIES_ALLOWED' => $smilies_status,
'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id)) ? true : false,
'S_NOTIFY_ALLOWED' => ($user->data['user_id'] != ANONYMOUS) ? true : false,
- 'S_DELETE_ALLOWED' => ($mode = 'edit' && (($post_id == $topic_last_post_id && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_get('m_delete', intval($forum_id)) || $auth->acl_get('a_'))) ? true : false,
+ 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $topic_last_post_id && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_gets('m_delete', 'a_', intval($forum_id)))) ? true : false,
'S_TYPE_TOGGLE' => $topic_type_toggle,
'S_TOPIC_ID' => intval($topic_id),
@@ -705,11 +709,11 @@ $template->assign_vars(array(
);
// Poll entry
-if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_first_post_id) && empty($poll_last_vote))) && $auth->acl_get('f_poll', intval($forum_id))) || $auth->acl_get('a_'))
+if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_first_post_id) && empty($poll_last_vote))) && $auth->acl_get('f_poll', intval($forum_id))) || $auth->acl_gets('m_edit', 'a_', $forum_id))
{
$template->assign_vars(array(
'S_SHOW_POLL_BOX' => true,
- 'S_POLL_DELETE' => ($mode = 'edit' && !empty($poll_options) && ((empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_get('m_delete', intval($forum_id)) || $auth->acl_get('a_'))) ? true : false,
+ 'S_POLL_DELETE' => ($mode = 'edit' && !empty($poll_options) && ((empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_gets('m_delete', 'a_', intval($forum_id)))) ? true : false,
'L_ADD_A_POLL' => $user->lang['Add_poll'],
'L_ADD_POLL_EXPLAIN' => $user->lang['Add_poll_explain'],
@@ -731,7 +735,7 @@ if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_f
}
// Attachment entry
-if ( $auth->acl_get('f_attach', $forum_id) )
+if ($auth->acl_gets('f_attach', 'm_edit', 'a_', $forum_id))
{
$template->assign_vars(array(
'S_SHOW_ATTACH_BOX' => true,
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 87113155ea..9bfdd0d51a 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -30,9 +30,9 @@ include($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
//
// Is PM disabled?
//
-if ( !empty($config['privmsg_disable']) )
+if (!empty($config['privmsg_disable']))
{
- message_die(MESSAGE, 'PM_disabled');
+ trigger_error('PM_disabled');
}
$html_entities_match = array('#&#', '#<#', '#>#');
diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css
index a6beb39a7f..074afe542a 100644
--- a/phpBB/templates/subSilver/subSilver.css
+++ b/phpBB/templates/subSilver/subSilver.css
@@ -4,6 +4,8 @@
http://www.subBlue.com
*/
+/* Protected classes used internally -DO NOT REMOVE!- */
+span.hilit {color:red;font-weight:bold}
/* General page style. The scroll bar colours only visible in IE5.5+ */
body {
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html
index af4314ec23..d2a1480868 100644
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -34,7 +34,7 @@
</table></td>
</tr>
<tr>
- <td align="center"><input type="submit" name="submit" value="{L_SUBMIT_VOTE}" class="liteoption" /></td>
+ <td align="center"><input type="submit" name="castvote" value="{L_SUBMIT_VOTE}" class="liteoption" /></td>
</tr>
<tr>
<td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}" class="gensmall">{L_VIEW_RESULTS}</a></b></span></td>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 7b5e25f59f..e4ac031b96 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -33,25 +33,25 @@ if (preg_match('/^c([0-9]+)$/', $_POST['f'], $m))
include($phpbb_root_path . 'common.'.$phpEx);
// Start initial var setup
-if ( isset($_GET['f']) || isset($_POST['f']) )
+if (isset($_GET['f']) || isset($_POST['f']))
{
- $forum_id = ( isset($_GET['f']) ) ? intval($_GET['f']) : intval($_POST['f']);
+ $forum_id = (isset($_GET['f'])) ? intval($_GET['f']) : intval($_POST['f']);
}
else
{
$forum_id = '';
}
-if ( isset($_GET['mark']) || isset($_POST['mark']) )
+if (isset($_GET['mark']) || isset($_POST['mark']))
{
- $mark_read = ( isset($_POST['mark']) ) ? $_POST['mark'] : $_GET['mark'];
+ $mark_read = (isset($_POST['mark'])) ? $_POST['mark'] : $_GET['mark'];
}
else
{
$mark_read = '';
}
-$start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0;
+$start = (isset($_GET['start'])) ? intval($_GET['start']) : 0;
// End initial var setup
// Start session
@@ -61,12 +61,12 @@ $user->start();
// If not give them a nice error page.
if (empty($forum_id))
{
- message_die(MESSAGE, 'Forum_not_exist');
+ trigger_error('Forum_not_exist');
}
if (!$forum_branch = get_forum_branch($forum_id))
{
- message_die(MESSAGE, 'Forum_not_exist');
+ trigger_error('Forum_not_exist');
}
// Configure style, language, etc.
@@ -74,22 +74,23 @@ $user->setup(false, $forum_branch['forum_style']);
$auth->acl($user->data, $forum_id);
// Auth check
-if (!$auth->acl_get('f_read', $forum_id))
+if (!$auth->acl_gets('f_read', 'm_', 'a_', $forum_id))
{
- if ( !$user->data['user_id'] )
+ if (!$user->data['user_id'] != ANONYMOUS)
{
redirect("login.$phpEx$SID&redirect=viewforum.$phpEx&f=$forum_id" . ((isset($start)) ? "&start=$start" : ''));
}
- trigger_error( $user->lang['Sorry_auth_read']);
+ trigger_error($user->lang['Sorry_auth_read']);
}
// End of auth check
// Build subforums list if applicable
+//$forum_data = array();
+//$s_has_subforums = forum_nav_links($forum_id, $forum_data);
$type = 'parent';
$forum_rows = array();
-$s_has_subforums = FALSE;
foreach ($forum_branch as $row)
{
if ($type == 'parent')
@@ -155,13 +156,13 @@ foreach ($forum_branch as $row)
}
// Topic read tracking cookie info
-$mark_topics = ( isset($_COOKIE[$config['cookie_name'] . '_t']) ) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
-$mark_forums = ( isset($_COOKIE[$config['cookie_name'] . '_f']) ) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_f'])) : array();
+$mark_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
+$mark_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_f'])) : array();
// Handle marking posts
-if ( $mark_read == 'topics' )
+if ($mark_read == 'topics')
{
- if ( $user->data['user_id'] )
+ if ($user->data['user_id'] != ANONYMOUS)
{
$mark_forums[$forum_id] = time();
@@ -178,9 +179,9 @@ if ( $mark_read == 'topics' )
// End handle marking posts
// Do the forum Prune
-if ( $auth->acl_get('m_prune', $forum_id) && $config['prune_enable'] )
+if ($auth->acl_gets('m_prune', 'a_', $forum_id) && $config['prune_enable'])
{
- if ( $forum_data['prune_next'] < time() && $forum_data['prune_enable'] )
+ if ($forum_data['prune_next'] < time() && $forum_data['prune_enable'])
{
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
auto_prune($forum_id);
@@ -205,11 +206,11 @@ $previous_days = array(0 => $user->lang['All_Topics'], 1 => $user->lang['1_Day']
$sort_by_text = array('a' => $user->lang['Author'], 't' => $user->lang['Post_time'], 'r' => $user->lang['Replies'], 's' => $user->lang['Subject'], 'v' => $user->lang['Views']);
$sort_by = array('a' => 'u.username', 't' => 't.topic_last_post_id', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
-if ( isset($_POST['sort']) )
+if (isset($_POST['sort']))
{
- if ( !empty($_POST['sort_days']) )
+ if (!empty($_POST['sort_days']))
{
- $sort_days = ( !empty($_POST['sort_days']) ) ? intval($_POST['sort_days']) : intval($_GET['sort_days']);
+ $sort_days = (!empty($_POST['sort_days'])) ? intval($_POST['sort_days']) : intval($_GET['sort_days']);
$min_topic_time = time() - ( $sort_days * 86400 );
//
@@ -222,20 +223,20 @@ if ( isset($_POST['sort']) )
$result = $db->sql_query($sql);
$start = 0;
- $topics_count = ( $row = $db->sql_fetchrow($result) ) ? $row['forum_topics'] : 0;
+ $topics_count = ($row = $db->sql_fetchrow($result)) ? $row['forum_topics'] : 0;
$limit_topics_time = "AND t.topic_last_post_time >= $min_topic_time";
}
else
{
- $topics_count = ( $forum_data['forum_topics'] ) ? $forum_data['forum_topics'] : 1;
+ $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
}
- $sort_key = ( isset($_POST['sort_key']) ) ? $_POST['sort_key'] : $_GET['sort_key'];
- $sort_dir = ( isset($_POST['sort_dir']) ) ? $_POST['sort_dir'] : $_GET['sort_dir'];
+ $sort_key = (isset($_POST['sort_key'])) ? $_POST['sort_key'] : $_GET['sort_key'];
+ $sort_dir = (isset($_POST['sort_dir'])) ? $_POST['sort_dir'] : $_GET['sort_dir'];
}
else
{
- $topics_count = ( $forum_data['forum_topics'] ) ? $forum_data['forum_topics'] : 1;
+ $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
$limit_topics_time = '';
$sort_days = 0;
@@ -243,38 +244,38 @@ else
$sort_dir = 'd';
}
-$sort_order = $sort_by[$sort_key] . ' ' . ( ( $sort_dir == 'd' ) ? 'DESC' : 'ASC' );
+$sort_order = $sort_by[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$select_sort_days = '<select name="sort_days">';
-foreach ( $previous_days as $day => $text )
+foreach ($previous_days as $day => $text)
{
- $selected = ( $sort_days == $day ) ? ' selected="selected"' : '';
+ $selected = ($sort_days == $day) ? ' selected="selected"' : '';
$select_sort_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
}
$select_sort_days .= '</select>';
$select_sort = '<select name="sort_key">';
-foreach ( $sort_by_text as $key => $text )
+foreach ($sort_by_text as $key => $text)
{
- $selected = ( $sort_key == $key ) ? ' selected="selected"' : '';
+ $selected = ($sort_key == $key) ? ' selected="selected"' : '';
$select_sort .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
}
$select_sort .= '</select>';
$select_sort_dir = '<select name="sort_dir">';
-$select_sort_dir .= ( $sort_dir == 'a' ) ? '<option value="a" selected="selected">' . $user->lang['Ascending'] . '</option><option value="d">' . $user->lang['Descending'] . '</option>' : '<option value="a">' . $user->lang['Ascending'] . '</option><option value="d" selected="selected">' . $user->lang['Descending'] . '</option>';
+$select_sort_dir .= ($sort_dir == 'a') ? '<option value="a" selected="selected">' . $user->lang['Ascending'] . '</option><option value="d">' . $user->lang['Descending'] . '</option>' : '<option value="a">' . $user->lang['Ascending'] . '</option><option value="d" selected="selected">' . $user->lang['Descending'] . '</option>';
$select_sort_dir .= '</select>';
-$post_alt = ( $forum_data['forum_status'] == FORUM_LOCKED ) ? 'Forum_locked' : 'Post_new_topic';
+$post_alt = (intval($forum_data['forum_status']) == ITEM_LOCKED) ? 'Forum_locked' : 'Post_new_topic';
// Basic pagewide vars
$template->assign_vars(array(
'FORUM_ID' => $forum_id,
'FORUM_NAME' => $forum_data['forum_name'],
- 'POST_IMG' => ( $forum_data['forum_status'] == FORUM_LOCKED ) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt),
+ 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt),
'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&amp;f=$forum_id&amp;topicdays=$topic_days", $topics_count, $config['topics_per_page'], $start),
- 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], ( floor( $start / $config['topics_per_page'] ) + 1 ), ceil( $topics_count / $config['topics_per_page'] )),
- 'MOD_CP' => ( $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id) ) ? sprintf($user->lang['MCP'], '<a href="modcp.' . $phpEx . $SID . '&amp;f=' . $forum_id . '">', '</a>') : '',
+ 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], (floor( $start / $config['topics_per_page'] ) + 1), ceil( $topics_count / $config['topics_per_page'] )),
+ 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '<a href="modcp.' . $phpEx . $SID . '&amp;f=' . $forum_id . '">', '</a>') : '',
'FOLDER_IMG' => $user->img('folder', 'No_new_posts'),
'FOLDER_NEW_IMG' => $user->img('folder_new', 'New_posts'),
@@ -397,7 +398,7 @@ while( $row = $db->sql_fetchrow($result) )
$db->sql_freeresult($result);
// Okay, lets dump out the page ...
-if ( $total_topics )
+if ($total_topics)
{
for($i = 0; $i < $total_topics; $i++)
{
@@ -405,7 +406,7 @@ if ( $total_topics )
// Type and folder
$topic_type = '';
- if ( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
+ if ($topic_rowset[$i]['topic_status'] == TOPIC_MOVED)
{
$topic_type = $user->lang['Topic_Moved'] . ' ';
$topic_id = $topic_rowset[$i]['topic_moved_id'];
@@ -416,7 +417,7 @@ if ( $total_topics )
}
else
{
- switch ( $topic_rowset[$i]['topic_type'] )
+ switch ($topic_rowset[$i]['topic_type'])
{
case POST_ANNOUNCE:
$topic_type = $user->lang['Topic_Announcement'] . ' ';
@@ -428,12 +429,12 @@ if ( $total_topics )
$folder = 'folder_sticky';
$folder_new = 'folder_sticky_new';
break;
- case TOPIC_LOCKED:
+ case ITEM_LOCKED:
$folder = 'folder_locked';
$folder_new = 'folder_locked_new';
break;
default:
- if ( $replies >= $config['hot_threshold'] )
+ if ($replies >= intval($config['hot_threshold']))
{
$folder = 'folder_hot';
$folder_new = 'folder_hot_new';
@@ -447,39 +448,41 @@ if ( $total_topics )
}
$unread_topic = false;
- if ( $user->data['user_id'] && $topic_rowset[$i]['topic_last_post_time'] > $user->data['user_lastvisit'] )
+ if ($user->data['user_id'] && $topic_rowset[$i]['topic_last_post_time'] > $user->data['session_last_visit'])
{
$unread_topic = true;
}
- $newest_post_img = ( $unread_topic ) ? '<a href="viewtopic.' . $phpEx . $SID . '&amp;t=' . $topic_id . '&amp;view=newest">' . $user->img('goto_post_newest', 'View_newest_post') . '</a> ' : '';
- $folder_img = ( $unread_topic ) ? $folder_new : $folder;
- $folder_alt = ( $unread_topic ) ? 'New_posts' : ( ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? 'Topic_locked' : 'No_new_posts' );
+ $newest_post_img = ($unread_topic) ? '<a href="viewtopic.' . $phpEx . $SID . '&amp;t=' . $topic_id . '&amp;view=newest">' . $user->img('goto_post_newest', 'View_newest_post') . '</a> ' : '';
+ $folder_img = ($unread_topic) ? $folder_new : $folder;
+ $folder_alt = ($unread_topic) ? 'New_posts' : (($topic_rowset[$i]['topic_status'] == ITEM_LOCKED) ? 'Topic_locked' : 'No_new_posts');
}
- if ( $topic_rowset[$i]['topic_vote'] )
+ if (intval($topic_rowset[$i]['poll_start']))
{
$topic_type .= $user->lang['Topic_Poll'] . ' ';
}
+ $replies = $topic_rowset[$i]['topic_replies'];
+
// Goto message
- if ( ( $replies + 1 ) > $config['posts_per_page'] )
+ if (($replies + 1 ) > intval($config['posts_per_page']))
{
- $total_pages = ceil( ( $replies + 1 ) / $config['posts_per_page'] );
- $goto_page = ' [ <img src=' . $theme['goto_post'] . ' alt="' . $user->lang['Goto_page'] . '" title="' . $user->lang['Goto_page'] . '" />' . $user->lang['Goto_page'] . ': ';
+ $total_pages = ceil(($replies + 1) / intval($config['posts_per_page']));
+ $goto_page = ' [ ' . $user->img('goto_post', 'Goto_page') . $user->lang['Goto_page'] . ': ';
$times = 1;
- for($j = 0; $j < $replies + 1; $j += $config['posts_per_page'])
+ for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page']))
{
$goto_page .= '<a href="viewtopic.' . $phpEx . $SID . '&amp;t=' . $topic_id . '&amp;start=' . $j . '">' . $times . '</a>';
- if ( $times == 1 && $total_pages > 4 )
+ if ($times == 1 && $total_pages > 4)
{
$goto_page .= ' ... ';
$times = $total_pages - 3;
- $j += ( $total_pages - 4 ) * $config['posts_per_page'];
+ $j += ($total_pages - 4) * intval($config['posts_per_page']);
}
- else if ( $times < $total_pages )
+ else if ($times < $total_pages)
{
$goto_page .= ', ';
}
@@ -495,22 +498,20 @@ if ( $total_topics )
// Generate all the URIs ...
$view_topic_url = 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;t=' . $topic_id;
- $topic_author = ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['user_id'] . '">' : '';
- $topic_author .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? $topic_rowset[$i]['username'] : ( ( $topic_rowset[$i]['topic_first_poster_name'] != '' ) ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest'] );
+ $topic_author = ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['user_id'] . '">' : '';
+ $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest']);
- $topic_author .= ( $topic_rowset[$i]['user_id'] ) ? '</a>' : '';
+ $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '</a>' : '';
$first_post_time = $user->format_date($topic_rowset[$i]['topic_time'], $config['board_timezone']);
$last_post_time = $user->format_date($topic_rowset[$i]['topic_last_post_time']);
- $last_post_author = ( !$topic_rowset[$i]['id2'] ) ? ( ( $topic_rowset[$i]['topic_last_poster_name'] != '' ) ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ' ) : '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['topic_last_poster_id'] . '">' . $topic_rowset[$i]['user2'] . '</a>';
+ $last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['topic_last_poster_id'] . '">' . $topic_rowset[$i]['user2'] . '</a>';
$last_post_url = '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;p=' . $topic_rowset[$i]['topic_last_post_id'] . '#' . $topic_rowset[$i]['topic_last_post_id'] . '">' . $user->img('goto_post_latest', 'View_latest_post') . '</a>';
- //
// Send vars to template
- //
$template->assign_block_vars('topicrow', array(
'FORUM_ID' => $forum_id,
'TOPIC_ID' => $topic_id,
@@ -524,10 +525,12 @@ if ( $total_topics )
'GOTO_PAGE' => $goto_page,
'REPLIES' => $topic_rowset[$i]['topic_replies'],
'VIEWS' => $topic_rowset[$i]['topic_views'],
- 'TOPIC_TITLE' => ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $topic_rowset[$i]['topic_title']) : $topic_rowset[$i]['topic_title'],
+ 'TOPIC_TITLE' => (count($orig_word)) ? preg_replace($orig_word, $replacement_word, $topic_rowset[$i]['topic_title']) : $topic_rowset[$i]['topic_title'],
'TOPIC_TYPE' => $topic_type,
- 'TOPIC_ICON' => ( !empty($topic_rowset[$i]['topic_icon']) ) ? '<img src="' . $config['icons_path'] . '/' . $topic_icons[$topic_rowset[$i]['topic_icon']]['img'] . '" width="' . $topic_icons[$topic_rowset[$i]['topic_icon']]['width'] . '" height="' . $topic_icons[$topic_rowset[$i]['topic_icon']]['height'] . '" alt="" title="" />' : '',
- 'TOPIC_RATING' => ( !empty($topic_rowset[$i]['topic_rating']) ) ? '<img src=' . str_replace('{RATE}', $topic_rowset[$i]['topic_rating'], $theme['rating']) . ' alt="' . $topic_rowset[$i]['topic_rating'] . '" title="' . $topic_rowset[$i]['topic_rating'] . '" />' : '',
+ 'TOPIC_ICON' => (!empty($topic_rowset[$i]['topic_icon']) ) ? '<img src="' . $config['icons_path'] . '/' . $topic_icons[$topic_rowset[$i]['topic_icon']]['img'] . '" width="' . $topic_icons[$topic_rowset[$i]['topic_icon']]['width'] . '" height="' . $topic_icons[$topic_rowset[$i]['topic_icon']]['height'] . '" alt="" title="" />' : '',
+
+
+ 'TOPIC_RATING' => (!empty($topic_rowset[$i]['topic_rating'])) ? '<img src=' . str_replace('{RATE}', $topic_rowset[$i]['topic_rating'], $theme['rating']) . ' alt="' . $topic_rowset[$i]['topic_rating'] . '" title="' . $topic_rowset[$i]['topic_rating'] . '" />' : '',
'S_ROW_COUNT' => $i,
@@ -545,7 +548,7 @@ if ($user->data['user_id'] != ANONYMOUS)
$page_title = $user->lang['View_forum'] . ' - ' . $forum_data['forum_name'];
$nav_links['up'] = array(
- 'url' => 'index.' . $phpEx . $SID,
+ 'url' => 'index.' . $phpEx . $SID,
'title' => sprintf($user->lang['Forum_Index'], $config['sitename'])
);
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 17b19b3be7..c9245e2399 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -40,9 +40,11 @@ if (isset($_GET['view']) && empty($post_id))
{
if ($_GET['view'] == 'newest')
{
- if (isset($_COOKIE[$config['cookie_name'] . '_sid']))
+ if (!empty($_COOKIE[$config['cookie_name'] . '_sid']) || !empty($_GET['sid']))
{
- $session_id = $_COOKIE[$config['cookie_name'] . '_sid'];
+ $session_id = (!empty($_COOKIE[$config['cookie_name'] . '_sid'])) ? $_COOKIE[$config['cookie_name'] . '_sid'] : $_GET['sid'];
+
+ $SID = '?sid=' . ((!empty($_GET['sid'])) ? $session_id : '');
if ($session_id)
{
@@ -59,7 +61,7 @@ if (isset($_GET['view']) && empty($post_id))
if (!($row = $db->sql_fetchrow($result)))
{
- message_die(MESSAGE, 'No_new_posts_last_visit');
+ trigger_error('No_new_posts_last_visit');
}
$post_id = $row['post_id'];
@@ -67,7 +69,7 @@ if (isset($_GET['view']) && empty($post_id))
}
}
- redirect("index.$phpEx$SID");
+ redirect("index.$phpEx");
}
else if ($_GET['view'] == 'next' || $_GET['view'] == 'previous')
{
@@ -85,8 +87,8 @@ if (isset($_GET['view']) && empty($post_id))
if (!($row = $db->sql_fetchrow($result)))
{
- $message = ( $_GET['view'] == 'next' ) ? 'No_newer_topics' : 'No_older_topics';
- message_die(MESSAGE, $message);
+ $message = ($_GET['view'] == 'next') ? 'No_newer_topics' : 'No_older_topics';
+ trigger_error($message);
}
else
{
@@ -101,7 +103,7 @@ $user->start();
if ($user->data['user_id'] != ANONYMOUS)
{
- if (isset($_POST['rating']) )
+ if (isset($_POST['rating']))
{
$sql = "SELECT rating
FROM " . TOPICS_RATINGS_TABLE . "
@@ -111,14 +113,14 @@ if ($user->data['user_id'] != ANONYMOUS)
$rating = ($row = $db->sql_fetchrow($result)) ? $row['rating'] : '';
- if ( empty($_POST['rating_value']) && $rating != '' )
+ if ( empty($_POST['rating_value']) && $rating != '')
{
}
else
{
$new_rating = intval($_POST['rating']);
- $sql = ( $rating != '' ) ? "UPDATE " . TOPICS_RATING_TABLE . " SET rating = $new_rating WHERE user_id = " . $user->data['user_id'] . " AND topic_id = $topic_id" : "INSERT INTO " . TOPICS_RATING_TABLE . " (topic_id, user_id, rating) VALUES ($topic_id, " . $user->data['user_id'] . ", $new_rating)";
+ $sql = ($rating != '') ? "UPDATE " . TOPICS_RATING_TABLE . " SET rating = $new_rating WHERE user_id = " . $user->data['user_id'] . " AND topic_id = $topic_id" : "INSERT INTO " . TOPICS_RATING_TABLE . " (topic_id, user_id, rating) VALUES ($topic_id, " . $user->data['user_id'] . ", $new_rating)";
}
}
else if (isset($_POST['castvote']))
@@ -133,10 +135,10 @@ if ($user->data['user_id'] != ANONYMOUS)
// This rather complex gaggle of code handles querying for topics but
// also allows for direct linking to a post (and the calculation of which
// page the post is on and the correct display of viewtopic)
-$join_sql_table = ( !$post_id ) ? '' : ', ' . POSTS_TABLE . ' p, ' . POSTS_TABLE . ' p2 ';
-$join_sql = ( !$post_id ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND p.post_approved = " . TRUE . " AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_approved = " . TRUE . " AND p2.post_id <= $post_id";
-$count_sql = ( !$post_id ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
-$order_sql = ( !$post_id ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id, f.forum_style ORDER BY p.post_id ASC";
+$join_sql_table = (!$post_id) ? '' : ', ' . POSTS_TABLE . ' p, ' . POSTS_TABLE . ' p2 ';
+$join_sql = (!$post_id) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND p.post_approved = " . TRUE . " AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_approved = " . TRUE . " AND p2.post_id <= $post_id";
+$count_sql = (!$post_id) ? '' : ", COUNT(p2.post_id) AS prev_posts";
+$order_sql = (!$post_id) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id, f.forum_style ORDER BY p.post_id ASC";
$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_status, f.forum_id, f.forum_style" . $count_sql . "
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . "
@@ -151,12 +153,12 @@ if (!(extract($db->sql_fetchrow($result))))
}
// Configure style, language, etc.
-$user->setup(false, $forum_style);
-$auth->acl($user->data, $forum_id);
+$user->setup(false, intval($forum_style));
+$auth->acl($user->data, intval($forum_id));
// End configure
// Start auth check
-if (!$auth->acl_get('f_read', $forum_id))
+if (!$auth->acl_gets('f_read', 'm_', 'a_', intval($forum_id)))
{
if ($user->data['user_id'] == ANONYMOUS)
{
@@ -206,8 +208,8 @@ if (isset($_POST['sort']))
$topic_replies++;
}
- $sort_key = ( isset($_POST['sort_key']) ) ? $_POST['sort_key'] : $_GET['sort_key'];
- $sort_dir = ( isset($_POST['sort_dir']) ) ? $_POST['sort_dir'] : $_GET['sort_dir'];
+ $sort_key = (isset($_POST['sort_key'])) ? $_POST['sort_key'] : $_GET['sort_key'];
+ $sort_dir = (isset($_POST['sort_dir'])) ? $_POST['sort_dir'] : $_GET['sort_dir'];
}
else
{
@@ -219,12 +221,12 @@ else
$sort_dir = 'a';
}
-$sort_order = $sort_by[$sort_key] . ' ' . ( ( $sort_dir == 'd' ) ? 'DESC' : 'ASC' );
+$sort_order = $sort_by[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$select_sort_days = '<select name="sort_days">';
foreach ($previous_days as $day => $text)
{
- $selected = ( $sort_days == $day ) ? ' selected="selected"' : '';
+ $selected = ($sort_days == $day) ? ' selected="selected"' : '';
$select_sort_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
}
$select_sort_days .= '</select>';
@@ -232,13 +234,13 @@ $select_sort_days .= '</select>';
$select_sort = '<select name="sort_key">';
foreach ($sort_by_text as $key => $text)
{
- $selected = ( $sort_key == $key ) ? ' selected="selected"' : '';
+ $selected = ($sort_key == $key) ? ' selected="selected"' : '';
$select_sort .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
}
$select_sort .= '</select>';
$select_sort_dir = '<select name="sort_dir">';
-$select_sort_dir .= ( $sort_dir == 'a' ) ? '<option value="a" selected="selected">' . $user->lang['Ascending'] . '</option><option value="d">' . $user->lang['Descending'] . '</option>' : '<option value="a">' . $user->lang['Ascending'] . '</option><option value="d" selected="selected">' . $user->lang['Descending'] . '</option>';
+$select_sort_dir .= ($sort_dir == 'a') ? '<option value="a" selected="selected">' . $user->lang['Ascending'] . '</option><option value="d">' . $user->lang['Descending'] . '</option>' : '<option value="a">' . $user->lang['Ascending'] . '</option><option value="d" selected="selected">' . $user->lang['Descending'] . '</option>';
$select_sort_dir .= '</select>';
$select_post_days = '<select name="postdays">';
@@ -271,12 +273,12 @@ if ($user->data['user_id'] != ANONYMOUS)
AND user_id = " . $user->data['user_id'];
$result = $db->sql_query($sql);
- $user_rating = ( $row = $db->sql_fetchrow($result) ) ? $row['rating'] : 0;
+ $user_rating = ($row = $db->sql_fetchrow($result)) ? $row['rating'] : 0;
for($i = -5; $i < 6; $i++)
{
- $selected = ( $user_rating == $i ) ? ' selected="selected"' : '';
- $rating .= '<option value="' . $i . '"' . $selected . '>' . $i . ( ( !empty($rating_text[$i]) ) ? ' > ' . $rating_text[$i] : '' ) . '</option>';
+ $selected = ($user_rating == $i) ? ' selected="selected"' : '';
+ $rating .= '<option value="' . $i . '"' . $selected . '>' . $i . ((!empty($rating_text[$i])) ? ' > ' . $rating_text[$i] : '') . '</option>';
}
$rating = '<select name="rating">' . $rating . '</select>';
@@ -295,7 +297,7 @@ if (isset($_GET['highlight']))
{
if (trim($word) != '')
{
- $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '([\w]+)?', preg_quote($word, '#'));
+ $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '\w*', preg_quote($word, '#'));
}
}
unset($words);
@@ -306,11 +308,11 @@ $s_forum_rules = '';
get_forum_rules('topic', $s_forum_rules, $forum_id);
$topic_mod = '';
-$topic_mod .= ( $auth->acl_get('m_lock', $forum_id) ) ? ( ( $topic_status == TOPIC_UNLOCKED ) ? '<option value="lock">' . $user->lang['Lock_topic'] . '</option>' : '<option value="unlock">' . $user->lang['Unlock_topic'] . '</option>' ) : '';
-$topic_mod .= ( $auth->acl_get('m_delete', $forum_id) ) ? '<option value="delete">' . $user->lang['Delete_topic'] . '</option>' : '';
-$topic_mod .= ( $auth->acl_get('m_move', $forum_id) ) ? '<option value="move">' . $user->lang['Move_topic'] . '</option>' : '';
-$topic_mod .= ( $auth->acl_get('m_split', $forum_id) ) ? '<option value="split">' . $user->lang['Split_topic'] . '</option>' : '';
-$topic_mod .= ( $auth->acl_get('m_merge', $forum_id) ) ? '<option value="merge">' . $user->lang['Merge_topic'] . '</option>' : '';
+$topic_mod .= ($auth->acl_gets('m_lock', 'a_', $forum_id)) ? ((intval($topic_status) == TOPIC_UNLOCKED) ? '<option value="lock">' . $user->lang['Lock_topic'] . '</option>' : '<option value="unlock">' . $user->lang['Unlock_topic'] . '</option>') : '';
+$topic_mod .= ($auth->acl_gets('m_delete', 'a_', $forum_id)) ? '<option value="delete">' . $user->lang['Delete_topic'] . '</option>' : '';
+$topic_mod .= ($auth->acl_gets('m_move', 'a_', $forum_id)) ? '<option value="move">' . $user->lang['Move_topic'] . '</option>' : '';
+$topic_mod .= ($auth->acl_gets('m_split', 'a_', $forum_id)) ? '<option value="split">' . $user->lang['Split_topic'] . '</option>' : '';
+$topic_mod .= ($auth->acl_gets('m_merge', 'a_', $forum_id)) ? '<option value="merge">' . $user->lang['Merge_topic'] . '</option>' : '';
// If we've got a hightlight set pass it on to pagination.
$pagination = ($highlight_match) ? generate_pagination("viewtopic.$phpEx$SID&amp;t=$topic_id&amp;postdays=$post_days&amp;postorder=$post_order&amp;highlight=" . $_GET['highlight'], $topic_replies, $config['posts_per_page'], $start) : generate_pagination("viewtopic.$phpEx$SID&amp;t=$topic_id&amp;postdays=$post_days&amp;postorder=$post_order", $topic_replies, $config['posts_per_page'], $start);
@@ -323,13 +325,13 @@ $view_forum_url = 'viewforum.' . $phpEx . $SID . '&amp;f=' . $forum_id;
$view_prev_topic_url = 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;t=' . $topic_id . '&amp;view=previous';
$view_next_topic_url = 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;t=' . $topic_id . '&amp;view=next';
-$reply_img = ( $forum_status == FORUM_LOCKED || $topic_status == TOPIC_LOCKED ) ? $user->img('reply_locked', $user->lang['Topic_locked']) : $user->img('reply_new', $user->lang['Reply_to_topic']);
-$post_img = ( $forum_status == FORUM_LOCKED ) ? $user->img('post_locked', $user->lang['Forum_locked']) : $user->img('post_new', $user->lang['Post_new_topic']);
+$reply_img = ($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) ? $user->img('reply_locked', $user->lang['Topic_locked']) : $user->img('reply_new', $user->lang['Reply_to_topic']);
+$post_img = ($forum_status == ITEM_LOCKED) ? $user->img('post_locked', $user->lang['Forum_locked']) : $user->img('post_new', $user->lang['Post_new_topic']);
// Set a cookie for this topic
if ($user->data['user_id'] != ANONYMOUS)
{
- $mark_topics = ( isset($_COOKIE[$config['cookie_name'] . '_t']) ) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
+ $mark_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
$mark_topics[$forum_id][$topic_id] = 0;
setcookie($config['cookie_name'] . '_t', serialize($mark_topics), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
@@ -354,7 +356,7 @@ $template->assign_vars(array(
'TOPIC_TITLE' => $topic_title,
'PAGINATION' => $pagination,
'PAGE_NUMBER' => sprintf($user->lang['Page_of'], ( floor( $start / $config['posts_per_page'] ) + 1 ), ceil( $topic_replies / $config['posts_per_page'] )),
- 'MOD_CP' => ( $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id) ) ? sprintf($user->lang['MCP'], '<a href="modcp.' . $phpEx . $SID . '&amp;f=' . $forum_id . '">', '</a>') : '',
+ 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '<a href="modcp.' . $phpEx . $SID . '&amp;f=' . $forum_id . '">', '</a>') : '',
'POST_IMG' => $post_img,
'REPLY_IMG' => $reply_img,
@@ -384,7 +386,7 @@ $template->assign_vars(array(
'S_SELECT_RATING' => $rating,
'S_TOPIC_ACTION' => "viewtopic.$phpEx$SID&amp;t=" . $topic_id . "&amp;start=$start",
'S_AUTH_LIST' => $s_forum_rules,
- 'S_TOPIC_MOD' => ( $topic_mod != '' ) ? '<select name="mode">' . $topic_mod . '</select>' : '',
+ 'S_TOPIC_MOD' => ($topic_mod != '') ? '<select name="mode">' . $topic_mod . '</select>' : '',
'S_MOD_ACTION' => "modcp.$phpEx$SID",
'S_WATCH_TOPIC' => $s_watching_topic,
@@ -419,7 +421,7 @@ if (!empty($poll_start))
ORDER BY poll_option_id";
$result = $db->sql_query($sql);
- while ( $row = $db->sql_fetchrow($result))
+ while ($row = $db->sql_fetchrow($result))
{
$poll_info[] = $row;
}
@@ -434,7 +436,7 @@ if (!empty($poll_start))
$voted_id = ($row = $db->sql_fetchrow($result)) ? $row['poll_option_id'] : false;
$db->sql_freeresult($result);
- $display_results = ($voted_id || ($poll_length != 0 && $poll_start + $poll_length < time()) || $_GET['vote'] == 'viewresult' || !$auth->acl_get('f_vote', $forum_id) || $topic_status == TOPIC_LOCKED) ? true : false;
+ $display_results = ($voted_id || ($poll_length != 0 && $poll_start + $poll_length < time()) || $_GET['vote'] == 'viewresult' || !$auth->acl_gets('f_vote', 'm_', 'a_', $forum_id) || $topic_status == ITEM_LOCKED || $forum_status == ITEM_LOCKED) ? true : false;
$poll_total = 0;
foreach ($poll_info as $poll_option)
@@ -479,6 +481,7 @@ if (!empty($poll_start))
// Container for user details, only process once
$poster_details = array();
+$i = 0;
// Go ahead and pull all data for this topic
$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid
@@ -497,31 +500,31 @@ if ($row = $db->sql_fetchrow($result))
do
{
$poster_id = $row['user_id'];
- $poster = ( !$poster_id ) ? $user->lang['Guest'] : $row['username'];
+ $poster = (!$poster_id) ? $user->lang['Guest'] : $row['username'];
- $poster_posts = ( $row['user_id'] ) ? $user->lang['Posts'] . ': ' . $row['user_posts'] : '';
+ $poster_posts = ($row['user_id']) ? $user->lang['Posts'] . ': ' . $row['user_posts'] : '';
- $poster_from = ( $row['user_from'] && $row['user_id'] ) ? $user->lang['Location'] . ': ' . $row['user_from'] : '';
+ $poster_from = ($row['user_from'] && $row['user_id']) ? $user->lang['Location'] . ': ' . $row['user_from'] : '';
- if ( !isset($poster_details[$poster_id]['joined']) )
+ if (!isset($poster_details[$poster_id]['joined']))
{
- $poster_details[$poster_id]['joined'] = ( $row['user_id'] ) ? $user->lang['Joined'] . ': ' . $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '';
+ $poster_details[$poster_id]['joined'] = ($row['user_id']) ? $user->lang['Joined'] . ': ' . $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '';
}
- if ( !isset($poster_details[$poster_id]['avatar']) )
+ if (isset($poster_details[$poster_id]['avatar']))
{
- if ( $row['user_avatar_type'] && $poster_id && $row['user_allowavatar'] )
+ if ($row['user_avatar_type'] && $poster_id && $row['user_allowavatar'])
{
- switch( $row['user_avatar_type'] )
+ switch ($row['user_avatar_type'])
{
case USER_AVATAR_UPLOAD:
- $poster_details[$poster_id]['avatar'] = ( $config['allow_avatar_upload'] ) ? '<img src="' . $config['avatar_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
+ $poster_details[$poster_id]['avatar'] = ($config['allow_avatar_upload']) ? '<img src="' . $config['avatar_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
break;
case USER_AVATAR_REMOTE:
- $poster_details[$poster_id]['avatar'] = ( $config['allow_avatar_remote'] ) ? '<img src="' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
+ $poster_details[$poster_id]['avatar'] = ($config['allow_avatar_remote']) ? '<img src="' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
break;
case USER_AVATAR_GALLERY:
- $poster_details[$poster_id]['avatar'] = ( $config['allow_avatar_local'] ) ? '<img src="' . $config['avatar_gallery_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
+ $poster_details[$poster_id]['avatar'] = ($config['allow_avatar_local']) ? '<img src="' . $config['avatar_gallery_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : '';
break;
}
}
@@ -532,16 +535,16 @@ if ($row = $db->sql_fetchrow($result))
}
// Generate ranks, set them to empty string initially.
- if ( !isset($poster_details[$poster_id]['rank_title']) )
+ if (!isset($poster_details[$poster_id]['rank_title']) )
{
- if ( $row['user_rank'] )
+ if ($row['user_rank'] )
{
for($j = 0; $j < count($ranksrow); $j++)
{
- if ( $row['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] )
+ if ($row['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'])
{
$poster_details[$poster_id]['rank_title'] = $ranksrow[$j]['rank_title'];
- $poster_details[$poster_id]['rank_image'] = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" border="0" alt="' . $poster_rank . '" title="' . $poster_rank . '" /><br />' : '';
+ $poster_details[$poster_id]['rank_image'] = ($ranksrow[$j]['rank_image']) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" border="0" alt="' . $poster_rank . '" title="' . $poster_rank . '" /><br />' : '';
}
}
}
@@ -549,23 +552,23 @@ if ($row = $db->sql_fetchrow($result))
{
for($j = 0; $j < count($ranksrow); $j++)
{
- if ( $row['user_posts'] >= $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] )
+ if ($row['user_posts'] >= $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'])
{
$poster_details[$poster_id]['rank_title'] = $ranksrow[$j]['rank_title'];
- $poster_details[$poster_id]['rank_image'] = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" border="0" alt="' . $poster_rank . '" title="' . $poster_rank . '" /><br />' : '';
+ $poster_details[$poster_id]['rank_image'] = ($ranksrow[$j]['rank_image']) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" border="0" alt="' . $poster_rank . '" title="' . $poster_rank . '" /><br />' : '';
}
}
}
}
// Handle anon users posting with usernames
- if ( !$poster_id && $row['post_username'] != '' )
+ if (!$poster_id && $row['post_username'] != '')
{
$poster = $row['post_username'];
$poster_rank = $user->lang['Guest'];
}
- if ( !isset($poster_details[$poster_id]['profile']) && $poster_id )
+ if (!isset($poster_details[$poster_id]['profile']) && $poster_id)
{
$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
$poster_details[$poster_id]['profile_img'] = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>';
@@ -575,9 +578,9 @@ if ($row = $db->sql_fetchrow($result))
$poster_details[$poster_id]['pm_img'] = '<a href="' . $temp_url . '">' . $user->img('icon_pm', $user->lang['Send_private_message']) . '</a>';
$poster_details[$poster_id]['pm'] = '<a href="' . $temp_url . '">' . $user->lang['Send_private_message'] . '</a>';
- if ( !empty($row['user_viewemail']) || $auth->acl_get('m_', $forum_id) )
+ if (!empty($row['user_viewemail']) || $auth->acl_get('m_', $forum_id))
{
- $email_uri = ( $config['board_email_form'] ) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $poster_id : 'mailto:' . $row['user_email'];
+ $email_uri = ($config['board_email_form'] && $config['email_enable']) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $poster_id : 'mailto:' . $row['user_email'];
$poster_details[$poster_id]['email_img'] = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>';
$poster_details[$poster_id]['email'] = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>';
@@ -591,7 +594,7 @@ if ($row = $db->sql_fetchrow($result))
$poster_details[$poster_id]['www_img'] = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww">' . $user->img('icon_www', $user->lang['Visit_website']) . '</a>' : '';
$poster_details[$poster_id]['www'] = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww">' . $user->lang['Visit_website'] . '</a>' : '';
- if ( !empty($row['user_icq']) )
+ if (!empty($row['user_icq']))
{
$poster_details[$poster_id]['icq_status_img'] = '<a href="http://wwp.icq.com/' . $row['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
$poster_details[$poster_id]['icq_img'] = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '">' . $user->img('icon_icq', $user->lang['ICQ']) . '</a>';
@@ -604,17 +607,17 @@ if ($row = $db->sql_fetchrow($result))
$poster_details[$poster_id]['icq'] = '';
}
- $poster_details[$poster_id]['aim_img'] = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
- $poster_details[$poster_id]['aim'] = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
+ $poster_details[$poster_id]['aim_img'] = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
+ $poster_details[$poster_id]['aim'] = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
- $poster_details[$poster_id]['msn_img'] = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
- $poster_details[$poster_id]['msn'] = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';
+ $poster_details[$poster_id]['msn_img'] = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
+ $poster_details[$poster_id]['msn'] = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';
- $poster_details[$poster_id]['yim_img'] = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg">' . $user->img('icon_yim', $user->lang['YIM']) . '</a>' : '';
- $poster_details[$poster_id]['yim'] = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg">' . $user->lang['YIM'] . '</a>' : '';
+ $poster_details[$poster_id]['yim_img'] = ($row['user_yim']) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg">' . $user->img('icon_yim', $user->lang['YIM']) . '</a>' : '';
+ $poster_details[$poster_id]['yim'] = ($row['user_yim']) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg">' . $user->lang['YIM'] . '</a>' : '';
- if ( $auth->acl_get('f_search', $forum_id) )
+ if ($auth->acl_get('f_search', $forum_id))
{
$temp_url = 'search.' . $phpEx . $SID . '&amp;search_author=' . urlencode($row['username']) .'"&amp;showresults=posts';
$search_img = '<a href="' . $temp_url . '">' . $user->img('icon_search', $user->lang['Search_user_posts']) . '</a>';
@@ -627,7 +630,7 @@ if ($row = $db->sql_fetchrow($result))
}
}
- else if ( !$poster_id )
+ else if (!$poster_id)
{
$poster_details[$poster_id]['profile_img'] = '';
$poster_details[$poster_id]['profile'] = '';
@@ -653,7 +656,7 @@ if ($row = $db->sql_fetchrow($result))
$quote_img = '<a href="' . $temp_url . '">' . $user->img('icon_quote', $user->lang['Reply_with_quote']) . '</a>';
$quote = '<a href="' . $temp_url . '">' . $user->lang['Reply_with_quote'] . '</a>';
- if ( ( $user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) ) || $auth->acl_get('m_edit', $forum_id) || $auth->acl_get('a_') )
+ if (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id)) || $auth->acl_gets('m_edit', 'a_', $forum_id))
{
$temp_url = "posting.$phpEx$SID&amp;mode=edit&amp;f=" . $row['forum_id'] . "&amp;p=" . $row['post_id'];
$edit_img = '<a href="' . $temp_url . '">' . $user->img('icon_edit', $user->lang['Edit_delete_post']) . '</a>';
@@ -665,7 +668,7 @@ if ($row = $db->sql_fetchrow($result))
$edit = '';
}
- if ( $auth->acl_get('m_ip', $forum_id) )
+ if ($auth->acl_gets('m_ip', 'a_', $forum_id))
{
$temp_url = "modcp.$phpEx$SID&amp;mode=ip&amp;p=" . $row['post_id'] . "&amp;t=" . $topic_id;
$ip_img = '<a href="' . $temp_url . '">' . $user->img('icon_ip', $user->lang['View_IP']) . '</a>';
@@ -677,7 +680,7 @@ if ($row = $db->sql_fetchrow($result))
$ip = '';
}
- if ( ( $user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $forum_topic_data['topic_last_post_id'] == $row['post_id'] ) || $auth->acl_get('m_delete', $forum_id) )
+ if (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $forum_topic_data['topic_last_post_id'] == $row['post_id']) || $auth->acl_gets('m_delete', 'a_', $forum_id))
{
$temp_url = "posting.$phpEx$SID&amp;mode=delete&amp;p=" . $row['post_id'];
$delpost_img = '<a href="' . $temp_url . '">' . $user->img('icon_delete', $user->lang['Delete_post']) . '</a>';
@@ -710,34 +713,34 @@ if ($row = $db->sql_fetchrow($result))
// $message = ( $auth->acl_get('f_bbcode', $forum_id) ) ? bbencode_second_pass($message, $bbcode_uid, $auth->acl_get('f_img', $forum_id)) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
}
+ // If we allow users to disable display of emoticons
+ // we'll need an appropriate check and preg_replace here
+ if ($row['enable_smilies'])
+ {
+ $message = str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message);
+ }
+
// Highlight active words (primarily for search)
-/* if ($highlight_match)
+ if ($highlight_match)
{
// This was shamelessly 'borrowed' from volker at multiartstudio dot de
// via php.net's annotated manual
- $message = substr(preg_replace('#(\>(((?>[^><]+)|(?R))*)\<)#ie', "preg_replace('/(?>($highlight_match)+)/i','<span style=\"color:red\">\\1</span>', '\\0')", '>' . $message . '<'), 1, -1);
+ $message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $highlight_match . ")\b#i', '<span class=\"hilit\">\\\\1</span>', '\\0')", '>' . $message . '<'), 1, -1));
}
-*/
- // Replace naughty words
+
+ // Replace naughty words such as farty pants
if (count($orig_word))
{
$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
$message = preg_replace($orig_word, $replacement_word, $message);
}
- // If we allow users to disable display of emoticons
- // we'll need an appropriate check and preg_replace here
- if ($row['enable_smilies'])
- {
- $message = str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message);
- }
-
$message = nl2br($message);
// Editing information
- if ($row['post_edit_count'])
+ if (intval($row['post_edit_count']))
{
- $l_edit_time_total = ($row['post_edit_count'] == 1) ? $user->lang['Edited_time_total'] : $user->lang['Edited_times_total'];
+ $l_edit_time_total = (intval($row['post_edit_count']) == 1) ? $user->lang['Edited_time_total'] : $user->lang['Edited_times_total'];
$l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, $poster, $user->format_date($row['post_edit_time']), $row['post_edit_count']);
}
@@ -747,14 +750,14 @@ if ($row = $db->sql_fetchrow($result))
}
// Signature
- if ( !isset($poster_details[$poster_id]['sig']) )
+ if (!isset($poster_details[$poster_id]['sig']))
{
- $user_sig = ($row['enable_sig'] && $row['user_sig'] != '' && $config['allow_sig'] ) ? $row['user_sig'] : '';
+ $user_sig = ($row['enable_sig'] && $row['user_sig'] != '' && $config['allow_sig']) ? $row['user_sig'] : '';
$user_sig_bbcode_uid = $row['user_sig_bbcode_uid'];
- if ($user_sig != '' && $user_sig_bbcode_uid != '' && $auth->acl_get('f_sigs', $forum_id) )
+ if ($user_sig != '' && $user_sig_bbcode_uid != '' && $auth->acl_get('f_sigs', $forum_id))
{
- if ( !$auth->acl_get('f_html', $forum_id) && $user->data['user_allowhtml'] )
+ if (!$auth->acl_get('f_html', $forum_id) && $user->data['user_allowhtml'])
{
$user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "&lt;\\2&gt;", $user_sig);
}
@@ -832,13 +835,11 @@ if ($row = $db->sql_fetchrow($result))
'L_MINI_POST_ALT' => $mini_post_alt,
- 'S_ROW_COUNT' => $i,
+ 'S_ROW_COUNT' => $i++,
'U_MINI_POST' => $mini_post_url,
'U_POST_ID' => $row['post_id'])
);
-
- $i++;
}
while ($row = $db->sql_fetchrow($result));
}