phpbb-php5mod-cvs-checkins Mailing List for phpBB-php5 MOD (Page 5)
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: Christian H. <fli...@us...> - 2004-09-24 02:28:12
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12593 Modified Files: db.php Log Message: Well, Here we go, db.php has also been updated! This should be all that is needed for it to work with php5... enjoy :) NOTE: I didn't test this one :-P Index: db.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/db.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db.php 29 Jul 2004 22:36:19 -0000 1.1 --- db.php 24 Sep 2004 02:28:03 -0000 1.2 *************** *** 35,38 **** --- 35,43 ---- include($phpbb_root_path . 'db/mysql4.'.$phpEx); break; + + //for MySQLi support --phpbb2_fan + case 'mysqli': + include($phpbb_root_path . 'db/mysqli.'.$phpEx); + break; case 'postgres': *************** *** 64,66 **** } ! ?> \ No newline at end of file --- 69,71 ---- } ! ?> |
|
From: Christian H. <fli...@us...> - 2004-09-24 02:20:27
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11598 Modified Files: install.php Log Message: Hrm... install.php has been updated to work with mysqli now, It has been *somewhat* tested. Note however, that the required mysqli.php file is not yet included in the commit, so make sure to note use it yet! It's just here so that the other devs can also work on it Index: install.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.php 30 Jul 2004 02:12:38 -0000 1.2 --- install.php 24 Sep 2004 02:20:12 -0000 1.3 *************** *** 19,23 **** * ***************************************************************************/ ! // --------- // FUNCTIONS --- 19,23 ---- * ***************************************************************************/ ! //---------------- // --------- // FUNCTIONS *************** *** 322,325 **** --- 322,333 ---- 'DELIM_BASIC' => ';', 'COMMENTS' => 'remove_remarks' + ), + //this was added for support of MySQLI :) -phpbb2_fan + 'mysql4' => array( + 'LABEL' => 'MySQL 4.x /w MySQLi', + 'SCHEMA' => 'mysql', + 'DELIM' => ';', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_remarks' ), 'postgres' => array( *************** *** 769,772 **** --- 777,782 ---- case 'mysql': + //added for MySQLi support -phpbb2_fan + case 'mysqli': case 'mysql4': $check_exts = 'mysql'; |
|
From: Josh <jel...@us...> - 2004-09-11 19:59:32
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17570/admin Modified Files: admin_ug_auth.php Log Message: Fixed permissions bug. Finally! (and to think it required changing 2 lines and about 7 characters, although more are changed here) Index: admin_ug_auth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_ug_auth.php 30 Jul 2004 20:12:43 -0000 1.3 --- admin_ug_auth.php 11 Sep 2004 19:59:23 -0000 1.4 *************** *** 233,244 **** $change_mod_list = ( isset($_POST['moderator']) ) ? $_POST['moderator'] : false; ! if ( empty($adv) ) { ! $change_acl_list = ( isset($_POST['private']) ) ? $_POST['private'] : false; } else { - $change_acl_list = array(); for($j = 0; $j < count($forum_auth_fields); $j++) { --- 233,247 ---- $change_mod_list = ( isset($_POST['moderator']) ) ? $_POST['moderator'] : false; ! $change_acl_list = array(); ! if ( empty($adv) ) { ! while( list($forum_id, $value) = @each($_POST['private']) ) ! { ! $change_acl_list[$forum_id] = $value; ! } } else { for($j = 0; $j < count($forum_auth_fields); $j++) { *************** *** 314,322 **** $auth_field = $forum_auth_fields[$j]; ! if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) ) { if ( ( empty($auth_access[$forum_id]['auth_mod']) && ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) || ! ( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) || !empty($update_mod_status[$forum_id]) ) --- 317,325 ---- $auth_field = $forum_auth_fields[$j]; ! if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id]) ) { if ( ( empty($auth_access[$forum_id]['auth_mod']) && ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) || ! ( !isset($auth_access[$forum_id][$auth_field]) && empty($change_acl_list[$forum_id][$auth_field]) ) ) || !empty($update_mod_status[$forum_id]) ) *************** *** 948,950 **** include('./page_footer_admin.'.$phpEx); ! ?> \ No newline at end of file --- 951,953 ---- include('./page_footer_admin.'.$phpEx); ! ?> |
|
From: geocator <geo...@us...> - 2004-07-31 06:07:27
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30561/docs Modified Files: AUTHORS CHANGELOG.html Log Message: Updates to changelog and authors for release Index: CHANGELOG.html =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/docs/CHANGELOG.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CHANGELOG.html 29 Jul 2004 22:36:00 -0000 1.1 --- CHANGELOG.html 31 Jul 2004 06:07:15 -0000 1.2 *************** *** 25,29 **** <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="phpBB 2 : Creating Communities" vspace="1" /></a></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">phpBB 2.0.10 CHANGELOG</span></td> </tr> </table> --- 25,29 ---- <tr> <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="phpBB 2 : Creating Communities" vspace="1" /></a></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">phpBB-php5 2.0.10.1 CHANGELOG</span></td> </tr> </table> *************** *** 33,36 **** --- 33,37 ---- <li><a href="#changelog">Changelog</a></li> <ol type="i"> + <li><a href="#2010">Changes since 2.0.10</a></li> <li><a href="#209">Changes since 2.0.9</a></li> <li><a href="#208">Changes since 2.0.8</a></li> *************** *** 56,59 **** --- 57,68 ---- <p>This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.</p> + <a name="2010"></a><h3 class="h3">l.i. Changes since 2.0.10</h3> + + <ul> + <li>Changed all global variables to not rely on register_long_arrays</li> + <li>Fixed moderator permissions error</li> + <li>Renamed postgeSQL functions</li> + </ul> + <a name="209"></a><h3 class="h3">l.i. Changes since 2.0.9</h3> Index: AUTHORS =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/docs/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AUTHORS 29 Jul 2004 22:36:00 -0000 1.1 --- AUTHORS 31 Jul 2004 06:07:15 -0000 1.2 *************** *** 1 **** --- 1,3 ---- Please see: http://www.phpbb.com/about.php for a list of all the people involved in phpBB. + + For info about the conversion for php 5 please see http://phpbb-php5mod.sourceforge.net. |
|
From: geocator <geo...@us...> - 2004-07-31 00:14:54
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24972/templates/subSilver Modified Files: overall_footer.tpl Log Message: Yet another change to the powered by line. Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver/overall_footer.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_footer.tpl 30 Jul 2004 21:15:33 -0000 1.3 --- overall_footer.tpl 31 Jul 2004 00:14:41 -0000 1.4 *************** *** 11,15 **** The phpBB Group : 2002 // --> ! Powered by <a href="http://phpbb-php5mod.sourceforge.net/" target="_phpbb" class="copyright">php5BB 2.{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 2.{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> |
|
From: geocator <geo...@us...> - 2004-07-30 21:15:42
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29605/templates/subSilver Modified Files: overall_footer.tpl Log Message: Added our version number, also changed footer links to point to us and phpbb Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver/overall_footer.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_footer.tpl 30 Jul 2004 19:19:22 -0000 1.2 --- overall_footer.tpl 30 Jul 2004 21:15:33 -0000 1.3 *************** *** 11,15 **** The phpBB Group : 2002 // --> ! Powered by <a href="http://phpbb-php5mod.sourceforge.net/" target="_phpbb" class="copyright">php5BB (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">php5BB 2.{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> |
|
From: geocator <geo...@us...> - 2004-07-30 21:15:41
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29605/install/schemas Modified Files: mssql_basic.sql mysql_basic.sql postgres_basic.sql Log Message: Added our version number, also changed footer links to point to us and phpbb Index: mysql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mysql_basic.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mysql_basic.sql 29 Jul 2004 22:36:20 -0000 1.1 --- mysql_basic.sql 30 Jul 2004 21:15:33 -0000 1.2 *************** *** 64,67 **** --- 64,68 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.10'); + INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.10.1'); Index: mssql_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/mssql_basic.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mssql_basic.sql 29 Jul 2004 22:36:20 -0000 1.1 --- mssql_basic.sql 30 Jul 2004 21:15:33 -0000 1.2 *************** *** 71,74 **** --- 71,75 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.10'); + INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.10.1'); /* Index: postgres_basic.sql =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/schemas/postgres_basic.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** postgres_basic.sql 29 Jul 2004 22:36:20 -0000 1.1 --- postgres_basic.sql 30 Jul 2004 21:15:33 -0000 1.2 *************** *** 65,68 **** --- 65,69 ---- INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.10'); + INSERT INTO phpbb_config (config_name, config_value) VALUES ('version5', '.0.10.1'); -- Categories |
|
From: geocator <geo...@us...> - 2004-07-30 21:15:41
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29605/includes Modified Files: page_tail.php Log Message: Added our version number, also changed footer links to point to us and phpbb Index: page_tail.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_tail.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_tail.php 29 Jul 2004 22:36:19 -0000 1.1 --- page_tail.php 30 Jul 2004 21:15:33 -0000 1.2 *************** *** 37,40 **** --- 37,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) |
|
From: Josh <jel...@us...> - 2004-07-30 20:12:52
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17924/db Modified Files: postgres7.php Log Message: Fixed assignment of moderators. Fixed postgre support Index: postgres7.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/postgres7.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** postgres7.php 29 Jul 2004 22:36:00 -0000 1.1 --- postgres7.php 30 Jul 2004 20:12:43 -0000 1.2 *************** *** 94,103 **** if( $this->in_transaction ) { ! @pg_exec($this->db_connect_id, "COMMIT"); } if( $this->query_result ) { ! @pg_freeresult($this->query_result); } --- 94,103 ---- if( $this->in_transaction ) { ! @pg_query($this->db_connect_id, "COMMIT"); } if( $this->query_result ) { ! @pg_free_result($this->query_result); } *************** *** 129,133 **** $this->in_transaction = TRUE; ! if( !@pg_exec($this->db_connect_id, "BEGIN") ) { return false; --- 129,133 ---- $this->in_transaction = TRUE; ! if( !@pg_query($this->db_connect_id, "BEGIN") ) { return false; *************** *** 135,139 **** } ! $this->query_result = @pg_exec($this->db_connect_id, $query); if( $this->query_result ) { --- 135,139 ---- } ! $this->query_result = @pg_query($this->db_connect_id, $query); if( $this->query_result ) { *************** *** 142,148 **** $this->in_transaction = FALSE; ! if( !@pg_exec($this->db_connect_id, "COMMIT") ) { ! @pg_exec($this->db_connect_id, "ROLLBACK"); return false; } --- 142,148 ---- $this->in_transaction = FALSE; ! if( !@pg_query($this->db_connect_id, "COMMIT") ) { ! @pg_query($this->db_connect_id, "ROLLBACK"); return false; } *************** *** 161,165 **** if( $this->in_transaction ) { ! @pg_exec($this->db_connect_id, "ROLLBACK"); } $this->in_transaction = FALSE; --- 161,165 ---- if( $this->in_transaction ) { ! @pg_query($this->db_connect_id, "ROLLBACK"); } $this->in_transaction = FALSE; *************** *** 174,180 **** $this->in_transaction = FALSE; ! if( !@pg_exec($this->db_connect_id, "COMMIT") ) { ! @pg_exec($this->db_connect_id, "ROLLBACK"); return false; } --- 174,180 ---- $this->in_transaction = FALSE; ! if( !@pg_query($this->db_connect_id, "COMMIT") ) { ! @pg_query($this->db_connect_id, "ROLLBACK"); return false; } *************** *** 205,209 **** } ! return ( $query_id ) ? @pg_numfields($query_id) : false; } --- 205,209 ---- } ! return ( $query_id ) ? @pg_num_fields($query_id) : false; } *************** *** 215,219 **** } ! return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false; } --- 215,219 ---- } ! return ( $query_id ) ? @pg_field_name($query_id, $offset) : false; } *************** *** 225,229 **** } ! return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false; } --- 225,229 ---- } ! return ( $query_id ) ? @pg_field_type($query_id, $offset) : false; } *************** *** 343,347 **** { $query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value"; ! $temp_q_id = @pg_exec($this->db_connect_id, $query); if( !$temp_q_id ) { --- 343,347 ---- { $query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value"; ! $temp_q_id = @pg_query($this->db_connect_id, $query); if( !$temp_q_id ) { *************** *** 365,369 **** } ! return ( $query_id ) ? @pg_cmdtuples($query_id) : false; } --- 365,369 ---- } ! return ( $query_id ) ? @pg_affected_rows($query_id) : false; } *************** *** 375,379 **** } ! return ( $query_id ) ? @pg_freeresult($query_id) : false; } --- 375,379 ---- } ! return ( $query_id ) ? @pg_free_result($query_id) : false; } *************** *** 385,389 **** } ! $result['message'] = @pg_errormessage($this->db_connect_id); $result['code'] = -1; --- 385,389 ---- } ! $result['message'] = @pg_last_error($this->db_connect_id); $result['code'] = -1; |
|
From: Josh <jel...@us...> - 2004-07-30 20:12:52
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17924/admin Modified Files: admin_ug_auth.php Log Message: Fixed assignment of moderators. Fixed postgre support Index: admin_ug_auth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_ug_auth.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_ug_auth.php 30 Jul 2004 20:12:43 -0000 1.3 *************** *** 284,287 **** --- 284,288 ---- $update_mod_status = array(); + for($i = 0; $i < count($forum_access); $i++) { *************** *** 289,297 **** if ( ! ( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) || ! ( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) ) ) { ! $update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod']; if ( !$update_mod_status[$forum_id] ) --- 290,298 ---- if ( ! ( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id] != $auth_access[$forum_id]['auth_mod'] ) || ! ( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]) ) ) { ! $update_mod_status[$forum_id] = $change_mod_list[$forum_id]; if ( !$update_mod_status[$forum_id] ) *************** *** 363,366 **** --- 364,368 ---- while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) ) { + $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type; $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value; |
|
From: Josh <jel...@us...> - 2004-07-30 20:11:54
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17777/includes Modified Files: sessions.php Log Message: More legacy code removed Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sessions.php 30 Jul 2004 02:12:38 -0000 1.2 --- sessions.php 30 Jul 2004 20:11:45 -0000 1.3 *************** *** 28,32 **** { global $db, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; --- 28,32 ---- { global $db, $board_config; ! global $SID; $cookiename = $board_config['cookie_name']; *************** *** 201,205 **** { global $db, $lang, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; --- 201,205 ---- { global $db, $lang, $board_config; ! global $SID; $cookiename = $board_config['cookie_name']; *************** *** 335,339 **** { global $db, $lang, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; --- 335,339 ---- { global $db, $lang, $board_config; ! global $SID; $cookiename = $board_config['cookie_name']; |
|
From: Josh <jel...@us...> - 2004-07-30 20:11:54
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17777 Modified Files: common.php Log Message: More legacy code removed Index: common.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common.php 30 Jul 2004 02:12:38 -0000 1.2 --- common.php 30 Jul 2004 20:11:45 -0000 1.3 *************** *** 44,60 **** if (@$ini_val('register_globals') == '1' || strtolower(@$ini_val('register_globals')) == 'on') { - $var_prefix = 'HTTP'; - $var_suffix = '_VARS'; - $test = array('_GET', '_POST', '_SERVER', '_COOKIE', '_ENV'); foreach ($test as $var) { - if (is_array(${$var_prefix . $var . $var_suffix})) - { - unset_vars(${$var_prefix . $var . $var_suffix}); - @reset(${$var_prefix . $var . $var_suffix}); - } - if (is_array(${$var})) { --- 44,51 ---- *************** *** 69,78 **** @reset(${'_FILES'}); } - - if (is_array(${'HTTP_POST_FILES'})) - { - unset_vars(${'HTTP_POST_FILES'}); - @reset(${'HTTP_POST_FILES'}); - } } --- 60,63 ---- |
|
From: geocator <geo...@us...> - 2004-07-30 19:19:31
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8884/templates/subSilver Modified Files: overall_footer.tpl Log Message: Changed powerd by line to reflect MOD Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/templates/subSilver/overall_footer.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** overall_footer.tpl 29 Jul 2004 22:36:22 -0000 1.1 --- overall_footer.tpl 30 Jul 2004 19:19:22 -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<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">php5BB (Based on phpBB</a> {PHPBB_VERSION} )© 2001, 2002 phpBB Group<br />{TRANSLATION_INFO}</span></div> </td> </tr> |
|
From: geocator <geo...@us...> - 2004-07-30 02:12:48
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115 Modified Files: common.php faq.php groupcp.php index.php login.php memberlist.php modcp.php posting.php privmsg.php profile.php search.php viewforum.php viewtopic.php Log Message: Say goodbye long array names. Say hello superglobals. Removed code in common.php to try to rename the variables at runtime. No longer needed since we are renaming them. Index: login.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/login.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** login.php 29 Jul 2004 22:30:30 -0000 1.1 --- login.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 42,48 **** // session id check ! if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid'])) { ! $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid']; } else --- 42,48 ---- // session id check ! if (!empty($_POST['sid']) || !empty($_GET['sid'])) { ! $sid = (!empty($_POST['sid'])) ? $_POST['sid'] : $_GET['sid']; } else *************** *** 51,62 **** } ! if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] ) { ! $username = isset($HTTP_POST_VARS['username']) ? trim(htmlspecialchars($HTTP_POST_VARS['username'])) : ''; $username = substr(str_replace("\\'", "'", $username), 0, 25); $username = str_replace("'", "\\'", $username); ! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; $sql = "SELECT user_id, username, user_password, user_active, user_level --- 51,62 ---- } ! 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($_POST['username']) ? trim(htmlspecialchars($_POST['username'])) : ''; $username = substr(str_replace("\\'", "'", $username), 0, 25); $username = str_replace("'", "\\'", $username); ! $password = isset($_POST['password']) ? $_POST['password'] : ''; $sql = "SELECT user_id, username, user_password, user_active, user_level *************** *** 78,82 **** if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); --- 78,82 ---- if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = ( isset($_POST['autologin']) ) ? TRUE : 0; $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); *************** *** 84,88 **** if( $session_id ) { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; redirect(append_sid($url, true)); } --- 84,88 ---- if( $session_id ) { ! $url = ( !empty($_POST['redirect']) ) ? str_replace('&', '&', htmlspecialchars($_POST['redirect'])) : "index.$phpEx"; redirect(append_sid($url, true)); } *************** *** 94,98 **** else { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; $redirect = str_replace('?', '&', $redirect); --- 94,98 ---- else { ! $redirect = ( !empty($_POST['redirect']) ) ? str_replace('&', '&', htmlspecialchars($_POST['redirect'])) : ''; $redirect = str_replace('?', '&', $redirect); *************** *** 114,118 **** else { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; $redirect = str_replace("?", "&", $redirect); --- 114,118 ---- else { ! $redirect = ( !empty($_POST['redirect']) ) ? str_replace('&', '&', htmlspecialchars($_POST['redirect'])) : ""; $redirect = str_replace("?", "&", $redirect); *************** *** 131,135 **** } } ! else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) { if( $userdata['session_logged_in'] ) --- 131,135 ---- } } ! else if( ( isset($_GET['logout']) || isset($_POST['logout']) ) && $userdata['session_logged_in'] ) { if( $userdata['session_logged_in'] ) *************** *** 138,144 **** } ! if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { ! $url = (!empty($HTTP_POST_VARS['redirect'])) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : htmlspecialchars($HTTP_GET_VARS['redirect']); $url = str_replace('&', '&', $url); redirect(append_sid($url, true)); --- 138,144 ---- } ! if (!empty($_POST['redirect']) || !empty($_GET['redirect'])) { ! $url = (!empty($_POST['redirect'])) ? htmlspecialchars($_POST['redirect']) : htmlspecialchars($_GET['redirect']); $url = str_replace('&', '&', $url); redirect(append_sid($url, true)); *************** *** 151,155 **** else { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; redirect(append_sid($url, true)); } --- 151,155 ---- else { ! $url = ( !empty($_POST['redirect']) ) ? str_replace('&', '&', htmlspecialchars($_POST['redirect'])) : "index.$phpEx"; redirect(append_sid($url, true)); } *************** *** 170,176 **** ); ! if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) { ! $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; if( preg_match("/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si", $forward_to, $forward_matches) ) --- 170,176 ---- ); ! if( isset($_POST['redirect']) || isset($_GET['redirect']) ) { ! $forward_to = $_SERVER['QUERY_STRING']; if( preg_match("/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si", $forward_to, $forward_matches) ) Index: posting.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/posting.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** posting.php 29 Jul 2004 22:30:30 -0000 1.1 --- posting.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 34,40 **** while( list($var, $param) = @each($params) ) { ! if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) { ! $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? htmlspecialchars($HTTP_POST_VARS[$param]) : htmlspecialchars($HTTP_GET_VARS[$param]); } else --- 34,40 ---- while( list($var, $param) = @each($params) ) { ! if ( !empty($_POST[$param]) || !empty($_GET[$param]) ) { ! $$var = ( !empty($_POST[$param]) ) ? htmlspecialchars($_POST[$param]) : htmlspecialchars($_GET[$param]); } else *************** *** 44,55 **** } ! $confirm = isset($HTTP_POST_VARS['confirm']) ? true : false; $params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL); while( list($var, $param) = @each($params) ) { ! if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) { ! $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? intval($HTTP_POST_VARS[$param]) : intval($HTTP_GET_VARS[$param]); } else --- 44,55 ---- } ! $confirm = isset($_POST['confirm']) ? true : false; $params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL); while( list($var, $param) = @each($params) ) { ! if ( !empty($_POST[$param]) || !empty($_GET[$param]) ) { ! $$var = ( !empty($_POST[$param]) ) ? intval($_POST[$param]) : intval($_GET[$param]); } else *************** *** 64,68 **** // Set topic type // ! $topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL; // --- 64,68 ---- // Set topic type // ! $topic_type = ( !empty($_POST['topictype']) ) ? intval($_POST['topictype']) : POST_NORMAL; // *************** *** 96,100 **** // page, no point in continuing with any further checks // ! if ( isset($HTTP_POST_VARS['cancel']) ) { if ( $post_id ) --- 96,100 ---- // page, no point in continuing with any further checks // ! if ( isset($_POST['cancel']) ) { if ( $post_id ) *************** *** 363,367 **** else { ! $html_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_html']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_html'] : $userdata['user_allowhtml'] ); } --- 363,367 ---- else { ! $html_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_html']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_html'] : $userdata['user_allowhtml'] ); } *************** *** 372,376 **** else { ! $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_bbcode']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_bbcode'] : $userdata['user_allowbbcode'] ); } --- 372,376 ---- else { ! $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_bbcode']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_bbcode'] : $userdata['user_allowbbcode'] ); } *************** *** 381,390 **** else { ! $smilies_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_smilies']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_smilies'] : $userdata['user_allowsmile'] ); } if ( ($submit || $refresh) && $is_auth['auth_read']) { ! $notify_user = ( !empty($HTTP_POST_VARS['notify']) ) ? TRUE : 0; } else --- 381,390 ---- else { ! $smilies_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_smilies']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_smilies'] : $userdata['user_allowsmile'] ); } if ( ($submit || $refresh) && $is_auth['auth_read']) { ! $notify_user = ( !empty($_POST['notify']) ) ? TRUE : 0; } else *************** *** 410,414 **** } ! $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? 0 : $userdata['user_attachsig'] ); // -------------------- --- 410,414 ---- } ! $attach_sig = ( $submit || $refresh ) ? ( ( !empty($_POST['attach_sig']) ) ? TRUE : 0 ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? 0 : $userdata['user_attachsig'] ); // -------------------- *************** *** 454,460 **** // Vote in a poll // ! if ( !empty($HTTP_POST_VARS['vote_id']) ) { ! $vote_option_id = intval($HTTP_POST_VARS['vote_id']); $sql = "SELECT vd.vote_id --- 454,460 ---- // Vote in a poll // ! if ( !empty($_POST['vote_id']) ) { ! $vote_option_id = intval($_POST['vote_id']); $sql = "SELECT vd.vote_id *************** *** 538,547 **** case 'newtopic': case 'reply': ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? $HTTP_POST_VARS['username'] : ''; ! $subject = ( !empty($HTTP_POST_VARS['subject']) ) ? trim($HTTP_POST_VARS['subject']) : ''; ! $message = ( !empty($HTTP_POST_VARS['message']) ) ? $HTTP_POST_VARS['message'] : ''; ! $poll_title = ( isset($HTTP_POST_VARS['poll_title']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_title'] : ''; ! $poll_options = ( isset($HTTP_POST_VARS['poll_option_text']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_option_text'] : ''; ! $poll_length = ( isset($HTTP_POST_VARS['poll_length']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_length'] : ''; $bbcode_uid = ''; --- 538,547 ---- case 'newtopic': case 'reply': ! $username = ( !empty($_POST['username']) ) ? $_POST['username'] : ''; ! $subject = ( !empty($_POST['subject']) ) ? trim($_POST['subject']) : ''; ! $message = ( !empty($_POST['message']) ) ? $_POST['message'] : ''; ! $poll_title = ( isset($_POST['poll_title']) && $is_auth['auth_pollcreate'] ) ? $_POST['poll_title'] : ''; ! $poll_options = ( isset($_POST['poll_option_text']) && $is_auth['auth_pollcreate'] ) ? $_POST['poll_option_text'] : ''; ! $poll_length = ( isset($_POST['poll_length']) && $is_auth['auth_pollcreate'] ) ? $_POST['poll_length'] : ''; $bbcode_uid = ''; *************** *** 577,582 **** if ( $mode == 'newtopic' || $mode == 'reply' ) { ! $tracking_topics = ( !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); if ( count($tracking_topics) + count($tracking_forums) == 100 && empty($tracking_topics[$topic_id]) ) --- 577,582 ---- if ( $mode == 'newtopic' || $mode == 'reply' ) { ! $tracking_topics = ( !empty($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( !empty($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array(); if ( count($tracking_topics) + count($tracking_forums) == 100 && empty($tracking_topics[$topic_id]) ) *************** *** 598,616 **** } ! if( $refresh || isset($HTTP_POST_VARS['del_poll_option']) || $error_msg != '' ) { ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['username']))) : ''; ! $subject = ( !empty($HTTP_POST_VARS['subject']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['subject']))) : ''; ! $message = ( !empty($HTTP_POST_VARS['message']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['message']))) : ''; ! $poll_title = ( !empty($HTTP_POST_VARS['poll_title']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['poll_title']))) : ''; ! $poll_length = ( isset($HTTP_POST_VARS['poll_length']) ) ? max(0, intval($HTTP_POST_VARS['poll_length'])) : 0; $poll_options = array(); ! if ( !empty($HTTP_POST_VARS['poll_option_text']) ) { ! while( list($option_id, $option_text) = @each($HTTP_POST_VARS['poll_option_text']) ) { ! if( isset($HTTP_POST_VARS['del_poll_option'][$option_id]) ) { unset($poll_options[$option_id]); --- 598,616 ---- } ! if( $refresh || isset($_POST['del_poll_option']) || $error_msg != '' ) { ! $username = ( !empty($_POST['username']) ) ? htmlspecialchars(trim(stripslashes($_POST['username']))) : ''; ! $subject = ( !empty($_POST['subject']) ) ? htmlspecialchars(trim(stripslashes($_POST['subject']))) : ''; ! $message = ( !empty($_POST['message']) ) ? htmlspecialchars(trim(stripslashes($_POST['message']))) : ''; ! $poll_title = ( !empty($_POST['poll_title']) ) ? htmlspecialchars(trim(stripslashes($_POST['poll_title']))) : ''; ! $poll_length = ( isset($_POST['poll_length']) ) ? max(0, intval($_POST['poll_length'])) : 0; $poll_options = array(); ! if ( !empty($_POST['poll_option_text']) ) { ! while( list($option_id, $option_text) = @each($_POST['poll_option_text']) ) { ! if( isset($_POST['del_poll_option'][$option_id]) ) { unset($poll_options[$option_id]); *************** *** 623,629 **** } ! if ( isset($poll_add) && !empty($HTTP_POST_VARS['add_poll_option_text']) ) { ! $poll_options[] = htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['add_poll_option_text']))); } --- 623,629 ---- } ! if ( isset($poll_add) && !empty($_POST['add_poll_option_text']) ) { ! $poll_options[] = htmlspecialchars(trim(stripslashes($_POST['add_poll_option_text']))); } Index: search.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/search.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** search.php 29 Jul 2004 22:30:30 -0000 1.1 --- search.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 40,46 **** // Define initial vars // ! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; } else --- 40,46 ---- // Define initial vars // ! if ( isset($_POST['mode']) || isset($_GET['mode']) ) { ! $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; } else *************** *** 49,55 **** } ! if ( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) ) { ! $search_keywords = ( isset($HTTP_POST_VARS['search_keywords']) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords']; } else --- 49,55 ---- } ! if ( isset($_POST['search_keywords']) || isset($_GET['search_keywords']) ) { ! $search_keywords = ( isset($_POST['search_keywords']) ) ? $_POST['search_keywords'] : $_GET['search_keywords']; } else *************** *** 58,64 **** } ! if ( isset($HTTP_POST_VARS['search_author']) || isset($HTTP_GET_VARS['search_author'])) { ! $search_author = ( isset($HTTP_POST_VARS['search_author']) ) ? $HTTP_POST_VARS['search_author'] : $HTTP_GET_VARS['search_author']; $search_author = htmlspecialchars($search_author); } --- 58,64 ---- } ! if ( isset($_POST['search_author']) || isset($_GET['search_author'])) { ! $search_author = ( isset($_POST['search_author']) ) ? $_POST['search_author'] : $_GET['search_author']; $search_author = htmlspecialchars($search_author); } *************** *** 68,79 **** } ! $search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : ''; ! $show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts'; $show_results = ($show_results == 'topics') ? 'topics' : 'posts'; ! if ( isset($HTTP_POST_VARS['search_terms']) ) { ! $search_terms = ( $HTTP_POST_VARS['search_terms'] == 'all' ) ? 1 : 0; } else --- 68,79 ---- } ! $search_id = ( isset($_GET['search_id']) ) ? $_GET['search_id'] : ''; ! $show_results = ( isset($_POST['show_results']) ) ? $_POST['show_results'] : 'posts'; $show_results = ($show_results == 'topics') ? 'topics' : 'posts'; ! if ( isset($_POST['search_terms']) ) { ! $search_terms = ( $_POST['search_terms'] == 'all' ) ? 1 : 0; } else *************** *** 82,88 **** } ! if ( isset($HTTP_POST_VARS['search_fields']) ) { ! $search_fields = ( $HTTP_POST_VARS['search_fields'] == 'all' ) ? 1 : 0; } else --- 82,88 ---- } ! if ( isset($_POST['search_fields']) ) { ! $search_fields = ( $_POST['search_fields'] == 'all' ) ? 1 : 0; } else *************** *** 91,104 **** } ! $return_chars = ( isset($HTTP_POST_VARS['return_chars']) ) ? intval($HTTP_POST_VARS['return_chars']) : 200; ! $search_cat = ( isset($HTTP_POST_VARS['search_cat']) ) ? intval($HTTP_POST_VARS['search_cat']) : -1; ! $search_forum = ( isset($HTTP_POST_VARS['search_forum']) ) ? intval($HTTP_POST_VARS['search_forum']) : -1; ! $sort_by = ( isset($HTTP_POST_VARS['sort_by']) ) ? intval($HTTP_POST_VARS['sort_by']) : 0; ! if ( isset($HTTP_POST_VARS['sort_dir']) ) { ! $sort_dir = ( $HTTP_POST_VARS['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC'; } else --- 91,104 ---- } ! $return_chars = ( isset($_POST['return_chars']) ) ? intval($_POST['return_chars']) : 200; ! $search_cat = ( isset($_POST['search_cat']) ) ? intval($_POST['search_cat']) : -1; ! $search_forum = ( isset($_POST['search_forum']) ) ? intval($_POST['search_forum']) : -1; ! $sort_by = ( isset($_POST['sort_by']) ) ? intval($_POST['sort_by']) : 0; ! if ( isset($_POST['sort_dir']) ) { ! $sort_dir = ( $_POST['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC'; } else *************** *** 107,114 **** } ! if ( !empty($HTTP_POST_VARS['search_time']) || !empty($HTTP_GET_VARS['search_time'])) { ! $search_time = time() - ( ( ( !empty($HTTP_POST_VARS['search_time']) ) ? intval($HTTP_POST_VARS['search_time']) : intval($HTTP_GET_VARS['search_time']) ) * 86400 ); ! $topic_days = (!empty($HTTP_POST_VARS['search_time'])) ? intval($HTTP_POST_VARS['search_time']) : intval($HTTP_GET_VARS['search_time']); } else --- 107,114 ---- } ! if ( !empty($_POST['search_time']) || !empty($_GET['search_time'])) { ! $search_time = time() - ( ( ( !empty($_POST['search_time']) ) ? intval($_POST['search_time']) : intval($_GET['search_time']) ) * 86400 ); ! $topic_days = (!empty($_POST['search_time'])) ? intval($_POST['search_time']) : intval($_GET['search_time']); } else *************** *** 118,122 **** } ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; $sort_by_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']); --- 118,122 ---- } ! $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; $sort_by_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']); *************** *** 135,141 **** // This handles the simple windowed user search functions called from various other scripts // ! if ( isset($HTTP_POST_VARS['search_username']) ) { ! username_search($HTTP_POST_VARS['search_username']); } else --- 135,141 ---- // This handles the simple windowed user search functions called from various other scripts // ! if ( isset($_POST['search_username']) ) { ! username_search($_POST['search_username']); } else *************** *** 834,839 **** $highlight_active = urlencode(trim($highlight_active)); ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); for($i = 0; $i < count($searchset); $i++) --- 834,839 ---- $highlight_active = urlencode(trim($highlight_active)); ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array(); for($i = 0; $i < count($searchset); $i++) *************** *** 1135,1139 **** if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { --- 1135,1139 ---- if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { *************** *** 1156,1162 **** } ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $searchset[$i]['post_time'] ) { $unread_topics = false; --- 1156,1162 ---- } ! if ( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] > $searchset[$i]['post_time'] ) { $unread_topics = false; Index: index.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.php 29 Jul 2004 22:30:30 -0000 1.1 --- index.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 35,43 **** // ! $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; ! if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) { ! $mark_read = ( isset($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; } else --- 35,43 ---- // ! $viewcat = ( !empty($_GET[POST_CAT_URL]) ) ? $_GET[POST_CAT_URL] : -1; ! if( isset($_GET['mark']) || isset($_POST['mark']) ) { ! $mark_read = ( isset($_POST['mark']) ) ? $_POST['mark'] : $_GET['mark']; } else *************** *** 68,73 **** // ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array(); // --- 68,73 ---- // ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . "_t"]) : array(); ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . "_f"]) : array(); // *************** *** 375,381 **** } ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) { $unread_topics = false; --- 375,381 ---- } ! if ( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) { $unread_topics = false; Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** viewtopic.php 29 Jul 2004 22:30:30 -0000 1.1 --- viewtopic.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 31,50 **** // $topic_id = $post_id = 0; ! if ( isset($HTTP_GET_VARS[POST_TOPIC_URL]) ) { ! $topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]); } ! else if ( isset($HTTP_GET_VARS['topic']) ) { ! $topic_id = intval($HTTP_GET_VARS['topic']); } ! if ( isset($HTTP_GET_VARS[POST_POST_URL])) { ! $post_id = intval($HTTP_GET_VARS[POST_POST_URL]); } ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; if ( !isset($topic_id) && !isset($post_id) ) --- 31,50 ---- // $topic_id = $post_id = 0; ! if ( isset($_GET[POST_TOPIC_URL]) ) { ! $topic_id = intval($_GET[POST_TOPIC_URL]); } ! else if ( isset($_GET['topic']) ) { ! $topic_id = intval($_GET['topic']); } ! if ( isset($_GET[POST_POST_URL])) { ! $post_id = intval($_GET[POST_POST_URL]); } ! $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; if ( !isset($topic_id) && !isset($post_id) ) *************** *** 57,67 **** // or older topic // ! if ( isset($HTTP_GET_VARS['view']) && empty($HTTP_GET_VARS[POST_POST_URL]) ) { ! if ( $HTTP_GET_VARS['view'] == 'newest' ) { ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_GET_VARS['sid']) ) { ! $session_id = isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) ? $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid'] : $HTTP_GET_VARS['sid']; if (!preg_match('/^[A-Za-z0-9]*$/', $session_id)) --- 57,67 ---- // or older topic // ! if ( isset($_GET['view']) && empty($_GET[POST_POST_URL]) ) { ! if ( $_GET['view'] == 'newest' ) { ! if ( isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_GET['sid']) ) { ! $session_id = isset($_COOKIE[$board_config['cookie_name'] . '_sid']) ? $_COOKIE[$board_config['cookie_name'] . '_sid'] : $_GET['sid']; if (!preg_match('/^[A-Za-z0-9]*$/', $session_id)) *************** *** 92,96 **** $post_id = $row['post_id']; ! if (isset($HTTP_GET_VARS['sid'])) { redirect("viewtopic.$phpEx?sid=$session_id&" . POST_POST_URL . "=$post_id#$post_id"); --- 92,96 ---- $post_id = $row['post_id']; ! if (isset($_GET['sid'])) { redirect("viewtopic.$phpEx?sid=$session_id&" . POST_POST_URL . "=$post_id#$post_id"); *************** *** 105,112 **** redirect(append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); } ! else if ( $HTTP_GET_VARS['view'] == 'next' || $HTTP_GET_VARS['view'] == 'previous' ) { ! $sql_condition = ( $HTTP_GET_VARS['view'] == 'next' ) ? '>' : '<'; ! $sql_ordering = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'ASC' : 'DESC'; $sql = "SELECT t.topic_id --- 105,112 ---- redirect(append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); } ! else if ( $_GET['view'] == 'next' || $_GET['view'] == 'previous' ) { ! $sql_condition = ( $_GET['view'] == 'next' ) ? '>' : '<'; ! $sql_ordering = ( $_GET['view'] == 'next' ) ? 'ASC' : 'DESC'; $sql = "SELECT t.topic_id *************** *** 129,133 **** else { ! $message = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'No_newer_topics' : 'No_older_topics'; message_die(GENERAL_MESSAGE, $message); } --- 129,133 ---- else { ! $message = ( $_GET['view'] == 'next' ) ? 'No_newer_topics' : 'No_older_topics'; message_die(GENERAL_MESSAGE, $message); } *************** *** 223,229 **** if ( $row = $db->sql_fetchrow($result) ) { ! if ( isset($HTTP_GET_VARS['unwatch']) ) { ! if ( $HTTP_GET_VARS['unwatch'] == 'topic' ) { $is_watching_topic = 0; --- 223,229 ---- if ( $row = $db->sql_fetchrow($result) ) { ! if ( isset($_GET['unwatch']) ) { ! if ( $_GET['unwatch'] == 'topic' ) { $is_watching_topic = 0; *************** *** 266,272 **** else { ! if ( isset($HTTP_GET_VARS['watch']) ) { ! if ( $HTTP_GET_VARS['watch'] == 'topic' ) { $is_watching_topic = TRUE; --- 266,272 ---- else { ! if ( isset($_GET['watch']) ) { ! if ( $_GET['watch'] == 'topic' ) { $is_watching_topic = TRUE; *************** *** 296,302 **** else { ! if ( isset($HTTP_GET_VARS['unwatch']) ) { ! if ( $HTTP_GET_VARS['unwatch'] == 'topic' ) { redirect(append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true)); --- 296,302 ---- else { ! if ( isset($_GET['unwatch']) ) { ! if ( $_GET['unwatch'] == 'topic' ) { redirect(append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true)); *************** *** 318,324 **** $previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); ! if( !empty($HTTP_POST_VARS['postdays']) || !empty($HTTP_GET_VARS['postdays']) ) { ! $post_days = ( !empty($HTTP_POST_VARS['postdays']) ) ? intval($HTTP_POST_VARS['postdays']) : intval($HTTP_GET_VARS['postdays']); $min_post_time = time() - (intval($post_days) * 86400); --- 318,324 ---- $previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); ! if( !empty($_POST['postdays']) || !empty($_GET['postdays']) ) { ! $post_days = ( !empty($_POST['postdays']) ) ? intval($_POST['postdays']) : intval($_GET['postdays']); $min_post_time = time() - (intval($post_days) * 86400); *************** *** 337,341 **** $limit_posts_time = "AND p.post_time >= $min_post_time "; ! if ( !empty($HTTP_POST_VARS['postdays'])) { $start = 0; --- 337,341 ---- $limit_posts_time = "AND p.post_time >= $min_post_time "; ! if ( !empty($_POST['postdays'])) { $start = 0; *************** *** 361,367 **** // Decide how to order the post display // ! if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) ) { ! $post_order = (!empty($HTTP_POST_VARS['postorder'])) ? htmlspecialchars($HTTP_POST_VARS['postorder']) : htmlspecialchars($HTTP_GET_VARS['postorder']); $post_time_order = ($post_order == "asc") ? "ASC" : "DESC"; } --- 361,367 ---- // Decide how to order the post display // ! if ( !empty($_POST['postorder']) || !empty($_GET['postorder']) ) { ! $post_order = (!empty($_POST['postorder'])) ? htmlspecialchars($_POST['postorder']) : htmlspecialchars($_GET['postorder']); $post_time_order = ($post_order == "asc") ? "ASC" : "DESC"; } *************** *** 481,488 **** // $highlight_match = $highlight = ''; ! if (isset($HTTP_GET_VARS['highlight'])) { // Split words and phrases ! $words = explode(' ', trim(htmlspecialchars(urldecode($HTTP_GET_VARS['highlight'])))); for($i = 0; $i < sizeof($words); $i++) --- 481,488 ---- // $highlight_match = $highlight = ''; ! if (isset($_GET['highlight'])) { // Split words and phrases ! $words = explode(' ', trim(htmlspecialchars(urldecode($_GET['highlight'])))); for($i = 0; $i < sizeof($words); $i++) *************** *** 495,499 **** unset($words); ! $highlight = urlencode($HTTP_GET_VARS['highlight']); } --- 495,499 ---- unset($words); ! $highlight = urlencode($_GET['highlight']); } *************** *** 534,539 **** if ( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); if ( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) ) --- 534,539 ---- if ( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array(); if ( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) ) *************** *** 708,714 **** $db->sql_freeresult($result); ! if ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) ) { ! $view_result = ( ( ( isset($HTTP_GET_VARS['vote']) ) ? $HTTP_GET_VARS['vote'] : $HTTP_POST_VARS['vote'] ) == 'viewresult' ) ? TRUE : 0; } else --- 708,714 ---- $db->sql_freeresult($result); ! if ( isset($_GET['vote']) || isset($_POST['vote']) ) { ! $view_result = ( ( ( isset($_GET['vote']) ) ? $_GET['vote'] : $_POST['vote'] ) == 'viewresult' ) ? TRUE : 0; } else Index: faq.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/faq.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** faq.php 29 Jul 2004 22:30:30 -0000 1.1 --- faq.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 41,47 **** // Load the appropriate faq file // ! if( isset($HTTP_GET_VARS['mode']) ) { ! switch( $HTTP_GET_VARS['mode'] ) { case 'bbcode': --- 41,47 ---- // Load the appropriate faq file // ! if( isset($_GET['mode']) ) { ! switch( $_GET['mode'] ) { case 'bbcode': Index: memberlist.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/memberlist.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** memberlist.php 29 Jul 2004 22:30:30 -0000 1.1 --- memberlist.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 34,42 **** // ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; ! if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? htmlspecialchars($HTTP_POST_VARS['mode']) : htmlspecialchars($HTTP_GET_VARS['mode']); } else --- 34,42 ---- // ! $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; ! if ( isset($_GET['mode']) || isset($_POST['mode']) ) { ! $mode = ( isset($_POST['mode']) ) ? htmlspecialchars($_POST['mode']) : htmlspecialchars($_GET['mode']); } else *************** *** 45,55 **** } ! if(isset($HTTP_POST_VARS['order'])) { ! $sort_order = ($HTTP_POST_VARS['order'] == 'ASC') ? 'ASC' : 'DESC'; } ! else if(isset($HTTP_GET_VARS['order'])) { ! $sort_order = ($HTTP_GET_VARS['order'] == 'ASC') ? 'ASC' : 'DESC'; } else --- 45,55 ---- } ! if(isset($_POST['order'])) { ! $sort_order = ($_POST['order'] == 'ASC') ? 'ASC' : 'DESC'; } ! else if(isset($_GET['order'])) { ! $sort_order = ($_GET['order'] == 'ASC') ? 'ASC' : 'DESC'; } else Index: viewforum.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewforum.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** viewforum.php 29 Jul 2004 22:30:30 -0000 1.1 --- viewforum.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 29,39 **** // Start initial var setup // ! if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) { ! $forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]); } ! else if ( isset($HTTP_GET_VARS['forum'])) { ! $forum_id = intval($HTTP_GET_VARS['forum']); } else --- 29,39 ---- // Start initial var setup // ! if ( isset($_GET[POST_FORUM_URL]) || isset($_POST[POST_FORUM_URL]) ) { ! $forum_id = ( isset($_GET[POST_FORUM_URL]) ) ? intval($_GET[POST_FORUM_URL]) : intval($_POST[POST_FORUM_URL]); } ! else if ( isset($_GET['forum'])) { ! $forum_id = intval($_GET['forum']); } else *************** *** 42,50 **** } ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; ! if ( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) { ! $mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; } else --- 42,50 ---- } ! $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; ! if ( isset($_GET['mark']) || isset($_POST['mark']) ) { ! $mark_read = (isset($_POST['mark'])) ? $_POST['mark'] : $_GET['mark']; } else *************** *** 134,139 **** if ( $row = $db->sql_fetchrow($result) ) { ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); if ( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums[$forum_id]) ) --- 134,139 ---- if ( $row = $db->sql_fetchrow($result) ) { ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array(); ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array(); if ( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums[$forum_id]) ) *************** *** 163,168 **** // ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : ''; ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : ''; // --- 163,168 ---- // ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : ''; ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : ''; // *************** *** 239,245 **** $previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); ! if ( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) ) { ! $topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? intval($HTTP_POST_VARS['topicdays']) : intval($HTTP_GET_VARS['topicdays']); $min_topic_time = time() - ($topic_days * 86400); --- 239,245 ---- $previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); ! if ( !empty($_POST['topicdays']) || !empty($_GET['topicdays']) ) { ! $topic_days = ( !empty($_POST['topicdays']) ) ? intval($_POST['topicdays']) : intval($_GET['topicdays']); $min_topic_time = time() - ($topic_days * 86400); *************** *** 259,263 **** $limit_topics_time = "AND p.post_time >= $min_topic_time"; ! if ( !empty($HTTP_POST_VARS['topicdays']) ) { $start = 0; --- 259,263 ---- $limit_topics_time = "AND p.post_time >= $min_topic_time"; ! if ( !empty($_POST['topicdays']) ) { $start = 0; *************** *** 520,524 **** if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) { ! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { $unread_topics = true; --- 520,524 ---- if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) { ! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { $unread_topics = true; *************** *** 540,546 **** } ! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $topic_rowset[$i]['post_time'] ) { $unread_topics = false; --- 540,546 ---- } ! if( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if( $_COOKIE[$board_config['cookie_name'] . '_f_all'] >= $topic_rowset[$i]['post_time'] ) { $unread_topics = false; Index: groupcp.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/groupcp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** groupcp.php 29 Jul 2004 22:30:30 -0000 1.1 --- groupcp.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 126,132 **** $server_url = $server_protocol . $server_name . $server_port . $script_name; ! if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) { ! $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); } else --- 126,132 ---- $server_url = $server_protocol . $server_name . $server_port . $script_name; ! if ( isset($_GET[POST_GROUPS_URL]) || isset($_POST[POST_GROUPS_URL]) ) { ! $group_id = ( isset($_POST[POST_GROUPS_URL]) ) ? intval($_POST[POST_GROUPS_URL]) : intval($_GET[POST_GROUPS_URL]); } else *************** *** 135,141 **** } ! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } --- 135,141 ---- } ! if ( isset($_POST['mode']) || isset($_GET['mode']) ) { ! $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; $mode = htmlspecialchars($mode); } *************** *** 145,152 **** } ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; // --- 145,152 ---- } ! $confirm = ( isset($_POST['confirm']) ) ? TRUE : 0; ! $cancel = ( isset($_POST['cancel']) ) ? TRUE : 0; ! $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; // *************** *** 155,159 **** $is_moderator = FALSE; ! if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id ) { if ( !$userdata['session_logged_in'] ) --- 155,159 ---- $is_moderator = FALSE; ! if ( isset($_POST['groupstatus']) && $group_id ) { if ( !$userdata['session_logged_in'] ) *************** *** 184,188 **** $sql = "UPDATE " . GROUPS_TABLE . " ! SET group_type = " . intval($HTTP_POST_VARS['group_type']) . " WHERE group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) --- 184,188 ---- $sql = "UPDATE " . GROUPS_TABLE . " ! SET group_type = " . intval($_POST['group_type']) . " WHERE group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) *************** *** 200,204 **** } ! else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) { // --- 200,204 ---- } ! else if ( isset($_POST['joingroup']) && $group_id ) { // *************** *** 301,305 **** message_die(GENERAL_MESSAGE, $message); } ! else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending']) && $group_id ) { // --- 301,305 ---- message_die(GENERAL_MESSAGE, $message); } ! else if ( isset($_POST['unsub']) || isset($_POST['unsubpending']) && $group_id ) { // *************** *** 360,364 **** else { ! $unsub_msg = ( isset($HTTP_POST_VARS['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending']; $s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />'; --- 360,364 ---- else { ! $unsub_msg = ( isset($_POST['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending']; $s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />'; *************** *** 392,396 **** // If so, check to see if they are logged in. // ! if ( isset($HTTP_GET_VARS['validate']) ) { if ( !$userdata['session_logged_in'] ) --- 392,396 ---- // If so, check to see if they are logged in. // ! if ( isset($_GET['validate']) ) { if ( !$userdata['session_logged_in'] ) *************** *** 453,457 **** // Handle Additions, removals, approvals and denials // ! if ( !empty($HTTP_POST_VARS['add']) || !empty($HTTP_POST_VARS['remove']) || isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) { if ( !$userdata['session_logged_in'] ) --- 453,457 ---- // Handle Additions, removals, approvals and denials // ! if ( !empty($_POST['add']) || !empty($_POST['remove']) || isset($_POST['approve']) || isset($_POST['deny']) ) { if ( !$userdata['session_logged_in'] ) *************** *** 471,477 **** } ! if ( isset($HTTP_POST_VARS['add']) ) { ! $username = ( isset($HTTP_POST_VARS['username']) ) ? htmlspecialchars($HTTP_POST_VARS['username']) : ''; $sql = "SELECT user_id, user_email, user_lang, user_level --- 471,477 ---- } ! if ( isset($_POST['add']) ) { ! $username = ( isset($_POST['username']) ) ? htmlspecialchars($_POST['username']) : ''; $sql = "SELECT user_id, user_email, user_lang, user_level *************** *** 584,591 **** else { ! if ( ( ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) && isset($HTTP_POST_VARS['pending_members']) ) || ( isset($HTTP_POST_VARS['remove']) && isset($HTTP_POST_VARS['members']) ) ) { ! $members = ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) ? $HTTP_POST_VARS['pending_members'] : $HTTP_POST_VARS['members']; $sql_in = ''; --- 584,591 ---- else { ! if ( ( ( isset($_POST['approve']) || isset($_POST['deny']) ) && isset($_POST['pending_members']) ) || ( isset($_POST['remove']) && isset($_POST['members']) ) ) { ! $members = ( isset($_POST['approve']) || isset($_POST['deny']) ) ? $_POST['pending_members'] : $_POST['members']; $sql_in = ''; *************** *** 595,599 **** } ! if ( isset($HTTP_POST_VARS['approve']) ) { if ( $group_info['auth_mod'] ) --- 595,599 ---- } ! if ( isset($_POST['approve']) ) { if ( $group_info['auth_mod'] ) *************** *** 617,621 **** WHERE user_id IN ($sql_in)"; } ! else if ( isset($HTTP_POST_VARS['deny']) || isset($HTTP_POST_VARS['remove']) ) { if ( $group_info['auth_mod'] ) --- 617,621 ---- WHERE user_id IN ($sql_in)"; } ! else if ( isset($_POST['deny']) || isset($_POST['remove']) ) { if ( $group_info['auth_mod'] ) *************** *** 679,683 **** // Email users when they are approved // ! if ( isset($HTTP_POST_VARS['approve']) ) { if ( !($result = $db->sql_query($sql_select)) ) --- 679,683 ---- // Email users when they are approved // ! if ( isset($_POST['approve']) ) { if ( !($result = $db->sql_query($sql_select)) ) Index: profile.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/profile.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** profile.php 29 Jul 2004 22:30:30 -0000 1.1 --- profile.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 36,42 **** // session id check ! if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid'])) { ! $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid']; } else --- 36,42 ---- // session id check ! if (!empty($_POST['sid']) || !empty($_GET['sid'])) { ! $sid = (!empty($_POST['sid'])) ? $_POST['sid'] : $_GET['sid']; } else *************** *** 81,87 **** // Start of program proper // ! if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = htmlspecialchars($mode); --- 81,87 ---- // Start of program proper // ! if ( isset($_GET['mode']) || isset($_POST['mode']) ) { ! $mode = ( isset($_GET['mode']) ) ? $_GET['mode'] : $_POST['mode']; $mode = htmlspecialchars($mode); Index: privmsg.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/privmsg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** privmsg.php 29 Jul 2004 22:30:30 -0000 1.1 --- privmsg.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 42,62 **** // Parameters // ! $submit = ( isset($HTTP_POST_VARS['post']) ) ? TRUE : 0; ! $submit_search = ( isset($HTTP_POST_VARS['usersubmit']) ) ? TRUE : 0; ! $submit_msgdays = ( isset($HTTP_POST_VARS['submit_msgdays']) ) ? TRUE : 0; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? TRUE : 0; ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; ! $delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : 0; ! $delete_all = ( isset($HTTP_POST_VARS['deleteall']) ) ? TRUE : 0; ! $save = ( isset($HTTP_POST_VARS['save']) ) ? TRUE : 0; $refresh = $preview || $submit_search; ! $mark_list = ( !empty($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : 0; ! if ( isset($HTTP_POST_VARS['folder']) || isset($HTTP_GET_VARS['folder']) ) { ! $folder = ( isset($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : $HTTP_GET_VARS['folder']; $folder = htmlspecialchars($folder); --- 42,62 ---- // Parameters // ! $submit = ( isset($_POST['post']) ) ? TRUE : 0; ! $submit_search = ( isset($_POST['usersubmit']) ) ? TRUE : 0; ! $submit_msgdays = ( isset($_POST['submit_msgdays']) ) ? TRUE : 0; ! $cancel = ( isset($_POST['cancel']) ) ? TRUE : 0; ! $preview = ( isset($_POST['preview']) ) ? TRUE : 0; ! $confirm = ( isset($_POST['confirm']) ) ? TRUE : 0; ! $delete = ( isset($_POST['delete']) ) ? TRUE : 0; ! $delete_all = ( isset($_POST['deleteall']) ) ? TRUE : 0; ! $save = ( isset($_POST['save']) ) ? TRUE : 0; $refresh = $preview || $submit_search; ! $mark_list = ( !empty($_POST['mark']) ) ? $_POST['mark'] : 0; ! if ( isset($_POST['folder']) || isset($_GET['folder']) ) { ! $folder = ( isset($_POST['folder']) ) ? $_POST['folder'] : $_GET['folder']; $folder = htmlspecialchars($folder); *************** *** 91,97 **** // Var definitions // ! if ( !empty($HTTP_POST_VARS['mode']) || !empty($HTTP_GET_VARS['mode']) ) { ! $mode = ( !empty($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } --- 91,97 ---- // Var definitions // ! if ( !empty($_POST['mode']) || !empty($_GET['mode']) ) { ! $mode = ( !empty($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; $mode = htmlspecialchars($mode); } *************** *** 101,109 **** } ! $start = ( !empty($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; ! if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) ) { ! $privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]); } else --- 101,109 ---- } ! $start = ( !empty($_GET['start']) ) ? intval($_GET['start']) : 0; ! if ( isset($_POST[POST_POST_URL]) || isset($_GET[POST_POST_URL]) ) { ! $privmsg_id = ( isset($_POST[POST_POST_URL]) ) ? intval($_POST[POST_POST_URL]) : intval($_GET[POST_POST_URL]); } else *************** *** 173,179 **** else if ( $mode == 'read' ) { ! if ( !empty($HTTP_GET_VARS[POST_POST_URL]) ) { ! $privmsgs_id = intval($HTTP_GET_VARS[POST_POST_URL]); } else --- 173,179 ---- else if ( $mode == 'read' ) { ! if ( !empty($_GET[POST_POST_URL]) ) { ! $privmsgs_id = intval($_GET[POST_POST_URL]); } else *************** *** 666,670 **** { $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />'; ! $s_hidden_fields .= ( isset($HTTP_POST_VARS['delete']) ) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />'; for($i = 0; $i < count($mark_list); $i++) --- 666,670 ---- { $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />'; ! $s_hidden_fields .= ( isset($_POST['delete']) ) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />'; for($i = 0; $i < count($mark_list); $i++) *************** *** 1067,1071 **** if ( !$userdata['session_logged_in'] ) { ! $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . intval($HTTP_GET_VARS[POST_USERS_URL]) : ''; redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true)); } --- 1067,1071 ---- if ( !$userdata['session_logged_in'] ) { ! $user_id = ( isset($_GET[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . intval($_GET[POST_USERS_URL]) : ''; redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true)); } *************** *** 1080,1084 **** else { ! $html_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_html']) ) ? 0 : TRUE ) : $userdata['user_allowhtml']; } --- 1080,1084 ---- else { ! $html_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_html']) ) ? 0 : TRUE ) : $userdata['user_allowhtml']; } *************** *** 1089,1093 **** else { ! $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_bbcode']) ) ? 0 : TRUE ) : $userdata['user_allowbbcode']; } --- 1089,1093 ---- else { ! $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_bbcode']) ) ? 0 : TRUE ) : $userdata['user_allowbbcode']; } *************** *** 1098,1105 **** else { ! $smilies_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_smilies']) ) ? 0 : TRUE ) : $userdata['user_allowsmile']; } ! $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; --- 1098,1105 ---- else { ! $smilies_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_smilies']) ) ? 0 : TRUE ) : $userdata['user_allowsmile']; } ! $attach_sig = ( $submit || $refresh ) ? ( ( !empty($_POST['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; *************** *** 1131,1137 **** if ( $submit ) { ! if ( !empty($HTTP_POST_VARS['username']) ) { ! $to_username = $HTTP_POST_VARS['username']; $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active --- 1131,1137 ---- if ( $submit ) { ! if ( !empty($_POST['username']) ) { ! $to_username = $_POST['username']; $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active *************** *** 1153,1157 **** } ! $privmsg_subject = trim(strip_tags($HTTP_POST_VARS['subject'])); if ( empty($privmsg_subject) ) { --- 1153,1157 ---- } ! $privmsg_subject = trim(strip_tags($_POST['subject'])); if ( empty($privmsg_subject) ) { *************** *** 1160,1164 **** } ! if ( !empty($HTTP_POST_VARS['message']) ) { if ( !$error ) --- 1160,1164 ---- } ! if ( !empty($_POST['message']) ) { if ( !$error ) *************** *** 1169,1173 **** } ! $privmsg_message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); } --- 1169,1173 ---- } ! $privmsg_message = prepare_message($_POST['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); } *************** *** 1338,1344 **** // where neccessary, etc. // ! $to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ''; ! $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ''; ! $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ''; $privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message); if ( !$preview ) --- 1338,1344 ---- // where neccessary, etc. // ! $to_username = ( isset($_POST['username']) ) ? trim(strip_tags(stripslashes($_POST['username']))) : ''; ! $privmsg_subject = ( isset($_POST['subject']) ) ? trim(strip_tags(stripslashes($_POST['subject']))) : ''; ! $privmsg_message = ( isset($_POST['message']) ) ? trim($_POST['message']) : ''; $privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message); if ( !$preview ) *************** *** 1395,1401 **** } ! if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) { ! $user_id = intval($HTTP_GET_VARS[POST_USERS_URL]); $sql = "SELECT username --- 1395,1401 ---- } ! if ( !empty($_GET[POST_USERS_URL]) ) { ! $user_id = intval($_GET[POST_USERS_URL]); $sql = "SELECT username *************** *** 1918,1924 **** // Show messages over previous x days/months // ! if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays... [truncated message content] |
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115/admin Modified Files: admin_board.php admin_db_utilities.php admin_disallow.php admin_forum_prune.php admin_forumauth.php admin_forums.php admin_groups.php admin_mass_email.php admin_ranks.php admin_smilies.php admin_styles.php admin_ug_auth.php admin_user_ban.php admin_users.php admin_words.php index.php page_header_admin.php pagestart.php Log Message: Say goodbye long array names. Say hello superglobals. Removed code in common.php to try to rename the variables at runtime. No longer needed since we are renaming them. Index: admin_forums.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_forums.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_forums.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_forums.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 53,59 **** // Mode setting // ! if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } --- 53,59 ---- // Mode setting // ! if( isset($_POST['mode']) || isset($_GET['mode']) ) { ! $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; $mode = htmlspecialchars($mode); } *************** *** 227,241 **** // Begin program proper // ! if( isset($HTTP_POST_VARS['addforum']) || isset($HTTP_POST_VARS['addcategory']) ) { ! $mode = ( isset($HTTP_POST_VARS['addforum']) ) ? "addforum" : "addcat"; if( $mode == "addforum" ) { ! list($cat_id) = each($HTTP_POST_VARS['addforum']); // // stripslashes needs to be run on this because slashes are added when the forum name is posted // ! $forumname = stripslashes($HTTP_POST_VARS['forumname'][$cat_id]); } } --- 227,241 ---- // Begin program proper // ! if( isset($_POST['addforum']) || isset($_POST['addcategory']) ) { ! $mode = ( isset($_POST['addforum']) ) ? "addforum" : "addcat"; if( $mode == "addforum" ) { ! list($cat_id) = each($_POST['addforum']); // // stripslashes needs to be run on this because slashes are added when the forum name is posted // ! $forumname = stripslashes($_POST['forumname'][$cat_id]); } } *************** *** 258,262 **** $buttonvalue = $lang['Update']; ! $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); $row = get_info('forum', $forum_id); --- 258,262 ---- $buttonvalue = $lang['Update']; ! $forum_id = intval($_GET[POST_FORUM_URL]); $row = get_info('forum', $forum_id); *************** *** 351,355 **** // Create a forum in the DB // ! if( trim($HTTP_POST_VARS['forumname']) == "" ) { message_die(GENERAL_ERROR, "Can't create a forum without a name"); --- 351,355 ---- // Create a forum in the DB // ! if( trim($_POST['forumname']) == "" ) { message_die(GENERAL_ERROR, "Can't create a forum without a name"); *************** *** 358,362 **** $sql = "SELECT MAX(forum_order) AS max_order FROM " . FORUMS_TABLE . " ! WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]); if( !$result = $db->sql_query($sql) ) { --- 358,362 ---- $sql = "SELECT MAX(forum_order) AS max_order FROM " . FORUMS_TABLE . " ! WHERE cat_id = " . intval($_POST[POST_CAT_URL]); if( !$result = $db->sql_query($sql) ) { *************** *** 393,397 **** // There is no problem having duplicate forum names so we won't check for it. $sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable" . $field_sql . ") ! VALUES ('" . $next_id . "', '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . $value_sql . ")"; if( !$result = $db->sql_query($sql) ) { --- 393,397 ---- // There is no problem having duplicate forum names so we won't check for it. $sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable" . $field_sql . ") ! VALUES ('" . $next_id . "', '" . str_replace("\'", "''", $_POST['forumname']) . "', " . intval($_POST[POST_CAT_URL]) . ", '" . str_replace("\'", "''", $_POST['forumdesc']) . "', $next_order, " . intval($_POST['forumstatus']) . ", " . intval($_POST['prune_enable']) . $value_sql . ")"; if( !$result = $db->sql_query($sql) ) { *************** *** 399,406 **** } ! if( $HTTP_POST_VARS['prune_enable'] ) { ! if( $HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "") { message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); --- 399,406 ---- } ! if( $_POST['prune_enable'] ) { ! if( $_POST['prune_days'] == "" || $_POST['prune_freq'] == "") { message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); *************** *** 408,412 **** $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) ! VALUES('" . $next_id . "', " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")"; if( !$result = $db->sql_query($sql) ) { --- 408,412 ---- $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) ! VALUES('" . $next_id . "', " . intval($_POST['prune_days']) . ", " . intval($_POST['prune_freq']) . ")"; if( !$result = $db->sql_query($sql) ) { *************** *** 423,437 **** case 'modforum': // Modify a forum in the DB ! if( isset($HTTP_POST_VARS['prune_enable'])) { ! if( $HTTP_POST_VARS['prune_enable'] != 1 ) { ! $HTTP_POST_VARS['prune_enable'] = 0; } } $sql = "UPDATE " . FORUMS_TABLE . " ! SET forum_name = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", forum_desc = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', forum_status = " . intval($HTTP_POST_VARS['forumstatus']) . ", prune_enable = " . intval($HTTP_POST_VARS['prune_enable']) . " ! WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); if( !$result = $db->sql_query($sql) ) { --- 423,437 ---- case 'modforum': // Modify a forum in the DB ! if( isset($_POST['prune_enable'])) { ! if( $_POST['prune_enable'] != 1 ) { ! $_POST['prune_enable'] = 0; } } $sql = "UPDATE " . FORUMS_TABLE . " ! SET forum_name = '" . str_replace("\'", "''", $_POST['forumname']) . "', cat_id = " . intval($_POST[POST_CAT_URL]) . ", forum_desc = '" . str_replace("\'", "''", $_POST['forumdesc']) . "', forum_status = " . intval($_POST['forumstatus']) . ", prune_enable = " . intval($_POST['prune_enable']) . " ! WHERE forum_id = " . intval($_POST[POST_FORUM_URL]); if( !$result = $db->sql_query($sql) ) { *************** *** 439,445 **** } ! if( $HTTP_POST_VARS['prune_enable'] == 1 ) { ! if( $HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "" ) { message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); --- 439,445 ---- } ! if( $_POST['prune_enable'] == 1 ) { ! if( $_POST['prune_days'] == "" || $_POST['prune_freq'] == "" ) { message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); *************** *** 448,452 **** $sql = "SELECT * FROM " . PRUNE_TABLE . " ! WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); if( !$result = $db->sql_query($sql) ) { --- 448,452 ---- $sql = "SELECT * FROM " . PRUNE_TABLE . " ! WHERE forum_id = " . intval($_POST[POST_FORUM_URL]); if( !$result = $db->sql_query($sql) ) { *************** *** 457,467 **** { $sql = "UPDATE " . PRUNE_TABLE . " ! SET prune_days = " . intval($HTTP_POST_VARS['prune_days']) . ", prune_freq = " . intval($HTTP_POST_VARS['prune_freq']) . " ! WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); } else { $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) ! VALUES(" . intval($HTTP_POST_VARS[POST_FORUM_URL]) . ", " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")"; } --- 457,467 ---- { $sql = "UPDATE " . PRUNE_TABLE . " ! SET prune_days = " . intval($_POST['prune_days']) . ", prune_freq = " . intval($_POST['prune_freq']) . " ! WHERE forum_id = " . intval($_POST[POST_FORUM_URL]); } else { $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) ! VALUES(" . intval($_POST[POST_FORUM_URL]) . ", " . intval($_POST['prune_days']) . ", " . intval($_POST['prune_freq']) . ")"; } *************** *** 480,484 **** case 'addcat': // Create a category in the DB ! if( trim($HTTP_POST_VARS['categoryname']) == '') { message_die(GENERAL_ERROR, "Can't create a category without a name"); --- 480,484 ---- case 'addcat': // Create a category in the DB ! if( trim($_POST['categoryname']) == '') { message_die(GENERAL_ERROR, "Can't create a category without a name"); *************** *** 500,504 **** // $sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order) ! VALUES ('" . str_replace("\'", "''", $HTTP_POST_VARS['categoryname']) . "', $next_order)"; if( !$result = $db->sql_query($sql) ) { --- 500,504 ---- // $sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order) ! VALUES ('" . str_replace("\'", "''", $_POST['categoryname']) . "', $next_order)"; if( !$result = $db->sql_query($sql) ) { *************** *** 519,523 **** $buttonvalue = $lang['Update']; ! $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); $row = get_info('category', $cat_id); --- 519,523 ---- $buttonvalue = $lang['Update']; ! $cat_id = intval($_GET[POST_CAT_URL]); $row = get_info('category', $cat_id); *************** *** 548,553 **** // Modify a category in the DB $sql = "UPDATE " . CATEGORIES_TABLE . " ! SET cat_title = '" . str_replace("\'", "''", $HTTP_POST_VARS['cat_title']) . "' ! WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]); if( !$result = $db->sql_query($sql) ) { --- 548,553 ---- // Modify a category in the DB $sql = "UPDATE " . CATEGORIES_TABLE . " ! SET cat_title = '" . str_replace("\'", "''", $_POST['cat_title']) . "' ! WHERE cat_id = " . intval($_POST[POST_CAT_URL]); if( !$result = $db->sql_query($sql) ) { *************** *** 563,567 **** case 'deleteforum': // Show form to delete a forum ! $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); $select_to = '<select name="to_id">'; --- 563,567 ---- case 'deleteforum': // Show form to delete a forum ! $forum_id = intval($_GET[POST_FORUM_URL]); $select_to = '<select name="to_id">'; *************** *** 604,610 **** // Move or delete a forum in the DB // ! $from_id = intval($HTTP_POST_VARS['from_id']); ! $to_id = intval($HTTP_POST_VARS['to_id']); ! $delete_old = intval($HTTP_POST_VARS['delete_old']); // Either delete or move all posts in a forum --- 604,610 ---- // Move or delete a forum in the DB // ! $from_id = intval($_POST['from_id']); ! $to_id = intval($_POST['to_id']); ! $delete_old = intval($_POST['delete_old']); // Either delete or move all posts in a forum *************** *** 760,764 **** // Show form to delete a category // ! $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); $buttonvalue = $lang['Move_and_Delete']; --- 760,764 ---- // Show form to delete a category // ! $cat_id = intval($_GET[POST_CAT_URL]); $buttonvalue = $lang['Move_and_Delete']; *************** *** 821,826 **** // Move or delete a category in the DB // ! $from_id = intval($HTTP_POST_VARS['from_id']); ! $to_id = intval($HTTP_POST_VARS['to_id']); if (!empty($to_id)) --- 821,826 ---- // Move or delete a category in the DB // ! $from_id = intval($_POST['from_id']); ! $to_id = intval($_POST['to_id']); if (!empty($to_id)) *************** *** 865,870 **** // Change order of forums in the DB // ! $move = intval($HTTP_GET_VARS['move']); ! $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); $forum_info = get_info('forum', $forum_id); --- 865,870 ---- // Change order of forums in the DB // ! $move = intval($_GET['move']); ! $forum_id = intval($_GET[POST_FORUM_URL]); $forum_info = get_info('forum', $forum_id); *************** *** 889,894 **** // Change order of categories in the DB // ! $move = intval($HTTP_GET_VARS['move']); ! $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); $sql = "UPDATE " . CATEGORIES_TABLE . " --- 889,894 ---- // Change order of categories in the DB // ! $move = intval($_GET['move']); ! $cat_id = intval($_GET[POST_CAT_URL]); $sql = "UPDATE " . CATEGORIES_TABLE . " *************** *** 906,910 **** case 'forum_sync': ! sync('forum', intval($HTTP_GET_VARS[POST_FORUM_URL])); $show_index = TRUE; --- 906,910 ---- case 'forum_sync': ! sync('forum', intval($_GET[POST_FORUM_URL])); $show_index = TRUE; Index: admin_words.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_words.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_words.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_words.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 37,43 **** require('./pagestart.' . $phpEx); ! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = htmlspecialchars($mode); } --- 37,43 ---- require('./pagestart.' . $phpEx); ! if( isset($_GET['mode']) || isset($_POST['mode']) ) { ! $mode = ($_GET['mode']) ? $_GET['mode'] : $_POST['mode']; $mode = htmlspecialchars($mode); } *************** *** 47,55 **** // These could be entered via a form button // ! if( isset($HTTP_POST_VARS['add']) ) { $mode = "add"; } ! else if( isset($HTTP_POST_VARS['save']) ) { $mode = "save"; --- 47,55 ---- // These could be entered via a form button // ! if( isset($_POST['add']) ) { $mode = "add"; } ! else if( isset($_POST['save']) ) { $mode = "save"; *************** *** 65,69 **** if( $mode == "edit" || $mode == "add" ) { ! $word_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0; $template->set_filenames(array( --- 65,69 ---- if( $mode == "edit" || $mode == "add" ) { ! $word_id = ( isset($_GET['id']) ) ? intval($_GET['id']) : 0; $template->set_filenames(array( *************** *** 115,121 **** else if( $mode == "save" ) { ! $word_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0; ! $word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : ""; ! $replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : ""; if($word == "" || $replacement == "") --- 115,121 ---- else if( $mode == "save" ) { ! $word_id = ( isset($_POST['id']) ) ? intval($_POST['id']) : 0; ! $word = ( isset($_POST['word']) ) ? trim($_POST['word']) : ""; ! $replacement = ( isset($_POST['replacement']) ) ? trim($_POST['replacement']) : ""; if($word == "" || $replacement == "") *************** *** 149,155 **** else if( $mode == "delete" ) { ! if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) ) { ! $word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; $word_id = intval($word_id); } --- 149,155 ---- else if( $mode == "delete" ) { ! if( isset($_POST['id']) || isset($_GET['id']) ) { ! $word_id = ( isset($_POST['id']) ) ? $_POST['id'] : $_GET['id']; $word_id = intval($word_id); } Index: admin_disallow.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_disallow.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_disallow.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_disallow.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 38,46 **** require('./pagestart.' . $phpEx); ! if( isset($HTTP_POST_VARS['add_name']) ) { include($phpbb_root_path . 'includes/functions_validate.'.$phpEx); ! $disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? trim($HTTP_POST_VARS['disallowed_user']) : trim($HTTP_GET_VARS['disallowed_user']); if ($disallowed_user == '') --- 38,46 ---- require('./pagestart.' . $phpEx); ! if( isset($_POST['add_name']) ) { include($phpbb_root_path . 'includes/functions_validate.'.$phpEx); ! $disallowed_user = ( isset($_POST['disallowed_user']) ) ? trim($_POST['disallowed_user']) : trim($_GET['disallowed_user']); if ($disallowed_user == '') *************** *** 68,74 **** message_die(GENERAL_MESSAGE, $message); } ! else if( isset($HTTP_POST_VARS['delete_name']) ) { ! $disallowed_id = ( isset($HTTP_POST_VARS['disallowed_id']) ) ? intval( $HTTP_POST_VARS['disallowed_id'] ) : intval( $HTTP_GET_VARS['disallowed_id'] ); $sql = "DELETE FROM " . DISALLOW_TABLE . " --- 68,74 ---- message_die(GENERAL_MESSAGE, $message); } ! else if( isset($_POST['delete_name']) ) { ! $disallowed_id = ( isset($_POST['disallowed_id']) ) ? intval( $_POST['disallowed_id'] ) : intval( $_GET['disallowed_id'] ); $sql = "DELETE FROM " . DISALLOW_TABLE . " Index: admin_styles.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_styles.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_styles.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_styles.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 42,54 **** require($phpbb_root_path . 'extension.inc'); ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; ! $no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE; require('./pagestart.' . $phpEx); ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; if ($cancel) --- 42,54 ---- require($phpbb_root_path . 'extension.inc'); ! $confirm = ( isset($_POST['confirm']) ) ? TRUE : FALSE; ! $cancel = ( isset($_POST['cancel']) ) ? TRUE : FALSE; ! $no_page_header = (!empty($_POST['send_file']) || $cancel) ? TRUE : FALSE; require('./pagestart.' . $phpEx); ! $confirm = ( isset($_POST['confirm']) ) ? TRUE : FALSE; ! $cancel = ( isset($_POST['cancel']) ) ? TRUE : FALSE; if ($cancel) *************** *** 57,63 **** } ! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = htmlspecialchars($mode); } --- 57,63 ---- } ! if( isset($_GET['mode']) || isset($_POST['mode']) ) { ! $mode = ( isset($_GET['mode']) ) ? $_GET['mode'] : $_POST['mode']; $mode = htmlspecialchars($mode); } *************** *** 70,75 **** { case "addnew": ! $install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to']; ! $style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style']; if( isset($install_to) ) --- 70,75 ---- { case "addnew": ! $install_to = ( isset($_GET['install_to']) ) ? urldecode($_GET['install_to']) : $_POST['install_to']; ! $style_name = ( isset($_GET['style']) ) ? urldecode($_GET['style']) : $_POST['style']; if( isset($install_to) ) *************** *** 201,205 **** case "create": case "edit": ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0; if( $submit ) --- 201,205 ---- case "create": case "edit": ! $submit = ( isset($_POST['submit']) ) ? TRUE : 0; if( $submit ) *************** *** 208,282 **** // DAMN! Thats alot of data to validate... // ! $updated['style_name'] = $HTTP_POST_VARS['style_name']; ! $updated['template_name'] = $HTTP_POST_VARS['template_name']; ! $updated['head_stylesheet'] = $HTTP_POST_VARS['head_stylesheet']; ! $updated['body_background'] = $HTTP_POST_VARS['body_background']; ! $updated['body_bgcolor'] = $HTTP_POST_VARS['body_bgcolor']; ! $updated['body_text'] = $HTTP_POST_VARS['body_text']; ! $updated['body_link'] = $HTTP_POST_VARS['body_link']; ! $updated['body_vlink'] = $HTTP_POST_VARS['body_vlink']; ! $updated['body_alink'] = $HTTP_POST_VARS['body_alink']; ! $updated['body_hlink'] = $HTTP_POST_VARS['body_hlink']; ! $updated['tr_color1'] = $HTTP_POST_VARS['tr_color1']; ! $updated_name['tr_color1_name'] = $HTTP_POST_VARS['tr_color1_name']; ! $updated['tr_color2'] = $HTTP_POST_VARS['tr_color2']; ! $updated_name['tr_color2_name'] = $HTTP_POST_VARS['tr_color2_name']; ! $updated['tr_color3'] = $HTTP_POST_VARS['tr_color3']; ! $updated_name['tr_color3_name'] = $HTTP_POST_VARS['tr_color3_name']; ! $updated['tr_class1'] = $HTTP_POST_VARS['tr_class1']; ! $updated_name['tr_class1_name'] = $HTTP_POST_VARS['tr_class1_name']; ! $updated['tr_class2'] = $HTTP_POST_VARS['tr_class2']; ! $updated_name['tr_class2_name'] = $HTTP_POST_VARS['tr_class2_name']; ! $updated['tr_class3'] = $HTTP_POST_VARS['tr_class3']; ! $updated_name['tr_class3_name'] = $HTTP_POST_VARS['tr_class3_name']; ! $updated['th_color1'] = $HTTP_POST_VARS['th_color1']; ! $updated_name['th_color1_name'] = $HTTP_POST_VARS['th_color1_name']; ! $updated['th_color2'] = $HTTP_POST_VARS['th_color2']; ! $updated_name['th_color2_name'] = $HTTP_POST_VARS['th_color2_name']; ! $updated['th_color3'] = $HTTP_POST_VARS['th_color3']; ! $updated_name['th_color3_name'] = $HTTP_POST_VARS['th_color3_name']; ! $updated['th_class1'] = $HTTP_POST_VARS['th_class1']; ! $updated_name['th_class1_name'] = $HTTP_POST_VARS['th_class1_name']; ! $updated['th_class2'] = $HTTP_POST_VARS['th_class2']; ! $updated_name['th_class2_name'] = $HTTP_POST_VARS['th_class2_name']; ! $updated['th_class3'] = $HTTP_POST_VARS['th_class3']; ! $updated_name['th_class3_name'] = $HTTP_POST_VARS['th_class3_name']; ! $updated['td_color1'] = $HTTP_POST_VARS['td_color1']; ! $updated_name['td_color1_name'] = $HTTP_POST_VARS['td_color1_name']; ! $updated['td_color2'] = $HTTP_POST_VARS['td_color2']; ! $updated_name['td_color2_name'] = $HTTP_POST_VARS['td_color2_name']; ! $updated['td_color3'] = $HTTP_POST_VARS['td_color3']; ! $updated_name['td_color3_name'] = $HTTP_POST_VARS['td_color3_name']; ! $updated['td_class1'] = $HTTP_POST_VARS['td_class1']; ! $updated_name['td_class1_name'] = $HTTP_POST_VARS['td_class1_name']; ! $updated['td_class2'] = $HTTP_POST_VARS['td_class2']; ! $updated_name['td_class2_name'] = $HTTP_POST_VARS['td_class2_name']; ! $updated['td_class3'] = $HTTP_POST_VARS['td_class3']; ! $updated_name['td_class3_name'] = $HTTP_POST_VARS['td_class3_name']; ! $updated['fontface1'] = $HTTP_POST_VARS['fontface1']; ! $updated_name['fontface1_name'] = $HTTP_POST_VARS['fontface1_name']; ! $updated['fontface2'] = $HTTP_POST_VARS['fontface2']; ! $updated_name['fontface2_name'] = $HTTP_POST_VARS['fontface2_name']; ! $updated['fontface3'] = $HTTP_POST_VARS['fontface3']; ! $updated_name['fontface3_name'] = $HTTP_POST_VARS['fontface3_name']; ! $updated['fontsize1'] = intval($HTTP_POST_VARS['fontsize1']); ! $updated_name['fontsize1_name'] = $HTTP_POST_VARS['fontsize1_name']; ! $updated['fontsize2'] = intval($HTTP_POST_VARS['fontsize2']); ! $updated_name['fontsize2_name'] = $HTTP_POST_VARS['fontsize2_name']; ! $updated['fontsize3'] = intval($HTTP_POST_VARS['fontsize3']); ! $updated_name['fontsize3_name'] = $HTTP_POST_VARS['fontsize3_name']; ! $updated['fontcolor1'] = $HTTP_POST_VARS['fontcolor1']; ! $updated_name['fontcolor1_name'] = $HTTP_POST_VARS['fontcolor1_name']; ! $updated['fontcolor2'] = $HTTP_POST_VARS['fontcolor2']; ! $updated_name['fontcolor2_name'] = $HTTP_POST_VARS['fontcolor2_name']; ! $updated['fontcolor3'] = $HTTP_POST_VARS['fontcolor3']; ! $updated_name['fontcolor3_name'] = $HTTP_POST_VARS['fontcolor3_name']; ! $updated['span_class1'] = $HTTP_POST_VARS['span_class1']; ! $updated_name['span_class1_name'] = $HTTP_POST_VARS['span_class1_name']; ! $updated['span_class2'] = $HTTP_POST_VARS['span_class2']; ! $updated_name['span_class2_name'] = $HTTP_POST_VARS['span_class2_name']; ! $updated['span_class3'] = $HTTP_POST_VARS['span_class3']; ! $updated_name['span_class3_name'] = $HTTP_POST_VARS['span_class3_name']; ! $style_id = intval($HTTP_POST_VARS['style_id']); // // Wheeeew! Thank heavens for copy and paste and search and replace :D --- 208,282 ---- // DAMN! Thats alot of data to validate... // ! $updated['style_name'] = $_POST['style_name']; ! $updated['template_name'] = $_POST['template_name']; ! $updated['head_stylesheet'] = $_POST['head_stylesheet']; ! $updated['body_background'] = $_POST['body_background']; ! $updated['body_bgcolor'] = $_POST['body_bgcolor']; ! $updated['body_text'] = $_POST['body_text']; ! $updated['body_link'] = $_POST['body_link']; ! $updated['body_vlink'] = $_POST['body_vlink']; ! $updated['body_alink'] = $_POST['body_alink']; ! $updated['body_hlink'] = $_POST['body_hlink']; ! $updated['tr_color1'] = $_POST['tr_color1']; ! $updated_name['tr_color1_name'] = $_POST['tr_color1_name']; ! $updated['tr_color2'] = $_POST['tr_color2']; ! $updated_name['tr_color2_name'] = $_POST['tr_color2_name']; ! $updated['tr_color3'] = $_POST['tr_color3']; ! $updated_name['tr_color3_name'] = $_POST['tr_color3_name']; ! $updated['tr_class1'] = $_POST['tr_class1']; ! $updated_name['tr_class1_name'] = $_POST['tr_class1_name']; ! $updated['tr_class2'] = $_POST['tr_class2']; ! $updated_name['tr_class2_name'] = $_POST['tr_class2_name']; ! $updated['tr_class3'] = $_POST['tr_class3']; ! $updated_name['tr_class3_name'] = $_POST['tr_class3_name']; ! $updated['th_color1'] = $_POST['th_color1']; ! $updated_name['th_color1_name'] = $_POST['th_color1_name']; ! $updated['th_color2'] = $_POST['th_color2']; ! $updated_name['th_color2_name'] = $_POST['th_color2_name']; ! $updated['th_color3'] = $_POST['th_color3']; ! $updated_name['th_color3_name'] = $_POST['th_color3_name']; ! $updated['th_class1'] = $_POST['th_class1']; ! $updated_name['th_class1_name'] = $_POST['th_class1_name']; ! $updated['th_class2'] = $_POST['th_class2']; ! $updated_name['th_class2_name'] = $_POST['th_class2_name']; ! $updated['th_class3'] = $_POST['th_class3']; ! $updated_name['th_class3_name'] = $_POST['th_class3_name']; ! $updated['td_color1'] = $_POST['td_color1']; ! $updated_name['td_color1_name'] = $_POST['td_color1_name']; ! $updated['td_color2'] = $_POST['td_color2']; ! $updated_name['td_color2_name'] = $_POST['td_color2_name']; ! $updated['td_color3'] = $_POST['td_color3']; ! $updated_name['td_color3_name'] = $_POST['td_color3_name']; ! $updated['td_class1'] = $_POST['td_class1']; ! $updated_name['td_class1_name'] = $_POST['td_class1_name']; ! $updated['td_class2'] = $_POST['td_class2']; ! $updated_name['td_class2_name'] = $_POST['td_class2_name']; ! $updated['td_class3'] = $_POST['td_class3']; ! $updated_name['td_class3_name'] = $_POST['td_class3_name']; ! $updated['fontface1'] = $_POST['fontface1']; ! $updated_name['fontface1_name'] = $_POST['fontface1_name']; ! $updated['fontface2'] = $_POST['fontface2']; ! $updated_name['fontface2_name'] = $_POST['fontface2_name']; ! $updated['fontface3'] = $_POST['fontface3']; ! $updated_name['fontface3_name'] = $_POST['fontface3_name']; ! $updated['fontsize1'] = intval($_POST['fontsize1']); ! $updated_name['fontsize1_name'] = $_POST['fontsize1_name']; ! $updated['fontsize2'] = intval($_POST['fontsize2']); ! $updated_name['fontsize2_name'] = $_POST['fontsize2_name']; ! $updated['fontsize3'] = intval($_POST['fontsize3']); ! $updated_name['fontsize3_name'] = $_POST['fontsize3_name']; ! $updated['fontcolor1'] = $_POST['fontcolor1']; ! $updated_name['fontcolor1_name'] = $_POST['fontcolor1_name']; ! $updated['fontcolor2'] = $_POST['fontcolor2']; ! $updated_name['fontcolor2_name'] = $_POST['fontcolor2_name']; ! $updated['fontcolor3'] = $_POST['fontcolor3']; ! $updated_name['fontcolor3_name'] = $_POST['fontcolor3_name']; ! $updated['span_class1'] = $_POST['span_class1']; ! $updated_name['span_class1_name'] = $_POST['span_class1_name']; ! $updated['span_class2'] = $_POST['span_class2']; ! $updated_name['span_class2_name'] = $_POST['span_class2_name']; ! $updated['span_class3'] = $_POST['span_class3']; ! $updated_name['span_class3_name'] = $_POST['span_class3_name']; ! $style_id = intval($_POST['style_id']); // // Wheeeew! Thank heavens for copy and paste and search and replace :D *************** *** 493,497 **** $themes_explain = $lang['Edit_theme_explain']; ! $style_id = intval($HTTP_GET_VARS['style_id']); $selected_names = array(); --- 493,497 ---- $themes_explain = $lang['Edit_theme_explain']; ! $style_id = intval($_GET['style_id']); $selected_names = array(); *************** *** 702,708 **** case "export"; ! if($HTTP_POST_VARS['export_template']) { ! $template_name = $HTTP_POST_VARS['export_template']; $sql = "SELECT * --- 702,708 ---- case "export"; ! if($_POST['export_template']) { ! $template_name = $_POST['export_template']; $sql = "SELECT * *************** *** 774,778 **** } ! else if($HTTP_POST_VARS['send_file']) { --- 774,778 ---- } ! else if($_POST['send_file']) { *************** *** 780,784 **** header("Content-disposition: attachment; filename=theme_info.cfg"); ! echo stripslashes($HTTP_POST_VARS['theme_info']); } else --- 780,784 ---- header("Content-disposition: attachment; filename=theme_info.cfg"); ! echo stripslashes($_POST['theme_info']); } else *************** *** 821,825 **** case "delete": ! $style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']); if( !$confirm ) --- 821,825 ---- case "delete": ! $style_id = ( isset($_GET['style_id']) ) ? intval($_GET['style_id']) : intval($_POST['style_id']); if( !$confirm ) *************** *** 933,937 **** } ! if (empty($HTTP_POST_VARS['send_file'])) { include('./page_footer_admin.'.$phpEx); --- 933,937 ---- } ! if (empty($_POST['send_file'])) { include('./page_footer_admin.'.$phpEx); Index: admin_users.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_users.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_users.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_users.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 45,51 **** // Set mode // ! if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) { ! $mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } --- 45,51 ---- // Set mode // ! if( isset( $_POST['mode'] ) || isset( $_GET['mode'] ) ) { ! $mode = ( isset( $_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; $mode = htmlspecialchars($mode); } *************** *** 58,69 **** // Begin program // ! if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ) { // // Ok, the profile has been modified and submitted, let's update // ! if ( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) || isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) ) { ! $user_id = intval($HTTP_POST_VARS['id']); if (!($this_userdata = get_userdata($user_id))) --- 58,69 ---- // Begin program // ! if ( $mode == 'edit' || $mode == 'save' && ( isset($_POST['username']) || isset($_GET[POST_USERS_URL]) || isset( $_POST[POST_USERS_URL]) ) ) { // // Ok, the profile has been modified and submitted, let's update // ! if ( ( $mode == 'save' && isset( $_POST['submit'] ) ) || isset( $_POST['avatargallery'] ) || isset( $_POST['submitavatar'] ) || isset( $_POST['cancelavatar'] ) ) { ! $user_id = intval($_POST['id']); if (!($this_userdata = get_userdata($user_id))) *************** *** 72,76 **** } ! if( $HTTP_POST_VARS['deleteuser'] ) { $sql = "SELECT g.group_id --- 72,76 ---- } ! if( $_POST['deleteuser'] ) { $sql = "SELECT g.group_id *************** *** 218,275 **** } ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['username']))) : ''; ! $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : ''; ! $password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : ''; ! $password_confirm = ( !empty($HTTP_POST_VARS['password_confirm']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password_confirm'] ) )) : ''; ! $icq = ( !empty($HTTP_POST_VARS['icq']) ) ? trim(strip_tags( $HTTP_POST_VARS['icq'] ) ) : ''; ! $aim = ( !empty($HTTP_POST_VARS['aim']) ) ? trim(strip_tags( $HTTP_POST_VARS['aim'] ) ) : ''; ! $msn = ( !empty($HTTP_POST_VARS['msn']) ) ? trim(strip_tags( $HTTP_POST_VARS['msn'] ) ) : ''; ! $yim = ( !empty($HTTP_POST_VARS['yim']) ) ? trim(strip_tags( $HTTP_POST_VARS['yim'] ) ) : ''; ! $website = ( !empty($HTTP_POST_VARS['website']) ) ? trim(strip_tags( $HTTP_POST_VARS['website'] ) ) : ''; ! $location = ( !empty($HTTP_POST_VARS['location']) ) ? trim(strip_tags( $HTTP_POST_VARS['location'] ) ) : ''; ! $occupation = ( !empty($HTTP_POST_VARS['occupation']) ) ? trim(strip_tags( $HTTP_POST_VARS['occupation'] ) ) : ''; ! $interests = ( !empty($HTTP_POST_VARS['interests']) ) ? trim(strip_tags( $HTTP_POST_VARS['interests'] ) ) : ''; ! $signature = ( !empty($HTTP_POST_VARS['signature']) ) ? trim(str_replace('<br />', "\n", $HTTP_POST_VARS['signature'] ) ) : ''; validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); ! $viewemail = ( isset( $HTTP_POST_VARS['viewemail']) ) ? ( ( $HTTP_POST_VARS['viewemail'] ) ? TRUE : 0 ) : 0; ! $allowviewonline = ( isset( $HTTP_POST_VARS['hideonline']) ) ? ( ( $HTTP_POST_VARS['hideonline'] ) ? 0 : TRUE ) : TRUE; ! $notifyreply = ( isset( $HTTP_POST_VARS['notifyreply']) ) ? ( ( $HTTP_POST_VARS['notifyreply'] ) ? TRUE : 0 ) : 0; ! $notifypm = ( isset( $HTTP_POST_VARS['notifypm']) ) ? ( ( $HTTP_POST_VARS['notifypm'] ) ? TRUE : 0 ) : TRUE; ! $popuppm = ( isset( $HTTP_POST_VARS['popup_pm']) ) ? ( ( $HTTP_POST_VARS['popup_pm'] ) ? TRUE : 0 ) : TRUE; ! $attachsig = ( isset( $HTTP_POST_VARS['attachsig']) ) ? ( ( $HTTP_POST_VARS['attachsig'] ) ? TRUE : 0 ) : 0; ! $allowhtml = ( isset( $HTTP_POST_VARS['allowhtml']) ) ? intval( $HTTP_POST_VARS['allowhtml'] ) : $board_config['allow_html']; ! $allowbbcode = ( isset( $HTTP_POST_VARS['allowbbcode']) ) ? intval( $HTTP_POST_VARS['allowbbcode'] ) : $board_config['allow_bbcode']; ! $allowsmilies = ( isset( $HTTP_POST_VARS['allowsmilies']) ) ? intval( $HTTP_POST_VARS['allowsmilies'] ) : $board_config['allow_smilies']; ! $user_style = ( $HTTP_POST_VARS['style'] ) ? intval( $HTTP_POST_VARS['style'] ) : $board_config['default_style']; ! $user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; ! $user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone']; ! $user_template = ( $HTTP_POST_VARS['template'] ) ? $HTTP_POST_VARS['template'] : $board_config['board_template']; ! $user_dateformat = ( $HTTP_POST_VARS['dateformat'] ) ? trim( $HTTP_POST_VARS['dateformat'] ) : $board_config['default_dateformat']; ! $user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] ) ) ? $HTTP_POST_VARS['avatarlocal'] : '' ); ! $user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim( $HTTP_POST_VARS['avatarremoteurl'] ) : ''; ! $user_avatar_url = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim( $HTTP_POST_VARS['avatarurl'] ) : ''; ! $user_avatar_loc = ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : ''; ! $user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : ''; ! $user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0; ! $user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : ''; $user_avatar = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar'] : ''; $user_avatar_type = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar_type'] : ''; ! $user_status = ( !empty($HTTP_POST_VARS['user_status']) ) ? intval( $HTTP_POST_VARS['user_status'] ) : 0; ! $user_allowpm = ( !empty($HTTP_POST_VARS['user_allowpm']) ) ? intval( $HTTP_POST_VARS['user_allowpm'] ) : 0; ! $user_rank = ( !empty($HTTP_POST_VARS['user_rank']) ) ? intval( $HTTP_POST_VARS['user_rank'] ) : 0; ! $user_allowavatar = ( !empty($HTTP_POST_VARS['user_allowavatar']) ) ? intval( $HTTP_POST_VARS['user_allowavatar'] ) : 0; ! if( isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) ) { $username = stripslashes($username); --- 218,275 ---- } ! $username = ( !empty($_POST['username']) ) ? trim(strip_tags(htmlspecialchars($_POST['username']))) : ''; ! $email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars( $_POST['email'] ) )) : ''; ! $password = ( !empty($_POST['password']) ) ? trim(strip_tags(htmlspecialchars( $_POST['password'] ) )) : ''; ! $password_confirm = ( !empty($_POST['password_confirm']) ) ? trim(strip_tags(htmlspecialchars( $_POST['password_confirm'] ) )) : ''; ! $icq = ( !empty($_POST['icq']) ) ? trim(strip_tags( $_POST['icq'] ) ) : ''; ! $aim = ( !empty($_POST['aim']) ) ? trim(strip_tags( $_POST['aim'] ) ) : ''; ! $msn = ( !empty($_POST['msn']) ) ? trim(strip_tags( $_POST['msn'] ) ) : ''; ! $yim = ( !empty($_POST['yim']) ) ? trim(strip_tags( $_POST['yim'] ) ) : ''; ! $website = ( !empty($_POST['website']) ) ? trim(strip_tags( $_POST['website'] ) ) : ''; ! $location = ( !empty($_POST['location']) ) ? trim(strip_tags( $_POST['location'] ) ) : ''; ! $occupation = ( !empty($_POST['occupation']) ) ? trim(strip_tags( $_POST['occupation'] ) ) : ''; ! $interests = ( !empty($_POST['interests']) ) ? trim(strip_tags( $_POST['interests'] ) ) : ''; ! $signature = ( !empty($_POST['signature']) ) ? trim(str_replace('<br />', "\n", $_POST['signature'] ) ) : ''; validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); ! $viewemail = ( isset( $_POST['viewemail']) ) ? ( ( $_POST['viewemail'] ) ? TRUE : 0 ) : 0; ! $allowviewonline = ( isset( $_POST['hideonline']) ) ? ( ( $_POST['hideonline'] ) ? 0 : TRUE ) : TRUE; ! $notifyreply = ( isset( $_POST['notifyreply']) ) ? ( ( $_POST['notifyreply'] ) ? TRUE : 0 ) : 0; ! $notifypm = ( isset( $_POST['notifypm']) ) ? ( ( $_POST['notifypm'] ) ? TRUE : 0 ) : TRUE; ! $popuppm = ( isset( $_POST['popup_pm']) ) ? ( ( $_POST['popup_pm'] ) ? TRUE : 0 ) : TRUE; ! $attachsig = ( isset( $_POST['attachsig']) ) ? ( ( $_POST['attachsig'] ) ? TRUE : 0 ) : 0; ! $allowhtml = ( isset( $_POST['allowhtml']) ) ? intval( $_POST['allowhtml'] ) : $board_config['allow_html']; ! $allowbbcode = ( isset( $_POST['allowbbcode']) ) ? intval( $_POST['allowbbcode'] ) : $board_config['allow_bbcode']; ! $allowsmilies = ( isset( $_POST['allowsmilies']) ) ? intval( $_POST['allowsmilies'] ) : $board_config['allow_smilies']; ! $user_style = ( $_POST['style'] ) ? intval( $_POST['style'] ) : $board_config['default_style']; ! $user_lang = ( $_POST['language'] ) ? $_POST['language'] : $board_config['default_lang']; ! $user_timezone = ( isset( $_POST['timezone']) ) ? doubleval( $_POST['timezone'] ) : $board_config['board_timezone']; ! $user_template = ( $_POST['template'] ) ? $_POST['template'] : $board_config['board_template']; ! $user_dateformat = ( $_POST['dateformat'] ) ? trim( $_POST['dateformat'] ) : $board_config['default_dateformat']; ! $user_avatar_local = ( isset( $_POST['avatarselect'] ) && !empty($_POST['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $_POST['avatarselect'] : ( ( isset( $_POST['avatarlocal'] ) ) ? $_POST['avatarlocal'] : '' ); ! $user_avatar_remoteurl = ( !empty($_POST['avatarremoteurl']) ) ? trim( $_POST['avatarremoteurl'] ) : ''; ! $user_avatar_url = ( !empty($_POST['avatarurl']) ) ? trim( $_POST['avatarurl'] ) : ''; ! $user_avatar_loc = ( $_FILES['avatar']['tmp_name'] != "none") ? $_FILES['avatar']['tmp_name'] : ''; ! $user_avatar_name = ( !empty($_FILES['avatar']['name']) ) ? $_FILES['avatar']['name'] : ''; ! $user_avatar_size = ( !empty($_FILES['avatar']['size']) ) ? $_FILES['avatar']['size'] : 0; ! $user_avatar_filetype = ( !empty($_FILES['avatar']['type']) ) ? $_FILES['avatar']['type'] : ''; $user_avatar = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar'] : ''; $user_avatar_type = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar_type'] : ''; ! $user_status = ( !empty($_POST['user_status']) ) ? intval( $_POST['user_status'] ) : 0; ! $user_allowpm = ( !empty($_POST['user_allowpm']) ) ? intval( $_POST['user_allowpm'] ) : 0; ! $user_rank = ( !empty($_POST['user_rank']) ) ? intval( $_POST['user_rank'] ) : 0; ! $user_allowavatar = ( !empty($_POST['user_allowavatar']) ) ? intval( $_POST['user_allowavatar'] ) : 0; ! if( isset( $_POST['avatargallery'] ) || isset( $_POST['submitavatar'] ) || isset( $_POST['cancelavatar'] ) ) { $username = stripslashes($username); *************** *** 292,296 **** $user_dateformat = htmlspecialchars(stripslashes($user_dateformat)); ! if ( !isset($HTTP_POST_VARS['cancelavatar'])) { $user_avatar = $user_avatar_local; --- 292,296 ---- $user_dateformat = htmlspecialchars(stripslashes($user_dateformat)); ! if ( !isset($_POST['cancelavatar'])) { $user_avatar = $user_avatar_local; *************** *** 300,304 **** } ! if( isset( $HTTP_POST_VARS['submit'] ) ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); --- 300,304 ---- } ! if( isset( $_POST['submit'] ) ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); *************** *** 386,390 **** // $avatar_sql = ""; ! if( isset($HTTP_POST_VARS['avatardel']) ) { if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" ) --- 386,390 ---- // $avatar_sql = ""; ! if( isset($_POST['avatardel']) ) { if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" ) *************** *** 727,735 **** } } ! else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' && !isset( $HTTP_POST_VARS['avatargallery'] ) && !isset( $HTTP_POST_VARS['submitavatar'] ) && !isset( $HTTP_POST_VARS['cancelavatar'] ) ) { ! if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) { ! $user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]); $this_userdata = get_userdata($user_id); if( !$this_userdata ) --- 727,735 ---- } } ! else if( !isset( $_POST['submit'] ) && $mode != 'save' && !isset( $_POST['avatargallery'] ) && !isset( $_POST['submitavatar'] ) && !isset( $_POST['cancelavatar'] ) ) { ! if( isset( $_GET[POST_USERS_URL]) || isset( $_POST[POST_USERS_URL]) ) { ! $user_id = ( isset( $_POST[POST_USERS_URL]) ) ? intval( $_POST[POST_USERS_URL]) : intval( $_GET[POST_USERS_URL]); $this_userdata = get_userdata($user_id); if( !$this_userdata ) *************** *** 740,744 **** else { ! $this_userdata = get_userdata($HTTP_POST_VARS['username'], true); if( !$this_userdata ) { --- 740,744 ---- else { ! $this_userdata = get_userdata($_POST['username'], true); if( !$this_userdata ) { *************** *** 797,805 **** } ! if( isset($HTTP_POST_VARS['avatargallery']) && !$error ) { if( !$error ) { ! $user_id = intval($HTTP_POST_VARS['id']); $template->set_filenames(array( --- 797,805 ---- } ! if( isset($_POST['avatargallery']) && !$error ) { if( !$error ) { ! $user_id = intval($_POST['id']); $template->set_filenames(array( *************** *** 838,844 **** @closedir($dir); ! if( isset($HTTP_POST_VARS['avatarcategory']) ) { ! $category = htmlspecialchars($HTTP_POST_VARS['avatarcategory']); } else --- 838,844 ---- @closedir($dir); ! if( isset($_POST['avatarcategory']) ) { ! $category = htmlspecialchars($_POST['avatarcategory']); } else *************** *** 877,881 **** } ! $coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == "register") ? 0 : TRUE; $s_hidden_fields = '<input type="hidden" name="mode" value="edit" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; --- 877,881 ---- } ! $coppa = ( ( !$_POST['coppa'] && !$_GET['coppa'] ) || $mode == "register") ? 0 : TRUE; $s_hidden_fields = '<input type="hidden" name="mode" value="edit" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; Index: index.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.php 29 Jul 2004 22:30:29 -0000 1.1 --- index.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 52,56 **** // Generate relevant output // ! if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' ) { $dir = @opendir("."); --- 52,56 ---- // Generate relevant output // ! if( isset($_GET['pane']) && $_GET['pane'] == 'left' ) { $dir = @opendir("."); *************** *** 119,123 **** include('./page_footer_admin.'.$phpEx); } ! elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' ) { --- 119,123 ---- include('./page_footer_admin.'.$phpEx); } ! elseif( isset($_GET['pane']) && $_GET['pane'] == 'right' ) { Index: page_header_admin.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/page_header_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header_admin.php 29 Jul 2004 22:30:29 -0000 1.1 --- page_header_admin.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 47,51 **** else if ( $phpver > '4.0' ) { ! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) --- 47,51 ---- else if ( $phpver > '4.0' ) { ! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) Index: admin_ug_auth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_ug_auth.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_ug_auth.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 45,51 **** while( list($var, $param) = @each($params) ) { ! if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) { ! $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? $HTTP_POST_VARS[$param] : $HTTP_GET_VARS[$param]; } else --- 45,51 ---- while( list($var, $param) = @each($params) ) { ! if ( !empty($_POST[$param]) || !empty($_GET[$param]) ) { ! $$var = ( !empty($_POST[$param]) ) ? $_POST[$param] : $_GET[$param]; } else *************** *** 128,132 **** // ------------- ! if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == 'user' && $user_id ) || ( $mode == 'group' && $group_id ) ) ) { $user_level = ''; --- 128,132 ---- // ------------- ! if ( isset($_POST['submit']) && ( ( $mode == 'user' && $user_id ) || ( $mode == 'group' && $group_id ) ) ) { $user_level = ''; *************** *** 158,162 **** // Carry out requests // ! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN ) { // --- 158,162 ---- // Carry out requests // ! if ( $mode == 'user' && $_POST['userlevel'] == 'admin' && $user_level != ADMIN ) { // *************** *** 199,203 **** else { ! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN ) { // --- 199,203 ---- else { ! if ( $mode == 'user' && $_POST['userlevel'] == 'user' && $user_level == ADMIN ) { // *************** *** 232,240 **** { ! $change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false; if ( empty($adv) ) { ! $change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false; } else --- 232,240 ---- { ! $change_mod_list = ( isset($_POST['moderator']) ) ? $_POST['moderator'] : false; if ( empty($adv) ) { ! $change_acl_list = ( isset($_POST['private']) ) ? $_POST['private'] : false; } else *************** *** 245,249 **** $auth_field = $forum_auth_fields[$j]; ! while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) ) { $change_acl_list[$forum_id][$auth_field] = $value; --- 245,249 ---- $auth_field = $forum_auth_fields[$j]; ! while( list($forum_id, $value) = @each($_POST['private_' . $auth_field]) ) { $change_acl_list[$forum_id][$auth_field] = $value; *************** *** 512,520 **** } } ! else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id ) ) || ( $mode == 'group' && $group_id ) ) { ! if ( isset($HTTP_POST_VARS['username']) ) { ! $this_userdata = get_userdata($HTTP_POST_VARS['username'], true); if ( !is_array($this_userdata) ) { --- 512,520 ---- } } ! else if ( ( $mode == 'user' && ( isset($_POST['username']) || $user_id ) ) || ( $mode == 'group' && $group_id ) ) { ! if ( isset($_POST['username']) ) { ! $this_userdata = get_userdata($_POST['username'], true); if ( !is_array($this_userdata) ) { Index: admin_user_ban.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_user_ban.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_user_ban.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_user_ban.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 41,45 **** // Start program // ! if ( isset($HTTP_POST_VARS['submit']) ) { $user_bansql = ''; --- 41,45 ---- // Start program // ! if ( isset($_POST['submit']) ) { $user_bansql = ''; *************** *** 48,54 **** $user_list = array(); ! if ( !empty($HTTP_POST_VARS['username']) ) { ! $this_userdata = get_userdata($HTTP_POST_VARS['username'], true); if( !$this_userdata ) { --- 48,54 ---- $user_list = array(); ! if ( !empty($_POST['username']) ) { ! $this_userdata = get_userdata($_POST['username'], true); if( !$this_userdata ) { *************** *** 60,66 **** $ip_list = array(); ! if ( isset($HTTP_POST_VARS['ban_ip']) ) { ! $ip_list_temp = explode(',', $HTTP_POST_VARS['ban_ip']); for($i = 0; $i < count($ip_list_temp); $i++) --- 60,66 ---- $ip_list = array(); ! if ( isset($_POST['ban_ip']) ) { ! $ip_list_temp = explode(',', $_POST['ban_ip']); for($i = 0; $i < count($ip_list_temp); $i++) *************** *** 145,151 **** $email_list = array(); ! if ( isset($HTTP_POST_VARS['ban_email']) ) { ! $email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']); for($i = 0; $i < count($email_list_temp); $i++) --- 145,151 ---- $email_list = array(); ! if ( isset($_POST['ban_email']) ) { ! $email_list_temp = explode(',', $_POST['ban_email']); for($i = 0; $i < count($email_list_temp); $i++) *************** *** 270,276 **** $where_sql = ''; ! if ( isset($HTTP_POST_VARS['unban_user']) ) { ! $user_list = $HTTP_POST_VARS['unban_user']; for($i = 0; $i < count($user_list); $i++) --- 270,276 ---- $where_sql = ''; ! if ( isset($_POST['unban_user']) ) { ! $user_list = $_POST['unban_user']; for($i = 0; $i < count($user_list); $i++) *************** *** 283,289 **** } ! if ( isset($HTTP_POST_VARS['unban_ip']) ) { ! $ip_list = $HTTP_POST_VARS['unban_ip']; for($i = 0; $i < count($ip_list); $i++) --- 283,289 ---- } ! if ( isset($_POST['unban_ip']) ) { ! $ip_list = $_POST['unban_ip']; for($i = 0; $i < count($ip_list); $i++) *************** *** 296,302 **** } ! if ( isset($HTTP_POST_VARS['unban_email']) ) { ! $email_list = $HTTP_POST_VARS['unban_email']; for($i = 0; $i < count($email_list); $i++) --- 296,302 ---- } ! if ( isset($_POST['unban_email']) ) { ! $email_list = $_POST['unban_email']; for($i = 0; $i < count($email_list); $i++) Index: admin_forumauth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_forumauth.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_forumauth.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_forumauth.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 72,78 **** $forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN); ! if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL])) { ! $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? intval($HTTP_POST_VARS[POST_FORUM_URL]) : intval($HTTP_GET_VARS[POST_FORUM_URL]); $forum_sql = "AND forum_id = $forum_id"; } --- 72,78 ---- $forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN); ! if(isset($_GET[POST_FORUM_URL]) || isset($_POST[POST_FORUM_URL])) { ! $forum_id = (isset($_POST[POST_FORUM_URL])) ? intval($_POST[POST_FORUM_URL]) : intval($_GET[POST_FORUM_URL]); $forum_sql = "AND forum_id = $forum_id"; } *************** *** 83,89 **** } ! if( isset($HTTP_GET_VARS['adv']) ) { ! $adv = intval($HTTP_GET_VARS['adv']); } else --- 83,89 ---- } ! if( isset($_GET['adv']) ) { ! $adv = intval($_GET['adv']); } else *************** *** 95,99 **** // Start program proper // ! if( isset($HTTP_POST_VARS['submit']) ) { $sql = ''; --- 95,99 ---- // Start program proper // ! if( isset($_POST['submit']) ) { $sql = ''; *************** *** 101,107 **** if(!empty($forum_id)) { ! if(isset($HTTP_POST_VARS['simpleauth'])) { ! $simple_ary = $simple_auth_ary[intval($HTTP_POST_VARS['simpleauth'])]; for($i = 0; $i < count($simple_ary); $i++) --- 101,107 ---- if(!empty($forum_id)) { ! if(isset($_POST['simpleauth'])) { ! $simple_ary = $simple_auth_ary[intval($_POST['simpleauth'])]; for($i = 0; $i < count($simple_ary); $i++) *************** *** 119,127 **** for($i = 0; $i < count($forum_auth_fields); $i++) { ! $value = intval($HTTP_POST_VARS[$forum_auth_fields[$i]]); if ( $forum_auth_fields[$i] == 'auth_vote' ) { ! if ( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL ) { $value = AUTH_REG; --- 119,127 ---- for($i = 0; $i < count($forum_auth_fields); $i++) { ! $value = intval($_POST[$forum_auth_fields[$i]]); if ( $forum_auth_fields[$i] == 'auth_vote' ) { ! if ( $_POST['auth_vote'] == AUTH_ALL ) { $value = AUTH_REG; Index: admin_mass_email.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_mass_email.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mass_email.php 29 Jul 2004 22:30:29 -0000 1.1 --- admin_mass_email.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 50,57 **** // Do the job ... // ! if ( isset($HTTP_POST_VARS['submit']) ) { ! $subject = stripslashes(trim($HTTP_POST_VARS['subject'])); ! $message = stripslashes(trim($HTTP_POST_VARS['message'])); $error = FALSE; --- 50,57 ---- // Do the job ... // ! if ( isset($_POST['submit']) ) { ! $subject = stripslashes(trim($_POST['subject'])); ! $message = stripslashes(trim($_POST['message'])); $error = FALSE; *************** *** 70,74 **** } ! $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]); $sql = ( $group_id != -1 ) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE; --- 70,74 ---- } ! $group_id = intval($_POST[POST_GROUPS_URL]); $sql = ( $group_id != -1 ) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE; Index: admin_board.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_board.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_board.php 29 Jul 2004 22:30:28 -0000 1.1 --- admin_board.php 30 Jul 2004 02:12:37 -0000 1.2 *************** *** 44,50 **** $config_name = $row['config_name']; $config_value = $row['config_value']; ! $default_config[$config_name] = isset($HTTP_POST_VARS['submit']) ? str_replace("'", "\'", $config_value) : $config_value; ! $new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name]; if ($config_name == 'cookie_name') --- 44,50 ---- $config_name = $row['config_name']; $config_value = $row['config_value']; ! $default_config[$config_name] = isset($_POST['submit']) ? str_replace("'", "\'", $config_value) : $config_value; ! $new[$config_name] = ( isset($_POST[$config_name]) ) ? $_POST[$config_name] : $default_config[$config_name]; if ($config_name == 'cookie_name') *************** *** 53,57 **** } ! if( isset($HTTP_POST_VARS['subm... [truncated message content] |
|
From: geocator <geo...@us...> - 2004-07-30 02:12:48
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115/install Modified Files: install.php upgrade.php Log Message: Say goodbye long array names. Say hello superglobals. Removed code in common.php to try to rename the variables at runtime. No longer needed since we are renaming them. Index: install.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/install.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.php 29 Jul 2004 22:36:20 -0000 1.1 --- install.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 140,144 **** function guess_lang() { ! global $phpbb_root_path, $HTTP_SERVER_VARS; // The order here _is_ important, at least for major_minor --- 140,144 ---- function guess_lang() { ! global $phpbb_root_path, $_SERVER; // The order here _is_ important, at least for major_minor *************** *** 196,202 **** ); ! if (isset($HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'])) { ! $accept_lang_ary = explode(',', $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE']); for ($i = 0; $i < sizeof($accept_lang_ary); $i++) { --- 196,202 ---- ); ! if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { ! $accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); for ($i = 0; $i < sizeof($accept_lang_ary); $i++) { *************** *** 229,290 **** if (!get_magic_quotes_gpc()) { ! if (is_array($HTTP_GET_VARS)) { ! while (list($k, $v) = each($HTTP_GET_VARS)) { ! if (is_array($HTTP_GET_VARS[$k])) { ! while (list($k2, $v2) = each($HTTP_GET_VARS[$k])) { ! $HTTP_GET_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_GET_VARS[$k]); } else { ! $HTTP_GET_VARS[$k] = addslashes($v); } } ! @reset($HTTP_GET_VARS); } ! if (is_array($HTTP_POST_VARS)) { ! while (list($k, $v) = each($HTTP_POST_VARS)) { ! if (is_array($HTTP_POST_VARS[$k])) { ! while (list($k2, $v2) = each($HTTP_POST_VARS[$k])) { ! $HTTP_POST_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_POST_VARS[$k]); } else { ! $HTTP_POST_VARS[$k] = addslashes($v); } } ! @reset($HTTP_POST_VARS); } ! if (is_array($HTTP_COOKIE_VARS)) { ! while (list($k, $v) = each($HTTP_COOKIE_VARS)) { ! if (is_array($HTTP_COOKIE_VARS[$k])) { ! while (list($k2, $v2) = each($HTTP_COOKIE_VARS[$k])) { ! $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_COOKIE_VARS[$k]); } else { ! $HTTP_COOKIE_VARS[$k] = addslashes($v); } } ! @reset($HTTP_COOKIE_VARS); } } --- 229,290 ---- if (!get_magic_quotes_gpc()) { ! if (is_array($_GET)) { ! while (list($k, $v) = each($_GET)) { ! if (is_array($_GET[$k])) { ! while (list($k2, $v2) = each($_GET[$k])) { ! $_GET[$k][$k2] = addslashes($v2); } ! @reset($_GET[$k]); } else { ! $_GET[$k] = addslashes($v); } } ! @reset($_GET); } ! if (is_array($_POST)) { ! while (list($k, $v) = each($_POST)) { ! if (is_array($_POST[$k])) { ! while (list($k2, $v2) = each($_POST[$k])) { ! $_POST[$k][$k2] = addslashes($v2); } ! @reset($_POST[$k]); } else { ! $_POST[$k] = addslashes($v); } } ! @reset($_POST); } ! if (is_array($_COOKIE)) { ! while (list($k, $v) = each($_COOKIE)) { ! if (is_array($_COOKIE[$k])) { ! while (list($k2, $v2) = each($_COOKIE[$k])) { ! $_COOKIE[$k][$k2] = addslashes($v2); } ! @reset($_COOKIE[$k]); } else { ! $_COOKIE[$k] = addslashes($v); } } ! @reset($_COOKIE); } } *************** *** 354,363 **** // Obtain various vars ! $confirm = (isset($HTTP_POST_VARS['confirm'])) ? true : false; ! $cancel = (isset($HTTP_POST_VARS['cancel'])) ? true : false; ! if (isset($HTTP_POST_VARS['install_step']) || isset($HTTP_GET_VARS['install_step'])) { ! $install_step = (isset($HTTP_POST_VARS['install_step'])) ? $HTTP_POST_VARS['install_step'] : $HTTP_GET_VARS['install_step']; } else --- 354,363 ---- // Obtain various vars ! $confirm = (isset($_POST['confirm'])) ? true : false; ! $cancel = (isset($_POST['cancel'])) ? true : false; ! if (isset($_POST['install_step']) || isset($_GET['install_step'])) { ! $install_step = (isset($_POST['install_step'])) ? $_POST['install_step'] : $_GET['install_step']; } else *************** *** 366,392 **** } ! $upgrade = (!empty($HTTP_POST_VARS['upgrade'])) ? $HTTP_POST_VARS['upgrade']: ''; ! $upgrade_now = (!empty($HTTP_POST_VARS['upgrade_now'])) ? $HTTP_POST_VARS['upgrade_now']:''; ! $dbms = isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : ''; ! $dbhost = (!empty($HTTP_POST_VARS['dbhost'])) ? $HTTP_POST_VARS['dbhost'] : 'localhost'; ! $dbuser = (!empty($HTTP_POST_VARS['dbuser'])) ? $HTTP_POST_VARS['dbuser'] : ''; ! $dbpasswd = (!empty($HTTP_POST_VARS['dbpasswd'])) ? $HTTP_POST_VARS['dbpasswd'] : ''; ! $dbname = (!empty($HTTP_POST_VARS['dbname'])) ? $HTTP_POST_VARS['dbname'] : ''; ! $table_prefix = (!empty($HTTP_POST_VARS['prefix'])) ? $HTTP_POST_VARS['prefix'] : ''; ! $admin_name = (!empty($HTTP_POST_VARS['admin_name'])) ? $HTTP_POST_VARS['admin_name'] : ''; ! $admin_pass1 = (!empty($HTTP_POST_VARS['admin_pass1'])) ? $HTTP_POST_VARS['admin_pass1'] : ''; ! $admin_pass2 = (!empty($HTTP_POST_VARS['admin_pass2'])) ? $HTTP_POST_VARS['admin_pass2'] : ''; ! $ftp_path = (!empty($HTTP_POST_VARS['ftp_path'])) ? $HTTP_POST_VARS['ftp_path'] : ''; ! $ftp_user = (!empty($HTTP_POST_VARS['ftp_user'])) ? $HTTP_POST_VARS['ftp_user'] : ''; ! $ftp_pass = (!empty($HTTP_POST_VARS['ftp_pass'])) ? $HTTP_POST_VARS['ftp_pass'] : ''; ! if (isset($HTTP_POST_VARS['lang']) && preg_match('#^[a-z_]+$#', $HTTP_POST_VARS['lang'])) { ! $language = strip_tags($HTTP_POST_VARS['lang']); } else --- 366,392 ---- } ! $upgrade = (!empty($_POST['upgrade'])) ? $_POST['upgrade']: ''; ! $upgrade_now = (!empty($_POST['upgrade_now'])) ? $_POST['upgrade_now']:''; ! $dbms = isset($_POST['dbms']) ? $_POST['dbms'] : ''; ! $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost'; ! $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : ''; ! $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : ''; ! $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : ''; ! $table_prefix = (!empty($_POST['prefix'])) ? $_POST['prefix'] : ''; ! $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : ''; ! $admin_pass1 = (!empty($_POST['admin_pass1'])) ? $_POST['admin_pass1'] : ''; ! $admin_pass2 = (!empty($_POST['admin_pass2'])) ? $_POST['admin_pass2'] : ''; ! $ftp_path = (!empty($_POST['ftp_path'])) ? $_POST['ftp_path'] : ''; ! $ftp_user = (!empty($_POST['ftp_user'])) ? $_POST['ftp_user'] : ''; ! $ftp_pass = (!empty($_POST['ftp_pass'])) ? $_POST['ftp_pass'] : ''; ! if (isset($_POST['lang']) && preg_match('#^[a-z_]+$#', $_POST['lang'])) { ! $language = strip_tags($_POST['lang']); } else *************** *** 395,415 **** } ! $board_email = (!empty($HTTP_POST_VARS['board_email'])) ? $HTTP_POST_VARS['board_email'] : ''; ! $script_path = (!empty($HTTP_POST_VARS['script_path'])) ? $HTTP_POST_VARS['script_path'] : str_replace('install', '', dirname($HTTP_SERVER_VARS['PHP_SELF'])); ! if (!empty($HTTP_POST_VARS['server_name'])) { ! $server_name = $HTTP_POST_VARS['server_name']; } else { // Guess at some basic info used for install.. ! if (!empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME'])) { ! $server_name = (!empty($HTTP_SERVER_VARS['SERVER_NAME'])) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME']; } ! else if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST'])) { ! $server_name = (!empty($HTTP_SERVER_VARS['HTTP_HOST'])) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST']; } else --- 395,415 ---- } ! $board_email = (!empty($_POST['board_email'])) ? $_POST['board_email'] : ''; ! $script_path = (!empty($_POST['script_path'])) ? $_POST['script_path'] : str_replace('install', '', dirname($_SERVER['PHP_SELF'])); ! if (!empty($_POST['server_name'])) { ! $server_name = $_POST['server_name']; } else { // Guess at some basic info used for install.. ! if (!empty($_SERVER['SERVER_NAME']) || !empty($_ENV['SERVER_NAME'])) { ! $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $_ENV['SERVER_NAME']; } ! else if (!empty($_SERVER['HTTP_HOST']) || !empty($_ENV['HTTP_HOST'])) { ! $server_name = (!empty($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : $_ENV['HTTP_HOST']; } else *************** *** 419,431 **** } ! if (!empty($HTTP_POST_VARS['server_port'])) { ! $server_port = $HTTP_POST_VARS['server_port']; } else { ! if (!empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT'])) { ! $server_port = (!empty($HTTP_SERVER_VARS['SERVER_PORT'])) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $HTTP_ENV_VARS['SERVER_PORT']; } else --- 419,431 ---- } ! if (!empty($_POST['server_port'])) { ! $server_port = $_POST['server_port']; } else { ! if (!empty($_SERVER['SERVER_PORT']) || !empty($_ENV['SERVER_PORT'])) { ! $server_port = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : $_ENV['SERVER_PORT']; } else *************** *** 461,465 **** // What do we need to do? ! if (!empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1 && empty($HTTP_POST_VARS['upgrade_now'])) { header('Content-Type: text/x-delimtext; name="config.' . $phpEx . '"'); --- 461,465 ---- // What do we need to do? ! if (!empty($_POST['send_file']) && $_POST['send_file'] == 1 && empty($_POST['upgrade_now'])) { header('Content-Type: text/x-delimtext; name="config.' . $phpEx . '"'); *************** *** 469,479 **** // because we add slashes at the top if its off, and they are added automaticlly // if it is on. ! echo stripslashes($HTTP_POST_VARS['config_data']); exit; } ! else if (!empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2) { ! $s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars(stripslashes($HTTP_POST_VARS['config_data'])) . '" />'; $s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />'; --- 469,479 ---- // because we add slashes at the top if its off, and they are added automaticlly // if it is on. ! echo stripslashes($_POST['config_data']); exit; } ! else if (!empty($_POST['send_file']) && $_POST['send_file'] == 2) { ! $s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars(stripslashes($_POST['config_data'])) . '" />'; $s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />'; *************** *** 508,512 **** } ! else if (!empty($HTTP_POST_VARS['ftp_file'])) { // Try to connect ... --- 508,512 ---- } ! else if (!empty($_POST['ftp_file'])) { // Try to connect ... *************** *** 519,523 **** // Error couldn't get connected... Go back to option to send file... ! $s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars(stripslashes($HTTP_POST_VARS['config_data'])) . '" />'; $s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />'; --- 519,523 ---- // Error couldn't get connected... Go back to option to send file... ! $s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars(stripslashes($_POST['config_data'])) . '" />'; $s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />'; *************** *** 560,564 **** $fp = @fopen($tmpfname, 'w'); ! @fwrite($fp, stripslashes($HTTP_POST_VARS['config_data'])); @fclose($fp); --- 560,564 ---- $fp = @fopen($tmpfname, 'w'); ! @fwrite($fp, stripslashes($_POST['config_data'])); @fclose($fp); *************** *** 606,611 **** if (!empty($install_step)) { ! if ((($HTTP_POST_VARS['admin_pass1'] != $HTTP_POST_VARS['admin_pass2'])) || ! (empty($HTTP_POST_VARS['admin_pass1']) || empty($dbhost)) && $HTTP_POST_VARS['cur_lang'] == $language) { $error = $lang['Password_mismatch']; --- 606,611 ---- if (!empty($install_step)) { ! if ((($_POST['admin_pass1'] != $_POST['admin_pass2'])) || ! (empty($_POST['admin_pass1']) || empty($dbhost)) && $_POST['cur_lang'] == $language) { $error = $lang['Password_mismatch']; Index: upgrade.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/install/upgrade.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** upgrade.php 29 Jul 2004 22:36:20 -0000 1.1 --- upgrade.php 30 Jul 2004 02:12:39 -0000 1.2 *************** *** 398,402 **** // Start at the beginning if the user hasn't specified a specific starting point. // ! $next = ( isset($HTTP_GET_VARS['next']) ) ? $HTTP_GET_VARS['next'] : 'start'; // If debug is set we'll do all steps in one go. --- 398,402 ---- // Start at the beginning if the user hasn't specified a specific starting point. // ! $next = ( isset($_GET['next']) ) ? $_GET['next'] : 'start'; // If debug is set we'll do all steps in one go. *************** *** 1879,1883 **** $per_percent = round(( $totalposts / 500 ) * 10); ! $postcounter = ( !isset($HTTP_GET_VARS['batchstart']) ) ? 0 : $HTTP_GET_VARS['batchstart']; $batchsize = 150; // Process this many posts per loop --- 1879,1883 ---- $per_percent = round(( $totalposts / 500 ) * 10); ! $postcounter = ( !isset($_GET['batchstart']) ) ? 0 : $_GET['batchstart']; $batchsize = 150; // Process this many posts per loop |
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115/includes Modified Files: page_header.php sessions.php usercp_activate.php usercp_email.php usercp_register.php usercp_sendpasswd.php usercp_viewprofile.php Log Message: Say goodbye long array names. Say hello superglobals. Removed code in common.php to try to rename the variables at runtime. No longer needed since we are renaming them. Index: usercp_sendpasswd.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_sendpasswd.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_sendpasswd.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_sendpasswd.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 28,35 **** } ! if ( isset($HTTP_POST_VARS['submit']) ) { ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : ''; ! $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : ''; $sql = "SELECT user_id, username, user_email, user_active, user_lang --- 28,35 ---- } ! if ( isset($_POST['submit']) ) { ! $username = ( !empty($_POST['username']) ) ? trim(strip_tags($_POST['username'])) : ''; ! $email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : ''; $sql = "SELECT user_id, username, user_email, user_active, user_lang Index: usercp_email.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_email.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_email.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_email.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 34,40 **** } ! if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) ) { ! $user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? intval($HTTP_GET_VARS[POST_USERS_URL]) : intval($HTTP_POST_VARS[POST_USERS_URL]); } else --- 34,40 ---- } ! if ( !empty($_GET[POST_USERS_URL]) || !empty($_POST[POST_USERS_URL]) ) { ! $user_id = ( !empty($_GET[POST_USERS_URL]) ) ? intval($_GET[POST_USERS_URL]) : intval($_POST[POST_USERS_URL]); } else *************** *** 66,76 **** } ! if ( isset($HTTP_POST_VARS['submit']) ) { $error = FALSE; ! if ( !empty($HTTP_POST_VARS['subject']) ) { ! $subject = trim(stripslashes($HTTP_POST_VARS['subject'])); } else --- 66,76 ---- } ! if ( isset($_POST['submit']) ) { $error = FALSE; ! if ( !empty($_POST['subject']) ) { ! $subject = trim(stripslashes($_POST['subject'])); } else *************** *** 80,86 **** } ! if ( !empty($HTTP_POST_VARS['message']) ) { ! $message = trim(stripslashes($HTTP_POST_VARS['message'])); } else --- 80,86 ---- } ! if ( !empty($_POST['message']) ) { ! $message = trim(stripslashes($_POST['message'])); } else *************** *** 123,127 **** $emailer->reset(); ! if ( !empty($HTTP_POST_VARS['cc_email']) ) { $emailer->from($userdata['user_email']); --- 123,127 ---- $emailer->reset(); ! if ( !empty($_POST['cc_email']) ) { $emailer->from($userdata['user_email']); Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sessions.php 29 Jul 2004 22:36:20 -0000 1.1 --- sessions.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 28,32 **** { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 28,32 ---- { global $db, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; *************** *** 35,42 **** $cookiesecure = $board_config['cookie_secure']; ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; ! $sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } --- 35,42 ---- $cookiesecure = $board_config['cookie_secure']; ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $session_id = isset($_COOKIE[$cookiename . '_sid']) ? $_COOKIE[$cookiename . '_sid'] : ''; ! $sessiondata = isset($_COOKIE[$cookiename . '_data']) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 44,48 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 44,48 ---- { $sessiondata = array(); ! $session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } *************** *** 201,205 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 201,205 ---- { global $db, $lang, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; *************** *** 211,218 **** unset($userdata); ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); ! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } --- 211,218 ---- unset($userdata); ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $sessiondata = isset( $_COOKIE[$cookiename . '_data'] ) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); ! $session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 220,224 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 220,224 ---- { $sessiondata = array(); ! $session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } *************** *** 335,339 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 335,339 ---- { global $db, $lang, $board_config; ! global $_COOKIE, $_GET, $SID; $cookiename = $board_config['cookie_name']; *************** *** 347,358 **** // Pull cookiedata or grab the URI propagated sid // ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ) { ! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } else { ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 347,358 ---- // Pull cookiedata or grab the URI propagated sid // ! if ( isset($_COOKIE[$cookiename . '_sid']) ) { ! $session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } else { ! $session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } Index: usercp_activate.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_activate.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_activate.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_activate.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 30,34 **** $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " ! WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]); if ( !($result = $db->sql_query($sql)) ) { --- 30,34 ---- $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " ! WHERE user_id = " . intval($_GET[POST_USERS_URL]); if ( !($result = $db->sql_query($sql)) ) { *************** *** 46,50 **** message_die(GENERAL_MESSAGE, $lang['Already_activated']); } ! else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != '')) { $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; --- 46,50 ---- message_die(GENERAL_MESSAGE, $lang['Already_activated']); } ! else if ((trim($row['user_actkey']) == trim($_GET['act_key'])) && (trim($row['user_actkey']) != '')) { $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; Index: usercp_register.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_register.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_register.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 63,67 **** $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register']; ! if ( $mode == 'register' && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) ) { include($phpbb_root_path . 'includes/page_header.'.$phpEx); --- 63,67 ---- $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register']; ! if ( $mode == 'register' && !isset($_POST['agreed']) && !isset($_GET['agreed']) ) { include($phpbb_root_path . 'includes/page_header.'.$phpEx); *************** *** 72,76 **** } ! $coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE; // --- 72,76 ---- } ! $coppa = ( empty($_POST['coppa']) && empty($_GET['coppa']) ) ? 0 : TRUE; // *************** *** 78,85 **** // if ( ! isset($HTTP_POST_VARS['submit']) || ! isset($HTTP_POST_VARS['avatargallery']) || ! isset($HTTP_POST_VARS['submitavatar']) || ! isset($HTTP_POST_VARS['cancelavatar']) || $mode == 'register' ) { --- 78,85 ---- // if ( ! isset($_POST['submit']) || ! isset($_POST['avatargallery']) || ! isset($_POST['submitavatar']) || ! isset($_POST['cancelavatar']) || $mode == 'register' ) { *************** *** 90,95 **** if ( $mode == 'editprofile' ) { ! $user_id = intval($HTTP_POST_VARS['user_id']); ! $current_email = trim(htmlspecialchars($HTTP_POST_VARS['current_email'])); } --- 90,95 ---- if ( $mode == 'editprofile' ) { ! $user_id = intval($_POST['user_id']); ! $current_email = trim(htmlspecialchars($_POST['current_email'])); } *************** *** 101,107 **** while( list($var, $param) = @each($strip_var_list) ) { ! if ( !empty($HTTP_POST_VARS[$param]) ) { ! $$var = trim(htmlspecialchars($HTTP_POST_VARS[$param])); } } --- 101,107 ---- while( list($var, $param) = @each($strip_var_list) ) { ! if ( !empty($_POST[$param]) ) { ! $$var = trim(htmlspecialchars($_POST[$param])); } } *************** *** 111,117 **** while( list($var, $param) = @each($trim_var_list) ) { ! if ( !empty($HTTP_POST_VARS[$param]) ) { ! $$var = trim($HTTP_POST_VARS[$param]); } } --- 111,117 ---- while( list($var, $param) = @each($trim_var_list) ) { ! if ( !empty($_POST[$param]) ) { ! $$var = trim($_POST[$param]); } } *************** *** 123,156 **** validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); ! $viewemail = ( isset($HTTP_POST_VARS['viewemail']) ) ? ( ($HTTP_POST_VARS['viewemail']) ? TRUE : 0 ) : 0; ! $allowviewonline = ( isset($HTTP_POST_VARS['hideonline']) ) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : TRUE ) : TRUE; ! $notifyreply = ( isset($HTTP_POST_VARS['notifyreply']) ) ? ( ($HTTP_POST_VARS['notifyreply']) ? TRUE : 0 ) : 0; ! $notifypm = ( isset($HTTP_POST_VARS['notifypm']) ) ? ( ($HTTP_POST_VARS['notifypm']) ? TRUE : 0 ) : TRUE; ! $popup_pm = ( isset($HTTP_POST_VARS['popup_pm']) ) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE; if ( $mode == 'register' ) { ! $attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : $board_config['allow_sig']; ! $allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $board_config['allow_html']; ! $allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $board_config['allow_bbcode']; ! $allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $board_config['allow_smilies']; } else { ! $attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : 0; ! $allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $userdata['user_allowhtml']; ! $allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $userdata['user_allowbbcode']; ! $allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $userdata['user_allowsmile']; } ! $user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style']; ! if ( !empty($HTTP_POST_VARS['language']) ) { ! if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) ) { ! $user_lang = htmlspecialchars($HTTP_POST_VARS['language']); } else --- 123,156 ---- validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); ! $viewemail = ( isset($_POST['viewemail']) ) ? ( ($_POST['viewemail']) ? TRUE : 0 ) : 0; ! $allowviewonline = ( isset($_POST['hideonline']) ) ? ( ($_POST['hideonline']) ? 0 : TRUE ) : TRUE; ! $notifyreply = ( isset($_POST['notifyreply']) ) ? ( ($_POST['notifyreply']) ? TRUE : 0 ) : 0; ! $notifypm = ( isset($_POST['notifypm']) ) ? ( ($_POST['notifypm']) ? TRUE : 0 ) : TRUE; ! $popup_pm = ( isset($_POST['popup_pm']) ) ? ( ($_POST['popup_pm']) ? TRUE : 0 ) : TRUE; if ( $mode == 'register' ) { ! $attachsig = ( isset($_POST['attachsig']) ) ? ( ($_POST['attachsig']) ? TRUE : 0 ) : $board_config['allow_sig']; ! $allowhtml = ( isset($_POST['allowhtml']) ) ? ( ($_POST['allowhtml']) ? TRUE : 0 ) : $board_config['allow_html']; ! $allowbbcode = ( isset($_POST['allowbbcode']) ) ? ( ($_POST['allowbbcode']) ? TRUE : 0 ) : $board_config['allow_bbcode']; ! $allowsmilies = ( isset($_POST['allowsmilies']) ) ? ( ($_POST['allowsmilies']) ? TRUE : 0 ) : $board_config['allow_smilies']; } else { ! $attachsig = ( isset($_POST['attachsig']) ) ? ( ($_POST['attachsig']) ? TRUE : 0 ) : 0; ! $allowhtml = ( isset($_POST['allowhtml']) ) ? ( ($_POST['allowhtml']) ? TRUE : 0 ) : $userdata['user_allowhtml']; ! $allowbbcode = ( isset($_POST['allowbbcode']) ) ? ( ($_POST['allowbbcode']) ? TRUE : 0 ) : $userdata['user_allowbbcode']; ! $allowsmilies = ( isset($_POST['allowsmilies']) ) ? ( ($_POST['allowsmilies']) ? TRUE : 0 ) : $userdata['user_allowsmile']; } ! $user_style = ( isset($_POST['style']) ) ? intval($_POST['style']) : $board_config['default_style']; ! if ( !empty($_POST['language']) ) { ! if ( preg_match('/^[a-z_]+$/i', $_POST['language']) ) { ! $user_lang = htmlspecialchars($_POST['language']); } else *************** *** 165,169 **** } ! $user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone']; $sql = "SELECT config_value --- 165,169 ---- } ! $user_timezone = ( isset($_POST['timezone']) ) ? doubleval($_POST['timezone']) : $board_config['board_timezone']; $sql = "SELECT config_value *************** *** 176,193 **** $row = $db->sql_fetchrow($result); $board_config['default_dateformat'] = $row['config_value']; ! $user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['dateformat'])) : $board_config['default_dateformat']; ! $user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarselect']) : ( ( isset($HTTP_POST_VARS['avatarlocal']) ) ? htmlspecialchars($HTTP_POST_VARS['avatarlocal']) : '' ); ! $user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['avatarremoteurl'])) : ''; ! $user_avatar_upload = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim($HTTP_POST_VARS['avatarurl']) : ( ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '' ); ! $user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : ''; ! $user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0; ! $user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : ''; $user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : ''; $user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : ''; ! if ( (isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar'])) && (!isset($HTTP_POST_VARS['submit'])) ) { $username = stripslashes($username); --- 176,193 ---- $row = $db->sql_fetchrow($result); $board_config['default_dateformat'] = $row['config_value']; ! $user_dateformat = ( !empty($_POST['dateformat']) ) ? trim(htmlspecialchars($_POST['dateformat'])) : $board_config['default_dateformat']; ! $user_avatar_local = ( isset($_POST['avatarselect']) && !empty($_POST['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($_POST['avatarselect']) : ( ( isset($_POST['avatarlocal']) ) ? htmlspecialchars($_POST['avatarlocal']) : '' ); ! $user_avatar_remoteurl = ( !empty($_POST['avatarremoteurl']) ) ? trim(htmlspecialchars($_POST['avatarremoteurl'])) : ''; ! $user_avatar_upload = ( !empty($_POST['avatarurl']) ) ? trim($_POST['avatarurl']) : ( ( $_FILES['avatar']['tmp_name'] != "none") ? $_FILES['avatar']['tmp_name'] : '' ); ! $user_avatar_name = ( !empty($_FILES['avatar']['name']) ) ? $_FILES['avatar']['name'] : ''; ! $user_avatar_size = ( !empty($_FILES['avatar']['size']) ) ? $_FILES['avatar']['size'] : 0; ! $user_avatar_filetype = ( !empty($_FILES['avatar']['type']) ) ? $_FILES['avatar']['type'] : ''; $user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : ''; $user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : ''; ! if ( (isset($_POST['avatargallery']) || isset($_POST['submitavatar']) || isset($_POST['cancelavatar'])) && (!isset($_POST['submit'])) ) { $username = stripslashes($username); *************** *** 211,215 **** $user_dateformat = stripslashes($user_dateformat); ! if ( !isset($HTTP_POST_VARS['cancelavatar'])) { $user_avatar = $user_avatar_local; --- 211,215 ---- $user_dateformat = stripslashes($user_dateformat); ! if ( !isset($_POST['cancelavatar'])) { $user_avatar = $user_avatar_local; *************** *** 232,236 **** // Did the user submit? In this case build a query to update the users profile in the DB // ! if ( isset($HTTP_POST_VARS['submit']) ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); --- 232,236 ---- // Did the user submit? In this case build a query to update the users profile in the DB // ! if ( isset($_POST['submit']) ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); *************** *** 386,390 **** $avatar_sql = ''; ! if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' ) { $avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); --- 386,390 ---- $avatar_sql = ''; ! if ( isset($_POST['avatardel']) && $mode == 'editprofile' ) { $avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); *************** *** 687,691 **** } ! else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) && !isset($HTTP_POST_VARS['submitavatar']) && !isset($HTTP_POST_VARS['cancelavatar']) ) { $user_id = $userdata['user_id']; --- 687,691 ---- } ! else if ( $mode == 'editprofile' && !isset($_POST['avatargallery']) && !isset($_POST['submitavatar']) && !isset($_POST['cancelavatar']) ) { $user_id = $userdata['user_id']; *************** *** 742,750 **** } ! if( isset($HTTP_POST_VARS['avatargallery']) && !$error ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); ! $avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? htmlspecialchars($HTTP_POST_VARS['avatarcategory']) : ''; $template->set_filenames(array( --- 742,750 ---- } ! if( isset($_POST['avatargallery']) && !$error ) { include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); ! $avatar_category = ( !empty($_POST['avatarcategory']) ) ? htmlspecialchars($_POST['avatarcategory']) : ''; $template->set_filenames(array( Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header.php 29 Jul 2004 22:36:19 -0000 1.1 --- page_header.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 47,51 **** else if ( $phpver > '4.0' ) { ! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) --- 47,51 ---- else if ( $phpver > '4.0' ) { ! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) *************** *** 463,467 **** // Add no-cache control for cookies if they are set ! //$c_no_cache = (isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : ''; // Work around for "current" Apache 2 + PHP module which seems to not --- 463,467 ---- // Add no-cache control for cookies if they are set ! //$c_no_cache = (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : ''; // Work around for "current" Apache 2 + PHP module which seems to not Index: usercp_viewprofile.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_viewprofile.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usercp_viewprofile.php 29 Jul 2004 22:36:20 -0000 1.1 --- usercp_viewprofile.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 28,36 **** } ! if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS ) { message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); } ! $profiledata = get_userdata($HTTP_GET_VARS[POST_USERS_URL]); $sql = "SELECT * --- 28,36 ---- } ! if ( empty($_GET[POST_USERS_URL]) || $_GET[POST_USERS_URL] == ANONYMOUS ) { message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); } ! $profiledata = get_userdata($_GET[POST_USERS_URL]); $sql = "SELECT * |
|
From: geocator <geo...@us...> - 2004-07-30 02:12:46
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115/contrib Modified Files: dbinformer.php Log Message: Say goodbye long array names. Say hello superglobals. Removed code in common.php to try to rename the variables at runtime. No longer needed since we are renaming them. Index: dbinformer.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/contrib/dbinformer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dbinformer.php 29 Jul 2004 22:35:59 -0000 1.1 --- dbinformer.php 30 Jul 2004 02:12:38 -0000 1.2 *************** *** 26,47 **** if (!get_magic_quotes_gpc()) { ! if (is_array($HTTP_POST_VARS)) { ! while (list($k, $v) = each($HTTP_POST_VARS)) { ! if (is_array($HTTP_POST_VARS[$k])) { ! while (list($k2, $v2) = each($HTTP_POST_VARS[$k])) { ! $HTTP_POST_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_POST_VARS[$k]); } else { ! $HTTP_POST_VARS[$k] = addslashes($v); } } ! @reset($HTTP_POST_VARS); } } --- 26,47 ---- if (!get_magic_quotes_gpc()) { ! if (is_array($_POST)) { ! while (list($k, $v) = each($_POST)) { ! if (is_array($_POST[$k])) { ! while (list($k2, $v2) = each($_POST[$k])) { ! $_POST[$k][$k2] = addslashes($v2); } ! @reset($_POST[$k]); } else { ! $_POST[$k] = addslashes($v); } } ! @reset($_POST); } } *************** *** 98,104 **** while (list($var, $param) = each($check_var_list)) { ! if (!empty($HTTP_POST_VARS[$param])) { ! $$var = stripslashes(htmlspecialchars(strip_tags($HTTP_POST_VARS[$param]))); } } --- 98,104 ---- while (list($var, $param) = each($check_var_list)) { ! if (!empty($_POST[$param])) { ! $$var = stripslashes(htmlspecialchars(strip_tags($_POST[$param]))); } } *************** *** 113,117 **** ); ! if (isset($HTTP_POST_VARS['download_config']) && $HTTP_POST_VARS['download_config'] == true && isset($HTTP_POST_VARS['submit_download_config']) && $HTTP_POST_VARS['submit_download_config'] == 'Download') { /* borrowed from install.php */ --- 113,117 ---- ); ! if (isset($_POST['download_config']) && $_POST['download_config'] == true && isset($_POST['submit_download_config']) && $_POST['submit_download_config'] == 'Download') { /* borrowed from install.php */ *************** *** 171,175 **** <td class="row1" align="right"><span class="gen">Database type: </span></td> <td class="row2"> ! <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post"> <select name="dbms"> <?php --- 171,175 ---- <td class="row1" align="right"><span class="gen">Database type: </span></td> <td class="row2"> ! <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post"> <select name="dbms"> <?php *************** *** 206,210 **** <td class="row1" align="right"><span class="gen">Generate a config file: </span></td> </td> ! <td class="row2"><input type="checkbox" name="generate_config" value="true" <?php $checked = (isset($HTTP_POST_VARS['generate_config']) && $HTTP_POST_VARS['generate_config'] == true) ? 'checked="checked"' : ''; echo $checked; ?> /></td> </tr> <tr> --- 206,210 ---- <td class="row1" align="right"><span class="gen">Generate a config file: </span></td> </td> ! <td class="row2"><input type="checkbox" name="generate_config" value="true" <?php $checked = (isset($_POST['generate_config']) && $_POST['generate_config'] == true) ? 'checked="checked"' : ''; echo $checked; ?> /></td> </tr> <tr> *************** *** 216,220 **** </table> <?php ! if (!isset($HTTP_POST_VARS['submit'])) { echo '<br />Please enter your data.<br />'; --- 216,220 ---- </table> <?php ! if (!isset($_POST['submit'])) { echo '<br />Please enter your data.<br />'; *************** *** 405,409 **** { /* Highlight tables with the table_prefix specified */ ! if (preg_match("/^$HTTP_POST_VARS[table_prefix]/i", $table[0])) { echo '<li><b>' . $table[0] . '</b></li><br />'; --- 405,409 ---- { /* Highlight tables with the table_prefix specified */ ! if (preg_match("/^$_POST[table_prefix]/i", $table[0])) { echo '<li><b>' . $table[0] . '</b></li><br />'; *************** *** 426,430 **** /* Create a config file if checked and if the connection went OK */ ! if (isset($HTTP_POST_VARS['generate_config']) && $HTTP_POST_VARS['generate_config'] == true) { echo '<a name="config"><h3><u>Config file</u></h3></a>'; --- 426,430 ---- /* Create a config file if checked and if the connection went OK */ ! if (isset($_POST['generate_config']) && $_POST['generate_config'] == true) { echo '<a name="config"><h3><u>Config file</u></h3></a>'; *************** *** 438,442 **** /* Create our config file */ ! echo '<form action="' . $HTTP_SERVER_VARS['PHP_SELF'] . '" method="post"><table cellspacing="1" cellpadding="3" border="0"><tr><td class="code">'; echo make_config($dbms, $dbhost, $dbname, $dbuser, $dbpasswd, $table_prefix); echo '</td></tr></table>'; --- 438,442 ---- /* Create our config file */ ! echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><table cellspacing="1" cellpadding="3" border="0"><tr><td class="code">'; echo make_config($dbms, $dbhost, $dbname, $dbuser, $dbpasswd, $table_prefix); echo '</td></tr></table>'; |
