phpbb-php5mod-cvs-checkins Mailing List for phpBB-php5 MOD (Page 3)
Brought to you by:
jelly_doughnut
Menu
▾
▴
phpbb-php5mod-cvs-checkins — Notification of cvs checkins
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
(7) |
Oct
(2) |
Nov
(10) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(15) |
Mar
|
Apr
(7) |
May
(11) |
Jun
(5) |
Jul
(6) |
Aug
|
Sep
|
Oct
(12) |
Nov
|
Dec
(7) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2007 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Josh <jel...@us...> - 2005-05-12 02:56:17
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16387/db Modified Files: mysqli.php Log Message: stupid, stupid, stupid donut. Tip: don't code while watching the Numa Numa dance Index: mysqli.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/mysqli.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mysqli.php 8 May 2005 02:12:43 -0000 1.6 --- mysqli.php 12 May 2005 02:56:08 -0000 1.7 *************** *** 340,345 **** function sql_error() { ! $result['message'] = mysqli_error( (string) $this->db_connect_id); ! $result['code'] = mysqli_errno( (string) $this->db_connect_id); return $result; --- 340,345 ---- function sql_error() { ! $result['message'] = mysqli_error($this->db_connect_id); ! $result['code'] = mysqli_errno($this->db_connect_id); return $result; |
|
From: Josh <jel...@us...> - 2005-05-12 02:56:17
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16387 Modified Files: viewtopic.php Log Message: stupid, stupid, stupid donut. Tip: don't code while watching the Numa Numa dance Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** viewtopic.php 8 May 2005 02:12:43 -0000 1.8 --- viewtopic.php 12 May 2005 02:56:08 -0000 1.9 *************** *** 1109,1112 **** --- 1109,1114 ---- // via php.net's annotated manual $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace('#\b(" . str_replace('\\', '\\\\', $highlight_match) . ")\b#i', '<span style=\"color:#" . $theme['fontcolor3'] . "\"><b>\\\\1</b></span>', '\\0')", '>' . $message . '<'), 1, -1)); + } + // // Replace naughty words *************** *** 1121,1125 **** } ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); } // --- 1123,1128 ---- } ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); ! } // |
|
From: Josh <jel...@us...> - 2005-05-09 00:33:28
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32438/install Added Files: update_to_20154.php Log Message: Schema changes for 2.0.15 --- NEW FILE: update_to_20154.php --- <?php /*************************************************************************** * update_to_20xy.php * ------------------- * begin : Friday, Nov. * copyright : (C) 2005 phpBB-php5 * email : n/a * * $Id: update_to_20154.php,v 1.1 2005/05/09 00:33:18 jelly_doughnut Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // This script is basically phpBB's update_to_20x.php // Except it doesn't have information to upgrade from ancient versions. function _sql($sql, &$errored, &$error_ary, $echo_dot = true) { global $db; if (!($result = $db->sql_query($sql))) { $errored = true; $error_ary['sql'][] = (is_array($sql)) ? $sql[$i] : $sql; $error_ary['error_code'][] = $db->sql_error(); } if ($echo_dot) { echo ". \n"; flush(); } return $result; } @set_time_limit(120); define('IN_PHPBB', 1); $phpbb_root_path = './../'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); if(!isset($dbms)) { die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update."); } include($phpbb_root_path . 'includes/constants.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include($phpbb_root_path . 'includes/functions_search.'.$phpEx); include($phpbb_root_path . 'includes/db.'.$phpEx); // // // $updates_to_version = ".0.15"; $update_php5mod_version = ".0.15.4"; // // // ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;"> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"> <!-- font,th,td,p,body { font-family: "Courier New", courier; font-size: 11pt } a:link,a:active,a:visited { color : #006699; } a:hover { text-decoration: underline; color : #DD6900;} hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} .maintitle,h1,h2 {font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; text-decoration: none; line-height : 120%; color : #000000;} .ok {color:green} /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ @import url("../templates/subSilver/formIE.css"); --> </style> </head> <body bgcolor="#FFFFFF" text="#000000" link="#006699" vlink="#5584AA"> <table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> <td align="center" width="100%" valign="middle"><span class="maintitle">Updating to latest stable release</span></td> </tr> </table></td> </tr> </table> <br clear="all" /> <h2>Information</h2> <?php echo '<p>Database type :: <b>' . SQL_LAYER . '</b><br />'; $sql = "SELECT config_value FROM " . CONFIG_TABLE . " WHERE config_name = 'version'"; if (!($result = $db->sql_query($sql))) { die("Couldn't obtain version info"); } $row = $db->sql_fetchrow($result); $sql = array(); echo 'Previous version :: <b>2' . $row['config_value'] . '</b><br />'; echo 'Updated version :: <b>2' . $updates_to_version . '</b></p>' ."\n"; echo "<h2>Updating database schema</h2>\n"; echo "<p>Progress :: <b>"; flush(); // // Data updates // unset($sql); $error_ary = array(); $errored = false; echo "<h2>Updating data</h2>\n"; echo "<p>Progress :: <b>"; flush(); $sql = 'ALTER TABLE ' . SESSIONS_TABLE . ' ADD session_admin int(1)'; _sql($sql, $errored, $error_ary); echo " No updates where required</b></p>\n"; echo "<h2>Updating version and optimizing tables</h2>\n"; echo "<p>Progress :: <b>"; flush(); // update the version $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$updates_to_version' WHERE config_name = 'version'"; _sql($sql, $errored, $error_ary); $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$update_php5mod_version' WHERE config_name = 'version5'"; _sql($sql, $errored, $error_ary); // Optimize/vacuum analyze the tables where appropriate // this should be done for each version in future along with // the version number update switch (SQL_LAYER) { case 'mysql': case 'mysql4': case 'mysqli': $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; _sql($sql, $errored, $error_ary); break; case 'postgresql': _sql("VACUUM ANALYZE", $errored, $error_ary); break; } echo "</b> <b class=\"ok\">Done</b><br />Result :: \n"; if ($errored) { echo " <b>Some queries failed, the statements and errors are listing below</b>\n<ul>"; for ($i = 0; $i < count($error_ary['sql']); $i++) { echo "<li>Error :: <b>" . $error_ary['error_code'][$i]['message'] . "</b><br />"; echo "SQL :: <b>" . $error_ary['sql'][$i] . "</b><br /><br /></li>"; } echo "</ul>\n<p>This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See <a href=\"docs\README.html\">README</a> for details on how to obtain advice.</p>\n"; } else { echo "<b>No errors</b>\n"; } echo "<h2>Update completed</h2>\n"; echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"../admin/\">Administration Panel</a> and check the General Configuration of the board. If you updated from versions prior to RC-3 you <b>must</b> update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n"; ?> <br clear="all" /> </body> </html> |
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32438/install/schemas Modified Files: mssql_basic.sql mssql_schema.sql mysql_basic.sql mysql_schema.sql postgres_basic.sql postgres_schema.sql Log Message: Schema changes for 2.0.15 Index: postgres_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/postgres_basic.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** postgres_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 --- postgres_basic.sql 9 May 2005 00:33:17 -0000 1.6 *************** *** 64,69 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); -- Categories --- 64,69 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.15'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.15.3'); -- Categories Index: mysql_schema.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mysql_schema.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mysql_schema.sql 29 Jul 2004 22:36:20 -0000 1.1 --- mysql_schema.sql 9 May 2005 00:33:17 -0000 1.2 *************** *** 306,309 **** --- 306,310 ---- session_page int(11) DEFAULT '0' NOT NULL, session_logged_in tinyint(1) DEFAULT '0' NOT NULL, + session_admin tinyint(1) DEFAULT '0' NOT NULL, PRIMARY KEY (session_id), KEY session_user_id (session_user_id), Index: postgres_schema.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/postgres_schema.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** postgres_schema.sql 29 Jul 2004 22:36:20 -0000 1.1 --- postgres_schema.sql 9 May 2005 00:33:17 -0000 1.2 *************** *** 290,293 **** --- 290,294 ---- session_page int4 DEFAULT '0' NOT NULL, session_logged_in int2 DEFAULT '0' NOT NULL, + session_admin int2 DEFAULT '0' NOT NULL, CONSTRAINT phpbb_session_pkey PRIMARY KEY (session_id) ); Index: mysql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mysql_basic.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mysql_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 --- mysql_basic.sql 9 May 2005 00:33:17 -0000 1.6 *************** *** 63,68 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); --- 63,68 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.15'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.15.4'); Index: mssql_schema.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mssql_schema.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mssql_schema.sql 29 Jul 2004 22:36:20 -0000 1.1 --- mssql_schema.sql 9 May 2005 00:33:17 -0000 1.2 *************** *** 191,195 **** [session_ip] [char] (8) NOT NULL , [session_page] [int] NULL , ! [session_logged_in] [smallint] NULL ) ON [PRIMARY] GO --- 191,196 ---- [session_ip] [char] (8) NOT NULL , [session_page] [int] NULL , ! [session_logged_in] [smallint] NULL, ! [session_admin] [int] NOT NULL, ) ON [PRIMARY] GO Index: mssql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mssql_basic.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mssql_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 --- mssql_basic.sql 9 May 2005 00:33:17 -0000 1.6 *************** *** 70,75 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); /* --- 70,75 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.15'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.15.4'); /* |
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28399/includes Modified Files: bbcode.php page_header.php sessions.php smtp.php usercp_confirm.php usercp_register.php usercp_sendpasswd.php usercp_viewprofile.php Log Message: - phpBB 2.0.15 - some bug fixes courtesy of astute users - a few long arrays turned to short ones Index: usercp_sendpasswd.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_sendpasswd.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** usercp_sendpasswd.php 20 Nov 2004 01:01:11 -0000 1.3 --- usercp_sendpasswd.php 8 May 2005 02:12:44 -0000 1.4 *************** *** 30,34 **** if ( isset($_POST['submit']) ) { ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : ''; --- 30,34 ---- if ( isset($_POST['submit']) ) { ! $username = ( !empty($_POST['username']) ) ? phpbb_clean_username($_POST['username']) : ''; $email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : ''; Index: smtp.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/smtp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** smtp.php 29 Jul 2004 22:36:20 -0000 1.1 --- smtp.php 8 May 2005 02:12:44 -0000 1.2 *************** *** 107,111 **** // Ok we have error checked as much as we can to this point let's get on // it already. ! if( !$socket = fsockopen($board_config['smtp_host'], 25, $errno, $errstr, 20) ) { message_die(GENERAL_ERROR, "Could not connect to smtp host : $errno : $errstr", "", __LINE__, __FILE__); --- 107,111 ---- // Ok we have error checked as much as we can to this point let's get on // it already. ! if( !$socket = @fsockopen($board_config['smtp_host'], 25, $errno, $errstr, 20) ) { message_die(GENERAL_ERROR, "Could not connect to smtp host : $errno : $errstr", "", __LINE__, __FILE__); Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sessions.php 16 Apr 2005 21:07:04 -0000 1.6 --- sessions.php 8 May 2005 02:12:44 -0000 1.7 *************** *** 25,29 **** // Returns the new session ID on success. // ! function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0) { global $db, $board_config; --- 25,29 ---- // Returns the new session ID on success. // ! function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0, $admin = 0) { global $db, $board_config; *************** *** 155,168 **** // $sql = "UPDATE " . SESSIONS_TABLE . " ! SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login ! WHERE session_id = '" . $session_id . "' AND session_ip = '$user_ip'"; if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! $session_id = md5(uniqid($user_ip)); $sql = "INSERT INTO " . SESSIONS_TABLE . " ! (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in) ! VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)"; if ( !$db->sql_query($sql) ) { --- 155,170 ---- // $sql = "UPDATE " . SESSIONS_TABLE . " ! SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login, session_admin = $admin ! WHERE session_id = '" . $session_id . "' AND session_ip = '$user_ip'"; if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! list($sec, $usec) = explode(' ', microtime()); ! mt_srand((float) $sec + ((float) $usec * 100000)); ! $session_id = md5(uniqid(mt_rand(), true)); $sql = "INSERT INTO " . SESSIONS_TABLE . " ! (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin) ! VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)"; if ( !$db->sql_query($sql) ) { *************** *** 175,190 **** $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time; ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit ! WHERE user_id = $user_id"; ! if ( !$db->sql_query($sql) ) { ! message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql); } $userdata['user_lastvisit'] = $last_visit; - $sessiondata['autologinid'] = ( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : ''; - $sessiondata['userid'] = $user_id; } --- 177,194 ---- $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time; ! if (!$admin) { ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit ! WHERE user_id = $user_id"; ! if ( !$db->sql_query($sql) ) ! { ! message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql); ! } } $userdata['user_lastvisit'] = $last_visit; + $sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid']; } *************** *** 196,199 **** --- 200,204 ---- $userdata['session_start'] = $current_time; $userdata['session_time'] = $current_time; + $userdata['session_admin'] = $admin; setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure); *************** *** 284,289 **** if ( $current_time - $userdata['session_time'] > 60 ) { ! $sql = "UPDATE " . SESSIONS_TABLE . " ! SET session_time = $current_time, session_page = $thispage_id WHERE session_id = '" . $userdata['session_id'] . "'"; if ( !$db->sql_query($sql) ) --- 289,297 ---- if ( $current_time - $userdata['session_time'] > 60 ) { ! // A little trick to reset session_admin on session re-usage ! $update_admin = (!defined('IN_ADMIN') && $current_time - $userdata['session_time'] > ($board_config['session_length']+60)) ? ', session_admin = 0' : ''; ! ! $sql = "UPDATE " . SESSIONS_TABLE . " ! SET session_time = $current_time, session_page = $thispage_id$update_admin WHERE session_id = '" . $userdata['session_id'] . "'"; if ( !$db->sql_query($sql) ) Index: usercp_confirm.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_confirm.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_confirm.php 20 Nov 2004 01:01:11 -0000 1.1 --- usercp_confirm.php 8 May 2005 02:12:44 -0000 1.2 *************** *** 34,43 **** // Do we have an id? No, then just exit ! if (empty($HTTP_GET_VARS['id'])) { exit; } ! $confirm_id = htmlspecialchars($HTTP_GET_VARS['id']); // Define available charset --- 34,43 ---- // Do we have an id? No, then just exit ! if (empty($_GET_['id'])) { exit; } ! $confirm_id = htmlspecialchars($_GET['id']); // Define available charset *************** *** 154,162 **** else { ! if (!empty($HTTP_GET_VARS['c'])) { $_png = define_raw_pngs(); ! $char = substr($code, intval($HTTP_GET_VARS['c']) - 1, 1); header('Content-Type: image/png'); header('Cache-control: no-cache, no-store'); --- 154,162 ---- else { ! if (!empty($_GET['c'])) { $_png = define_raw_pngs(); ! $char = substr($code, intval($_GET['c']) - 1, 1); header('Content-Type: image/png'); header('Cache-control: no-cache, no-store'); Index: usercp_register.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** usercp_register.php 22 Feb 2005 01:21:02 -0000 1.4 --- usercp_register.php 8 May 2005 02:12:44 -0000 1.5 *************** *** 267,271 **** if ($board_config['enable_confirm'] && $mode == 'register') { ! if (empty($HTTP_POST_VARS['confirm_id'])) { $error = TRUE; --- 267,271 ---- if ($board_config['enable_confirm'] && $mode == 'register') { ! if (empty($_POST['confirm_id'])) { $error = TRUE; *************** *** 274,278 **** else { ! $confirm_id = htmlspecialchars($HTTP_POST_VARS['confirm_id']); if (!preg_match('/^[A-Za-z0-9]+$/', $confirm_id)) { --- 274,278 ---- else { ! $confirm_id = htmlspecialchars($_POST['confirm_id']); if (!preg_match('/^[A-Za-z0-9]+$/', $confirm_id)) { *************** *** 409,413 **** else if ( $username != $userdata['username'] || $mode == 'register' ) { ! if (strtolower($username) != strtolower($userdata['username'])) { $result = validate_username($username); --- 409,413 ---- else if ( $username != $userdata['username'] || $mode == 'register' ) { ! if (strtolower($username) != strtolower($userdata['username']) || $mode == 'register') { $result = validate_username($username); Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** page_header.php 16 Apr 2005 21:07:04 -0000 1.4 --- page_header.php 8 May 2005 02:12:44 -0000 1.5 *************** *** 36,40 **** $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 36,40 ---- $phpver = phpversion(); ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) *************** *** 467,471 **** // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); --- 467,471 ---- // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); Index: usercp_viewprofile.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_viewprofile.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** usercp_viewprofile.php 20 Nov 2004 01:01:11 -0000 1.3 --- usercp_viewprofile.php 8 May 2005 02:12:44 -0000 1.4 *************** *** 34,37 **** --- 34,42 ---- $profiledata = get_userdata($_GET[POST_USERS_URL]); + if (!$profiledata) + { + message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); + } + $sql = "SELECT * FROM " . RANKS_TABLE . " Index: bbcode.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/bbcode.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bbcode.php 29 Jul 2004 22:36:19 -0000 1.1 --- bbcode.php 8 May 2005 02:12:44 -0000 1.2 *************** *** 125,128 **** --- 125,130 ---- global $lang, $bbcode_tpl; + $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); + // pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0). // This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it. *************** *** 195,199 **** // [img]image_url_here[/img] code.. // This one gets first-passed.. ! $patterns[] = "#\[img:$uid\](.*?)\[/img:$uid\]#si"; $replacements[] = $bbcode_tpl['img']; --- 197,201 ---- // [img]image_url_here[/img] code.. // This one gets first-passed.. ! $patterns[] = "#\[img:$uid\]([^?].*?)\[/img:$uid\]#si"; $replacements[] = $bbcode_tpl['img']; *************** *** 207,216 **** // [url=xxxx://www.phpbb.com]phpBB[/url] code.. ! $patterns[] = "#\[url=([\w]+?://[^ \"\n\r\t<]*?)\](.*?)\[/url\]#is"; $replacements[] = $bbcode_tpl['url3']; // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). ! $patterns[] = "#\[url=((www|ftp)\.[^ \"\n\r\t<]*?)\](.*?)\[/url\]#is"; ! $replacements[] = $bbcode_tpl['url4']; // [email]us...@do...d[/email] code.. --- 209,217 ---- // [url=xxxx://www.phpbb.com]phpBB[/url] code.. ! $patterns[] = "#\[url=([\w]+?://[^ \"\n\r\t<]*?)\]([^?].*?)\[/url\]#i"; $replacements[] = $bbcode_tpl['url3']; // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). ! $patterns[] = "#\[url=((www|ftp)\.[^ \"\n\r\t<]*?)\]([^?].*?)\[/url\]#i"; // [email]us...@do...d[/email] code.. *************** *** 615,618 **** --- 616,620 ---- function make_clickable($text) { + $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); // pad it with a space so we can match things at the start of the 1st line. |
|
From: Josh <jel...@us...> - 2005-05-08 02:12:53
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28399/language/lang_english Modified Files: lang_main.php Log Message: - phpBB 2.0.15 - some bug fixes courtesy of astute users - a few long arrays turned to short ones Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/language/lang_english/lang_main.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_main.php 29 Jul 2004 22:36:21 -0000 1.1 --- lang_main.php 8 May 2005 02:12:44 -0000 1.2 *************** *** 1019,1022 **** --- 1019,1024 ---- $lang['A_critical_error'] = 'A Critical Error Occurred'; + $lang['Admin_reauthenticate'] = 'To administer the board you must re-authenticate yourself.'; + // // That's all, Folks! |
|
From: Josh <jel...@us...> - 2005-05-08 02:12:52
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28399 Modified Files: groupcp.php login.php privmsg.php viewtopic.php Log Message: - phpBB 2.0.15 - some bug fixes courtesy of astute users - a few long arrays turned to short ones Index: login.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.php 20 Nov 2004 01:01:10 -0000 1.3 --- login.php 8 May 2005 02:12:43 -0000 1.4 *************** *** 53,59 **** if( isset($_POST['login']) || isset($_GET['login']) || isset($_POST['logout']) || isset($_GET['logout']) ) { ! if( ( isset($_POST['login']) || isset($_GET['login']) ) && !$userdata['session_logged_in'] ) { ! $username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $password = isset($_POST['password']) ? $_POST['password'] : ''; --- 53,59 ---- if( isset($_POST['login']) || isset($_GET['login']) || isset($_POST['logout']) || isset($_GET['logout']) ) { ! if( ( isset($_POST['login']) || isset($_GET['login']) ) && (!$userdata['session_logged_in'] || isset($_POST['admin'])) ) { ! $username = isset($_POST['username']) ? phpbb_clean_username($_POST['username']) : ''; $password = isset($_POST['password']) ? $_POST['password'] : ''; *************** *** 78,82 **** $autologin = ( isset($_POST['autologin']) ) ? TRUE : 0; ! $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); if( $session_id ) --- 78,83 ---- $autologin = ( isset($_POST['autologin']) ) ? TRUE : 0; ! $admin = (isset($_POST['admin'])) ? 1 : 0; ! $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); if( $session_id ) *************** *** 159,163 **** // user not already logged in // ! if( !$userdata['session_logged_in'] ) { $page_title = $lang['Login']; --- 160,164 ---- // user not already logged in // ! if( !$userdata['session_logged_in'] || (isset($_GET['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { $page_title = $lang['Login']; *************** *** 208,211 **** --- 209,213 ---- $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; + $s_hidden_fields .= (isset($_GET['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; make_jumpbox('viewforum.'.$phpEx, $forum_id); *************** *** 213,218 **** 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => $lang['Enter_password'], ! 'L_SEND_PASSWORD' => $lang['Forgotten_password'], 'U_SEND_PASSWORD' => append_sid("profile.$phpEx?mode=sendpassword"), --- 215,219 ---- 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => (isset($_GET['admin'])) ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], 'U_SEND_PASSWORD' => append_sid("profile.$phpEx?mode=sendpassword"), Index: groupcp.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/groupcp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** groupcp.php 20 Nov 2004 01:01:10 -0000 1.3 --- groupcp.php 8 May 2005 02:12:43 -0000 1.4 *************** *** 338,342 **** } ! if ( !($row = $db->sql_fetchrow($result)) ) { $sql = "UPDATE " . USERS_TABLE . " --- 338,342 ---- } ! if ( !($row = $db->sql_fetchrow($result)) || $row['is_auth_mod'] == 0) { $sql = "UPDATE " . USERS_TABLE . " *************** *** 473,477 **** if ( isset($_POST['add']) ) { ! $username = ( isset($_POST['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $sql = "SELECT user_id, user_email, user_lang, user_level --- 473,477 ---- if ( isset($_POST['add']) ) { ! $username = ( isset($_POST['username']) ) ? phpbb_clean_username($_POST['username']) : ''; $sql = "SELECT user_id, user_email, user_lang, user_level Index: privmsg.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/privmsg.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** privmsg.php 16 Apr 2005 21:02:23 -0000 1.4 --- privmsg.php 8 May 2005 02:12:43 -0000 1.5 *************** *** 1133,1137 **** if ( !empty($_POST['username']) ) { ! $to_username = phpbb_clean_username($HTTP_POST_VARS['username']); $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active --- 1133,1137 ---- if ( !empty($_POST['username']) ) { ! $to_username = phpbb_clean_username($_POST['username']); $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** viewtopic.php 16 Apr 2005 21:02:23 -0000 1.7 --- viewtopic.php 8 May 2005 02:12:43 -0000 1.8 *************** *** 1108,1113 **** // This was shamelessly 'borrowed' from volker at multiartstudio dot de // via php.net's annotated manual ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace('#\b(" . $highlight_match . ")\b#i', '<span style=\"color:#" . $theme['fontcolor3'] . "\"><b>\\\\1</b></span>', '\\0')", '>' . $message . '<'), 1, -1)); } ! // // Replace naughty words --- 1108,1112 ---- // This was shamelessly 'borrowed' from volker at multiartstudio dot de // via php.net's annotated manual ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace('#\b(" . str_replace('\\', '\\\\', $highlight_match) . ")\b#i', '<span style=\"color:#" . $theme['fontcolor3'] . "\"><b>\\\\1</b></span>', '\\0')", '>' . $message . '<'), 1, -1)); // // Replace naughty words |
|
From: Josh <jel...@us...> - 2005-05-08 02:12:52
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28399/db Modified Files: mysqli.php postgres7.php Log Message: - phpBB 2.0.15 - some bug fixes courtesy of astute users - a few long arrays turned to short ones Index: mysqli.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/mysqli.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mysqli.php 22 Feb 2005 01:21:02 -0000 1.5 --- mysqli.php 8 May 2005 02:12:43 -0000 1.6 *************** *** 86,90 **** if( $this->in_transaction ) { ! mysqli_query("COMMIT", $this->db_connect_id); } --- 86,90 ---- if( $this->in_transaction ) { ! mysqli_query($this->db_connect_id, "COMMIT"); } *************** *** 126,130 **** if( $transaction == END_TRANSACTION && $this->in_transaction ) { ! $result = mysqli_query("COMMIT", $this->db_connect_id); } } --- 126,130 ---- if( $transaction == END_TRANSACTION && $this->in_transaction ) { ! $result = mysqli_query($this->db_connect_id, "COMMIT"); } } Index: postgres7.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/postgres7.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** postgres7.php 16 Apr 2005 21:02:23 -0000 1.3 --- postgres7.php 8 May 2005 02:12:43 -0000 1.4 *************** *** 124,128 **** $query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query); - $query = preg_replace('#(.*WHERE.*)(username|user_email|ban_email) = \'(.*)\'#ise', "\"\\1LOWER(\\2) = '\" . strtolower('\\3') . \"'\"", $query); if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) --- 124,127 ---- |
|
From: Josh <jel...@us...> - 2005-05-08 02:12:52
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28399/admin Modified Files: admin_forums.php admin_smilies.php admin_ug_auth.php page_header_admin.php pagestart.php Log Message: - phpBB 2.0.15 - some bug fixes courtesy of astute users - a few long arrays turned to short ones Index: pagestart.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/pagestart.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pagestart.php 30 Jul 2004 02:12:37 -0000 1.2 --- pagestart.php 8 May 2005 02:12:43 -0000 1.3 *************** *** 60,63 **** --- 60,68 ---- } + if (!$userdata['session_admin']) + { + redirect(append_sid("login.$phpEx?redirect=admin/&admin=1", true)); + } + if (empty($no_page_header)) { Index: page_header_admin.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/page_header_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** page_header_admin.php 16 Apr 2005 21:02:22 -0000 1.3 --- page_header_admin.php 8 May 2005 02:12:43 -0000 1.4 *************** *** 36,40 **** $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 36,40 ---- $phpver = phpversion(); ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) Index: admin_ug_auth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_ug_auth.php 21 Feb 2005 02:50:25 -0000 1.5 --- admin_ug_auth.php 8 May 2005 02:12:43 -0000 1.6 *************** *** 554,557 **** --- 554,599 ---- $forum_auth_level[$forum_id] = AUTH_ALL; + $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . " + WHERE group_id = $group_id"; + $result = $db->sql_query($sql); + + $group_user = array(); + + while ($row = $db->sql_fetchrow($result)) + { + $group_user[$row['user_id']] = $row['user_id']; + } + $db->sql_freeresult($result); + + $sql = "SELECT ug.user_id, COUNT(auth_mod) AS is_auth_mod + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id IN (" . implode(', ', $group_user) . ") + AND aa.group_id = ug.group_id + AND aa.auth_mod = 1 + GROUP BY ug.user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + if ($row['is_auth_mod']) + { + unset($group_user[$row['user_id']]); + } + } + $db->sql_freeresult($result); + + if (sizeof($group_user)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id IN (" . implode(', ', $group_user) . ")"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } for($j = 0; $j < count($forum_auth_fields); $j++) { Index: admin_forums.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_forums.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_forums.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_forums.php 8 May 2005 02:12:43 -0000 1.3 *************** *** 234,237 **** --- 234,238 ---- { list($cat_id) = each($_POST['addforum']); + $cat_id = intval($cat_id); // // stripslashes needs to be run on this because slashes are added when the forum name is posted Index: admin_smilies.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_smilies.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_smilies.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_smilies.php 8 May 2005 02:12:43 -0000 1.3 *************** *** 448,451 **** --- 448,454 ---- $smile_url = ( isset($_POST['smile_url']) ) ? $_POST['smile_url'] : $_GET['smile_url']; $smile_emotion = ( isset($_POST['smile_emotion']) ) ? $_POST['smile_emotion'] : $_GET['smile_emotion']; + $smile_code = trim($smile_code); + $smile_url = trim($smile_url); + $smile_emotion = trim($smile_emotion); // If no code was entered complain ... |
|
From: Josh <jel...@us...> - 2005-04-16 21:09:14
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25155/install/schemas Modified Files: mssql_basic.sql mysql_basic.sql postgres_basic.sql Log Message: Schemas & update script Index: mysql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mysql_basic.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql_basic.sql 22 Feb 2005 21:05:09 -0000 1.4 --- mysql_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 *************** *** 63,68 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); --- 63,68 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); Index: mssql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mssql_basic.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mssql_basic.sql 22 Feb 2005 21:05:08 -0000 1.4 --- mssql_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 *************** *** 70,75 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); /* --- 70,75 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); /* Index: postgres_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/postgres_basic.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** postgres_basic.sql 22 Feb 2005 21:05:10 -0000 1.4 --- postgres_basic.sql 16 Apr 2005 21:09:05 -0000 1.5 *************** *** 64,69 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); -- Categories --- 64,69 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.14'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.14.3'); -- Categories |
|
From: Josh <jel...@us...> - 2005-04-16 21:09:14
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25155/install Added Files: update_to_20143.php Log Message: Schemas & update script --- NEW FILE: update_to_20143.php --- <?php /*************************************************************************** * update_to_20xy.php * ------------------- * begin : Friday, Nov. * copyright : (C) 2005 phpBB-php5 * email : n/a * * $Id: update_to_20143.php,v 1.1 2005/04/16 21:09:05 jelly_doughnut Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // This script is basically phpBB's update_to_20x.php // Except it doesn't have information to upgrade from ancient versions. function _sql($sql, &$errored, &$error_ary, $echo_dot = true) { global $db; if (!($result = $db->sql_query($sql))) { $errored = true; $error_ary['sql'][] = (is_array($sql)) ? $sql[$i] : $sql; $error_ary['error_code'][] = $db->sql_error(); } if ($echo_dot) { echo ". \n"; flush(); } return $result; } @set_time_limit(120); define('IN_PHPBB', 1); $phpbb_root_path = './../'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); if(!isset($dbms)) { die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update."); } include($phpbb_root_path . 'includes/constants.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include($phpbb_root_path . 'includes/functions_search.'.$phpEx); include($phpbb_root_path . 'includes/db.'.$phpEx); // // // $updates_to_version = ".0.14"; $update_php5mod_version = ".0.14.3"; // // // ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;"> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"> <!-- font,th,td,p,body { font-family: "Courier New", courier; font-size: 11pt } a:link,a:active,a:visited { color : #006699; } a:hover { text-decoration: underline; color : #DD6900;} hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} .maintitle,h1,h2 {font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; text-decoration: none; line-height : 120%; color : #000000;} .ok {color:green} /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ @import url("../templates/subSilver/formIE.css"); --> </style> </head> <body bgcolor="#FFFFFF" text="#000000" link="#006699" vlink="#5584AA"> <table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> <td align="center" width="100%" valign="middle"><span class="maintitle">Updating to latest stable release</span></td> </tr> </table></td> </tr> </table> <br clear="all" /> <h2>Information</h2> <?php echo '<p>Database type :: <b>' . SQL_LAYER . '</b><br />'; $sql = "SELECT config_value FROM " . CONFIG_TABLE . " WHERE config_name = 'version'"; if (!($result = $db->sql_query($sql))) { die("Couldn't obtain version info"); } $row = $db->sql_fetchrow($result); $sql = array(); echo 'Previous version :: <b>2' . $row['config_value'] . '</b><br />'; echo 'Updated version :: <b>2' . $updates_to_version . '</b></p>' ."\n"; echo "<h2>Updating database schema</h2>\n"; echo "<p>Progress :: <b>"; flush(); // // Data updates // unset($sql); $error_ary = array(); $errored = false; echo "<h2>Updating data</h2>\n"; echo "<p>Progress :: <b>"; flush(); echo " No updates where required</b></p>\n"; echo "<h2>Updating version and optimizing tables</h2>\n"; echo "<p>Progress :: <b>"; flush(); // update the version $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$updates_to_version' WHERE config_name = 'version'"; _sql($sql, $errored, $error_ary); $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$update_php5mod_version' WHERE config_name = 'version5'"; _sql($sql, $errored, $error_ary); // Optimize/vacuum analyze the tables where appropriate // this should be done for each version in future along with // the version number update switch (SQL_LAYER) { case 'mysql': case 'mysql4': $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; _sql($sql, $errored, $error_ary); break; case 'postgresql': _sql("VACUUM ANALYZE", $errored, $error_ary); break; } echo "</b> <b class=\"ok\">Done</b><br />Result :: \n"; if ($errored) { echo " <b>Some queries failed, the statements and errors are listing below</b>\n<ul>"; for ($i = 0; $i < count($error_ary['sql']); $i++) { echo "<li>Error :: <b>" . $error_ary['error_code'][$i]['message'] . "</b><br />"; echo "SQL :: <b>" . $error_ary['sql'][$i] . "</b><br /><br /></li>"; } echo "</ul>\n<p>This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See <a href=\"docs\README.html\">README</a> for details on how to obtain advice.</p>\n"; } else { echo "<b>No errors</b>\n"; } echo "<h2>Update completed</h2>\n"; echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"../admin/\">Administration Panel</a> and check the General Configuration of the board. If you updated from versions prior to RC-3 you <b>must</b> update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n"; ?> <br clear="all" /> </body> </html> |
|
From: Josh <jel...@us...> - 2005-04-16 21:07:13
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24299/includes Modified Files: page_header.php sessions.php Log Message: Erm, oops. Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** page_header.php 16 Apr 2005 21:02:23 -0000 1.3 --- page_header.php 16 Apr 2005 21:07:04 -0000 1.4 *************** *** 467,471 **** // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) ) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); --- 467,471 ---- // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sessions.php 16 Apr 2005 21:02:23 -0000 1.5 --- sessions.php 16 Apr 2005 21:07:04 -0000 1.6 *************** *** 241,245 **** } ! $thispage_id = (int) $thispage_id // // Does a session exist? --- 241,245 ---- } ! $thispage_id = (int) $thispage_id; // // Does a session exist? |
|
From: Josh <jel...@us...> - 2005-04-16 21:02:32
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363 Modified Files: modcp.php privmsg.php search.php viewtopic.php Log Message: 2.0.14.3 Index: modcp.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/modcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modcp.php 30 Jul 2004 02:12:38 -0000 1.2 --- modcp.php 16 Apr 2005 21:02:23 -0000 1.3 *************** *** 132,135 **** --- 132,140 ---- $topic_row = $db->sql_fetchrow($result); + if (!$topic_row) + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); + } + $forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics']; $forum_id = $topic_row['forum_id']; *************** *** 147,150 **** --- 152,161 ---- $topic_row = $db->sql_fetchrow($result); + if (!$topic_row) + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); + } + + $forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics']; $forum_name = $topic_row['forum_name']; Index: privmsg.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/privmsg.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** privmsg.php 20 Nov 2004 01:01:10 -0000 1.3 --- privmsg.php 16 Apr 2005 21:02:23 -0000 1.4 *************** *** 564,570 **** // on then we process it, else leave it alone // ! if ( !$board_config['allow_html'] ) { ! if ( $user_sig != '' && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] ) { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); --- 564,570 ---- // on then we process it, else leave it alone // ! if ( !$board_config['allow_html'] || !$userdata['user_allowhtml']) { ! if ( $user_sig != '') { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); *************** *** 1528,1534 **** // Finalise processing as per viewtopic // ! if ( !$html_on ) { ! if ( $user_sig != '' || !$userdata['user_allowhtml'] ) { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); --- 1528,1534 ---- // Finalise processing as per viewtopic // ! if ( !$html_on || !$board_config['allow_html'] || !$userdata['user_allowhtml'] ) { ! if ( $user_sig != '' ) { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); Index: search.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/search.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** search.php 20 Nov 2004 01:01:10 -0000 1.3 --- search.php 16 Apr 2005 21:02:23 -0000 1.4 *************** *** 198,201 **** --- 198,206 ---- else { + if (preg_match('#^[\*%]+$#', trim($search_author)) || preg_match('#^[^\*]{1,2}$#', str_replace(array('*', '%'), '', trim($search_author)))) + { + $search_author = ''; + } + $search_author = str_replace('*', '%', trim($search_author)); *************** *** 265,268 **** --- 270,279 ---- for($i = 0; $i < count($split_search); $i++) { + if (preg_match('#^[\*%]+$#', trim($split_search[$i])) || preg_match('#^[^\*]{1,2}$#', str_replace(array('*', '%'), '', trim($split_search[$i])))) + { + $split_search[$i] = ''; + continue; + } + switch ( $split_search[$i] ) { *************** *** 408,411 **** --- 419,427 ---- if ( $search_author != '' ) { + if (preg_match('#^[\*%]+$#', trim($search_author)) || preg_match('#^[^\*]{1,2}$#', str_replace(array('*', '%'), '', trim($search_author)))) + { + $search_author = ''; + } + $search_author = str_replace('*', '%', trim(str_replace("\'", "''", $search_author))); } Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** viewtopic.php 28 Feb 2005 00:58:11 -0000 1.6 --- viewtopic.php 16 Apr 2005 21:02:23 -0000 1.7 *************** *** 1050,1056 **** // on then we process it, else leave it alone // ! if ( !$board_config['allow_html'] ) { ! if ( $user_sig != '' && $userdata['user_allowhtml'] ) { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); --- 1050,1056 ---- // on then we process it, else leave it alone // ! if ( !$board_config['allow_html'] || !$userdata['user_allowhtml']) { ! if ( $user_sig != '' ) { $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); *************** *** 1119,1127 **** if ($user_sig != '') { ! $user_sig = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $user_sig . '<'), 1, -1)); } ! $message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); ! } // --- 1119,1126 ---- if ($user_sig != '') { ! $user_sig = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $user_sig . '<'), 1, -1)); } ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); } // |
|
From: Josh <jel...@us...> - 2005-04-16 21:02:32
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/includes Modified Files: page_header.php sessions.php usercp_avatar.php Log Message: 2.0.14.3 Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_header.php 30 Jul 2004 02:12:38 -0000 1.2 --- page_header.php 16 Apr 2005 21:02:23 -0000 1.3 *************** *** 36,40 **** $phpver = phpversion(); ! $useragent = (isset($_SERVER["HTTP_USER_AGENT"]) ) ? $_SERVER["HTTP_USER_AGENT"] : $HTTP_USER_AGENT; if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 36,40 ---- $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) *************** *** 467,471 **** // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); --- 467,471 ---- // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) ) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sessions.php 28 Feb 2005 00:58:11 -0000 1.4 --- sessions.php 16 Apr 2005 21:02:23 -0000 1.5 *************** *** 52,55 **** --- 52,56 ---- { $session_id = ''; + $page_id = 0; } *************** *** 92,95 **** --- 93,101 ---- $enable_autologin = 0; $user_id = $userdata['user_id'] = ANONYMOUS; + + $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS; + $result = $db->sql_query($sql); + $userdata = $db->sql_fetchrow($result); + $db->sql_freeresult($result); } } *************** *** 100,103 **** --- 106,114 ---- $enable_autologin = 0; $user_id = $userdata['user_id'] = ANONYMOUS; + + $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS; + $result = $db->sql_query($sql); + $userdata = $db->sql_fetchrow($result); + $db->sql_freeresult($result); } } *************** *** 230,233 **** --- 241,245 ---- } + $thispage_id = (int) $thispage_id // // Does a session exist? Index: usercp_avatar.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_avatar.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** usercp_avatar.php 22 Feb 2005 01:21:02 -0000 1.2 --- usercp_avatar.php 16 Apr 2005 21:02:23 -0000 1.3 *************** *** 233,242 **** } ! $move_file($avatar_filename, './' . $board_config['avatar_path'] . "/$new_filename"); ! } ! if (!is_uploaded_file($avatar_filename)) ! { ! message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); } --- 233,243 ---- } ! if (!is_uploaded_file($avatar_filename)) ! { ! message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); ! } ! ! $move_file($avatar_filename, './' . $board_config['avatar_path'] . "/$new_filename"); } |
|
From: Josh <jel...@us...> - 2005-04-16 21:02:31
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/admin Modified Files: admin_styles.php page_footer_admin.php page_header_admin.php Log Message: 2.0.14.3 Index: page_header_admin.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/page_header_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_header_admin.php 30 Jul 2004 02:12:37 -0000 1.2 --- page_header_admin.php 16 Apr 2005 21:02:22 -0000 1.3 *************** *** 36,40 **** $phpver = phpversion(); ! $useragent = (isset($_SERVER["HTTP_USER_AGENT"]) ) ? $_SERVER["HTTP_USER_AGENT"] : $HTTP_USER_AGENT; if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 36,40 ---- $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) Index: admin_styles.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_styles.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_styles.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_styles.php 16 Apr 2005 21:02:22 -0000 1.3 *************** *** 76,80 **** { ! include($phpbb_root_path. "templates/" . $install_to . "/theme_info.cfg"); $template_name = $$install_to; --- 76,80 ---- { ! include($phpbb_root_path. "templates/" . basename($install_to) . "/theme_info.cfg"); $template_name = $$install_to; *************** *** 740,744 **** @umask(0111); ! $fp = @fopen($phpbb_root_path . 'templates/' . $template_name . '/theme_info.cfg', 'w'); if( !$fp ) --- 740,744 ---- @umask(0111); ! $fp = @fopen($phpbb_root_path . 'templates/' . basename($template_name) . '/theme_info.cfg', 'w'); if( !$fp ) Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/page_footer_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_footer_admin.php 29 Jul 2004 22:30:29 -0000 1.1 --- page_footer_admin.php 16 Apr 2005 21:02:22 -0000 1.2 *************** *** 34,38 **** $template->assign_vars(array( ! 'PHPBB_VERSION' => '2' . $board_config['version'], 'TRANSLATION_INFO' => $lang['TRANSLATION_INFO']) ); --- 34,38 ---- $template->assign_vars(array( ! 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'TRANSLATION_INFO' => $lang['TRANSLATION_INFO']) ); |
|
From: Josh <jel...@us...> - 2005-04-16 21:02:31
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/db Modified Files: oracle.php postgres7.php Log Message: 2.0.14.3 Index: oracle.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/oracle.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oracle.php 29 Jul 2004 22:36:00 -0000 1.1 --- oracle.php 16 Apr 2005 21:02:23 -0000 1.2 *************** *** 369,405 **** } } - function sql_nextid($query_id = 0) - { - if(!$query_id) - { - $query_id = $this->query_result; - } - if($query_id && $this->last_query_text[$query_id] != "") - { - if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename)) - { - $query = "SELECT ".$tablename[2]."_id_seq.currval FROM DUAL"; - $stmt = @OCIParse($this->db_connect_id, $query); - @OCIExecute($stmt,OCI_DEFAULT ); - $temp_result = @OCIFetchInto($stmt, $temp_result, OCI_ASSOC+OCI_RETURN_NULLS); - if($temp_result) - { - return $temp_result['CURRVAL']; - } - else - { - return false; - } - } - else - { - return false; - } - } - else - { - return false; - } - } function sql_nextid($query_id = 0) --- 369,372 ---- Index: postgres7.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/postgres7.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** postgres7.php 30 Jul 2004 20:12:43 -0000 1.2 --- postgres7.php 16 Apr 2005 21:02:23 -0000 1.3 *************** *** 124,127 **** --- 124,128 ---- $query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query); + $query = preg_replace('#(.*WHERE.*)(username|user_email|ban_email) = \'(.*)\'#ise', "\"\\1LOWER(\\2) = '\" . strtolower('\\3') . \"'\"", $query); if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) |
|
From: Josh <jel...@us...> - 2005-02-28 01:01:11
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31243/install Added Files: update_to_20133.php Log Message: 2.0.12.3 --- NEW FILE: update_to_20133.php --- <?php /*************************************************************************** * update_to_20xy.php * ------------------- * begin : Friday, Nov. * copyright : (C) 2005 phpBB-php5 * email : n/a * * $Id: update_to_20133.php,v 1.1 2005/02/28 01:01:01 jelly_doughnut Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // This script is basically phpBB's update_to_20x.php // Except it doesn't have information to upgrade from ancient versions. function _sql($sql, &$errored, &$error_ary, $echo_dot = true) { global $db; if (!($result = $db->sql_query($sql))) { $errored = true; $error_ary['sql'][] = (is_array($sql)) ? $sql[$i] : $sql; $error_ary['error_code'][] = $db->sql_error(); } if ($echo_dot) { echo ". \n"; flush(); } return $result; } @set_time_limit(120); define('IN_PHPBB', 1); $phpbb_root_path = './../'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); if(!isset($dbms)) { die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update."); } include($phpbb_root_path . 'includes/constants.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include($phpbb_root_path . 'includes/functions_search.'.$phpEx); include($phpbb_root_path . 'includes/db.'.$phpEx); // // // $updates_to_version = ".0.13"; $update_php5mod_version = ".0.13.3"; // // // ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;"> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"> <!-- font,th,td,p,body { font-family: "Courier New", courier; font-size: 11pt } a:link,a:active,a:visited { color : #006699; } a:hover { text-decoration: underline; color : #DD6900;} hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} .maintitle,h1,h2 {font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; text-decoration: none; line-height : 120%; color : #000000;} .ok {color:green} /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ @import url("../templates/subSilver/formIE.css"); --> </style> </head> <body bgcolor="#FFFFFF" text="#000000" link="#006699" vlink="#5584AA"> <table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> <td align="center" width="100%" valign="middle"><span class="maintitle">Updating to latest stable release</span></td> </tr> </table></td> </tr> </table> <br clear="all" /> <h2>Information</h2> <?php echo '<p>Database type :: <b>' . SQL_LAYER . '</b><br />'; $sql = "SELECT config_value FROM " . CONFIG_TABLE . " WHERE config_name = 'version'"; if (!($result = $db->sql_query($sql))) { die("Couldn't obtain version info"); } $row = $db->sql_fetchrow($result); $sql = array(); echo 'Previous version :: <b>2' . $row['config_value'] . '</b><br />'; echo 'Updated version :: <b>2' . $updates_to_version . '</b></p>' ."\n"; echo "<h2>Updating database schema</h2>\n"; echo "<p>Progress :: <b>"; flush(); // // Data updates // unset($sql); $error_ary = array(); $errored = false; echo "<h2>Updating data</h2>\n"; echo "<p>Progress :: <b>"; flush(); echo " No updates where required</b></p>\n"; echo "<h2>Updating version and optimizing tables</h2>\n"; echo "<p>Progress :: <b>"; flush(); // update the version $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$updates_to_version' WHERE config_name = 'version'"; _sql($sql, $errored, $error_ary); $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$update_php5mod_version' WHERE config_name = 'version5'"; _sql($sql, $errored, $error_ary); // Optimize/vacuum analyze the tables where appropriate // this should be done for each version in future along with // the version number update switch (SQL_LAYER) { case 'mysql': case 'mysql4': $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; _sql($sql, $errored, $error_ary); break; case 'postgresql': _sql("VACUUM ANALYZE", $errored, $error_ary); break; } echo "</b> <b class=\"ok\">Done</b><br />Result :: \n"; if ($errored) { echo " <b>Some queries failed, the statements and errors are listing below</b>\n<ul>"; for ($i = 0; $i < count($error_ary['sql']); $i++) { echo "<li>Error :: <b>" . $error_ary['error_code'][$i]['message'] . "</b><br />"; echo "SQL :: <b>" . $error_ary['sql'][$i] . "</b><br /><br /></li>"; } echo "</ul>\n<p>This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See <a href=\"docs\README.html\">README</a> for details on how to obtain advice.</p>\n"; } else { echo "<b>No errors</b>\n"; } echo "<h2>Update completed</h2>\n"; echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"../admin/\">Administration Panel</a> and check the General Configuration of the board. If you updated from versions prior to RC-3 you <b>must</b> update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n"; ?> <br clear="all" /> </body> </html> |
|
From: Josh <jel...@us...> - 2005-02-28 00:58:19
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30205 Modified Files: viewtopic.php Log Message: 2.0.12.3 Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** viewtopic.php 22 Feb 2005 01:21:03 -0000 1.5 --- viewtopic.php 28 Feb 2005 00:58:11 -0000 1.6 *************** *** 1108,1113 **** // This was shamelessly 'borrowed' from volker at multiartstudio dot de // via php.net's annotated manual ! $message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $highlight_match . ")\b#i', '<span style=\"color:#" . $theme['fontcolor3'] . "\"><b>\\\\1</b></span>', '\\0')", '>' . $message . '<'), 1, -1)); ! } // --- 1108,1112 ---- // This was shamelessly 'borrowed' from volker at multiartstudio dot de // via php.net's annotated manual ! $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace('#\b(" . $highlight_match . ")\b#i', '<span style=\"color:#" . $theme['fontcolor3'] . "\"><b>\\\\1</b></span>', '\\0')", '>' . $message . '<'), 1, -1)); } // |
|
From: Josh <jel...@us...> - 2005-02-28 00:58:19
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30205/includes Modified Files: sessions.php Log Message: 2.0.12.3 Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sessions.php 30 Jul 2004 20:11:45 -0000 1.3 --- sessions.php 28 Feb 2005 00:58:11 -0000 1.4 *************** *** 80,84 **** { // We have to login automagically ! if( $sessiondata['autologinid'] == $auto_login_key ) { // autologinid matches password --- 80,84 ---- { // We have to login automagically ! if( $sessiondata['autologinid'] === $auto_login_key ) { // autologinid matches password |
|
From: Josh <jel...@us...> - 2005-02-22 21:05:47
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20999/install/schemas Modified Files: mssql_basic.sql mysql_basic.sql postgres_basic.sql Log Message: 2.0.12.3 Index: mysql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mysql_basic.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_basic.sql 20 Nov 2004 01:01:11 -0000 1.3 --- mysql_basic.sql 22 Feb 2005 21:05:09 -0000 1.4 *************** *** 63,68 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.11'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.11.2'); --- 63,68 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); Index: mssql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mssql_basic.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mssql_basic.sql 20 Nov 2004 01:01:11 -0000 1.3 --- mssql_basic.sql 22 Feb 2005 21:05:08 -0000 1.4 *************** *** 70,75 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.11'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.11.2'); /* --- 70,75 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); /* Index: postgres_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/postgres_basic.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** postgres_basic.sql 20 Nov 2004 01:01:11 -0000 1.3 --- postgres_basic.sql 22 Feb 2005 21:05:10 -0000 1.4 *************** *** 64,69 **** INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.11'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.11.2'); -- Categories --- 64,69 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.12'); ! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.12.3'); -- Categories |
|
From: Josh <jel...@us...> - 2005-02-22 01:32:12
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19434/install Added Files: update_to_20123.php Log Message: 2.0.12.3 --- NEW FILE: update_to_20123.php --- <?php /*************************************************************************** * update_to_20xy.php * ------------------- * begin : Friday, Nov. * copyright : (C) 2005 phpBB-php5 * email : n/a * * $Id: update_to_20123.php,v 1.1 2005/02/22 01:32:02 jelly_doughnut Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // This script is basically phpBB's update_to_20x.php // Except it doesn't have information to upgrade from ancient versions. function _sql($sql, &$errored, &$error_ary, $echo_dot = true) { global $db; if (!($result = $db->sql_query($sql))) { $errored = true; $error_ary['sql'][] = (is_array($sql)) ? $sql[$i] : $sql; $error_ary['error_code'][] = $db->sql_error(); } if ($echo_dot) { echo ". \n"; flush(); } return $result; } @set_time_limit(120); define('IN_PHPBB', 1); $phpbb_root_path = './../'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); if(!isset($dbms)) { die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update."); } include($phpbb_root_path . 'includes/constants.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include($phpbb_root_path . 'includes/functions_search.'.$phpEx); include($phpbb_root_path . 'includes/db.'.$phpEx); // // // $updates_to_version = ".0.12"; $update_php5mod_version = ".0.12.3"; // // // ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;"> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"> <!-- font,th,td,p,body { font-family: "Courier New", courier; font-size: 11pt } a:link,a:active,a:visited { color : #006699; } a:hover { text-decoration: underline; color : #DD6900;} hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} .maintitle,h1,h2 {font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; text-decoration: none; line-height : 120%; color : #000000;} .ok {color:green} /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ @import url("../templates/subSilver/formIE.css"); --> </style> </head> <body bgcolor="#FFFFFF" text="#000000" link="#006699" vlink="#5584AA"> <table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> <td align="center" width="100%" valign="middle"><span class="maintitle">Updating to latest stable release</span></td> </tr> </table></td> </tr> </table> <br clear="all" /> <h2>Information</h2> <?php echo '<p>Database type :: <b>' . SQL_LAYER . '</b><br />'; $sql = "SELECT config_value FROM " . CONFIG_TABLE . " WHERE config_name = 'version'"; if (!($result = $db->sql_query($sql))) { die("Couldn't obtain version info"); } $row = $db->sql_fetchrow($result); $sql = array(); echo 'Previous version :: <b>2' . $row['config_value'] . '</b><br />'; echo 'Updated version :: <b>2' . $updates_to_version . '</b></p>' ."\n"; echo "<h2>Updating database schema</h2>\n"; echo "<p>Progress :: <b>"; flush(); // // Data updates // unset($sql); $error_ary = array(); $errored = false; echo "<h2>Updating data</h2>\n"; echo "<p>Progress :: <b>"; flush(); echo " No updates where required</b></p>\n"; echo "<h2>Updating version and optimizing tables</h2>\n"; echo "<p>Progress :: <b>"; flush(); // update the version $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$updates_to_version' WHERE config_name = 'version'"; _sql($sql, $errored, $error_ary); $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$update_php5mod_version' WHERE config_name = 'version5'"; _sql($sql, $errored, $error_ary); // Optimize/vacuum analyze the tables where appropriate // this should be done for each version in future along with // the version number update switch (SQL_LAYER) { case 'mysql': case 'mysql4': $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; _sql($sql, $errored, $error_ary); break; case 'postgresql': _sql("VACUUM ANALYZE", $errored, $error_ary); break; } echo "</b> <b class=\"ok\">Done</b><br />Result :: \n"; if ($errored) { echo " <b>Some queries failed, the statements and errors are listing below</b>\n<ul>"; for ($i = 0; $i < count($error_ary['sql']); $i++) { echo "<li>Error :: <b>" . $error_ary['error_code'][$i]['message'] . "</b><br />"; echo "SQL :: <b>" . $error_ary['sql'][$i] . "</b><br /><br /></li>"; } echo "</ul>\n<p>This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See <a href=\"docs\README.html\">README</a> for details on how to obtain advice.</p>\n"; } else { echo "<b>No errors</b>\n"; } echo "<h2>Update completed</h2>\n"; echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"../admin/\">Administration Panel</a> and check the General Configuration of the board. If you updated from versions prior to RC-3 you <b>must</b> update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n"; ?> <br clear="all" /> </body> </html> |
|
From: Josh <jel...@us...> - 2005-02-22 01:21:19
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972/admin Modified Files: admin_db_utilities.php index.php Log Message: Updating to phpBB 2.0.12. Release within 24 hours hopefully :) Index: admin_db_utilities.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_db_utilities.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_db_utilities.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_db_utilities.php 22 Feb 2005 01:21:01 -0000 1.3 *************** *** 694,698 **** } ! $tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words'); $additional_tables = (isset($_POST['additional_tables'])) ? $_POST['additional_tables'] : ( (isset($_GET['additional_tables'])) ? $_GET['additional_tables'] : "" ); --- 694,698 ---- } ! $tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words', 'confirm'); $additional_tables = (isset($_POST['additional_tables'])) ? $_POST['additional_tables'] : ( (isset($_GET['additional_tables'])) ? $_GET['additional_tables'] : "" ); Index: index.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 30 Jul 2004 02:12:37 -0000 1.2 --- index.php 22 Feb 2005 01:21:01 -0000 1.3 *************** *** 561,564 **** --- 561,630 ---- } + // Check for new version + // phpBB-php5 should do something else I guess... + $current_version = explode('.', '2' . $board_config['version']); + $minor_revision = (int) $current_version[2]; + + $errno = 0; + $errstr = $version_info = ''; + + if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr)) + { + @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); + @fputs($fsock, "HOST: www.phpbb.com\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + $get_info = false; + while (!@feof($fsock)) + { + if ($get_info) + { + $version_info .= @fread($fsock, 1024); + } + else + { + if (@fgets($fsock, 1024) == "\r\n") + { + $get_info = true; + } + } + } + @fclose($fsock); + + $version_info = explode("\n", $version_info); + $latest_head_revision = (int) $version_info[0]; + $latest_minor_revision = (int) $version_info[2]; + $latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2]; + + if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision) + { + $version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; + } + else + { + $version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; + $version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; + } + } + else + { + if ($errstr) + { + $version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>'; + } + else + { + $version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>'; + } + } + + $version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>'; + + + $template->assign_vars(array( + 'VERSION_INFO' => $version_info, + 'L_VERSION_INFORMATION' => $lang['Version_information']) + ); + $template->pparse("body"); |
|
From: Josh <jel...@us...> - 2005-02-22 01:21:15
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972 Modified Files: viewtopic.php Log Message: Updating to phpBB 2.0.12. Release within 24 hours hopefully :) Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** viewtopic.php 21 Dec 2004 03:06:12 -0000 1.4 --- viewtopic.php 22 Feb 2005 01:21:03 -0000 1.5 *************** *** 496,499 **** --- 496,500 ---- $highlight = urlencode($_GET['highlight']); + $highlight_match = rtrim($highlight_match, "\\"); } |
|
From: Josh <jel...@us...> - 2005-02-22 01:21:15
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972/templates/subSilver Modified Files: overall_footer.tpl simple_footer.tpl Log Message: Updating to phpBB 2.0.12. Release within 24 hours hopefully :) Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver/overall_footer.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** overall_footer.tpl 20 Nov 2004 01:01:13 -0000 1.5 --- overall_footer.tpl 22 Feb 2005 01:21:03 -0000 1.6 *************** *** 11,15 **** The phpBB Group : 2002 // --> ! Powered by <a href="http://phpbb-php5mod.sourceforge.net/" target="_phpbb" class="copyright">phpBB-php5 {PHPBB5_VERSION}</a> <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">(Based on phpBB</a> {PHPBB_VERSION} )© 2001, 2002 phpBB Group<br />{TRANSLATION_INFO}</span></div> </td> </tr> --- 11,15 ---- The phpBB Group : 2002 // --> ! Powered by <a href="http://phpbb-php5mod.sourceforge.net/" target="_phpbb" class="copyright">phpBB-php5 </a> <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">(Based on phpBB)</a> © 2001, 2002 phpBB Group<br />{TRANSLATION_INFO}</span></div> </td> </tr> Index: simple_footer.tpl =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver/simple_footer.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** simple_footer.tpl 29 Jul 2004 22:36:22 -0000 1.1 --- simple_footer.tpl 22 Feb 2005 01:21:03 -0000 1.2 *************** *** 11,15 **** The phpBB Group : 2002 // --> ! Powered by <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001,2002 phpBB Group</span></div> </td> </tr> --- 11,15 ---- The phpBB Group : 2002 // --> ! Powered by <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> © 2001,2002 phpBB Group</span></div> </td> </tr> |
|
From: Josh <jel...@us...> - 2005-02-22 01:21:15
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972/includes Modified Files: functions.php page_tail.php template.php usercp_avatar.php usercp_register.php Log Message: Updating to phpBB 2.0.12. Release within 24 hours hopefully :) Index: template.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/template.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** template.php 29 Jul 2004 22:36:20 -0000 1.1 --- template.php 22 Feb 2005 01:21:02 -0000 1.2 *************** *** 231,235 **** if (substr($filename, 0, 1) != '/') { ! $filename = phpbb_realpath($this->root . '/' . $filename); } --- 231,235 ---- if (substr($filename, 0, 1) != '/') { ! $filename = ($rp_filename = phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; } Index: usercp_register.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** usercp_register.php 20 Nov 2004 01:01:11 -0000 1.3 --- usercp_register.php 22 Feb 2005 01:21:02 -0000 1.4 *************** *** 457,461 **** if ( !empty($user_avatar_upload) ) { ! $avatar_mode = ( !empty($user_avatar_name) ) ? 'local' : 'remote'; $avatar_sql = user_avatar_upload($mode, $avatar_mode, $userdata['user_avatar'], $userdata['user_avatar_type'], $error, $error_msg, $user_avatar_upload, $user_avatar_name, $user_avatar_size, $user_avatar_filetype); } --- 457,461 ---- if ( !empty($user_avatar_upload) ) { ! $avatar_mode = (empty($user_avatar_name)) ? 'remote' : 'local'; $avatar_sql = user_avatar_upload($mode, $avatar_mode, $userdata['user_avatar'], $userdata['user_avatar_type'], $error, $error_msg, $user_avatar_upload, $user_avatar_name, $user_avatar_size, $user_avatar_filetype); } Index: functions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions.php 20 Nov 2004 01:01:11 -0000 1.2 --- functions.php 22 Feb 2005 01:21:02 -0000 1.3 *************** *** 78,84 **** function phpbb_clean_username($username) { ! $username = htmlspecialchars(rtrim(trim($username), "\\")); ! $username = substr(str_replace("\\'", "'", $username), 0, 25); ! $username = str_replace("'", "\\'", $username); return $username; --- 78,84 ---- function phpbb_clean_username($username) { ! $username = substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25); ! $username = rtrim($username, "\\"); ! $username = str_replace("'", "\'", $username); return $username; *************** *** 580,584 **** if ( $err_line != '' && $err_file != '' ) { ! $debug_text .= '</br /><br />Line : ' . $err_line . '<br />File : ' . $err_file; } } --- 580,584 ---- if ( $err_line != '' && $err_file != '' ) { ! $debug_text .= '</br /><br />Line : ' . $err_line . '<br />File : ' . basename($err_file); } } Index: page_tail.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_tail.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_tail.php 30 Jul 2004 21:15:33 -0000 1.2 --- page_tail.php 22 Feb 2005 01:21:02 -0000 1.3 *************** *** 36,41 **** $template->assign_vars(array( ! 'PHPBB_VERSION' => '2' . $board_config['version'], ! 'PHPBB5_VERSION' => '2' . $board_config['version5'], 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 'ADMIN_LINK' => $admin_link) --- 36,41 ---- $template->assign_vars(array( ! //'PHPBB_VERSION' => '2' . $board_config['version'], ! //'PHPBB5_VERSION' => '2' . $board_config['version5'], 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 'ADMIN_LINK' => $admin_link) Index: usercp_avatar.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_avatar.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_avatar.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_avatar.php 22 Feb 2005 01:21:02 -0000 1.2 *************** *** 52,55 **** --- 52,57 ---- global $board_config, $userdata; + $avatar_file = basename($avatar_file); + if ( $avatar_type == USER_AVATAR_UPLOAD && $avatar_file != '' ) { *************** *** 66,69 **** --- 68,77 ---- { global $board_config; + + $avatar_filename = str_replace(array('../', '..\\', './', '.\\'), '', $avatar_filename); + if ($avatar_filename{0} == '/' || $avatar_filename{0} == "\\") + { + return ''; + } if ( file_exists(@phpbb_realpath($board_config['avatar_gallery_path'] . '/' . $avatar_filename)) && ($mode == 'editprofile') ) { *************** *** 228,231 **** --- 236,244 ---- } + if (!is_uploaded_file($avatar_filename)) + { + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + @chmod('./' . $board_config['avatar_path'] . "/$new_filename", 0777); |
