[TEP-COMMIT] [CVS catalog] use the new database class
hpdl-OfajU3CKLf1/[email protected] 30 Mar 2005 00:26:39 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog/includes/modules</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">address_book_details.php</a></tt></td><td align="right" id="added">+14</td><td align="right" id="removed">-14</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php?rev=1.13&content-type=text/vnd.viewcvs-markup">1.13</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php.diff?r1=1.13&r2=1.14">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php?rev=1.14&content-type=text/vnd.viewcvs-markup">1.14</a></td></tr>
</table>
<pre class="comment">
use the new database class
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a><br /></span>
<div class="fileheader"><big><b>address_book_details.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php?rev=1.13&content-type=text/vnd.viewcvs-markup">1.13</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php.diff?r1=1.13&r2=1.14">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/address_book_details.php?rev=1.14&content-type=text/vnd.viewcvs-markup">1.14</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.13 -r1.14
--- address_book_details.php 2004/07/22 21:50:40 1.13
+++ address_book_details.php 2005/03/30 00:26:37 1.14
@@ -18,50 +18,50 @@
</small></pre><pre class="diff" id="context"> ?>
<tr>
<td class="main"><?php echo ENTRY_GENDER; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_radio_field('gender', $gender_array, (isset($<span id="removedchars">entry['entry_gender']) ? $entry['entry_gender']</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->gender : '')), '', (ACCOUNT_GENDER > 0)); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_radio_field('gender', $gender_array, (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_gender')</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->gender : '')), '', (ACCOUNT_GENDER > 0)); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
}
?>
<tr>
<td class="main"><?php echo ENTRY_FIRST_NAME; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('firstname', (isset($<span id="removedchars">entry['entry_firstname']) ? $entry['entry_firstname']</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->first_name : '')), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('firstname', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_firstname')</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->first_name : '')), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<tr>
<td class="main"><?php echo ENTRY_LAST_NAME; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('lastname', (isset($<span id="removedchars">entry['entry_lastname']) ? $entry['entry_lastname']</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->last_name : '')), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('lastname', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_lastname')</span> : (($osC_Customer->hasDefaultAddress() === false) ? $osC_Customer->last_name : '')), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
if (ACCOUNT_COMPANY > -1) {
?>
<tr>
<td class="main"><?php echo ENTRY_COMPANY; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('company', (isset($<span id="removedchars">entry['entry_company']) ? $entry['entry_company']</span> : ''), '', (ACCOUNT_COMPANY > 0)); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('company', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_company')</span> : ''), '', (ACCOUNT_COMPANY > 0)); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
}
?>
<tr>
<td class="main"><?php echo ENTRY_STREET_ADDRESS; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('street_address', (isset($entry['entry_street_address']) ? $entry['entry_street_address'] : ''), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('street_address', (isset($Qentry) ? $Qentry->value('entry_street_address') : ''), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
if (ACCOUNT_SUBURB > -1) {
?>
<tr>
<td class="main"><?php echo ENTRY_SUBURB; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('suburb', (isset($<span id="removedchars">entry['entry_suburb']) ? $entry['entry_suburb']</span> : ''), '', (ACCOUNT_SUBURB > 0)); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('suburb', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_suburb')</span> : ''), '', (ACCOUNT_SUBURB > 0)); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
}
?>
<tr>
<td class="main"><?php echo ENTRY_POST_CODE; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('postcode', (isset($<span id="removedchars">entry['entry_postcode']) ? $entry['entry_postcode']</span> : ''), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('postcode', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_postcode')</span> : ''), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<tr>
<td class="main"><?php echo ENTRY_CITY; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('city', (isset($<span id="removedchars">entry['entry_city']) ? $entry['entry_city']</span> : ''), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('city', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_city')</span> : ''), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
if (ACCOUNT_STATE > -1) {
</pre><pre class="diff"><small id="info">@@ -70,7 +70,7 @@
</small></pre><pre class="diff" id="context"> <td class="main"><?php echo ENTRY_STATE; ?></td>
<td class="main">
<?php
</pre><pre class="diff" id="removed">- if (isset($_POST['action']) && (($_POST['action'] == 'process') || ($_POST['action'] == 'update'))) {
</pre><pre class="diff" id="added">+ if ( (isset($_GET['new']) && ($_GET['new'] == 'save')) || (isset($_GET['edit']) && ($_GET['edit'] == 'save')) ) {
</pre><pre class="diff" id="context"> if ($entry_state_has_zones === true) {
$Qzones = $osC_Database->query('select zone_name from :table_zones where zone_country_id = :zone_country_id order by zone_name');
$Qzones->bindRaw(':table_zones', TABLE_ZONES);
</pre><pre class="diff"><small id="info">@@ -87,7 +87,7 @@
</small></pre><pre class="diff" id="context"> echo osc_draw_input_field('state', '', '', (ACCOUNT_STATE > 0));
}
} else {
</pre><pre class="diff" id="removed">- echo osc_draw_input_field('state', (isset($entry['entry_country_id']) ? tep_get_zone_name($entry['entry_country_id'], $entry['entry_zone_id'], $entry['entry_state']) : ''), '', (ACCOUNT_STATE > 0));
</pre><pre class="diff" id="added">+ echo osc_draw_input_field('state', (isset($Qentry) ? tep_get_zone_name($Qentry->valueInt('entry_country_id'), $Qentry->valueInt('entry_zone_id'), $Qentry->value('entry_state')) : ''), '', (ACCOUNT_STATE > 0));
</pre><pre class="diff" id="context"> }
?>
</td>
</pre><pre class="diff"><small id="info">@@ -97,14 +97,14 @@
</small></pre><pre class="diff" id="context"> ?>
<tr>
<td class="main"><?php echo ENTRY_COUNTRY; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo tep_get_country_list('country', (isset($<span id="removedchars">entry['entry_country_id']) ? $entry['entry_country_id']</span> : STORE_COUNTRY), '', true); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo tep_get_country_list('country', (isset($<span id="addedchars">Qentry) ? $Qentry->valueInt('entry_country_id')</span> : STORE_COUNTRY), '', true); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
if (ACCOUNT_TELEPHONE > -1) {
?>
<tr>
<td class="main"><?php echo ENTRY_TELEPHONE_NUMBER; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('telephone', (isset($<span id="removedchars">entry['entry_telephone']) ? $entry['entry_telephone']</span> : ''), '', (ACCOUNT_TELEPHONE > 0)); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('telephone', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_telephone')</span> : ''), '', (ACCOUNT_TELEPHONE > 0)); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
}
</pre><pre class="diff"><small id="info">@@ -114,13 +114,13 @@
</small></pre><pre class="diff" id="context"> ?>
<tr>
<td class="main"><?php echo ENTRY_FAX_NUMBER; ?></td>
</pre><pre class="diff" id="removed">- <td class="main"><?php echo osc_draw_input_field('fax', (isset($<span id="removedchars">entry['entry_fax']) ? $entry['entry_fax']</span> : ''), '', (ACCOUNT_FAX > 0)); ?></td>
</pre><pre class="diff" id="added">+ <td class="main"><?php echo osc_draw_input_field('fax', (isset($<span id="addedchars">Qentry) ? $Qentry->value('entry_fax')</span> : ''), '', (ACCOUNT_FAX > 0)); ?></td>
</pre><pre class="diff" id="context"> </tr>
<?php
}
?>
<?php
</pre><pre class="diff" id="removed">- if ($osC_Customer->hasDefaultAddress() && ((isset($_GET['edit']) && ($osC_Customer->default_address_id != $_GET['<span id="removedchars">edit'])) || (isset($_GET['edit']) == false</span>)) ) {
</pre><pre class="diff" id="added">+ if ($osC_Customer->hasDefaultAddress() && ((isset($_GET['edit']) && ($osC_Customer->default_address_id != $_GET['<span id="addedchars">address_book'])) || isset($_GET['new']</span>)) ) {
</pre><pre class="diff" id="context"> ?>
<tr>
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></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>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click