diff --git a/catalog/account.php b/catalog/account.php index cc59fe943..dd577efec 100644 --- a/catalog/account.php +++ b/catalog/account.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2007 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -24,186 +24,42 @@ require(DIR_WS_INCLUDES . 'template_top.php'); ?> - - - - - - - - - -size('account') > 0) { -?> - - - - - - - - if (tep_count_customer_orders() > 0) { -?> - - - - - - - - - size('account') > 0) { + echo '

' . $messageStack->output('account') . '

'; } ?> - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
output('account'); ?>
- - - - -
' . OVERVIEW_SHOW_ALL_ORDERS . ''; ?>
- - - -
- - - - - -
' . OVERVIEW_PREVIOUS_ORDERS . '
' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?>		 - - - - - - - - - - -
- - - -
- - - -
- - - - - - - -
- - - - - - - - - -
' . MY_ACCOUNT_INFORMATION . ''; ?>
' . MY_ACCOUNT_ADDRESS_BOOK . ''; ?>
' . MY_ACCOUNT_PASSWORD . ''; ?>
- - - -
- - - -
- - - - - - - -
- - - -
' . MY_ORDERS_VIEW . ''; ?>
- - - -
- - - -
- - - - - - - -
- - - - - - -
' . EMAIL_NOTIFICATIONS_NEWSLETTERS . ''; ?>
' . EMAIL_NOTIFICATIONS_PRODUCTS . ''; ?>
+ +
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+
- - - - - - - +

+ size('account_edit') > 0) { -?> - - - - - - -' . $messageStack->output('account_edit') . '

'; } ?> - - + + + + - + + - + + -
- - - - -
output('account_edit'); ?>
- - - - - - -
- - - - -
- - - -
+ + + +
+
+ + +
+ +
+
+ - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + + + - - - - - - - - - - - - -
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_DATE_OF_BIRTH_TEXT . '': ''); ?>
' . ENTRY_DATE_OF_BIRTH_TEXT . '': ''); ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_TELEPHONE_NUMBER_TEXT . '': ''); ?>
' . ENTRY_FAX_NUMBER_TEXT . '': ''); ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_TELEPHONE_NUMBER_TEXT . '': ''); ?>
- - - -
- - - - - - -
' . ENTRY_FAX_NUMBER_TEXT . '': ''); ?>
+ + +
+ +
+ + + +
+ + + + - - - - - - - - - - + +
+

display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>

+ +

display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?>

+
+ 0) { + } else { ?> - - - + +
+

+
+ - - - - - - -
- - - - -
+

+ +
+ - - - - - -
' . TEXT_ORDER_NUMBER . ' ' . $history['orders_id']; ?>' . TEXT_ORDER_STATUS . ' ' . $history['orders_status_name']; ?>
- - - - -
- - - - - -
' . TEXT_ORDER_DATE . ' ' . tep_date_long($history['date_purchased']) . '
' . $order_type . ' ' . tep_output_string_protected($order_name); ?>		' . TEXT_ORDER_PRODUCTS . ' ' . $products['count'] . '
' . TEXT_ORDER_COST . ' ' . strip_tags($history['order_total']); ?>
- - - - -
+ + (' . $history['orders_status_name'] . ')'; ?> + +
+ + + + + + +
' . TEXT_ORDER_DATE . ' ' . tep_date_long($history['date_purchased']) . '
' . $order_type . ' ' . tep_output_string_protected($order_name); ?>		' . TEXT_ORDER_PRODUCTS . ' ' . $products['count'] . '
' . TEXT_ORDER_COST . ' ' . strip_tags($history['order_total']); ?>
+
+ - - - - -
- - - -
- -
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
- - - -
- - - - - -
+ +
+ +
+ - - - - - - - +

+ +
+ (' . $order->info['orders_status'] . ')'; ?> + +
+
+ info['total']; ?> + info['date_purchased']); ?> +
+ +
- - - - -
- - - - - - -
+ +delivery != false) { +?> + - - - - +
- + - - + -
(' . $order->info['orders_status'] . ')'; ?>
info['date_purchased']); ?>info['total']; ?>delivery['format_id'], $order->delivery, 1, ' ', '
'); ?>
- -delivery != false) { -?> - +
- - - - - - info['shipping_method'])) { ?> - - - - - - + + + + + + -
delivery['format_id'], $order->delivery, 1, ' ', '
'); ?>
info['shipping_method']; ?>
info['shipping_method']; ?>
 - - -
+ - -
info['tax_groups']) > 1) { ?> - - - - - + + + + + - - - + + + + products); $i<$n; $i++) { echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . + ' ' . "\n"; if (sizeof($order->info['tax_groups']) > 1) { - echo ' ' . "\n"; + echo ' ' . "\n"; } - echo ' ' . "\n" . + echo ' ' . "\n" . ' ' . "\n"; } ?> -
' . $order->products[$i]['qty'] . ' x' . $order->products[$i]['name']; + ' ' . $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name']; if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) { for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) { - echo '
  - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . ''; + echo '
  - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . ''; } } echo '		' . tep_display_tax_value($order->products[$i]['tax']) . '%' . tep_display_tax_value($order->products[$i]['tax']) . '%' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '
+ + + + +
+ - - - - - - - - - -
- - - +
- - - - - - - - - - - - -
billing['format_id'], $order->billing, 1, ' ', '
'); ?>
info['payment_method']; ?>
 + + -
+ + + + + + + + + + + + +
billing['format_id'], $order->billing, 1, ' ', '
'); ?>
info['payment_method']; ?>
totals); $i<$n; $i++) { - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } ?> -
' . $order->totals[$i]['title'] . '' . $order->totals[$i]['text'] . '
' . $order->totals[$i]['title'] . '' . $order->totals[$i]['text'] . '
+ + + + +
+ - - - - - - - - - - - - - - - -
- - +
+ -
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } ?> -
' . tep_date_short($statuses['date_added']) . '' . $statuses['orders_status_name'] . '' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '
' . tep_date_short($statuses['date_added']) . '' . $statuses['orders_status_name'] . '' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '
+ + -
- - - -
- - - - - -
+ +
+ +
+
- +
+ - +
+
- + + - - - - - - - - - - - - - - - -
- - - - -

- - - -
- - - - - -
- - - - - - - - -
  - - - - - -
- - - -
- - - - - - -
+
+
+ +
+ + + +
+ + + - +
+ - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ + + +
+
- - - - -
- - - -
- - - - - -
- - - -
- - - - - -
- - - - - - - - -
 
- + + +

+
+ -
- - - - -
- - - - - + +
+ +
+ -
+ + + +
+ 0) { ?> -
- - + +
+ +
+ - - - - + + + + + + + +
+ + -
- - - - + + + - - - - - -
- - - - - - -
- - + +
+ + + +
+ + + - - - - - - - +

+ size('account_password') > 0) { -?> - - - - - - -' . $messageStack->output('account_password') . '

'; } ?> + + + +
+
+ + +
+ +
+
- - - - -
output('account_password'); ?>
- + + - - + + + - - + + + -
- - - - - - -
- - - - -
- - - -
- - - - - - - - - - - - - - - -
' . ENTRY_PASSWORD_CURRENT_TEXT . '': ''); ?>
' . ENTRY_PASSWORD_NEW_TEXT . '': ''); ?>
' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '': ''); ?>
' . ENTRY_PASSWORD_CURRENT_TEXT . '': ''); ?>
' . ENTRY_PASSWORD_NEW_TEXT . '': ''); ?>
- - - -
- - - - - - -
' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '': ''); ?>
+ + + +
+ + + +
+ + + - - - - - - - - - +

+ size('addressbook') > 0) { -?> - - - - - - -' . $messageStack->output('addressbook') . '

'; } ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
output('addressbook'); ?>
- - - -
- - - - - -
- - - - - - -

'); ?>
- - - -
+ +
+ + +
+
+
+ +
+ '); ?> +
+
+ + +
+ +
+ + + +
+ -
- - - - + +
+ +

' . PRIMARY_ADDRESS . ''; ?>

+

'); ?>

+
+ -
- - - - - - - -
' . PRIMARY_ADDRESS . ''; ?>
- - - - - -
'); ?>
- - - -
- - - + + + +
+ -
+ + - - -
+ + + + +

+ - - - - - - - +

+ size('addressbook') > 0) { -?> - - - - - - -' . $messageStack->output('addressbook') . '

'; } +?> + - - - - - - - - - - - - + +
+ + +
+

+ +

'); ?>

+
+ +
+ + + +
+
+ - - - - - - + + + +
+ + + -
- - + +
+ + + +
+ snapshot) > 0) { @@ -354,26 +310,24 @@ $back_link = tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'); } ?> - - - + +
+ + + +
+ + + + + + -
- - - - -
output('addressbook'); ?>
- - - -
- - - - - -
- - - - - - -

'); ?>
- - - -
- - - - - - -
- - - -
- - - - - - -
- - - -
- - - - - - -
'; ?> - - - - - - - +

+ size('search') > 0) { + echo '

' . $messageStack->output('search') . '

'; + } ?> + + + +
+ + +
+
+ +
+ +
+ +
+ ' . TEXT_SEARCH_HELP_LINK . ''; ?> + +
+ +
+ +
- - - - -
- + + - + + - - + + - + + - + + - + + - + + -
output('search'); ?> '', 'text' => TEXT_ALL_CATEGORIES)))); ?>
 
- HEADING_SEARCH_CRITERIA); - - 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); - - new infoBox($info_box_contents); -?> - '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
- - - - -
' . TEXT_SEARCH_HELP_LINK . ''; ?>
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
'', 'text' => TEXT_ALL_CATEGORIES)))); ?>
 
'', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
+ + + + + - - - - - - - - - - - - - - - - -
- - - - -
+

+ +
+ PRODUCT_LIST_MODEL, @@ -322,15 +312,13 @@ require(DIR_WS_MODULES . FILENAME_PRODUCT_LISTING); ?> -
+ +
+ +
+ +
+ - - - - - - - + +
+ + +
+
+

+ form_action_url)) { $form_action_url = $$payment->form_action_url; @@ -102,69 +101,73 @@ echo tep_draw_form('checkout_confirmation', $form_action_url, 'post'); ?> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- + - + - +
- - - - - - + + + +
' . HEADING_DELIVERY_ADDRESS . ' (' . TEXT_EDIT . ')'; ?>
delivery['format_id'], $order->delivery, 1, ' ', '
'); ?>
+ + + + + + + info['shipping_method']) { ?> - - - - - - + + + + + + + -
' . HEADING_DELIVERY_ADDRESS . ' (' . TEXT_EDIT . ')'; ?>
delivery['format_id'], $order->delivery, 1, ' ', '
'); ?>
' . HEADING_SHIPPING_METHOD . ' (' . TEXT_EDIT . ')'; ?>
info['shipping_method']; ?>
' . HEADING_SHIPPING_METHOD . ' (' . TEXT_EDIT . ')'; ?>
info['shipping_method']; ?>
 - - - +
+ + - -
+ info['tax_groups']) > 1) { ?> - - - - - + + + + + + + - - - + + + + + products); $i<$n; $i++) { echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . + ' ' . "\n"; - if (sizeof($order->info['tax_groups']) > 1) echo ' ' . "\n"; + if (sizeof($order->info['tax_groups']) > 1) echo ' ' . "\n"; - echo ' ' . "\n" . + echo ' ' . "\n" . ' ' . "\n"; } ?> -
' . HEADING_PRODUCTS . ' (' . TEXT_EDIT . ')'; ?>
' . HEADING_PRODUCTS . ' (' . TEXT_EDIT . ')'; ?>
' . HEADING_PRODUCTS . ' (' . TEXT_EDIT . ')'; ?>
' . HEADING_PRODUCTS . ' (' . TEXT_EDIT . ')'; ?>
' . $order->products[$i]['qty'] . ' x' . $order->products[$i]['name']; + ' ' . $order->products[$i]['qty'] . ' x' . $order->products[$i]['name']; if (STOCK_CHECK == 'true') { echo tep_check_stock($order->products[$i]['id'], $order->products[$i]['qty']); @@ -172,180 +175,139 @@ if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) { for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) { - echo '
  - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . ''; + echo '
  - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . ''; } } echo '		' . tep_display_tax_value($order->products[$i]['tax']) . '%' . tep_display_tax_value($order->products[$i]['tax']) . '%' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . '' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . '
+ + + + +
+ - - - - - - - - - - - - -info['comments'])) { ?> - - - - - - - - - - - - + + ' . HEADING_ORDER_COMMENTS . ' (' . TEXT_EDIT . ')'; ?> + +
+ info['comments'])) . tep_draw_hidden_field('comments', $order->info['comments']); ?> +
+ - - - - - - - - - -
- - - +
- - - - - - - - - - - - -
' . HEADING_BILLING_ADDRESS . ' (' . TEXT_EDIT . ')'; ?>
billing['format_id'], $order->billing, 1, ' ', '
'); ?>
' . HEADING_PAYMENT_METHOD . ' (' . TEXT_EDIT . ')'; ?>
info['payment_method']; ?>
 + + - +
+ + + + + + + + + + + + +
' . HEADING_BILLING_ADDRESS . ' (' . TEXT_EDIT . ')'; ?>
billing['format_id'], $order->billing, 1, ' ', '
'); ?>
' . HEADING_PAYMENT_METHOD . ' (' . TEXT_EDIT . ')'; ?>
info['payment_method']; ?>
 + output(); } ?> -
+ + modules)) { if ($confirmation = $payment_modules->confirmation()) { ?> + + + +
+ - - - - - - - + - - - + +
- - - -
- - - + - - - - - - + + + + + + + + -
+
+ -
' . HEADING_ORDER_COMMENTS . ' (' . TEXT_EDIT . ')'; ?>
- - - -
- - - -
info['comments'])) . tep_draw_hidden_field('comments', $order->info['comments']); ?>
- - - -
+ +
+
+
+ + + + + + + +
' . CHECKOUT_BAR_DELIVERY . ''; ?>' . CHECKOUT_BAR_PAYMENT . ''; ?>
+
+ +
+ modules)) { echo $payment_modules->process_button(); } - echo tep_draw_button(IMAGE_BUTTON_CONFIRM_ORDER, 'check', null, 'primary') . "\n"; + echo tep_draw_button(IMAGE_BUTTON_CONFIRM_ORDER, 'check', null, 'primary'); ?> -
- - - - - - - - - - - - -
- - - - -
- - - - - -
- - - - -
' . CHECKOUT_BAR_DELIVERY . ''; ?>' . CHECKOUT_BAR_PAYMENT . ''; ?>
+ +
+ + + + + + + javascript_validation(); ?> - - - - - - - +

+ + + +
+ get_error())) { ?> -
- - - - - - - - + +
+ ' . tep_output_string_protected($error['title']) . ''; ?> + +

+
+ - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - -
- - - - - -
- - - -
- - - -
- - - - - -


- - - - - - -

'); ?>
- - - -
- -
+ + + +
+
+
+ +
+ '); ?> +
+
+ +

+
+ +
+ + + selection(); if (sizeof($selection) > 1) { ?> - - - - - - + +
+
+ ' . TITLE_PLEASE_SELECT . ''; ?> +
+ + +
+ - - - - - + +
+ +
+ +
+ + -
- - - - + +

+ +
+ ' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } ?> - - - + - - + + + + - - - - - + + + + + - - - + + -
+ + + 1) { echo tep_draw_radio_field('payment', $selection[$i]['id'], ($selection[$i]['id'] == $payment)); @@ -247,127 +211,84 @@ function rowOutEffect(object) { echo tep_draw_hidden_field('payment', $selection[$i]['id']); } ?> -
+ + + - - + +
+ - - - - - - - + + + + + + -
+ -
- - - -
- - - -
- - - -
- - - -
- - - - - - -

' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?>
- - - - - - - - - - - - -
- - - - -
- - - - - -
- - - - -
' . CHECKOUT_BAR_DELIVERY . ''; ?>
+ + + + + +
+ +
+ +
+
+
+ + + + + + + +
' . CHECKOUT_BAR_DELIVERY . ''; ?>
+
+ +
+
+ + + + + - - - - - - - +

+ size('checkout_address') > 0) { -?> - - - - - - -' . $messageStack->output('checkout_address') . '

'; } +?> + + +
+ + -
- - - - - - - - + + + +
+
+
+ +
+ '); ?> +
+
+ + +
+ +
+ 1) { ?> - - - - - - - - - + +
- - - - -
output('checkout_address'); ?>
- - - -
- - - -
- - - - - -
- - - - - - -
' . TITLE_PAYMENT_ADDRESS . '
' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?>		'); ?>
- - - -
- - - -
- - - - - - + + + +
+
+ ' . TITLE_PLEASE_SELECT . ''; ?> +
+ + +
+ +
+
' . TITLE_PLEASE_SELECT . '
' . tep_image(DIR_WS_IMAGES . 'arrow_east_south.gif'); ?>
+ - - - - - + + + + + + + + -
-' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } ?> - - - - - - - - - - -
- - - - - -
+ + - - - - - -
- - - - - - -
- - - - - - - - - - -
- - - - - -
- + +
+ + + +
+ +
+ + + - - - - - - - - -
- - - - - - -
' . TITLE_CONTINUE_CHECKOUT_PROCEDURE . '
' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?>
- + +
+
+
+ + + + + + + +
' . CHECKOUT_BAR_DELIVERY . ''; ?>' . CHECKOUT_BAR_PAYMENT . ''; ?>
+
+ +
+
+ + + - - - - - - + +
+ +
+ - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - -
- - - - -
' . CHECKOUT_BAR_DELIVERY . ''; ?>
- - + + + + - - - - - - - - - - - - - - - - +

+ + + +
+ + +
+
+
+ +
+ '); ?> +
+
+ +

+
+ +
+ 0) { ?> -
- - - - - - - - + +
- - - - -
- - - -
- - - -
- - - - - -


- - - - - - -
' . TITLE_SHIPPING_ADDRESS . '
' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?>		'); ?>
- - - -
- - - -
+ + + 1 && sizeof($quotes[0]) > 1) { ?> - - - - - - + +
+
+ ' . TITLE_PLEASE_SELECT . ''; ?> +
+ + +
+ - - - - - + +
+ +
+ +
+
' . TITLE_PLEASE_SELECT . '
' . tep_image(DIR_WS_IMAGES . 'arrow_east_south.gif'); ?>
+ + - - - - - + + + + + + + + - - - - - - -
- - - - - - - - - - -
 
format(MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER)) . tep_draw_hidden_field('shipping', 'free_free'); ?>
 
format(MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER)) . tep_draw_hidden_field('shipping', 'free_free'); ?>
- - - - - + + + + + - - - - - + + + + + ' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } ?> - - + + + 1) || ($n2 > 1) ) { ?> - - + + + + - + + + - - + + + -
 
 
format(tep_add_tax($quotes[$i]['methods'][$j]['cost'], (isset($quotes[$i]['tax']) ? $quotes[$i]['tax'] : 0))); ?>format(tep_add_tax($quotes[$i]['methods'][$j]['cost'], (isset($quotes[$i]['tax']) ? $quotes[$i]['tax'] : 0))); ?>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']); ?>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']); ?>
+ + - - - - - -
- - - - - - -
- - - -
- - - - - - - - - -
- - - - - - -
' . TITLE_CONTINUE_CHECKOUT_PROCEDURE . '
' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?>
- - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- - + +
+ + + +
+ +
+ +
+
+
+ + + + + + + +
+
+ +
+
+ + + + + - - - - - - - +

+ size('checkout_address') > 0) { -?> - - - - - - -' . $messageStack->output('checkout_address') . '

'; } +?> + + +
+ + -
- - - - - - - - + + + +
+
+
+ +
+ '); ?> +
+
+ + +
+ +
+ 1) { ?> - - - - - - - - - + +
- - - - -
output('checkout_address'); ?>
- - - -
- - - -
- - - - - -
- - - - - - -
' . TITLE_SHIPPING_ADDRESS . '
' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?>		'); ?>
- - - -
- - - -
- - - - - - + + + +
+
+ ' . TITLE_PLEASE_SELECT . ''; ?> +
+ + +
+ +
+
' . TITLE_PLEASE_SELECT . '
' . tep_image(DIR_WS_IMAGES . 'arrow_east_south.gif'); ?>
+ - - - - - + + + + + + + + -
-' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } ?> - - - - - - - - - - -
- - - - - -
+ + - - - - - -
- - - - - - -
- - - - - - - - - - -
- - - - - -
- + +
+ + + +
+ +
+ + + - - - - - - - - -
- - - - - - -
' . TITLE_CONTINUE_CHECKOUT_PROCEDURE . '
' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?>
- + +
+
+
+ + + + + + + +
' . CHECKOUT_BAR_DELIVERY . ''; ?>
+
+ +
+
+ + + - - - - - - + +
+ +
+ - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- - + + + + - - - - - - - - - - - - - - - - + + + +
+ +
+ -
- - - - -



+

+ + + +
+
+ +
+ +
+

'; + echo TEXT_NOTIFY_PRODUCTS . '

'; $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'] . '
'; + echo tep_draw_checkbox_field('notify[]', $products_array[$i]['id']) . ' ' . $products_array[$i]['text'] . '
'; $products_displayed[] = $products_array[$i]['id']; } } echo '

'; - } else { - echo TEXT_SEE_ORDERS . '

' . TEXT_CONTACT_STORE_OWNER; } + + echo TEXT_SEE_ORDERS . '

' . TEXT_CONTACT_STORE_OWNER; ?> -

- - - - - - - - - - - - -
- - - - -
- - - - -
+ +
+ +
+ + + - - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - - - -
+

+ +
+
+ +
+ +
+ +
+
- - - - - - - +

+ size('contact') > 0) { -?> - - - - - - -' . $messageStack->output('contact') . '

'; } if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'success')) { ?> - - - - - - - - - + +
+
+ +
+ +
+ +
+
+ + + + +
+
+
- - - - -
output('contact'); ?>
- - - -
- - - - - -
- + + - + + - + + +
- - - -
- - - - - - - - - - - - - - - - - - -
- - - -
- - - - - -
+ + +
+ +
+ + + + - - diff --git a/catalog/cookie_usage.php b/catalog/cookie_usage.php index 1557ea959..93bb5b920 100644 --- a/catalog/cookie_usage.php +++ b/catalog/cookie_usage.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -19,45 +19,25 @@ require(DIR_WS_INCLUDES . 'template_top.php'); ?> - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -
BOX_INFORMATION_HEADING))); ?>
BOX_INFORMATION))); ?>
- - - -
- - - - - -
+

+ +
+
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
- - - - - - - - - - - - - +

+ size('create_account') > 0) { -?> - - - - - - -' . $messageStack->output('create_account') . '

'; } ?> - - - - - + + + + +
- - - - -

output('create_account'); ?>
- - - - -
- - - -
+ + + +
+
+ + +
+ +
+
+ - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + + + - - - - -
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_DATE_OF_BIRTH_TEXT . '': ''); ?>
' . ENTRY_DATE_OF_BIRTH_TEXT . '': ''); ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . '': ''); ?>
+ + + + + +
+ - - - - - - - + + +
- - - -
- - - - -
' . ENTRY_COMPANY_TEXT . '': ''); ?>
' . ENTRY_COMPANY_TEXT . '': ''); ?>
+
+ + + + +
+ - - - - + + - - - - - - - - - - - - - - - - - - + - + + +
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
- - - -
- - - - + - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - + + - + + + - - - - -
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
+ +
' . ENTRY_STATE_TEXT; ?> -
' . ENTRY_COUNTRY_TEXT . '': ''); ?>
- - - -
- - - - - - - - -
' . ENTRY_TELEPHONE_NUMBER_TEXT . '': ''); ?>
' . ENTRY_FAX_NUMBER_TEXT . '': ''); ?>
- - - -
- - - - -
' . ENTRY_NEWSLETTER_TEXT . '': ''); ?>
' . ENTRY_COUNTRY_TEXT . '': ''); ?>
+
+ + + +
+ - + + - + + - + + +
' . ENTRY_TELEPHONE_NUMBER_TEXT . '': ''); ?>
' . ENTRY_FAX_NUMBER_TEXT . '': ''); ?>
- - - -
- - - - - - - - -
' . ENTRY_PASSWORD_TEXT . '': ''); ?>
' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '': ''); ?>
' . ENTRY_NEWSLETTER_TEXT . '': ''); ?>
+
+ + + +
+ - + + - + + -
' . ENTRY_PASSWORD_TEXT . '': ''); ?>
- - - -
- - - - - -
' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '': ''); ?>
+ +
+ +
+ +
+ + + - - - - - - - - - - -
- - - - -
- - - - - - - - - -
- - - -
- - - - - -
+

+ +
+
+ +
+ +
+ +
+
remove($HTTP_GET_VARS['products_id']); + } + tep_redirect(tep_href_link($goto, tep_get_all_get_params($parameters))); + break; // performed by the 'buy now' button in product listings and review page case 'buy_now' : if (isset($HTTP_GET_VARS['products_id'])) { if (tep_has_product_attributes($HTTP_GET_VARS['products_id'])) { diff --git a/catalog/includes/boxes/best_sellers.php b/catalog/includes/boxes/best_sellers.php index d56ef517c..6d4386109 100644 --- a/catalog/includes/boxes/best_sellers.php +++ b/catalog/includes/boxes/best_sellers.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -17,32 +17,24 @@ } if (tep_db_num_rows($best_sellers_query) >= MIN_DISPLAY_BESTSELLERS) { -?> - - - - BOX_HEADING_BESTSELLERS); - - new infoBoxHeading($info_box_contents, false, false); - $rows = 0; - $bestsellers_list = ''; + $bestsellers_list = '
'; while ($best_sellers = tep_db_fetch_array($best_sellers_query)) { $rows++; - $bestsellers_list .= ''; + $bestsellers_list .= ''; } $bestsellers_list .= '
' . tep_row_number_format($rows) . '.' . $best_sellers['products_name'] . '
' . tep_row_number_format($rows) . '.' . $best_sellers['products_name'] . '
'; +?> - $info_box_contents = array(); - $info_box_contents[] = array('text' => $bestsellers_list); +
+
- new infoBox($info_box_contents); + - - - + +
+ diff --git a/catalog/includes/boxes/categories.php b/catalog/includes/boxes/categories.php index 51b38f5de..4fe97cdff 100644 --- a/catalog/includes/boxes/categories.php +++ b/catalog/includes/boxes/categories.php @@ -5,11 +5,13 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ + $categories_string = ''; + function tep_show_category($counter) { global $tree, $categories_string, $cPath_array; @@ -57,15 +59,6 @@ function tep_show_category($counter) { tep_show_category($tree[$counter]['next_id']); } } -?> - - - - BOX_HEADING_CATEGORIES); - - new infoBoxHeading($info_box_contents, true, false); $categories_string = ''; $tree = array(); @@ -127,12 +120,12 @@ function tep_show_category($counter) { } } tep_show_category($first_element); +?> - $info_box_contents = array(); - $info_box_contents[] = array('text' => $categories_string); +
+
- new infoBox($info_box_contents); -?> - - - +
+ +
+
diff --git a/catalog/includes/boxes/currencies.php b/catalog/includes/boxes/currencies.php index 146f8e4b9..369f46f02 100644 --- a/catalog/includes/boxes/currencies.php +++ b/catalog/includes/boxes/currencies.php @@ -5,22 +5,12 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ if (isset($currencies) && is_object($currencies) && (count($currencies->currencies) > 1)) { -?> - - - - BOX_HEADING_CURRENCIES); - - new infoBoxHeading($info_box_contents, false, false); - reset($currencies->currencies); $currencies_array = array(); while (list($key, $value) = each($currencies->currencies)) { @@ -34,17 +24,21 @@ $hidden_get_variables .= tep_draw_hidden_field($key, $value); } } +?> - $info_box_contents = array(); - $info_box_contents[] = array('form' => tep_draw_form('currencies', tep_href_link(basename($PHP_SELF), '', $request_type, false), 'get'), - 'align' => 'center', - 'text' => tep_draw_pull_down_menu('currency', $currencies_array, $currency, 'onChange="this.form.submit();" style="width: 100%"') . $hidden_get_variables . tep_hide_session_id()); +
+
- new infoBox($info_box_contents); +
+ + - - - + +
+
+ diff --git a/catalog/includes/boxes/information.php b/catalog/includes/boxes/information.php index 85c2c8564..a0baa8f88 100644 --- a/catalog/includes/boxes/information.php +++ b/catalog/includes/boxes/information.php @@ -5,28 +5,23 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ ?> - - - - BOX_HEADING_INFORMATION); - new infoBoxHeading($info_box_contents, false, false); +
+
- $info_box_contents = array(); - $info_box_contents[] = array('text' => '' . BOX_INFORMATION_SHIPPING . '
' . - '' . BOX_INFORMATION_PRIVACY . '
' . - '' . BOX_INFORMATION_CONDITIONS . '
' . - '' . BOX_INFORMATION_CONTACT . ''); +
- new infoBox($info_box_contents); +' . BOX_INFORMATION_SHIPPING . '
' . + '' . BOX_INFORMATION_PRIVACY . '
' . + '' . BOX_INFORMATION_CONDITIONS . '
' . + '' . BOX_INFORMATION_CONTACT . ''; ?> - - - + +
+
diff --git a/catalog/includes/boxes/languages.php b/catalog/includes/boxes/languages.php index 22e450be8..d2527471d 100644 --- a/catalog/includes/boxes/languages.php +++ b/catalog/includes/boxes/languages.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -16,31 +16,21 @@ } if (count($lng->catalog_languages) > 1) { + $languages_string = ''; + reset($lng->catalog_languages); + while (list($key, $value) = each($lng->catalog_languages)) { + $languages_string .= ' ' . tep_image(DIR_WS_LANGUAGES . $value['directory'] . '/images/' . $value['image'], $value['name']) . ' '; + } ?> - - - - BOX_HEADING_LANGUAGES); - - new infoBoxHeading($info_box_contents, false, false); - $languages_string = ''; - reset($lng->catalog_languages); - while (list($key, $value) = each($lng->catalog_languages)) { - $languages_string .= ' ' . tep_image(DIR_WS_LANGUAGES . $value['directory'] . '/images/' . $value['image'], $value['name']) . ' '; - } +
+
- $info_box_contents = array(); - $info_box_contents[] = array('align' => 'center', - 'text' => $languages_string); +
+ +
+
- new infoBox($info_box_contents); -?> - - - \ No newline at end of file +?> diff --git a/catalog/includes/boxes/manufacturer_info.php b/catalog/includes/boxes/manufacturer_info.php index bd1af4172..fe92bc60d 100644 --- a/catalog/includes/boxes/manufacturer_info.php +++ b/catalog/includes/boxes/manufacturer_info.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -14,30 +14,20 @@ $manufacturer_query = tep_db_query("select m.manufacturers_id, m.manufacturers_name, m.manufacturers_image, mi.manufacturers_url from " . TABLE_MANUFACTURERS . " m left join " . TABLE_MANUFACTURERS_INFO . " mi on (m.manufacturers_id = mi.manufacturers_id and mi.languages_id = '" . (int)$languages_id . "'), " . TABLE_PRODUCTS . " p where p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and p.manufacturers_id = m.manufacturers_id"); if (tep_db_num_rows($manufacturer_query)) { $manufacturer = tep_db_fetch_array($manufacturer_query); -?> - - - - BOX_HEADING_MANUFACTURER_INFO); - - new infoBoxHeading($info_box_contents, false, false); - $manufacturer_info_string = ''; - if (tep_not_null($manufacturer['manufacturers_image'])) $manufacturer_info_string .= ''; - if (tep_not_null($manufacturer['manufacturers_url'])) $manufacturer_info_string .= ''; - $manufacturer_info_string .= '' . + $manufacturer_info_string = '
' . tep_image(DIR_WS_IMAGES . $manufacturer['manufacturers_image'], $manufacturer['manufacturers_name']) . '
- ' . sprintf(BOX_MANUFACTURER_INFO_HOMEPAGE, $manufacturer['manufacturers_name']) . '
- ' . BOX_MANUFACTURER_INFO_OTHER_PRODUCTS . '
'; + if (tep_not_null($manufacturer['manufacturers_image'])) $manufacturer_info_string .= ''; + if (tep_not_null($manufacturer['manufacturers_url'])) $manufacturer_info_string .= ''; + $manufacturer_info_string .= '' . '
' . tep_image(DIR_WS_IMAGES . $manufacturer['manufacturers_image'], $manufacturer['manufacturers_name']) . '
- ' . sprintf(BOX_MANUFACTURER_INFO_HOMEPAGE, $manufacturer['manufacturers_name']) . '
- ' . BOX_MANUFACTURER_INFO_OTHER_PRODUCTS . '
'; +?> - $info_box_contents = array(); - $info_box_contents[] = array('text' => $manufacturer_info_string); +
+
+ + +
- new infoBox($info_box_contents); -?> - - - - - - - BOX_HEADING_MANUFACTURERS); - - new infoBoxHeading($info_box_contents, false, false); - if ($number_of_rows <= MAX_DISPLAY_MANUFACTURERS_IN_A_LIST) { // Display a list $manufacturers_list = ''; @@ -33,8 +23,7 @@ $manufacturers_list = substr($manufacturers_list, 0, -4); - $info_box_contents = array(); - $info_box_contents[] = array('text' => $manufacturers_list); + $content = $manufacturers_list; } else { // Display a drop-down $manufacturers_array = array(); @@ -48,16 +37,20 @@ 'text' => $manufacturers_name); } - $info_box_contents = array(); - $info_box_contents[] = array('form' => tep_draw_form('manufacturers', tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false), 'get'), - 'text' => tep_draw_pull_down_menu('manufacturers_id', $manufacturers_array, (isset($HTTP_GET_VARS['manufacturers_id']) ? $HTTP_GET_VARS['manufacturers_id'] : ''), 'onChange="this.form.submit();" size="' . MAX_MANUFACTURERS_LIST . '" style="width: 100%"') . tep_hide_session_id()); + $content = tep_draw_form('manufacturers', tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false), 'get') . + tep_draw_pull_down_menu('manufacturers_id', $manufacturers_array, (isset($HTTP_GET_VARS['manufacturers_id']) ? $HTTP_GET_VARS['manufacturers_id'] : ''), 'onChange="this.form.submit();" size="' . MAX_MANUFACTURERS_LIST . '" style="width: 100%"') . tep_hide_session_id() . + ''; } - - new infoBox($info_box_contents); ?> - - - + +
+
+ +
+ +
+
+ diff --git a/catalog/includes/boxes/order_history.php b/catalog/includes/boxes/order_history.php index 0fe07507c..5e5a00576 100644 --- a/catalog/includes/boxes/order_history.php +++ b/catalog/includes/boxes/order_history.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -14,40 +14,29 @@ // retreive the last x products purchased $orders_query = tep_db_query("select distinct op.products_id from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_PRODUCTS . " p where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = op.orders_id and op.products_id = p.products_id and p.products_status = '1' group by products_id order by o.date_purchased desc limit " . MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX); if (tep_db_num_rows($orders_query)) { -?> - - - - BOX_HEADING_CUSTOMER_ORDERS); - - new infoBoxHeading($info_box_contents, false, false); - $product_ids = ''; while ($orders = tep_db_fetch_array($orders_query)) { $product_ids .= (int)$orders['products_id'] . ','; } $product_ids = substr($product_ids, 0, -1); - $customer_orders_string = ''; + $customer_orders_string = '
'; $products_query = tep_db_query("select products_id, products_name from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id in (" . $product_ids . ") and language_id = '" . (int)$languages_id . "' order by products_name"); while ($products = tep_db_fetch_array($products_query)) { $customer_orders_string .= ' ' . - ' ' . - ' ' . + ' ' . + ' ' . ' '; } $customer_orders_string .= '
' . $products['products_name'] . '' . tep_image(DIR_WS_ICONS . 'cart.gif', ICON_CART) . '' . $products['products_name'] . '' . tep_image(DIR_WS_ICONS . 'cart.gif', ICON_CART) . '
'; +?> - $info_box_contents = array(); - $info_box_contents[] = array('text' => $customer_orders_string); +
+
+ + +
- new infoBox($info_box_contents); -?> - - - - - - - BOX_HEADING_NOTIFICATIONS); - - new infoBoxHeading($info_box_contents, false, false, tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL')); - if (tep_session_is_registered('customer_id')) { $check_query = tep_db_query("select count(*) as count from " . TABLE_PRODUCTS_NOTIFICATIONS . " where products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and customers_id = '" . (int)$customer_id . "'"); $check = tep_db_fetch_array($check_query); @@ -30,18 +20,21 @@ $notification_exists = false; } - $info_box_contents = array(); + $notif_contents = ''; + if ($notification_exists == true) { - $info_box_contents[] = array('text' => '
' . tep_image(DIR_WS_IMAGES . 'box_products_notifications_remove.gif', IMAGE_BUTTON_REMOVE_NOTIFICATIONS) . '' . sprintf(BOX_NOTIFICATIONS_NOTIFY_REMOVE, tep_get_products_name($HTTP_GET_VARS['products_id'])) .'
'); + $notif_contents = '
' . tep_image(DIR_WS_IMAGES . 'box_products_notifications_remove.gif', IMAGE_BUTTON_REMOVE_NOTIFICATIONS) . '' . sprintf(BOX_NOTIFICATIONS_NOTIFY_REMOVE, tep_get_products_name($HTTP_GET_VARS['products_id'])) .'
'; } else { - $info_box_contents[] = array('text' => '
' . tep_image(DIR_WS_IMAGES . 'box_products_notifications.gif', IMAGE_BUTTON_NOTIFICATIONS) . '' . sprintf(BOX_NOTIFICATIONS_NOTIFY, tep_get_products_name($HTTP_GET_VARS['products_id'])) .'
'); + $notif_contents = '
' . tep_image(DIR_WS_IMAGES . 'box_products_notifications.gif', IMAGE_BUTTON_NOTIFICATIONS) . '' . sprintf(BOX_NOTIFICATIONS_NOTIFY, tep_get_products_name($HTTP_GET_VARS['products_id'])) .'
'; } - - new infoBox($info_box_contents); ?> - - - + +
+
' . BOX_HEADING_NOTIFICATIONS . ''; ?>
+ + +
+ diff --git a/catalog/includes/boxes/product_social_bookmarks.php b/catalog/includes/boxes/product_social_bookmarks.php index 239d6f7ef..160d182b5 100644 --- a/catalog/includes/boxes/product_social_bookmarks.php +++ b/catalog/includes/boxes/product_social_bookmarks.php @@ -32,24 +32,15 @@ if ( !empty($social_bookmarks) ) { ?> - - - - BOX_HEADING_SOCIAL_BOOKMARKS); - new infoBoxHeading($info_box_contents, false, false); +
+
- $info_box_contents = array(); - $info_box_contents[] = array('align' => 'center', - 'text' => implode(' ', $social_bookmarks)); +
+ +
+
- new infoBox($info_box_contents); -?> - - - - - - - BOX_HEADING_REVIEWS); - - new infoBoxHeading($info_box_contents, false, false, tep_href_link(FILENAME_REVIEWS)); $random_select = "select r.reviews_id, r.reviews_rating, p.products_id, p.products_image, pd.products_name from " . TABLE_REVIEWS . " r, " . TABLE_REVIEWS_DESCRIPTION . " rd, " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = r.products_id and r.reviews_id = rd.reviews_id and rd.languages_id = '" . (int)$languages_id . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'"; if (isset($HTTP_GET_VARS['products_id'])) { @@ -26,7 +17,7 @@ $random_select .= " order by r.reviews_id desc limit " . MAX_RANDOM_SELECT_REVIEWS; $random_product = tep_random_select($random_select); - $info_box_contents = array(); + $reviews_box_contents = ''; if ($random_product) { // display random review box @@ -35,17 +26,21 @@ $rand_review_text = tep_break_string(tep_output_string_protected($rand_review['reviews_text']), 15, '-
'); - $info_box_contents[] = array('text' => '
' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $rand_review_text . ' ..
' . tep_image(DIR_WS_IMAGES . 'stars_' . $random_product['reviews_rating'] . '.gif' , sprintf(BOX_REVIEWS_TEXT_OF_5_STARS, $random_product['reviews_rating'])) . '
'); + $reviews_box_contents .= '
' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $rand_review_text . ' ..
' . tep_image(DIR_WS_IMAGES . 'stars_' . $random_product['reviews_rating'] . '.gif' , sprintf(BOX_REVIEWS_TEXT_OF_5_STARS, $random_product['reviews_rating'])) . '
'; } elseif (isset($HTTP_GET_VARS['products_id'])) { // display 'write a review' box - $info_box_contents[] = array('text' => '
' . tep_image(DIR_WS_IMAGES . 'box_write_review.gif', IMAGE_BUTTON_WRITE_REVIEW) . '' . BOX_REVIEWS_WRITE_REVIEW .'
'); + $reviews_box_contents .= '
' . tep_image(DIR_WS_IMAGES . 'box_write_review.gif', IMAGE_BUTTON_WRITE_REVIEW) . '' . BOX_REVIEWS_WRITE_REVIEW .'
'; } else { // display 'no reviews' box - $info_box_contents[] = array('text' => BOX_REVIEWS_NO_REVIEWS); + $reviews_box_contents .= '
' . BOX_REVIEWS_NO_REVIEWS . '
'; } +?> - new infoBox($info_box_contents); +
+
' . BOX_HEADING_REVIEWS . ''; ?>
+ + - - - + +
diff --git a/catalog/includes/boxes/search.php b/catalog/includes/boxes/search.php index b5056abca..d891cd0a7 100644 --- a/catalog/includes/boxes/search.php +++ b/catalog/includes/boxes/search.php @@ -5,27 +5,22 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ ?> - - - - BOX_HEADING_SEARCH); - new infoBoxHeading($info_box_contents, false, false); +
+
- $info_box_contents = array(); - $info_box_contents[] = array('form' => tep_draw_form('quick_find', tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, '', 'NONSSL', false), 'get'), - 'align' => 'center', - 'text' => tep_draw_input_field('keywords', '', 'size="10" maxlength="30" style="width: ' . (BOX_WIDTH-30) . 'px"') . ' ' . tep_hide_session_id() . tep_image_submit('button_quick_find.gif', BOX_HEADING_SEARCH) . '
' . BOX_SEARCH_TEXT . '
' . BOX_SEARCH_ADVANCED_SEARCH . ''); +
- new infoBox($info_box_contents); +' . BOX_SEARCH_TEXT . '
' . BOX_SEARCH_ADVANCED_SEARCH . '' . + ''; ?> - - - + +
+
diff --git a/catalog/includes/boxes/shopping_cart.php b/catalog/includes/boxes/shopping_cart.php index dd34042af..e472e2e4d 100644 --- a/catalog/includes/boxes/shopping_cart.php +++ b/catalog/includes/boxes/shopping_cart.php @@ -5,63 +5,61 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ -?> - - - - BOX_HEADING_SHOPPING_CART); - - new infoBoxHeading($info_box_contents, false, true, tep_href_link(FILENAME_SHOPPING_CART)); $cart_contents_string = ''; + if ($cart->count_contents() > 0) { - $cart_contents_string = ''; + $cart_contents_string = '
'; $products = $cart->get_products(); for ($i=0, $n=sizeof($products); $i<$n; $i++) { - $cart_contents_string .= ''; + $cart_contents_string .= $products[$i]['name']; + + if ((tep_session_is_registered('new_products_id_in_cart')) && ($new_products_id_in_cart == $products[$i]['id'])) { + $cart_contents_string .= ''; + } + + $cart_contents_string .= ''; if ((tep_session_is_registered('new_products_id_in_cart')) && ($new_products_id_in_cart == $products[$i]['id'])) { tep_session_unregister('new_products_id_in_cart'); } } - $cart_contents_string .= '
'; + $cart_contents_string .= '
'; if ((tep_session_is_registered('new_products_id_in_cart')) && ($new_products_id_in_cart == $products[$i]['id'])) { $cart_contents_string .= ''; - } else { - $cart_contents_string .= ''; } - $cart_contents_string .= $products[$i]['quantity'] . ' x '; + $cart_contents_string .= $products[$i]['quantity'] . ' x '; + + if ((tep_session_is_registered('new_products_id_in_cart')) && ($new_products_id_in_cart == $products[$i]['id'])) { + $cart_contents_string .= ''; + } + + $cart_contents_string .= ''; if ((tep_session_is_registered('new_products_id_in_cart')) && ($new_products_id_in_cart == $products[$i]['id'])) { $cart_contents_string .= ''; - } else { - $cart_contents_string .= ''; } - $cart_contents_string .= $products[$i]['name'] . '
'; + + $cart_contents_string .= '' . tep_draw_separator() . '' . + '' . $currencies->format($cart->show_total()) . '' . + ''; } else { - $cart_contents_string .= BOX_SHOPPING_CART_EMPTY; + $cart_contents_string .= '
' . BOX_SHOPPING_CART_EMPTY . '
'; } +?> - $info_box_contents = array(); - $info_box_contents[] = array('text' => $cart_contents_string); +
+
' . BOX_HEADING_SHOPPING_CART . ''; ?>
- if ($cart->count_contents() > 0) { - $info_box_contents[] = array('text' => tep_draw_separator()); - $info_box_contents[] = array('align' => 'right', - 'text' => $currencies->format($cart->show_total())); - } - - new infoBox($info_box_contents); + - - - + +
diff --git a/catalog/includes/boxes/specials.php b/catalog/includes/boxes/specials.php index f37220515..3a69161ae 100644 --- a/catalog/includes/boxes/specials.php +++ b/catalog/includes/boxes/specials.php @@ -5,31 +5,26 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ if ($random_product = tep_random_select("select p.products_id, pd.products_name, p.products_price, p.products_tax_class_id, p.products_image, s.specials_new_products_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_status = '1' and p.products_id = s.products_id and pd.products_id = s.products_id and pd.language_id = '" . (int)$languages_id . "' and s.status = '1' order by s.specials_date_added desc limit " . MAX_RANDOM_SELECT_SPECIALS)) { ?> - - - - BOX_HEADING_SPECIALS); - new infoBoxHeading($info_box_contents, false, false, tep_href_link(FILENAME_SPECIALS)); +
+
' . BOX_HEADING_SPECIALS . ''; ?>
- $info_box_contents = array(); - $info_box_contents[] = array('align' => 'center', - 'text' => '' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $random_product['products_name'] . '
' . $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . '
' . $currencies->display_price($random_product['specials_new_products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . ''); +
- new infoBox($info_box_contents); +' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $random_product['products_name'] . '
' . $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . '
' . $currencies->display_price($random_product['specials_new_products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . ''; ?> - - - + +
+
+ diff --git a/catalog/includes/boxes/whats_new.php b/catalog/includes/boxes/whats_new.php index 082dfab55..0b0ee9696 100644 --- a/catalog/includes/boxes/whats_new.php +++ b/catalog/includes/boxes/whats_new.php @@ -5,41 +5,31 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ if ($random_product = tep_random_select("select products_id, products_image, products_tax_class_id, products_price from " . TABLE_PRODUCTS . " where products_status = '1' order by products_date_added desc limit " . MAX_RANDOM_SELECT_NEW)) { -?> - - - - BOX_HEADING_WHATS_NEW); - - new infoBoxHeading($info_box_contents, false, false, tep_href_link(FILENAME_PRODUCTS_NEW)); - if (tep_not_null($random_product['specials_new_products_price'])) { $whats_new_price = '' . $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . '
'; $whats_new_price .= '' . $currencies->display_price($random_product['specials_new_products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . ''; } else { $whats_new_price = $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])); } +?> - $info_box_contents = array(); - $info_box_contents[] = array('align' => 'center', - 'text' => '' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $random_product['products_name'] . '
' . $whats_new_price); +
+
' . BOX_HEADING_WHATS_NEW . ''; ?>
+ +
+ ' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $random_product['products_name'] . '
' . $whats_new_price; ?> +
+
- new infoBox($info_box_contents); -?> - - - diff --git a/catalog/includes/footer.php b/catalog/includes/footer.php index 77be148b8..99cd7ca19 100644 --- a/catalog/includes/footer.php +++ b/catalog/includes/footer.php @@ -5,34 +5,30 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ require(DIR_WS_INCLUDES . 'counter.php'); ?> - - - - - -
        
-
- - - - -
+ +
+

+
+ -
- - - - -
+ +
+ +
+ + + diff --git a/catalog/includes/header.php b/catalog/includes/header.php index e3d2e0069..bc9a9e43d 100644 --- a/catalog/includes/header.php +++ b/catalog/includes/header.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -14,18 +14,31 @@ echo $messageStack->output('header'); } ?> - - - - - -
' . tep_image(DIR_WS_IMAGES . 'store_logo.png', STORE_NAME) . ''; ?>' . tep_image(DIR_WS_IMAGES . 'header_account.gif', HEADER_TITLE_MY_ACCOUNT) . '  ' . tep_image(DIR_WS_IMAGES . 'header_cart.gif', HEADER_TITLE_CART_CONTENTS) . '  ' . tep_image(DIR_WS_IMAGES . 'header_checkout.gif', HEADER_TITLE_CHECKOUT) . ''; ?>  
- - - - - -
  trail(' » '); ?>  |   |   |    
+ + + +
+
trail(' » '); ?>
+
+ diff --git a/catalog/includes/languages/english/checkout_confirmation.php b/catalog/includes/languages/english/checkout_confirmation.php index 7f03eba39..c2eaf51a4 100644 --- a/catalog/includes/languages/english/checkout_confirmation.php +++ b/catalog/includes/languages/english/checkout_confirmation.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -15,6 +15,7 @@ define('HEADING_TITLE', 'Order Confirmation'); +define('HEADING_SHIPPING_INFORMATION', 'Shipping Information'); define('HEADING_DELIVERY_ADDRESS', 'Delivery Address'); define('HEADING_SHIPPING_METHOD', 'Shipping Method'); define('HEADING_PRODUCTS', 'Products'); diff --git a/catalog/includes/modules/address_book_details.php b/catalog/includes/modules/address_book_details.php index f29218a47..293c29b2b 100644 --- a/catalog/includes/modules/address_book_details.php +++ b/catalog/includes/modules/address_book_details.php @@ -5,26 +5,22 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2007 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ if (!isset($process)) $process = false; ?> - - - - - - - -
- - - - -
- - - -
+ +
+ + +
+ +
+
+ - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - + + - +?> + + + - - - - + + + + + + - - - - - - + + + + + -
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_COMPANY_TEXT . '': ''); ?>
' . ENTRY_COMPANY_TEXT . '': ''); ?>
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
+ +
' . ENTRY_STATE_TEXT; -?>
' . ENTRY_COUNTRY_TEXT . '': ''); ?>
' . ENTRY_COUNTRY_TEXT . '': ''); ?>
+ + diff --git a/catalog/includes/modules/also_purchased_products.php b/catalog/includes/modules/also_purchased_products.php index d38a09cb4..143537de1 100644 --- a/catalog/includes/modules/also_purchased_products.php +++ b/catalog/includes/modules/also_purchased_products.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -14,33 +14,40 @@ $orders_query = tep_db_query("select p.products_id, p.products_image from " . TABLE_ORDERS_PRODUCTS . " opa, " . TABLE_ORDERS_PRODUCTS . " opb, " . TABLE_ORDERS . " o, " . TABLE_PRODUCTS . " p where opa.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and opa.orders_id = opb.orders_id and opb.products_id != '" . (int)$HTTP_GET_VARS['products_id'] . "' and opb.products_id = p.products_id and opb.orders_id = o.orders_id and p.products_status = '1' group by p.products_id order by o.date_purchased desc limit " . MAX_DISPLAY_ALSO_PURCHASED); $num_products_ordered = tep_db_num_rows($orders_query); if ($num_products_ordered >= MIN_DISPLAY_ALSO_PURCHASED) { -?> - - TEXT_ALSO_PURCHASED_PRODUCTS); - - new contentBoxHeading($info_box_contents); - - $row = 0; $col = 0; - $info_box_contents = array(); + + $also_pur_prods_content = ''; while ($orders = tep_db_fetch_array($orders_query)) { $orders['products_name'] = tep_get_products_name($orders['products_id']); - $info_box_contents[$row][$col] = array('align' => 'center', - 'params' => 'class="smallText" width="33%" valign="top"', - 'text' => '' . tep_image(DIR_WS_IMAGES . $orders['products_image'], $orders['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $orders['products_name'] . ''); + + if ($col === 0) { + $also_pur_prods_content .= ''; + } + + $also_pur_prods_content .= ''; $col ++; + if ($col > 2) { + $also_pur_prods_content .= ''; + $col = 0; - $row ++; } } - new contentBox($info_box_contents); + $also_pur_prods_content .= '
' . tep_image(DIR_WS_IMAGES . $orders['products_image'], $orders['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $orders['products_name'] . '
'; ?> - + +
+ +
+
+ +
+ + +
+ - + +
+
+ - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - + + - + + + + - - - - -
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_GENDER_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_FIRST_NAME_TEXT . '': ''); ?>
' . ENTRY_LAST_NAME_TEXT . '': ''); ?>
' . ENTRY_COMPANY_TEXT . '': ''); ?>
' . ENTRY_COMPANY_TEXT . '': ''); ?>
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_STREET_ADDRESS_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_SUBURB_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
' . ENTRY_POST_CODE_TEXT . '': ''); ?>
' . ENTRY_CITY_TEXT . '': ''); ?>
+ +
+ ' . ENTRY_STATE_TEXT; ?> -
' . ENTRY_COUNTRY_TEXT . '': ''); ?>
+ + + + ' . ENTRY_COUNTRY_TEXT . '': ''); ?> + + + diff --git a/catalog/includes/modules/downloads.php b/catalog/includes/modules/downloads.php index 9a3cc3cea..cc7aa5dd5 100644 --- a/catalog/includes/modules/downloads.php +++ b/catalog/includes/modules/downloads.php @@ -5,13 +5,11 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2007 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ -?> - - 0) { ?> - - - - - - - - - - - - + + + +
+
+ - - -' . "\n"; + // The link will appear only if: // - Download remaining count is > 0, AND // - The file is present in the DOWNLOAD directory, AND EITHER // - No expiry date is enforced (maxdays == 0), OR // - The expiry date is not reached if ( ($downloads['download_count'] > 0) && (file_exists(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'])) && ( ($downloads['download_maxdays'] == 0) || ($download_timestamp > time())) ) { - echo ' ' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } -?> - -' . TABLE_HEADING_DOWNLOAD_DATE . tep_date_long($download_expiry) . '' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } ?> - -
' . $downloads['products_name'] . '' . $downloads['products_name'] . '' . $downloads['products_name'] . '' . $downloads['products_name'] . '' . $downloads['download_count'] . TABLE_HEADING_DOWNLOAD_COUNT . '
' . TABLE_HEADING_DOWNLOAD_DATE . tep_date_long($download_expiry) . '' . $downloads['download_count'] . TABLE_HEADING_DOWNLOAD_COUNT . '
- + + + - - - - -

' . HEADER_TITLE_MY_ACCOUNT . ''); ?>

- + +

' . HEADER_TITLE_MY_ACCOUNT . ''); ?>

+ + + + + - diff --git a/catalog/includes/modules/new_products.php b/catalog/includes/modules/new_products.php index c2c1e9a12..58ea9f44c 100644 --- a/catalog/includes/modules/new_products.php +++ b/catalog/includes/modules/new_products.php @@ -5,17 +5,10 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2008 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ -?> - - sprintf(TABLE_HEADING_NEW_PRODUCTS, strftime('%B'))); - - new contentBoxHeading($info_box_contents); if ( (!isset($new_products_category_id)) || ($new_products_category_id == '0') ) { $new_products_query = tep_db_query("select p.products_id, p.products_image, p.products_tax_class_id, pd.products_name, if(s.status, s.specials_new_products_price, p.products_price) as products_price from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by p.products_date_added desc limit " . MAX_DISPLAY_NEW_PRODUCTS); @@ -23,21 +16,32 @@ $new_products_query = tep_db_query("select distinct p.products_id, p.products_image, p.products_tax_class_id, pd.products_name, if(s.status, s.specials_new_products_price, p.products_price) as products_price from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by p.products_date_added desc limit " . MAX_DISPLAY_NEW_PRODUCTS); } - $row = 0; $col = 0; - $info_box_contents = array(); + + $new_prods_content = ''; while ($new_products = tep_db_fetch_array($new_products_query)) { - $info_box_contents[$row][$col] = array('align' => 'center', - 'params' => 'class="smallText" width="33%" valign="top"', - 'text' => '' . tep_image(DIR_WS_IMAGES . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $new_products['products_name'] . '
' . $currencies->display_price($new_products['products_price'], tep_get_tax_rate($new_products['products_tax_class_id']))); + if ($col === 0) { + $new_prods_content .= ''; + } + + $new_prods_content .= ''; $col ++; + if ($col > 2) { + $new_prods_content .= ''; + $col = 0; - $row ++; } } - new contentBox($info_box_contents); + $new_prods_content .= '
' . tep_image(DIR_WS_IMAGES . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $new_products['products_name'] . '
' . $currencies->display_price($new_products['products_price'], tep_get_tax_rate($new_products['products_tax_class_id'])) . '
'; ?> - + +
+ + + +
+ +
diff --git a/catalog/includes/modules/product_listing.php b/catalog/includes/modules/product_listing.php index 7cb10b9f2..fde0de0f6 100644 --- a/catalog/includes/modules/product_listing.php +++ b/catalog/includes/modules/product_listing.php @@ -5,27 +5,41 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ $listing_split = new splitPageResults($listing_sql, MAX_DISPLAY_SEARCH_RESULTS, 'p.products_id'); +?> + +
+number_of_rows > 0) && ( (PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3') ) ) { ?> - - - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
+ +
+ display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?> + + display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?> +
+ +
+ - $list_box_contents = array(); +
+ +' . + ' '; for ($col=0, $n=sizeof($column_list); $col<$n; $col++) { + $lc_align = ''; + switch ($column_list[$col]) { case 'PRODUCT_LIST_MODEL': $lc_text = TABLE_HEADING_MODEL; @@ -65,100 +79,95 @@ $lc_text = tep_create_sort_heading($HTTP_GET_VARS['sort'], $col+1, $lc_text); } - $list_box_contents[0][] = array('align' => $lc_align, - 'params' => 'class="productListing-heading"', - 'text' => ' ' . $lc_text . ' '); + $prod_list_contents .= '  ' . $lc_text . ' '; } + $prod_list_contents .= ' ' . + ''; + if ($listing_split->number_of_rows > 0) { $rows = 0; $listing_query = tep_db_query($listing_split->sql_query); + + $prod_list_contents .= ''; + while ($listing = tep_db_fetch_array($listing_query)) { $rows++; - if (($rows/2) == floor($rows/2)) { - $list_box_contents[] = array('params' => 'class="productListing-even"'); - } else { - $list_box_contents[] = array('params' => 'class="productListing-odd"'); - } - - $cur_row = sizeof($list_box_contents) - 1; + $prod_list_contents .= ' '; for ($col=0, $n=sizeof($column_list); $col<$n; $col++) { - $lc_align = ''; - switch ($column_list[$col]) { case 'PRODUCT_LIST_MODEL': - $lc_align = ''; - $lc_text = ' ' . $listing['products_model'] . ' '; + $prod_list_contents .= ' '; break; case 'PRODUCT_LIST_NAME': - $lc_align = ''; if (isset($HTTP_GET_VARS['manufacturers_id'])) { - $lc_text = '' . $listing['products_name'] . ''; + $prod_list_contents .= ' '; } else { - $lc_text = ' ' . $listing['products_name'] . ' '; + $prod_list_contents .= ' '; } break; case 'PRODUCT_LIST_MANUFACTURER': - $lc_align = ''; - $lc_text = ' ' . $listing['manufacturers_name'] . ' '; + $prod_list_contents .= ' '; break; case 'PRODUCT_LIST_PRICE': - $lc_align = 'right'; if (tep_not_null($listing['specials_new_products_price'])) { - $lc_text = ' ' . $currencies->display_price($listing['products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . '  ' . $currencies->display_price($listing['specials_new_products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . ' '; + $prod_list_contents .= ' '; } else { - $lc_text = ' ' . $currencies->display_price($listing['products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . ' '; + $prod_list_contents .= ' '; } break; case 'PRODUCT_LIST_QUANTITY': - $lc_align = 'right'; - $lc_text = ' ' . $listing['products_quantity'] . ' '; + $prod_list_contents .= ' '; break; case 'PRODUCT_LIST_WEIGHT': - $lc_align = 'right'; - $lc_text = ' ' . $listing['products_weight'] . ' '; + $prod_list_contents .= ' '; break; case 'PRODUCT_LIST_IMAGE': - $lc_align = 'center'; if (isset($HTTP_GET_VARS['manufacturers_id'])) { - $lc_text = '' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; + $prod_list_contents .= ' '; } else { - $lc_text = ' ' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ' '; + $prod_list_contents .= ' '; } break; case 'PRODUCT_LIST_BUY_NOW': - $lc_align = 'center'; - $lc_text = tep_draw_button(IMAGE_BUTTON_BUY_NOW, 'cart', tep_href_link(basename($PHP_SELF), tep_get_all_get_params(array('action')) . 'action=buy_now&products_id=' . $listing['products_id'])) . ' '; + $prod_list_contents .= ' '; break; } - - $list_box_contents[$cur_row][] = array('align' => $lc_align, - 'params' => 'class="productListing-data"', - 'text' => $lc_text); } + + $prod_list_contents .= ' '; } - new productListingBox($list_box_contents); + $prod_list_contents .= '
 ' . $listing['products_model'] . ' ' . $listing['products_name'] . ' ' . $listing['products_name'] . '  ' . $listing['manufacturers_name'] . '  ' . $currencies->display_price($listing['products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . '  ' . $currencies->display_price($listing['specials_new_products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . '  ' . $currencies->display_price($listing['products_price'], tep_get_tax_rate($listing['products_tax_class_id'])) . '  ' . $listing['products_quantity'] . '  ' . $listing['products_weight'] . ' ' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ' ' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ' ' . tep_draw_button(IMAGE_BUTTON_BUY_NOW, 'cart', tep_href_link(basename($PHP_SELF), tep_get_all_get_params(array('action')) . 'action=buy_now&products_id=' . $listing['products_id'])) . ' 
'; +?> + + +
+ + - $list_box_contents[0] = array('params' => 'class="productListing-odd"'); - $list_box_contents[0][] = array('params' => 'class="productListing-data"', - 'text' => TEXT_NO_PRODUCTS); +

- new productListingBox($list_box_contents); +number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3')) ) { ?> - - - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
+ +
+ +
+ display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?> + + display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?> +
+ + +
diff --git a/catalog/includes/modules/upcoming_products.php b/catalog/includes/modules/upcoming_products.php index 12011cbbc..93d936601 100644 --- a/catalog/includes/modules/upcoming_products.php +++ b/catalog/includes/modules/upcoming_products.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -13,38 +13,28 @@ $expected_query = tep_db_query("select p.products_id, pd.products_name, products_date_available as date_expected from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where to_days(products_date_available) >= to_days(now()) and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by " . EXPECTED_PRODUCTS_FIELD . " " . EXPECTED_PRODUCTS_SORT . " limit " . MAX_DISPLAY_UPCOMING_PRODUCTS); if (tep_db_num_rows($expected_query) > 0) { ?> - - -
- - - - - - - - + +
+ +
+
+ + +
+ +
    
' . "\n"; - } else { - echo ' ' . "\n"; - } - - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } ?> - - - -
 ' . $expected['products_name'] . '  ' . tep_date_short($expected['date_expected']) . ' 
' . $expected['products_name'] . '' . tep_date_short($expected['date_expected']) . '
- - + + + + diff --git a/catalog/includes/template_top.php b/catalog/includes/template_top.php index dca693d48..8c13ee6df 100644 --- a/catalog/includes/template_top.php +++ b/catalog/includes/template_top.php @@ -18,10 +18,10 @@ <?php echo tep_output_string_protected($oscTemplate->getTitle()); ?> - + getHeaderTags(); ?> diff --git a/catalog/index.php b/catalog/index.php index 1a130ecb5..8020b9938 100644 --- a/catalog/index.php +++ b/catalog/index.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -38,23 +38,13 @@ $category_query = tep_db_query("select cd.categories_name, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'"); $category = tep_db_fetch_array($category_query); ?> - - - - - - - + +

+ +
+
+
- - - - -
-
- - - - - - - - - -
- ' . tep_image(DIR_WS_IMAGES . $categories['categories_image'], $categories['categories_name'], SUBCATEGORY_IMAGE_WIDTH, SUBCATEGORY_IMAGE_HEIGHT) . '
' . $categories['categories_name'] . '' . "\n"; + echo ' ' . "\n"; if ((($rows / MAX_DISPLAY_CATEGORIES_PER_ROW) == floor($rows / MAX_DISPLAY_CATEGORIES_PER_ROW)) && ($rows != $number_of_categories)) { - echo ' ' . "\n"; - echo ' ' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; } } // needed for the new products module shown below $new_products_category_id = $current_category_id; ?> - -
' . tep_image(DIR_WS_IMAGES . $categories['categories_image'], $categories['categories_name'], SUBCATEGORY_IMAGE_WIDTH, SUBCATEGORY_IMAGE_HEIGHT) . '
' . $categories['categories_name'] . '
+ +
+ + + + + + - - - - - - - - - - -
- - + +

+ +
+
+ 0) { @@ -219,7 +219,7 @@ } $filterlist_query = tep_db_query($filterlist_sql); if (tep_db_num_rows($filterlist_query) > 1) { - echo '
' . "\n"; + echo tep_hide_session_id() . '' . "\n"; } } -// Get the right image for the top-right - $image = DIR_WS_IMAGES . 'table_background_list.gif'; - if (isset($HTTP_GET_VARS['manufacturers_id'])) { - $image = tep_db_query("select manufacturers_image from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'"); - $image = tep_db_fetch_array($image); - $image = $image['manufacturers_image']; - } elseif ($current_category_id) { - $image = tep_db_query("select categories_image from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'"); - $image = tep_db_fetch_array($image); - $image = $image['categories_image']; - } + include(DIR_WS_MODULES . FILENAME_PRODUCT_LISTING); ?> - - -
' . tep_draw_form('filter', FILENAME_DEFAULT, 'get') . TEXT_SHOW . ' '; + echo '
' . tep_draw_form('filter', FILENAME_DEFAULT, 'get') . TEXT_SHOW . ' '; if (isset($HTTP_GET_VARS['manufacturers_id'])) { echo tep_draw_hidden_field('manufacturers_id', $HTTP_GET_VARS['manufacturers_id']); $options = array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)); @@ -232,71 +232,40 @@ $options[] = array('id' => $filterlist['id'], 'text' => $filterlist['name']); } echo tep_draw_pull_down_menu('filter_id', $options, (isset($HTTP_GET_VARS['filter_id']) ? $HTTP_GET_VARS['filter_id'] : ''), 'onchange="this.form.submit()"'); - echo tep_hide_session_id() . '
+ + + + - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - + +

+ +
+
+
+ +
+ +
+ +
+
+ -
+ + + - +

- - - - - - - size('login') > 0) { -?> - - - - - - -' . $messageStack->output('login') . '

'; } - - if ($cart->count_contents() > 0) { ?> + +
+ + +
+

+

+ +

+
+
+ +
+ + +
+

+ + + +
- - - - -
output('login'); ?>
- - - - + + - - + + -
- - - - - - - - -
- - - -
- - - - - - - - - - - - -

' . TEXT_NEW_CUSTOMER_INTRODUCTION; ?>
- - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
' . TEXT_PASSWORD_FORGOTTEN . ''; ?>
- - - - - -
+ + +

' . TEXT_PASSWORD_FORGOTTEN . ''; ?>

+ +

+ + + + - - - - - - - - - - -
- - - - -
- - - - - - - - - -
- - - -
- - - - - -
+

+ +
+
+ +
+ +
+ +
+
- - - - - - - +

+ size('password_forgotten') > 0) { -?> - - - - - - -' . $messageStack->output('password_forgotten') . '

'; } ?> + + + +
+
+
+ +
+ +
- - - - -
output('password_forgotten'); ?>
- - - - - - - + + -
- - - -
- - - - - - - - - - - - - - - -
' . ENTRY_EMAIL_ADDRESS . ' ' . tep_draw_input_field('email_address'); ?>
- - - -
- - - - - - -
+ + +
+ +
+ + + +
+ + + + - - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - -
- - - - - -
+

+ +
+
+ +
+ +
+ +
+
- - - - - - - - - - + +
+
+ +
+ +
+ +
+
+ - - - - - - - -
TEXT_PRODUCT_NOT_FOUND))); ?>
- - - -
- - - - - -
- - - - -
+ + + +
+

+

+
+ +
+
+ - - - - -
+ +
-
+
+ -

+ + + 0) { ?> - - - - + +

+ +
- - - - + + + + -
+
+ - - - - - - 0) { ?> - - - - - - + +

+ - - - - - - + +

+ date('Y-m-d H:i:s')) { ?> - - - + +

+ - - - + +

+ - - - - - - - - -
- - - - - - -
- - - - - - + +
+
+ + +
+ - - - + + + + + diff --git a/catalog/product_reviews.php b/catalog/product_reviews.php index 07951ea7f..d1f6d3eac 100644 --- a/catalog/product_reviews.php +++ b/catalog/product_reviews.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -44,140 +44,95 @@ function popupWindow(url) { } //--> - - - - - - - - - - -
- - - - -
- - - -
+
+

+

+
+ +
+ + + +
+ + + +

+
+ number_of_rows > 0) { if ((PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3')) { ?> -
- - - - - + +
+

display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>

+ +

display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>

+
+ +
+ sql_query); while ($reviews = tep_db_fetch_array($reviews_query)) { ?> - - - - - - - - - + +
+ ' . sprintf(TEXT_REVIEW_BY, tep_output_string_protected($reviews['customers_name'])) . ''; ?> + +
+ +
+ ') . ((strlen($reviews['reviews_text']) >= 100) ? '..' : '') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $reviews['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])) . ''; ?> +
+ - - - - - - - + +
+ +
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> - - - - - - + +
+

display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>

+ +

display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>

+
+ - - - -
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
- - - - -
' . sprintf(TEXT_REVIEW_BY, tep_output_string_protected($reviews['customers_name'])) . ''; ?>
- - - -
- - - - - -
') . ((strlen($reviews['reviews_text']) >= 100) ? '..' : '') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $reviews['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])) . ''; ?>
TEXT_NO_REVIEWS))); ?>
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
- - - -
- - - - - - -
- - - -
- - - -' . tep_draw_button(IMAGE_BUTTON_IN_CART, 'cart', tep_href_link(basename($PHP_SELF), tep_get_all_get_params(array('action')) . 'action=buy_now')) . '

'; -?> -
-
+
+ +
+ + + +
+ - - - - - - - - - - -
- - - - -
- - - -
- - - - - - - - - - - - -
- - - - -
' . sprintf(TEXT_REVIEW_BY, tep_output_string_protected($review['customers_name'])) . ''; ?>
- - - -
- - - - - -
') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $review['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $review['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $review['reviews_rating'])) . ''; ?>
- - - -
- - - - - - -
- - - -
+
+

+

+
+ +
+ + +
+ +

+
+ ' . tep_draw_button(IMAGE_BUTTON_IN_CART, 'cart', tep_href_link(basename($PHP_SELF), tep_get_all_get_params(array('action')) . 'action=buy_now')) . '

'; ?> -
-
+ +
+ + +
+ +
+ ') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $review['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $review['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $review['reviews_rating'])) . ''; ?> +
+ +
+ +
+ + + +
+ - - - - - - - +
+

+

+
+ size('review') > 0) { -?> - - - - - - -' . $messageStack->output('review') . '

'; } ?> - - + +
+
- - - - -
output('review'); ?>
- - - -
- - - - - - - - - - - - - - - -
' . SUB_TITLE_FROM . ' ' . tep_output_string_protected($customer['customers_firstname'] . ' ' . $customer['customers_lastname']); ?>
- - - -
- - - - - - - - - -
' . SUB_TITLE_RATING . ' ' . 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; ?>
- - - -
- - - - - - -
- - - -
+ + + +
+ + +
+ +

+
+ ' . tep_draw_button(IMAGE_BUTTON_IN_CART, 'cart', tep_href_link(basename($PHP_SELF), tep_get_all_get_params(array('action')) . 'action=buy_now')) . '

'; ?> -
-
+ + + + + + + + + + + -
' . TEXT_NO_HTML . ''; ?>
+ + +
+ +
+ + + +
+ + + + - - - - - - - +

+ +
+
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> -
- - - - - + +
+ display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?> + + display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS_NEW); ?> +
+ +
+ - -
- - - - -
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS_NEW); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
+ number_of_rows > 0) { +?> + +
+ +sql_query); while ($products_new = tep_db_fetch_array($products_new_query)) { if ($new_price = tep_get_products_special_price($products_new['products_id'])) { @@ -65,44 +60,45 @@ $products_price = $currencies->display_price($products_new['products_price'], tep_get_tax_rate($products_new['products_tax_class_id'])); } ?> - - - - - - - - + + + + + - - - - - - + +
' . tep_image(DIR_WS_IMAGES . $products_new['products_image'], $products_new['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; ?>' . $products_new['products_name'] . '
' . TEXT_DATE_ADDED . ' ' . tep_date_long($products_new['products_date_added']) . '
' . TEXT_MANUFACTURER . ' ' . $products_new['manufacturers_name'] . '

' . TEXT_PRICE . ' ' . $products_price; ?>
' . tep_image(DIR_WS_IMAGES . $products_new['products_image'], $products_new['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; ?>' . $products_new['products_name'] . '
' . TEXT_DATE_ADDED . ' ' . tep_date_long($products_new['products_date_added']) . '
' . TEXT_MANUFACTURER . ' ' . $products_new['manufacturers_name'] . '

' . TEXT_PRICE . ' ' . $products_price; ?>
+ -
- + +
+ +
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> - - - - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS_NEW); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
- + +
+ +
+ display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?> + + display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS_NEW); ?> +
+ - + + + - - - - - - - - - - - - - - + +
+ +
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> - - - - - - + +
+ +
+

display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>

+ +

display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>

+
+ -
- - - - -
+

+ +
+ number_of_rows > 0) { if ((PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3')) { ?> -
- - - - - + +
+

display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>

+ +

display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>

+
+ +
+ sql_query); while ($reviews = tep_db_fetch_array($reviews_query)) { ?> - - - - - - - - - + +
+ ' . $reviews['products_name'] . ' ' . sprintf(TEXT_REVIEW_BY, tep_output_string_protected($reviews['customers_name'])) . ''; ?> + +
+ +
+
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
- - - - -
' . $reviews['products_name'] . ' ' . sprintf(TEXT_REVIEW_BY, tep_output_string_protected($reviews['customers_name'])) . ''; ?>
- - - -
- - - - - - -
' . tep_image(DIR_WS_IMAGES . $reviews['products_image'], $reviews['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; ?>') . ((strlen($reviews['reviews_text']) >= 100) ? '..' : '') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $reviews['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])) . ''; ?>
+ + + + +
' . tep_image(DIR_WS_IMAGES . $reviews['products_image'], $reviews['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; ?>') . ((strlen($reviews['reviews_text']) >= 100) ? '..' : '') . '

' . sprintf(TEXT_REVIEW_RATING, tep_image(DIR_WS_IMAGES . 'stars_' . $reviews['reviews_rating'] . '.gif', sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])), sprintf(TEXT_OF_5_STARS, $reviews['reviews_rating'])) . ''; ?>
+ + - -
TEXT_NO_REVIEWS))); ?>
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_REVIEWS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
- - + + - - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - -
- - - - - -
+

+ +
+
+

+ +

+
+
- - - - - - - +

+ count_contents() > 0) { ?> - - ' . + ' ' . + ' '; + } +?> - $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'])); +
- - - - -
- 'center', - 'params' => 'class="productListing-heading"', - 'text' => TABLE_HEADING_REMOVE); - $info_box_contents[0][] = array('params' => 'class="productListing-heading"', - 'text' => TABLE_HEADING_PRODUCTS); + - $info_box_contents[0][] = array('align' => 'center', - 'params' => 'class="productListing-heading"', - 'text' => TABLE_HEADING_QUANTITY); +
+ - $info_box_contents[0][] = array('align' => 'right', - 'params' => 'class="productListing-heading"', - 'text' => TABLE_HEADING_TOTAL); +
+ + +get_products(); @@ -86,22 +69,12 @@ } for ($i=0, $n=sizeof($products); $i<$n; $i++) { - if (($i/2) == floor($i/2)) { - $info_box_contents[] = array('params' => 'class="productListing-even"'); - } else { - $info_box_contents[] = array('params' => 'class="productListing-odd"'); - } - - $cur_row = sizeof($info_box_contents) - 1; - - $info_box_contents[$cur_row][] = array('align' => 'center', - 'params' => 'class="productListing-data" valign="top"', - 'text' => tep_draw_checkbox_field('cart_delete[]', $products[$i]['id'])); + echo ' '; $products_name = '
' . ' ' . - ' ' . - ' ' . + ' ' . ' ' . '
' . tep_image(DIR_WS_IMAGES . $products[$i]['image'], $products[$i]['name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '' . $products[$i]['name'] . ''; + ' ' . tep_image(DIR_WS_IMAGES . $products[$i]['image'], $products[$i]['name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '' . $products[$i]['name'] . ''; if (STOCK_CHECK == 'true') { $stock_check = tep_check_stock($products[$i]['id'], $products[$i]['quantity']); @@ -115,129 +88,88 @@ if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) { reset($products[$i]['attributes']); while (list($option, $value) = each($products[$i]['attributes'])) { - $products_name .= '
- ' . $products[$i][$option]['products_options_name'] . ' ' . $products[$i][$option]['products_options_values_name'] . ''; + $products_name .= '
- ' . $products[$i][$option]['products_options_name'] . ' ' . $products[$i][$option]['products_options_values_name'] . ''; } } + $products_name .= '

' . tep_draw_input_field('cart_quantity[]', $products[$i]['quantity'], 'size="4"') . tep_draw_hidden_field('products_id[]', $products[$i]['id']) . tep_draw_button(IMAGE_BUTTON_UPDATE, 'refresh') . '   or remove'; + $products_name .= '
'; - $info_box_contents[$cur_row][] = array('params' => 'class="productListing-data"', - 'text' => $products_name); + echo '
' . $products_name . '' . $currencies->display_price($products[$i]['final_price'], tep_get_tax_rate($products[$i]['tax_class_id']), $products[$i]['quantity']) . '
- $info_box_contents[$cur_row][] = array('align' => 'right', - 'params' => 'class="productListing-data" valign="top"', - 'text' => '' . $currencies->display_price($products[$i]['final_price'], tep_get_tax_rate($products[$i]['tax_class_id']), $products[$i]['quantity']) . ''); - } +

format($cart->show_total()); ?>

- new productListingBox($info_box_contents); -?> - - - - - - - format($cart->show_total()); ?> - - -
- + +

+ - -
- + +

+ - - - - - - - - -
- - - -path)-2; - if (isset($navigation->path[$back])) { -?> - - - - - -
path[$back]['page'], tep_array_to_string($navigation->path[$back]['get'], array('action')), $navigation->path[$back]['mode'])); ?>
- + +
+ +

+ checkout_initialization_method(); if (!empty($initialize_checkout_methods)) { ?> - - - - - - + +

+ - - - - - - + +

+ - - TEXT_CART_EMPTY))); ?> - - - - - - - - - -
- - - - - -
- + + + + + + - + +
+
+ + +

+
+
diff --git a/catalog/specials.php b/catalog/specials.php index fe9ba027f..f7f467509 100644 --- a/catalog/specials.php +++ b/catalog/specials.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -19,80 +19,64 @@ require(DIR_WS_INCLUDES . 'template_top.php'); ?> - - - - - - - +

+ +
+
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> + +
- - - - -
- - - - + + +
- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_SPECIALS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
display_count(TEXT_DISPLAY_NUMBER_OF_SPECIALS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
+ + + - +
- sql_query); while ($specials = tep_db_fetch_array($specials_query)) { $row++; - echo ' ' . "\n"; + echo ' ' . "\n"; if ((($row / 3) == floor($row / 3))) { ?> - - - - - + + - -
' . tep_image(DIR_WS_IMAGES . $specials['products_image'], $specials['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $specials['products_name'] . '
' . $currencies->display_price($specials['products_price'], tep_get_tax_rate($specials['products_tax_class_id'])) . '
' . $currencies->display_price($specials['specials_new_products_price'], tep_get_tax_rate($specials['products_tax_class_id'])) . '		' . tep_image(DIR_WS_IMAGES . $specials['products_image'], $specials['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $specials['products_name'] . '
' . $currencies->display_price($specials['products_price'], tep_get_tax_rate($specials['products_tax_class_id'])) . '
' . $currencies->display_price($specials['specials_new_products_price'], tep_get_tax_rate($specials['products_tax_class_id'])) . '
+ number_of_rows > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3'))) { ?> + + - + + -

- - - - -
display_count(TEXT_DISPLAY_NUMBER_OF_SPECIALS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
display_count(TEXT_DISPLAY_NUMBER_OF_SPECIALS); ?>display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?>
diff --git a/catalog/ssl_check.php b/catalog/ssl_check.php index 7bd060b6b..00447cab3 100644 --- a/catalog/ssl_check.php +++ b/catalog/ssl_check.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2003 osCommerce + Copyright (c) 2010 osCommerce Released under the GNU General Public License */ @@ -19,35 +19,25 @@ require(DIR_WS_INCLUDES . 'template_top.php'); ?> - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -
BOX_INFORMATION_HEADING))); ?>
BOX_INFORMATION))); ?>
+

+ +
+
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
- - - - - - - +

+ size('friend') > 0) { + echo '

' . $messageStack->output('friend') . '

'; + } ?> + + + +
+
+ + +
+ +
+
- - - - -
- + + - + + - +
output('friend'); ?>
+ + + + +
+ - + + - + + +
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - - - - - - -
- - - -
- - - - - - - - -
' . ENTRY_FIRST_NAME_TEXT . ''; ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . ''; ?>
- - - -
' . ENTRY_FIRST_NAME_TEXT . ''; ?>
' . ENTRY_EMAIL_ADDRESS_TEXT . ''; ?>
+
+ + + +
+ - + -
- - - -
- - - - - - -
+ +
+ +
+ +
+ + + +
+ + +