[TEP-COMMIT] [CVS catalog] add the ability to choose a database class, with the introduction of MySQL InnoDB to use transactions
anonymous-OfajU3CKLf1/[email protected] 22 Jul 2004 20:47:17 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit in catalog/catalog/install/templates/pages on MAIN
index.php +1 -1 1.4 -> 1.5
install.php +2 -2 1.9 -> 1.10
install_2.php +62 -22 1.8 -> 1.9
install_3.php +22 -10 1.9 -> 1.10
install_4.php +13 -13 1.12 -> 1.13
install_5.php +5 -5 1.23 -> 1.24
install_6.php +27 -9 1.4 -> 1.5
install_7.php +22 -10 1.2 -> 1.3
upgrade.php +4 -4 1.5 -> 1.6
upgrade_2.php +8 -8 1.3 -> 1.4
upgrade_3.php +4 -4 1.69 -> 1.70
+170 -88
11 modified files
add the ability to choose a database class, with the introduction of MySQL InnoDB to use transactions
replace all tep_draw_* form field function calls to osc_draw_*
remove calls to stripslashes due to how magic_quotes_gpc is now handled
----------
catalog /catalog /install /templates /pages
index.php 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- index.php 2004/02/16 06:59:42 1.4
+++ index.php 2004/07/22 20:47:11 1.5
@@ -17,7 +17,7 @@
<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>
+<form action="index.php" method="get"><p align="right"><?php echo osc_draw_pull_down_menu('language', $languages_array, $language, 'onChange="this.form.submit();"'); ?></p></form>
<table width="95%" class="formPage" cellpadding="2">
<tr>
----------
catalog /catalog /install /templates /pages
install.php 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- install.php 2004/02/16 06:59:42 1.9
+++ install.php 2004/07/22 20:47:11 1.10
@@ -21,7 +21,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_IMPORT_CATALOG_DATABASE; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_checkbox_field('install[]', 'database', true); ?>
+ <?php echo osc_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>
@@ -30,7 +30,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_AUTOMATIC_CONFIGURATION; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_checkbox_field('install[]', 'configure', true); ?>
+ <?php echo osc_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>
----------
catalog /catalog /install /templates /pages
install_2.php 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- install_2.php 2004/02/16 06:59:42 1.8
+++ install_2.php 2004/07/22 20:47:11 1.9
@@ -9,6 +9,9 @@
Released under the GNU General Public License
*/
+
+ $db_table_types = array(array('id' => 'mysql', 'text' => 'MySQL - MyISAM (Default)'),
+ array('id' => 'mysql_innodb', 'text' => 'MySQL - InnoDB (Transaction-Safe)'));
?>
<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
@@ -17,13 +20,14 @@
<?php
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 = array('DB_SERVER' => trim($_POST['DB_SERVER']),
+ 'DB_SERVER_USERNAME' => trim($_POST['DB_SERVER_USERNAME']),
+ 'DB_SERVER_PASSWORD' => trim($_POST['DB_SERVER_PASSWORD']),
+ 'DB_DATABASE' => trim($_POST['DB_DATABASE']),
+ 'DB_TABLE_PREFIX' => trim($_POST['DB_TABLE_PREFIX']),
+ 'DB_DATABASE_CLASS' => trim($_POST['DB_DATABASE_CLASS']));
- $osC_Database = osC_Database::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['DB_DATABASE_CLASS']);
if ($osC_Database->isError() === false) {
$osC_Database->hasCreatePermission($db['DB_DATABASE']);
@@ -44,10 +48,10 @@
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
for ($i=0, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -65,6 +69,15 @@
<?php
} else {
+ if ($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') {
+ $db_has_innodb = false;
+
+ $Qinno = $osC_Database->query('show variables like "have_innodb"');
+ if (($Qinno->numberOfRows() === 1) && (strtolower($Qinno->value('Value')) == 'yes')) {
+ $db_has_innodb = true;
+ }
+ }
+
$script_filename = getenv('PATH_TRANSLATED');
if (empty($script_filename)) {
$script_filename = getenv('SCRIPT_FILENAME');
@@ -100,14 +113,26 @@
</table>
<?php
+ if ( ($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') && ($db_has_innodb === false) ) {
+?>
+
+<table width="95%" border="0" cellpadding="2">
+ <tr>
+ <td class="boxme"><?php echo sprintf(ERROR_UNSUCCESSFUL_DATABASE_TYPE, 'mysql_innodb', 'mysql'); ?></td>
+ </tr>
+</table>
+
+<?php
+ }
+
foreach ($_POST as $key => $value) {
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
for ($i=0, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -136,7 +161,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER'); ?>
+ <?php echo osc_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>
@@ -145,7 +170,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER_USERNAME'); ?>
+ <?php echo osc_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>
@@ -154,7 +179,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_password_field('DB_SERVER_PASSWORD'); ?>
+ <?php echo osc_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>
@@ -163,16 +188,31 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_DATABASE'); ?>
+ <?php echo osc_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 colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_CLASS; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo osc_draw_pull_down_menu('DB_DATABASE_CLASS', $db_table_types); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbClass');"><br>
+ <div id="dbClassSD"><?php echo CONFIG_DATABASE_CLASS_DESCRIPTION; ?></div>
+ <div id="dbClass" class="longDescription"><?php echo CONFIG_DATABASE_CLASS_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_TABLE_PREFIX; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_TABLE_PREFIX', 'osc_'); ?>
+ <?php echo osc_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>
@@ -184,7 +224,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_checkbox_field('USE_PCONNECT', 'true'); ?>
+ <?php echo osc_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>
@@ -193,7 +233,7 @@
<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; ?>
+ <?php echo osc_draw_radio_field('STORE_SESSIONS', 'files', true); ?> <?php echo CONFIG_SESSION_STORAGE_FILES; ?> <?php echo osc_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>
@@ -205,7 +245,7 @@
<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)); ?>
+ <?php echo osc_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>
@@ -223,18 +263,18 @@
<?php
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 (($key != 'x') && ($key != 'y') && ($key != 'DB_SERVER') && ($key != 'DB_SERVER_USERNAME') && ($key != 'DB_SERVER_PASSWORD') && ($key != 'DB_DATABASE') && ($key != 'DB_DATABASE_CLASS') && ($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, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
- echo tep_draw_hidden_field('DB_TEST_CONNECTION', 'true');
+ echo osc_draw_hidden_field('DB_TEST_CONNECTION', 'true');
?>
</form>
----------
catalog /catalog /install /templates /pages
install_3.php 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- install_3.php 2004/02/16 06:59:42 1.9
+++ install_3.php 2004/07/22 20:47:11 1.10
@@ -32,13 +32,14 @@
<?php
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'])));
+ $db = array('DB_SERVER' => trim($_POST['DB_SERVER']),
+ 'DB_SERVER_USERNAME' => trim($_POST['DB_SERVER_USERNAME']),
+ 'DB_SERVER_PASSWORD' => trim($_POST['DB_SERVER_PASSWORD']),
+ 'DB_DATABASE' => trim($_POST['DB_DATABASE']),
+ 'DB_TABLE_PREFIX' => trim($_POST['DB_TABLE_PREFIX']),
+ 'DB_DATABASE_CLASS' => trim($_POST['DB_DATABASE_CLASS']));
- $osC_Database = osC_Database::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['DB_DATABASE_CLASS']);
if ($osC_Database->isError() === false) {
$osC_Database->setErrorReporting(false);
@@ -64,6 +65,17 @@
$osC_Database->importSQL($sql_file, $db['DB_DATABASE'], $db['DB_TABLE_PREFIX']);
}
+ if ($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') {
+ $Qinno = $osC_Database->query('show variables like "have_innodb"');
+ if (($Qinno->numberOfRows() === 1) && (strtolower($Qinno->value('Value')) == 'yes')) {
+ $database_tables = array('address_book', 'categories', 'categories_description', 'customers', 'customers_basket', 'customers_basket_attributes', 'customers_info', 'manufacturers', 'manufacturers_info', 'orders', 'orders_products', 'orders_status', 'orders_status_history', 'orders_products_attributes', 'orders_products_download', 'orders_total', 'products', 'products_attributes', 'products_attributes_download', 'products_description', 'products_options', 'products_options_values', 'products_options_values_to_products_options', 'products_to_categories', 'reviews', 'reviews_description', 'weight_classes', 'weight_classes_rules');
+
+ foreach ($database_tables as $table) {
+ $osC_Database->simpleQuery('alter table ' . $db['DB_TABLE_PREFIX'] . $table . ' type = innodb');
+ }
+ }
+ }
+
if ($osC_Database->isError()) {
?>
<form name="install" action="install.php?step=3" method="post">
@@ -79,10 +91,10 @@
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
for ($i=0, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -116,10 +128,10 @@
if (($key != 'x') && ($key != 'y') && ($key != 'DB_TEST_CONNECTION')) {
if (is_array($value)) {
for ($i=0, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
----------
catalog /catalog /install /templates /pages
install_4.php 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- install_4.php 2004/02/16 06:59:42 1.12
+++ install_4.php 2004/07/22 20:47:11 1.13
@@ -52,10 +52,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -88,10 +88,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -139,7 +139,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_ADDRESS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTP_WWW_ADDRESS', $www_location); ?>
+ <?php echo osc_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>
@@ -151,7 +151,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_ROOT_DIRECTORY; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DIR_FS_DOCUMENT_ROOT', $dir_fs_www_root); ?>
+ <?php echo osc_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>
@@ -163,7 +163,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_HTTP_COOKIE_DOMAIN; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTP_COOKIE_DOMAIN', getenv('HTTP_HOST')); ?>
+ <?php echo osc_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>
@@ -172,7 +172,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_HTTP_COOKIE_PATH; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTP_COOKIE_PATH', $cookie_path); ?>
+ <?php echo osc_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>
@@ -184,7 +184,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_ENABLE_SSL; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_checkbox_field('ENABLE_SSL', 'true'); ?>
+ <?php echo osc_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>
@@ -196,7 +196,7 @@
<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'); ?>
+ <?php echo osc_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>
@@ -217,15 +217,15 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
- echo tep_draw_hidden_field('install[]', 'configure');
+ echo osc_draw_hidden_field('install[]', 'configure');
?>
</form>
----------
catalog /catalog /install /templates /pages
install_5.php 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- install_5.php 2004/02/16 06:59:42 1.23
+++ install_5.php 2004/07/22 20:47:11 1.24
@@ -25,7 +25,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_ADDRESS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTPS_WWW_ADDRESS', $https_www_address); ?>
+ <?php echo osc_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>
@@ -34,7 +34,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_COOKIE_DOMAIN; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTPS_COOKIE_DOMAIN', $_POST['HTTP_COOKIE_DOMAIN']); ?>
+ <?php echo osc_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>
@@ -43,7 +43,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_WWW_HTTPS_COOKIE_PATH; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('HTTPS_COOKIE_PATH', $_POST['HTTP_COOKIE_PATH']); ?>
+ <?php echo osc_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>
@@ -64,10 +64,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
----------
catalog /catalog /install /templates /pages
install_6.php 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- install_6.php 2004/02/28 12:50:59 1.4
+++ install_6.php 2004/07/22 20:47:11 1.5
@@ -9,6 +9,9 @@
Released under the GNU General Public License
*/
+
+ $db_table_types = array(array('id' => 'mysql', 'text' => 'MySQL - MyISAM (Default)'),
+ array('id' => 'mysql_innodb', 'text' => 'MySQL - InnoDB (Transaction-Safe)'));
?>
<p class="pageTitle"><?php echo PAGE_TITLE_INSTALLATION; ?></p>
@@ -21,7 +24,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER', (isset($_POST['DB_SERVER']) ? $_POST['DB_SERVER'] : '')); ?>
+ <?php echo osc_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>
@@ -30,7 +33,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER_USERNAME', (isset($_POST['DB_SERVER_USERNAME']) ? $_POST['DB_SERVER_USERNAME'] : '')); ?>
+ <?php echo osc_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>
@@ -39,7 +42,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_password_field('DB_SERVER_PASSWORD', (isset($_POST['DB_SERVER_PASSWORD']) ? $_POST['DB_SERVER_PASSWORD'] : '')); ?>
+ <?php echo osc_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>
@@ -48,16 +51,31 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_DATABASE', (isset($_POST['DB_DATABASE']) ? $_POST['DB_DATABASE'] : '')); ?>
+ <?php echo osc_draw_input_field('DB_DATABASE', (isset($_POST['DB_DATABASE']) ? $_POST['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 colspan="2"> </td>
+ </tr>
+ <tr>
+ <td width="30%" valign="top"><?php echo CONFIG_DATABASE_CLASS; ?></td>
+ <td width="70%" class="smallDesc">
+ <?php echo osc_draw_pull_down_menu('DB_DATABASE_CLASS', $db_table_types); ?>
+ <img src="templates/<?php echo $template; ?>/images/help_icon.gif" onClick="toggleBox('dbClass');"><br>
+ <div id="dbClassSD"><?php echo CONFIG_DATABASE_CLASS_DESCRIPTION; ?></div>
+ <div id="dbClass" class="longDescription"><?php echo CONFIG_DATABASE_CLASS_DESCRIPTION_LONG; ?></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_TABLE_PREFIX; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_TABLE_PREFIX', (isset($_POST['DB_TABLE_PREFIX']) ? $_POST['DB_TABLE_PREFIX'] : 'osc_')); ?>
+ <?php echo osc_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>
@@ -69,7 +87,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_PERSISTENT_CONNECTIONS; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_checkbox_field('USE_PCONNECT', 'true', (isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'true' ? true : false)); ?>
+ <?php echo osc_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>
@@ -78,7 +96,7 @@
<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; ?>
+ <?php echo osc_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 osc_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>
@@ -99,10 +117,10 @@
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, $n=sizeof($value); $i<$n; $i++) {
- echo tep_draw_hidden_field($key . '[]', $value[$i]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
----------
catalog /catalog /install /templates /pages
install_7.php 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- install_7.php 2004/02/16 06:59:43 1.2
+++ install_7.php 2004/07/22 20:47:11 1.3
@@ -26,18 +26,28 @@
<p class="pageSubTitle"><?php echo PAGE_SUBTITLE_OSCOMMERCE_CONFIGURATION; ?></p>
<?php
- $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 = array('DB_SERVER' => trim($_POST['DB_SERVER']),
+ 'DB_SERVER_USERNAME' => trim($_POST['DB_SERVER_USERNAME']),
+ 'DB_SERVER_PASSWORD' => trim($_POST['DB_SERVER_PASSWORD']),
+ 'DB_DATABASE' => trim($_POST['DB_DATABASE']),
+ 'DB_TABLE_PREFIX' => trim($_POST['DB_TABLE_PREFIX']),
+ 'DB_DATABASE_CLASS' => trim($_POST['DB_DATABASE_CLASS']));
- $osC_Database = osC_Database::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['DB_DATABASE_CLASS']);
if ($osC_Database->isError() === false) {
$osC_Database->selectDatabase($db['DB_DATABASE']);
}
+ if ($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') {
+ $db_has_innodb = false;
+
+ $Qinno = $osC_Database->query('show variables like "have_innodb"');
+ if (($Qinno->numberOfRows() === 1) && (strtolower($Qinno->value('Value')) == 'yes')) {
+ $db_has_innodb = true;
+ }
+ }
+
if ($osC_Database->isError()) {
?>
<form name="install" action="install.php?step=6" method="post">
@@ -61,10 +71,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -96,10 +106,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -189,6 +199,7 @@
' 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_DATABASE_CLASS\', \'' . (($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') && ($db_has_innodb === true) ? 'mysql_innodb' : 'mysql') . '\');' . "\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" .
@@ -241,6 +252,7 @@
' 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_DATABASE_CLASS\', \'' . (($_POST['DB_DATABASE_CLASS'] == 'mysql_innodb') && ($db_has_innodb === true) ? 'mysql_innodb' : 'mysql') . '\');' . "\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" .
----------
catalog /catalog /install /templates /pages
upgrade.php 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- upgrade.php 2004/02/16 06:59:43 1.5
+++ upgrade.php 2004/07/22 20:47:11 1.6
@@ -23,7 +23,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_SERVER; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER'); ?>
+ <?php echo osc_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>
@@ -32,7 +32,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_USERNAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_SERVER_USERNAME'); ?>
+ <?php echo osc_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>
@@ -41,7 +41,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_PASSWORD; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_password_field('DB_SERVER_PASSWORD'); ?>
+ <?php echo osc_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>
@@ -50,7 +50,7 @@
<tr>
<td width="30%" valign="top"><?php echo CONFIG_DATABASE_NAME; ?></td>
<td width="70%" class="smallDesc">
- <?php echo tep_draw_input_field('DB_DATABASE'); ?>
+ <?php echo osc_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>
----------
catalog /catalog /install /templates /pages
upgrade_2.php 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- upgrade_2.php 2004/02/16 06:59:43 1.3
+++ upgrade_2.php 2004/07/22 20:47:11 1.4
@@ -14,10 +14,10 @@
<p class="pageTitle"><?php echo PAGE_TITLE_UPGRADE; ?></p>
<?php
- $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 = array('DB_SERVER' => trim($_POST['DB_SERVER']),
+ 'DB_SERVER_USERNAME' => trim($_POST['DB_SERVER_USERNAME']),
+ 'DB_SERVER_PASSWORD' => trim($_POST['DB_SERVER_PASSWORD']),
+ 'DB_DATABASE' => trim($_POST['DB_DATABASE']));
$osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
@@ -49,10 +49,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
@@ -85,10 +85,10 @@
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]);
+ echo osc_draw_hidden_field($key . '[]', $value[$i]);
}
} else {
- echo tep_draw_hidden_field($key, $value);
+ echo osc_draw_hidden_field($key, $value);
}
}
}
----------
catalog /catalog /install /templates /pages
upgrade_3.php 1.69 -> 1.70
diff -u -r1.69 -r1.70
--- upgrade_3.php 2004/04/16 05:31:35 1.69
+++ upgrade_3.php 2004/07/22 20:47:11 1.70
@@ -14,10 +14,10 @@
<p class="pageTitle"><?php echo PAGE_TITLE_UPGRADE; ?></p>
<?php
- $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 = array('DB_SERVER' => trim($_POST['DB_SERVER']),
+ 'DB_SERVER_USERNAME' => trim($_POST['DB_SERVER_USERNAME']),
+ 'DB_SERVER_PASSWORD' => trim($_POST['DB_SERVER_PASSWORD']),
+ 'DB_DATABASE' => trim($_POST['DB_DATABASE']));
$osC_Database = osC_Database::connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']);
$osC_Database->selectDatabase($db['DB_DATABASE']);
CVSspam 0.2.8
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click