[TEP-COMMIT] [CVS catalog] remove the administration tool configuration file
hpdl-OfajU3CKLf1/[email protected] 7 Nov 2004 21:02:18 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>includes/<a href="#file1">configure.php</a></tt></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php.diff?r1=1.16&r2=1.17">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a></td></tr>
<tr class="alt"><td><tt>install/includes/languages/english/<a href="#file2">install.php</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt>install/includes/languages/espanol/<a href="#file3">install.php</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt>install/includes/languages/german/<a href="#file4">install.php</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt>install/templates/pages/<a href="#file5">install_3.php</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php?rev=1.10&content-type=text/vnd.viewcvs-markup">1.10</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php.diff?r1=1.10&r2=1.11">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php?rev=1.11&content-type=text/vnd.viewcvs-markup">1.11</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file6">install_7.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-55</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-59</td><td></td></tr>
</table>
<small id="info">6 modified files</small><br />
<pre class="comment">
remove the administration tool configuration file
add the backup directory to the configuration file
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a><br /></span>
<div class="fileheader"><big><b>configure.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php.diff?r1=1.16&r2=1.17">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/configure.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.16 -r1.17
--- configure.php 2004/07/22 16:59:04 1.16
+++ configure.php 2004/11/07 21:02:10 1.17
@@ -36,6 +36,7 @@
</small></pre><pre class="diff" id="context"> define('DIR_FS_WORK', '/tmp/'); // the work directory should be outside the public html directory
define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
</pre><pre class="diff" id="added">+ define('DIR_FS_BACKUP', DIR_FS_CATALOG . 'admin/backups/');
</pre><pre class="diff" id="context">
// define our database connection
define('DB_SERVER', ''); // eg, localhost - should not be empty for productive servers
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install">install</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english">english</a><br /></span>
<div class="fileheader"><big><b>install.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/english/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- install.php 2004/07/22 20:38:47 1.2
+++ install.php 2004/11/07 21:02:11 1.3
@@ -118,7 +118,7 @@
</small></pre><pre class="diff" id="context"> define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION', 'The secure path to store cookies under');
define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION_LONG', 'The web address of the secure server to limit the cookie to, for example <i>/my_name/catalog/</i>');
</pre><pre class="diff" id="removed">- define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="removedchars">s do not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %sincludes/</li><li>touch configure.php</li><li>chmod 706 configure.php</li></ul><ul class="boxMe"><li>cd %sadmin/</span>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>');
</pre><pre class="diff" id="added">+ define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="addedchars"> does not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %s</span>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 create
d.</p>');
</pre><pre class="diff" id="context">
define('TEXT_SUCCESSFUL_CONFIGURATION', 'The configuration was successful!');
?>
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install">install</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol">espanol</a><br /></span>
<div class="fileheader"><big><b>install.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/espanol/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- install.php 2004/07/22 20:38:47 1.2
+++ install.php 2004/11/07 21:02:12 1.3
@@ -118,7 +118,7 @@
</small></pre><pre class="diff" id="context"> define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION', 'The secure path to store cookies under');
define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION_LONG', 'The web address of the secure server to limit the cookie to, for example <i>/my_name/catalog/</i>');
</pre><pre class="diff" id="removed">- define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="removedchars">s do not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %sincludes/</li><li>touch configure.php</li><li>chmod 706 configure.php</li></ul><ul class="boxMe"><li>cd %sadmin/</span>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>');
</pre><pre class="diff" id="added">+ define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="addedchars"> does not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %s</span>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 create
d.</p>');
</pre><pre class="diff" id="context">
define('TEXT_SUCCESSFUL_CONFIGURATION', 'The configuration was successful!');
?>
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install">install</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german">german</a><br /></span>
<div class="fileheader"><big><b>install.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/includes/languages/german/install.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- install.php 2004/07/22 20:38:48 1.2
+++ install.php 2004/11/07 21:02:14 1.3
@@ -118,7 +118,7 @@
</small></pre><pre class="diff" id="context"> define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION', 'The secure path to store cookies under');
define('CONFIG_WWW_HTTPS_COOKIE_PATH_DESCRIPTION_LONG', 'The web address of the secure server to limit the cookie to, for example <i>/my_name/catalog/</i>');
</pre><pre class="diff" id="removed">- define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="removedchars">s do not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %sincludes/</li><li>touch configure.php</li><li>chmod 706 configure.php</li></ul><ul class="boxMe"><li>cd %sadmin/</span>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>');
</pre><pre class="diff" id="added">+ define('ERROR_CONFIG_FILE_NOT_WRITEABLE', '<p>The following error has occurred:</p><p><div class="boxMe"><b>The configuration file<span id="addedchars"> does not exist, or permission levels are not set.</b><br><br>Please perform the following actions:<ul class="boxMe"><li>cd %s</span>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 create
d.</p>');
</pre><pre class="diff" id="context">
define('TEXT_SUCCESSFUL_CONFIGURATION', 'The configuration was successful!');
?>
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install">install</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>install_3.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php?rev=1.10&content-type=text/vnd.viewcvs-markup">1.10</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php.diff?r1=1.10&r2=1.11">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_3.php?rev=1.11&content-type=text/vnd.viewcvs-markup">1.11</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.10 -r1.11
--- install_3.php 2004/07/22 20:47:11 1.10
+++ install_3.php 2004/11/07 21:02:14 1.11
@@ -68,7 +68,7 @@
</small></pre><pre class="diff" id="context"> 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')) {
</pre><pre class="diff" id="removed">- $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', '<span id="removedchars">reviews_description', '</span>weight_classes', 'weight_classes_rules');
</pre><pre class="diff" id="added">+ $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', 'weight_classes', 'weight_classes_rules');
</pre><pre class="diff" id="context">
foreach ($database_tables as $table) {
$osC_Database->simpleQuery('alter table ' . $db['DB_TABLE_PREFIX'] . $table . ' type = innodb');
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install">install</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>install_7.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/install/templates/pages/install_7.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- install_7.php 2004/07/22 20:47:11 1.3
+++ install_7.php 2004/11/07 21:02:15 1.4
@@ -83,13 +83,13 @@
</small></pre><pre class="diff" id="context"> </form>
<?php
</pre><pre class="diff" id="removed">- } 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')) ) {
</pre><pre class="diff" id="added">+ } elseif (file_exists($dir_fs_document_root . 'includes/configure.php') && !is_writeable($dir_fs_document_root . 'includes/configure.php')) {
</pre><pre class="diff" id="context"> ?>
<form name="install" action="install.php?step=7" method="post">
<table width="95%" border="0" cellpadding="2" class="formPage">
<tr>
</pre><pre class="diff" id="removed">- <td><?php echo sprintf(ERROR_CONFIG_FILE_NOT_WRITEABLE, $dir_fs_document_root<span id="removedchars">, $dir_fs_document_root</span>); ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo sprintf(ERROR_CONFIG_FILE_NOT_WRITEABLE, $dir_fs_document_root); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
</pre><pre class="diff"><small id="info">@@ -193,6 +193,7 @@
</small></pre><pre class="diff" id="context"> ' 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" .
</pre><pre class="diff" id="added">+ ' define(\'DIR_FS_BACKUP\', \'' . $dir_fs_document_root . 'admin/backups/\');' . "\n" .
</pre><pre class="diff" id="context"> '' . "\n" .
'// define our database connection' . "\n" .
' define(\'DB_SERVER\', \'' . $_POST['DB_SERVER'] . '\'); // eg, localhost - should not be empty for productive servers' . "\n" .
</pre><pre class="diff"><small id="info">@@ -206,59 +207,6 @@
</small></pre><pre class="diff" id="context"> '?>';
$fp = fopen($dir_fs_document_root . 'includes/configure.php', 'w');
</pre><pre class="diff" id="removed">- fputs($fp, $file_contents);
- fclose($fp);
-
- $file_contents = '<?php' . "\n" .
- '/*' . "\n" .
- ' osCommerce, Open Source E-Commerce Solutions' . "\n" .
- ' http://www.oscommerce.com' . "\n" .
- '' . "\n" .
- ' Copyright (c) 2004 osCommerce' . "\n" .
- '' . "\n" .
- ' Released under the GNU General Public License' . "\n" .
- '*/' . "\n" .
- '' . "\n" .
- '// Define the webserver and path parameters' . "\n" .
- '// * DIR_FS_* = Filesystem directories (local/physical)' . "\n" .
- '// * DIR_WS_* = Webserver directories (virtual/URL)' . "\n" .
- ' define(\'HTTP_SERVER\', \'' . $http_server . '\'); // eg, http://localhost - should not be empty for productive servers' . "\n" .
- ' define(\'HTTP_CATALOG_SERVER\', \'' . $http_server . '\');' . "\n" .
- ' define(\'HTTPS_CATALOG_SERVER\', \'' . $https_server . '\');' . "\n" .
- ' define(\'ENABLE_SSL_CATALOG\', \'' . $enable_ssl . '\'); // secure webserver for catalog module' . "\n" .
- ' define(\'DIR_FS_DOCUMENT_ROOT\', \'' . $dir_fs_document_root . '\'); // where the pages are located on the server' . "\n" .
- ' define(\'DIR_WS_ADMIN\', \'' . $http_catalog . 'admin/\'); // absolute path required' . "\n" .
- ' define(\'DIR_FS_ADMIN\', \'' . $dir_fs_document_root . 'admin/\'); // absolute pate required' . "\n" .
- ' define(\'DIR_WS_CATALOG\', \'' . $http_catalog . '\'); // absolute path required' . "\n" .
- ' define(\'DIR_FS_CATALOG\', \'' . $dir_fs_document_root . '\'); // absolute path required' . "\n" .
- ' define(\'DIR_WS_IMAGES\', \'images/\');' . "\n" .
- ' define(\'DIR_WS_ICONS\', DIR_WS_IMAGES . \'icons/\');' . "\n" .
- ' define(\'DIR_WS_CATALOG_IMAGES\', DIR_WS_CATALOG . \'images/\');' . "\n" .
- ' define(\'DIR_WS_INCLUDES\', \'includes/\');' . "\n" .
- ' define(\'DIR_WS_BOXES\', DIR_WS_INCLUDES . \'boxes/\');' . "\n" .
- ' define(\'DIR_WS_FUNCTIONS\', DIR_WS_INCLUDES . \'functions/\');' . "\n" .
- ' define(\'DIR_WS_CLASSES\', DIR_WS_INCLUDES . \'classes/\');' . "\n" .
- ' define(\'DIR_WS_MODULES\', DIR_WS_INCLUDES . \'modules/\');' . "\n" .
- ' define(\'DIR_WS_LANGUAGES\', DIR_WS_INCLUDES . \'languages/\');' . "\n" .
- ' define(\'DIR_WS_CATALOG_LANGUAGES\', DIR_WS_CATALOG . \'includes/languages/\');' . "\n" .
- ' define(\'DIR_FS_CATALOG_LANGUAGES\', DIR_FS_CATALOG . \'includes/languages/\');' . "\n" .
- ' 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\', \'' . $_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_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" .
- '?>';
-
- $fp = fopen($dir_fs_document_root . 'admin/includes/configure.php', 'w');
</pre><pre class="diff" id="context"> fputs($fp, $file_contents);
fclose($fp);
?>
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click