[TEP-COMMIT] CVS: catalog/catalog/install/templates/pages index.php,1.3,1.4 install.php,1.8,1.9 install_2.php,1.7,1.8 install_3.php,1.8,1.9 install_4.php,1.11,1.12 install_5.php,1.22,1.23 install_6.php,1.2,1.3 install_7.php,1.1,1.2 upgrade.php,1.4,1.5 upgrade_2.php,1.2,1.3 upgrade_3.php,1.65,1.66
cvs-OfajU3CKLf1/[email protected] Mon, 16 Feb 2004 08:08:56 +0100
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages
In directory sunsite.dk:/tmp/cvs-serv4284/templates/pages
Modified Files:
index.php install.php install_2.php install_3.php
install_4.php install_5.php install_6.php install_7.php
upgrade.php upgrade_2.php upgrade_3.php
Log Message:
make the installation and upgrade procedure multilingual
separate the sample database data from the database structure - installing
the sample data is now an option during the installation procedure
Index: index.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php 2003/07/09 01:11:06 1.3
+++ index.php 2004/02/16 06:59:42 1.4
@@ -5,29 +5,31 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
+
+ $languages_array = array(array('id' => 'english', 'text' => 'English'),
+ array('id' => 'german', 'text' => 'Deutsch'),
+ array('id' => 'espanol', 'text' => 'Espanol'));
?>
-<p class="pageTitle">Welcome to osCommerce!</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_WELCOME; ?></p>
+<form action="index.php" method="get"><p align="right"><?php echo tep_draw_pull_down_menu('language', $languages_array, $language, 'onChange="this.form.submit();"'); ?></p></form>
+
<table width="95%" class="formPage" cellpadding="2">
<tr>
- <td>
- <p>osCommerce is an open source e-commerce solution under on going development by the open source community. Its feature packed out-of-the-box installation allows store owners to setup, run, and maintain their online stores with minimum effort and with no costs involved.</p>
- <p>osCommerce combines open source solutions to provide a free and open development platform, which includes the <i>powerful</i> PHP web scripting language, the <i>stable</i> Apache web server, and the <i>fast</i> MySQL database server.</p>
- <p>With no restrictions or special requirements, osCommerce can be installed on any PHP3 or PHP4 enabled web server, on any environment that PHP and MySQL supports, which includes Linux, Solaris, BSD, and Microsoft Windows environments.</p>
- </td>
+ <td><?php echo TEXT_WELCOME; ?></td>
</tr>
</table>
-<p>Please choose the installation method to continue.</p>
+<p><?php echo TEXT_CHOOSE_INSTALLATION_TYPE; ?></p>
<table border="0" width="95%" cellspacing="0" cellpadding="0">
<tr>
- <td width="50%" align="center"><a href="install.php"><img src="images/install.gif" border="0" alt="New Install"></a></td>
- <td width="50%" align="center"><a href="upgrade.php"><img src="images/upgrade.gif" border="0" alt="Upgrade"></a></td>
+ <td width="50%" align="center"><a href="install.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/install.gif" border="0" alt="<?php echo IMAGE_INSTALL; ?>"></a></td>
+ <td width="50%" align="center"><a href="upgrade.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/upgrade.gif" border="0" alt="<?php echo IMAGE_UPGRADE; ?>"></a></td>
</tr>
</table>
Index: install.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- install.php 2003/07/09 01:11:06 1.8
+++ install.php 2004/02/16 06:59:42 1.9
@@ -5,45 +5,44 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-<p class="pageTitle">New Installation</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
<form name="install" action="install.php?step=2" method="post">
-<p><b>Please customize the new installation with the following options:</b></p>
+<p><?php echo TEXT_CUSTOMIZE_INSTALLATION; ?></p>
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">Import Catalog Database:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_IMPORT_CATALOG_DATABASE; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_checkbox_field('install[]', 'database', true); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbImport');"><br>
- <div id="dbImportSD">Install the database and add the sample data</div>
- <div id="dbImport" class="longDescription">Checking this box will import the database structure, required data, and some sample data. (required for first time installations)</div>
+ <?php echo tep_draw_checkbox_field('install[]', 'database', true); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbImport');"><br>
+ <div id="dbImportSD"><?php echo CONFIG_IMPORT_CATALOG_DATABASE_DESCRIPTION; ?></div>
+ <div id="dbImport" class="longDescription"><?php echo CONFIG_IMPORT_CATALOG_DATABASE_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Automatic Configuration:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_AUTOMATIC_CONFIGURATION; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_checkbox_field('install[]', 'configure', true); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('autoConfig');"><br>
- <div id="autoConfigSD">Save configuration values</div>
- <div id="autoConfig" class="longDescription">Checking this box will save all entered data during the installation procedure to the appropriate configuration files on the server.</div>
+ <?php echo tep_draw_checkbox_field('install[]', 'configure', true); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('autoConfig');"><br>
+ <div id="autoConfigSD"><?php echo CONFIG_AUTOMATIC_CONFIGURATION_DESCRIPTION; ?></div>
+ <div id="autoConfig" class="longDescription"><?php echo CONFIG_AUTOMATIC_CONFIGURATION_DESCRIPTION_LONG;?></div>
</td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
Index: install_2.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_2.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- install_2.php 2003/07/12 08:10:08 1.7
+++ install_2.php 2004/02/16 06:59:42 1.8
@@ -5,57 +5,49 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-<p class="pageTitle">New Installation</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
-<p><b>Database Import</b></p>
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_DATABASE_IMPORT; ?></p>
<?php
- if (isset($HTTP_POST_VARS['DB_SERVER']) && !empty($HTTP_POST_VARS['DB_SERVER']) && isset($HTTP_POST_VARS['DB_TEST_CONNECTION']) && ($HTTP_POST_VARS['DB_TEST_CONNECTION'] == 'true')) {
- $db = array();
- $db['DB_SERVER'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER']));
- $db['DB_SERVER_USERNAME'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_USERNAME']));
- $db['DB_SERVER_PASSWORD'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_PASSWORD']));
- $db['DB_DATABASE'] = trim(stripslashes($HTTP_POST_VARS['DB_DATABASE']));
+ if (isset($_POST['DB_TEST_CONNECTION']) && ($_POST['DB_TEST_CONNECTION'] == 'true')) {
+ $db = array('DB_SERVER' => trim(stripslashes($_POST['DB_SERVER'])),
+ 'DB_SERVER_USERNAME' => trim(stripslashes($_POST['DB_SERVER_USERNAME'])),
+ 'DB_SERVER_PASSWORD' => trim(stripslashes($_POST['DB_SERVER_PASSWORD'])),
+ 'DB_DATABASE' => trim(stripslashes($_POST['DB_DATABASE'])),
+ 'DB_TABLE_PREFIX' => trim(stripslashes($_POST['DB_TABLE_PREFIX'])));
- $db_error = false;
- osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
+ $osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
- if ($db_error == false) {
- osc_db_test_create_db_permission($db['DB_DATABASE']);
+ if ($osC_Database->isError() === false) {
+ $osC_Database->hasCreatePermission($db['DB_DATABASE']);
}
- if ($db_error != false) {
+ if ($osC_Database->isError()) {
?>
<form name="install" action="install.php?step=2" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>A test connection made to the database was <b>NOT</b> successful.</p>
- <p>The error message returned is:</p>
- <p class="boxme"><?php echo $db_error; ?></p>
- <p>Please click on the <i>Back</i> button below to review your database server settings.</p>
- <p>If you require help with your database server settings, please consult your hosting company.</p>
- </td>
+ <td><?php echo sprintf(ERROR_UNSUCCESSFUL_DATABASE_CONNECTION, $osC_Database->getError()); ?></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -63,10 +55,9 @@
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_back.gif" border="0" alt="Back"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/back.gif" border="0" alt="<?php echo IMAGE_BUTTON_BACK; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
@@ -95,25 +86,28 @@
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
<td>
- <p>A test connection made to the database was <b>successful</b>.</p>
- <p>Please continue the installation process to execute the database import procedure.</p>
- <p>It is important this procedure is not interrupted, otherwise the database may end up corrupt.</p>
- <p>The file to import must be located and named at:</p>
- <p><?php echo $dir_fs_www_root . 'install/oscommerce.sql'; ?></p>
+<?php
+ echo TEXT_SUCCESSFUL_DATABASE_CONNECTION;
+
+ echo sprintf(TEXT_IMPORT_SQL, $dir_fs_www_root . 'install/oscommerce.sql');
+
+ if (isset($_POST['DB_INSERT_SAMPLE_DATA']) && ($_POST['DB_INSERT_SAMPLE_DATA'] == 'true')) {
+ echo sprintf(TEXT_IMPORT_DATA_SAMPLE_SQL, $dir_fs_www_root . 'install/oscommerce_sample_data.sql');
+ }
+?>
</td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -121,10 +115,9 @@
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
@@ -137,89 +130,111 @@
<form name="install" action="install.php?step=2" method="post">
-<p><b>Please enter the database server information:</b></p>
+<p><?php echo TEXT_ENTER_DATABASE_INFORMATION; ?></p>
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">Database Server:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbHost');"><br>
- <div id="dbHostSD">Hostame or IP-address of the database server</div>
- <div id="dbHost" class="longDescription">The database server can be in the form of a hostname, such as db1.myserver.com, or as an IP-address, such as 192.168.0.1</div>
+ <?php echo tep_draw_input_field('DB_SERVER'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbHost');"><br>
+ <div id="dbHostSD"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION; ?></div>
+ <div id="dbHost" class="longDescription"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Username:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER_USERNAME'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbUser');"><br>
- <div id="dbUserSD">Database username</div>
- <div id="dbUser" class="longDescription">The username used to connect to the database server. An example username is 'mysql_10'.<br><br>Note: Create and Drop permissions <b>are required</b> at this point of the installation procedure.</div>
+ <?php echo tep_draw_input_field('DB_SERVER_USERNAME'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbUser');"><br>
+ <div id="dbUserSD"><?php echo CONFIG_DATABASE_USERNAME_DESCRIPTION; ?></div>
+ <div id="dbUser" class="longDescription"><?php echo CONFIG_DATABASE_USERNAME_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Password:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_password_field('DB_SERVER_PASSWORD'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbPass');"><br>
- <div id="dbPassSD">Database password</div>
- <div id="dbPass" class="longDescription">The password is used together with the username, which forms the database user account.</div>
+ <?php echo tep_draw_password_field('DB_SERVER_PASSWORD'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbPass');"><br>
+ <div id="dbPassSD"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION; ?></div>
+ <div id="dbPass" class="longDescription"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Database Name:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_DATABASE'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbName');"><br>
- <div id="dbNameSD">Database Name</div>
- <div id="dbName" class="longDescription">The database used to hold the data. An example database name is 'osCommerce'.</div>
+ <?php echo tep_draw_input_field('DB_DATABASE'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbName');"><br>
+ <div id="dbNameSD"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION; ?></div>
+ <div id="dbName" class="longDescription"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Persistent Connections:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_TABLE_PREFIX; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_checkbox_field('USE_PCONNECT', 'true'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbConn');"><br>
- <div id="dbConnSD"></div>
- <div id="dbConn" class="longDescription">Enable persistent database connections.<br><br>Note: Persistent connections should be disabled for shared servers.</div>
+ <?php echo tep_draw_input_field('DB_TABLE_PREFIX', 'osc_'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbNamePrefix');"><br>
+ <div id="dbNamePrefixSD"><?php echo CONFIG_DATABASE_TABLE_PREFIX_DESCRIPTION; ?></div>
+ <div id="dbNamePrefix" class="longDescription"><?php echo CONFIG_DATABASE_TABLE_PREFIX_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Session Storage:</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_radio_field('STORE_SESSIONS', 'files', true); ?> Files <?php echo osc_draw_radio_field('STORE_SESSIONS', 'mysql'); ?> Database
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbSess');"><br>
- <div id="dbSessSD"></div>
- <div id="dbSess" class="longDescription">Store user session data as files on the server, or in the database.<br><br>Note: Due to security related issues, database session storage is recommended for shared servers.</td></div>
+ <?php echo tep_draw_checkbox_field('USE_PCONNECT', 'true'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbConn');"><br>
+ <div id="dbConnSD"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS_DESCRIPTION; ?></div>
+ <div id="dbConn" class="longDescription"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS_DESCRIPTION_LONG; ?></div>
</td>
</tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_SESSION_STORAGE; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo tep_draw_radio_field('STORE_SESSIONS', 'files', true); ?> <?php echo CONFIG_SESSION_STORAGE_FILES; ?> <?php echo tep_draw_radio_field('STORE_SESSIONS', 'mysql'); ?> <?php echo CONFIG_SESSION_STORAGE_DATABASE; ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbSess');"><br>
+ <div id="dbSessSD"><?php echo CONFIG_SESSION_STORAGE_DESCRIPTION; ?></div>
+ <div id="dbSess" class="longDescription"><?php echo CONFIG_SESSION_STORAGE_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_IMPORT_SAMPLE_DATA; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo tep_draw_checkbox_field('DB_INSERT_SAMPLE_DATA', 'true', (!isset($_POST['DB_SERVER']) || (isset($_POST['DB_INSERT_SAMPLE_DATA']) && ($_POST['DB_INSERT_SAMPLE_DATA'] == 'true')) ? true : false)); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbSample');"><br>
+ <div id="dbSampleSD"><?php echo CONFIG_IMPORT_SAMPLE_DATA_DESCRIPTION; ?></div>
+ <div id="dbSample" class="longDescription"><?php echo CONFIG_IMPORT_SAMPLE_DATA_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
- if (($key != 'x') && ($key != 'y') && ($key != 'DB_SERVER') && ($key != 'DB_SERVER_USERNAME') && ($key != 'DB_SERVER_PASSWORD') && ($key != 'DB_DATABASE') && ($key != 'USE_PCONNECT') && ($key != 'STORE_SESSIONS') && ($key != 'DB_TEST_CONNECTION')) {
+ foreach ($_POST as $key => $value) {
+ if (($key != 'x') && ($key != 'y') && ($key != 'DB_SERVER') && ($key != 'DB_SERVER_USERNAME') && ($key != 'DB_SERVER_PASSWORD') && ($key != 'DB_DATABASE') && ($key != 'DB_TABLE_PREFIX') && ($key != 'USE_PCONNECT') && ($key != 'STORE_SESSIONS') && ($key != 'DB_INSERT_SAMPLE_DATA') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
- echo osc_draw_hidden_field('DB_TEST_CONNECTION', 'true');
+ echo tep_draw_hidden_field('DB_TEST_CONNECTION', 'true');
?>
</form>
Index: install_3.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_3.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- install_3.php 2003/07/11 14:59:01 1.8
+++ install_3.php 2004/02/16 06:59:42 1.9
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -26,49 +26,63 @@
$dir_fs_www_root = implode('/', $dir_fs_www_root) . '/';
?>
-<p class="pageTitle">New Installation</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
-<p><b>Database Import</b></p>
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_DATABASE_IMPORT; ?></p>
<?php
- if (osc_in_array('database', $HTTP_POST_VARS['install'])) {
- $db = array();
- $db['DB_SERVER'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER']));
- $db['DB_SERVER_USERNAME'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_USERNAME']));
- $db['DB_SERVER_PASSWORD'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_PASSWORD']));
- $db['DB_DATABASE'] = trim(stripslashes($HTTP_POST_VARS['DB_DATABASE']));
+ if (in_array('database', $_POST['install'])) {
+ $db = array('DB_SERVER' => trim(stripslashes($_POST['DB_SERVER'])),
+ 'DB_SERVER_USERNAME' => trim(stripslashes($_POST['DB_SERVER_USERNAME'])),
+ 'DB_SERVER_PASSWORD' => trim(stripslashes($_POST['DB_SERVER_PASSWORD'])),
+ 'DB_DATABASE' => trim(stripslashes($_POST['DB_DATABASE'])),
+ 'DB_TABLE_PREFIX' => trim(stripslashes($_POST['DB_TABLE_PREFIX'])));
- osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
+ $osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
- $db_error = false;
- $sql_file = $dir_fs_www_root . 'install/oscommerce.sql';
+ if ($osC_Database->isError() === false) {
+ $osC_Database->setErrorReporting(false);
- osc_set_time_limit(0);
- osc_db_install($db['DB_DATABASE'], $sql_file);
+ if ($osC_Database->selectDatabase($db['DB_DATABASE']) === false) {
+ $osC_Database->setErrorReporting(true);
- if ($db_error != false) {
+ $osC_Database->query('create database ' . $db['DB_DATABASE']);
+ }
+
+ $osC_Database->setErrorReporting(true);
+ }
+
+ if ($osC_Database->isError() === false) {
+ $sql_file = $dir_fs_www_root . 'install/oscommerce.sql';
+
+ $osC_Database->importSQL($sql_file, $db['DB_DATABASE'], $db['DB_TABLE_PREFIX']);
+ }
+
+ if (($osC_Database->isError() === false) && isset($_POST['DB_INSERT_SAMPLE_DATA']) && ($_POST['DB_INSERT_SAMPLE_DATA'] == 'true')) {
+ $sql_file = $dir_fs_www_root . 'install/oscommerce_sample_data.sql';
+
+ $osC_Database->importSQL($sql_file, $db['DB_DATABASE'], $db['DB_TABLE_PREFIX']);
+ }
+
+ if ($osC_Database->isError()) {
?>
<form name="install" action="install.php?step=3" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>The following error has occurred:</p>
- <p class="boxme"><?php echo $db_error; ?></p>
- </td>
+ <td><?php echo sprintf(ERROR_UNSUCCESSFUL_DATABASE_IMPORT, $osC_Database->getError()); ?></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -76,10 +90,9 @@
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_retry.gif" border="0" alt="Retry"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/retry.gif" border="0" alt="<?php echo IMAGE_BUTTON_RETRY; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
@@ -93,21 +106,20 @@
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
<td>
- <p>The database import was <b>successful!</b></p>
+ <p><?php echo TEXT_SUCCESSFUL_DATABASE_IMPORT; ?></p>
</td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -115,16 +127,16 @@
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
<?php
- if (osc_in_array('configure', $HTTP_POST_VARS['install'])) {
+ if (in_array('configure', $_POST['install'])) {
?>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"></td>
<?php
} else {
?>
- <td align="center"><a href="index.php"><img src="images/button_continue.gif" border="0" alt="Continue"></a></td>
+ <td align="right"><a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"></a></td>
<?php
}
?>
Index: install_4.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_4.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- install_4.php 2003/07/11 14:59:01 1.11
+++ install_4.php 2004/02/16 06:59:42 1.12
@@ -5,111 +5,231 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
+?>
- $cookie_path = substr(dirname(getenv('SCRIPT_NAME')), 0, -7);
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
- $www_location = 'http://' . getenv('HTTP_HOST') . getenv('SCRIPT_NAME');
- $www_location = substr($www_location, 0, strpos($www_location, 'install'));
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_OSCOMMERCE_CONFIGURATION; ?></p>
- $script_filename = getenv('PATH_TRANSLATED');
- if (empty($script_filename)) {
- $script_filename = getenv('SCRIPT_FILENAME');
- }
+<?php
+ if (isset($_POST['HTTP_WWW_ADDRESS'])) {
+ if (file_exists($_POST['HTTP_WORK_DIRECTORY'])) {
+ if (is_writeable($_POST['HTTP_WORK_DIRECTORY'])) {
+ if ($fp = @fopen($_POST['HTTP_WORK_DIRECTORY'] . '/.htaccess', 'w')) {
+ flock($fp, 2); // LOCK_EX
+ fputs($fp, "<Files *>\nOrder Deny,Allow\nDeny from all\n</Files>");
+ flock($fp, 3); // LOCK_UN
+ fclose($fp);
- $script_filename = str_replace('\\', '/', $script_filename);
- $script_filename = str_replace('//', '/', $script_filename);
+ $error = false;
+ } else {
+ $error = ERROR_WORK_DIRECTORY_NOT_WRITEABLE;
+ }
+ } else {
+ $error = ERROR_WORK_DIRECTORY_NOT_WRITEABLE;
+ }
+ } else {
+ $error = ERROR_WORK_DIRECTORY_NON_EXISTANT;
+ }
- $dir_fs_www_root_array = explode('/', dirname($script_filename));
- $dir_fs_www_root = array();
- for ($i=0, $n=sizeof($dir_fs_www_root_array)-1; $i<$n; $i++) {
- $dir_fs_www_root[] = $dir_fs_www_root_array[$i];
- }
- $dir_fs_www_root = implode('/', $dir_fs_www_root) . '/';
+ if ($error !== false) {
?>
-<p class="pageTitle">New Installation</p>
-<p><b>osCommerce Configuration</b></p>
+<form name="install" action="install.php?step=4" method="post">
+<table width="95%" border="0" cellpadding="2" class="formPage">
+ <tr>
+ <td><?php echo sprintf($error, $_POST['HTTP_WORK_DIRECTORY']); ?></td>
+ </tr>
+</table>
+
+<?php
+ foreach($_POST as $key => $value) {
+ if (($key != 'x') && ($key != 'y')) {
+ if (is_array($value)) {
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ }
+ } else {
+ echo tep_draw_hidden_field($key, $value);
+ }
+ }
+ }
+?>
+
+<p> </p>
+
+<table width="95%" border="0" cellspacing="2">
+ <tr>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/retry.gif" border="0" alt="<?php echo IMAGE_BUTTON_RETRY; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
+ </tr>
+</table>
+
+</form>
+
+<?php
+ } else {
+?>
+
<form name="install" action="install.php?step=5" method="post">
-<p><b>Please enter the web server information:</b></p>
+<table width="95%" border="0" cellpadding="2" class="formPage">
+ <tr>
+ <td><?php echo TEXT_SUCCESSFUL_CONFIGURATION; ?></td>
+ </tr>
+</table>
+
+<?php
+ foreach ($_POST as $key => $value) {
+ if (($key != 'x') && ($key != 'y')) {
+ if (is_array($value)) {
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ }
+ } else {
+ echo tep_draw_hidden_field($key, $value);
+ }
+ }
+ }
+?>
+
+<p> </p>
+
+<table width="95%" border="0" cellspacing="2">
+ <tr>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
+ </tr>
+</table>
+
+</form>
+
+<?php
+ }
+ } else {
+ $cookie_path = substr(dirname(getenv('SCRIPT_NAME')), 0, -7);
+
+ $www_location = 'http://' . getenv('HTTP_HOST') . getenv('SCRIPT_NAME');
+ $www_location = substr($www_location, 0, strpos($www_location, 'install'));
+
+ $script_filename = getenv('PATH_TRANSLATED');
+ if (empty($script_filename)) {
+ $script_filename = getenv('SCRIPT_FILENAME');
+ }
+
+ $script_filename = str_replace('\\', '/', $script_filename);
+ $script_filename = str_replace('//', '/', $script_filename);
+
+ $dir_fs_www_root_array = explode('/', dirname($script_filename));
+ $dir_fs_www_root = array();
+ for ($i=0, $n=sizeof($dir_fs_www_root_array)-1; $i<$n; $i++) {
+ $dir_fs_www_root[] = $dir_fs_www_root_array[$i];
+ }
+ $dir_fs_www_root = implode('/', $dir_fs_www_root) . '/';
+?>
+
+<form name="install" action="install.php?step=4" method="post">
+
+<p><?php echo TEXT_ENTER_WEBSERVER_INFORMATION; ?></p>
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">WWW Address:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_ADDRESS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTP_WWW_ADDRESS', $www_location); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbWWW');"><br>
- <div id="dbWWWSD">The full website address to the online store</div>
- <div id="dbWWW" class="longDescription">The web address to the online store, for example <i>http://www.my-server.com/catalog/</i></div>
+ <?php echo tep_draw_input_field('HTTP_WWW_ADDRESS', $www_location); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpWWW');"><br>
+ <div id="httpWWWSD"><?php echo CONFIG_WWW_ADDRESS_DESCRIPTION; ?></div>
+ <div id="httpWWW" class="longDescription"><?php echo CONFIG_WWW_ADDRESS_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Webserver Root Directory:</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_ROOT_DIRECTORY; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DIR_FS_DOCUMENT_ROOT', $dir_fs_www_root); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbRoot');"><br>
- <div id="dbRootSD">The server path to the online store</div>
- <div id="dbRoot" class="longDescription">The directory where osCommerce is installed on the server, for example <i>/home/myname/public_html/osCommerce/</i></div>
+ <?php echo tep_draw_input_field('DIR_FS_DOCUMENT_ROOT', $dir_fs_www_root); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpRoot');"><br>
+ <div id="httpRootSD"><?php echo CONFIG_WWW_ROOT_DIRECTORY_DESCRIPTION; ?></div>
+ <div id="httpRoot" class="longDescription"><?php echo CONFIG_WWW_ROOT_DIRECTORY_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">HTTP Cookie Domain:</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_HTTP_COOKIE_DOMAIN; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTP_COOKIE_DOMAIN', getenv('HTTP_HOST')); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbCookieD');"><br>
- <div id="dbCookieDSD">The domain to store cookies in</div>
- <div id="dbCookieD" class="longDescription">The full or top-level domain to store the cookies in, for example <i>.my-server.com</i></div>
+ <?php echo tep_draw_input_field('HTTP_COOKIE_DOMAIN', getenv('HTTP_HOST')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpCookieD');"><br>
+ <div id="httpCookieDSD"><?php echo CONFIG_WWW_HTTP_COOKIE_DOMAIN_DESCRIPTION; ?></div>
+ <div id="httpCookieD" class="longDescription"><?php echo CONFIG_WWW_HTTP_COOKIE_DOMAIN_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">HTTP Cookie Path:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_HTTP_COOKIE_PATH; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTP_COOKIE_PATH', $cookie_path); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbCookieP');"><br>
- <div id="dbCookiePSD">The path to store cookies under</div>
- <div id="dbCookieP" class="longDescription">The web address to limit the cookie to, for example <i>/catalog/</i></div>
+ <?php echo tep_draw_input_field('HTTP_COOKIE_PATH', $cookie_path); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpCookieP');"><br>
+ <div id="httpCookiePSD"><?php echo CONFIG_WWW_HTTP_COOKIE_PATH_DESCRIPTION; ?></div>
+ <div id="httpCookieP" class="longDescription"><?php echo CONFIG_WWW_HTTP_COOKIE_PATH_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Enable SSL Connections:</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_ENABLE_SSL; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_checkbox_field('ENABLE_SSL', 'true'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbSSL');"><br>
- <div id="dbSSLSD"></div>
- <div id="dbSSL" class="longDescription">Enable secure SSL/HTTPS connections (requires a secure certificate installed on the web server)</div>
+ <?php echo tep_draw_checkbox_field('ENABLE_SSL', 'true'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpSSL');"><br>
+ <div id="httpSSLSD"><?php echo CONFIG_ENABLE_SSL_DESCRIPTION; ?></div>
+ <div id="httpSSL" class="longDescription"><?php echo CONFIG_ENABLE_SSL_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_WORK_DIRECTORY; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo tep_draw_input_field('HTTP_WORK_DIRECTORY', $dir_fs_www_root . 'oscommerce_data'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpWork');"><br>
+ <div id="httpWorkSD"><?php echo CONFIG_WWW_WORK_DIRECTORY_DESCRIPTION; ?></div>
+ <div id="httpWork" class="longDescription"><?php echo CONFIG_WWW_WORK_DIRECTORY_DESCRIPTION_LONG; ?></div>
</td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
- if (($key != 'x') && ($key != 'y')) {
- if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ foreach ($_POST as $key => $value) {
+ if (($key != 'x') && ($key != 'y')) {
+ if (is_array($value)) {
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ }
+ } else {
+ echo tep_draw_hidden_field($key, $value);
}
- } else {
- echo osc_draw_hidden_field($key, $value);
}
}
- }
- echo osc_draw_hidden_field('install[]', 'configure');
+ echo tep_draw_hidden_field('install[]', 'configure');
?>
</form>
+
+<?php
+ }
+?>
Index: install_5.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_5.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- install_5.php 2003/07/09 01:11:06 1.22
+++ install_5.php 2004/02/16 06:59:42 1.23
@@ -5,71 +5,69 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
- $https_www_address = str_replace('http://', 'https://', $HTTP_POST_VARS['HTTP_WWW_ADDRESS']);
+ $https_www_address = str_replace('http://', 'https://', $_POST['HTTP_WWW_ADDRESS']);
?>
-<p class="pageTitle">New Installation</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
-<p><b>osCommerce Configuration</b></p>
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_OSCOMMERCE_CONFIGURATION; ?></p>
<form name="install" action="install.php?step=6" method="post">
-<p><b>Please enter the secure web server information:</b></p>
+<p><?php echo TEXT_ENTER_SECURE_WEBSERVER_INFORMATION; ?></p>
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">Secure WWW Address:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_ADDRESS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTPS_WWW_ADDRESS', $https_www_address); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('httpsWWW');"><br>
- <div id="httpsWWWSD">The full website address to the online store on the secure server</div>
- <div id="httpsWWW" class="longDescription">The secure web address to the online store, for example <i>https://ssl.my-hosting-company.com/my_name/catalog/</i></div>
+ <?php echo tep_draw_input_field('HTTPS_WWW_ADDRESS', $https_www_address); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpsWWW');"><br>
+ <div id="httpsWWWSD"><?php echo CONFIG_WWW_HTTPS_ADDRESS_DESCRIPTION; ?></div>
+ <div id="httpsWWW" class="longDescription"><?php echo CONFIG_WWW_HTTPS_ADDRESS_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Secure Cookie Domain:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_COOKIE_DOMAIN; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTPS_COOKIE_DOMAIN', $HTTP_POST_VARS['HTTP_COOKIE_DOMAIN']); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('httpsCookieD');"><br>
- <div id="httpsCookieDSD">The secure domain to store cookies in</div>
- <div id="httpsCookieD" class="longDescription">The full or top-level domain of the secure server to store the cookies in, for example <i>ssl.my-hosting-company.com</i></div>
+ <?php echo tep_draw_input_field('HTTPS_COOKIE_DOMAIN', $_POST['HTTP_COOKIE_DOMAIN']); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpsCookieD');"><br>
+ <div id="httpsCookieDSD"><?php echo CONFIG_WWW_HTTPS_COOKIE_DOMAIN_DESCRIPTION; ?></div>
+ <div id="httpsCookieD" class="longDescription"><?php echo CONFIG_WWW_HTTPS_COOKIE_DOMAIN_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Secure Cookie Path:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_COOKIE_PATH; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('HTTPS_COOKIE_PATH', $HTTP_POST_VARS['HTTP_COOKIE_PATH']); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbCookieP');"><br>
- <div id="dbCookiePSD">The secure path to store cookies under</div>
- <div id="dbCookieP" class="longDescription">The web address of the secure server to limit the cookie to, for example <i>/my_name/catalog/</i></div>
+ <?php echo tep_draw_input_field('HTTPS_COOKIE_PATH', $_POST['HTTP_COOKIE_PATH']); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('httpsCookieP');"><br>
+ <div id="httpsCookiePSD"><?php echo CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION; ?></div>
+ <div id="httpsCookieP" class="longDescription"><?php echo CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION_LONG; ?></div>
</td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
Index: install_6.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_6.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install_6.php 2003/07/12 08:10:08 1.2
+++ install_6.php 2004/02/16 06:59:43 1.3
@@ -5,93 +5,104 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-<p class="pageTitle">New Installation</p>
-<p><b>osCommerce Configuration</b></p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
+
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_OSCOMMERCE_CONFIGURATION; ?></p>
<form name="install" action="install.php?step=7" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">Database Server:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbHost');"><br>
- <div id="dbHostSD">Hostame or IP-address of the database server</div>
- <div id="dbHost" class="longDescription">The database server can be in the form of a hostname, such as db1.myserver.com, or as an IP-address, such as 192.168.0.1</div>
+ <?php echo tep_draw_input_field('DB_SERVER', (isset($_POST['DB_SERVER']) ? $_POST['DB_SERVER'] : '')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbHost');"><br>
+ <div id="dbHostSD"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION; ?></div>
+ <div id="dbHost" class="longDescription"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Username:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER_USERNAME'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbUser');"><br>
- <div id="dbUserSD">Database username</div>
- <div id="dbUser" class="longDescription">The username used to connect to the database server. An example username is 'mysql_10'.<br><br>Note: Create and Drop permissions <b>are not required</b> for the general use of osCommerce.</div>
+ <?php echo tep_draw_input_field('DB_SERVER_USERNAME', (isset($_POST['DB_SERVER_USERNAME']) ? $_POST['DB_SERVER_USERNAME'] : '')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbUser');"><br>
+ <div id="dbUserSD"><?php echo CONFIG_DATABASE_USERNAME_DESCRIPTION; ?></div>
+ <div id="dbUser" class="longDescription"><?php echo CONFIG_DATABASE_USERNAME_RESTRICTED_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Password:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_password_field('DB_SERVER_PASSWORD'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbPass');"><br>
- <div id="dbPassSD">Database password</div>
- <div id="dbPass" class="longDescription">The password is used together with the username, which forms the database user account.</div>
+ <?php echo tep_draw_password_field('DB_SERVER_PASSWORD', (isset($_POST['DB_SERVER_PASSWORD']) ? $_POST['DB_SERVER_PASSWORD'] : '')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbPass');"><br>
+ <div id="dbPassSD"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION; ?></div>
+ <div id="dbPass" class="longDescription"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Database Name:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_DATABASE'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbName');"><br>
- <div id="dbNameSD">Database Name</div>
- <div id="dbName" class="longDescription">The database used to hold the data. An example database name is 'osCommerce'.</div>
+ <?php echo tep_draw_input_field('DB_DATABASE', (isset($_POST['DB_SERVER_PASSWORD']) ? $_POST['DB_SERVER_PASSWORD'] : '')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbName');"><br>
+ <div id="dbNameSD"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION; ?></div>
+ <div id="dbName" class="longDescription"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Persistent Connections:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_TABLE_PREFIX; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_checkbox_field('USE_PCONNECT', 'true'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbConn');"><br>
- <div id="dbConnSD"></div>
- <div id="dbConn" class="longDescription">Enable persistent database connections.<br><br>Note: Persistent connections should be disabled for shared servers.</div>
+ <?php echo tep_draw_input_field('DB_TABLE_PREFIX', (isset($_POST['DB_TABLE_PREFIX']) ? $_POST['DB_TABLE_PREFIX'] : 'osc_')); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbNamePrefix');"><br>
+ <div id="dbNamePrefixSD"><?php echo CONFIG_DATABASE_TABLE_PREFIX_DESCRIPTION; ?></div>
+ <div id="dbNamePrefix" class="longDescription"><?php echo CONFIG_DATABASE_TABLE_PREFIX_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Session Storage:</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_radio_field('STORE_SESSIONS', 'files', (isset($HTTP_POST_VARS['STORE_SESSIONS']) ? '' : true)); ?> Files <?php echo osc_draw_radio_field('STORE_SESSIONS', 'mysql'); ?> Database
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbSess');"><br>
- <div id="dbSessSD"></div>
- <div id="dbSess" class="longDescription">Store user session data as files on the server, or in the database.<br><br>Note: Due to security related issues, database session storage is recommended for shared servers.</td></div>
+ <?php echo tep_draw_checkbox_field('USE_PCONNECT', 'true', (isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'true' ? true : false)); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbConn');"><br>
+ <div id="dbConnSD"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS_DESCRIPTION; ?></div>
+ <div id="dbConn" class="longDescription"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS_DESCRIPTION_LONG; ?></div>
</td>
</tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_SESSION_STORAGE; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo tep_draw_radio_field('STORE_SESSIONS', 'files', (!isset($_POST['STORE_SESSIONS']) || (isset($_POST['STORE_SESSIONS']) && $_POST['STORE_SESSIONS'] == 'files') ? true : false)); ?> <?php echo CONFIG_SESSION_STORAGE_FILES; ?> <?php echo tep_draw_radio_field('STORE_SESSIONS', 'mysql', (isset($_POST['STORE_SESSIONS']) && $_POST['STORE_SESSIONS'] == 'mysql' ? true : false)); ?> <?php echo CONFIG_SESSION_STORAGE_DATABASE; ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbSess');"><br>
+ <div id="dbSessSD"><?php echo CONFIG_SESSION_STORAGE_DESCRIPTION; ?></div>
+ <div id="dbSess" class="longDescription"><?php echo CONFIG_SESSION_STORAGE_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_SERVER') && ($key != 'DB_SERVER_USERNAME') && ($key != 'DB_SERVER_PASSWORD') && ($key != 'DB_DATABASE') && ($key != 'USE_PCONNECT') && ($key != 'STORE_SESSIONS')) {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
Index: install_7.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/install_7.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install_7.php 2003/07/09 01:11:06 1.1
+++ install_7.php 2004/02/16 06:59:43 1.2
@@ -5,12 +5,12 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
- $dir_fs_document_root = $HTTP_POST_VARS['DIR_FS_DOCUMENT_ROOT'];
+ $dir_fs_document_root = $_POST['DIR_FS_DOCUMENT_ROOT'];
if ((substr($dir_fs_document_root, -1) != '/') && (substr($dir_fs_document_root, -1) != '/')) {
$where = strrpos($dir_fs_document_root, '\\');
if (is_string($where) && !$where) {
@@ -21,59 +21,50 @@
}
?>
-<p class="pageTitle">New Installation</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
-<p><b>osCommerce Configuration</b></p>
+<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_OSCOMMERCE_CONFIGURATION; ?></p>
<?php
- $db = array();
- $db['DB_SERVER'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER']));
- $db['DB_SERVER_USERNAME'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_USERNAME']));
- $db['DB_SERVER_PASSWORD'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_PASSWORD']));
- $db['DB_DATABASE'] = trim(stripslashes($HTTP_POST_VARS['DB_DATABASE']));
+ $db = array('DB_SERVER' => trim(stripslashes($_POST['DB_SERVER'])),
+ 'DB_SERVER_USERNAME' => trim(stripslashes($_POST['DB_SERVER_USERNAME'])),
+ 'DB_SERVER_PASSWORD' => trim(stripslashes($_POST['DB_SERVER_PASSWORD'])),
+ 'DB_DATABASE' => trim(stripslashes($_POST['DB_DATABASE'])),
+ 'DB_TABLE_PREFIX' => trim(stripslashes($_POST['DB_TABLE_PREFIX'])));
- $db_error = false;
- osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
+ $osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
- if ($db_error == false) {
- osc_db_test_connection($db['DB_DATABASE']);
+ if ($osC_Database->isError() === false) {
+ $osC_Database->selectDatabase($db['DB_DATABASE']);
}
- if ($db_error != false) {
+ if ($osC_Database->isError()) {
?>
<form name="install" action="install.php?step=6" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>A test connection made to the database was <b>NOT</b> successful.</p>
- <p>The error message returned is:</p>
- <p class="boxme"><?php echo $db_error; ?></p>
- <p>Please click on the <i>Back</i> button below to review your database server settings.</p>
- <p>If you require help with your database server settings, please consult your hosting company.</p>
- </td>
+ <td><?php echo sprintf(ERROR_UNSUCCESSFUL_DATABASE_CONNECTION, $osC_Database->getError()); ?></td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_back.gif" border="0" alt="Back"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/back.gif" border="0" alt="<?php echo IMAGE_BUTTON_BACK; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if ($key != 'x' && $key != 'y') {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -82,43 +73,33 @@
</form>
<?php
- } elseif ( ( (file_exists($dir_fs_document_root . 'includes/configure.php')) && (!is_writeable($dir_fs_document_root . 'includes/configure.php')) ) || ( (file_exists($dir_fs_document_root . '/admin/includes/configure.php')) && (!is_writeable($dir_fs_document_root . '/admin/includes/configure.php')) ) ) {
+ } elseif ( (file_exists($dir_fs_document_root . 'includes/configure.php') && !is_writeable($dir_fs_document_root . 'includes/configure.php')) || (file_exists($dir_fs_document_root . '/admin/includes/configure.php') && !is_writeable($dir_fs_document_root . '/admin/includes/configure.php')) ) {
?>
<form name="install" action="install.php?step=7" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>The following error has occurred:</p>
- <p><div class="boxMe"><b>The configuration files do not exist, or permission levels are not set.</b><br><br>Please perform the following actions:
- <ul class="boxMe"><li>cd <?php echo $dir_fs_document_root; ?>includes/</li><li>touch configure.php</li><li>chmod 706 configure.php</li></ul>
- <ul class="boxMe"><li>cd <?php echo $dir_fs_document_root; ?>admin/includes/</li><li>touch configure.php</li><li>chmod 706 configure.php</li></ul></div>
- </p>
- <p class="noteBox">If <i>chmod 706</i> does not work, please try <i>chmod 777</i>.</p>
- <p class="noteBox">If you are running this installation procedure under a Microsoft Windows environment, try renaming the existing configuration file so a new file can be created.</p>
- </td>
+ <td><?php echo sprintf(ERROR_CONFIG_FILE_NOT_WRITEABLE, $dir_fs_document_root, $dir_fs_document_root); ?></td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_retry.gif" border="0" alt="Retry"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/retry.gif" border="0" alt="<?php echo IMAGE_BUTTON_RETRY; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if ($key != 'x' && $key != 'y') {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -128,7 +109,7 @@
<?php
} else {
- $http_url = parse_url($HTTP_POST_VARS['HTTP_WWW_ADDRESS']);
+ $http_url = parse_url($_POST['HTTP_WWW_ADDRESS']);
$http_server = $http_url['scheme'] . '://' . $http_url['host'];
$http_catalog = $http_url['path'];
if (isset($http_url['port']) && !empty($http_url['port'])) {
@@ -141,8 +122,8 @@
$https_server = '';
$https_catalog = '';
- if (isset($HTTP_POST_VARS['HTTPS_WWW_ADDRESS']) && !empty($HTTP_POST_VARS['HTTPS_WWW_ADDRESS'])) {
- $https_url = parse_url($HTTP_POST_VARS['HTTPS_WWW_ADDRESS']);
+ if (isset($_POST['HTTPS_WWW_ADDRESS']) && !empty($_POST['HTTPS_WWW_ADDRESS'])) {
+ $https_url = parse_url($_POST['HTTPS_WWW_ADDRESS']);
$https_server = $https_url['scheme'] . '://' . $https_url['host'];
$https_catalog = $https_url['path'];
@@ -155,18 +136,23 @@
}
}
- $enable_ssl = (isset($HTTP_POST_VARS['ENABLE_SSL']) && ($HTTP_POST_VARS['ENABLE_SSL'] == 'true') ? 'true' : 'false');
- $http_cookie_domain = $HTTP_POST_VARS['HTTP_COOKIE_DOMAIN'];
- $https_cookie_domain = (isset($HTTP_POST_VARS['HTTPS_COOKIE_DOMAIN']) ? $HTTP_POST_VARS['HTTPS_COOKIE_DOMAIN'] : '');
- $http_cookie_path = $HTTP_POST_VARS['HTTP_COOKIE_PATH'];
- $https_cookie_path = (isset($HTTP_POST_VARS['HTTPS_COOKIE_PATH']) ? $HTTP_POST_VARS['HTTPS_COOKIE_PATH'] : '');
+ $enable_ssl = (isset($_POST['ENABLE_SSL']) && ($_POST['ENABLE_SSL'] == 'true') ? 'true' : 'false');
+ $http_cookie_domain = $_POST['HTTP_COOKIE_DOMAIN'];
+ $https_cookie_domain = (isset($_POST['HTTPS_COOKIE_DOMAIN']) ? $_POST['HTTPS_COOKIE_DOMAIN'] : '');
+ $http_cookie_path = $_POST['HTTP_COOKIE_PATH'];
+ $https_cookie_path = (isset($_POST['HTTPS_COOKIE_PATH']) ? $_POST['HTTPS_COOKIE_PATH'] : '');
+
+ $http_work_directory = $_POST['HTTP_WORK_DIRECTORY'];
+ if (substr($http_work_directory, -1) != '/') {
+ $http_work_directory .= '/';
+ }
$file_contents = '<?php' . "\n" .
'/*' . "\n" .
' osCommerce, Open Source E-Commerce Solutions' . "\n" .
' http://www.oscommerce.com' . "\n" .
'' . "\n" .
- ' Copyright (c) 2003 osCommerce' . "\n" .
+ ' Copyright (c) 2004 osCommerce' . "\n" .
'' . "\n" .
' Released under the GNU General Public License' . "\n" .
'*/' . "\n" .
@@ -194,16 +180,18 @@
'' . "\n" .
' define(\'DIR_WS_DOWNLOAD_PUBLIC\', \'pub/\');' . "\n" .
' define(\'DIR_FS_CATALOG\', \'' . $dir_fs_document_root . '\');' . "\n" .
+ ' define(\'DIR_FS_WORK\', \'' . $http_work_directory . '\');' . "\n" .
' define(\'DIR_FS_DOWNLOAD\', DIR_FS_CATALOG . \'download/\');' . "\n" .
' define(\'DIR_FS_DOWNLOAD_PUBLIC\', DIR_FS_CATALOG . \'pub/\');' . "\n" .
'' . "\n" .
'// define our database connection' . "\n" .
- ' define(\'DB_SERVER\', \'' . $HTTP_POST_VARS['DB_SERVER'] . '\'); // eg, localhost - should not be empty for productive servers' . "\n" .
- ' define(\'DB_SERVER_USERNAME\', \'' . $HTTP_POST_VARS['DB_SERVER_USERNAME'] . '\');' . "\n" .
- ' define(\'DB_SERVER_PASSWORD\', \'' . $HTTP_POST_VARS['DB_SERVER_PASSWORD']. '\');' . "\n" .
- ' define(\'DB_DATABASE\', \'' . $HTTP_POST_VARS['DB_DATABASE']. '\');' . "\n" .
- ' define(\'USE_PCONNECT\', \'' . (($HTTP_POST_VARS['USE_PCONNECT'] == 'true') ? 'true' : 'false') . '\'); // use persistent connections?' . "\n" .
- ' define(\'STORE_SESSIONS\', \'' . (($HTTP_POST_VARS['STORE_SESSIONS'] == 'files') ? '' : 'mysql') . '\'); // leave empty \'\' for default handler or set to \'mysql\'' . "\n" .
+ ' define(\'DB_SERVER\', \'' . $_POST['DB_SERVER'] . '\'); // eg, localhost - should not be empty for productive servers' . "\n" .
+ ' define(\'DB_SERVER_USERNAME\', \'' . $_POST['DB_SERVER_USERNAME'] . '\');' . "\n" .
+ ' define(\'DB_SERVER_PASSWORD\', \'' . $_POST['DB_SERVER_PASSWORD']. '\');' . "\n" .
+ ' define(\'DB_DATABASE\', \'' . $_POST['DB_DATABASE']. '\');' . "\n" .
+ ' define(\'DB_TABLE_PREFIX\', \'' . $_POST['DB_TABLE_PREFIX']. '\');' . "\n" .
+ ' define(\'USE_PCONNECT\', \'' . (isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'true' ? 'true' : 'false') . '\'); // use persistent connections?' . "\n" .
+ ' define(\'STORE_SESSIONS\', \'' . (($_POST['STORE_SESSIONS'] == 'files') ? '' : 'mysql') . '\'); // leave empty \'\' for default handler or set to \'mysql\'' . "\n" .
'?>';
$fp = fopen($dir_fs_document_root . 'includes/configure.php', 'w');
@@ -215,7 +203,7 @@
' osCommerce, Open Source E-Commerce Solutions' . "\n" .
' http://www.oscommerce.com' . "\n" .
'' . "\n" .
- ' Copyright (c) 2003 osCommerce' . "\n" .
+ ' Copyright (c) 2004 osCommerce' . "\n" .
'' . "\n" .
' Released under the GNU General Public License' . "\n" .
'*/' . "\n" .
@@ -246,14 +234,16 @@
' define(\'DIR_FS_CATALOG_IMAGES\', DIR_FS_CATALOG . \'images/\');' . "\n" .
' define(\'DIR_FS_CATALOG_MODULES\', DIR_FS_CATALOG . \'includes/modules/\');' . "\n" .
' define(\'DIR_FS_BACKUP\', DIR_FS_ADMIN . \'backups/\');' . "\n" .
+ ' define(\'DIR_FS_WORK\', \'' . $http_work_directory . '\');' . "\n" .
'' . "\n" .
'// define our database connection' . "\n" .
- ' define(\'DB_SERVER\', \'' . $HTTP_POST_VARS['DB_SERVER'] . '\'); // eg, localhost - should not be empty for productive servers' . "\n" .
- ' define(\'DB_SERVER_USERNAME\', \'' . $HTTP_POST_VARS['DB_SERVER_USERNAME'] . '\');' . "\n" .
- ' define(\'DB_SERVER_PASSWORD\', \'' . $HTTP_POST_VARS['DB_SERVER_PASSWORD']. '\');' . "\n" .
- ' define(\'DB_DATABASE\', \'' . $HTTP_POST_VARS['DB_DATABASE']. '\');' . "\n" .
- ' define(\'USE_PCONNECT\', \'' . (($HTTP_POST_VARS['USE_PCONNECT'] == 'true') ? 'true' : 'false') . '\'); // use persisstent connections?' . "\n" .
- ' define(\'STORE_SESSIONS\', \'' . (($HTTP_POST_VARS['STORE_SESSIONS'] == 'files') ? '' : 'mysql') . '\'); // leave empty \'\' for default handler or set to \'mysql\'' . "\n" .
+ ' define(\'DB_SERVER\', \'' . $_POST['DB_SERVER'] . '\'); // eg, localhost - should not be empty for productive servers' . "\n" .
+ ' define(\'DB_SERVER_USERNAME\', \'' . $_POST['DB_SERVER_USERNAME'] . '\');' . "\n" .
+ ' define(\'DB_SERVER_PASSWORD\', \'' . $_POST['DB_SERVER_PASSWORD']. '\');' . "\n" .
+ ' define(\'DB_DATABASE\', \'' . $_POST['DB_DATABASE']. '\');' . "\n" .
+ ' define(\'DB_TABLE_PREFIX\', \'' . $_POST['DB_TABLE_PREFIX']. '\');' . "\n" .
+ ' define(\'USE_PCONNECT\', \'' . (isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'true' ? 'true' : 'false') . '\'); // use persistent connections?' . "\n" .
+ ' define(\'STORE_SESSIONS\', \'' . (($_POST['STORE_SESSIONS'] == 'files') ? '' : 'mysql') . '\'); // leave empty \'\' for default handler or set to \'mysql\'' . "\n" .
'?>';
$fp = fopen($dir_fs_document_root . 'admin/includes/configure.php', 'w');
@@ -263,7 +253,7 @@
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>The configuration was successful!</td>
+ <td><?php echo TEXT_SUCCESSFUL_CONFIGURATION; ?></td>
</tr>
</table>
Index: upgrade.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/upgrade.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- upgrade.php 2003/07/12 09:05:43 1.4
+++ upgrade.php 2004/02/16 06:59:43 1.5
@@ -5,67 +5,64 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-
-<p class="pageTitle">Upgrade</p>
-<p>This upgrade procedure will upgrade the <nobr>The Exchange Project 2.1</nobr> database structure to the <nobr>osCommerce 2.2 Milestone 2</nobr> database structure.</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_UPGRADE; ?></p>
-<p>It is recommended to perform this upgrade procedure on an up-to-date backup of your 2.1 database.</p>
+<?php echo TEXT_UPGRADE_DESCRIPTION; ?>
<form name="upgrade" action="upgrade.php?step=2" method="post">
-<p><b>Please enter the database server information:</b></p>
+<p><?php echo TEXT_ENTER_DATABASE_INFORMATION; ?>
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td width="30%" valign="top">Database Server:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbHost');"><br>
- <div id="dbHostSD">Hostame or IP-address of the database server</div>
- <div id="dbHost" class="longDescription">The database server can be in the form of a hostname, such as db1.myserver.com, or as an IP-address, such as 192.168.0.1</div>
+ <?php echo tep_draw_input_field('DB_SERVER'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbHost');"><br>
+ <div id="dbHostSD"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION; ?></div>
+ <div id="dbHost" class="longDescription"><?php echo CONFIG_DATABASE_SERVER_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Username:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_SERVER_USERNAME'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbUser');"><br>
- <div id="dbUserSD">Database username</div>
- <div id="dbUser" class="longDescription">The username used to connect to the database server. An example username is 'mysql_10'.<br><br>Note: Create and Drop permissions <b>are required</b> at this point of the upgrade procedure.</div>
+ <?php echo tep_draw_input_field('DB_SERVER_USERNAME'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbUser');"><br>
+ <div id="dbUserSD"><?php echo CONFIG_DATABASE_USERNAME_DESCRIPTION; ?></div>
+ <div id="dbUser" class="longDescription"><?php echo CONFIG_DATABASE_USERNAME_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Password:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_password_field('DB_SERVER_PASSWORD'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbPass');"><br>
- <div id="dbPassSD">Database password</div>
- <div id="dbPass" class="longDescription">The password is used together with the username, which forms the database user account.</div>
+ <?php echo tep_draw_password_field('DB_SERVER_PASSWORD'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbPass');"><br>
+ <div id="dbPassSD"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION; ?></div>
+ <div id="dbPass" class="longDescription"><?php echo CONFIG_DATABASE_PASSWORD_DESCRIPTION_LONG; ?></div>
</td>
</tr>
<tr>
- <td width="30%" valign="top">Database Name:</td>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo osc_draw_input_field('DB_DATABASE'); ?>
- <img src="images/layout/help_icon.gif" onClick="toggleBox('dbName');"><br>
- <div id="dbNameSD">Database Name</div>
- <div id="dbName" class="longDescription">The database used to hold the data. An example database name is 'osCommerce'.</div>
+ <?php echo tep_draw_input_field('DB_DATABASE'); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbName');"><br>
+ <div id="dbNameSD"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION; ?></div>
+ <div id="dbName" class="longDescription"><?php echo CONFIG_DATABASE_NAME_DESCRIPTION_LONG; ?></div>
</td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
Index: upgrade_2.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/upgrade_2.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- upgrade_2.php 2003/07/09 01:11:06 1.2
+++ upgrade_2.php 2004/02/16 06:59:43 1.3
@@ -5,64 +5,54 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-<p class="pageTitle">Upgrade</p>
+<p class="pageTitle"><?php echo PAGE_TITLE_UPGRADE; ?></p>
<?php
- $db = array();
- $db['DB_SERVER'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER']));
- $db['DB_SERVER_USERNAME'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_USERNAME']));
- $db['DB_SERVER_PASSWORD'] = trim(stripslashes($HTTP_POST_VARS['DB_SERVER_PASSWORD']));
- $db['DB_DATABASE'] = trim(stripslashes($HTTP_POST_VARS['DB_DATABASE']));
+ $db = array('DB_SERVER' => trim(stripslashes($_POST['DB_SERVER'])),
+ 'DB_SERVER_USERNAME' => trim(stripslashes($_POST['DB_SERVER_USERNAME'])),
+ 'DB_SERVER_PASSWORD' => trim(stripslashes($_POST['DB_SERVER_PASSWORD'])),
+ 'DB_DATABASE' => trim(stripslashes($_POST['DB_DATABASE'])));
- $db_error = false;
- osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
+ $osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
- if ($db_error == false) {
- osc_db_test_create_db_permission($db['DB_DATABASE']);
+ if ($osC_Database->isError() === false) {
+ $osC_Database->selectDatabase($db['DB_DATABASE']);
}
- if ($db_error != false) {
+ if ($osC_Database->isError()) {
?>
<form name="upgrade" action="upgrade.php" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>A test connection made to the database was <b>NOT</b> successful.</p>
- <p>The error message returned is:</p>
- <p class="boxme"><?php echo $db_error; ?></p>
- <p>Please click on the <i>Back</i> button below to review your database server settings.</p>
- <p>If you require help with your database server settings, please consult your hosting company.</p>
- </td>
+ <td><?php echo sprintf(ERROR_UNSUCCESSFUL_DATABASE_CONNECTION, $osC_Database->getError()); ?></td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_back.gif" border="0" alt="Back"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/back.gif" border="0" alt="<?php echo IMAGE_BUTTON_BACK; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if ($key != 'x' && $key != 'y') {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
@@ -78,33 +68,27 @@
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
- <td>
- <p>A test connection made to the database was <b>successful</b>.</p>
- <p>Please continue the upgrade process to execute the database upgrade procedure.</p>
- <p>It is important this procedure is not interrupted, otherwise the database may end up corrupt.</p>
- </td>
+ <td><?php echo TEXT_SUCCESSFUL_DATABASE_CONNECTION; ?></td>
</tr>
</table>
<p> </p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table width="95%" border="0" cellspacing="2">
<tr>
- <td align="center"><a href="index.php"><img src="images/button_cancel.gif" border="0" alt="Cancel"></a></td>
- <td align="center"><input type="image" src="images/button_continue.gif" border="0" alt="Continue"></td>
+ <td align="right"><input type="image" src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/continue.gif" border="0" alt="<?php echo IMAGE_BUTTON_CONTINUE; ?>"> <a href="index.php"><img src="templates/<?php echo $template; ?>/languages/<?php echo $language; ?>/images/buttons/cancel.gif" border="0" alt="<?php echo IMAGE_BUTTON_CANCEL; ?>"></a></td>
</tr>
</table>
<?php
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
+ foreach ($_POST as $key => $value) {
if ($key != 'x' && $key != 'y') {
if (is_array($value)) {
- for ($i=0; $i<sizeof($value); $i++) {
- echo osc_draw_hidden_field($key . '[]', $value[$i]);
+ for ($i=0, $n=sizeof($value); $i<$n; $i++) {
+ echo tep_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo osc_draw_hidden_field($key, $value);
+ echo tep_draw_hidden_field($key, $value);
}
}
}
Index: upgrade_3.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/templates/pages/upgrade_3.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- upgrade_3.php 2003/12/18 12:06:18 1.65
+++ upgrade_3.php 2004/02/16 06:59:43 1.66
@@ -5,566 +5,608 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
?>
-<p class="pageTitle">Upgrade</p>
[...1307 lines suppressed...]
?>
<script language="javascript"><!--
changeStyle('whosOnline', 'normal');
changeText('whosOnlineMarker', '*');
-changeText('statusText', 'Updating Whos Online .. done!');
+changeText('statusText', '<?php echo sprintf(TEXT_UPDATING_DONE, TEXT_WHOS_ONLINE); ?>');
changeStyle('statusText', 'bold');
-changeText('statusText', 'Update Complete!');
+changeText('statusText', '<?php echo TEXT_UPDATING_COMPLETE; ?>');
//--></script>
-<?php flush(); ?>
+<?php
+ flush();
-<p>The database upgrade procedure was successful!</p>
+ echo TEXT_SUCCESSFUL_DATABASE_UPGRADE;
+?>
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click