Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Paul S. O. <ps...@us...> - 2002-03-22 18:07:07
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv31276/templates/subSilver/admin
Modified Files:
page_header.tpl
Log Message:
Change td.cat to zero border
Index: page_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/page_header.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** page_header.tpl 19 Mar 2002 01:05:00 -0000 1.11
--- page_header.tpl 22 Mar 2002 18:07:05 -0000 1.12
***************
*** 84,87 ****
--- 84,88 ----
td.cat,td.catHead,td.catBottom {
height: 29px;
+ border-width: 0px 0px 0px 0px;
}
th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR {
|
|
From: Paul S. O. <ps...@us...> - 2002-03-22 17:54:36
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27651/includes
Modified Files:
prune.php
Log Message:
Change a few quotes
Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** prune.php 20 Mar 2002 19:59:42 -0000 1.14
--- prune.php 22 Mar 2002 17:54:33 -0000 1.15
***************
*** 20,23 ****
--- 20,24 ----
*
***************************************************************************/
+
if ( !defined('IN_PHPBB') )
{
***************
*** 40,44 ****
AND t.topic_type <> " . POST_ANNOUNCE . "
AND p.post_id = t.topic_last_post_id";
! if ( $prune_date != "" )
{
$sql .= " AND p.post_time < $prune_date";
--- 41,45 ----
AND t.topic_type <> " . POST_ANNOUNCE . "
AND p.post_id = t.topic_last_post_id";
! if ( $prune_date != '' )
{
$sql .= " AND p.post_time < $prune_date";
***************
*** 46,59 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain lists of topics to prune.", "", __LINE__, __FILE__, $sql);
}
! $sql_topics = "";
while( $row = $db->sql_fetchrow($result) )
{
! $sql_topics .= ( ( $sql_topics != "" ) ? ", " : "" ) . $row['topic_id'];
}
! if( $sql_topics != "" )
{
$sql = "SELECT post_id
--- 47,60 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain lists of topics to prune', '', __LINE__, __FILE__, $sql);
}
! $sql_topics = '';
while( $row = $db->sql_fetchrow($result) )
{
! $sql_topics .= ( ( $sql_topics != '' ) ? ', ' : '' ) . $row['topic_id'];
}
! if( $sql_topics != '' )
{
$sql = "SELECT post_id
***************
*** 63,76 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain list of posts to prune.", "", __LINE__, __FILE__, $sql);
}
! $sql_post = "";
while ( $row = $db->sql_fetchrow($result) )
{
! $sql_post .= ( ( $sql_post != "" ) ? ", " : "" ) . $row['post_id'];
}
! if ( $sql_post != "" )
{
$sql = "DELETE FROM " . TOPICS_TABLE . "
--- 64,77 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain list of posts to prune', '', __LINE__, __FILE__, $sql);
}
! $sql_post = '';
while ( $row = $db->sql_fetchrow($result) )
{
! $sql_post .= ( ( $sql_post != '' ) ? ', ' : '' ) . $row['post_id'];
}
! if ( $sql_post != '' )
{
$sql = "DELETE FROM " . TOPICS_TABLE . "
***************
*** 78,82 ****
if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete topics during prune.", "", __LINE__, __FILE__, $sql);
}
--- 79,83 ----
if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
! message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
}
***************
*** 87,91 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete post_text during prune.", "", __LINE__, __FILE__, $sql);
}
--- 88,92 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not delete post_text during prune', '', __LINE__, __FILE__, $sql);
}
***************
*** 96,100 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete post during prune.", "", __LINE__, __FILE__, $sql);
}
--- 97,101 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not delete post during prune', '', __LINE__, __FILE__, $sql);
}
***************
*** 103,107 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete search matches", "", __LINE__, __FILE__, $sql);
}
--- 104,108 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not delete search matches', '', __LINE__, __FILE__, $sql);
}
***************
*** 113,132 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't update forum data after prune.", "", __LINE__, __FILE__, $sql);
}
! return array ("topics" => $pruned_topics, "posts" => $pruned_posts);
}
}
! return array("topics" => 0, "posts" => 0);
}
! /***************************************************************************\
! *
! * Function auto_prune(), this function will read the configuration data from
! * the auto_prune table and call the prune function with the necessary info.
! *
! ****************************************************************************/
function auto_prune($forum_id = 0)
{
--- 114,131 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update forum data after prune', '', __LINE__, __FILE__, $sql);
}
! return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
}
}
! return array('topics' => 0, 'posts' => 0);
}
! //
! // Function auto_prune(), this function will read the configuration data from
! // the auto_prune table and call the prune function with the necessary info.
! //
function auto_prune($forum_id = 0)
{
***************
*** 136,143 ****
FROM " . PRUNE_TABLE . "
WHERE forum_id = $forum_id";
-
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
}
--- 135,141 ----
FROM " . PRUNE_TABLE . "
WHERE forum_id = $forum_id";
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not read auto_prune table', '', __LINE__, __FILE__, $sql);
}
***************
*** 156,160 ****
if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Auto-Prune: Couldn't update forum table.", __LINE__, __FILE__);
}
}
--- 154,158 ----
if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update forum table', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 164,166 ****
}
! ?>
--- 162,164 ----
}
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-03-22 17:53:32
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27359/includes
Modified Files:
functions_search.php
Log Message:
preg_quote stopwords
Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** functions_search.php 19 Mar 2002 00:46:22 -0000 1.5
--- functions_search.php 22 Mar 2002 17:53:28 -0000 1.6
***************
*** 24,33 ****
// Weird, $init_match doesn't work with static when double quotes (") are used...
static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
! static $drop_char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ", " ", " ");
// static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
// static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
! $entry = " " . strip_tags(strtolower($entry)) . " ";
for($i = 0; $i < count($accent_match); $i++)
--- 24,33 ----
// Weird, $init_match doesn't work with static when double quotes (") are used...
static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
! static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' ');
// static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
// static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
! $entry = ' ' . strip_tags(strtolower($entry)) . ' ';
for($i = 0; $i < count($accent_match); $i++)
***************
*** 36,60 ****
}
! if( $mode == "post" )
{
// Replace line endings by a space
! $entry = preg_replace("/[\n\r]/is", " ", $entry);
// HTML entities like
! $entry = preg_replace("/\b&[a-z]+;\b/", " ", $entry);
// Remove URL's
! $entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/", " ", $entry);
// Quickly remove BBcode.
! $entry = preg_replace("/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/", " ", $entry);
! $entry = preg_replace("/\[\/?url(=.*?)?\]/", " ", $entry);
! $entry = preg_replace("/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/", " ", $entry);
}
! else if( $mode == "search" )
{
! $entry = str_replace("+", " and ", $entry);
! $entry = str_replace("-", " not ", $entry);
}
// Replace numbers on their own
! $entry = preg_replace("/\b[0-9]+\b/", " ", $entry);
//
--- 36,60 ----
}
! if( $mode == 'post' )
{
// Replace line endings by a space
! $entry = preg_replace('/[\n\r]/is', ' ', $entry);
// HTML entities like
! $entry = preg_replace('/\b&[a-z]+;\b/', ' ', $entry);
// Remove URL's
! $entry = preg_replace('/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/', ' ', $entry);
// Quickly remove BBcode.
! $entry = preg_replace('/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/', ' ', $entry);
! $entry = preg_replace('/\[\/?url(=.*?)?\]/', ' ', $entry);
! $entry = preg_replace('/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/', ' ', $entry);
}
! else if( $mode == 'search' )
{
! $entry = str_replace('+', ' and ', $entry);
! $entry = str_replace('-', ' not ', $entry);
}
// Replace numbers on their own
! $entry = preg_replace('/\b[0-9]+\b/', ' ', $entry);
//
***************
*** 66,75 ****
}
! if( $mode == "post" )
{
! $entry = str_replace("*", " ", $entry);
// 'words' that consist of <=3 or >=25 characters are removed.
! $entry = preg_replace("/\b([a-z0-9]{1,3}|[a-z0-9]{25,})\b/", " ", $entry);
}
--- 66,75 ----
}
! if( $mode == 'post' )
{
! $entry = str_replace('*', ' ', $entry);
// 'words' that consist of <=3 or >=25 characters are removed.
! $entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{25,})\b/',' ', $entry);
}
***************
*** 80,86 ****
$stopword = trim($stopword_list[$j]);
! if ( $mode == "post" || ( $stopword != "not" && $stopword != "and" && $stopword != "or" ) )
{
! $entry = preg_replace("/\b" . $stopword . "\b/", " ", $entry);
}
}
--- 80,86 ----
$stopword = trim($stopword_list[$j]);
! if ( $mode == 'post' || ( $stopword != 'not' && $stopword != 'and' && $stopword != 'or' ) )
{
! $entry = preg_replace('#\b' . preg_quote($stopword) . '\b#', ' ', $entry);
}
}
***************
*** 91,98 ****
for ($j = 0; $j < count($synonym_list); $j++)
{
! list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
! if ( $mode == "post" || ( $match_synonym != "not" && $match_synonym != "and" && $match_synonym != "or" ) )
{
! $entry = preg_replace("/\b" . trim($match_synonym) . "\b/", " " . trim($replace_synonym) . " ", $entry);
}
}
--- 91,98 ----
for ($j = 0; $j < count($synonym_list); $j++)
{
! list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_list[$j])));
! if ( $mode == 'post' || ( $match_synonym != 'not' && $match_synonym != 'and' && $match_synonym != 'or' ) )
{
! $entry = preg_replace('#\b' . trim($match_synonym) . '\b#', ' ' . trim($replace_synonym) . ' ', $entry);
}
}
***************
*** 102,108 ****
}
! function split_words(&$entry, $mode = "post")
{
! if( $mode == "post" )
{
preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
--- 102,108 ----
}
! function split_words(&$entry, $mode = 'post')
{
! if( $mode == 'post' )
{
preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
***************
*** 110,114 ****
else
{
! preg_match_all("/(\*?[a-z0-9]+\*?)|\b([a-z0-9]+)\b/", $entry, $split_entries);
}
--- 110,114 ----
else
{
! preg_match_all('/(\*?[a-z0-9]+\*?)|\b([a-z0-9]+)\b/', $entry, $split_entries);
}
***************
*** 116,125 ****
}
! function add_search_words($post_id, $post_text, $post_title = "")
{
global $db, $phpbb_root_path, $board_config, $lang;
! $stopwords_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
! $synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
$search_raw_words = array();
--- 116,125 ----
}
! function add_search_words($post_id, $post_text, $post_title = '')
{
global $db, $phpbb_root_path, $board_config, $lang;
! $stopwords_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_stopwords.txt");
! $synonym_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_synonyms.txt");
$search_raw_words = array();
***************
*** 131,135 ****
while( list($word_in, $search_matches) = @each($search_raw_words) )
{
! $word_insert_sql[$word_in] = "";
if( !empty($search_matches) )
{
--- 131,135 ----
while( list($word_in, $search_matches) = @each($search_raw_words) )
{
! $word_insert_sql[$word_in] = '';
if( !empty($search_matches) )
{
***************
*** 138,142 ****
$search_matches[$i] = trim($search_matches[$i]);
! if( $search_matches[$i] != "" )
{
$word[] = $search_matches[$i];
--- 138,142 ----
$search_matches[$i] = trim($search_matches[$i]);
! if( $search_matches[$i] != '' )
{
$word[] = $search_matches[$i];
***************
*** 154,159 ****
sort($word);
! $prev_word = "";
! $word_text_sql = "";
$temp_word = array();
for($i = 0; $i < count($word); $i++)
--- 154,159 ----
sort($word);
! $prev_word = '';
! $word_text_sql = '';
$temp_word = array();
for($i = 0; $i < count($word); $i++)
***************
*** 162,166 ****
{
$temp_word[] = $word[$i];
! $word_text_sql .= ( ( $word_text_sql != "" ) ? ", " : "" ) . "'" . $word[$i] . "'";
}
$prev_word = $word[$i];
--- 162,166 ----
{
$temp_word[] = $word[$i];
! $word_text_sql .= ( ( $word_text_sql != '' ) ? ', ' : '' ) . "'" . $word[$i] . "'";
}
$prev_word = $word[$i];
***************
*** 181,185 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
}
--- 181,185 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql);
}
***************
*** 191,195 ****
}
! $value_sql = "";
$match_word = array();
for ($i = 0; $i < count($word); $i++)
--- 191,195 ----
}
! $value_sql = '';
$match_word = array();
for ($i = 0; $i < count($word); $i++)
***************
*** 207,214 ****
case 'mysql':
case 'mysql4':
! $value_sql .= ( ( $value_sql != "" ) ? ", " : "" ) . "('" . $word[$i] . "')";
break;
case 'mssql':
! $value_sql .= ( ( $value_sql != "" ) ? " UNION ALL " : "" ) . "SELECT '" . $word[$i] . "'";
break;
default:
--- 207,214 ----
case 'mysql':
case 'mysql4':
! $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . "('" . $word[$i] . "')";
break;
case 'mssql':
! $value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "'";
break;
default:
***************
*** 217,221 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
}
break;
--- 217,221 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
}
break;
***************
*** 224,228 ****
}
! if ( $value_sql != "" )
{
switch ( SQL_LAYER )
--- 224,228 ----
}
! if ( $value_sql != '' )
{
switch ( SQL_LAYER )
***************
*** 241,245 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
}
}
--- 241,245 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 250,254 ****
$title_match = ( $word_in == 'title' ) ? 1 : 0;
! if ( $match_sql != "" )
{
$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match)
--- 250,254 ----
$title_match = ( $word_in == 'title' ) ? 1 : 0;
! if ( $match_sql != '' )
{
$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match)
***************
*** 258,262 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
}
}
--- 258,262 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 278,285 ****
global $db;
! $sql = ( $mode == "global" ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
}
--- 278,285 ----
global $db;
! $sql = ( $mode == 'global' ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain post count', '', __LINE__, __FILE__, $sql);
}
***************
*** 290,299 ****
$common_threshold = floor($row['total_posts'] * $fraction);
! if( $mode == "single" && count($word_id_list) )
{
! $word_id_sql = "";
for($i = 0; $i < count($word_id_list); $i++)
{
! $word_id_sql .= ( ( $word_id_sql != "" ) ? ", " : "" ) . "'" . $word_id_list[$i] . "'";
}
--- 290,299 ----
$common_threshold = floor($row['total_posts'] * $fraction);
! if( $mode == 'single' && count($word_id_list) )
{
! $word_id_sql = '';
for($i = 0; $i < count($word_id_list); $i++)
{
! $word_id_sql .= ( ( $word_id_sql != '' ) ? ', ' : '' ) . "'" . $word_id_list[$i] . "'";
}
***************
*** 315,330 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
}
! $common_word_id = "";
while( $row = $db->sql_fetchrow($result) )
{
! $common_word_id .= ( $common_word_id != "" ) ? ", " . $row['word_id'] : $row['word_id'];
}
$db->sql_freeresult($result);
! if( $common_word_id != "" )
{
$sql = "UPDATE " . SEARCH_WORD_TABLE . "
--- 315,330 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain common word list', '', __LINE__, __FILE__, $sql);
}
! $common_word_id = '';
while( $row = $db->sql_fetchrow($result) )
{
! $common_word_id .= ( ( $common_word_id != '' ) ? ', ' : '' ) . $row['word_id'];
}
$db->sql_freeresult($result);
! if( $common_word_id != '' )
{
$sql = "UPDATE " . SEARCH_WORD_TABLE . "
***************
*** 333,337 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
--- 333,337 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql);
}
***************
*** 340,344 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
}
}
--- 340,344 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not delete word match entry', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 443,447 ****
if ( !empty($search_match) )
{
! $username_search = preg_replace("/\*/", "%", trim(strip_tags($search_match)));
$sql = "SELECT username
--- 443,447 ----
if ( !empty($search_match) )
{
! $username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match)));
$sql = "SELECT username
***************
*** 451,455 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
}
--- 451,455 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
}
***************
*** 476,493 ****
$template->set_filenames(array(
! "search_user_body" => "search_username.tpl")
);
$template->assign_vars(array(
! "L_CLOSE_WINDOW" => $lang['Close_window'],
! "L_SEARCH_USERNAME" => $lang['Find_username'],
! "L_UPDATE_USERNAME" => $lang['Select_username'],
! "L_SELECT" => $lang['Select'],
! "L_SEARCH" => $lang['Search'],
! "L_SEARCH_EXPLAIN" => $lang['Search_author_explain'],
! "L_CLOSE_WINDOW" => $lang['Close_window'],
! "S_AUTHOR_OPTIONS" => $author_list,
! "S_SEARCH_ACTION" => append_sid("search.$phpEx?mode=searchuser"))
);
--- 476,493 ----
$template->set_filenames(array(
! 'search_user_body' => 'search_username.tpl')
);
$template->assign_vars(array(
! 'L_CLOSE_WINDOW' => $lang['Close_window'],
! 'L_SEARCH_USERNAME' => $lang['Find_username'],
! 'L_UPDATE_USERNAME' => $lang['Select_username'],
! 'L_SELECT' => $lang['Select'],
! 'L_SEARCH' => $lang['Search'],
! 'L_SEARCH_EXPLAIN' => $lang['Search_author_explain'],
! 'L_CLOSE_WINDOW' => $lang['Close_window'],
! 'S_AUTHOR_OPTIONS' => $author_list,
! 'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=searchuser"))
);
***************
*** 498,505 ****
if ( !empty($author_list) )
{
! $template->assign_block_vars("switch_select_name", array());
}
! $template->pparse("search_user_body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
--- 498,505 ----
if ( !empty($author_list) )
{
! $template->assign_block_vars('switch_select_name', array());
}
! $template->pparse('search_user_body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
|
From: Paul S. O. <ps...@us...> - 2002-03-22 17:25:30
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv18956
Modified Files:
upgrade.php
Log Message:
A few permission related discrepancies ... hopefully fixed while hopefully not breaking anything else
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** upgrade.php 19 Mar 2002 23:21:23 -0000 1.25
--- upgrade.php 22 Mar 2002 17:25:27 -0000 1.26
***************
*** 70,74 ****
);
-
// ---------------
// Begin functions
--- 70,73 ----
***************
*** 1350,1355 ****
flush();
! $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete)
! VALUES ($group_id, $forum_id, 1, 1, 1, 1, 1, 1)";
$result = query($sql, "Unable to set group auth access.");
--- 1349,1354 ----
flush();
! $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate)
! VALUES ($group_id, $forum_id, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1)";
$result = query($sql, "Unable to set group auth access.");
***************
*** 1488,1507 ****
flush();
- // Old auth structure:
- // forum_type: (only concerns viewing)
- // 0 = Public
- // 1 = Private
- switch( $row['forum_type'] )
- {
- case 0:
- $auth_view = AUTH_ALL;
- $auth_read = AUTH_ALL;
- break;
- default:
- $auth_view = AUTH_ALL;
- $auth_read = AUTH_ALL;
- break;
- }
-
// forum_access: (only concerns posting)
// 1 = Registered users only
--- 1487,1490 ----
***************
*** 1512,1515 ****
--- 1495,1500 ----
case 1:
// Public forum, no anonymous posting
+ $auth_view = AUTH_ALL;
+ $auth_read = AUTH_ALL;
$auth_post = AUTH_REG;
$auth_reply = AUTH_REG;
***************
*** 1524,1529 ****
$auth_post = AUTH_ALL;
$auth_reply = AUTH_ALL;
! $auth_edit = AUTH_ALL;
! $auth_delete = AUTH_ALL;
$auth_vote = AUTH_ALL;
$auth_pollcreate = AUTH_ALL;
--- 1509,1514 ----
$auth_post = AUTH_ALL;
$auth_reply = AUTH_ALL;
! $auth_edit = AUTH_REG;
! $auth_delete = AUTH_REG;
$auth_vote = AUTH_ALL;
$auth_pollcreate = AUTH_ALL;
***************
*** 1543,1546 ****
--- 1528,1558 ----
}
+ // Old auth structure:
+ // forum_type: (only concerns viewing)
+ // 0 = Public
+ // 1 = Private
+ switch( $row['forum_type'] )
+ {
+ case 0:
+ $auth_view = AUTH_ALL;
+ $auth_read = AUTH_ALL;
+ break;
+ default:
+ //
+ // Make it really private ...
+ //
+ $auth_view = AUTH_ACL;
+ $auth_read = AUTH_ACL;
+ $auth_post = AUTH_ACL;
+ $auth_reply = AUTH_ACL;
+ $auth_edit = AUTH_ACL;
+ $auth_delete = AUTH_ACL;
+ $auth_vote = AUTH_ACL;
+ $auth_pollcreate = AUTH_ACL;
+ $auth_sticky = AUTH_ACL;
+ $auth_announce = AUTH_MOD;
+ break;
+ }
+
$sql = "UPDATE " . FORUMS_TABLE . " SET
auth_view = $auth_view,
|
|
From: Paul S. O. <ps...@us...> - 2002-03-22 17:08:05
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv12395/admin Removed Files: pagestart.inc Log Message: Move to pagestart.php --- pagestart.inc DELETED --- |
|
From: Paul S. O. <ps...@us...> - 2002-03-22 17:08:04
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12720/templates/subSilver/admin
Modified Files:
user_edit_body.tpl
Log Message:
Avatar blocks same as user_profile
Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_edit_body.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** user_edit_body.tpl 1 Mar 2002 18:04:26 -0000 1.10
--- user_edit_body.tpl 22 Mar 2002 17:01:50 -0000 1.11
***************
*** 223,228 ****
</td>
</tr>
! <!-- BEGIN avatarupload -->
! <!-- BEGIN fileuploads -->
<tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}</span></td>
--- 223,228 ----
</td>
</tr>
!
! <!-- BEGIN avatar_local_upload -->
<tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}</span></td>
***************
*** 232,236 ****
</td>
</tr>
! <!-- END fileuploads -->
<tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}</span></td>
--- 232,237 ----
</td>
</tr>
! <!-- END avatar_local_upload -->
! <!-- BEGIN avatar_remote_upload -->
<tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}</span></td>
***************
*** 239,243 ****
</td>
</tr>
! <!-- END avatarupload -->
<tr>
<td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}</span></td>
--- 240,244 ----
</td>
</tr>
! <!-- END avatar_remote_upload -->
<tr>
<td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}</span></td>
***************
*** 246,250 ****
</td>
</tr>
! <!-- BEGIN avatargallery -->
<tr>
<td class="row1"><span class="gen">{L_AVATAR_GALLERY}</span></td>
--- 247,251 ----
</td>
</tr>
! <!-- BEGIN avatar_local_gallery -->
<tr>
<td class="row1"><span class="gen">{L_AVATAR_GALLERY}</span></td>
***************
*** 253,257 ****
</td>
</tr>
! <!-- END avatargallery -->
<tr>
<td class="catSides" colspan="2"> </td>
--- 254,259 ----
</td>
</tr>
! <!-- END avatar_local_gallery -->
!
<tr>
<td class="catSides" colspan="2"> </td>
***************
*** 298,302 ****
</tr>
<tr>
! <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
--- 300,304 ----
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12198/admin
Modified Files:
admin_board.php admin_db_utilities.php admin_disallow.php
admin_forum_prune.php admin_forumauth.php admin_forums.php
admin_groups.php admin_mass_email.php admin_ranks.php
admin_smilies.php admin_styles.php admin_ug_auth.php
admin_user_ban.php admin_users.php admin_words.php index.php
page_header_admin.php
Log Message:
Fix problem with user_admin not showing correct status for certain settings + switch to same include series as main files
Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** admin_board.php 18 Mar 2002 14:54:24 -0000 1.50
--- admin_board.php 22 Mar 2002 17:00:32 -0000 1.51
***************
*** 24,30 ****
// Let's set the root dir for phpBB
//
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
//
--- 24,31 ----
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
//
Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** admin_db_utilities.php 20 Mar 2002 14:41:20 -0000 1.40
--- admin_db_utilities.php 22 Mar 2002 17:00:32 -0000 1.41
***************
*** 54,60 ****
// Load default header
//
- $phpbb_root_dir = "./../";
$no_page_header = TRUE;
! require('pagestart.inc');
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
--- 54,61 ----
// Load default header
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_disallow.php 20 Mar 2002 00:21:27 -0000 1.8
--- admin_disallow.php 22 Mar 2002 17:00:32 -0000 1.9
***************
*** 34,39 ****
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_dir = './../';
! require('pagestart.inc');
if( isset($HTTP_POST_VARS['add_name']) )
--- 34,40 ----
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS['add_name']) )
Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_forum_prune.php 18 Mar 2002 14:54:25 -0000 1.19
--- admin_forum_prune.php 22 Mar 2002 17:00:32 -0000 1.20
***************
*** 22,26 ****
define('IN_PHPBB', 1);
! if( !empty($setmodules) )
{
$filename = basename(__FILE__);
--- 22,26 ----
define('IN_PHPBB', 1);
! if ( !empty($setmodules) )
{
$filename = basename(__FILE__);
***************
*** 33,39 ****
// Load default header
//
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_path . 'includes/prune.'.$phpEx);
//
--- 33,41 ----
// Load default header
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! require($phpbb_root_path . 'includes/prune.'.$phpEx);
! require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
//
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_forumauth.php 18 Mar 2002 14:54:25 -0000 1.22
--- admin_forumauth.php 22 Mar 2002 17:00:32 -0000 1.23
***************
*** 34,40 ****
// Load default header
//
- $phpbb_root_dir = "./../";
$no_page_header = TRUE;
! require('pagestart.inc');
//
--- 34,41 ----
// Load default header
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** admin_forums.php 18 Mar 2002 14:54:25 -0000 1.39
--- admin_forums.php 22 Mar 2002 17:00:32 -0000 1.40
***************
*** 33,39 ****
// Load default header
//
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_dir . 'includes/functions_admin.'.$phpEx);
$forum_auth_ary = array(
--- 33,40 ----
// Load default header
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
$forum_auth_ary = array(
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** admin_groups.php 19 Mar 2002 15:39:06 -0000 1.24
--- admin_groups.php 22 Mar 2002 17:00:32 -0000 1.25
***************
*** 34,40 ****
// Load default header
//
! $phpbb_root_dir = "./../";
!
! require('pagestart.inc');
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
--- 34,40 ----
// Load default header
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_mass_email.php 18 Mar 2002 14:54:25 -0000 1.13
--- admin_mass_email.php 22 Mar 2002 17:00:32 -0000 1.14
***************
*** 33,39 ****
// Load default header
//
- $phpbb_root_dir = "./../";
$no_page_header = TRUE;
! require('pagestart.inc');
//
--- 33,40 ----
// Load default header
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_ranks.php 18 Mar 2002 14:54:25 -0000 1.12
--- admin_ranks.php 22 Mar 2002 17:00:32 -0000 1.13
***************
*** 33,40 ****
// Let's set the root dir for phpBB
//
! $phpbb_root_dir = "./../";
!
! require('pagestart.inc');
!
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_smilies.php 18 Mar 2002 14:54:25 -0000 1.20
--- admin_smilies.php 22 Mar 2002 17:00:32 -0000 1.21
***************
*** 40,45 ****
// Load default header
//
- $phpbb_root_dir = "./../";
-
if( isset($HTTP_GET_VARS['export_pack']) )
{
--- 40,43 ----
***************
*** 49,54 ****
}
}
- require('pagestart.inc');
//
--- 47,54 ----
}
}
+ $phpbb_root_path = "../";
+ require($phpbb_root_path . 'extension.inc');
+ require('pagestart.' . $phpEx);
//
Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_styles.php 19 Mar 2002 00:25:03 -0000 1.25
--- admin_styles.php 22 Mar 2002 17:00:32 -0000 1.26
***************
*** 36,44 ****
// Load default header
//
- $phpbb_root_dir = "./../";
-
//
// Check if the user has cancled a confirmation message.
//
$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
--- 36,44 ----
// Load default header
//
//
// Check if the user has cancled a confirmation message.
//
+ $phpbb_root_path = "../";
+
$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
***************
*** 47,51 ****
{
$no_page_header = ( $cancel ) ? TRUE : FALSE;
! require('pagestart.inc');
}
--- 47,52 ----
{
$no_page_header = ( $cancel ) ? TRUE : FALSE;
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
}
***************
*** 73,77 ****
{
! include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
$template_name = $$install_to;
--- 74,78 ----
{
! include($phpbb_root_path. "templates/" . $install_to . "/theme_info.cfg");
$template_name = $$install_to;
***************
*** 128,132 ****
$installable_themes = array();
! if( $dir = @opendir($phpbb_root_dir . "templates/") )
{
while( $sub_dir = @readdir($dir) )
--- 129,133 ----
$installable_themes = array();
! if( $dir = @opendir($phpbb_root_path. "templates/") )
{
while( $sub_dir = @readdir($dir) )
***************
*** 134,140 ****
if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
{
! if( @file_exists($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg") )
{
! include($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg");
for($i = 0; $i < count($$sub_dir); $i++)
--- 135,141 ----
if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
{
! if( @file_exists($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg") )
{
! include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg");
for($i = 0; $i < count($$sub_dir); $i++)
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_ug_auth.php 21 Mar 2002 01:56:19 -0000 1.8
--- admin_ug_auth.php 22 Mar 2002 17:00:32 -0000 1.9
***************
*** 35,41 ****
// Load default header
//
- $phpbb_root_dir = './../';
$no_page_header = TRUE;
! require('pagestart.inc');
$params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
--- 35,43 ----
// Load default header
//
$no_page_header = TRUE;
!
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
$params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_user_ban.php 20 Mar 2002 01:23:24 -0000 1.20
--- admin_user_ban.php 22 Mar 2002 17:00:32 -0000 1.21
***************
*** 34,39 ****
// Load default header
//
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
//
--- 34,40 ----
// Load default header
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** admin_users.php 19 Mar 2002 00:26:49 -0000 1.53
--- admin_users.php 22 Mar 2002 17:00:33 -0000 1.54
***************
*** 7,11 ****
* email : su...@ph...
*
! * $Id$
*
*
--- 7,11 ----
* email : su...@ph...
*
! * $user_id: admin_users.php,v 1.53 2002/03/19 00:26:49 psotfx Exp $
*
[...1027 lines suppressed...]
! 'L_USER_SELECT' => $lang['Select_a_User'],
! 'L_LOOK_UP' => $lang['Look_up_user'],
! 'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"),
! 'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
! 'S_USER_SELECT' => $select_list)
);
$template->pparse('body');
***************
*** 1099,1101 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 1070,1072 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_words.php 18 Mar 2002 14:54:25 -0000 1.9
--- admin_words.php 22 Mar 2002 17:00:33 -0000 1.10
***************
*** 33,38 ****
// Load default header
//
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
// Load default header
//
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** index.php 18 Mar 2002 14:54:25 -0000 1.38
--- index.php 22 Mar 2002 17:00:33 -0000 1.39
***************
*** 26,33 ****
// Load default header
//
- $phpbb_root_dir = "./../";
-
$no_page_header = TRUE;
! require('pagestart.inc');
// ---------------
--- 26,33 ----
// Load default header
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
// ---------------
Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_header_admin.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** page_header_admin.php 18 Mar 2002 14:54:25 -0000 1.11
--- page_header_admin.php 22 Mar 2002 17:00:33 -0000 1.12
***************
*** 36,51 ****
$phpver = phpversion();
! if($phpver >= "4.0.4pl1")
{
! if(extension_loaded("zlib"))
{
! ob_start("ob_gzhandler");
}
}
! else if($phpver > "4.0")
{
if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
{
! if(extension_loaded("zlib"))
{
$do_gzip_compress = TRUE;
--- 36,51 ----
$phpver = phpversion();
! if($phpver >= '4.0.4pl1')
{
! if(extension_loaded('zlib'))
{
! ob_start('ob_gzhandler');
}
}
! else if($phpver > '4.0')
{
if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
{
! if(extension_loaded('zlib'))
{
$do_gzip_compress = TRUE;
***************
*** 53,57 ****
ob_implicit_flush(0);
! header("Content-Encoding: gzip");
}
}
--- 53,57 ----
ob_implicit_flush(0);
! header('Content-Encoding: gzip');
}
}
***************
*** 60,83 ****
$template->set_filenames(array(
! "header" => "admin/page_header.tpl")
);
//
- // Do timezone text output
- //
- if($board_config['board_timezone'] < 0)
- {
- $s_timezone = $lang['All_times'] . " " .$lang['GMT'] . " - " . (-$board_config['board_timezone']) . " " . $lang['Hours'];
- }
- else if($board_config['board_timezone'] == 0)
- {
- $s_timezone = $lang['All_times'] . " " . $lang['GMT'];
- }
- else
- {
- $s_timezone = $lang['All_times'] . " " . $lang['GMT'] ." + " . $board_config['board_timezone'] . " " . $lang['Hours'];
- }
-
- //
// The following assigns all _common_ variables that may be used at any point
// in a template. Note that all URL's should be wrapped in append_sid, as
--- 60,67 ----
$template->set_filenames(array(
! 'header' => 'admin/page_header.tpl')
);
//
// The following assigns all _common_ variables that may be used at any point
// in a template. Note that all URL's should be wrapped in append_sid, as
***************
*** 85,175 ****
//
$template->assign_vars(array(
! "SITENAME" => $board_config['sitename'],
! "PAGE_TITLE" => $page_title,
! "L_ADMIN" => $lang['Admin'],
! "L_USERNAME" => $lang['Username'],
! "L_PASSWORD" => $lang['Password'],
! "L_INDEX" => $lang['Forum_Index'],
! "L_REGISTER" => $lang['Register'],
! "L_PROFILE" => $lang['Profile'],
! "L_SEARCH" => $lang['Search'],
! "L_PRIVATEMSGS" => $lang['Private_msgs'],
! "L_MEMBERLIST" => $lang['Memberlist'],
! "L_FAQ" => $lang['FAQ'],
! "L_USERGROUPS" => $lang['Usergroups'],
! "L_FORUM" => $lang['Forum'],
! "L_TOPICS" => $lang['Topics'],
! "L_REPLIES" => $lang['Replies'],
! "L_VIEWS" => $lang['Views'],
! "L_POSTS" => $lang['Posts'],
! "L_LASTPOST" => $lang['Last_Post'],
! "L_MODERATOR" => $lang['Moderator'],
! "L_NONEWPOSTS" => $lang['No_new_posts'],
! "L_NEWPOSTS" => $lang['New_posts'],
! "L_POSTED" => $lang['Posted'],
! "L_JOINED" => $lang['Joined'],
! "L_AUTHOR" => $lang['Author'],
! "L_MESSAGE" => $lang['Message'],
! "L_BY" => $lang['by'],
!
! "U_INDEX" => append_sid("../index.".$phpEx),
!
! "S_TIMEZONE" => $s_timezone,
! "S_LOGIN_ACTION" => append_sid("../login.$phpEx"),
! "S_JUMPBOX_ACTION" => append_sid("../viewforum.$phpEx"),
! "S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
! "S_CONTENT_DIRECTION" => $lang['DIRECTION'],
! "S_CONTENT_ENCODING" => $lang['ENCODING'],
! "S_CONTENT_DIR_LEFT" => $lang['LEFT'],
! "S_CONTENT_DIR_RIGHT" => $lang['RIGHT'],
!
! "T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
! "T_BODY_BACKGROUND" => $theme['body_background'],
! "T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
! "T_BODY_TEXT" => "#".$theme['body_text'],
! "T_BODY_LINK" => "#".$theme['body_link'],
! "T_BODY_VLINK" => "#".$theme['body_vlink'],
! "T_BODY_ALINK" => "#".$theme['body_alink'],
! "T_BODY_HLINK" => "#".$theme['body_hlink'],
! "T_TR_COLOR1" => "#".$theme['tr_color1'],
! "T_TR_COLOR2" => "#".$theme['tr_color2'],
! "T_TR_COLOR3" => "#".$theme['tr_color3'],
! "T_TR_CLASS1" => $theme['tr_class1'],
! "T_TR_CLASS2" => $theme['tr_class2'],
! "T_TR_CLASS3" => $theme['tr_class3'],
! "T_TH_COLOR1" => "#".$theme['th_color1'],
! "T_TH_COLOR2" => "#".$theme['th_color2'],
! "T_TH_COLOR3" => "#".$theme['th_color3'],
! "T_TH_CLASS1" => $theme['th_class1'],
! "T_TH_CLASS2" => $theme['th_class2'],
! "T_TH_CLASS3" => $theme['th_class3'],
! "T_TD_COLOR1" => "#".$theme['td_color1'],
! "T_TD_COLOR2" => "#".$theme['td_color2'],
! "T_TD_COLOR3" => "#".$theme['td_color3'],
! "T_TD_CLASS1" => $theme['td_class1'],
! "T_TD_CLASS2" => $theme['td_class2'],
! "T_TD_CLASS3" => $theme['td_class3'],
! "T_FONTFACE1" => $theme['fontface1'],
! "T_FONTFACE2" => $theme['fontface2'],
! "T_FONTFACE3" => $theme['fontface3'],
! "T_FONTSIZE1" => $theme['fontsize1'],
! "T_FONTSIZE2" => $theme['fontsize2'],
! "T_FONTSIZE3" => $theme['fontsize3'],
! "T_FONTCOLOR1" => "#".$theme['fontcolor1'],
! "T_FONTCOLOR2" => "#".$theme['fontcolor2'],
! "T_FONTCOLOR3" => "#".$theme['fontcolor3'],
! "T_SPAN_CLASS1" => $theme['span_class1'],
! "T_SPAN_CLASS2" => $theme['span_class2'],
! "T_SPAN_CLASS3" => $theme['span_class3'])
);
- header ("Cache-Control: no-store, no-cache, must-revalidate");
- header ("Cache-Control: pre-check=0, post-check=0, max-age=0", false);
- header ("Pragma: no-cache");
- header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
- header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
! $template->pparse("header");
! ?>
--- 69,154 ----
//
$template->assign_vars(array(
! 'SITENAME' => $board_config['sitename'],
! 'PAGE_TITLE' => $page_title,
! 'L_ADMIN' => $lang['Admin'],
! 'L_USERNAME' => $lang['Username'],
! 'L_PASSWORD' => $lang['Password'],
! 'L_INDEX' => $lang['Forum_Index'],
! 'L_REGISTER' => $lang['Register'],
! 'L_PROFILE' => $lang['Profile'],
! 'L_SEARCH' => $lang['Search'],
! 'L_PRIVATEMSGS' => $lang['Private_msgs'],
! 'L_MEMBERLIST' => $lang['Memberlist'],
! 'L_FAQ' => $lang['FAQ'],
! 'L_USERGROUPS' => $lang['Usergroups'],
! 'L_FORUM' => $lang['Forum'],
! 'L_TOPICS' => $lang['Topics'],
! 'L_REPLIES' => $lang['Replies'],
! 'L_VIEWS' => $lang['Views'],
! 'L_POSTS' => $lang['Posts'],
! 'L_LASTPOST' => $lang['Last_Post'],
! 'L_MODERATOR' => $lang['Moderator'],
! 'L_NONEWPOSTS' => $lang['No_new_posts'],
! 'L_NEWPOSTS' => $lang['New_posts'],
! 'L_POSTED' => $lang['Posted'],
! 'L_JOINED' => $lang['Joined'],
! 'L_AUTHOR' => $lang['Author'],
! 'L_MESSAGE' => $lang['Message'],
! 'L_BY' => $lang['by'],
!
! 'U_INDEX' => append_sid('../index.'.$phpEx),
!
! 'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
! 'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx),
! 'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx),
! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
! 'S_CONTENT_ENCODING' => $lang['ENCODING'],
! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
!
! 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
! 'T_BODY_BACKGROUND' => $theme['body_background'],
! 'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
! 'T_BODY_TEXT' => '#'.$theme['body_text'],
! 'T_BODY_LINK' => '#'.$theme['body_link'],
! 'T_BODY_VLINK' => '#'.$theme['body_vlink'],
! 'T_BODY_ALINK' => '#'.$theme['body_alink'],
! 'T_BODY_HLINK' => '#'.$theme['body_hlink'],
! 'T_TR_COLOR1' => '#'.$theme['tr_color1'],
! 'T_TR_COLOR2' => '#'.$theme['tr_color2'],
! 'T_TR_COLOR3' => '#'.$theme['tr_color3'],
! 'T_TR_CLASS1' => $theme['tr_class1'],
! 'T_TR_CLASS2' => $theme['tr_class2'],
! 'T_TR_CLASS3' => $theme['tr_class3'],
! 'T_TH_COLOR1' => '#'.$theme['th_color1'],
! 'T_TH_COLOR2' => '#'.$theme['th_color2'],
! 'T_TH_COLOR3' => '#'.$theme['th_color3'],
! 'T_TH_CLASS1' => $theme['th_class1'],
! 'T_TH_CLASS2' => $theme['th_class2'],
! 'T_TH_CLASS3' => $theme['th_class3'],
! 'T_TD_COLOR1' => '#'.$theme['td_color1'],
! 'T_TD_COLOR2' => '#'.$theme['td_color2'],
! 'T_TD_COLOR3' => '#'.$theme['td_color3'],
! 'T_TD_CLASS1' => $theme['td_class1'],
! 'T_TD_CLASS2' => $theme['td_class2'],
! 'T_TD_CLASS3' => $theme['td_class3'],
! 'T_FONTFACE1' => $theme['fontface1'],
! 'T_FONTFACE2' => $theme['fontface2'],
! 'T_FONTFACE3' => $theme['fontface3'],
! 'T_FONTSIZE1' => $theme['fontsize1'],
! 'T_FONTSIZE2' => $theme['fontsize2'],
! 'T_FONTSIZE3' => $theme['fontsize3'],
! 'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
! 'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
! 'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
! 'T_SPAN_CLASS1' => $theme['span_class1'],
! 'T_SPAN_CLASS2' => $theme['span_class2'],
! 'T_SPAN_CLASS3' => $theme['span_class3'])
);
! $template->pparse('header');
! ?>
\ No newline at end of file
|
|
From: Jonathan H. <the...@us...> - 2002-03-22 14:30:12
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv1814 Modified Files: install.php Log Message: D@#n it when changing something, make sure that you change it EVERYWHERE it's used :( Index: install.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/install.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** install.php 20 Mar 2002 14:26:26 -0000 1.40 --- install.php 22 Mar 2002 14:30:05 -0000 1.41 *************** *** 1010,1014 **** $s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />'; $s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/" />'; $s_hidden_fields .= '<input type="hidden" name="login" value="true" />'; } --- 1010,1014 ---- $s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />'; $s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.php" />'; $s_hidden_fields .= '<input type="hidden" name="login" value="true" />'; } |
|
From: Paul S. O. <ps...@us...> - 2002-03-22 12:23:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv2947
Modified Files:
login.php
Log Message:
webstar on MacOS X seems to suffer the same refresh issue as IIS CGI, fixed
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** login.php 19 Mar 2002 15:39:05 -0000 1.44
--- login.php 22 Mar 2002 12:22:58 -0000 1.45
***************
*** 48,52 ****
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
--- 48,52 ----
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 15:45:16
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv26657/includes
Modified Files:
usercp_register.php
Log Message:
damn it damn it ... engage brain before commiting the thing you were going to change but didn't ... again, thanks acydburn
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** usercp_register.php 21 Mar 2002 15:42:45 -0000 1.12
--- usercp_register.php 21 Mar 2002 15:45:13 -0000 1.13
***************
*** 208,212 ****
{
$error = TRUE;
! $error_ms .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
--- 208,212 ----
{
$error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
***************
*** 258,266 ****
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
- }
- else if ( empty($password) && empty($password_confirm) && $mode == 'register' )
- {
- $error = TRUE;
- $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
--- 258,261 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 15:42:50
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv25883/includes
Modified Files:
usercp_register.php
Log Message:
Change lang output upon no passwords entered to Fields_empty ... thanks acydburn ... completely forgot about that :D
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** usercp_register.php 21 Mar 2002 13:34:02 -0000 1.11
--- usercp_register.php 21 Mar 2002 15:42:45 -0000 1.12
***************
*** 254,261 ****
}
}
! else if ( ( empty($password) && !empty($password_confirm) ) || ( !empty($password) && empty($password_confirm) ) || ( empty($password) && empty($password_confirm) && $mode == 'register' ) )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
}
--- 254,266 ----
}
}
! else if ( ( empty($password) && !empty($password_confirm) ) || ( !empty($password) && empty($password_confirm) ) )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
+ }
+ else if ( empty($password) && empty($password_confirm) && $mode == 'register' )
+ {
+ $error = TRUE;
+ $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 14:29:45
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv3454/includes
Modified Files:
functions_validate.php
Log Message:
Wasn't checking for wildcards in disallowed usernames during validation ... how we missed this for months is beyond me ... thanks to the anonymous bug track adder ...
Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_validate.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** functions_validate.php 18 Mar 2002 23:53:12 -0000 1.4
--- functions_validate.php 21 Mar 2002 14:29:42 -0000 1.5
***************
*** 59,69 ****
$sql = "SELECT disallow_username
! FROM " . DISALLOW_TABLE . "
! WHERE disallow_username LIKE '$username'";
if ( $result = $db->sql_query($sql) )
{
! if ( $db->sql_fetchrow($result) )
{
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
}
}
--- 59,71 ----
$sql = "SELECT disallow_username
! FROM " . DISALLOW_TABLE;
if ( $result = $db->sql_query($sql) )
{
! while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
! {
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
! }
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 13:59:37
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv26522/db/schemas
Modified Files:
mssql_schema.sql mysql_schema.sql postgres_schema.sql
Log Message:
Re-fix schemas to allow decimal/real numbers in timezone ...
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** mssql_schema.sql 19 Mar 2002 22:00:17 -0000 1.23
--- mssql_schema.sql 21 Mar 2002 13:59:33 -0000 1.24
***************
*** 319,323 ****
[user_level] [smallint] NOT NULL ,
[user_posts] [int] NOT NULL ,
! [user_timezone] [smallint] NOT NULL ,
[user_style] [int] NULL ,
[user_lang] [varchar] (255) NULL ,
--- 319,323 ----
[user_level] [smallint] NOT NULL ,
[user_posts] [int] NOT NULL ,
! [user_timezone] [real] NOT NULL ,
[user_style] [int] NULL ,
[user_lang] [varchar] (255) NULL ,
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** mysql_schema.sql 11 Feb 2002 13:11:36 -0000 1.16
--- mysql_schema.sql 21 Mar 2002 13:59:33 -0000 1.17
***************
*** 464,468 ****
user_level tinyint(4) DEFAULT '0',
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! user_timezone tinyint(4) DEFAULT '0' NOT NULL,
user_style tinyint(4),
user_lang varchar(255),
--- 464,468 ----
user_level tinyint(4) DEFAULT '0',
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! user_timezone float DEFAULT '0' NOT NULL,
user_style tinyint(4),
user_lang varchar(255),
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** postgres_schema.sql 11 Feb 2002 13:11:36 -0000 1.18
--- postgres_schema.sql 21 Mar 2002 13:59:33 -0000 1.19
***************
*** 479,483 ****
user_level int4 DEFAULT '1',
user_lang varchar(255),
! user_timezone int4 DEFAULT '0' NOT NULL,
user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
user_notify_pm int2 DEFAULT '1' NOT NULL,
--- 479,483 ----
user_level int4 DEFAULT '1',
user_lang varchar(255),
! user_timezone real DEFAULT '0' NOT NULL,
user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
user_notify_pm int2 DEFAULT '1' NOT NULL,
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 13:34:05
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv19152/includes
Modified Files:
usercp_register.php
Log Message:
This one has the added benefit of working ...
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** usercp_register.php 21 Mar 2002 13:27:38 -0000 1.10
--- usercp_register.php 21 Mar 2002 13:34:02 -0000 1.11
***************
*** 254,263 ****
}
}
! else if ( empty($password) && empty($password_confirm) )
! {
! $error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
! }
! else
{
$error = TRUE;
--- 254,258 ----
}
}
! else if ( ( empty($password) && !empty($password_confirm) ) || ( !empty($password) && empty($password_confirm) ) || ( empty($password) && empty($password_confirm) && $mode == 'register' ) )
{
$error = TRUE;
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 13:29:55
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv18108/includes
Modified Files:
functions_post.php
Log Message:
Fix missing global var causing failure of include for username validation
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** functions_post.php 18 Mar 2002 13:35:22 -0000 1.3
--- functions_post.php 21 Mar 2002 13:29:53 -0000 1.4
***************
*** 143,147 ****
function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on, &$error_msg, &$username, &$bbcode_uid, &$subject, &$message, &$poll_title, &$poll_options, &$poll_length)
{
! global $board_config, $userdata, $lang, $phpEx;
// Check username
--- 143,147 ----
function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on, &$error_msg, &$username, &$bbcode_uid, &$subject, &$message, &$poll_title, &$poll_options, &$poll_length)
{
! global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path;
// Check username
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 13:27:41
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv17499/includes
Modified Files:
usercp_register.php
Log Message:
Fix blank error when not submitting any passwords during registration and alter error when no username is input
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** usercp_register.php 20 Mar 2002 23:57:18 -0000 1.9
--- usercp_register.php 21 Mar 2002 13:27:38 -0000 1.10
***************
*** 55,78 ****
}
-
- function parse_variables()
- {
-
- }
-
- function process_data()
- {
-
- }
-
- function show_profile_page()
- {
-
- }
//
//
//
-
$page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
--- 55,62 ----
***************
*** 90,94 ****
}
-
$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
--- 74,77 ----
***************
*** 127,131 ****
$username = str_replace(' ', '', $username);
$email = htmlspecialchars($email);
! $signature = str_replace('<br />', '\n', $signature);
// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
--- 110,114 ----
$username = str_replace(' ', '', $username);
$email = htmlspecialchars($email);
! $signature = str_replace('<br />', "\n", $signature);
// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
***************
*** 203,217 ****
}
-
-
-
-
-
-
-
-
-
-
-
if ( isset($HTTP_POST_VARS['submit']) )
{
--- 186,189 ----
***************
*** 282,286 ****
}
}
! else if ( ( $password && !$password_confirm ) || ( !$password && $password_confirm ) )
{
$error = TRUE;
--- 254,263 ----
}
}
! else if ( empty($password) && empty($password_confirm) )
! {
! $error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
! }
! else
{
$error = TRUE;
***************
*** 327,331 ****
if ( $board_config['allow_namechange'] || $mode == 'register' )
{
! if ( $username != $userdata['username'] || $mode == 'register' )
{
$result = validate_username($username);
--- 304,313 ----
if ( $board_config['allow_namechange'] || $mode == 'register' )
{
! if ( empty($username) )
! {
! $error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_disallowed'];
! }
! else if ( $username != $userdata['username'] || $mode == 'register' )
{
$result = validate_username($username);
***************
*** 410,416 ****
$user_actkey = gen_rand_string(true);
- //
- // The user is inactive, remove their session forcing them to login again before they can post.
- //
if ( $userdata['session_logged_in'] )
{
--- 392,395 ----
***************
*** 627,639 ****
}
-
-
-
-
-
-
-
-
-
if ( $error )
{
--- 606,609 ----
***************
*** 700,718 ****
}
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 670,676 ----
}
! //
! // Default pages
! //
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
***************
*** 972,974 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 930,932 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 01:56:23
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv20083/admin
Modified Files:
admin_ug_auth.php
Log Message:
Hopefully fix bug #532648
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_ug_auth.php 19 Mar 2002 12:35:13 -0000 1.7
--- admin_ug_auth.php 21 Mar 2002 01:56:19 -0000 1.8
***************
*** 35,39 ****
// Load default header
//
! $phpbb_root_dir = "./../";
$no_page_header = TRUE;
require('pagestart.inc');
--- 35,39 ----
// Load default header
//
! $phpbb_root_dir = './../';
$no_page_header = TRUE;
require('pagestart.inc');
***************
*** 56,84 ****
// Start program - define vars
//
! $forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
$auth_field_match = array(
! "auth_view" => AUTH_VIEW,
! "auth_read" => AUTH_READ,
! "auth_post" => AUTH_POST,
! "auth_reply" => AUTH_REPLY,
! "auth_edit" => AUTH_EDIT,
! "auth_delete" => AUTH_DELETE,
! "auth_sticky" => AUTH_STICKY,
! "auth_announce" => AUTH_ANNOUNCE,
! "auth_vote" => AUTH_VOTE,
! "auth_pollcreate" => AUTH_POLLCREATE);
$field_names = array(
! "auth_view" => $lang['View'],
! "auth_read" => $lang['Read'],
! "auth_post" => $lang['Post'],
! "auth_reply" => $lang['Reply'],
! "auth_edit" => $lang['Edit'],
! "auth_delete" => $lang['Delete'],
! "auth_sticky" => $lang['Sticky'],
! "auth_announce" => $lang['Announce'],
! "auth_vote" => $lang['Vote'],
! "auth_pollcreate" => $lang['Pollcreate']);
// ---------------
--- 56,84 ----
// Start program - define vars
//
! $forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
$auth_field_match = array(
! 'auth_view' => AUTH_VIEW,
! 'auth_read' => AUTH_READ,
! 'auth_post' => AUTH_POST,
! 'auth_reply' => AUTH_REPLY,
! 'auth_edit' => AUTH_EDIT,
! 'auth_delete' => AUTH_DELETE,
! 'auth_sticky' => AUTH_STICKY,
! 'auth_announce' => AUTH_ANNOUNCE,
! 'auth_vote' => AUTH_VOTE,
! 'auth_pollcreate' => AUTH_POLLCREATE);
$field_names = array(
! 'auth_view' => $lang['View'],
! 'auth_read' => $lang['Read'],
! 'auth_post' => $lang['Post'],
! 'auth_reply' => $lang['Reply'],
! 'auth_edit' => $lang['Edit'],
! 'auth_delete' => $lang['Delete'],
! 'auth_sticky' => $lang['Sticky'],
! 'auth_announce' => $lang['Announce'],
! 'auth_vote' => $lang['Vote'],
! 'auth_pollcreate' => $lang['Pollcreate']);
// ---------------
***************
*** 121,128 ****
// -------------
! if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || ( $mode == "group" && $group_id ) ) )
{
! $user_level = "";
! if ( $mode == "user" )
{
//
--- 121,128 ----
// -------------
! if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == 'user' && $user_id ) || ( $mode == 'group' && $group_id ) ) )
{
! $user_level = '';
! if ( $mode == 'user' )
{
//
***************
*** 137,141 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't select info from user/user_group table", "", __LINE__, __FILE__, $sql);
}
--- 137,141 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select info from user/user_group table', '', __LINE__, __FILE__, $sql);
}
***************
*** 151,155 ****
// Carry out requests
//
! if ( $mode == "user" && $HTTP_POST_VARS['userlevel'] == "user" && $user_level == ADMIN )
{
//
--- 151,155 ----
// Carry out requests
//
! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN )
{
//
***************
*** 164,168 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
}
--- 164,168 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update auth access', '', __LINE__, __FILE__, $sql);
}
***************
*** 175,179 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
}
}
--- 175,179 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 182,186 ****
exit;
}
! else if ( $mode == "user" && $HTTP_POST_VARS['userlevel'] == "admin" && $user_level != ADMIN )
{
//
--- 182,186 ----
exit;
}
! else if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN )
{
//
***************
*** 194,198 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
}
--- 194,198 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
}
***************
*** 339,348 ****
// Checks complete, make updates to DB
//
! $delete_sql = "";
while( list($forum_id, $action) = @each($forum_auth_action) )
{
if ( $action == 'delete' )
{
! $delete_sql .= ( ( $delete_sql != "" ) ? ", " : "" ) . $forum_id;
}
else
--- 339,348 ----
// Checks complete, make updates to DB
//
! $delete_sql = '';
while( list($forum_id, $action) = @each($forum_auth_action) )
{
if ( $action == 'delete' )
{
! $delete_sql .= ( ( $delete_sql != '' ) ? ', ' : '' ) . $forum_id;
}
else
***************
*** 350,362 ****
if ( $action == 'insert' )
{
! $sql_field = "";
! $sql_value = "";
while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
{
! $sql_field .= ( ( $sql_field != "" ) ? ", " : "" ) . $auth_type;
! $sql_value .= ( ( $sql_value != "" ) ? ", " : "" ) . $value;
}
! $sql_field .= ( ( $sql_field != "" ) ? ", " : "" ) . 'auth_mod';
! $sql_value .= ( ( $sql_value != "" ) ? ", " : "" ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
$sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field)
--- 350,362 ----
if ( $action == 'insert' )
{
! $sql_field = '';
! $sql_value = '';
while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
{
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type;
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value;
}
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . 'auth_mod';
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
$sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field)
***************
*** 365,374 ****
else
{
! $sql_values = "";
while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
{
! $sql_values .= ( ( $sql_values != "" ) ? ", " : "" ) . $auth_type . " = " . $value;
}
! $sql_values .= ( ( $sql_values != "" ) ? ", " : "" ) . "auth_mod = " . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
$sql = "UPDATE " . AUTH_ACCESS_TABLE . "
--- 365,374 ----
else
{
! $sql_values = '';
while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
{
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . $auth_type . ' = ' . $value;
}
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . 'auth_mod = ' . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
$sql = "UPDATE " . AUTH_ACCESS_TABLE . "
***************
*** 384,388 ****
}
! if ( $delete_sql != "" )
{
$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
--- 384,388 ----
}
! if ( $delete_sql != '' )
{
$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
***************
*** 410,417 ****
}
! $set_mod = "";
while( $row = $db->sql_fetchrow($result) )
{
! $set_mod .= ( ( $set_mod != "" ) ? ", " : "" ) . $row['user_id'];
}
$db->sql_freeresult($result);
--- 410,417 ----
}
! $set_mod = '';
while( $row = $db->sql_fetchrow($result) )
{
! $set_mod .= ( ( $set_mod != '' ) ? ', ' : '' ) . $row['user_id'];
}
$db->sql_freeresult($result);
***************
*** 470,478 ****
while( $row = $db->sql_fetchrow($result) )
{
! $unset_mod .= ( ( $unset_mod != "" ) ? ", " : "" ) . $row['user_id'];
}
$db->sql_freeresult($result);
! if ( $set_mod != "" )
{
$sql = "UPDATE " . USERS_TABLE . "
--- 470,478 ----
while( $row = $db->sql_fetchrow($result) )
{
! $unset_mod .= ( ( $unset_mod != '' ) ? ', ' : '' ) . $row['user_id'];
}
$db->sql_freeresult($result);
! if ( $set_mod != '' )
{
$sql = "UPDATE " . USERS_TABLE . "
***************
*** 485,489 ****
}
! if ( $unset_mod != "" )
{
$sql = "UPDATE " . USERS_TABLE . "
--- 485,489 ----
}
! if ( $unset_mod != '' )
{
$sql = "UPDATE " . USERS_TABLE . "
***************
*** 541,545 ****
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $forum_access[$i][$forum_auth_fields[$j]] . " :: ";
if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL )
{
--- 541,545 ----
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $forum_access[$i][$forum_auth_fields[$j]] . ' :: ';
if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL )
{
***************
*** 723,743 ****
$optionlist_mod .= '</select>';
! $row_class = ( !( $i % 2 ) ) ? "row2" : "row1";
$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
! $template->assign_block_vars("forums", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "FORUM_NAME" => $forum_access[$i]['forum_name'],
! "U_FORUM_AUTH" => append_sid("admin_forumauth.$phpEx?f=" . $forum_access[$i]['forum_id']),
! "S_MOD_SELECT" => $optionlist_mod)
);
if( !$adv )
{
! $template->assign_block_vars("forums.aclvalues", array(
! "S_ACL_SELECT" => $optionlist_acl)
);
}
--- 723,743 ----
$optionlist_mod .= '</select>';
! $row_class = ( !( $i % 2 ) ) ? 'row2' : 'row1';
$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
! $template->assign_block_vars('forums', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'FORUM_NAME' => $forum_access[$i]['forum_name'],
! 'U_FORUM_AUTH' => append_sid("admin_forumauth.$phpEx?f=" . $forum_access[$i]['forum_id']),
! 'S_MOD_SELECT' => $optionlist_mod)
);
if( !$adv )
{
! $template->assign_block_vars('forums.aclvalues', array(
! 'S_ACL_SELECT' => $optionlist_acl)
);
}
***************
*** 746,751 ****
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $template->assign_block_vars("forums.aclvalues", array(
! "S_ACL_SELECT" => $optionlist_acl_adv[$forum_id][$j])
);
}
--- 746,751 ----
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $template->assign_block_vars('forums.aclvalues', array(
! 'S_ACL_SELECT' => $optionlist_acl_adv[$forum_id][$j])
);
}
***************
*** 762,765 ****
--- 762,767 ----
}
+ $name = array();
+ $id = array();
for($i = 0; $i < count($ug_info); $i++)
{
***************
*** 767,771 ****
{
$name[] = ( $mode == 'user' ) ? $ug_info[$i]['group_name'] : $ug_info[$i]['username'];
! $id[] = ( $mode == 'user' ) ? $ug_info[$i]['group_id'] : $ug_info[$i]['user_id'];
}
}
--- 769,773 ----
{
$name[] = ( $mode == 'user' ) ? $ug_info[$i]['group_name'] : $ug_info[$i]['username'];
! $id[] = ( $mode == 'user' ) ? intval($ug_info[$i]['group_id']) : intval($ug_info[$i]['user_id']);
}
}
***************
*** 773,777 ****
if( count($name) )
{
! $t_usergroup_list = "";
for($i = 0; $i < count($ug_info); $i++)
{
--- 775,779 ----
if( count($name) )
{
! $t_usergroup_list = '';
for($i = 0; $i < count($ug_info); $i++)
{
***************
*** 787,792 ****
if( !$adv )
{
! $template->assign_block_vars("acltype", array(
! "L_UG_ACL_TYPE" => $lang['Simple_Permission'])
);
$s_column_span++;
--- 789,794 ----
if( !$adv )
{
! $template->assign_block_vars('acltype', array(
! 'L_UG_ACL_TYPE' => $lang['Simple_Permission'])
);
$s_column_span++;
***************
*** 798,803 ****
$cell_title = $field_names[$forum_auth_fields[$i]];
! $template->assign_block_vars("acltype", array(
! "L_UG_ACL_TYPE" => $cell_title)
);
$s_column_span++;
--- 800,805 ----
$cell_title = $field_names[$forum_auth_fields[$i]];
! $template->assign_block_vars('acltype', array(
! 'L_UG_ACL_TYPE' => $cell_title)
);
$s_column_span++;
***************
*** 811,815 ****
$template->set_filenames(array(
! "body" => "admin/auth_ug_body.tpl")
);
--- 813,817 ----
$template->set_filenames(array(
! "body" => 'admin/auth_ug_body.tpl')
);
***************
*** 825,834 ****
if ( $mode == 'user' )
{
! $template->assign_block_vars("switch_user_auth", array());
$template->assign_vars(array(
! "USERNAME" => $t_username,
! "USER_LEVEL" => $lang['User_Level'] . " : " . $s_user_type,
! "USER_GROUP_MEMBERSHIPS" => $lang['Group_memberships'] . " : " . $t_usergroup_list)
);
}
--- 827,836 ----
if ( $mode == 'user' )
{
! $template->assign_block_vars('switch_user_auth', array());
$template->assign_vars(array(
! 'USERNAME' => $t_username,
! 'USER_LEVEL' => $lang['User_Level'] . " : " . $s_user_type,
! 'USER_GROUP_MEMBERSHIPS' => $lang['Group_memberships'] . ' : ' . $t_usergroup_list)
);
}
***************
*** 838,863 ****
$template->assign_vars(array(
! "USERNAME" => $t_groupname,
! "GROUP_MEMBERSHIP" => $lang['Usergroup_members'] . ": " . $t_usergroup_list)
);
}
$template->assign_vars(array(
! "L_USER_OR_GROUPNAME" => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
! "L_USER_OR_GROUP" => ( $mode == 'user' ) ? $lang['User'] : $lang['Group'],
! "L_AUTH_TITLE" => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
! "L_AUTH_EXPLAIN" => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
! "L_MODERATOR_STATUS" => $lang['Moderator_status'],
! "L_PERMISSIONS" => $lang['Permissions'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "U_USER_OR_GROUP" => append_sid("admin_ug_auth.$phpEx"),
! "U_SWITCH_MODE" => $u_switch_mode,
!
! "S_COLUMN_SPAN" => $s_column_span,
! "S_AUTH_ACTION" => append_sid("admin_ug_auth.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields)
);
}
--- 840,865 ----
$template->assign_vars(array(
! 'USERNAME' => $t_groupname,
! 'GROUP_MEMBERSHIP' => $lang['Usergroup_members'] . ' : ' . $t_usergroup_list)
);
}
$template->assign_vars(array(
! 'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
! 'L_USER_OR_GROUP' => ( $mode == 'user' ) ? $lang['User'] : $lang['Group'],
! 'L_AUTH_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
! 'L_AUTH_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
! 'L_MODERATOR_STATUS' => $lang['Moderator_status'],
! 'L_PERMISSIONS' => $lang['Permissions'],
! 'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
!
! 'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
! 'U_SWITCH_MODE' => $u_switch_mode,
!
! 'S_COLUMN_SPAN' => $s_column_span,
! 'S_AUTH_ACTION' => append_sid("admin_ug_auth.$phpEx"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
}
***************
*** 870,874 ****
$template->set_filenames(array(
! "body" => ( $mode == 'user' ) ? "admin/user_select_body.tpl" : "admin/auth_select_body.tpl")
);
--- 872,876 ----
$template->set_filenames(array(
! 'body' => ( $mode == 'user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl')
);
***************
*** 876,882 ****
{
$template->assign_vars(array(
! "L_FIND_USERNAME" => $lang['Find_username'],
! "U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"))
);
}
--- 878,884 ----
{
$template->assign_vars(array(
! 'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"))
);
}
***************
*** 903,907 ****
$template->assign_vars(array(
! "S_AUTH_SELECT" => $select_list)
);
}
--- 905,909 ----
$template->assign_vars(array(
! 'S_AUTH_SELECT' => $select_list)
);
}
***************
*** 912,927 ****
$template->assign_vars(array(
! "L_" . $l_type . "_TITLE" => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
! "L_" . $l_type . "_EXPLAIN" => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
! "L_" . $l_type . "_SELECT" => ( $mode == 'user' ) ? $lang['Select_a_User'] : $lang['Select_a_Group'],
! "L_LOOK_UP" => ( $mode == 'user' ) ? $lang['Look_up_User'] : $lang['Look_up_Group'],
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_" . $l_type . "_ACTION" => append_sid("admin_ug_auth.$phpEx"))
);
}
! $template->pparse("body");
include('page_footer_admin.'.$phpEx);
--- 914,929 ----
$template->assign_vars(array(
! 'L_' . $l_type . '_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
! 'L_' . $l_type . '_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
! 'L_' . $l_type . '_SELECT' => ( $mode == 'user' ) ? $lang['Select_a_User'] : $lang['Select_a_Group'],
! 'L_LOOK_UP' => ( $mode == 'user' ) ? $lang['Look_up_User'] : $lang['Look_up_Group'],
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 'S_' . $l_type . '_ACTION' => append_sid("admin_ug_auth.$phpEx"))
);
}
! $template->pparse('body');
include('page_footer_admin.'.$phpEx);
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 01:39:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16715
Modified Files:
search.php
Log Message:
Update goto page code
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** search.php 20 Mar 2002 15:57:21 -0000 1.67
--- search.php 21 Mar 2002 01:38:58 -0000 1.68
***************
*** 826,836 ****
if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics['' . $topic_id . '']) && !empty($tracking_forums['' . $forum_id . '']) )
{
! $topic_last_read = ( $tracking_topics['' . $topic_id . ''] > $tracking_forums['' . $forum_id . ''] ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
}
! else if( !empty($tracking_topics['' . $topic_id . '']) || !empty($tracking_forums['' . $forum_id . '']) )
{
! $topic_last_read = ( !empty($tracking_topics['' . $topic_id . '']) ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
}
--- 826,836 ----
if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) )
{
! $topic_last_read = ( $tracking_topics[$topic_id] > $tracking_forums[$forum_id] ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id];
}
! else if( !empty($tracking_topics[$topic_id]) || !empty($tracking_forums[$forum_id]) )
{
! $topic_last_read = ( !empty($tracking_topics[$topic_id]) ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id];
}
***************
*** 868,872 ****
else
{
! $message = "";
if( count($orig_word) )
--- 868,872 ----
else
{
! $message = '';
if( count($orig_word) )
***************
*** 898,930 ****
$replies = $searchset[$i]['topic_replies'];
! if( $replies > $board_config['topics_per_page'] )
{
! $goto_page = '[ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
$times = 1;
for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
{
! $base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_active");
!
! if( $times > 4 )
{
! if( $j + $board_config['topics_per_page'] >= $replies + 1 )
! {
! $goto_page .= ' ... <a href="' . $base_url . '">' . $times . '</a>';
! }
}
! else
{
! if( $times != 1 )
! {
! $goto_page .= ', ';
! }
!
! $goto_page .= '<a href="' . $base_url . '">' . $times . '</a>';
}
-
$times++;
}
! $goto_page .= ' ]';
}
else
--- 898,923 ----
$replies = $searchset[$i]['topic_replies'];
! if( ( $replies + 1 ) > $board_config['posts_per_page'] )
{
! $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] );
! $goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
$times = 1;
for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
{
! $goto_page .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j") . '">' . $times . '</a>';
! if( $times == 1 && $total_pages > 4 )
{
! $goto_page .= ' ... ';
! $times = $total_pages - 3;
! $j += ( $total_pages - 4 ) * $board_config['posts_per_page'];
}
! else if ( $times < $total_pages )
{
! $goto_page .= ', ';
}
$times++;
}
! $goto_page .= ' ] ';
}
else
***************
*** 976,980 ****
if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
--- 969,973 ----
if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{
***************
*** 1009,1013 ****
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />';
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
}
else
--- 1002,1006 ----
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />';
! $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
}
else
***************
*** 1024,1028 ****
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />';
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
}
else
--- 1017,1021 ----
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />';
! $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
}
else
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 01:38:48
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16671
Modified Files:
viewforum.php
Log Message:
A few coding style alterations
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** viewforum.php 18 Mar 2002 13:35:43 -0000 1.132
--- viewforum.php 21 Mar 2002 01:38:45 -0000 1.133
***************
*** 22,26 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 22,26 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 29,37 ****
// Start initial var setup
//
! if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
{
$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
}
! else if( isset($HTTP_GET_VARS['forum']))
{
$forum_id = $HTTP_GET_VARS['forum'];
--- 29,37 ----
// Start initial var setup
//
! if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
{
$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
}
! else if ( isset($HTTP_GET_VARS['forum']))
{
$forum_id = $HTTP_GET_VARS['forum'];
***************
*** 39,48 ****
else
{
! $forum_id = "";
}
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
! if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
{
$mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark'];
--- 39,48 ----
else
{
! $forum_id = '';
}
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
! if ( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
{
$mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark'];
***************
*** 50,54 ****
else
{
! $mark_read = "";
}
//
--- 50,54 ----
else
{
! $mark_read = '';
}
//
***************
*** 60,71 ****
// If not give them a nice error page.
//
! if( !empty($forum_id) )
{
$sql = "SELECT *
FROM " . FORUMS_TABLE . "
WHERE forum_id = $forum_id";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
}
}
--- 60,71 ----
// If not give them a nice error page.
//
! if ( !empty($forum_id) )
{
$sql = "SELECT *
FROM " . FORUMS_TABLE . "
WHERE forum_id = $forum_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 79,83 ****
// the user.
//
! if( !($forum_row = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, 'Forum_not_exist');
--- 79,83 ----
// the user.
//
! if ( !($forum_row = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, 'Forum_not_exist');
***************
*** 99,103 ****
$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
! if( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
{
if ( !$userdata['session_logged_in'] )
--- 99,103 ----
$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
! if ( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
{
if ( !$userdata['session_logged_in'] )
***************
*** 120,143 ****
// Handle marking posts
//
! if( $mark_read == "topics" )
{
! if( $userdata['session_logged_in'] )
{
$sql = "SELECT MAX(post_time) AS last_post
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
}
! if( $db->sql_numrows($result) )
{
! $row = $db->sql_fetchrow($result);
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
!
! if( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums['' . $forum_id . '']) )
{
asort($tracking_forums);
--- 120,141 ----
// Handle marking posts
//
! if ( $mark_read == 'topics' )
{
! if ( $userdata['session_logged_in'] )
{
$sql = "SELECT MAX(post_time) AS last_post
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array();
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array();
! if ( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums[$forum_id]) )
{
asort($tracking_forums);
***************
*** 145,162 ****
}
! if( $row['last_post'] > $userdata['user_lastvisit'] )
{
! $tracking_forums['' . $forum_id . ''] = time();
! setcookie($board_config['cookie_name'] . "_f", serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
}
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
}
! $message = $lang['Topics_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a> ");
message_die(GENERAL_MESSAGE, $message);
}
--- 143,160 ----
}
! if ( $row['last_post'] > $userdata['user_lastvisit'] )
{
! $tracking_forums[$forum_id] = time();
! setcookie($board_config['cookie_name'] . '_f', serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
}
$template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
}
! $message = $lang['Topics_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a> ');
message_die(GENERAL_MESSAGE, $message);
}
***************
*** 165,177 ****
//
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : "";
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : "";
//
// Do the forum Prune
//
! if( $is_auth['auth_mod'] && $board_config['prune_enable'] )
{
! if( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] )
{
include($phpbb_root_path . 'includes/prune.'.$phpEx);
--- 163,175 ----
//
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : '';
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : '';
//
// Do the forum Prune
//
! if ( $is_auth['auth_mod'] && $board_config['prune_enable'] )
{
! if ( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] )
{
include($phpbb_root_path . 'includes/prune.'.$phpEx);
***************
*** 198,204 ****
GROUP BY u.user_id, u.username
ORDER BY u.user_id";
! if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
}
--- 196,202 ----
GROUP BY u.user_id, u.username
ORDER BY u.user_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
}
***************
*** 219,225 ****
GROUP BY g.group_id, g.group_name
ORDER BY g.group_id";
! if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
}
--- 217,223 ----
GROUP BY g.group_id, g.group_name
ORDER BY g.group_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
}
***************
*** 230,234 ****
$l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! $forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None'];
unset($moderators);
--- 228,232 ----
$l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! $forum_moderators = ( count($moderators) ) ? implode(', ', $moderators) : $lang['None'];
unset($moderators);
***************
*** 241,245 ****
$previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
! if( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) )
{
$topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? $HTTP_POST_VARS['topicdays'] : $HTTP_GET_VARS['topicdays'];
--- 239,243 ----
$previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
! if ( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) )
{
$topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? $HTTP_POST_VARS['topicdays'] : $HTTP_GET_VARS['topicdays'];
***************
*** 252,258 ****
AND p.post_time >= $min_topic_time";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain limited topics count information", "", __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
--- 250,256 ----
AND p.post_time >= $min_topic_time";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain limited topics count information', '', __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
***************
*** 261,265 ****
$limit_topics_time = "AND p.post_time >= $min_topic_time";
! if( !empty($HTTP_POST_VARS['topicdays']) )
{
$start = 0;
--- 259,263 ----
$limit_topics_time = "AND p.post_time >= $min_topic_time";
! if ( !empty($HTTP_POST_VARS['topicdays']) )
{
$start = 0;
***************
*** 270,284 ****
$topics_count = $forum_row['forum_topics'];
! $limit_topics_time = "";
$topic_days = 0;
}
! $select_topic_days = "<select name=\"topicdays\">";
for($i = 0; $i < count($previous_days); $i++)
{
! $selected = ($topic_days == $previous_days[$i]) ? " selected=\"selected\"" : "";
! $select_topic_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
}
! $select_topic_days .= "</select>";
--- 268,282 ----
$topics_count = $forum_row['forum_topics'];
! $limit_topics_time = '';
$topic_days = 0;
}
! $select_topic_days = '<select name="topicdays">';
for($i = 0; $i < count($previous_days); $i++)
{
! $selected = ($topic_days == $previous_days[$i]) ? ' selected="selected"' : '';
! $select_topic_days .= '<option value="' . $previous_days[$i] . '"' . $selected . '>' . $previous_days_text[$i] . '</option>';
}
! $select_topic_days .= '</select>';
***************
*** 295,301 ****
AND t.topic_type = " . POST_ANNOUNCE . "
ORDER BY t.topic_last_post_id DESC ";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
}
--- 293,299 ----
AND t.topic_type = " . POST_ANNOUNCE . "
ORDER BY t.topic_last_post_id DESC ";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
}
***************
*** 325,331 ****
ORDER BY t.topic_type DESC, t.topic_last_post_id DESC
LIMIT $start, ".$board_config['topics_per_page'];
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
}
--- 323,329 ----
ORDER BY t.topic_type DESC, t.topic_last_post_id DESC
LIMIT $start, ".$board_config['topics_per_page'];
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
}
***************
*** 355,364 ****
//
$template->assign_vars(array(
! "L_DISPLAY_TOPICS" => $lang['Display_topics'],
! "U_POST_NEW_TOPIC" => append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id"),
! "S_SELECT_TOPIC_DAYS" => $select_topic_days,
! "S_POST_DAYS_ACTION" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&start=$start"))
);
--- 353,362 ----
//
$template->assign_vars(array(
! 'L_DISPLAY_TOPICS' => $lang['Display_topics'],
! 'U_POST_NEW_TOPIC' => append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id"),
! 'S_SELECT_TOPIC_DAYS' => $select_topic_days,
! 'S_POST_DAYS_ACTION' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&start=$start"))
);
***************
*** 366,378 ****
// User authorisation levels output
//
! $s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . "<br />";
! $s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . "<br />";
! $s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . "<br />";
! $s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . "<br />";
! $s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . "<br />";
! if( $is_auth['auth_mod'] )
{
! $s_auth_can .= sprintf($lang['Rules_moderate'], "<a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
}
--- 364,376 ----
// User authorisation levels output
//
! $s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '<br />';
! $s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '<br />';
! $s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '<br />';
! $s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '<br />';
! $s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . '<br />';
! if ( $is_auth['auth_mod'] )
{
! $s_auth_can .= sprintf($lang['Rules_moderate'], '<a href="' . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
}
***************
*** 388,436 ****
// Dump out the page header and load viewforum template
//
! $page_title = $lang['View_forum'] . " - " . $forum_row['forum_name'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
! "body" => "viewforum_body.tpl",
! "jumpbox" => "jumpbox.tpl")
);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
! "L_GO" => $lang['Go'],
! "L_JUMP_TO" => $lang['Jump_to'],
! "L_SELECT_FORUM" => $lang['Select_forum'],
! "S_JUMPBOX_LIST" => $jumpbox,
! "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
! $template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array(
! "FORUM_ID" => $forum_id,
! "FORUM_NAME" => $forum_row['forum_name'],
! "MODERATORS" => $forum_moderators,
! "IMG_POST" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
!
! "FOLDER_IMG" => $images['folder'],
! "FOLDER_NEW_IMG" => $images['folder_new'],
! "FOLDER_HOT_IMG" => $images['folder_hot'],
! "FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
! "FOLDER_LOCKED_IMG" => $images['folder_locked'],
! "FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
! "FOLDER_STICKY_IMG" => $images['folder_sticky'],
! "FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
! "FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
! "FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
!
! "L_MODERATOR" => $l_moderators,
! "L_MARK_TOPICS_READ" => $lang['Mark_all_topics'],
! "L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
! "S_AUTH_LIST" => $s_auth_can,
! "U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"),
! "U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"))
);
//
--- 386,434 ----
// Dump out the page header and load viewforum template
//
! $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
! 'body' => 'viewforum_body.tpl',
! 'jumpbox' => 'jumpbox.tpl')
);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
! 'L_GO' => $lang['Go'],
! 'L_JUMP_TO' => $lang['Jump_to'],
! 'L_SELECT_FORUM' => $lang['Select_forum'],
! 'S_JUMPBOX_LIST' => $jumpbox,
! 'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
! $template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$template->assign_vars(array(
! 'FORUM_ID' => $forum_id,
! 'FORUM_NAME' => $forum_row['forum_name'],
! 'MODERATORS' => $forum_moderators,
! 'IMG_POST' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
!
! 'FOLDER_IMG' => $images['folder'],
! 'FOLDER_NEW_IMG' => $images['folder_new'],
! 'FOLDER_HOT_IMG' => $images['folder_hot'],
! 'FOLDER_HOT_NEW_IMG' => $images['folder_hot_new'],
! 'FOLDER_LOCKED_IMG' => $images['folder_locked'],
! 'FOLDER_LOCKED_NEW_IMG' => $images['folder_locked_new'],
! 'FOLDER_STICKY_IMG' => $images['folder_sticky'],
! 'FOLDER_STICKY_NEW_IMG' => $images['folder_sticky_new'],
! 'FOLDER_ANNOUNCE_IMG' => $images['folder_announce'],
! 'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'],
!
! 'L_MODERATOR' => $l_moderators,
! 'L_MARK_TOPICS_READ' => $lang['Mark_all_topics'],
! 'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
! 'S_AUTH_LIST' => $s_auth_can,
! 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"),
! 'U_MARK_READ' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"))
);
//
***************
*** 455,477 ****
if( $topic_type == POST_ANNOUNCE )
{
! $topic_type = $lang['Topic_Announcement'] . " ";
}
else if( $topic_type == POST_STICKY )
{
! $topic_type = $lang['Topic_Sticky'] . " ";
}
else
{
! $topic_type = "";
}
if( $topic_rowset[$i]['topic_vote'] )
{
! $topic_type .= $lang['Topic_Poll'] . " ";
}
if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
{
! $topic_type = $lang['Topic_Moved'] . " ";
$topic_id = $topic_rowset[$i]['topic_moved_id'];
--- 453,475 ----
if( $topic_type == POST_ANNOUNCE )
{
! $topic_type = $lang['Topic_Announcement'] . ' ';
}
else if( $topic_type == POST_STICKY )
{
! $topic_type = $lang['Topic_Sticky'] . ' ';
}
else
{
! $topic_type = '';
}
if( $topic_rowset[$i]['topic_vote'] )
{
! $topic_type .= $lang['Topic_Poll'] . ' ';
}
if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
{
! $topic_type = $lang['Topic_Moved'] . ' ';
$topic_id = $topic_rowset[$i]['topic_moved_id'];
***************
*** 510,525 ****
}
! $newest_post_img = "";
if( $userdata['session_logged_in'] )
{
if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
$unread_topics = true;
! if( !empty($tracking_topics['' . $topic_id . '']) )
{
! if( $tracking_topics['' . $topic_id . ''] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 508,523 ----
}
! $newest_post_img = '';
if( $userdata['session_logged_in'] )
{
if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{
$unread_topics = true;
! if( !empty($tracking_topics[$topic_id]) )
{
! if( $tracking_topics[$topic_id] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 527,533 ****
}
! if( !empty($tracking_forums['' . $forum_id . '']) )
{
! if( $tracking_forums['' . $forum_id . ''] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 525,531 ----
}
! if( !empty($tracking_forums[$forum_id]) )
{
! if( $tracking_forums[$forum_id] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 535,541 ****
}
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 533,539 ----
}
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 581,585 ****
if( ( $replies + 1 ) > $board_config['posts_per_page'] )
{
! $total_pages = ceil(($replies+1)/$board_config['posts_per_page']);
$goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
--- 579,583 ----
if( ( $replies + 1 ) > $board_config['posts_per_page'] )
{
! $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] );
$goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
***************
*** 625,651 ****
$template->assign_block_vars("topicrow", array(
! "FORUM_ID" => $forum_id,
! "TOPIC_ID" => $topic_id,
! "FOLDER" => $folder_image,
! "TOPIC_POSTER" => $topic_poster,
! "GOTO_PAGE" => $goto_page,
! "REPLIES" => $replies,
! "NEWEST_POST_IMG" => $newest_post_img,
! "TOPIC_TITLE" => $topic_title,
! "TOPIC_TYPE" => $topic_type,
! "VIEWS" => $views,
! "LAST_POST" => $last_post,
! "ROW_COLOR" => $row_color,
! "ROW_CLASS" => $row_class,
! "U_VIEW_TOPIC" => $view_topic_url)
);
}
$template->assign_vars(array(
! "PAGINATION" => generate_pagination("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&topicdays=$topic_days", $topics_count, $board_config['topics_per_page'], $start),
! "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $topics_count / $board_config['topics_per_page'] )),
! "L_GOTO_PAGE" => $lang['Goto_page'])
);
--- 623,649 ----
$template->assign_block_vars("topicrow", array(
! 'FORUM_ID' => $forum_id,
! 'TOPIC_ID' => $topic_id,
! 'FOLDER' => $folder_image,
! 'TOPIC_POSTER' => $topic_poster,
! 'GOTO_PAGE' => $goto_page,
! 'REPLIES' => $replies,
! 'NEWEST_POST_IMG' => $newest_post_img,
! 'TOPIC_TITLE' => $topic_title,
! 'TOPIC_TYPE' => $topic_type,
! 'VIEWS' => $views,
! 'LAST_POST' => $last_post,
! 'ROW_COLOR' => $row_color,
! 'ROW_CLASS' => $row_class,
! 'U_VIEW_TOPIC' => $view_topic_url)
);
}
$template->assign_vars(array(
! 'PAGINATION' => generate_pagination("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&topicdays=$topic_days", $topics_count, $board_config['topics_per_page'], $start),
! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $topics_count / $board_config['topics_per_page'] )),
! 'L_GOTO_PAGE' => $lang['Goto_page'])
);
***************
*** 656,665 ****
// No topics
//
! $no_topics_msg = ($forum_row['forum_status'] == FORUM_LOCKED) ? $lang['Forum_locked'] : $lang['No_topics_post_one'];
$template->assign_vars(array(
! "L_NO_TOPICS" => $no_topics_msg)
);
! $template->assign_block_vars("notopicsrow", array() );
}
--- 654,663 ----
// No topics
//
! $no_topics_msg = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['No_topics_post_one'];
$template->assign_vars(array(
! 'L_NO_TOPICS' => $no_topics_msg)
);
! $template->assign_block_vars('notopicsrow', array() );
}
***************
*** 668,672 ****
// Parse the page and print
//
! $template->pparse("body");
//
--- 666,670 ----
// Parse the page and print
//
! $template->pparse('body');
//
***************
*** 675,677 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 673,675 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-03-21 01:03:49
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv10320
Modified Files:
posting.php
Log Message:
Fix failure if duplicate username, no subject, no post, etc. errors have occured when submitting, bug #532336
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -r1.152 -r1.153
*** posting.php 20 Mar 2002 14:56:11 -0000 1.152
--- posting.php 21 Mar 2002 01:03:47 -0000 1.153
***************
*** 531,534 ****
--- 531,535 ----
submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length);
+ if ( $error_msg == '' )
user_notification($mode, $post_data, $forum_id, $topic_id, $post_id, $notify_user);
}
***************
*** 541,552 ****
}
- if ( $mode != 'editpost' )
- {
- $user_id = ( $mode == 'reply' || $mode == 'newtopic' ) ? $userdata['user_id'] : $post_data['poster_id'];
- update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id);
- }
-
if ( $error_msg == '' )
{
if ( $mode == 'newtopic' || $mode == 'reply' )
{
--- 542,553 ----
}
if ( $error_msg == '' )
{
+ if ( $mode != 'editpost' )
+ {
+ $user_id = ( $mode == 'reply' || $mode == 'newtopic' ) ? $userdata['user_id'] : $post_data['poster_id'];
+ update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id);
+ }
+
if ( $mode == 'newtopic' || $mode == 'reply' )
{
|
|
From: Paul S. O. <ps...@us...> - 2002-03-20 23:57:21
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27530/includes
Modified Files:
usercp_register.php
Log Message:
Replace space with + in AIM names
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** usercp_register.php 20 Mar 2002 14:39:43 -0000 1.8
--- usercp_register.php 20 Mar 2002 23:57:18 -0000 1.9
***************
*** 425,429 ****
$sql = "UPDATE " . USERS_TABLE . "
! SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
WHERE user_id = $user_id";
if ( !($result = $db->sql_query($sql)) )
--- 425,429 ----
$sql = "UPDATE " . USERS_TABLE . "
! SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
WHERE user_id = $user_id";
if ( !($result = $db->sql_query($sql)) )
***************
*** 502,506 ****
//
$sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", $aim) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
--- 502,506 ----
//
$sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
***************
*** 647,651 ****
$icq = stripslashes($icq);
! $aim = stripslashes($aim);
$msn = stripslashes($msn);
$yim = stripslashes($yim);
--- 647,651 ----
$icq = stripslashes($icq);
! $aim = str_replace('+', ' ', stripslashes($aim));
$msn = stripslashes($msn);
$yim = stripslashes($yim);
***************
*** 670,674 ****
$icq = $userdata['user_icq'];
! $aim = $userdata['user_aim'];
$msn = $userdata['user_msnm'];
$yim = $userdata['user_yim'];
--- 670,674 ----
$icq = $userdata['user_icq'];
! $aim = str_replace('+', ' ', $userdata['user_aim']);
$msn = $userdata['user_msnm'];
$yim = $userdata['user_yim'];
|
|
From: Jonathan H. <the...@us...> - 2002-03-20 19:59:45
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv10081
Modified Files:
prune.php
Log Message:
add hack check
Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** prune.php 20 Mar 2002 15:46:36 -0000 1.13
--- prune.php 20 Mar 2002 19:59:42 -0000 1.14
***************
*** 20,23 ****
--- 20,27 ----
*
***************************************************************************/
+ if ( !defined('IN_PHPBB') )
+ {
+ die("Hacking attempt");
+ }
require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
***************
*** 160,162 ****
}
! ?>
\ No newline at end of file
--- 164,166 ----
}
! ?>
|
|
From: Paul S. O. <ps...@us...> - 2002-03-20 17:48:34
|
Update of /cvsroot/phpbb/phpBB2/db In directory usw-pr-cvs1:/tmp/cvs-serv2013/db Modified Files: mssql-odbc.php Log Message: suspect there may be a similar problem to the msaccess beyond first page bug here too ... may be wrong :D Index: mssql-odbc.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/db/mssql-odbc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** mssql-odbc.php 5 Mar 2002 02:19:38 -0000 1.6 --- mssql-odbc.php 20 Mar 2002 17:48:30 -0000 1.7 *************** *** 132,136 **** $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; ! $row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9; $row_inner = 0; --- 132,136 ---- $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; ! $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; $row_inner = 0; |
|
From: Paul S. O. <ps...@us...> - 2002-03-20 17:47:32
|
Update of /cvsroot/phpbb/phpBB2/db In directory usw-pr-cvs1:/tmp/cvs-serv1621/db Modified Files: msaccess.php Log Message: Fix bug causing no output beyond first page of results Index: msaccess.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/db/msaccess.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** msaccess.php 5 Mar 2002 02:19:38 -0000 1.7 --- msaccess.php 20 Mar 2002 17:47:26 -0000 1.8 *************** *** 135,139 **** $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; ! $row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9; $row_inner = 0; --- 135,139 ---- $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; ! $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; $row_inner = 0; |
|
From: Paul S. O. <ps...@us...> - 2002-03-20 15:57:24
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv22383
Modified Files:
search.php
Log Message:
Fix enter does not submit problems for username searching, all bow down before Matthijs ... no, not in that way you perverts
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** search.php 19 Mar 2002 18:59:50 -0000 1.66
--- search.php 20 Mar 2002 15:57:21 -0000 1.67
***************
*** 134,138 ****
// windowed version
//
! if( isset($HTTP_POST_VARS['search']) )
{
username_search($HTTP_POST_VARS['search_author'], false);
--- 134,138 ----
// windowed version
//
! if( isset($HTTP_POST_VARS['search_author']) )
{
username_search($HTTP_POST_VARS['search_author'], false);
|
7 messages has been excluded from this view by a project administrator.
