[TEP-COMMIT] [CVS admin] remove the administration tool configuration file, and use the one from the
hpdl-OfajU3CKLf1/[email protected] 7 Nov 2004 21:01:02 -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>admin/admin</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">categories.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/admin/admin/categories.php?rev=1.157&content-type=text/vnd.viewcvs-markup">1.157</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.157&r2=1.158">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.158&content-type=text/vnd.viewcvs-markup">1.158</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">define_language.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.18&r2=1.19">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.19&content-type=text/vnd.viewcvs-markup">1.19</a></td></tr>
<tr><td><tt><a href="#file3">invoice.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php.diff?r1=1.7&r2=1.8">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a></td></tr>
<tr class="alt"><td><tt><a href="#file4">manufacturers.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.60&content-type=text/vnd.viewcvs-markup">1.60</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.60&r2=1.61">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a></td></tr>
<tr><td><tt><a href="#file5">orders.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/admin/admin/orders.php?rev=1.117&content-type=text/vnd.viewcvs-markup">1.117</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php.diff?r1=1.117&r2=1.118">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php?rev=1.118&content-type=text/vnd.viewcvs-markup">1.118</a></td></tr>
<tr class="alt"><td><tt><a href="#file6">packingslip.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td><tt><a href="#file7">products.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.16&r2=1.17">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a></td></tr>
<tr class="alt"><td><tt>includes/<a href="#file8">application_top.php</a></tt></td><td align="right" id="added">+8</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.179&content-type=text/vnd.viewcvs-markup">1.179</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.179&r2=1.180">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.180&content-type=text/vnd.viewcvs-markup">1.180</a></td></tr>
<tr><td><tt> /<span id="removed">configure.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/configure.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a> removed</td></tr>
<tr class="alt"><td><tt>includes/functions/<a href="#file10">general.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-14</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.174&content-type=text/vnd.viewcvs-markup">1.174</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.174&r2=1.175">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.175&content-type=text/vnd.viewcvs-markup">1.175</a></td></tr>
<tr><td><tt> /<a href="#file11">html_output.php</a></tt></td><td align="right" id="added">+11</td><td align="right" id="removed">-50</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.34&content-type=text/vnd.viewcvs-markup">1.34</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php.diff?r1=1.34&r2=1.35">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.35&content-type=text/vnd.viewcvs-markup">1.35</a></td></tr>
<tr class="alt"><td><tt>includes/languages/english/<a href="#file12">products.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td><tt>includes/languages/espanol/<a href="#file13">products.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt>includes/languages/german/<a href="#file14">products.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt>includes/local/<span id="removed">.cvsignore</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> removed</td></tr>
<tr class="alt"><td><tt> /<span id="removed">README</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local/README?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> removed</td></tr>
<tr><td><tt>includes/modules/statistics/<a href="#file17">products_viewed.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/admin/admin/includes/modules/statistics/products_viewed.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt>includes/modules/summary/<a href="#file18">reviews.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt>templates/default/<a href="#file19">footer.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/admin/admin/templates/default/footer.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/footer.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/footer.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file20">header.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a></td></tr>
<tr><td><tt>templates/pages/<a href="#file21">banner_manager.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/admin/admin/templates/pages/banner_manager.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file22">banner_manager_statistics.php</a></tt></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file23">categories.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file24">define_language.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/admin/admin/templates/pages/define_language.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file25">define_language_edit.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file26">file_manager.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt> /<a href="#file27">geo_zones.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/admin/admin/templates/pages/geo_zones.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/geo_zones.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/geo_zones.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file28">manufacturers.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt> /<a href="#file29">modules.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file30">orders.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/admin/admin/templates/pages/orders.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file31">orders_status.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file32">products.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/admin/admin/templates/pages/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt> /<a href="#file33">products_attributes.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file34">products_attributes_listing.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file35">products_edit.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file36">products_preview.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt> /<a href="#file37">reviews.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file38">reviews_edit.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/admin/admin/templates/pages/reviews_edit.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_edit.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_edit.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt> /<a href="#file39">reviews_preview.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file40">services.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file41">tax_classes.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/admin/admin/templates/pages/tax_classes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/tax_classes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/tax_classes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file42">weight_classes.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td></td><td align="right" id="added">+106</td><td align="right" id="removed">-151</td><td></td></tr>
</table>
<small id="info">3 removed + 39 modified, total 42 files</small><br />
<pre class="comment">
remove the administration tool configuration file, and use the one from the
catalog side
hardcode directory names statically or dynamically through realpath()
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>categories.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.157&content-type=text/vnd.viewcvs-markup">1.157</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.157&r2=1.158">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.158&content-type=text/vnd.viewcvs-markup">1.158</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.157 -r1.158
--- categories.php 2004/10/28 18:59:48 1.157
+++ categories.php 2004/11/07 21:00:29 1.158
@@ -84,7 +84,7 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- if (($error === false) && ($categories_image = new upload('categories_image', <span id="removedchars">DIR_FS_CATALOG_IMAGES</span>))) {
</pre><pre class="diff" id="added">+ if (($error === false) && ($categories_image = new upload('categories_image', <span id="addedchars">realpath('../images')</span>))) {
</pre><pre class="diff" id="context"> $Qcf = $osC_Database->query('update :table_categories set categories_image = :categories_image where categories_id = :categories_id');
$Qcf->bindTable(':table_categories', TABLE_CATEGORIES);
$Qcf->bindValue(':categories_image', $categories_image->filename);
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>define_language.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.18&r2=1.19">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.19&content-type=text/vnd.viewcvs-markup">1.19</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.18 -r1.19
--- define_language.php 2004/08/15 18:17:01 1.18
+++ define_language.php 2004/11/07 21:00:29 1.19
@@ -40,9 +40,9 @@
</small></pre><pre class="diff" id="context"> switch ($action) {
case 'save':
if (isset($_GET['file']) && !empty($_GET['file'])) {
</pre><pre class="diff" id="removed">- $file = realpath(<span id="removedchars">DIR_FS_CATALOG_LANGUAGES</span> . $lng . '/' . $_GET['file']);
</pre><pre class="diff" id="added">+ $file = realpath(<span id="addedchars">'../includes/languages/'</span> . $lng . '/' . $_GET['file']);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- if (substr($file, 0, strlen(DIR_FS_CATALOG_LANGUAGES)) != DIR_FS_CATALOG_LANGUAGES) {
</pre><pre class="diff" id="added">+ if (substr($file, 0, strlen(realpath('../includes/languages'))) != realpath('../includes/languages')) {
</pre><pre class="diff" id="context"> $file = false;
}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>invoice.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php.diff?r1=1.7&r2=1.8">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/invoice.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- invoice.php 2004/07/22 23:33:00 1.7
+++ invoice.php 2004/11/07 21:00:29 1.8
@@ -35,7 +35,7 @@
</small></pre><pre class="diff" id="context"> <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td class="pageHeading"><?php echo nl2br(STORE_NAME_ADDRESS); ?></td>
</pre><pre class="diff" id="removed">- <td class="pageHeading" align="right"><?php echo tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>oscommerce.gif', 'osCommerce', '204', '50'); ?></td>
</pre><pre class="diff" id="added">+ <td class="pageHeading" align="right"><?php echo tep_image(<span id="addedchars">'images/</span>oscommerce.gif', 'osCommerce', '204', '50'); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table></td>
</tr>
</pre><pre class="diff"><small id="info">@@ -142,4 +142,4 @@
</small></pre><pre class="diff" id="context"> <br>
</body>
</html>
</pre><pre class="diff" id="removed">-<?php require(<span id="removedchars">DIR_WS_INCLUDES . '</span>application_bottom.php'); ?>
</pre><pre class="diff" id="added">+<?php require(<span id="addedchars">'includes/</span>application_bottom.php'); ?>
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>manufacturers.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.60&content-type=text/vnd.viewcvs-markup">1.60</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.60&r2=1.61">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.60 -r1.61
--- manufacturers.php 2004/10/28 18:59:50 1.60
+++ manufacturers.php 2004/11/07 21:00:30 1.61
@@ -44,7 +44,7 @@
</small></pre><pre class="diff" id="context"> $manufacturers_id = $osC_Database->nextID();
}
</pre><pre class="diff" id="removed">- if ($manufacturers_image = new upload('manufacturers_image', <span id="removedchars">DIR_FS_CATALOG_IMAGES</span>)) {
</pre><pre class="diff" id="added">+ if ($manufacturers_image = new upload('manufacturers_image', <span id="addedchars">realpath('../images')</span>)) {
</pre><pre class="diff" id="context"> $Qimage = $osC_Database->query('update :table_manufacturers set manufacturers_image = :manufacturers_image where manufacturers_id = :manufacturers_id');
$Qimage->bindTable(':table_manufacturers', TABLE_MANUFACTURERS);
$Qimage->bindValue(':manufacturers_image', $manufacturers_image->filename);
</pre><pre class="diff"><small id="info">@@ -101,10 +101,8 @@
</small></pre><pre class="diff" id="context"> $Qimage->execute();
if ($Qimage->numberOfRows() && tep_not_null($Qimage->value('manufacturers_image'))) {
</pre><pre class="diff" id="removed">- $image_location = DIR_FS_DOCUMENT_ROOT . DIR_WS_CATALOG_IMAGES . $Qimage->value('manufacturers_image');
-
- if (file_exists($image_location)) {
- @unlink($image_location);
</pre><pre class="diff" id="added">+ if (file_exists(realpath('../images/' . $Qimage->value('manufacturers_image')))) {
+ @unlink(realpath('../images/' . $Qimage->value('manufacturers_image')));
</pre><pre class="diff" id="context"> }
}
}
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>orders.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php?rev=1.117&content-type=text/vnd.viewcvs-markup">1.117</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php.diff?r1=1.117&r2=1.118">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php?rev=1.118&content-type=text/vnd.viewcvs-markup">1.118</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.117 -r1.118
--- orders.php 2004/10/28 18:59:50 1.117
+++ orders.php 2004/11/07 21:00:30 1.118
@@ -53,7 +53,7 @@
</small></pre><pre class="diff" id="context">
if ($Qupdate->affectedRows()) {
if (isset($_POST['notify_customer']) && ($_POST['notify_customer'] == 'on')) {
</pre><pre class="diff" id="removed">- $email_body = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" . EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n" . EMAIL_TEXT_INVOICE_URL . ' ' . tep_<span id="removedchars">catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL'</span>) . "\n" . EMAIL_TEXT_DATE_ORDERED . ' ' . tep_date_long($Qorder->value('date_purchased')) . "\n\n";
</pre><pre class="diff" id="added">+ $email_body = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" . EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n" . EMAIL_TEXT_INVOICE_URL . ' ' . tep_<span id="addedchars">href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL', false</span>) . "\n" . EMAIL_TEXT_DATE_ORDERED . ' ' . tep_date_long($Qorder->value('date_purchased')) . "\n\n";
</pre><pre class="diff" id="context">
if (isset($_POST['append_comment']) && ($_POST['append_comment'] == 'on')) {
$email_body .= sprintf(EMAIL_TEXT_COMMENTS_UPDATE, $_POST['comment']) . "\n\n";
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>packingslip.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/packingslip.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.8 -r1.9
--- packingslip.php 2004/07/22 23:33:00 1.8
+++ packingslip.php 2004/11/07 21:00:30 1.9
@@ -34,7 +34,7 @@
</small></pre><pre class="diff" id="context"> <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td class="pageHeading"><?php echo nl2br(STORE_NAME_ADDRESS); ?></td>
</pre><pre class="diff" id="removed">- <td class="pageHeading" align="right"><?php echo tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>oscommerce.gif', 'osCommerce', '204', '50'); ?></td>
</pre><pre class="diff" id="added">+ <td class="pageHeading" align="right"><?php echo tep_image(<span id="addedchars">'images/</span>oscommerce.gif', 'osCommerce', '204', '50'); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table></td>
</tr>
</pre><pre class="diff"><small id="info">@@ -118,4 +118,4 @@
</small></pre><pre class="diff" id="context"> <br>
</body>
</html>
</pre><pre class="diff" id="removed">-<?php require(<span id="removedchars">DIR_WS_INCLUDES . '</span>application_bottom.php'); ?>
</pre><pre class="diff" id="added">+<?php require(<span id="addedchars">'includes/</span>application_bottom.php'); ?>
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a><br /></span>
<div class="fileheader"><big><b>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.16&r2=1.17">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.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
--- products.php 2004/10/28 18:59:50 1.16
+++ products.php 2004/11/07 21:00:30 1.17
@@ -408,8 +408,8 @@
</small></pre><pre class="diff" id="context"> $osC_Currencies = new osC_Currencies();
// check if the catalog image directory exists
</pre><pre class="diff" id="removed">- if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) {
</pre><pre class="diff" id="added">+ if (is_dir(realpath('../images'))) {
+ if (!is_writeable(realpath('../images'))) {
</pre><pre class="diff" id="context"> $osC_MessageStack->add('header', ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE, 'error');
}
} else {
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a><br /></span>
<div class="fileheader"><big><b>application_top.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.179&content-type=text/vnd.viewcvs-markup">1.179</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.179&r2=1.180">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.180&content-type=text/vnd.viewcvs-markup">1.180</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.179 -r1.180
--- application_top.php 2004/11/02 00:59:11 1.179
+++ application_top.php 2004/11/07 21:00:34 1.180
@@ -14,10 +14,10 @@
</small></pre><pre class="diff" id="context"> define('PAGE_PARSE_START_TIME', microtime());
// set the local configuration parameters - mainly for developers
</pre><pre class="diff" id="removed">- if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
</pre><pre class="diff" id="added">+ if (file_exists('../includes/local/configure.php')) include('../includes/local/configure.php');
</pre><pre class="diff" id="context">
// include server parameters
</pre><pre class="diff" id="removed">- require('includes/configure.php');
</pre><pre class="diff" id="added">+ require('<span id="addedchars">../</span>includes/configure.php');
</pre><pre class="diff" id="context">
// set the level of error reporting
error_reporting(E_ALL & ~E_NOTICE);
</pre><pre class="diff"><small id="info">@@ -27,6 +27,12 @@
</small></pre><pre class="diff" id="context">
// set the type of request (secure or not)
$request_type = (isset($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) == 'on')) ? 'SSL' : 'NONSSL';
</pre><pre class="diff" id="added">+
+ if ($request_type == 'NONSSL') {
+ define('DIR_WS_CATALOG', DIR_WS_HTTP_CATALOG);
+ } else {
+ define('DIR_WS_CATALOG', DIR_WS_HTTPS_CATALOG);
+ }
</pre><pre class="diff" id="context">
// set php_self in the local scope
if (!isset($PHP_SELF)) $PHP_SELF = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']);
</pre></div>
<hr /><a name="file9" /><div class="file">
<span class="pathname" id="removed"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a><br /></span>
<div class="fileheader" id="removed"><big><b>configure.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/configure.php?rev=1.16&content-type=text/vnd.viewcvs-markup">1.16</a></small></div>
<pre class="diff"><small id="info">diff -N configure.php
--- /tmp/cvsAAA8Maa5x Sun Nov 7 22:00:36 2004
+++ /dev/null Sun Nov 7 22:00:32 2004
@@ -1,50 +0,0 @@
</small></pre><pre class="diff" id="removed">-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2002 osCommerce
-
- Released under the GNU General Public License
-*/
-
-// define our webserver variables
-// FS = Filesystem (physical)
-// WS = Webserver (virtual)
- define('HTTP_SERVER', ''); // eg, http://localhost or - https://localhost should not be NULL for productive servers
- define('HTTP_CATALOG_SERVER', '');
- define('HTTPS_CATALOG_SERVER', '');
- define('ENABLE_SSL_CATALOG', 'false'); // secure webserver for catalog module
- define('DIR_FS_DOCUMENT_ROOT', $DOCUMENT_ROOT); // where your pages are located on the server. if $DOCUMENT_ROOT doesnt suit you, replace with your local path. (eg, /usr/local/apache/htdocs)
- define('DIR_WS_ADMIN', '/admin/');
- define('DIR_FS_ADMIN', DIR_FS_DOCUMENT_ROOT . DIR_WS_ADMIN);
- define('DIR_WS_CATALOG', '/catalog/');
- define('DIR_FS_CATALOG', DIR_FS_DOCUMENT_ROOT . DIR_WS_CATALOG);
- define('DIR_WS_IMAGES', 'images/');
- define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
- define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG . 'images/');
- define('DIR_WS_INCLUDES', 'includes/');
- define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
- define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
- define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
- define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
- define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
- define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
- define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
- define('DIR_FS_BACKUP', DIR_FS_ADMIN . 'backups/');
- define('DIR_FS_WORK', '/tmp/');
-
-// define our database connection
- define('DB_SERVER', '');
- define('DB_SERVER_USERNAME', 'mysql');
- define('DB_SERVER_PASSWORD', '');
- define('DB_DATABASE', 'osCommerce');
- define('DB_DATABASE_CLASS', 'mysql');
- define('DB_TABLE_PREFIX', 'osc_');
- define('USE_PCONNECT', 'false');
- define('STORE_SESSIONS', '');
-?>
</pre><pre class="diff"><small id="info">\ No newline at end of file
<hr /><a name="file10" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions">functions</a><br /></span>
<div class="fileheader"><big><b>general.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.174&content-type=text/vnd.viewcvs-markup">1.174</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.174&r2=1.175">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.175&content-type=text/vnd.viewcvs-markup">1.175</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.174 -r1.175
--- general.php 2004/11/02 00:59:12 1.174
+++ general.php 2004/11/07 21:00:36 1.175
@@ -94,16 +94,6 @@
</small></pre><pre class="diff" id="context"> return strftime(DATE_TIME_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
}
</pre><pre class="diff" id="removed">- function tep_info_image($image, $alt, $width = '', $height = '') {
- if (tep_not_null($image) && (file_exists(DIR_FS_CATALOG_IMAGES . $image)) ) {
- $image = tep_image(DIR_WS_CATALOG_IMAGES . $image, $alt, $width, $height);
- } else {
- $image = TEXT_IMAGE_NONEXISTENT;
- }
-
- return $image;
- }
-
</pre><pre class="diff" id="context"> function tep_break_string($string, $len, $break_char = '-') {
$l = 0;
$output = '';
</pre><pre class="diff"><small id="info">@@ -757,8 +747,8 @@
</small></pre><pre class="diff" id="context"> $Qcheck->execute();
if ($Qcheck->numberOfRows() === 0) {
</pre><pre class="diff" id="removed">- if (file_exists(DIR_FS_CATALOG_IMAGES . $Qimage->value('categories_image'))) {
- @unlink(DIR_FS_CATALOG_IMAGES . $Qimage->value('categories_image'));
</pre><pre class="diff" id="added">+ if (file_exists(realpath('../images/' . $Qimage->value('categories_image')))) {
+ @unlink(realpath('../images/' . $Qimage->value('categories_image')));
</pre><pre class="diff" id="context"> }
}
}
</pre><pre class="diff"><small id="info">@@ -885,8 +875,8 @@
</small></pre><pre class="diff" id="context"> $Qcheck->execute();
if ($Qcheck->numberOfRows() === 0) {
</pre><pre class="diff" id="removed">- if (file_exists(DIR_FS_CATALOG_IMAGES . $Qimage->value('products_image'))) {
- @unlink(DIR_FS_CATALOG_IMAGES . $Qimage->value('products_image'));
</pre><pre class="diff" id="added">+ if (file_exists(realpath('../images/' . $Qimage->value('products_image')))) {
+ @unlink(realpath('../images/' . $Qimage->value('products_image')));
</pre><pre class="diff" id="context"> }
}
}
</pre></div>
<hr /><a name="file11" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions">functions</a><br /></span>
<div class="fileheader"><big><b>html_output.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.34&content-type=text/vnd.viewcvs-markup">1.34</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php.diff?r1=1.34&r2=1.35">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.35&content-type=text/vnd.viewcvs-markup">1.35</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.34 -r1.35
--- html_output.php 2004/11/02 00:59:12 1.34
+++ html_output.php 2004/11/07 21:00:36 1.35
@@ -10,54 +10,21 @@
</small></pre><pre class="diff" id="context"> Released under the GNU General Public License
*/
</pre><pre class="diff" id="removed">-////
-// The HTML href link wrapper function
- function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL') {
- if ($page == '') {
- die('</td></tr></table></td></tr></table><br><br><font color="#ff0000"><b>Error!</b></font><br><br><b>Unable to determine the page link!<br><br>Function used:<br><br>tep_href_link(\'' . $page . '\', \'' . $parameters . '\', \'' . $connection . '\')</b>');
- }
- if ($connection == 'NONSSL') {
- $link = HTTP_SERVER . DIR_WS_ADMIN;
- } elseif ($connection == 'SSL') {
- if (ENABLE_SSL == 'true') {
- $link = HTTPS_SERVER . DIR_WS_ADMIN;
- } else {
- $link = HTTP_SERVER . DIR_WS_ADMIN;
- }
- } else {
- die('</td></tr></table></td></tr></table><br><br><font color="#ff0000"><b>Error!</b></font><br><br><b>Unable to determine connection method on a link!<br><br>Known methods: NONSSL SSL<br><br>Function used:<br><br>tep_href_link(\'' . $page . '\', \'' . $parameters . '\', \'' . $connection . '\')</b>');
- }
- if ($parameters == '') {
</pre><pre class="diff" id="added">+ function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $administration = true) {
+ $path = ($administration === true) ? DIR_WS_CATALOG . 'admin/' : DIR_WS_CATALOG;
+
+ $link = ((($connection == 'SSL') && (ENABLE_SSL == 'true') ) ? HTTPS_SERVER : HTTP_SERVER) . $path;
+
+ if (empty($parameters)) {
</pre><pre class="diff" id="context"> $link = $link . $page . '?' . SID;
} else {
$link = $link . $page . '?' . $parameters . '&' . SID;
}
</pre><pre class="diff" id="removed">-
- while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) $link = substr($link, 0, -1);
-
- return $link;
- }
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL') {
- if ($connection == 'NONSSL') {
- $link = HTTP_CATALOG_SERVER . DIR_WS_CATALOG;
- } elseif ($connection == 'SSL') {
- if (ENABLE_SSL_CATALOG == 'true') {
- $link = HTTPS_CATALOG_SERVER . DIR_WS_CATALOG;
- } else {
- $link = HTTP_CATALOG_SERVER . DIR_WS_CATALOG;
- }
- } else {
- die('</td></tr></table></td></tr></table><br><br><font color="#ff0000"><b>Error!</b></font><br><br><b>Unable to determine connection method on a link!<br><br>Known methods: NONSSL SSL<br><br>Function used:<br><br>tep_href_link(\'' . $page . '\', \'' . $parameters . '\', \'' . $connection . '\')</b>');
- }
- if ($parameters == '') {
- $link .= $page;
- } else {
- $link .= $page . '?' . $parameters;
</pre><pre class="diff" id="added">+ while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) {
+ $link = substr($link, 0, -1);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) $link = substr($link, 0, -1);
-
</pre><pre class="diff" id="context"> return $link;
}
</pre><pre class="diff"><small id="info">@@ -94,7 +61,7 @@
</small></pre><pre class="diff" id="context"> function tep_image_submit($image, $alt = '', $parameters = '') {
global $language;
</pre><pre class="diff" id="removed">- $image_submit = '<input type="image" src="' . tep_output_string(<span id="removedchars">DIR_WS_LANGUAGES</span> . $language . '/images/buttons/' . $image) . '" border="0" alt="' . tep_output_string($alt) . '"';
</pre><pre class="diff" id="added">+ $image_submit = '<input type="image" src="' . tep_output_string(<span id="addedchars">'includes/languages/'</span> . $language . '/images/buttons/' . $image) . '" border="0" alt="' . tep_output_string($alt) . '"';
</pre><pre class="diff" id="context">
if (tep_not_null($alt)) $image_submit .= ' title=" ' . tep_output_string($alt) . ' "';
</pre><pre class="diff"><small id="info">@@ -106,15 +73,9 @@
</small></pre><pre class="diff" id="context"> }
////
</pre><pre class="diff" id="removed">-// Draw a 1 pixel black line
- function tep_black_line() {
- return tep_image(DIR_WS_IMAGES . 'pixel_black.gif', '', '100%', '1');
- }
-
-////
</pre><pre class="diff" id="context"> // Output a separator either through whitespace, or with an image
function tep_draw_separator($image = 'pixel_black.gif', $width = '100%', $height = '1') {
</pre><pre class="diff" id="removed">- return tep_image(<span id="removedchars">DIR_WS_IMAGES</span> . $image, '', $width, $height);
</pre><pre class="diff" id="added">+ return tep_image(<span id="addedchars">'images/'</span> . $image, '', $width, $height);
</pre><pre class="diff" id="context"> }
////
</pre><pre class="diff"><small id="info">@@ -122,7 +83,7 @@
</small></pre><pre class="diff" id="context"> function tep_image_button($image, $alt = '', $params = '') {
global $language;
</pre><pre class="diff" id="removed">- return tep_image(<span id="removedchars">DIR_WS_LANGUAGES</span> . $language . '/images/buttons/' . $image, $alt, '', '', $params);
</pre><pre class="diff" id="added">+ return tep_image(<span id="addedchars">'includes/languages/'</span> . $language . '/images/buttons/' . $image, $alt, '', '', $params);
</pre><pre class="diff" id="context"> }
////
</pre></div>
<hr /><a name="file12" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english">english</a><br /></span>
<div class="fileheader"><big><b>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/english/products.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.8 -r1.9
--- products.php 2004/10/26 20:15:23 1.8
+++ products.php 2004/11/07 21:00:38 1.9
@@ -67,6 +67,6 @@
</small></pre><pre class="diff" id="context"> define('TEXT_COPY_AS_DUPLICATE', 'Duplicate product');
define('ERROR_CANNOT_LINK_TO_SAME_CATEGORY', 'Error: Can not link products in the same category.');
</pre><pre class="diff" id="removed">- define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Error: Catalog images directory is not writeable: ' . DIR_FS_CATALOG_IMAGES);
- define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Error: Catalog images directory does not exist: ' . DIR_FS_CATALOG_IMAGES);
</pre><pre class="diff" id="added">+ define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Error: Catalog images directory is not writeable: ' . realpath('../images'));
+ define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Error: Catalog images directory does not exist: ' . realpath('../images'));
</pre><pre class="diff" id="context"> ?>
</pre></div>
<hr /><a name="file13" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol">espanol</a><br /></span>
<div class="fileheader"><big><b>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/espanol/products.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
--- products.php 2004/10/26 20:15:26 1.3
+++ products.php 2004/11/07 21:00:40 1.4
@@ -67,6 +67,6 @@
</small></pre><pre class="diff" id="context"> define('TEXT_COPY_AS_DUPLICATE', 'Duplicar el producto');
define('ERROR_CANNOT_LINK_TO_SAME_CATEGORY', 'Error: No se pueden enlazar productos en la misma categoria.');
</pre><pre class="diff" id="removed">- define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Error: No se puede escribir en el directorio de imagenes del cat&aacute;logo: ' . DIR_FS_CATALOG_IMAGES);
- define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Error: No existe el directorio de imagenes del cat&aacute;logo: ' . DIR_FS_CATALOG_IMAGES);
</pre><pre class="diff" id="added">+ define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Error: No se puede escribir en el directorio de imagenes del cat&aacute;logo: ' . realpath('../images'));
+ define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Error: No existe el directorio de imagenes del cat&aacute;logo: ' . realpath('../images'));
</pre><pre class="diff" id="context"> ?>
</pre></div>
<hr /><a name="file14" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages">languages</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german">german</a><br /></span>
<div class="fileheader"><big><b>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/languages/german/products.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
--- products.php 2004/10/26 20:15:29 1.3
+++ products.php 2004/11/07 21:00:41 1.4
@@ -67,6 +67,6 @@
</small></pre><pre class="diff" id="context"> define('TEXT_COPY_AS_DUPLICATE', 'Produkt duplizieren');
define('ERROR_CANNOT_LINK_TO_SAME_CATEGORY', 'Fehler: Produkte k&ouml;nnen nicht in der gleichen Kategorie verlinkt werden.');
</pre><pre class="diff" id="removed">- define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Fehler: Das Verzeichnis \'images\' im Katalogverzeichnis ist schreibgesch&uuml;tzt: ' . DIR_FS_CATALOG_IMAGES);
- define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Fehler: Das Verzeichnis \'images\' im Katalogverzeichnis ist nicht vorhanden: ' . DIR_FS_CATALOG_IMAGES);
</pre><pre class="diff" id="added">+ define('ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Fehler: Das Verzeichnis \'images\' im Katalogverzeichnis ist schreibgesch&uuml;tzt: ' . realpath('../images'));
+ define('ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Fehler: Das Verzeichnis \'images\' im Katalogverzeichnis ist nicht vorhanden: ' . realpath('../images'));
</pre><pre class="diff" id="context"> ?>
</pre></div>
<hr /><a name="file15" /><div class="file">
<span class="pathname" id="removed"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local">local</a><br /></span>
<div class="fileheader" id="removed"><big><b>.cvsignore</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a></small></div>
<pre class="diff"><small id="info">diff -N .cvsignore
--- /tmp/cvsAAAGDaqgy Sun Nov 7 22:00:43 2004
+++ /dev/null Sun Nov 7 22:00:39 2004
@@ -1 +0,0 @@
</small></pre><pre class="diff" id="removed"><hr /><a name="file16" /><div class="file">
<span class="pathname" id="removed"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local">local</a><br /></span>
<div class="fileheader" id="removed"><big><b>README</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/local/README?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></small></div>
<pre class="diff"><small id="info">diff -N README
--- /tmp/cvsAAAtEaygy Sun Nov 7 22:00:43 2004
+++ /dev/null Sun Nov 7 22:00:39 2004
@@ -1,6 +0,0 @@
</small></pre><pre class="diff" id="removed">-This directory contains local configuration information.
-
-It also must contain a file named configure.php that can be used to override
-the defaults set in application_top.php
-
-Remember to execute PHP commands the file needs to start with <?php and end with ?>
<hr /><a name="file17" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics">statistics</a><br /></span>
<div class="fileheader"><big><b>products_viewed.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- products_viewed.php 2004/07/22 23:14:43 1.1
+++ products_viewed.php 2004/11/07 21:00:43 1.2
@@ -61,7 +61,7 @@
</small></pre><pre class="diff" id="context">
while ($this->_resultset->next()) {
$this->_data[] = array('<a href="' . tep_href_link(FILENAME_CATEGORIES, 'action=new_product_preview&read=only&pID=' . $this->_resultset->valueInt('products_id')) . '">' . $this->_icon . '&nbsp;' . $this->_resultset->value('products_name') . '</a>',
</pre><pre class="diff" id="removed">- tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $this->_resultset->value('directory') . '/images/' . $this->_resultset->value('image'), $this->_resultset->value('name')),
</pre><pre class="diff" id="added">+ tep_image(<span id="addedchars">'../includes/languages/'</span> . $this->_resultset->value('directory') . '/images/' . $this->_resultset->value('image'), $this->_resultset->value('name')),
</pre><pre class="diff" id="context"> $this->_resultset->valueInt('products_viewed'));
}
}
</pre></div>
<hr /><a name="file18" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary">summary</a><br /></span>
<div class="fileheader"><big><b>reviews.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.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
--- reviews.php 2004/11/03 08:59:47 1.2
+++ reviews.php 2004/11/07 21:00:44 1.3
@@ -54,8 +54,8 @@
</small></pre><pre class="diff" id="context"> while ($Qreviews->next()) {
$this->_data .= ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);">' .
' <td><a href="' . tep_href_link(FILENAME_REVIEWS, 'rID=' . $Qreviews->valueInt('reviews_id') . '&action=rEdit') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/write.png', ICON_PREVIEW, '16', '16') . '&nbsp;' . $Qreviews->value('products_name') . '</a></td>' .
</pre><pre class="diff" id="removed">- ' <td align="center">' . tep_image(DIR_WS_CATALOG_LANGUAGES . $Qreviews->value('languages_directory') . '/images/' . $Qreviews->value('languages_image'), $Qreviews->value('languages_name')) . '</td>' .
- ' <td align="center">' . tep_image(HTTP_CATALOG_SERVER . DIR_WS_CATALOG_IMAGES . 'stars_' . $Qreviews->valueInt('reviews_rating') . '.gif', $Qreviews->valueInt('reviews_rating') . '/5') . '</td>' .
</pre><pre class="diff" id="added">+ ' <td align="center">' . tep_image('../includes/languages/' . $Qreviews->value('languages_directory') . '/images/' . $Qreviews->value('languages_image'), $Qreviews->value('languages_name')) . '</td>' .
+ ' <td align="center">' . tep_image('../images/stars_' . $Qreviews->valueInt('reviews_rating') . '.gif', $Qreviews->valueInt('reviews_rating') . '/5') . '</td>' .
</pre><pre class="diff" id="context"> ' <td>' . $Qreviews->value('date_last_modified') . '</td>' .
' </tr>';
}
</pre></div>
<hr /><a name="file19" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default">default</a><br /></span>
<div class="fileheader"><big><b>footer.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/footer.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/footer.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/footer.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- footer.php 2004/07/22 23:25:00 1.1
+++ footer.php 2004/11/07 21:00:44 1.2
@@ -29,7 +29,7 @@
</small></pre><pre class="diff" id="context"> <td align="center" class="smallText">E-Commerce Engine Copyright &copy; 2000-2004 <a href="http://www.oscommerce.com" target="_blank">osCommerce</a> (<a href="http://www.oscommerce.com/about/copyright" target="_blank">Copyright Policy</a>, <a href="http://www.oscommerce.com/about/trademark" target="_blank">Trademark Policy</a>)<br>osCommerce provides no warranty and is redistributable under the <a href="http://www.fsf.org/licenses/gpl.txt" target="_blank">GNU General Public License</a><br>(This copyright anouncement is in accordance with section 2c of the GPL license and must be shown)</td>
</tr>
<tr>
</pre><pre class="diff" id="removed">- <td><?php echo tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>pixel_trans.gif', '', '1', '5'); ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo tep_image(<span id="addedchars">'images/</span>pixel_trans.gif', '', '1', '5'); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
</pre></div>
<hr /><a name="file20" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default">default</a><br /></span>
<div class="fileheader"><big><b>header.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.6 -r1.7
--- header.php 2004/10/28 19:00:23 1.6
+++ header.php 2004/11/07 21:00:45 1.7
@@ -97,11 +97,11 @@
</small></pre><pre class="diff" id="context"> ' [\'' . tep_image('templates/' . $template . '/images/icons/16x16/locale.png', '', '16', '16') . '\', \'' . addslashes(HEADER_TITLE_LANGUAGES) . '\', null, null, null,' . "\n";
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo ' [\'' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/icon.gif') . '\', \'' . addslashes($l_entry['name']) . '\', \'' . tep_href_link(FILENAME_DEFAULT, 'language=' . $l_entry['code']) . '\', null, null],' . "\n";
</pre><pre class="diff" id="added">+ echo ' [\'' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/icon.gif') . '\', \'' . addslashes($l_entry['name']) . '\', \'' . tep_href_link(FILENAME_DEFAULT, 'language=' . $l_entry['code']) . '\', null, null],' . "\n";
</pre><pre class="diff" id="context"> }
echo ' ],' . "\n" .
</pre><pre class="diff" id="removed">- ' [\'' . tep_image('templates/' . $template . '/images/icons/16x16/home.png', '', '16', '16') . '\', \'' . addslashes(HEADER_TITLE_ONLINE_CATALOG) . '\', \'' . tep_<span id="removedchars">catalog_href_link(</span>) . '\', \'_blank\', null],' . "\n" .
</pre><pre class="diff" id="added">+ ' [\'' . tep_image('templates/' . $template . '/images/icons/16x16/home.png', '', '16', '16') . '\', \'' . addslashes(HEADER_TITLE_ONLINE_CATALOG) . '\', \'' . tep_<span id="addedchars">href_link('', '', 'NONSSL', false</span>) . '\', \'_blank\', null],' . "\n" .
</pre><pre class="diff" id="context"> ' ]' . "\n" .
'];' . "\n";
?>
</pre><pre class="diff"><small id="info">@@ -109,7 +109,7 @@
</small></pre><pre class="diff" id="context">
<table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT) . '">' . tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>oscommerce.gif', 'osCommerce', '204', '50') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT) . '">' . tep_image(<span id="addedchars">'images/</span>oscommerce.gif', 'osCommerce', '204', '50') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td width="150" align="right" class="smallText">
<?php
if ($request_type == 'SSL') {
</pre></div>
<hr /><a name="file21" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>banner_manager.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager.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
--- banner_manager.php 2004/08/25 19:57:29 1.2
+++ banner_manager.php 2004/11/07 21:00:45 1.3
@@ -172,7 +172,7 @@
</small></pre><pre class="diff" id="context"> if (!empty($bInfo->banners_html_text)) {
echo $bInfo->banners_html_text;
} else {
</pre><pre class="diff" id="removed">- echo tep_image(HTTP_CATALOG_SERVER . DIR_WS_CATALOG_IMAGES . $bInfo->banners_image, $bInfo->banners_title);
</pre><pre class="diff" id="added">+ echo tep_image('../images/' . $bInfo->banners_image, $bInfo->banners_title);
</pre><pre class="diff" id="context"> }
?>
</pre></div>
<hr /><a name="file22" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>banner_manager_statistics.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/banner_manager_statistics.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- banner_manager_statistics.php 2004/08/15 18:18:34 1.1
+++ banner_manager_statistics.php 2004/11/07 21:00:46 1.2
@@ -73,17 +73,17 @@
</small></pre><pre class="diff" id="context"> if (($dir_ok == true) && !empty($image_extension)) {
switch ($type) {
case 'yearly':
</pre><pre class="diff" id="removed">- include(DIR_WS_INCLUDES . 'graphs/banner_yearly.php');
- echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="added">+ include('includes/graphs/banner_yearly.php');
+ echo '<p align="center">' . tep_image('images/graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="context"> break;
case 'monthly':
</pre><pre class="diff" id="removed">- include(DIR_WS_INCLUDES . 'graphs/banner_monthly.php');
- echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="added">+ include('includes/graphs/banner_monthly.php');
+ echo '<p align="center">' . tep_image('images/graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="context"> break;
default:
case 'daily':
</pre><pre class="diff" id="removed">- include(DIR_WS_INCLUDES . 'graphs/banner_daily.php');
- echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="added">+ include('includes/graphs/banner_daily.php');
+ echo '<p align="center">' . tep_image('images/graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
</pre><pre class="diff" id="context"> break;
}
}
</pre></div>
<hr /><a name="file23" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>categories.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- categories.php 2004/10/26 20:20:09 1.4
+++ categories.php 2004/11/07 21:00:46 1.5
@@ -71,7 +71,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_CATEGORIES, 'page=' . $_GET['page'] . '&cPath=' . $cPath . '&search=' . $_GET['search'] . '&cID=' . $Qcategories->valueInt('categories_id')) . '\';">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_CATEGORIES, 'cPath=' . $osC_CategoryTree->buildBreadcrumb($Qcategories->valueInt('categories_id'))) . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>folder.gif', ICON_FOLDER) . '&nbsp;<b>' . $Qcategories->value('categories_name') . '</b></a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_CATEGORIES, 'cPath=' . $osC_CategoryTree->buildBreadcrumb($Qcategories->valueInt('categories_id'))) . '">' . tep_image(<span id="addedchars">'images/icons/</span>folder.gif', ICON_FOLDER) . '&nbsp;<b>' . $Qcategories->value('categories_name') . '</b></a>'; ?></td>
</pre><pre class="diff" id="context"> <td align="center"><?php echo tep_image('templates/' . $template . '/images/icons/checkbox_ticked.gif'); ?></td>
<td align="right">
<?php
</pre><pre class="diff"><small id="info">@@ -125,7 +125,7 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo '<br>' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="added">+ echo '<br>' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -195,11 +195,11 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo '<br>' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']', (isset($categories_name[$l_entry['id']]) ? $categories_name[$l_entry['id']] : ''));
</pre><pre class="diff" id="added">+ echo '<br>' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']', (isset($categories_name[$l_entry['id']]) ? $categories_name[$l_entry['id']] : ''));
</pre><pre class="diff" id="context"> }
?>
</p>
</pre><pre class="diff" id="removed">- <p><?php echo tep_image(DIR_WS_CATALOG_IMAGES . $cInfo->categories_image, $cInfo->categories_name, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT) . '<br>' . DIR_WS_CATALOG_IMAGES . '<br><b>' . $cInfo->categories_image . '</b>'; ?></p>
</pre><pre class="diff" id="added">+ <p><?php echo tep_image('../images/' . $cInfo->categories_image, $cInfo->categories_name, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT) . '<br>' . DIR_WS_CATALOG . 'images/<br><b>' . $cInfo->categories_image . '</b>'; ?></p>
</pre><pre class="diff" id="context"> <p><?php echo TEXT_EDIT_CATEGORIES_IMAGE . '<br>' . osc_draw_file_field('categories_image'); ?></p>
<p><?php echo TEXT_EDIT_SORT_ORDER . '<br>' . osc_draw_input_field('sort_order', $cInfo->sort_order); ?></p>
</pre></div>
<hr /><a name="file24" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>define_language.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- define_language.php 2004/08/15 18:17:04 1.1
+++ define_language.php 2004/11/07 21:00:46 1.2
@@ -12,7 +12,7 @@
</small></pre><pre class="diff" id="context">
require('includes/classes/directory_listing.php');
</pre><pre class="diff" id="removed">- $osC_DirectoryListing = new osC_DirectoryListing(DIR_FS_CATALOG_LANGUAGES . $lng);
</pre><pre class="diff" id="added">+ $osC_DirectoryListing = new osC_DirectoryListing(realpath('../includes/languages/' . $lng));
</pre><pre class="diff" id="context"> $osC_DirectoryListing->setRecursive(true);
$osC_DirectoryListing->setAddDirectoryToFilename(true);
$osC_DirectoryListing->setCheckExtension('php');
</pre></div>
<hr /><a name="file25" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>define_language_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/define_language_edit.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
--- define_language_edit.php 2004/10/28 19:00:25 1.2
+++ define_language_edit.php 2004/11/07 21:00:46 1.3
@@ -14,9 +14,9 @@
</small></pre><pre class="diff" id="context"> <h1><?php echo HEADING_TITLE; ?></h1>
<?php
</pre><pre class="diff" id="removed">- $file = realpath(<span id="removedchars">DIR_FS_CATALOG_LANGUAGES</span> . $lng . '/' . $_GET['file']);
</pre><pre class="diff" id="added">+ $file = realpath(<span id="addedchars">'../includes/languages/'</span> . $lng . '/' . $_GET['file']);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- if (substr($file, 0, strlen(DIR_FS_CATALOG_LANGUAGES)) != DIR_FS_CATALOG_LANGUAGES) {
</pre><pre class="diff" id="added">+ if (substr($file, 0, strlen(realpath('../includes/languages'))) != realpath('../includes/languages')) {
</pre><pre class="diff" id="context"> $file = false;
}
</pre><pre class="diff"><small id="info">@@ -35,7 +35,7 @@
</small></pre><pre class="diff" id="context">
<?php echo tep_draw_form('language', FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng . '&file=' . $_GET['file'] . '&action=save'); ?>
</pre><pre class="diff" id="removed">-<p><b><?php echo realpath(<span id="removedchars">DIR_FS_CATALOG_LANGUAGES</span> . $lng . '/' . $_GET['file']); ?></b></p>
</pre><pre class="diff" id="added">+<p><b><?php echo realpath(<span id="addedchars">'../includes/languages/'</span> . $lng . '/' . $_GET['file']); ?></b></p>
</pre><pre class="diff" id="context">
<p><?php echo osc_draw_textarea_field('contents', $contents, '80', '20', 'off', 'style="width: 100%;"' . (($file_writeable) ? '' : ' readonly')); ?></p>
</pre></div>
<hr /><a name="file26" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>file_manager.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/file_manager.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
--- file_manager.php 2004/08/25 19:57:29 1.2
+++ file_manager.php 2004/11/07 21:00:46 1.3
@@ -87,8 +87,8 @@
</small></pre><pre class="diff" id="context"> echo '<a href="#" onClick="document.location.href=\'' . tep_href_link(FILENAME_FILE_MANAGER, 'entry=' . $files[$i]['name'] . '&action=fmEdit') . '\';">' . tep_image('templates/' . $template . '/images/icons/16x16/edit.png', IMAGE_EDIT, '16', '16') . '</a>' . '&nbsp;' .
'<a href="#" onClick="document.location.href=\'' . tep_href_link(FILENAME_FILE_MANAGER, 'entry=' . $files[$i]['name'] . '&action=download') . '\';">' . tep_image('templates/' . $template . '/images/icons/16x16/save.png', IMAGE_SAVE, '16', '16') . '</a>' . '&nbsp;';
} else {
</pre><pre class="diff" id="removed">- echo tep_image(DIR_WS_IMAGES . 'pixel_trans.gif') . '&nbsp;' .
- tep_image(DIR_WS_IMAGES . 'pixel_trans.gif') . '&nbsp;';
</pre><pre class="diff" id="added">+ echo tep_image('images/pixel_trans.gif') . '&nbsp;' .
+ tep_image('images/pixel_trans.gif') . '&nbsp;';
</pre><pre class="diff" id="context"> }
if (isset($fmInfo) && ($files[$i]['name'] == $fmInfo->name)) {
</pre></div>
<hr /><a name="file27" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>geo_zones.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/geo_zones.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/geo_zones.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/geo_zones.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- geo_zones.php 2004/07/22 23:28:50 1.1
+++ geo_zones.php 2004/11/07 21:00:46 1.2
@@ -45,7 +45,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_GEO_ZONES, 'page=' . $_GET['page'] . '&zID=' . $Qzones->valueInt('geo_zone_id')) . '\';" title="' . $Qzones->valueProtected('geo_zone_description') . '">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_GEO_ZONES, 'page=' . $_GET['page'] . '&zID=' . $Qzones->valueInt('geo_zone_id') . '&action=list') . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qzones->value('geo_zone_name') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_GEO_ZONES, 'page=' . $_GET['page'] . '&zID=' . $Qzones->valueInt('geo_zone_id') . '&action=list') . '">' . tep_image(<span id="addedchars">'images/icons/</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qzones->value('geo_zone_name') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td><?php echo $Qentries->valueInt('total_entries'); ?></td>
<td align="right">
<?php
</pre></div>
<hr /><a name="file28" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>manufacturers.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.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
--- manufacturers.php 2004/08/04 16:53:50 1.2
+++ manufacturers.php 2004/11/07 21:00:46 1.3
@@ -94,7 +94,7 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo '<br>' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="added">+ echo '<br>' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -116,7 +116,7 @@
</small></pre><pre class="diff" id="context">
<p><?php echo TEXT_EDIT_INTRO; ?></p>
<p><?php echo TEXT_MANUFACTURERS_NAME . '<br>' . osc_draw_input_field('manufacturers_name', $mInfo->manufacturers_name); ?></p>
</pre><pre class="diff" id="removed">- <p><?php echo tep_info_image($mInfo->manufacturers_image, $mInfo->manufacturers_name) . '<br>' . DIR_WS_CATALOG_IMAGES . '<br><b>' . $mInfo->manufacturers_image . '</b>'; ?></p>
</pre><pre class="diff" id="added">+ <p><?php echo tep_image('../images/' . $mInfo->manufacturers_image, $mInfo->manufacturers_name) . '<br>' . DIR_WS_CATALOG . 'images/<br><b>' . $mInfo->manufacturers_image . '</b>'; ?></p>
</pre><pre class="diff" id="context"> <p><?php echo TEXT_MANUFACTURERS_IMAGE . '<br>' . osc_draw_file_field('manufacturers_image'); ?></p>
<p>
<?php
</pre><pre class="diff"><small id="info">@@ -124,7 +124,7 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo '<br>' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']', tep_get_manufacturer_url($mInfo->manufacturers_id, $l_entry['id']));
</pre><pre class="diff" id="added">+ echo '<br>' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']', tep_get_manufacturer_url($mInfo->manufacturers_id, $l_entry['id']));
</pre><pre class="diff" id="context"> }
?>
</p>
</pre></div>
<hr /><a name="file29" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>modules.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.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
--- modules.php 2004/08/25 19:57:29 1.2
+++ modules.php 2004/11/07 21:00:46 1.3
@@ -91,7 +91,7 @@
</small></pre><pre class="diff" id="context"> '<a href="#" onClick="toggleInfoBox(\'mEdit\');">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>';
} else {
echo '<a href="' . tep_href_link(FILENAME_MODULES, 'set=' . $set . '&module=' . $class . '&action=install') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/play.png', IMAGE_MODULE_INSTALL, '16', '16') . '</a>&nbsp;' .
</pre><pre class="diff" id="removed">- tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="added">+ tep_image(<span id="addedchars">'images/</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="context"> }
} else {
if (($module->check() > 0) && $module->enabled === true) {
</pre><pre class="diff"><small id="info">@@ -99,7 +99,7 @@
</small></pre><pre class="diff" id="context"> '<a href="' . tep_href_link(FILENAME_MODULES, 'set=' . $set . '&module=' . $class . '&action=mEdit') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>';
} else {
echo '<a href="' . tep_href_link(FILENAME_MODULES, 'set=' . $set . '&module=' . $class . '&action=install') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/play.png', IMAGE_MODULE_INSTALL, '16', '16') . '</a>&nbsp;' .
</pre><pre class="diff" id="removed">- tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="added">+ tep_image(<span id="addedchars">'images/</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="context"> }
}
?>
</pre></div>
<hr /><a name="file30" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>orders.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- orders.php 2004/07/22 23:29:47 1.1
+++ orders.php 2004/11/07 21:00:47 1.2
@@ -71,7 +71,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id')) . '\';">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id') . '&action=oEdit') . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qorders->valueProtected('customers_name') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id') . '&action=oEdit') . '">' . tep_image(<span id="addedchars">'images/icons/</span>preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qorders->valueProtected('customers_name') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td><?php echo strip_tags($Qorders->value('order_total')); ?></td>
<td><?php echo tep_datetime_short($Qorders->value('date_purchased')); ?></td>
<td><?php echo $Qorders->value('orders_status_name'); ?></td>
</pre></div>
<hr /><a name="file31" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>orders_status.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- orders_status.php 2004/07/22 23:30:04 1.1
+++ orders_status.php 2004/11/07 21:00:47 1.2
@@ -88,7 +88,7 @@
</small></pre><pre class="diff" id="context"> <?php
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -133,7 +133,7 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']', (isset($status_name[$l_entry['id']]) ? $status_name[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']', (isset($status_name[$l_entry['id']]) ? $status_name[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre></div>
<hr /><a name="file32" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.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
--- products.php 2004/10/26 20:15:32 1.3
+++ products.php 2004/11/07 21:00:47 1.4
@@ -79,7 +79,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_PRODUCTS, 'page=' . $_GET['page'] . '&cPath=' . $cPath . '&search=' . $_GET['search'] . '&pID=' . $Qproducts->valueInt('products_id')) . '\';">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS, 'page=' . $_GET['page'] . '&cPath=' . $cPath . '&search=' . $_GET['search'] . '&pID=' . $Qproducts->valueInt('products_id') . '&action=new_product_preview&read=only') . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qproducts->value('products_name') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS, 'page=' . $_GET['page'] . '&cPath=' . $cPath . '&search=' . $_GET['search'] . '&pID=' . $Qproducts->valueInt('products_id') . '&action=new_product_preview&read=only') . '">' . tep_image(<span id="addedchars">'images/icons/</span>preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qproducts->value('products_name') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td align="right"><?php echo $osC_Currencies->format($Qproducts->value('products_price')); ?></td>
<td align="right"><?php echo $Qproducts->valueInt('products_quantity'); ?></td>
<td align="center"><?php echo tep_image('templates/' . $template . '/images/icons/' . (($Qproducts->valueInt('products_status') === 1) ? 'checkbox_ticked.gif' : 'checkbox_crossed.gif')); ?></td>
</pre></div>
<hr /><a name="file33" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>products_attributes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- products_attributes.php 2004/08/29 22:19:04 1.1
+++ products_attributes.php 2004/11/07 21:00:47 1.2
@@ -87,7 +87,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'page=' . $_GET['page'] . '&paID=' . $Qgroups->valueInt('products_options_id')) . '\';">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'page=' . $_GET['page'] . '&paID=' . $Qgroups->valueInt('products_options_id') . '&action=list') . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qgroups->value('products_options_name') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'page=' . $_GET['page'] . '&paID=' . $Qgroups->valueInt('products_options_id') . '&action=list') . '">' . tep_image(<span id="addedchars">'images/icons/</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qgroups->value('products_options_name') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td><?php echo $Qentries->valueInt('total_entries'); ?></td>
<td align="right">
<?php
</pre><pre class="diff"><small id="info">@@ -130,7 +130,7 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="60%">
<?php
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -170,7 +170,7 @@
</small></pre><pre class="diff" id="context"> }
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']', (isset($group_names[$l_entry['id']]) ? $group_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']', (isset($group_names[$l_entry['id']]) ? $group_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre></div>
<hr /><a name="file34" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>products_attributes_listing.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- products_attributes_listing.php 2004/08/29 22:19:04 1.1
+++ products_attributes_listing.php 2004/11/07 21:00:47 1.2
@@ -89,7 +89,7 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="60%">
<?php
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -129,7 +129,7 @@
</small></pre><pre class="diff" id="context"> }
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']', (isset($entry_names[$l_entry['id']]) ? $entry_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']', (isset($entry_names[$l_entry['id']]) ? $entry_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre></div>
<hr /><a name="file35" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>products_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.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
--- products_edit.php 2004/10/26 20:15:32 1.3
+++ products_edit.php 2004/11/07 21:00:48 1.4
@@ -225,7 +225,7 @@
</small></pre><pre class="diff" id="context"> var image = document.new_product.products_image.value;
var preview = document.getElementById('previewImage');
</pre><pre class="diff" id="removed">- preview.src = '<?php echo DIR_WS_CATALOG_IMAGES; ?>' + image;
</pre><pre class="diff" id="added">+ preview.src = '../images/' + image;
</pre><pre class="diff" id="context"> }
//--></script>
</pre><pre class="diff"><small id="info">@@ -260,7 +260,7 @@
</small></pre><pre class="diff" id="context"> ?>
<div class="tab-page" id="tabDescriptionLanguages_<?php echo $l_entry['code']; ?>">
</pre><pre class="diff" id="removed">- <h2 class="tab"><?php echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . $l_entry['name']; ?></h2>
</pre><pre class="diff" id="added">+ <h2 class="tab"><?php echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . $l_entry['name']; ?></h2>
</pre><pre class="diff" id="context">
<script type="text/javascript"><!--
descriptionTabPane.addTabPage( document.getElementById( "tabDescriptionLanguages_<?php echo $l_entry['code']; ?>" ) );
</pre><pre class="diff"><small id="info">@@ -283,7 +283,7 @@
</small></pre><pre class="diff" id="context">
<script type="text/javascript"><!--
var fckpd_<?php echo $l_entry['code']; ?> = new FCKeditor('fckpd_<?php echo $l_entry['code']; ?>');
</pre><pre class="diff" id="removed">- fckpd_<?php echo $l_entry['code']; ?>.BasePath = "<?php echo DIR_WS_<span id="removedchars">ADMIN . '</span>external/FCKeditor/2.0b1/'; ?>";
</pre><pre class="diff" id="added">+ fckpd_<?php echo $l_entry['code']; ?>.BasePath = "<?php echo DIR_WS_<span id="addedchars">CATALOG . 'admin/</span>external/FCKeditor/2.0b1/'; ?>";
</pre><pre class="diff" id="context"> fckpd_<?php echo $l_entry['code']; ?>.Height = "400";
fckpd_<?php echo $l_entry['code']; ?>.ReplaceTextarea();
//--></script>
</pre><pre class="diff"><small id="info">@@ -394,7 +394,7 @@
</small></pre><pre class="diff" id="context"> <fieldset style="height: 100%;">
<legend>Image Location</legend>
</pre><pre class="diff" id="removed">- <p><?php echo DIR_WS_CATALOG<span id="removedchars">_IMAGES</span> . osc_draw_input_field('products_image', (isset($pInfo) ? $pInfo->products_image : '')) . '&nbsp;<input type="button" value="Preview" onClick="reloadImage();" class="infoBoxButton">'; ?></p>
</pre><pre class="diff" id="added">+ <p><?php echo DIR_WS_CATALOG<span id="addedchars"> . 'images/'</span> . osc_draw_input_field('products_image', (isset($pInfo) ? $pInfo->products_image : '')) . '&nbsp;<input type="button" value="Preview" onClick="reloadImage();" class="infoBoxButton">'; ?></p>
</pre><pre class="diff" id="context"> </fieldset>
</td>
</tr>
</pre><pre class="diff"><small id="info">@@ -424,7 +424,7 @@
</small></pre><pre class="diff" id="context">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
</pre><pre class="diff" id="removed">- <td align="center"><?php echo tep_image(<span id="removedchars">DIR_WS_CATALOG_IMAGES</span> . $pInfo->products_image, '', '', '', 'id="previewImage"'); ?></td>
</pre><pre class="diff" id="added">+ <td align="center"><?php echo tep_image(<span id="addedchars">'../images/'</span> . $pInfo->products_image, '', '', '', 'id="previewImage"'); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
</fieldset>
</pre></div>
<hr /><a name="file36" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>products_preview.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.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
--- products_preview.php 2004/10/26 20:15:33 1.3
+++ products_preview.php 2004/11/07 21:00:48 1.4
@@ -37,8 +37,8 @@
</small></pre><pre class="diff" id="context"> if (!isset($_GET['read'])) {
$products_image_name = $_POST['products_image'];
</pre><pre class="diff" id="removed">- $destination = realpath(DIR_FS_CATALOG_IMAGES . $_POST['products_image_location']);
- if (substr($destination, 0, strlen(DIR_FS_CATALOG_IMAGES)) == DIR_FS_CATALOG_IMAGES) {
</pre><pre class="diff" id="added">+ $destination = realpath('../images/' . $_POST['products_image_location']);
+ if (substr($destination, 0, strlen(realpath('../images'))) == realpath('../images')) {
</pre><pre class="diff" id="context"> $products_image = new upload('products_image_new');
$products_image->set_destination($destination);
if ($products_image->parse() && $products_image->save()) {
</pre><pre class="diff"><small id="info">@@ -58,7 +58,7 @@
</small></pre><pre class="diff" id="context"> <td>
<?php
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo '<span id="lang_' . $l_entry['code'] . '"' . (($l_entry['directory'] == $osC_Session->value('language')) ? ' class="highlight"' : '') . '><a href="javascript:toggleDivBlocks(\'pName_\', \'pName_' . $l_entry['code'] . '\'); toggleClass(\'lang_\', \'lang_' . $l_entry['code'] . '\', \'highlight\', \'span\');">' . tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '</a></span>&nbsp;&nbsp;';
</pre><pre class="diff" id="added">+ echo '<span id="lang_' . $l_entry['code'] . '"' . (($l_entry['directory'] == $osC_Session->value('language')) ? ' class="highlight"' : '') . '><a href="javascript:toggleDivBlocks(\'pName_\', \'pName_' . $l_entry['code'] . '\'); toggleClass(\'lang_\', \'lang_' . $l_entry['code'] . '\', \'highlight\', \'span\');">' . tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '</a></span>&nbsp;&nbsp;';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -77,7 +77,7 @@
</small></pre><pre class="diff" id="context"> </tr>
</table>
</pre><pre class="diff" id="removed">- <p class="main"><?php echo tep_image(<span id="removedchars">DIR_WS_CATALOG_IMAGES</span> . $products_image_name, $pInfo->products_name[$l_entry['id']], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . $pInfo->products_description[$l_entry['id']]; ?></p>
</pre><pre class="diff" id="added">+ <p class="main"><?php echo tep_image(<span id="addedchars">'../images/'</span> . $products_image_name, $pInfo->products_name[$l_entry['id']], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . $pInfo->products_description[$l_entry['id']]; ?></p>
</pre><pre class="diff" id="context">
<?php
if (!empty($pInfo->products_url[$l_entry['id']])) {
</pre></div>
<hr /><a name="file37" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>reviews.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews.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
--- reviews.php 2004/11/03 08:59:50 1.2
+++ reviews.php 2004/11/07 21:00:48 1.3
@@ -22,7 +22,7 @@
</small></pre><pre class="diff" id="context"> <th><?php echo TABLE_HEADING_RATING; ?></th>
<th><?php echo TABLE_HEADING_DATE_ADDED; ?></th>
<?php
</pre><pre class="diff" id="removed">- if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {<span id="removedchars"> </span>
</pre><pre class="diff" id="added">+ if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {
</pre><pre class="diff" id="context"> ?>
<th><?php echo TABLE_HEADING_STATUS; ?></th>
<?php
</pre><pre class="diff"><small id="info">@@ -66,12 +66,12 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $Qreviews->valueInt('reviews_id')) . '\';">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $Qreviews->valueInt('reviews_id') . '&action=rPreview') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qreviews->value('products_name') . '</a>'; ?></td>
- <td align="center"><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $Qreviews->value('languages_directory') . '/images/' . $Qreviews->value('languages_image'), $Qreviews->value('languages_name')); ?></td>
- <td align="center"><?php echo tep_image(HTTP_CATALOG_SERVER . DIR_WS_CATALOG_IMAGES . 'stars_' . $Qreviews->valueInt('reviews_rating') . '.gif', sprintf(TEXT_OF_5_STARS, $Qreviews->valueInt('reviews_rating'))); ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $Qreviews->valueInt('reviews_id') . '&action=rPreview') . '">' . tep_image('images/icons/preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qreviews->value('products_name') . '</a>'; ?></td>
+ <td align="center"><?php echo tep_image('../includes/languages/' . $Qreviews->value('languages_directory') . '/images/' . $Qreviews->value('languages_image'), $Qreviews->value('languages_name')); ?></td>
+ <td align="center"><?php echo tep_image('../images/stars_' . $Qreviews->valueInt('reviews_rating') . '.gif', sprintf(TEXT_OF_5_STARS, $Qreviews->valueInt('reviews_rating'))); ?></td>
</pre><pre class="diff" id="context"> <td><?php echo tep_date_short($Qreviews->value('date_added')); ?></td>
<?php
</pre><pre class="diff" id="removed">- if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {<span id="removedchars"> </span>
</pre><pre class="diff" id="added">+ if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {
</pre><pre class="diff" id="context"> switch ($Qreviews->valueInt('reviews_status')) {
case 1: $status_image = 'checkbox_ticked.gif'; break;
case 2: $status_image = 'checkbox_crossed.gif'; break;
</pre></div>
<hr /><a name="file38" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>reviews_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_edit.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_edit.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_edit.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
--- reviews_edit.php 2004/11/03 08:59:50 1.2
+++ reviews_edit.php 2004/11/07 21:00:48 1.3
@@ -40,7 +40,7 @@
</small></pre><pre class="diff" id="context">
<?php echo tep_draw_form('review', FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=rPreview'); ?>
</pre><pre class="diff" id="removed">-<p class="main"><?php echo tep_image(<span id="removedchars">HTTP_CATALOG_SERVER . DIR_WS_CATALOG_IMAGES</span> . $rInfo->products_image, $rInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . '<b>' . ENTRY_PRODUCT . '</b> ' . $rInfo->products_name . '<br><b>' . ENTRY_FROM . '</b> ' . $rInfo->customers_name . '<br><br><b>' . ENTRY_DATE . '</b> ' . tep_date_short($rInfo->date_added); ?></p>
</pre><pre class="diff" id="added">+<p class="main"><?php echo tep_image(<span id="addedchars">'../images/'</span> . $rInfo->products_image, $rInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . '<b>' . ENTRY_PRODUCT . '</b> ' . $rInfo->products_name . '<br><b>' . ENTRY_FROM . '</b> ' . $rInfo->customers_name . '<br><br><b>' . ENTRY_DATE . '</b> ' . tep_date_short($rInfo->date_added); ?></p>
</pre><pre class="diff" id="context">
<p class="main"><?php echo '<b>' . ENTRY_REVIEW . '</b><br>' . tep_draw_textarea_field('reviews_text', 'soft', '60', '15', $rInfo->reviews_text, 'style="width: 100%;"') . '<br><span class="smallText">' . ENTRY_REVIEW_TEXT . '</span>'; ?></p>
</pre></div>
<hr /><a name="file39" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>reviews_preview.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/reviews_preview.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
--- reviews_preview.php 2004/11/03 08:59:50 1.2
+++ reviews_preview.php 2004/11/07 21:00:48 1.3
@@ -33,18 +33,18 @@
</small></pre><pre class="diff" id="context">
<h1><?php echo HEADING_TITLE; ?></h1>
</pre><pre class="diff" id="removed">-<p class="main"><?php echo tep_image(<span id="removedchars">HTTP_CATALOG_SERVER . DIR_WS_CATALOG_IMAGES</span> . $rInfo->products_image, $rInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . '<b>' . ENTRY_PRODUCT . '</b> ' . $rInfo->products_name . '<br><b>' . ENTRY_FROM . '</b> ' . $rInfo->customers_name . '<br><br><b>' . ENTRY_DATE . '</b> ' . tep_date_short($rInfo->date_added); ?></p>
</pre><pre class="diff" id="added">+<p class="main"><?php echo tep_image(<span id="addedchars">'../images/'</span> . $rInfo->products_image, $rInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . '<b>' . ENTRY_PRODUCT . '</b> ' . $rInfo->products_name . '<br><b>' . ENTRY_FROM . '</b> ' . $rInfo->customers_name . '<br><br><b>' . ENTRY_DATE . '</b> ' . tep_date_short($rInfo->date_added); ?></p>
</pre><pre class="diff" id="context">
<p class="main"><?php echo '<b>' . ENTRY_REVIEW . '</b><br>' . nl2br(tep_output_string_protected($rInfo->reviews_text)); ?></p>
</pre><pre class="diff" id="removed">-<p class="main"><?php echo '<b>' . ENTRY_RATING . '</b>&nbsp;' . tep_image(<span id="removedchars">DIR_WS_CATALOG_IMAGES . '</span>stars_' . $rInfo->reviews_rating . '.gif', sprintf(TEXT_OF_5_STARS, $rInfo->reviews_rating)) . '&nbsp;<small>[' . sprintf(TEXT_OF_5_STARS, $rInfo->reviews_rating) . ']</small>'; ?></p>
</pre><pre class="diff" id="added">+<p class="main"><?php echo '<b>' . ENTRY_RATING . '</b>&nbsp;' . tep_image(<span id="addedchars">'../images/</span>stars_' . $rInfo->reviews_rating . '.gif', sprintf(TEXT_OF_5_STARS, $rInfo->reviews_rating)) . '&nbsp;<small>[' . sprintf(TEXT_OF_5_STARS, $rInfo->reviews_rating) . ']</small>'; ?></p>
</pre><pre class="diff" id="context">
<?php
if (empty($_POST)) {
echo '<p align="right"><input type="button" value="' . IMAGE_BACK . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID']) . '\';"></p>';
</pre><pre class="diff" id="removed">- if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {
- echo '<p align="right"><input type="button" value="' . IMAGE_APPROVE . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=rApprove') . '\';"> <input type="button" value="' . IMAGE_REJECT . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=rReject') . '\';"></p>';
- }
</pre><pre class="diff" id="added">+ if ( (defined('SERVICE_REVIEW_ENABLE_MODERATION')) && (SERVICE_REVIEW_ENABLE_MODERATION != -1) ) {
+ echo '<p align="right"><input type="button" value="' . IMAGE_APPROVE . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=rApprove') . '\';"> <input type="button" value="' . IMAGE_REJECT . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=rReject') . '\';"></p>';
+ }
</pre><pre class="diff" id="context"> } else {
echo tep_draw_form('update', FILENAME_REVIEWS, 'page=' . $_GET['page'] . '&rID=' . $_GET['rID'] . '&action=update', 'post', 'enctype="multipart/form-data"');
</pre></div>
<hr /><a name="file40" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>services.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/services.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- services.php 2004/07/22 23:30:41 1.1
+++ services.php 2004/11/07 21:00:48 1.2
@@ -89,7 +89,7 @@
</small></pre><pre class="diff" id="context"> echo '<a href="' . tep_href_link(FILENAME_SERVICES, 'service=' . $class_code . '&action=sDelete') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/stop.png', IMAGE_MODULE_REMOVE, '16', '16') . '</a>&nbsp;';
}
} else {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>pixel_trans.gif', '', '16', '16') . '&nbsp;';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'images/</span>pixel_trans.gif', '', '16', '16') . '&nbsp;';
</pre><pre class="diff" id="context"> }
if (is_array($module_keys) && (sizeof($module_keys) > 0)) {
</pre><pre class="diff"><small id="info">@@ -99,7 +99,7 @@
</small></pre><pre class="diff" id="context"> echo '<a href="' . tep_href_link(FILENAME_SERVICES, 'service=' . $class_code . '&action=sEdit') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>';
}
} else {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_IMAGES . '</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'images/</span>pixel_trans.gif', '', '16', '16');
</pre><pre class="diff" id="context"> }
?>
</td>
</pre></div>
<hr /><a name="file41" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>tax_classes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/tax_classes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/tax_classes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/tax_classes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- tax_classes.php 2004/07/22 23:31:49 1.1
+++ tax_classes.php 2004/11/07 21:00:48 1.2
@@ -45,7 +45,7 @@
</small></pre><pre class="diff" id="context"> echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_TAX_CLASSES, 'page=' . $_GET['page'] . '&tcID=' . $Qclasses->valueInt('tax_class_id')) . '\'" title="' . $Qclasses->valueProtected('tax_class_description') . '">' . "\n";
}
?>
</pre><pre class="diff" id="removed">- <td><?php echo '<a href="' . tep_href_link(FILENAME_TAX_CLASSES, 'page=' . $_GET['page'] . '&tcID=' . $Qclasses->valueInt('tax_class_id') . '&action=list') . '">' . tep_image(<span id="removedchars">DIR_WS_ICONS . '</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qclasses->value('tax_class_title') . '</a>'; ?></td>
</pre><pre class="diff" id="added">+ <td><?php echo '<a href="' . tep_href_link(FILENAME_TAX_CLASSES, 'page=' . $_GET['page'] . '&tcID=' . $Qclasses->valueInt('tax_class_id') . '&action=list') . '">' . tep_image(<span id="addedchars">'images/icons/</span>folder.gif', ICON_FOLDER) . '&nbsp;' . $Qclasses->value('tax_class_title') . '</a>'; ?></td>
</pre><pre class="diff" id="context"> <td><?php echo $Qrates->valueInt('total_tax_rates'); ?></td>
<td align="right">
<?php
</pre></div>
<hr /><a name="file42" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates">templates</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages">pages</a><br /></span>
<div class="fileheader"><big><b>weight_classes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php?rev=1.1&content-type=text/vnd.viewcvs-markup">1.1</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- weight_classes.php 2004/07/22 23:31:58 1.1
+++ weight_classes.php 2004/11/07 21:00:48 1.2
@@ -90,7 +90,7 @@
</small></pre><pre class="diff" id="context"> <?php
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']') . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', '', 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']') . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', '', 'size="4"') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -156,7 +156,7 @@
</small></pre><pre class="diff" id="context">
$languages = tep_get_languages();
foreach ($languages as $l_entry) {
</pre><pre class="diff" id="removed">- echo tep_image(<span id="removedchars">DIR_WS_CATALOG_LANGUAGES</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['title']) . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['key'], 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ echo tep_image(<span id="addedchars">'../includes/languages/'</span> . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['title']) . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['key'], 'size="4"') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</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