Skip to content
Browse files

Various changes. Imported from FluxBB.

git-svn-id: http://punbb.informer.com/svn/punbb/trunk@1116 4dc816b1-62af-4023-b237-cae3452c1eb1
  • Loading branch information...
1 parent 522296e commit de31fcca4e013ab3e476722d13bda20da31d2ff2 Roman committed Apr 2, 2009
Showing with 18 additions and 17 deletions.
  1. +4 −4 extern.php
  2. +1 −1 lang/English/admin_reindex.php
  3. +0 −2 lang/English/common.php
  4. +2 −2 lang/English/profile.php
  5. +3 −0 post.php
  6. +6 −6 userlist.php
  7. +2 −2 viewtopic.php
View
8 extern.php
@@ -292,7 +292,7 @@ function output_html($feed)
// Fetch topic subject
$query = array(
- 'SELECT' => 't.subject, t.num_replies, t.first_post_id',
+ 'SELECT' => 't.subject, t.first_post_id',
'FROM' => 'topics AS t',
'JOINS' => array(
array(
@@ -535,7 +535,7 @@ function output_html($feed)
{
if ($forum_user_online['user_id'] > 1)
{
- $users[] = '<a href="'.forum_link($forum_url['user'], $forum_user_online['user_id']).'">'.forum_htmlencode($forum_user_online['ident']).'</a>';
+ $users[] = $forum_user['g_view_users'] == '1' ?'<a href="'.forum_link($forum_url['user'], $forum_user_online['user_id']).'">'.forum_htmlencode($forum_user_online['ident']).'</a>' : forum_htmlencode($forum_user_online['ident']);
++$num_users;
}
else
@@ -552,8 +552,8 @@ function output_html($feed)
echo $lang_index['Guests online'].': '.forum_number_format($num_guests).'<br />'."\n";
- if ($_GET['action'] == 'online_full' && count($users) > 0)
- echo $lang_index['Users online'].': '.implode(', ', $users).'<br />'."\n";
+ if ($_GET['action'] == 'online_full' && !empty($users))
+ echo $lang_index['Users online'].': '.implode($lang_index['Online list separator'], $users).'<br />'."\n";
else
echo $lang_index['Users online'].': '.forum_number_format($num_users).'<br />'."\n";
View
2 lang/English/admin_reindex.php
@@ -10,7 +10,7 @@
'Empty index warning' => '<strong>WARNING!</strong> If you want to resume an aborted rebuild, do not select "empty index".',
'Posts per cycle' => 'Posts per cycle',
'Posts per cycle info' => 'The number of posts to process per pageview. E.g. if you were to enter 100, one hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process.',
-'Starting post' => 'Starting Post ID',
+'Starting post' => 'Starting post ID',
'Starting post info' => 'The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you would not want to change this.',
'Empty index' => 'Empty index',
'Empty index info' => 'Empty search index before rebuilding (see below).',
View
2 lang/English/common.php
@@ -146,8 +146,6 @@
'Jump to' => 'Jump to forum:',
// For extern.php RSS feed
-'ATOM Feed' => 'Atom',
-'RSS Feed' => 'RSS',
'RSS description' => 'The most recent topics at %s.',
'RSS description topic' => 'The most recent posts in %s.',
'RSS reply' => 'Re: ', // The topic subject will be appended to this string (to signify a reply)
View
4 lang/English/profile.php
@@ -44,13 +44,13 @@
'Too wide or high' => 'The file you tried to upload is wider and/or higher than the maximum allowed %sx%s pixels.',
'Unknown failure' => 'An unknown error occurred. Please try again.',
'Avatar' => 'Avatar',
-'Current avatar' => 'Current Avatar',
+'Current avatar' => 'Current avatar',
'No avatar info' => 'No avatar is currently uploaded.',
'Avatar info replace' => 'Uploading a new avatar will replace your existing avatar.',
'Avatar info none' => 'To display an avatar you first need to upload one.',
'Avatar info type' => 'The allowed image file types are gif, jpeg and png.',
'Avatar info size' => 'The maximum image size allowed is %sx%s pixels and %s bytes (%s KB).',
-'Delete avatar info' => 'Delete avatar to cease displaying any avatar.',
+'Delete avatar info' => 'Delete avatar to stop displaying any avatar.',
'Upload avatar file' => 'Upload avatar file',
'Avatar upload help' => 'Select file then update your profile to install.',
'No upload warn' => '<strong>IMPORTANT! </strong> You must choose a file to upload before updating your profile.',
View
3 post.php
@@ -153,6 +153,9 @@
if (!is_valid_email($email))
$errors[] = $lang_post['Invalid e-mail'];
+
+ if (is_banned_email($email))
+ $errors[] = $lang_profile['Banned e-mail'];
}
}
View
12 userlist.php
@@ -27,7 +27,7 @@
$forum_page['username'] = (isset($_GET['username']) && $_GET['username'] != '-' && $forum_user['g_search_users'] == '1') ? $_GET['username'] : '';
$forum_page['show_group'] = (!isset($_GET['show_group']) || intval($_GET['show_group']) < -1 && intval($_GET['show_group']) > 2) ? -1 : intval($_GET['show_group']);
$forum_page['sort_by'] = (!isset($_GET['sort_by']) || $_GET['sort_by'] != 'username' && $_GET['sort_by'] != 'registered' && ($_GET['sort_by'] != 'num_posts' || !$forum_page['show_post_count'])) ? 'username' : $_GET['sort_by'];
-$forum_page['sort_dir'] = (!isset($_GET['sort_dir']) || $_GET['sort_dir'] != 'ASC' && $_GET['sort_dir'] != 'DESC') ? 'ASC' : strtoupper($_GET['sort_dir']);
+$forum_page['sort_dir'] = (!isset($_GET['sort_dir']) || strtoupper($_GET['sort_dir']) != 'ASC' && strtoupper($_GET['sort_dir']) != 'DESC') ? 'ASC' : strtoupper($_GET['sort_dir']);
// Create any SQL for the WHERE clause
@@ -68,18 +68,18 @@
$forum_page['items_info'] = $lang_ul['Users'];
// Generate paging links
-$forum_page['page_post']['paging'] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($forum_page['num_pages'], $forum_page['page'], $forum_url['users_browse'], $lang_common['Paging separator'], array($forum_page['show_group'], $forum_page['sort_by'], strtoupper($forum_page['sort_dir']), ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'</p>';
+$forum_page['page_post']['paging'] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($forum_page['num_pages'], $forum_page['page'], $forum_url['users_browse'], $lang_common['Paging separator'], array($forum_page['show_group'], $forum_page['sort_by'], $forum_page['sort_dir'], ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'</p>';
// Navigation links for header and page numbering for title/meta description
if ($forum_page['page'] < $forum_page['num_pages'])
{
- $forum_page['nav']['last'] = '<link rel="last" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], $forum_page['num_pages'], array($forum_page['show_group'], $forum_page['sort_by'], strtoupper($forum_page['sort_dir']), ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.$forum_page['num_pages'].'" />';
- $forum_page['nav']['next'] = '<link rel="next" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], ($forum_page['page'] + 1), array($forum_page['show_group'], $forum_page['sort_by'], strtoupper($forum_page['sort_dir']), ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.($forum_page['page'] + 1).'" />';
+ $forum_page['nav']['last'] = '<link rel="last" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], $forum_page['num_pages'], array($forum_page['show_group'], $forum_page['sort_by'], $forum_page['sort_dir'], ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.$forum_page['num_pages'].'" />';
+ $forum_page['nav']['next'] = '<link rel="next" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], ($forum_page['page'] + 1), array($forum_page['show_group'], $forum_page['sort_by'], $forum_page['sort_dir'], ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.($forum_page['page'] + 1).'" />';
}
if ($forum_page['page'] > 1)
{
- $forum_page['nav']['prev'] = '<link rel="prev" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], ($forum_page['page'] - 1), array($forum_page['show_group'], $forum_page['sort_by'], strtoupper($forum_page['sort_dir']), ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.($forum_page['page'] - 1).'" />';
- $forum_page['nav']['first'] = '<link rel="first" href="'.forum_link($forum_url['users_browse'], array($forum_page['show_group'], $forum_page['sort_by'], strtoupper($forum_page['sort_dir']), ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' 1" />';
+ $forum_page['nav']['prev'] = '<link rel="prev" href="'.forum_sublink($forum_url['users_browse'], $forum_url['page'], ($forum_page['page'] - 1), array($forum_page['show_group'], $forum_page['sort_by'], $forum_page['sort_dir'], ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' '.($forum_page['page'] - 1).'" />';
+ $forum_page['nav']['first'] = '<link rel="first" href="'.forum_link($forum_url['users_browse'], array($forum_page['show_group'], $forum_page['sort_by'], $forum_page['sort_dir'], ($forum_page['username'] != '') ? urlencode($forum_page['username']) : '-')).'" title="'.$lang_common['Page'].' 1" />';
}
// Setup main options
View
4 viewtopic.php
@@ -113,7 +113,7 @@
// Fetch some info about the topic
$query = array(
- 'SELECT' => 't.subject, t.posted, t.poster, t.first_post_id, t.closed, t.num_replies, t.sticky, f.id AS forum_id, f.forum_name, f.moderators, fp.post_replies',
+ 'SELECT' => 't.subject, t.first_post_id, t.closed, t.num_replies, t.sticky, f.id AS forum_id, f.forum_name, f.moderators, fp.post_replies',
'FROM' => 'topics AS t',
'JOINS' => array(
array(
@@ -128,7 +128,7 @@
'WHERE' => '(fp.read_forum IS NULL OR fp.read_forum=1) AND t.id='.$id.' AND t.moved_to IS NULL'
);
-if (!$forum_user['is_guest'])
+if (!$forum_user['is_guest'] && $forum_config['o_subscriptions'] == '1')
{
$query['SELECT'] .= ', s.user_id AS is_subscribed';
$query['JOINS'][] = array(

0 comments on commit de31fcc

Please sign in to comment.
Something went wrong with that request. Please try again.