Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv14824
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** install.php 18 Sep 2002 16:28:01 -0000 1.10
--- install.php 18 Sep 2002 23:28:58 -0000 1.11
***************
*** 283,291 ****
install_header();
echo "<div style='text-align:center'>";
! $xoops_root_path = XOOPS_ROOT_PATH;
! $xoops_url = XOOPS_URL;
! if ( $xoops_root_path == "/path/to/xoops/directory" || !defined("XOOPS_ROOT_PATH") || $xoops_url == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
echo "<table width=\"70%\"><tr><td>";
! if ( $xoops_root_path == "/path/to/xoops/directory" || !defined(XOOPS_ROOT_PATH) ) {
echo _INSTALL_L1."<br /><br />
<b>define(\"XOOPS_ROOT_PATH\",\"/path/to/xoops/directory\");</b><br /><br />
--- 283,289 ----
install_header();
echo "<div style='text-align:center'>";
! if ( XOOPS_ROOT_PATH == "/path/to/xoops/directory" || !defined("XOOPS_ROOT_PATH") || XOOPS_URL == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
echo "<table width=\"70%\"><tr><td>";
! if ( XOOPS_ROOT_PATH == "/path/to/xoops/directory" || !defined(XOOPS_ROOT_PATH) ) {
echo _INSTALL_L1."<br /><br />
<b>define(\"XOOPS_ROOT_PATH\",\"/path/to/xoops/directory\");</b><br /><br />
***************
*** 293,297 ****
<b>define(\"XOOPS_ROOT_PATH\",\"<span style='color:#ff0000;'>".str_replace("\\","/",getcwd())."\");</span></b><br /><br />";
}
! if ( $xoops_url == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
$filepath = (!empty($REQUEST_URI)) ? ($REQUEST_URI) : $SCRIPT_NAME;
printf(_INSTALL_L3, "<br /><br /><b>define(\"XOOPS_URL\",\"http://url_to_xoops_directory\");</b><br /><br />", "<br /><br /><b>define(\"XOOPS_URL\",\"<span style='color:#ff0000;'>http://".$HTTP_HOST."/".str_replace("/", "", dirname($filepath))."\");</span></b>");
--- 291,295 ----
<b>define(\"XOOPS_ROOT_PATH\",\"<span style='color:#ff0000;'>".str_replace("\\","/",getcwd())."\");</span></b><br /><br />";
}
! if (XOOPS_URL == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
$filepath = (!empty($REQUEST_URI)) ? ($REQUEST_URI) : $SCRIPT_NAME;
printf(_INSTALL_L3, "<br /><br /><b>define(\"XOOPS_URL\",\"http://url_to_xoops_directory\");</b><br /><br />", "<br /><br /><b>define(\"XOOPS_URL\",\"<span style='color:#ff0000;'>http://".$HTTP_HOST."/".str_replace("/", "", dirname($filepath))."\");</span></b>");
***************
*** 311,315 ****
echo _INSTALL_L12."<b>".XOOPS_URL."</b><br /><br />";
echo _INSTALL_L13."<br /><br />\n";
! } elseif ( $xoops_root_path != $detected ) {
echo "<p>\n";
echo "<span style='color: #ff0000'>"._INSTALL_L5."</span><br />";
--- 309,313 ----
echo _INSTALL_L12."<b>".XOOPS_URL."</b><br /><br />";
echo _INSTALL_L13."<br /><br />\n";
! } elseif ( XOOPS_ROOT_PATH != $detected ) {
echo "<p>\n";
echo "<span style='color: #ff0000'>"._INSTALL_L5."</span><br />";
***************
*** 336,340 ****
function install_init(){
install_header();
! if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST = '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
--- 334,338 ----
function install_init(){
install_header();
! if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST == '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
***************
*** 1168,1172 ****
include_once("mainfile.php");
install_header();
- include_once("include/config.php");
install_createDB();
break;
--- 1166,1169 ----
|
