[TEP-COMMIT] [CVS catalog] replace calls to tep_draw_* form field functions to osc_draw_*
anonymous-OfajU3CKLf1/[email protected] 22 Jul 2004 17:23:57 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit in catalog/catalog on MAIN
account_newsletters.php +3 -3 1.4 -> 1.5
account_notifications.php +4 -4 1.3 -> 1.4
advanced_search.php +8 -8 1.52 -> 1.53
checkout_confirmation.php +2 -2 1.144 -> 1.145
checkout_payment.php +5 -15 1.117 -> 1.118
checkout_shipping.php +8 -11 1.21 -> 1.22
checkout_success.php +2 -2 1.50 -> 1.51
contact_us.php +4 -4 1.44 -> 1.45
index.php +4 -4 1.7 -> 1.8
login.php +3 -3 1.83 -> 1.84
password_forgotten.php +2 -2 1.51 -> 1.52
product_info.php +3 -3 1.103 -> 1.104
product_reviews_write.php +3 -3 1.58 -> 1.59
shopping_cart.php +4 -4 1.75 -> 1.76
tell_a_friend.php +6 -6 1.43 -> 1.44
+61 -74
15 modified files
replace calls to tep_draw_* form field functions to osc_draw_*
----------
catalog /catalog
account_newsletters.php 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- account_newsletters.php 2003/11/17 20:45:28 1.4
+++ account_newsletters.php 2004/07/22 17:23:52 1.5
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -80,7 +80,7 @@
<!-- left_navigation_eof //-->
</table></td>
<!-- body_text //-->
- <td width="100%" valign="top"><?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL')) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <td width="100%" valign="top"><?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL')) . osc_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
@@ -103,7 +103,7 @@
<td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('newsletter_general')">
- <td class="main"><?php echo tep_draw_checkbox_field('newsletter_general', '1', (($newsletter['customers_newsletter'] == '1') ? true : false), 'onclick="checkBox(\'newsletter_general\')"'); ?></td>
+ <td class="main"><?php echo osc_draw_checkbox_field('newsletter_general', '1', $newsletter['customers_newsletter'], 'onclick="checkBox(\'newsletter_general\')"'); ?></td>
<td class="main"><b><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></b></td>
</tr>
<tr>
----------
catalog /catalog
account_notifications.php 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- account_notifications.php 2003/11/17 20:45:28 1.3
+++ account_notifications.php 2004/07/22 17:23:52 1.4
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -104,7 +104,7 @@
<!-- left_navigation_eof //-->
</table></td>
<!-- body_text //-->
- <td width="100%" valign="top"><?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL')) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <td width="100%" valign="top"><?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL')) . osc_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
@@ -146,7 +146,7 @@
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('product_global')">
- <td class="main" width="30"><?php echo tep_draw_checkbox_field('product_global', '1', (($global['global_product_notifications'] == '1') ? true : false), 'onclick="checkBox(\'product_global\')"'); ?></td>
+ <td class="main" width="30"><?php echo osc_draw_checkbox_field('product_global', '1', $global['global_product_notifications'], 'onclick="checkBox(\'product_global\')"'); ?></td>
<td class="main"><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b></td>
</tr>
<tr>
@@ -190,7 +190,7 @@
while ($products = tep_db_fetch_array($products_query)) {
?>
<tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('products[<?php echo $counter; ?>]')">
- <td class="main" width="30"><?php echo tep_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true, 'onclick="checkBox(\'products[' . $counter . ']\')"'); ?></td>
+ <td class="main" width="30"><?php echo osc_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true, 'onclick="checkBox(\'products[' . $counter . ']\')"'); ?></td>
<td class="main"><b><?php echo $products['products_name']; ?></b></td>
</tr>
<?php
----------
catalog /catalog
advanced_search.php 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- advanced_search.php 2004/04/16 14:05:33 1.52
+++ advanced_search.php 2004/07/22 17:23:52 1.53
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -153,8 +153,8 @@
new infoBoxHeading($info_box_contents, true, true);
$info_box_contents = array();
- $info_box_contents[] = array('text' => tep_draw_input_field('keywords', '', 'style="width: 100%"'));
- $info_box_contents[] = array('align' => 'right', 'text' => tep_draw_checkbox_field('search_in_description', '1') . ' ' . TEXT_SEARCH_IN_DESCRIPTION);
+ $info_box_contents[] = array('text' => osc_draw_input_field('keywords', '', 'style="width: 100%"'));
+ $info_box_contents[] = array('align' => 'right', 'text' => osc_draw_checkbox_field('search_in_description', '1', true) . ' ' . TEXT_SEARCH_IN_DESCRIPTION);
new infoBox($info_box_contents);
?>
@@ -180,29 +180,29 @@
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td class="fieldKey"><?php echo ENTRY_CATEGORIES; ?></td>
- <td class="fieldValue"><?php echo tep_draw_pull_down_menu('categories_id', tep_get_categories(array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)))); ?></td>
+ <td class="fieldValue"><?php echo osc_draw_pull_down_menu('categories_id', tep_get_categories(array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)))); ?></td>
</tr>
<tr>
<td class="fieldKey"> </td>
- <td class="smallText"><?php echo tep_draw_checkbox_field('inc_subcat', '1', true) . ' ' . ENTRY_INCLUDE_SUBCATEGORIES; ?></td>
+ <td class="smallText"><?php echo osc_draw_checkbox_field('inc_subcat', '1', true) . ' ' . ENTRY_INCLUDE_SUBCATEGORIES; ?></td>
</tr>
<tr>
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
<tr>
<td class="fieldKey"><?php echo ENTRY_MANUFACTURERS; ?></td>
- <td class="fieldValue"><?php echo tep_draw_pull_down_menu('manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?></td>
+ <td class="fieldValue"><?php echo osc_draw_pull_down_menu('manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?></td>
</tr>
<tr>
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
<tr>
<td class="fieldKey"><?php echo ENTRY_PRICE_FROM; ?></td>
- <td class="fieldValue"><?php echo tep_draw_input_field('pfrom'); ?></td>
+ <td class="fieldValue"><?php echo osc_draw_input_field('pfrom'); ?></td>
</tr>
<tr>
<td class="fieldKey"><?php echo ENTRY_PRICE_TO; ?></td>
- <td class="fieldValue"><?php echo tep_draw_input_field('pto'); ?></td>
+ <td class="fieldValue"><?php echo osc_draw_input_field('pto'); ?></td>
</tr>
<tr>
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
----------
catalog /catalog
checkout_confirmation.php 1.144 -> 1.145
diff -u -r1.144 -r1.145
--- checkout_confirmation.php 2004/03/18 10:32:52 1.144
+++ checkout_confirmation.php 2004/07/22 17:23:53 1.145
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -306,7 +306,7 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td class="main"><?php echo nl2br(tep_output_string_protected($order->info['comments'])) . tep_draw_hidden_field('comments', $order->info['comments']); ?></td>
+ <td class="main"><?php echo nl2br(tep_output_string_protected($order->info['comments'])) . osc_draw_hidden_field('comments', $order->info['comments']); ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
checkout_payment.php 1.117 -> 1.118
diff -u -r1.117 -r1.118
--- checkout_payment.php 2003/12/17 16:16:16 1.117
+++ checkout_payment.php 2004/07/22 17:23:53 1.118
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -175,7 +175,7 @@
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo TEXT_CONDITIONS_DESCRIPTION . '<br><br>' . tep_draw_checkbox_field('conditions', '1', false, 'id="conditions"') . '<label for="conditions"> ' . TEXT_CONDITIONS_CONFIRM . '</label>'; ?></td>
+ <td class="main"><?php echo TEXT_CONDITIONS_DESCRIPTION . '<br><br>' . osc_draw_checkbox_field('conditions', '1', false, 'id="conditions"') . '<label for="conditions"> ' . TEXT_CONDITIONS_CONFIRM . '</label>'; ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
@@ -253,14 +253,12 @@
$radio_buttons = 0;
for ($i=0, $n=sizeof($selection); $i<$n; $i++) {
- $checked = ($selection[$i]['id'] == $osC_Session->value('payment') ? true : false);
-
?>
<tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td colspan="2"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
- if ( ($checked == true) || ($n == 1) ) {
+ if ( ($n == 1) || ($selection[$i]['id'] == $osC_Session->value('payment')) ) {
echo ' <tr id="defaultSelected" class="moduleRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="selectRowEffect(this, ' . $radio_buttons . ')">' . "\n";
} else {
echo ' <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="selectRowEffect(this, ' . $radio_buttons . ')">' . "\n";
@@ -268,15 +266,7 @@
?>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td class="main" colspan="3"><b><?php echo $selection[$i]['module']; ?></b></td>
- <td class="main" align="right">
-<?php
- if (sizeof($selection) > 1) {
- echo tep_draw_radio_field('payment', $selection[$i]['id'], $checked);
- } else {
- echo tep_draw_hidden_field('payment', $selection[$i]['id']);
- }
-?>
- </td>
+ <td class="main" align="right"><?php echo osc_draw_radio_field('payment', $selection[$i]['id'], $osC_Session->value('payment')); ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
<?php
@@ -338,7 +328,7 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td><?php echo tep_draw_textarea_field('comments', 'soft', '60', '5'); ?></td>
+ <td><?php echo osc_draw_textarea_field('comments', ($osC_Session->exists('comments') ? $osC_Session->value('comments') : '')); ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
checkout_shipping.php 1.21 -> 1.22
diff -u -r1.21 -r1.22
--- checkout_shipping.php 2004/03/16 20:14:22 1.21
+++ checkout_shipping.php 2004/07/22 17:23:53 1.22
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -208,7 +208,7 @@
<!-- left_navigation_eof //-->
</table></td>
<!-- body_text //-->
- <td width="100%" valign="top"><?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL')) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <td width="100%" valign="top"><?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL')) . osc_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr>
@@ -265,7 +265,7 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
- if (sizeof($quotes) > 1 && sizeof($quotes[0]) > 1) {
+ if ( (sizeof($quotes) > 1) && (sizeof($quotes[0]) > 1) ) {
?>
<tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
@@ -296,7 +296,7 @@
</tr>
<tr id="defaultSelected" class="moduleRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="selectRowEffect(this, 0)">
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" width="100%"><?php echo sprintf(FREE_SHIPPING_DESCRIPTION, $osC_Currencies->format(MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER)) . tep_draw_hidden_field('shipping', 'free_free'); ?></td>
+ <td class="main" width="100%"><?php echo sprintf(FREE_SHIPPING_DESCRIPTION, $osC_Currencies->format(MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER)) . osc_draw_hidden_field('shipping', 'free_free'); ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
@@ -326,10 +326,7 @@
<?php
} else {
for ($j=0, $n2=sizeof($quotes[$i]['methods']); $j<$n2; $j++) {
-// set the radio button to be checked if it is the method chosen
- $checked = (($quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'] == $osC_Session->value('shipping')) ? true : false);
-
- if ( ($checked == true) || ( ($n == 1) && ($n2 == 1) ) ) {
+ if ( (($n == 1) && ($n2 == 1)) || ($quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'] == $osC_Session->value('shipping')) ) {
echo ' <tr id="defaultSelected" class="moduleRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="selectRowEffect(this, ' . $radio_buttons . ')">' . "\n";
} else {
echo ' <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="selectRowEffect(this, ' . $radio_buttons . ')">' . "\n";
@@ -341,11 +338,11 @@
if ( ($n > 1) || ($n2 > 1) ) {
?>
<td class="main"><?php echo $osC_Currencies->format(tep_add_tax($quotes[$i]['methods'][$j]['cost'], (isset($quotes[$i]['tax']) ? $quotes[$i]['tax'] : 0))); ?></td>
- <td class="main" align="right"><?php echo tep_draw_radio_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'], $checked); ?></td>
+ <td class="main" align="right"><?php echo osc_draw_radio_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'], $osC_Session->value('shipping')); ?></td>
<?php
} else {
?>
- <td class="main" align="right" colspan="2"><?php echo $osC_Currencies->format(tep_add_tax($quotes[$i]['methods'][$j]['cost'], $quotes[$i]['tax'])) . tep_draw_hidden_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id']); ?></td>
+ <td class="main" align="right" colspan="2"><?php echo $osC_Currencies->format(tep_add_tax($quotes[$i]['methods'][$j]['cost'], $quotes[$i]['tax'])) . osc_draw_hidden_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id']); ?></td>
<?php
}
?>
@@ -385,7 +382,7 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td><?php echo tep_draw_textarea_field('comments', 'soft', '60', '5'); ?></td>
+ <td><?php echo osc_draw_textarea_field('comments', ($osC_Session->exists('comments') ? $osC_Session->value('comments') : '')); ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
checkout_success.php 1.50 -> 1.51
diff -u -r1.50 -r1.51
--- checkout_success.php 2003/11/17 20:58:34 1.50
+++ checkout_success.php 2004/07/22 17:23:53 1.51
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -84,7 +84,7 @@
$products_displayed = array();
for ($i=0, $n=sizeof($products_array); $i<$n; $i++) {
if (!in_array($products_array[$i]['id'], $products_displayed)) {
- echo tep_draw_checkbox_field('notify[]', $products_array[$i]['id']) . ' ' . $products_array[$i]['text'] . '<br>';
+ echo osc_draw_checkbox_field('notify[]', $products_array[$i]['id']) . ' ' . $products_array[$i]['text'] . '<br>';
$products_displayed[] = $products_array[$i]['id'];
}
}
----------
catalog /catalog
contact_us.php 1.44 -> 1.45
diff -u -r1.44 -r1.45
--- contact_us.php 2003/12/03 17:32:53 1.44
+++ contact_us.php 2004/07/22 17:23:53 1.45
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -128,19 +128,19 @@
<td class="main"><?php echo ENTRY_NAME; ?></td>
</tr>
<tr>
- <td class="main"><?php echo tep_draw_input_field('name'); ?></td>
+ <td class="main"><?php echo osc_draw_input_field('name'); ?></td>
</tr>
<tr>
<td class="main"><?php echo ENTRY_EMAIL; ?></td>
</tr>
<tr>
- <td class="main"><?php echo tep_draw_input_field('email'); ?></td>
+ <td class="main"><?php echo osc_draw_input_field('email'); ?></td>
</tr>
<tr>
<td class="main"><?php echo ENTRY_ENQUIRY; ?></td>
</tr>
<tr>
- <td><?php echo tep_draw_textarea_field('enquiry', 'soft', 50, 15); ?></td>
+ <td><?php echo osc_draw_textarea_field('enquiry', '', 50, 15); ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
index.php 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- index.php 2004/04/15 19:15:04 1.7
+++ index.php 2004/07/22 17:23:53 1.8
@@ -239,17 +239,17 @@
if (tep_db_num_rows($filterlist_query) > 1) {
echo ' <td align="center" class="main">' . tep_draw_form('filter', FILENAME_DEFAULT, 'get') . TEXT_SHOW . ' ';
if (isset($_GET['manufacturers_id']) && tep_not_null($_GET['manufacturers_id'])) {
- echo tep_draw_hidden_field('manufacturers_id', $_GET['manufacturers_id']);
+ echo osc_draw_hidden_field('manufacturers_id', $_GET['manufacturers_id']);
$options = array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES));
} else {
- echo tep_draw_hidden_field('cPath', $cPath);
+ echo osc_draw_hidden_field('cPath', $cPath);
$options = array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS));
}
- echo tep_draw_hidden_field('sort', $_GET['sort']);
+ echo osc_draw_hidden_field('sort', $_GET['sort']);
while ($filterlist = tep_db_fetch_array($filterlist_query)) {
$options[] = array('id' => $filterlist['id'], 'text' => $filterlist['name']);
}
- echo tep_draw_pull_down_menu('filter_id', $options, (isset($_GET['filter_id']) ? $_GET['filter_id'] : ''), 'onchange="this.form.submit()"');
+ echo osc_draw_pull_down_menu('filter_id', $options, (isset($_GET['filter_id']) ? $_GET['filter_id'] : ''), 'onchange="this.form.submit()"');
echo '</form></td>' . "\n";
}
}
----------
catalog /catalog
login.php 1.83 -> 1.84
diff -u -r1.83 -r1.84
--- login.php 2004/04/13 08:11:37 1.83
+++ login.php 2004/07/22 17:23:53 1.84
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -171,11 +171,11 @@
</tr>
<tr>
<td class="main"><b><?php echo ENTRY_EMAIL_ADDRESS; ?></b></td>
- <td class="main"><?php echo tep_draw_input_field('email_address'); ?></td>
+ <td class="main"><?php echo osc_draw_input_field('email_address'); ?></td>
</tr>
<tr>
<td class="main"><b><?php echo ENTRY_PASSWORD; ?></b></td>
- <td class="main"><?php echo tep_draw_password_field('password'); ?></td>
+ <td class="main"><?php echo osc_draw_password_field('password'); ?></td>
</tr>
<tr>
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
----------
catalog /catalog
password_forgotten.php 1.51 -> 1.52
diff -u -r1.51 -r1.52
--- password_forgotten.php 2003/11/17 21:04:11 1.51
+++ password_forgotten.php 2004/07/22 17:23:53 1.52
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -99,7 +99,7 @@
<td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
<tr>
- <td class="main"><?php echo '<b>' . ENTRY_EMAIL_ADDRESS . '</b> ' . tep_draw_input_field('email_address'); ?></td>
+ <td class="main"><?php echo '<b>' . ENTRY_EMAIL_ADDRESS . '</b> ' . osc_draw_input_field('email_address'); ?></td>
</tr>
<tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
----------
catalog /catalog
product_info.php 1.103 -> 1.104
diff -u -r1.103 -r1.104
--- product_info.php 2004/03/14 13:55:37 1.103
+++ product_info.php 2004/07/22 17:23:53 1.104
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -147,7 +147,7 @@
?>
<tr>
<td class="main"><?php echo $products_options_name['products_options_name'] . ':'; ?></td>
- <td class="main"><?php echo tep_draw_pull_down_menu('id[' . $products_options_name['products_options_id'] . ']', $products_options_array, $selected_attribute); ?></td>
+ <td class="main"><?php echo osc_draw_pull_down_menu('id[' . $products_options_name['products_options_id'] . ']', $products_options_array, $selected_attribute); ?></td>
</tr>
<?php
}
@@ -210,7 +210,7 @@
<tr>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td class="main"><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params()) . '">' . tep_image_button('button_reviews.gif', IMAGE_BUTTON_REVIEWS) . '</a>'; ?></td>
- <td class="main" align="right"><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']) . tep_image_submit('button_in_cart.gif', IMAGE_BUTTON_IN_CART); ?></td>
+ <td class="main" align="right"><?php echo osc_draw_hidden_field('products_id', $product_info['products_id']) . tep_image_submit('button_in_cart.gif', IMAGE_BUTTON_IN_CART); ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
----------
catalog /catalog
product_reviews_write.php 1.58 -> 1.59
diff -u -r1.58 -r1.59
--- product_reviews_write.php 2004/04/13 07:52:41 1.58
+++ product_reviews_write.php 2004/07/22 17:23:53 1.59
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -162,13 +162,13 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="2" cellpadding="2">
<tr>
- <td class="main"><?php echo tep_draw_textarea_field('review', 'soft', 60, 15); ?></td>
+ <td class="main"><?php echo osc_draw_textarea_field('review', '', 60, 15); ?></td>
</tr>
<tr>
<td class="smallText" align="right"><?php echo TEXT_NO_HTML; ?></td>
</tr>
<tr>
- <td class="main"><?php echo '<b>' . SUB_TITLE_RATING . '</b> ' . TEXT_BAD . ' ' . tep_draw_radio_field('rating', '1') . ' ' . tep_draw_radio_field('rating', '2') . ' ' . tep_draw_radio_field('rating', '3') . ' ' . tep_draw_radio_field('rating', '4') . ' ' . tep_draw_radio_field('rating', '5') . ' ' . TEXT_GOOD; ?></td>
+ <td class="main"><?php echo '<b>' . SUB_TITLE_RATING . '</b> ' . TEXT_BAD . ' ' . osc_draw_radio_field('rating', array('1', '2', '3', '4', '5')) . ' ' . TEXT_GOOD; ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
shopping_cart.php 1.75 -> 1.76
diff -u -r1.75 -r1.76
--- shopping_cart.php 2003/12/18 23:52:14 1.75
+++ shopping_cart.php 2004/07/22 17:23:53 1.76
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -78,7 +78,7 @@
// Push all attributes information in an array
if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) {
while (list($option, $value) = each($products[$i]['attributes'])) {
- echo tep_draw_hidden_field('id[' . $products[$i]['id'] . '][' . $option . ']', $value);
+ echo osc_draw_hidden_field('id[' . $products[$i]['id'] . '][' . $option . ']', $value);
$attributes = tep_db_query("select popt.products_options_name, poval.products_options_values_name, pa.options_values_price, pa.price_prefix
from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_OPTIONS_VALUES . " poval, " . TABLE_PRODUCTS_ATTRIBUTES . " pa
where pa.products_id = '" . $products[$i]['id'] . "'
@@ -110,7 +110,7 @@
$info_box_contents[$cur_row][] = array('align' => 'center',
'params' => 'class="productListing-data" valign="top"',
- 'text' => tep_draw_checkbox_field('cart_delete[]', $products[$i]['id']));
+ 'text' => osc_draw_checkbox_field('cart_delete[]', $products[$i]['id']));
$products_name = '<table border="0" cellspacing="2" cellpadding="2">' .
' <tr>' .
@@ -142,7 +142,7 @@
$info_box_contents[$cur_row][] = array('align' => 'center',
'params' => 'class="productListing-data" valign="top"',
- 'text' => tep_draw_input_field('cart_quantity[]', $products[$i]['quantity'], 'size="4"') . tep_draw_hidden_field('products_id[]', $products[$i]['id']));
+ 'text' => osc_draw_input_field('cart_quantity[]', $products[$i]['quantity'], 'size="4"') . osc_draw_hidden_field('products_id[]', $products[$i]['id']));
$info_box_contents[$cur_row][] = array('align' => 'right',
'params' => 'class="productListing-data" valign="top"',
----------
catalog /catalog
tell_a_friend.php 1.43 -> 1.44
diff -u -r1.43 -r1.44
--- tell_a_friend.php 2003/11/17 21:08:41 1.43
+++ tell_a_friend.php 2004/07/22 17:23:53 1.44
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -156,11 +156,11 @@
<td><table border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="main"><?php echo FORM_FIELD_CUSTOMER_NAME; ?></td>
- <td class="main"><?php echo tep_draw_input_field('from_name'); ?></td>
+ <td class="main"><?php echo osc_draw_input_field('from_name', '', '', true); ?></td>
</tr>
<tr>
<td class="main"><?php echo FORM_FIELD_CUSTOMER_EMAIL; ?></td>
- <td class="main"><?php echo tep_draw_input_field('from_email_address'); ?></td>
+ <td class="main"><?php echo osc_draw_input_field('from_email_address', '', '', true); ?></td>
</tr>
</table></td>
</tr>
@@ -178,11 +178,11 @@
<td><table border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="main"><?php echo FORM_FIELD_FRIEND_NAME; ?></td>
- <td class="main"><?php echo tep_draw_input_field('to_name') . ' <span class="inputRequirement">' . ENTRY_FIRST_NAME_TEXT . '</span>'; ?></td>
+ <td class="main"><?php echo osc_draw_input_field('to_name', '', '', true); ?></td>
</tr>
<tr>
<td class="main"><?php echo FORM_FIELD_FRIEND_EMAIL; ?></td>
- <td class="main"><?php echo tep_draw_input_field('to_email_address') . ' <span class="inputRequirement">' . ENTRY_EMAIL_ADDRESS_TEXT . '</span>'; ?></td>
+ <td class="main"><?php echo osc_draw_input_field('to_email_address', '', '', true); ?></td>
</tr>
</table></td>
</tr>
@@ -197,7 +197,7 @@
<tr>
<td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
<tr class="infoBoxContents">
- <td><?php echo tep_draw_textarea_field('message', 'soft', 40, 8); ?></td>
+ <td><?php echo osc_draw_textarea_field('message', '', 40, 8); ?></td>
</tr>
</table></td>
</tr>
CVSspam 0.2.8
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click