[TEP-COMMIT] [CVS admin] register_globals compatibility fixes
hpdl-OfajU3CKLf1/[email protected] 28 Apr 2005 07:40:34 -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">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.159&content-type=text/vnd.viewcvs-markup">1.159</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.159&r2=1.160">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.160&content-type=text/vnd.viewcvs-markup">1.160</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">define_language.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/define_language.php?rev=1.20&content-type=text/vnd.viewcvs-markup">1.20</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.20&r2=1.21">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.21&content-type=text/vnd.viewcvs-markup">1.21</a></td></tr>
<tr><td><tt><a href="#file3">manufacturers.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/manufacturers.php?rev=1.62&content-type=text/vnd.viewcvs-markup">1.62</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.62&r2=1.63">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.63&content-type=text/vnd.viewcvs-markup">1.63</a></td></tr>
<tr class="alt"><td><tt><a href="#file4">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/modules.php?rev=1.50&content-type=text/vnd.viewcvs-markup">1.50</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/modules.php.diff?r1=1.50&r2=1.51">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/modules.php?rev=1.51&content-type=text/vnd.viewcvs-markup">1.51</a></td></tr>
<tr><td><tt><a href="#file5">orders.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/orders.php?rev=1.118&content-type=text/vnd.viewcvs-markup">1.118</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php.diff?r1=1.118&r2=1.119">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php?rev=1.119&content-type=text/vnd.viewcvs-markup">1.119</a></td></tr>
<tr class="alt"><td><tt><a href="#file6">orders_status.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/orders_status.php?rev=1.25&content-type=text/vnd.viewcvs-markup">1.25</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php.diff?r1=1.25&r2=1.26">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a></td></tr>
<tr><td><tt><a href="#file7">products.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/products.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.18&r2=1.19">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.19&content-type=text/vnd.viewcvs-markup">1.19</a></td></tr>
<tr class="alt"><td><tt><a href="#file8">products_attributes.php</a></tt></td><td align="right" id="added">+7</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php?rev=1.57&content-type=text/vnd.viewcvs-markup">1.57</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php.diff?r1=1.57&r2=1.58">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php?rev=1.58&content-type=text/vnd.viewcvs-markup">1.58</a></td></tr>
<tr><td><tt><a href="#file9">weight_classes.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/weight_classes.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a></td></tr>
<tr class="alt"><td><tt>includes/<a href="#file10">application_top.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.184&content-type=text/vnd.viewcvs-markup">1.184</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.184&r2=1.185">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.185&content-type=text/vnd.viewcvs-markup">1.185</a></td></tr>
<tr><td><tt>includes/classes/<a href="#file11">language.php</a></tt></td><td align="right" id="added">+11</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file12">order.php</a></tt></td><td align="right" id="added">+7</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td><tt>includes/functions/<a href="#file13">general.php</a></tt></td><td align="right" id="added">+12</td><td align="right" id="removed">-12</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.177&content-type=text/vnd.viewcvs-markup">1.177</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.177&r2=1.178">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.178&content-type=text/vnd.viewcvs-markup">1.178</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file14">html_output.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/includes/functions/html_output.php?rev=1.36&content-type=text/vnd.viewcvs-markup">1.36</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php.diff?r1=1.36&r2=1.37">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.37&content-type=text/vnd.viewcvs-markup">1.37</a></td></tr>
<tr><td><tt>includes/modules/newsletters/<a href="#file15">product_notification.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/includes/modules/newsletters/product_notification.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/newsletters/product_notification.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/newsletters/product_notification.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr class="alt"><td><tt>includes/modules/statistics/<a href="#file16">low_stock.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/includes/modules/statistics/low_stock.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/low_stock.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/low_stock.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file17">orders.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/includes/modules/statistics/orders.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/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/orders.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file18">products_purchased.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/includes/modules/statistics/products_purchased.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_purchased.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_purchased.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file19">products_viewed.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/includes/modules/statistics/products_viewed.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/statistics/products_viewed.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt>includes/modules/summary/<a href="#file20">customers.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/customers.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/summary/customers.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/customers.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file21">orders.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/includes/modules/summary/orders.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/summary/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/orders.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file22">products.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/includes/modules/summary/products.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/products.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/products.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr><td><tt> /<a href="#file23">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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt>templates/default/<a href="#file24">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.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td><tt>templates/pages/<a href="#file25">categories.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/categories.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file26">manufacturers.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/manufacturers.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/manufacturers.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a></td></tr>
<tr><td><tt> /<a href="#file27">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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file28">newsletters.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/newsletters.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/newsletters.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file29">newsletters_edit.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/newsletters_edit.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/newsletters_edit.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_edit.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file30">newsletters_send.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/newsletters_send.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/newsletters_send.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_send.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr><td><tt> /<a href="#file31">orders.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.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/orders.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file32">orders_status.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/orders_status.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/orders_status.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt> /<a href="#file33">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/templates/pages/products.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/products.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file34">products_attributes.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/products_attributes.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_attributes.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt> /<a href="#file35">products_attributes_listing.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/products_attributes_listing.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_attributes_listing.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file36">products_edit.php</a></tt></td><td align="right" id="added">+17</td><td align="right" id="removed">-17</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></td></tr>
<tr><td><tt> /<a href="#file37">products_expected.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_expected.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/products_expected.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_expected.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file38">products_preview.php</a></tt></td><td align="right" id="added">+9</td><td align="right" id="removed">-9</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></td></tr>
<tr><td><tt> /<a href="#file39">specials.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/specials.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/specials.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file40">specials_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/specials_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/specials_edit.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials_edit.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td><tt> /<a href="#file41">weight_classes.php</a></tt></td><td align="right" id="added">+8</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.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/weight_classes.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a></td></tr>
<tr><td></td><td align="right" id="added">+194</td><td align="right" id="removed">-188</td><td></td></tr>
</table>
<small id="info">41 modified files</small><br />
<pre class="comment">
register_globals compatibility fixes
use new method to load language definitions and to return selected
language information
</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.159&content-type=text/vnd.viewcvs-markup">1.159</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.159&r2=1.160">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.160&content-type=text/vnd.viewcvs-markup">1.160</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.159 -r1.160
--- categories.php 2004/11/20 02:16:45 1.159
+++ categories.php 2005/04/28 07:40:17 1.160
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -64,7 +64,7 @@
</small></pre><pre class="diff" id="context"> if ($osC_Database->isError() === false) {
$category_id = (isset($_GET['cID']) && is_numeric($_GET['cID'])) ? $_GET['cID'] : $osC_Database->nextID();
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['cID']) && is_numeric($_GET['cID'])) {
$Qcd = $osC_Database->query('update :table_categories_description set categories_name = :categories_name where categories_id = :categories_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -72,8 +72,8 @@
</small></pre><pre class="diff" id="context"> }
$Qcd->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION);
$Qcd->bindInt(':categories_id', $category_id);
</pre><pre class="diff" id="removed">- $Qcd->bindInt(':language_id', $language['id']);
- $Qcd->bindValue(':categories_name', $_POST['categories_name'][$language['id']]);
</pre><pre class="diff" id="added">+ $Qcd->bindInt(':language_id', $l['id']);
+ $Qcd->bindValue(':categories_name', $_POST['categories_name'][$l['id']]);
</pre><pre class="diff" id="context"> $Qcd->execute();
if ($osC_Database->isError()) {
</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.20&content-type=text/vnd.viewcvs-markup">1.20</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.20&r2=1.21">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.21&content-type=text/vnd.viewcvs-markup">1.21</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.20 -r1.21
--- define_language.php 2004/11/20 02:16:45 1.20
+++ define_language.php 2005/04/28 07:40:17 1.21
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -16,17 +16,17 @@
</small></pre><pre class="diff" id="context">
$action = (isset($_GET['action']) ? $_GET['action'] : '');
</pre><pre class="diff" id="removed">- $lng = (isset($_GET['lng']) ? $_GET['lng'] : $osC_<span id="removedchars">Session->value('language'</span>));
</pre><pre class="diff" id="added">+ $lng = (isset($_GET['lng']) ? $_GET['lng'] : $osC_<span id="addedchars">Language->getDirectory(</span>));
</pre><pre class="diff" id="context">
$languages_array = array();
$exists = false;
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- if ($language['directory'] == $lng) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ if ($l['directory'] == $lng) {
</pre><pre class="diff" id="context"> $exists = true;
}
</pre><pre class="diff" id="removed">- $languages_array[] = array('id' => $language['directory'],
- 'text' => $language['name']);
</pre><pre class="diff" id="added">+ $languages_array[] = array('id' => $l['directory'],
+ 'text' => $l['name']);
</pre><pre class="diff" id="context"> }
if ($exists === 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>manufacturers.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.62&content-type=text/vnd.viewcvs-markup">1.62</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.62&r2=1.63">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.63&content-type=text/vnd.viewcvs-markup">1.63</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.62 -r1.63
--- manufacturers.php 2004/11/20 02:16:46 1.62
+++ manufacturers.php 2005/04/28 07:40:17 1.63
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -58,7 +58,7 @@
</small></pre><pre class="diff" id="context"> }
if ($error === false) {
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['mID']) && is_numeric($_GET['mID'])) {
$Qurl = $osC_Database->query('update :table_manufacturers_info set manufacturers_url = :manufacturers_url where manufacturers_id = :manufacturers_id and languages_id = :languages_id');
} else {
</pre><pre class="diff"><small id="info">@@ -66,8 +66,8 @@
</small></pre><pre class="diff" id="context"> }
$Qurl->bindTable(':table_manufacturers_info', TABLE_MANUFACTURERS_INFO);
$Qurl->bindInt(':manufacturers_id', $manufacturers_id);
</pre><pre class="diff" id="removed">- $Qurl->bindInt(':languages_id', $language['id']);
- $Qurl->bindValue(':manufacturers_url', $_POST['manufacturers_url'][$language['id']]);
</pre><pre class="diff" id="added">+ $Qurl->bindInt(':languages_id', $l['id']);
+ $Qurl->bindValue(':manufacturers_url', $_POST['manufacturers_url'][$l['id']]);
</pre><pre class="diff" id="context"> $Qurl->execute();
if ($osC_Database->isError()) {
</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>modules.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/modules.php?rev=1.50&content-type=text/vnd.viewcvs-markup">1.50</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/modules.php.diff?r1=1.50&r2=1.51">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/modules.php?rev=1.51&content-type=text/vnd.viewcvs-markup">1.51</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.50 -r1.51
--- modules.php 2005/04/06 00:12:13 1.50
+++ modules.php 2005/04/28 07:40:17 1.51
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -76,7 +76,7 @@
</small></pre><pre class="diff" id="context"> case 'install':
case 'remove':
if (file_exists('../includes/modules/' . $module_type . '/' . $_GET['module'] . $file_extension)) {
</pre><pre class="diff" id="removed">- include('../includes/languages/' . $osC_<span id="removedchars">Session->value('language'</span>) . '/modules/' . $module_type . '/' . $_GET['module'] . $file_extension);
</pre><pre class="diff" id="added">+ include('../includes/languages/' . $osC_<span id="addedchars">Language->getDirectory(</span>) . '/modules/' . $module_type . '/' . $_GET['module'] . $file_extension);
</pre><pre class="diff" id="context"> include('../includes/modules/' . $module_type . '/' . $_GET['module'] . $file_extension);
$module = new $_GET['module'];
if ($action == 'install') {
</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.118&content-type=text/vnd.viewcvs-markup">1.118</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php.diff?r1=1.118&r2=1.119">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders.php?rev=1.119&content-type=text/vnd.viewcvs-markup">1.119</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.118 -r1.119
--- orders.php 2004/11/07 21:00:30 1.118
+++ orders.php 2005/04/28 07:40:17 1.119
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -25,7 +25,7 @@
</small></pre><pre class="diff" id="context"> $orders_status_array = array();
$Qstatuses = $osC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where language_id = :language_id');
$Qstatuses->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">- $Qstatuses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qstatuses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qstatuses->execute();
while ($Qstatuses->next()) {
</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>orders_status.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php?rev=1.25&content-type=text/vnd.viewcvs-markup">1.25</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php.diff?r1=1.25&r2=1.26">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.25 -r1.26
--- orders_status.php 2004/11/20 02:16:46 1.25
+++ orders_status.php 2005/04/28 07:40:18 1.26
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -37,7 +37,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['osID']) && is_numeric($_GET['osID'])) {
$Qstatus = $osC_Database->query('update :table_orders_status set orders_status_name = :orders_status_name where orders_status_id = :orders_status_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -45,8 +45,8 @@
</small></pre><pre class="diff" id="context"> }
$Qstatus->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
$Qstatus->bindInt(':orders_status_id', $orders_status_id);
</pre><pre class="diff" id="removed">- $Qstatus->bindValue(':orders_status_name', $_POST['orders_status_name'][$language['id']]);
- $Qstatus->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="added">+ $Qstatus->bindValue(':orders_status_name', $_POST['orders_status_name'][$l['id']]);
+ $Qstatus->bindInt(':language_id', $l['id']);
</pre><pre class="diff" id="context"> $Qstatus->execute();
if ($osC_Database->isError()) {
</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.18&content-type=text/vnd.viewcvs-markup">1.18</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.18&r2=1.19">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.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
--- products.php 2004/11/20 02:16:46 1.18
+++ products.php 2005/04/28 07:40:18 1.19
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -183,7 +183,7 @@
</small></pre><pre class="diff" id="context"> }
if ($error === false) {
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['pID']) && is_numeric($_GET['pID'])) {
$Qpd = $osC_Database->query('update :table_products_description set products_name = :products_name, products_description = :products_description, products_url = :products_url where products_id = :products_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -191,10 +191,10 @@
</small></pre><pre class="diff" id="context"> }
$Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
$Qpd->bindInt(':products_id', $products_id);
</pre><pre class="diff" id="removed">- $Qpd->bindInt(':language_id', $language['id']);
- $Qpd->bindValue(':products_name', $_POST['products_name'][$language['id']]);
- $Qpd->bindValue(':products_description', $_POST['products_description'][$language['id']]);
- $Qpd->bindValue(':products_url', $_POST['products_url'][$language['id']]);
</pre><pre class="diff" id="added">+ $Qpd->bindInt(':language_id', $l['id']);
+ $Qpd->bindValue(':products_name', $_POST['products_name'][$l['id']]);
+ $Qpd->bindValue(':products_description', $_POST['products_description'][$l['id']]);
+ $Qpd->bindValue(':products_url', $_POST['products_url'][$l['id']]);
</pre><pre class="diff" id="context"> $Qpd->execute();
if ($osC_Database->isError()) {
</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><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/products_attributes.php?rev=1.57&content-type=text/vnd.viewcvs-markup">1.57</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php.diff?r1=1.57&r2=1.58">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php?rev=1.58&content-type=text/vnd.viewcvs-markup">1.58</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.57 -r1.58
--- products_attributes.php 2004/11/20 02:16:46 1.57
+++ products_attributes.php 2005/04/28 07:40:18 1.58
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -68,7 +68,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['paID']) && is_numeric($_GET['paID'])) {
$Qgroup = $osC_Database->query('update :table_products_options set products_options_name = :products_options_name where products_options_id = :products_options_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -76,8 +76,8 @@
</small></pre><pre class="diff" id="context"> }
$Qgroup->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
$Qgroup->bindInt(':products_options_id', $group_id);
</pre><pre class="diff" id="removed">- $Qgroup->bindValue(':products_options_name', $_POST['group_name'][$language['id']]);
- $Qgroup->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="added">+ $Qgroup->bindValue(':products_options_name', $_POST['group_name'][$l['id']]);
+ $Qgroup->bindInt(':language_id', $l['id']);
</pre><pre class="diff" id="context"> $Qgroup->execute();
if ($osC_Database->isError()) {
</pre><pre class="diff"><small id="info">@@ -178,7 +178,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['paeID']) && is_numeric($_GET['paeID'])) {
$Qentry = $osC_Database->query('update :table_products_options_values set products_options_values_name = :products_options_values_name where products_options_values_id = :products_options_values_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -186,8 +186,8 @@
</small></pre><pre class="diff" id="context"> }
$Qentry->bindTable(':table_products_options_values', TABLE_PRODUCTS_OPTIONS_VALUES);
$Qentry->bindInt(':products_options_values_id', $entry_id);
</pre><pre class="diff" id="removed">- $Qentry->bindValue(':products_options_values_name', $_POST['entry_name'][$language['id']]);
- $Qentry->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="added">+ $Qentry->bindValue(':products_options_values_name', $_POST['entry_name'][$l['id']]);
+ $Qentry->bindInt(':language_id', $l['id']);
</pre><pre class="diff" id="context"> $Qentry->execute();
if ($osC_Database->isError()) {
</pre></div>
<hr /><a name="file9" /><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>weight_classes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.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
--- weight_classes.php 2004/11/20 02:16:46 1.4
+++ weight_classes.php 2005/04/28 07:40:18 1.5
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -37,7 +37,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> if (isset($_GET['wcID']) && is_numeric($_GET['wcID'])) {
$Qwc = $osC_Database->query('update :table_weight_classes set weight_class_key = :weight_class_key, weight_class_title = :weight_class_title where weight_class_id = :weight_class_id and language_id = :language_id');
} else {
</pre><pre class="diff"><small id="info">@@ -45,9 +45,9 @@
</small></pre><pre class="diff" id="context"> }
$Qwc->bindTable(':table_weight_classes', TABLE_WEIGHT_CLASS);
$Qwc->bindInt(':weight_class_id', $weight_class_id);
</pre><pre class="diff" id="removed">- $Qwc->bindInt(':language_id', $language['id']);
- $Qwc->bindValue(':weight_class_key', $_POST['weight_class_key'][$language['id']]);
- $Qwc->bindValue(':weight_class_title', $_POST['weight_class_title'][$language['id']]);
</pre><pre class="diff" id="added">+ $Qwc->bindInt(':language_id', $l['id']);
+ $Qwc->bindValue(':weight_class_key', $_POST['weight_class_key'][$l['id']]);
+ $Qwc->bindValue(':weight_class_title', $_POST['weight_class_title'][$l['id']]);
</pre><pre class="diff" id="context"> $Qwc->execute();
if ($osC_Database->isError()) {
</pre><pre class="diff"><small id="info">@@ -81,7 +81,7 @@
</small></pre><pre class="diff" id="context"> $Qclasses = $osC_Database->query('select weight_class_id from :table_weight_classes where weight_class_id != :weight_class_id and language_id = :language_id');
$Qclasses->bindTable(':table_weight_classes', TABLE_WEIGHT_CLASS);
$Qclasses->bindInt(':weight_class_id', $weight_class_id);
</pre><pre class="diff" id="removed">- $Qclasses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qclasses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qclasses->execute();
while ($Qclasses->next()) {
</pre></div>
<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><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.184&content-type=text/vnd.viewcvs-markup">1.184</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.184&r2=1.185">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.185&content-type=text/vnd.viewcvs-markup">1.185</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.184 -r1.185
--- application_top.php 2005/04/06 00:12:17 1.184
+++ application_top.php 2005/04/28 07:40:21 1.185
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -95,16 +95,12 @@
</small></pre><pre class="diff" id="context"> $osC_Language->set($_GET['language']);
}
</pre><pre class="diff" id="removed">- require('includes/languages/' . $osC_Session->value('language') . '.php');
</pre><pre class="diff" id="added">+ $osC_Language->load();
</pre><pre class="diff" id="context">
header('Content-Type: text/html; charset=' . CHARSET);
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> setlocale(LC_TIME, LANGUAGE_LOCALE);
</pre><pre class="diff" id="removed">- $current_page = basename($_SERVER['SCRIPT_FILENAME']);
- if (file_exists('includes/languages/' . $osC_Session->value('language') . '/' . $current_page)) {
- include('includes/languages/' . $osC_Session->value('language') . '/' . $current_page);
- }
</pre><pre class="diff" id="added">+ $osC_Language->load(basename($_SERVER['SCRIPT_FILENAME']));
</pre><pre class="diff" id="context">
// define our localization functions
require('includes/functions/localization.php');
</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/classes">classes</a><br /></span>
<div class="fileheader"><big><b>language.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/language.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
--- language.php 2004/11/29 14:36:13 1.3
+++ language.php 2005/04/28 07:40:21 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -18,6 +18,16 @@
</small></pre><pre class="diff" id="context">
function osC_Language_Admin() {
$this->osC_Language();
</pre><pre class="diff" id="added">+ }
+
+/* Public methods */
+
+ function load($definition = false) {
+ if (is_string($definition) && file_exists('includes/languages/' . $this->getDirectory() . '/' . $definition)) {
+ include('includes/languages/' . $this->getDirectory() . '/' . $definition);
+ } else {
+ include('includes/languages/' . $this->getDirectory() . '.php');
+ }
</pre><pre class="diff" id="context"> }
function insert($language, $default = false) {
</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/classes">classes</a><br /></span>
<div class="fileheader"><big><b>order.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/order.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
--- order.php 2004/07/22 23:07:55 1.8
+++ order.php 2005/04/28 07:40:21 1.9
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -86,15 +86,15 @@
</small></pre><pre class="diff" id="context"> }
function _getStatus() {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
$Qstatus = $osC_Database->query('select orders_status_name from :table_orders_status where orders_status_id = :orders_status_id and language_id = :language_id');
$Qstatus->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
$Qstatus->bindInt(':orders_status_id', $this->_status_id);
</pre><pre class="diff" id="removed">-/* HPDL - LANGUAGE_ID is the language code, not the language id :( */
</pre><pre class="diff" id="added">+/* HPDL - DEFAULT_LANGUAGE is the language code, not the language id */
</pre><pre class="diff" id="context"> // $Qstatus->bindInt(':language_id', ($osC_Session->exists('languages_id') ? $osC_Session->value('languages_id') : DEFAULT_LANGUAGE));
</pre><pre class="diff" id="removed">- $Qstatus->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qstatus->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qstatus->execute();
if ($Qstatus->numberOfRows() === 1) {
</pre><pre class="diff"><small id="info">@@ -105,7 +105,7 @@
</small></pre><pre class="diff" id="context"> }
function _getStatusHistory() {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
$history_array = array();
</pre><pre class="diff"><small id="info">@@ -113,9 +113,9 @@
</small></pre><pre class="diff" id="context"> $Qhistory->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY);
$Qhistory->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">-/* HPDL - LANGUAGE_ID is the language code, not the language id :( */
</pre><pre class="diff" id="added">+/* HPDL - DEFAULT_LANGUAGE is the language code, not the language id */
</pre><pre class="diff" id="context"> // $Qstatus->bindInt(':language_id', ($osC_Session->exists('languages_id') ? $osC_Session->value('languages_id') : DEFAULT_LANGUAGE));
</pre><pre class="diff" id="removed">- $Qhistory->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qhistory->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context">
$Qhistory->bindInt(':orders_id', $this->_order_id);
$Qhistory->execute();
</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/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.177&content-type=text/vnd.viewcvs-markup">1.177</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.177&r2=1.178">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.178&content-type=text/vnd.viewcvs-markup">1.178</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.177 -r1.178
--- general.php 2004/11/24 15:56:42 1.177
+++ general.php 2005/04/28 07:40:23 1.178
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -281,10 +281,10 @@
</small></pre><pre class="diff" id="context"> }
function tep_get_weight_class_title($weight_class_id, $language_id = '') {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
if (empty($language_id)) {
</pre><pre class="diff" id="removed">- $language_id = $osC_Session->value('languages_id');
</pre><pre class="diff" id="added">+ $language_id = $osC_Language->getID();
</pre><pre class="diff" id="context"> }
$Qweight = $osC_Database->query('select weight_class_title from :table_weight_class where weight_class_id = :weight_class_id and language_id = :language_id');
</pre><pre class="diff"><small id="info">@@ -512,7 +512,7 @@
</small></pre><pre class="diff" id="context"> }
function tep_cfg_pull_down_weight_classes($weight_class_id, $key = '') {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
$name = (empty($key)) ? 'configuration_value' : 'configuration[' . $key . ']';
</pre><pre class="diff"><small id="info">@@ -520,7 +520,7 @@
</small></pre><pre class="diff" id="context">
$Qclasses = $osC_Database->query('select weight_class_id, weight_class_title from :table_weight_class where language_id = :language_id order by weight_class_title');
$Qclasses->bindTable(':table_weight_class', TABLE_WEIGHT_CLASS);
</pre><pre class="diff" id="removed">- $Qclasses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qclasses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qclasses->execute();
while ($Qclasses->next()) {
</pre><pre class="diff"><small id="info">@@ -605,7 +605,7 @@
</small></pre><pre class="diff" id="context"> }
function tep_generate_category_path($id, $from = 'category', $categories_array = '', $index = 0) {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
if (!is_array($categories_array)) $categories_array = array();
</pre><pre class="diff"><small id="info">@@ -623,7 +623,7 @@
</small></pre><pre class="diff" id="context"> $Qcategory->bindTable(':table_categories', TABLE_CATEGORIES);
$Qcategory->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION);
$Qcategory->bindInt(':categories_id', $Qcategories->valueInt('categories_id'));
</pre><pre class="diff" id="removed">- $Qcategory->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qcategory->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qcategory->execute();
$categories_array[$index][] = array('id' => $Qcategories->valueInt('categories_id'), 'text' => $Qcategory->value('categories_name'));
</pre><pre class="diff"><small id="info">@@ -641,7 +641,7 @@
</small></pre><pre class="diff" id="context"> $Qcategory->bindTable(':table_categories', TABLE_CATEGORIES);
$Qcategory->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION);
$Qcategory->bindInt(':categories_id', $id);
</pre><pre class="diff" id="removed">- $Qcategory->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qcategory->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qcategory->execute();
$categories_array[$index][] = array('id' => $id, 'text' => $Qcategory->value('categories_name'));
</pre><pre class="diff"><small id="info">@@ -1270,7 +1270,7 @@
</small></pre><pre class="diff" id="context"> }
function tep_cfg_pull_down_order_statuses($order_status_id, $key = '') {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
$name = (empty($key)) ? 'configuration_value' : 'configuration[' . $key . ']';
</pre><pre class="diff"><small id="info">@@ -1278,7 +1278,7 @@
</small></pre><pre class="diff" id="context">
$Qstatuses = $osC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where language_id = :language_id order by orders_status_name');
$Qstatuses->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">- $Qstatuses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qstatuses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qstatuses->execute();
while ($Qstatuses->next()) {
</pre><pre class="diff"><small id="info">@@ -1290,14 +1290,14 @@
</small></pre><pre class="diff" id="context"> }
function tep_get_order_status_name($order_status_id, $language_id = '') {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
if ($order_status_id < 1) {
return TEXT_DEFAULT;
}
if (!is_numeric($language_id)) {
</pre><pre class="diff" id="removed">- $language_id = $osC_Session->value('languages_id');
</pre><pre class="diff" id="added">+ $language_id = $osC_Language->getID();
</pre><pre class="diff" id="context"> }
$Qstatus = $osC_Database->query('select orders_status_name from :table_orders_status where orders_status_id = :orders_status_id and language_id = :language_id');
</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/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.36&content-type=text/vnd.viewcvs-markup">1.36</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php.diff?r1=1.36&r2=1.37">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/html_output.php?rev=1.37&content-type=text/vnd.viewcvs-markup">1.37</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.36 -r1.37
--- html_output.php 2005/03/07 10:06:44 1.36
+++ html_output.php 2005/04/28 07:40:23 1.37
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -59,9 +59,9 @@
</small></pre><pre class="diff" id="context"> // The HTML form submit button wrapper function
// Outputs a button in the selected language
function tep_image_submit($image, $alt = '', $parameters = '') {
</pre><pre class="diff" id="removed">- global $<span id="removedchars">l</span>anguage;
</pre><pre class="diff" id="added">+ global $<span id="addedchars">osC_L</span>anguage;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- $image_submit = '<input type="image" src="' . tep_output_string('includes/languages/' . $<span id="removedchars">language</span> . '/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('includes/languages/' . $<span id="addedchars">osC_Language->getDirectory()</span> . '/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">@@ -81,9 +81,9 @@
</small></pre><pre class="diff" id="context"> ////
// Output a function button in the selected language
function tep_image_button($image, $alt = '', $params = '') {
</pre><pre class="diff" id="removed">- global $<span id="removedchars">l</span>anguage;
</pre><pre class="diff" id="added">+ global $<span id="addedchars">osC_L</span>anguage;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- return tep_image('includes/languages/' . $<span id="removedchars">language</span> . '/images/buttons/' . $image, $alt, '', '', $params);
</pre><pre class="diff" id="added">+ return tep_image('includes/languages/' . $<span id="addedchars">osC_Language->getDirectory()</span> . '/images/buttons/' . $image, $alt, '', '', $params);
</pre><pre class="diff" id="context"> }
////
</pre></div>
<hr /><a name="file15" /><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/newsletters">newsletters</a><br /></span>
<div class="fileheader"><big><b>product_notification.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/newsletters/product_notification.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/newsletters/product_notification.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/newsletters/product_notification.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
--- product_notification.php 2004/08/17 23:59:10 1.8
+++ product_notification.php 2005/04/28 07:40:24 1.9
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -50,14 +50,14 @@
</small></pre><pre class="diff" id="context"> global $_GET;
}
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
$products_array = array();
$Qproducts = $osC_Database->query('select pd.products_id, pd.products_name from :table_products p, :table_products_description pd where pd.language_id = :language_id and pd.products_id = p.products_id and p.products_status = 1 order by pd.products_name');
$Qproducts->bindTable(':table_products', TABLE_PRODUCTS);
$Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qproducts->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qproducts->execute();
while ($Qproducts->next()) {
</pre></div>
<hr /><a name="file16" /><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>low_stock.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/low_stock.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/low_stock.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/low_stock.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
--- low_stock.php 2004/10/31 10:01:35 1.1
+++ low_stock.php 2005/04/28 07:40:25 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -19,9 +19,9 @@
</small></pre><pre class="diff" id="context"> // Class constructor
function osC_Statistics_Low_Stock() {
</pre><pre class="diff" id="removed">- global $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/statistics/low_stock.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/statistics/low_stock.php');
</pre><pre class="diff" id="context">
$this->_setIcon();
$this->_setTitle();
</pre><pre class="diff"><small id="info">@@ -48,13 +48,13 @@
</small></pre><pre class="diff" id="context"> }
global $osC_Database, $osC_Session;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> $this->_data = array();
$this->_resultset = $osC_Database->query('select p.products_id, pd.products_name, products_quantity from :table_products p, :table_products_description pd where p.products_id = pd.products_id and pd.language_id = :language_id and p.products_quantity <= :stock_reorder_level order by p.products_quantity desc');
$this->_resultset->bindTable(':table_products', TABLE_PRODUCTS);
$this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $this->_resultset->bindInt(':language_id', $osC_<span id="removedchars">Session->value('languages_id'</span>));
</pre><pre class="diff" id="added">+ $this->_resultset->bindInt(':language_id', $osC_<span id="addedchars">Language->getID(</span>));
</pre><pre class="diff" id="context"> $this->_resultset->bindInt(':stock_reorder_level', STOCK_REORDER_LEVEL);
$this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$this->_resultset->execute();
</pre></div>
<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>orders.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/orders.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/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/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:14:43 1.1
+++ orders.php 2005/04/28 07:40:25 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -19,9 +19,9 @@
</small></pre><pre class="diff" id="context"> // Class constructor
function osC_Statistics_Orders() {
</pre><pre class="diff" id="removed">- global $osC_<span id="removedchars">Session</span>, $osC_Currencies;
</pre><pre class="diff" id="added">+ global $osC_<span id="addedchars">Language</span>, $osC_Currencies;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/statistics/orders.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/statistics/orders.php');
</pre><pre class="diff" id="context">
if (!isset($osC_Currencies)) {
if (!class_exists('osC_Currencies')) {
</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/statistics">statistics</a><br /></span>
<div class="fileheader"><big><b>products_purchased.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_purchased.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_purchased.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_purchased.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_purchased.php 2004/07/22 23:14:43 1.1
+++ products_purchased.php 2005/04/28 07:40:25 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -19,9 +19,9 @@
</small></pre><pre class="diff" id="context"> // Class constructor
function osC_Statistics_Products_Purchased() {
</pre><pre class="diff" id="removed">- global $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/statistics/products_purchased.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/statistics/products_purchased.php');
</pre><pre class="diff" id="context">
$this->_setIcon();
$this->_setTitle();
</pre><pre class="diff"><small id="info">@@ -54,7 +54,7 @@
</small></pre><pre class="diff" id="context"> $this->_resultset = $osC_Database->query('select p.products_id, p.products_ordered, pd.products_name from :table_products p, :table_products_description pd where p.products_ordered > 0 and p.products_id = pd.products_id and pd.language_id = :language_id order by p.products_ordered desc, pd.products_name');
$this->_resultset->bindTable(':table_products', TABLE_PRODUCTS);
$this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $this->_resultset->bindInt(':language_id', $osC_<span id="removedchars">Session->value('languages_id'</span>));
</pre><pre class="diff" id="added">+ $this->_resultset->bindInt(':language_id', $osC_<span id="addedchars">Language->getID(</span>));
</pre><pre class="diff" id="context"> $this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$this->_resultset->execute();
</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/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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/statistics/products_viewed.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
--- products_viewed.php 2004/11/07 21:00:43 1.2
+++ products_viewed.php 2005/04/28 07:40:25 1.3
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -19,9 +19,9 @@
</small></pre><pre class="diff" id="context"> // Class constructor
function osC_Statistics_Products_Viewed() {
</pre><pre class="diff" id="removed">- global $osC_<span id="removedchars">Session</span>;
</pre><pre class="diff" id="added">+ global $osC_<span id="addedchars">Language</span>;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/statistics/products_viewed.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/statistics/products_viewed.php');
</pre><pre class="diff" id="context">
$this->_setIcon();
$this->_setTitle();
</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/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>customers.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/customers.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/summary/customers.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/customers.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
--- customers.php 2004/08/24 11:06:04 1.1
+++ customers.php 2005/04/28 07:40:26 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -15,7 +15,7 @@
</small></pre><pre class="diff" id="context"> }
if (!defined('MODULE_SUMMARY_CUSTOMERS_TITLE')) {
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/summary/customers.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/summary/customers.php');
</pre><pre class="diff" id="context"> }
class osC_Summary_customers extends osC_Summary {
</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/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>orders.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/orders.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/summary/orders.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/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/08/24 11:06:04 1.1
+++ orders.php 2005/04/28 07:40:26 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -15,7 +15,7 @@
</small></pre><pre class="diff" id="context"> }
if (!defined('MODULE_SUMMARY_ORDERS_TITLE')) {
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/summary/orders.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/summary/orders.php');
</pre><pre class="diff" id="context"> }
class osC_Summary_orders extends osC_Summary {
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> /* Private methods */
function _setData() {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>, $template;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>, $template;
</pre><pre class="diff" id="context">
$this->_data = '<table border="0" width="100%" cellspacing="0" cellpadding="2" class="dataTable">' .
' <thead>' .
</pre><pre class="diff"><small id="info">@@ -49,7 +49,7 @@
</small></pre><pre class="diff" id="context"> $Qorders->bindTable(':table_orders', TABLE_ORDERS);
$Qorders->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL);
$Qorders->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">- $Qorders->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qorders->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qorders->execute();
while ($Qorders->next()) {
</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/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>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/products.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/products.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/products.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
--- products.php 2004/10/30 22:13:07 1.2
+++ products.php 2005/04/28 07:40:26 1.3
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -15,7 +15,7 @@
</small></pre><pre class="diff" id="context"> }
if (!defined('MODULE_SUMMARY_PRODUCTS_TITLE')) {
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/summary/products.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/summary/products.php');
</pre><pre class="diff" id="context"> }
class osC_Summary_products extends osC_Summary {
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> /* Private methods */
function _setData() {
</pre><pre class="diff" id="removed">- global $osC_Database, $osC_<span id="removedchars">Session</span>, $osC_Currencies, $template;
</pre><pre class="diff" id="added">+ global $osC_Database, $osC_<span id="addedchars">Language</span>, $osC_Currencies, $template;
</pre><pre class="diff" id="context">
if (!isset($osC_Currencies)) {
if (!class_exists('osC_Currencies')) {
</pre><pre class="diff"><small id="info">@@ -56,7 +56,7 @@
</small></pre><pre class="diff" id="context"> $Qproducts = $osC_Database->query('select p.products_id, pd.products_name, p.products_price, greatest(p.products_date_added, p.products_last_modified) as date_last_modified, p.products_status from :table_products p, :table_products_description pd where p.products_id = pd.products_id and pd.language_id = :language_id order by date_last_modified desc, pd.products_name limit 6');
$Qproducts->bindTable(':table_products', TABLE_PRODUCTS);
$Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qproducts->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qproducts->execute();
while ($Qproducts->next()) {
</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/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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/modules/summary/reviews.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
--- reviews.php 2004/11/07 21:00:44 1.3
+++ reviews.php 2005/04/28 07:40:26 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -15,7 +15,7 @@
</small></pre><pre class="diff" id="context"> }
if (!defined('MODULE_SUMMARY_REVIEWS_TITLE')) {
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/summary/reviews.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/summary/reviews.php');
</pre><pre class="diff" id="context"> }
class osC_Summary_reviews extends osC_Summary {
</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/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.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.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
--- header.php 2004/11/20 02:16:49 1.8
+++ header.php 2005/04/28 07:40:27 1.9
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -94,8 +94,8 @@
</small></pre><pre class="diff" id="context"> ' ],' . "\n" .
' [\'' . tep_image('templates/' . $template . '/images/icons/16x16/locale.png', '', '16', '16') . '\', \'' . addslashes(HEADER_TITLE_LANGUAGES) . '\', null, null, null,' . "\n";
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo ' [\'' . tep_image('../includes/languages/' . $language['directory'] . '/images/icon.gif') . '\', \'' . addslashes($language['name']) . '\', \'' . tep_href_link(FILENAME_DEFAULT, 'language=' . $language['code']) . '\', null, null],' . "\n";
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo ' [\'' . tep_image('../includes/languages/' . $l['directory'] . '/images/icon.gif') . '\', \'' . addslashes($l['name']) . '\', \'' . tep_href_link(FILENAME_DEFAULT, 'language=' . $l['code']) . '\', null, null],' . "\n";
</pre><pre class="diff" id="context"> }
echo ' ],' . "\n" .
</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>categories.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.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
--- categories.php 2004/11/20 02:16:49 1.6
+++ categories.php 2005/04/28 07:40:28 1.7
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -53,7 +53,7 @@
</small></pre><pre class="diff" id="context">
$Qcategories->bindTable(':table_categories', TABLE_CATEGORIES);
$Qcategories->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qcategories->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qcategories->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qcategories->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qcategories->execute();
</pre><pre class="diff"><small id="info">@@ -123,8 +123,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_CATEGORIES_NAME;
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo '<br>' . tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $language['id'] . ']');
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo '<br>' . tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l['id'] . ']');
</pre><pre class="diff" id="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -192,8 +192,8 @@
</small></pre><pre class="diff" id="context"> $categories_name[$Qcd->valueInt('language_id')] = $Qcd->value('categories_name');
}
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo '<br>' . tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $language['id'] . ']', (isset($categories_name[$language['id']]) ? $categories_name[$language['id']] : ''));
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo '<br>' . tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l['id'] . ']', (isset($categories_name[$l['id']]) ? $categories_name[$l['id']] : ''));
</pre><pre class="diff" id="context"> }
?>
</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>manufacturers.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.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/manufacturers.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.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
--- manufacturers.php 2004/11/20 02:16:50 1.4
+++ manufacturers.php 2005/04/28 07:40:28 1.5
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -92,8 +92,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_MANUFACTURERS_URL;
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo '<br>' . tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $language['id'] . ']');
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo '<br>' . tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l['id'] . ']');
</pre><pre class="diff" id="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -121,8 +121,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_MANUFACTURERS_URL;
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo '<br>' . tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $language['id'] . ']', tep_get_manufacturer_url($mInfo->manufacturers_id, $language['id']));
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo '<br>' . tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l['id'] . ']', tep_get_manufacturer_url($mInfo->manufacturers_id, $l['id']));
</pre><pre class="diff" id="context"> }
?>
</p>
</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>modules.php</b></big> <small id="info"><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> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/modules.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
--- modules.php 2004/11/07 21:00:46 1.3
+++ modules.php 2005/04/28 07:40:28 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> <?php
$installed_modules = array();
foreach ($files as $file) {
</pre><pre class="diff" id="removed">- include('../includes/languages/' . $osC_<span id="removedchars">Session->value('language'</span>) . '/modules/' . $module_type . '/' . $file['name']);
</pre><pre class="diff" id="added">+ include('../includes/languages/' . $osC_<span id="addedchars">Language->getDirectory(</span>) . '/modules/' . $module_type . '/' . $file['name']);
</pre><pre class="diff" id="context"> include('../includes/modules/' . $module_type . '/' . $file['name']);
$class = substr($file['name'], 0, strrpos($file['name'], '.'));
</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>newsletters.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters.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/newsletters.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters.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
--- newsletters.php 2004/08/17 23:54:17 1.1
+++ newsletters.php 2005/04/28 07:40:28 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -35,7 +35,7 @@
</small></pre><pre class="diff" id="context"> $newsletter_module_class = 'osC_Newsletter_' . $Qnewsletters->value('module');
if (class_exists($newsletter_module_class) === false) {
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/newsletters/' . $Qnewsletters->value('module') . '.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/newsletters/' . $Qnewsletters->value('module') . '.php');
</pre><pre class="diff" id="context"> include('includes/modules/newsletters/' . $Qnewsletters->value('module') . '.php');
$$newsletter_module_class = new $newsletter_module_class();
</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>newsletters_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_edit.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/newsletters_edit.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_edit.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
--- newsletters_edit.php 2004/08/17 23:54:17 1.1
+++ newsletters_edit.php 2005/04/28 07:40:28 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -29,7 +29,7 @@
</small></pre><pre class="diff" id="context"> for ($i=0, $n=sizeof($files); $i<$n; $i++) {
$module = substr($files[$i]['name'], 0, strrpos($files[$i]['name'], '.'));
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/newsletters/' . $files[$i]['name']);
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/newsletters/' . $files[$i]['name']);
</pre><pre class="diff" id="context"> include('includes/modules/newsletters/' . $files[$i]['name']);
$newsletter_module_class = 'osC_Newsletter_' . $module;
</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>newsletters_send.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_send.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/newsletters_send.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/newsletters_send.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
--- newsletters_send.php 2004/08/17 23:54:17 1.1
+++ newsletters_send.php 2005/04/28 07:40:28 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -15,7 +15,7 @@
</small></pre><pre class="diff" id="context"> $Qnewsletter->bindInt(':newsletters_id', $_GET['nmID']);
$Qnewsletter->execute();
</pre><pre class="diff" id="removed">- include('includes/languages/' . $osC_Session->value('language') . '/modules/newsletters/' . $Qnewsletter->value('module') . '.php');
</pre><pre class="diff" id="added">+ $osC_Language->load('modules/newsletters/' . $Qnewsletter->value('module') . '.php');
</pre><pre class="diff" id="context"> include('includes/modules/newsletters/' . $Qnewsletter->value('module') . '.php');
$module_name = 'osC_Newsletter_' . $Qnewsletter->value('module');
</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.php</b></big> <small id="info"><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> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders.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
--- orders.php 2004/11/07 21:00:47 1.2
+++ orders.php 2005/04/28 07:40:28 1.3
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -56,7 +56,7 @@
</small></pre><pre class="diff" id="context"> $Qorders->bindTable(':table_orders', TABLE_ORDERS);
$Qorders->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL);
$Qorders->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">- $Qorders->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qorders->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qorders->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qorders->execute();
</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>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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.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
--- orders_status.php 2004/11/20 02:16:50 1.3
+++ orders_status.php 2005/04/28 07:40:28 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -25,7 +25,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qstatuses = $osC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where language_id = :language_id order by orders_status_name');
$Qstatuses->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
</pre><pre class="diff" id="removed">- $Qstatuses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qstatuses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qstatuses->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qstatuses->execute();
</pre><pre class="diff"><small id="info">@@ -86,8 +86,8 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="40%"><?php echo '<b>' . TEXT_INFO_ORDERS_STATUS_NAME . '</b>'; ?></td>
<td class="smallText" width="60%">
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $language['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -130,8 +130,8 @@
</small></pre><pre class="diff" id="context"> $status_name[$Qsd->valueInt('language_id')] = $Qsd->value('orders_status_name');
}
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $language['id'] . ']', (isset($status_name[$language['id']]) ? $status_name[$language['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : '')) . '<br>';
</pre><pre class="diff" id="context"> }
?>
</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.php</b></big> <small id="info"><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> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.php.diff?r1=1.4&r2=1.5">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products.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
--- products.php 2004/11/07 21:00:47 1.4
+++ products.php 2005/04/28 07:40:28 1.5
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -64,7 +64,7 @@
</small></pre><pre class="diff" id="context">
$Qproducts->bindTable(':table_products', TABLE_PRODUCTS);
$Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qproducts->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qproducts->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS, (!empty($_GET['search']) ? 'distinct p.products_id' : ''));
$Qproducts->execute();
</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.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.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_attributes.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.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_attributes.php 2004/11/20 02:16:50 1.3
+++ products_attributes.php 2005/04/28 07:40:28 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -60,7 +60,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qgroups = $osC_Database->query('select products_options_id, products_options_name from :table_products_options where language_id = :language_id order by products_options_name');
$Qgroups->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
</pre><pre class="diff" id="removed">- $Qgroups->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qgroups->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qgroups->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qgroups->execute();
</pre><pre class="diff"><small id="info">@@ -127,8 +127,8 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="40%" valign="top"><?php echo '<b>' . TEXT_INFO_ATTRIBUTE_GROUP_NAME . '</b>'; ?></td>
<td class="smallText" width="60%">
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/icon.gif', $language['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $language['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/icon.gif', $l['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -167,8 +167,8 @@
</small></pre><pre class="diff" id="context"> $group_names[$Qgd->valueInt('language_id')] = $Qgd->value('products_options_name');
}
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/icon.gif', $language['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $language['id'] . ']', (isset($group_names[$language['id']]) ? $group_names[$language['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/icon.gif', $l['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l['id'] . ']', (isset($group_names[$l['id']]) ? $group_names[$l['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_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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.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_attributes_listing.php 2004/11/20 02:16:50 1.3
+++ products_attributes_listing.php 2005/04/28 07:40:28 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -27,7 +27,7 @@
</small></pre><pre class="diff" id="context"> $Qentries->bindTable(':table_products_options_values', TABLE_PRODUCTS_OPTIONS_VALUES);
$Qentries->bindTable(':table_products_options_values_to_products_options', TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS);
$Qentries->bindInt(':products_options_id', $_GET['paID']);
</pre><pre class="diff" id="removed">- $Qentries->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qentries->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qentries->setBatchLimit($_GET['entriesPage'], MAX_DISPLAY_SEARCH_RESULTS);
$Qentries->execute();
</pre><pre class="diff"><small id="info">@@ -88,8 +88,8 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="40%" valign="top"><?php echo '<b>' . TEXT_INFO_ATTRIBUTE_ENTRY_NAME . '</b>'; ?></td>
<td class="smallText" width="60%">
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/icon.gif', $language['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $language['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/icon.gif', $l['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l['id'] . ']') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -128,8 +128,8 @@
</small></pre><pre class="diff" id="context"> $entry_names[$Qed->valueInt('language_id')] = $Qed->value('products_options_values_name');
}
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/icon.gif', $language['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $language['id'] . ']', (isset($entry_names[$language['id']]) ? $entry_names[$language['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/icon.gif', $l['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l['id'] . ']', (isset($entry_names[$l['id']]) ? $entry_names[$l['id']] : '')) . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</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_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- products_edit.php 2004/11/20 02:16:50 1.5
+++ products_edit.php 2005/04/28 07:40:28 1.6
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -55,7 +55,7 @@
</small></pre><pre class="diff" id="context">
$Qwc = $osC_Database->query('select weight_class_id, weight_class_title from :table_weight_class where language_id = :language_id order by weight_class_title');
$Qwc->bindTable(':table_weight_class', TABLE_WEIGHT_CLASS);
</pre><pre class="diff" id="removed">- $Qwc->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qwc->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qwc->execute();
$weight_class_array = array();
</pre><pre class="diff"><small id="info">@@ -254,36 +254,36 @@
</small></pre><pre class="diff" id="context"> //--></script>
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> ?>
</pre><pre class="diff" id="removed">- <div class="tab-page" id="tabDescriptionLanguages_<?php echo $language['code']; ?>">
- <h2 class="tab"><?php echo tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . $language['name']; ?></h2>
</pre><pre class="diff" id="added">+ <div class="tab-page" id="tabDescriptionLanguages_<?php echo $l['code']; ?>">
+ <h2 class="tab"><?php echo tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . $l['name']; ?></h2>
</pre><pre class="diff" id="context">
<script type="text/javascript"><!--
</pre><pre class="diff" id="removed">- descriptionTabPane.addTabPage( document.getElementById( "tabDescriptionLanguages_<?php echo $l<span id="removedchars">anguage</span>['code']; ?>" ) );
</pre><pre class="diff" id="added">+ descriptionTabPane.addTabPage( document.getElementById( "tabDescriptionLanguages_<?php echo $l['code']; ?>" ) );
</pre><pre class="diff" id="context"> //--></script>
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td class="smallText"><?php echo TEXT_PRODUCTS_NAME; ?></td>
</pre><pre class="diff" id="removed">- <td class="smallText"><?php echo osc_draw_input_field('products_name[' . $language['id'] . ']', (isset($pInfo) && is_array($pInfo->products_name) && isset($pInfo->products_name[$language['id']]) ? $pInfo->products_name[$language['id']] : '')); ?></td>
</pre><pre class="diff" id="added">+ <td class="smallText"><?php echo osc_draw_input_field('products_name[' . $l['id'] . ']', (isset($pInfo) && is_array($pInfo->products_name) && isset($pInfo->products_name[$l['id']]) ? $pInfo->products_name[$l['id']] : '')); ?></td>
</pre><pre class="diff" id="context"> </tr>
<tr>
<td class="smallText" valign="top"><?php echo TEXT_PRODUCTS_DESCRIPTION; ?></td>
</pre><pre class="diff" id="removed">- <td class="smallText"><?php echo tep_draw_textarea_field('products_description[' . $language['id'] . ']', 'soft', '70', '15', (isset($pInfo) && is_array($pInfo->products_description) && isset($pInfo->products_description[$language['id']]) ? $pInfo->products_description[$language['id']] : ''), 'id="fckpd_' . $language['code'] . '" style="width: 100%;"'); ?></td>
</pre><pre class="diff" id="added">+ <td class="smallText"><?php echo tep_draw_textarea_field('products_description[' . $l['id'] . ']', 'soft', '70', '15', (isset($pInfo) && is_array($pInfo->products_description) && isset($pInfo->products_description[$l['id']]) ? $pInfo->products_description[$l['id']] : ''), 'id="fckpd_' . $l['code'] . '" style="width: 100%;"'); ?></td>
</pre><pre class="diff" id="context"> </tr>
<tr>
<td class="smallText"><?php echo TEXT_PRODUCTS_URL; ?></td>
</pre><pre class="diff" id="removed">- <td class="smallText"><?php echo osc_draw_input_field('products_url[' . $language['id'] . ']', (isset($pInfo) && is_array($pInfo->products_url) && isset($pInfo->products_url[$language['id']]) ? $pInfo->products_url[$language['id']] : '')); ?></td>
</pre><pre class="diff" id="added">+ <td class="smallText"><?php echo osc_draw_input_field('products_url[' . $l['id'] . ']', (isset($pInfo) && is_array($pInfo->products_url) && isset($pInfo->products_url[$l['id']]) ? $pInfo->products_url[$l['id']] : '')); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
<script type="text/javascript"><!--
</pre><pre class="diff" id="removed">- var fckpd_<?php echo $language['code']; ?> = new FCKeditor('fckpd_<?php echo $language['code']; ?>');
- fckpd_<?php echo $language['code']; ?>.BasePath = "<?php echo DIR_WS_CATALOG . 'admin/external/FCKeditor/2.0b1/'; ?>";
- fckpd_<?php echo $language['code']; ?>.Height = "400";
- fckpd_<?php echo $language['code']; ?>.ReplaceTextarea();
</pre><pre class="diff" id="added">+ var fckpd_<?php echo $l['code']; ?> = new FCKeditor('fckpd_<?php echo $l['code']; ?>');
+ fckpd_<?php echo $l['code']; ?>.BasePath = "<?php echo DIR_WS_CATALOG . 'admin/external/FCKeditor/2.0b1/'; ?>";
+ fckpd_<?php echo $l['code']; ?>.Height = "400";
+ fckpd_<?php echo $l['code']; ?>.ReplaceTextarea();
</pre><pre class="diff" id="context"> //--></script>
</div>
</pre><pre class="diff"><small id="info">@@ -442,7 +442,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qoptions = $osC_Database->query('select products_options_id, products_options_name from :table_products_options where language_id = :language_id order by products_options_name');
$Qoptions->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
</pre><pre class="diff" id="removed">- $Qoptions->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qoptions->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qoptions->execute();
while ($Qoptions->next()) {
</pre><pre class="diff"><small id="info">@@ -452,7 +452,7 @@
</small></pre><pre class="diff" id="context"> $Qvalues->bindTable(':table_products_options_values', TABLE_PRODUCTS_OPTIONS_VALUES);
$Qvalues->bindTable(':table_products_options_values_to_products_options', TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS);
$Qvalues->bindInt(':products_options_id', $Qoptions->valueInt('products_options_id'));
</pre><pre class="diff" id="removed">- $Qvalues->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qvalues->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qvalues->execute();
while ($Qvalues->next()) {
</pre><pre class="diff"><small id="info">@@ -477,8 +477,8 @@
</small></pre><pre class="diff" id="context"> $Qattributes->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
$Qattributes->bindTable(':table_products_options_values', TABLE_PRODUCTS_OPTIONS_VALUES);
$Qattributes->bindInt(':products_id', $_GET['pID']);
</pre><pre class="diff" id="removed">- $Qattributes->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qattributes->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qattributes->bindInt(':language_id', $osC_Language->getID());
+ $Qattributes->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qattributes->execute();
$current_attribute_group = '';
</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>products_expected.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_expected.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/products_expected.php.diff?r1=1.2&r2=1.3">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_expected.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
--- products_expected.php 2004/08/02 12:35:56 1.2
+++ products_expected.php 2005/04/28 07:40:29 1.3
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> $Qproducts = $osC_Database->query('select p.products_id, p.products_date_available, pd.products_name from :table_products p, :table_products_description pd where p.products_date_available is not null and p.products_id = pd.products_id and pd.language_id = :language_id order by p.products_date_available');
$Qproducts->bindTable(':table_products', TABLE_PRODUCTS);
$Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qproducts->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qproducts->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qproducts->execute();
</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>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.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- products_preview.php 2004/11/20 02:16:50 1.5
+++ products_preview.php 2005/04/28 07:40:29 1.6
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -55,8 +55,8 @@
</small></pre><pre class="diff" id="context"> <tr bgcolor="#fff3e7">
<td>
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo '<span id="lang_' . $language['code'] . '"' . (($language['directory'] == $osC_Session->value('language')) ? ' class="highlight"' : '') . '><a href="javascript:toggleDivBlocks(\'pName_\', \'pName_' . $language['code'] . '\'); toggleClass(\'lang_\', \'lang_' . $language['code'] . '\', \'highlight\', \'span\');">' . tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '</a></span>&nbsp;&nbsp;';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo '<span id="lang_' . $l['code'] . '"' . (($l['directory'] == $osC_Language->getDirectory()) ? ' class="highlight"' : '') . '><a href="javascript:toggleDivBlocks(\'pName_\', \'pName_' . $l['code'] . '\'); toggleClass(\'lang_\', \'lang_' . $l['code'] . '\', \'highlight\', \'span\');">' . tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '</a></span>&nbsp;&nbsp;';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -64,22 +64,22 @@
</small></pre><pre class="diff" id="context"> </table>
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $l<span id="removedchars">anguage</span>) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
</pre><pre class="diff" id="context"> ?>
</pre><pre class="diff" id="removed">-<div id="pName_<?php echo $language['code']; ?>" <?php echo (($language['directory'] != $osC_Session->value('language')) ? ' style="display: none;"' : ''); ?>>
</pre><pre class="diff" id="added">+<div id="pName_<?php echo $l['code']; ?>" <?php echo (($l['directory'] != $osC_Language->getDirectory()) ? ' style="display: none;"' : ''); ?>>
</pre><pre class="diff" id="context"> <table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
</pre><pre class="diff" id="removed">- <td><h1><?php echo $pInfo->products_name[$l<span id="removedchars">anguage</span>['id']]; ?></h1></td>
</pre><pre class="diff" id="added">+ <td><h1><?php echo $pInfo->products_name[$l['id']]; ?></h1></td>
</pre><pre class="diff" id="context"> <td align="right"><h1><?php echo $osC_Currencies->format($pInfo->products_price); ?></h1></td>
</tr>
</table>
</pre><pre class="diff" id="removed">- <p class="main"><?php echo tep_image('../images/' . $products_image_name, $pInfo->products_name[$language['id']], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . $pInfo->products_description[$language['id']]; ?></p>
</pre><pre class="diff" id="added">+ <p class="main"><?php echo tep_image('../images/' . $products_image_name, $pInfo->products_name[$l['id']], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . $pInfo->products_description[$l['id']]; ?></p>
</pre><pre class="diff" id="context">
<?php
</pre><pre class="diff" id="removed">- if (!empty($pInfo->products_url[$language['id']])) {
- echo '<p class="main">' . sprintf(TEXT_PRODUCT_MORE_INFORMATION, $pInfo->products_url[$language['id']]) . '</p>';
</pre><pre class="diff" id="added">+ if (!empty($pInfo->products_url[$l['id']])) {
+ echo '<p class="main">' . sprintf(TEXT_PRODUCT_MORE_INFORMATION, $pInfo->products_url[$l['id']]) . '</p>';
</pre><pre class="diff" id="context"> }
?>
</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>specials.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials.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/specials.php.diff?r1=1.1&r2=1.2">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials.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
--- specials.php 2004/07/22 23:30:50 1.1
+++ specials.php 2005/04/28 07:40:29 1.2
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -29,7 +29,7 @@
</small></pre><pre class="diff" id="context"> $Qspecials->bindTable(':table_specials', TABLE_SPECIALS);
$Qspecials->bindTable(':table_products', TABLE_PRODUCTS);
$Qspecials->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
</pre><pre class="diff" id="removed">- $Qspecials->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qspecials->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qspecials->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qspecials->execute();
</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>specials_edit.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials_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/specials_edit.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/specials_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
--- specials_edit.php 2004/10/31 09:43:35 1.3
+++ specials_edit.php 2005/04/28 07:40:29 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -16,7 +16,7 @@
</small></pre><pre class="diff" id="context"> $Qspecial->bindTable(':table_products', TABLE_PRODUCTS);
$Qspecial->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
$Qspecial->bindInt(':specials_id', $_GET['sID']);
</pre><pre class="diff" id="removed">- $Qspecial->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qspecial->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qspecial->execute();
$sInfo = new objectInfo($Qspecial->toArray());
</pre><pre class="diff"><small id="info">@@ -27,7 +27,7 @@
</small></pre><pre class="diff" id="context"> $Qspecials->bindTable(':table_products', TABLE_PRODUCTS);
$Qspecials->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
$Qspecials->bindTable(':table_specials', TABLE_SPECIALS);
</pre><pre class="diff" id="removed">- $Qspecials->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qspecials->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qspecials->execute();
while ($Qspecials->next()) {
</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>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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php.diff?r1=1.3&r2=1.4">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.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
--- weight_classes.php 2004/11/20 02:16:50 1.3
+++ weight_classes.php 2005/04/28 07:40:29 1.4
@@ -5,7 +5,7 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">4</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff"><small id="info">@@ -26,7 +26,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qclasses = $osC_Database->query('select weight_class_id, weight_class_key, weight_class_title from :table_weight_classes where language_id = :language_id order by weight_class_title');
$Qclasses->bindTable(':table_weight_classes', TABLE_WEIGHT_CLASS);
</pre><pre class="diff" id="removed">- $Qclasses->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qclasses->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qclasses->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
$Qclasses->execute();
</pre><pre class="diff"><small id="info">@@ -88,8 +88,8 @@
</small></pre><pre class="diff" id="context"> <td class="smallText" width="40%"><?php echo '<b>' . TEXT_INFO_WEIGHT_CLASS_TITLE . '</b>'; ?></td>
<td class="smallText" width="60%">
<?php
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $language['id'] . ']') . osc_draw_input_field('weight_class_key[' . $language['id'] . ']', '', 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l['id'] . ']') . osc_draw_input_field('weight_class_key[' . $l['id'] . ']', '', 'size="4"') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -101,7 +101,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qrules = $osC_Database->query('select weight_class_id, weight_class_title from :table_weight_classes where language_id = :language_id order by weight_class_title');
$Qrules->bindTable(':table_weight_classes', TABLE_WEIGHT_CLASS);
</pre><pre class="diff" id="removed">- $Qrules->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qrules->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qrules->execute();
while ($Qrules->next()) {
</pre><pre class="diff"><small id="info">@@ -153,8 +153,8 @@
</small></pre><pre class="diff" id="context"> 'title' => $Qwc->value('weight_class_title'));
}
</pre><pre class="diff" id="removed">- foreach ($osC_Language->getAll() as $language) {
- echo tep_image('../includes/languages/' . $language['directory'] . '/images/' . $language['image'], $language['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $language['id'] . ']', $class_name[$language['id']]['title']) . osc_draw_input_field('weight_class_key[' . $language['id'] . ']', $class_name[$language['id']]['key'], 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $l) {
+ echo tep_image('../includes/languages/' . $l['directory'] . '/images/' . $l['image'], $l['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l['id'] . ']', $class_name[$l['id']]['title']) . osc_draw_input_field('weight_class_key[' . $l['id'] . ']', $class_name[$l['id']]['key'], 'size="4"') . '<br>';
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -169,7 +169,7 @@
</small></pre><pre class="diff" id="context"> $Qrules->bindTable(':table_weight_classes', TABLE_WEIGHT_CLASS);
$Qrules->bindInt(':weight_class_from_id', $wcInfo->weight_class_id);
$Qrules->bindInt(':weight_class_to_id', $wcInfo->weight_class_id);
</pre><pre class="diff" id="removed">- $Qrules->bindInt(':language_id', $osC_Session->value('languages_id'));
</pre><pre class="diff" id="added">+ $Qrules->bindInt(':language_id', $osC_Language->getID());
</pre><pre class="diff" id="context"> $Qrules->execute();
while ($Qrules->next()) {
</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>
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix