[TEP-COMMIT] [CVS admin] replace calls to the tep_get_languages() function with the new getAll()
hpdl-OfajU3CKLf1/[email protected] 20 Nov 2004 02:16:55 -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">+3</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.158&content-type=text/vnd.viewcvs-markup">1.158</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.158&r2=1.159">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.159&content-type=text/vnd.viewcvs-markup">1.159</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">define_language.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php?rev=1.19&content-type=text/vnd.viewcvs-markup">1.19</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.19&r2=1.20">-></a> <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></td></tr>
<tr><td><tt><a href="#file3">manufacturers.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.61&r2=1.62">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.62&content-type=text/vnd.viewcvs-markup">1.62</a></td></tr>
<tr class="alt"><td><tt><a href="#file4">orders_status.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php?rev=1.24&content-type=text/vnd.viewcvs-markup">1.24</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php.diff?r1=1.24&r2=1.25">-></a> <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></td></tr>
<tr><td><tt><a href="#file5">products.php</a></tt></td><td align="right" id="added">+5</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.17&content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.17&r2=1.18">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a></td></tr>
<tr class="alt"><td><tt><a href="#file6">products_attributes.php</a></tt></td><td align="right" id="added">+6</td><td align="right" id="removed">-10</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php?rev=1.56&content-type=text/vnd.viewcvs-markup">1.56</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php.diff?r1=1.56&r2=1.57">-></a> <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></td></tr>
<tr><td><tt><a href="#file7">weight_classes.php</a></tt></td><td align="right" id="added">+4</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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/weight_classes.php.diff?r1=1.3&r2=1.4">-></a> <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></td></tr>
<tr class="alt"><td><tt>includes/<a href="#file8">application_top.php</a></tt></td><td align="right" id="added">+10</td><td align="right" id="removed">-10</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.180&content-type=text/vnd.viewcvs-markup">1.180</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.180&r2=1.181">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.181&content-type=text/vnd.viewcvs-markup">1.181</a></td></tr>
<tr><td><tt>includes/functions/<a href="#file9">general.php</a></tt></td><td></td><td align="right" id="removed">-20</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.175&content-type=text/vnd.viewcvs-markup">1.175</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.175&r2=1.176">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.176&content-type=text/vnd.viewcvs-markup">1.176</a></td></tr>
<tr class="alt"><td><tt>templates/default/<a href="#file10">header.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.7&r2=1.8">-></a> <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></td></tr>
<tr><td><tt>templates/pages/<a href="#file11">categories.php</a></tt></td><td align="right" id="added">+4</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.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.5&r2=1.6">-></a> <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></td></tr>
<tr class="alt"><td><tt> /<a href="#file12">manufacturers.php</a></tt></td><td align="right" id="added">+4</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/manufacturers.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/manufacturers.php.diff?r1=1.3&r2=1.4">-></a> <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></td></tr>
<tr><td><tt> /<a href="#file13">orders_status.php</a></tt></td><td align="right" id="added">+4</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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php.diff?r1=1.2&r2=1.3">-></a> <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></td></tr>
<tr class="alt"><td><tt> /<a href="#file14">products_attributes.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php?rev=1.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php.diff?r1=1.2&r2=1.3">-></a> <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></td></tr>
<tr><td><tt> /<a href="#file15">products_attributes_listing.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.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_attributes_listing.php.diff?r1=1.2&r2=1.3">-></a> <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></td></tr>
<tr class="alt"><td><tt> /<a href="#file16">products_edit.php</a></tt></td><td align="right" id="added">+11</td><td align="right" id="removed">-13</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.4&r2=1.5">-></a> <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></td></tr>
<tr><td><tt> /<a href="#file17">products_preview.php</a></tt></td><td align="right" id="added">+8</td><td align="right" id="removed">-10</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php?rev=1.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.4&r2=1.5">-></a> <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></td></tr>
<tr class="alt"><td><tt> /<a href="#file18">weight_classes.php</a></tt></td><td align="right" id="added">+4</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/weight_classes.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/weight_classes.php.diff?r1=1.2&r2=1.3">-></a> <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></td></tr>
<tr><td></td><td align="right" id="added">+86</td><td align="right" id="removed">-135</td><td></td></tr>
</table>
<small id="info">18 modified files</small><br />
<pre class="comment">
replace calls to the tep_get_languages() function with the new getAll()
language class method
</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.158&content-type=text/vnd.viewcvs-markup">1.158</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php.diff?r1=1.158&r2=1.159">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/categories.php?rev=1.159&content-type=text/vnd.viewcvs-markup">1.159</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.158 -r1.159
--- categories.php 2004/11/07 21:00:29 1.158
+++ categories.php 2004/11/20 02:16:45 1.159
@@ -64,9 +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">- $languages = tep_get_languages();
-
- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -74,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', $l_entry['id']);
- $Qcd->bindValue(':categories_name', $_POST['categories_name'][$l_entry['id']]);
</pre><pre class="diff" id="added">+ $Qcd->bindInt(':language_id', $language['id']);
+ $Qcd->bindValue(':categories_name', $_POST['categories_name'][$language['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.19&content-type=text/vnd.viewcvs-markup">1.19</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/define_language.php.diff?r1=1.19&r2=1.20">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.19 -r1.20
--- define_language.php 2004/11/07 21:00:29 1.19
+++ define_language.php 2004/11/20 02:16:45 1.20
@@ -19,15 +19,14 @@
</small></pre><pre class="diff" id="context"> $lng = (isset($_GET['lng']) ? $_GET['lng'] : $osC_Session->value('language'));
$languages_array = array();
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
</pre><pre class="diff" id="context"> $exists = false;
</pre><pre class="diff" id="removed">- for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
- if ($languages[$i]['directory'] == $lng) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
+ if ($language['directory'] == $lng) {
</pre><pre class="diff" id="context"> $exists = true;
}
</pre><pre class="diff" id="removed">- $languages_array[] = array('id' => $languages[$i]['directory'],
- 'text' => $languages[$i]['name']);
</pre><pre class="diff" id="added">+ $languages_array[] = array('id' => $language['directory'],
+ 'text' => $language['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.61&content-type=text/vnd.viewcvs-markup">1.61</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php.diff?r1=1.61&r2=1.62">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/manufacturers.php?rev=1.62&content-type=text/vnd.viewcvs-markup">1.62</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.61 -r1.62
--- manufacturers.php 2004/11/07 21:00:30 1.61
+++ manufacturers.php 2004/11/20 02:16:46 1.62
@@ -58,8 +58,7 @@
</small></pre><pre class="diff" id="context"> }
if ($error === false) {
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -67,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', $l_entry['id']);
- $Qurl->bindValue(':manufacturers_url', $_POST['manufacturers_url'][$l_entry['id']]);
</pre><pre class="diff" id="added">+ $Qurl->bindInt(':languages_id', $language['id']);
+ $Qurl->bindValue(':manufacturers_url', $_POST['manufacturers_url'][$language['id']]);
</pre><pre class="diff" id="context"> $Qurl->execute();
if ($osC_Database->isError()) {
</pre><pre class="diff"><small id="info">@@ -81,7 +80,7 @@
</small></pre><pre class="diff" id="context"> if ($error === false) {
$osC_Database->commitTransaction();
</pre><pre class="diff" id="removed">- osC_Cache::<span id="removedchars">reset</span>('manufacturers');
</pre><pre class="diff" id="added">+ osC_Cache::<span id="addedchars">clear</span>('manufacturers');
</pre><pre class="diff" id="context">
$osC_MessageStack->add_session('header', SUCCESS_DB_ROWS_UPDATED, 'success');
} else {
</pre><pre class="diff"><small id="info">@@ -133,7 +132,7 @@
</small></pre><pre class="diff" id="context"> $Qupdate->execute();
}
</pre><pre class="diff" id="removed">- osC_Cache::<span id="removedchars">reset</span>('manufacturers');
</pre><pre class="diff" id="added">+ osC_Cache::<span id="addedchars">clear</span>('manufacturers');
</pre><pre class="diff" id="context">
$osC_MessageStack->add_session('header', SUCCESS_DB_ROWS_UPDATED, 'success');
}
</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>orders_status.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php?rev=1.24&content-type=text/vnd.viewcvs-markup">1.24</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/orders_status.php.diff?r1=1.24&r2=1.25">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.24 -r1.25
--- orders_status.php 2004/10/28 18:59:50 1.24
+++ orders_status.php 2004/11/20 02:16:46 1.25
@@ -23,8 +23,6 @@
</small></pre><pre class="diff" id="context"> if (!empty($action)) {
switch ($action) {
case 'save':
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> if (isset($_GET['osID']) && is_numeric($_GET['osID'])) {
$orders_status_id = $_GET['osID'];
} else {
</pre><pre class="diff"><small id="info">@@ -39,7 +37,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -47,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'][$l_entry['id']]);
- $Qstatus->bindInt(':language_id', $l_entry['id']);
</pre><pre class="diff" id="added">+ $Qstatus->bindValue(':orders_status_name', $_POST['orders_status_name'][$language['id']]);
+ $Qstatus->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="context"> $Qstatus->execute();
if ($osC_Database->isError()) {
</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>products.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php.diff?r1=1.17&r2=1.18">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.17 -r1.18
--- products.php 2004/11/07 21:00:30 1.17
+++ products.php 2004/11/20 02:16:46 1.18
@@ -183,8 +183,7 @@
</small></pre><pre class="diff" id="context"> }
if ($error === false) {
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -192,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', $l_entry['id']);
- $Qpd->bindValue(':products_name', $_POST['products_name'][$l_entry['id']]);
- $Qpd->bindValue(':products_description', $_POST['products_description'][$l_entry['id']]);
- $Qpd->bindValue(':products_url', $_POST['products_url'][$l_entry['id']]);
</pre><pre class="diff" id="added">+ $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="context"> $Qpd->execute();
if ($osC_Database->isError()) {
</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>products_attributes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php?rev=1.56&content-type=text/vnd.viewcvs-markup">1.56</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/products_attributes.php.diff?r1=1.56&r2=1.57">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.56 -r1.57
--- products_attributes.php 2004/10/28 18:59:51 1.56
+++ products_attributes.php 2004/11/20 02:16:46 1.57
@@ -39,8 +39,6 @@
</small></pre><pre class="diff" id="context">
$selected_box = 'catalog';
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> $action = (isset($_GET['action']) ? $_GET['action'] : '');
if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
</pre><pre class="diff"><small id="info">@@ -56,7 +54,6 @@
</small></pre><pre class="diff" id="context"> if (!empty($action)) {
switch ($action) {
case 'saveGroup':
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
</pre><pre class="diff" id="context"> $error = false;
if (isset($_GET['paID']) && is_numeric($_GET['paID'])) {
</pre><pre class="diff"><small id="info">@@ -71,7 +68,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -79,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'][$l_entry['id']]);
- $Qgroup->bindInt(':language_id', $l_entry['id']);
</pre><pre class="diff" id="added">+ $Qgroup->bindValue(':products_options_name', $_POST['group_name'][$language['id']]);
+ $Qgroup->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="context"> $Qgroup->execute();
if ($osC_Database->isError()) {
</pre><pre class="diff"><small id="info">@@ -167,7 +164,6 @@
</small></pre><pre class="diff" id="context"> if (!empty($entriesAction)) {
switch ($entriesAction) {
case 'saveGroupEntry':
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
</pre><pre class="diff" id="context"> $error = false;
if (isset($_GET['paeID']) && is_numeric($_GET['paeID'])) {
</pre><pre class="diff"><small id="info">@@ -182,7 +178,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -190,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'][$l_entry['id']]);
- $Qentry->bindInt(':language_id', $l_entry['id']);
</pre><pre class="diff" id="added">+ $Qentry->bindValue(':products_options_values_name', $_POST['entry_name'][$language['id']]);
+ $Qentry->bindInt(':language_id', $language['id']);
</pre><pre class="diff" id="context"> $Qentry->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>weight_classes.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/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/weight_classes.php.diff?r1=1.3&r2=1.4">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- weight_classes.php 2004/10/28 18:59:52 1.3
+++ weight_classes.php 2004/11/20 02:16:46 1.4
@@ -23,8 +23,6 @@
</small></pre><pre class="diff" id="context"> if (!empty($action)) {
switch ($action) {
case 'save':
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> if (isset($_GET['wcID']) && is_numeric($_GET['wcID'])) {
$weight_class_id = $_GET['wcID'];
} else {
</pre><pre class="diff"><small id="info">@@ -39,7 +37,7 @@
</small></pre><pre class="diff" id="context">
$osC_Database->startTransaction();
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</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">@@ -47,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', $l_entry['id']);
- $Qwc->bindValue(':weight_class_key', $_POST['weight_class_key'][$l_entry['id']]);
- $Qwc->bindValue(':weight_class_title', $_POST['weight_class_title'][$l_entry['id']]);
</pre><pre class="diff" id="added">+ $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="context"> $Qwc->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>/<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.180&content-type=text/vnd.viewcvs-markup">1.180</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.180&r2=1.181">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.181&content-type=text/vnd.viewcvs-markup">1.181</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.180 -r1.181
--- application_top.php 2004/11/07 21:00:34 1.180
+++ application_top.php 2004/11/20 02:16:48 1.181
@@ -91,18 +91,18 @@
</small></pre><pre class="diff" id="context"> $osC_Session->start();
// set the language
</pre><pre class="diff" id="removed">- if (($osC_Session->exists('language') == false) || isset($_GET['language'])) {
- include('../includes/classes/language.php');
- $lng = new language;
</pre><pre class="diff" id="added">+ require('../includes/classes/language.php');
+ $osC_Language = new language();
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- if (isset($_GET['language']) && tep_not_null($_GET['language'])) {
- $lng->set_language($_GET['language']);
- } else {
- $lng->get_browser_language();
- }
</pre><pre class="diff" id="added">+ if (isset($_GET['language']) && !empty($_GET['language'])) {
+ $osC_Language->set_language($_GET['language']);
+ } elseif ($osC_Session->exists('language') == false) {
+ $osC_Language->get_browser_language();
+ }
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- $osC_Session->set('language', $lng->language['directory']);
- $osC_Session->set('languages_id', $lng->language['id']);
</pre><pre class="diff" id="added">+ if ( ($osC_Session->exists('language') == false) || ($osC_Session->value('language') != $osC_Language->language['directory']) ) {
+ $osC_Session->set('language', $osC_Language->language['directory']);
+ $osC_Session->set('languages_id', $osC_Language->language['id']);
</pre><pre class="diff" id="context"> }
require('includes/languages/' . $osC_Session->value('language') . '.php');
</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>/<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.175&content-type=text/vnd.viewcvs-markup">1.175</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php.diff?r1=1.175&r2=1.176">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/functions/general.php?rev=1.176&content-type=text/vnd.viewcvs-markup">1.176</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.175 -r1.176
--- general.php 2004/11/07 21:00:36 1.175
+++ general.php 2004/11/20 02:16:48 1.176
@@ -280,26 +280,6 @@
</small></pre><pre class="diff" id="context"> return $pieces[0];
}
</pre><pre class="diff" id="removed">- function tep_get_languages() {
- global $osC_Database;
-
- $languages_array = array();
-
- $Qlanguages = $osC_Database->query('select languages_id, name, code, image, directory from :table_languages order by sort_order, name');
- $Qlanguages->bindTable(':table_languages', TABLE_LANGUAGES);
- $Qlanguages->execute();
-
- while ($Qlanguages->next()) {
- $languages_array[] = array('id' => $Qlanguages->valueInt('languages_id'),
- 'name' => $Qlanguages->value('name'),
- 'code' => $Qlanguages->value('code'),
- 'image' => $Qlanguages->value('image'),
- 'directory' => $Qlanguages->value('directory'));
- }
-
- return $languages_array;
- }
-
</pre><pre class="diff" id="context"> function tep_get_weight_class_title($weight_class_id, $language_id = '') {
global $osC_Database, $osC_Session;
</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/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.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/default/header.php.diff?r1=1.7&r2=1.8">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- header.php 2004/11/07 21:00:45 1.7
+++ header.php 2004/11/20 02:16:49 1.8
@@ -10,8 +10,6 @@
</small></pre><pre class="diff" id="context"> Released under the GNU General Public License
*/
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> if ($osC_MessageStack->size('header') > 0) {
echo $osC_MessageStack->output('header');
}
</pre><pre class="diff"><small id="info">@@ -96,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 ($languages as $l_entry) {
- echo ' [\'' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/icon.gif') . '\', \'' . addslashes($l_entry['name']) . '\', \'' . tep_href_link(FILENAME_DEFAULT, 'language=' . $l_entry['code']) . '\', null, null],' . "\n";
</pre><pre class="diff" id="added">+ 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="context"> }
echo ' ],' . "\n" .
</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/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.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/categories.php.diff?r1=1.5&r2=1.6">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- categories.php 2004/11/07 21:00:46 1.5
+++ categories.php 2004/11/20 02:16:49 1.6
@@ -123,9 +123,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_CATEGORIES_NAME;
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo '<br>' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -193,9 +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">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo '<br>' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('categories_name[' . $l_entry['id'] . ']', (isset($categories_name[$l_entry['id']]) ? $categories_name[$l_entry['id']] : ''));
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</p>
</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/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.3&content-type=text/vnd.viewcvs-markup">1.3</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/manufacturers.php.diff?r1=1.3&r2=1.4">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- manufacturers.php 2004/11/07 21:00:46 1.3
+++ manufacturers.php 2004/11/20 02:16:50 1.4
@@ -92,9 +92,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_MANUFACTURERS_URL;
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo '<br>' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']');
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</p>
</pre><pre class="diff"><small id="info">@@ -122,9 +121,8 @@
</small></pre><pre class="diff" id="context"> <?php
echo TEXT_MANUFACTURERS_URL;
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo '<br>' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('manufacturers_url[' . $l_entry['id'] . ']', tep_get_manufacturer_url($mInfo->manufacturers_id, $l_entry['id']));
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</p>
</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/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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/orders_status.php.diff?r1=1.2&r2=1.3">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- orders_status.php 2004/11/07 21:00:47 1.2
+++ orders_status.php 2004/11/20 02:16:50 1.3
@@ -86,9 +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">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -131,9 +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">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('orders_status_name[' . $l_entry['id'] . ']', (isset($status_name[$l_entry['id']]) ? $status_name[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</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/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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes.php.diff?r1=1.2&r2=1.3">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- products_attributes.php 2004/11/07 21:00:47 1.2
+++ products_attributes.php 2004/11/20 02:16:50 1.3
@@ -43,8 +43,6 @@
</small></pre><pre class="diff" id="context"> <?php
}
*/
</pre><pre class="diff" id="removed">-
- $languages = tep_get_languages();
</pre><pre class="diff" id="context"> ?>
<h1><?php echo HEADING_TITLE;?></h1>
</pre><pre class="diff"><small id="info">@@ -129,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 ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -161,7 +159,7 @@
</small></pre><pre class="diff" id="context"> <?php
$Qgd = $osC_Database->query('select language_id, products_options_name from :table_products_options where products_options_id = :products_options_id');
$Qgd->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
</pre><pre class="diff" id="removed">- $Qgd->bindInt(':products_options_id', $_GET['paID']);
</pre><pre class="diff" id="added">+ $Qgd->bindInt(':products_options_id', $paInfo->products_options_id);
</pre><pre class="diff" id="context"> $Qgd->execute();
$group_names = array();
</pre><pre class="diff"><small id="info">@@ -169,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 ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('group_name[' . $l_entry['id'] . ']', (isset($group_names[$l_entry['id']]) ? $group_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</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/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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_attributes_listing.php.diff?r1=1.2&r2=1.3">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- products_attributes_listing.php 2004/11/07 21:00:47 1.2
+++ products_attributes_listing.php 2004/11/20 02:16:50 1.3
@@ -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 ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']') . '<br>';
</pre><pre class="diff" id="added">+ 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="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 ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/icon.gif', $l_entry['name']) . '&nbsp;' . osc_draw_input_field('entry_name[' . $l_entry['id'] . ']', (isset($entry_names[$l_entry['id']]) ? $entry_names[$l_entry['id']] : '')) . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</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/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.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_edit.php.diff?r1=1.4&r2=1.5">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- products_edit.php 2004/11/07 21:00:48 1.4
+++ products_edit.php 2004/11/20 02:16:50 1.5
@@ -64,8 +64,6 @@
</small></pre><pre class="diff" id="context"> 'text' => $Qwc->value('weight_class_title'));
}
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> require('includes/classes/directory_listing.php');
$osC_Dir_Images = new osC_DirectoryListing('../images');
$osC_Dir_Images->setExcludeEntries('CVS');
</pre><pre class="diff"><small id="info">@@ -256,36 +254,36 @@
</small></pre><pre class="diff" id="context"> //--></script>
<?php
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</pre><pre class="diff" id="context"> ?>
</pre><pre class="diff" id="removed">- <div class="tab-page" id="tabDescriptionLanguages_<?php echo $l_entry['code']; ?>">
- <h2 class="tab"><?php echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . $l_entry['name']; ?></h2>
</pre><pre class="diff" id="added">+ <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="context">
<script type="text/javascript"><!--
</pre><pre class="diff" id="removed">- descriptionTabPane.addTabPage( document.getElementById( "tabDescriptionLanguages_<?php echo $l<span id="removedchars">_entry</span>['code']; ?>" ) );
</pre><pre class="diff" id="added">+ descriptionTabPane.addTabPage( document.getElementById( "tabDescriptionLanguages_<?php echo $l<span id="addedchars">anguage</span>['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[' . $l_entry['id'] . ']', (isset($pInfo) && is_array($pInfo->products_name) && isset($pInfo->products_name[$l_entry['id']]) ? $pInfo->products_name[$l_entry['id']] : '')); ?></td>
</pre><pre class="diff" id="added">+ <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="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[' . $l_entry['id'] . ']', 'soft', '70', '15', (isset($pInfo) && is_array($pInfo->products_description) && isset($pInfo->products_description[$l_entry['id']]) ? $pInfo->products_description[$l_entry['id']] : ''), 'id="fckpd_' . $l_entry['code'] . '" style="width: 100%;"'); ?></td>
</pre><pre class="diff" id="added">+ <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="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[' . $l_entry['id'] . ']', (isset($pInfo) && is_array($pInfo->products_url) && isset($pInfo->products_url[$l_entry['id']]) ? $pInfo->products_url[$l_entry['id']] : '')); ?></td>
</pre><pre class="diff" id="added">+ <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="context"> </tr>
</table>
<script type="text/javascript"><!--
</pre><pre class="diff" id="removed">- var fckpd_<?php echo $l_entry['code']; ?> = new FCKeditor('fckpd_<?php echo $l_entry['code']; ?>');
- fckpd_<?php echo $l_entry['code']; ?>.BasePath = "<?php echo DIR_WS_CATALOG . 'admin/external/FCKeditor/2.0b1/'; ?>";
- fckpd_<?php echo $l_entry['code']; ?>.Height = "400";
- fckpd_<?php echo $l_entry['code']; ?>.ReplaceTextarea();
</pre><pre class="diff" id="added">+ 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="context"> //--></script>
</div>
</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/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.4&content-type=text/vnd.viewcvs-markup">1.4</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/products_preview.php.diff?r1=1.4&r2=1.5">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- products_preview.php 2004/11/07 21:00:48 1.4
+++ products_preview.php 2004/11/20 02:16:50 1.5
@@ -48,8 +48,6 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
-
</pre><pre class="diff" id="context"> echo tep_draw_form('save_product', FILENAME_PRODUCTS, 'cPath=' . $cPath . '&search=' . $_GET['search'] . (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : '') . '&action=save_product', 'post', 'enctype="multipart/form-data"');
?>
</pre><pre class="diff"><small id="info">@@ -57,8 +55,8 @@
</small></pre><pre class="diff" id="context"> <tr bgcolor="#fff3e7">
<td>
<?php
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
- echo '<span id="lang_' . $l_entry['code'] . '"' . (($l_entry['directory'] == $osC_Session->value('language')) ? ' class="highlight"' : '') . '><a href="javascript:toggleDivBlocks(\'pName_\', \'pName_' . $l_entry['code'] . '\'); toggleClass(\'lang_\', \'lang_' . $l_entry['code'] . '\', \'highlight\', \'span\');">' . tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '</a></span>&nbsp;&nbsp;';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -66,22 +64,22 @@
</small></pre><pre class="diff" id="context"> </table>
<?php
</pre><pre class="diff" id="removed">- foreach ($languages as $l_entry) {
</pre><pre class="diff" id="added">+ foreach ($osC_Language->getAll() as $language) {
</pre><pre class="diff" id="context"> ?>
</pre><pre class="diff" id="removed">-<div id="pName_<?php echo $l<span id="removedchars">_entry['code']; ?>" <?php echo (($l_entry</span>['directory'] != $osC_Session->value('language')) ? ' style="display: none;"' : ''); ?>>
</pre><pre class="diff" id="added">+<div id="pName_<?php echo $l<span id="addedchars">anguage['code']; ?>" <?php echo (($language</span>['directory'] != $osC_Session->value('language')) ? ' 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">_entry</span>['id']]; ?></h1></td>
</pre><pre class="diff" id="added">+ <td><h1><?php echo $pInfo->products_name[$l<span id="addedchars">anguage</span>['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[$l_entry['id']], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="right" hspace="5" vspace="5"') . $pInfo->products_description[$l_entry['id']]; ?></p>
</pre><pre class="diff" id="added">+ <p class="main"><?php echo tep_image('../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="context">
<?php
</pre><pre class="diff" id="removed">- if (!empty($pInfo->products_url[$l_entry['id']])) {
- echo '<p class="main">' . sprintf(TEXT_PRODUCT_MORE_INFORMATION, $pInfo->products_url[$l_entry['id']]) . '</p>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</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/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.2&content-type=text/vnd.viewcvs-markup">1.2</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/templates/pages/weight_classes.php.diff?r1=1.2&r2=1.3">-></a> <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></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- weight_classes.php 2004/11/07 21:00:48 1.2
+++ weight_classes.php 2004/11/20 02:16:50 1.3
@@ -88,9 +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">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']') . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', '', 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -154,9 +153,8 @@
</small></pre><pre class="diff" id="context"> 'title' => $Qwc->value('weight_class_title'));
}
</pre><pre class="diff" id="removed">- $languages = tep_get_languages();
- foreach ($languages as $l_entry) {
- echo tep_image('../includes/languages/' . $l_entry['directory'] . '/images/' . $l_entry['image'], $l_entry['name']) . '&nbsp;' . osc_draw_input_field('weight_class_title[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['title']) . osc_draw_input_field('weight_class_key[' . $l_entry['id'] . ']', $class_name[$l_entry['id']]['key'], 'size="4"') . '<br>';
</pre><pre class="diff" id="added">+ 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="context"> }
?>
</td>
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8