Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 install.php,1.38,1.39 upgrade.php,1.24,1.25
|
From: Jonathan H. <the...@us...> - 2002-03-19 23:21:26
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5315
Modified Files:
install.php upgrade.php
Log Message:
Various updates for install and upgrade...
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** install.php 19 Mar 2002 17:36:49 -0000 1.38
--- install.php 19 Mar 2002 23:21:23 -0000 1.39
***************
*** 233,236 ****
--- 233,241 ----
$ftp_pass = ( !empty($HTTP_POST_VARS['ftp_pass']) ) ? $HTTP_POST_VARS['ftp_pass'] : "";
+ $server_name = ( !empty($HTTP_POST_VARS['server_name']) ) ? $HTTP_POST_VARS['server_name'] : "";
+ $server_port = ( !empty($HTTP_POST_VARS['server_port']) ) ? $HTTP_POST_VARS['server_port'] : "";
+ $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'] : "";
+
if( @file_exists('config.'.$phpEx) )
{
***************
*** 427,430 ****
--- 432,439 ----
$s_hidden_fields .= '<input type="hidden" name="admin_pass1" value="1" />';
$s_hidden_fields .= '<input type="hidden" name="admin_pass2" value="1" />';
+ $s_hidden_fields .= '<input type="hidden" name="server_port" value="'.$server_port.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="server_name" value="'.$server_name.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="script_path" value="'.$script_path.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="board_email" value="'.$board_email.'" />';
$template->assign_block_vars("switch_upgrade_install", array());
$template->assign_vars(array(
***************
*** 505,510 ****
}
else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == "" ) && !defined("PHPBB_INSTALLED") )
! {
! //
// Ok we haven't installed before so lets work our way through the various
// steps of the install process. This could turn out to be quite a lengty
--- 514,518 ----
}
else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == "" ) && !defined("PHPBB_INSTALLED") )
! { //
// Ok we haven't installed before so lets work our way through the various
// steps of the install process. This could turn out to be quite a lengty
***************
*** 516,519 ****
--- 524,554 ----
// Namely dbms, dbhost, dbname, dbuser, and dbpasswd.
//
+
+ //
+ // 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
+ {
+ $server_name = '';
+ }
+ 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
+ {
+ $server_port = '80';
+ }
+ $script_path = preg_replace('/install\.'.$phpEx.'/i', '', $HTTP_SERVER_VARS['PHP_SELF']);
+
$instruction_text = $lang['Inst_Step_0'];
***************
*** 560,564 ****
"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'],
"L_SUBMIT" => $lang['Start_Install'],
!
"DB_PREFIX" => ( !empty($table_prefix) ) ? $table_prefix : "phpbb_",
"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "",
--- 595,606 ----
"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'],
"L_SUBMIT" => $lang['Start_Install'],
! "L_ADMIN_EMAIL" => $lang['Admin_email'],
! "L_SERVER_NAME" => $lang['Server_name'],
! "L_SERVER_PORT" => $lang['Server_port'],
! "L_SCRIPT_PATH" => $lang['Script_path'],
!
! "SCRIPT_PATH" => $script_path,
! "SERVER_PORT" => $server_port,
! "SERVER_NAME" => $server_name,
"DB_PREFIX" => ( !empty($table_prefix) ) ? $table_prefix : "phpbb_",
"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "",
***************
*** 759,767 ****
$error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
}
$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
$sql = "UPDATE " . $table_prefix . "users
! SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "'
WHERE username = 'Admin'";
$result = $db->sql_query($sql);
--- 801,850 ----
$error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
}
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_name . "'
+ WHERE config_name = 'server_name'";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ }
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_port . "'
+ WHERE config_name = 'server_port'";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ }
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_path . "'
+ WHERE config_name = 'server_path'";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ }
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $board_email . "'
+ WHERE config_name = 'board_email'";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ }
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_name . "'
+ WHERE config_name = 'cookie_domain'";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ }
+
$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
$sql = "UPDATE " . $table_prefix . "users
! SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "'
WHERE username = 'Admin'";
$result = $db->sql_query($sql);
***************
*** 872,875 ****
--- 955,962 ----
$s_hidden_fields .= '<input type="hidden" name="admin_pass1" value="1" />';
$s_hidden_fields .= '<input type="hidden" name="admin_pass2" value="1" />';
+ $s_hidden_fields .= '<input type="hidden" name="server_port" value="'.$server_port.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="server_name" value="'.$server_name.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="script_path" value="'.$script_path.'" />';
+ $s_hidden_fields .= '<input type="hidden" name="board_email" value="'.$board_email.'" />';
$template->assign_block_vars("switch_upgrade_install", array());
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** upgrade.php 19 Mar 2002 19:37:30 -0000 1.24
--- upgrade.php 19 Mar 2002 23:21:23 -0000 1.25
***************
*** 1806,1809 ****
--- 1806,1830 ----
query($sql, "Couldn't insert board_startdate");
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_name . "'
+ WHERE config_name = 'server_name'
+ OR config_name = 'cookie_domain'";
+ query($sql, "Couldn't insert Board Server domain");
+
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $server_port . "'
+ WHERE config_name = 'server_port'";
+ query($sql, "Couldn't insert Board server port");
+
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $board_email . "'
+ WHERE config_name = 'board_email'";
+ query($sql, "Couldn't insert Board admin email");
+
+ $sql = "UPDATE " . $table_prefix . "config
+ SET config_value = '" . $script_path . "'
+ WHERE config_name = 'script_path'";
+ query($sql, "Couldn't insert Board admin email");
+
//
// Change session table to HEAP if MySQL version matches
|
