From 65a7fdc942d043dc442f800c54885b9fb8c54d91 Mon Sep 17 00:00:00 2001 From: gburton Date: Tue, 16 Aug 2016 17:44:42 +0100 Subject: [PATCH] Hardcode Paths --- account.php | 8 ++--- account_edit.php | 8 ++--- account_history.php | 8 ++--- account_history_info.php | 12 +++---- account_newsletters.php | 8 ++--- account_notifications.php | 8 ++--- account_password.php | 8 ++--- address_book.php | 8 ++--- address_book_process.php | 10 +++--- advanced_search.php | 8 ++--- advanced_search_result.php | 10 +++--- checkout_confirmation.php | 16 ++++----- checkout_payment.php | 12 +++---- checkout_payment_address.php | 10 +++--- checkout_process.php | 12 +++---- checkout_shipping.php | 14 ++++---- checkout_shipping_address.php | 12 +++---- checkout_success.php | 8 ++--- conditions.php | 8 ++--- contact_us.php | 8 ++--- cookie_usage.php | 8 ++--- create_account.php | 8 ++--- create_account_success.php | 8 ++--- download.php | 10 +++--- .../content/account/braintree/cards.php | 12 +++---- .../content/account/sage_pay/cards.php | 12 +++---- ext/modules/content/account/set_password.php | 8 ++--- ext/modules/content/account/stripe/cards.php | 12 +++---- ext/modules/payment/inpay/pb_handler.php | 4 +-- ext/modules/payment/ipayment/callback_cc.php | 2 +- ext/modules/payment/ipayment/callback_elv.php | 2 +- ext/modules/payment/ipayment/callback_pp.php | 2 +- ext/modules/payment/moneybookers/checkout.php | 16 ++++----- ext/modules/payment/paypal/express.php | 28 +++++++-------- .../payment/paypal/express_payflow.php | 20 +++++------ .../payment/paypal/hosted_checkout.php | 2 +- ext/modules/payment/paypal/pro_hosted_ipn.php | 2 +- ext/modules/payment/paypal/standard_ipn.php | 2 +- ext/modules/payment/sage_pay/checkout.php | 16 ++++----- .../payment/sage_pay/direct_3dauth.php | 6 ++-- ext/modules/payment/sage_pay/redirect.php | 4 +-- ext/modules/payment/sage_pay/server.php | 2 +- includes/application_top.php | 34 +++++++++---------- includes/classes/action_recorder.php | 6 ++-- includes/classes/boxes.php | 12 +++---- includes/classes/order_total.php | 4 +-- includes/classes/osc_template.php | 20 +++++------ includes/classes/payment.php | 4 +-- includes/classes/shipping.php | 4 +-- includes/configure.php | 8 ----- includes/functions/banner.php | 2 +- includes/functions/cache.php | 6 ++-- includes/functions/general.php | 2 +- includes/functions/html_output.php | 8 ++--- includes/functions/password_funcs.php | 4 +-- includes/modules/also_purchased_products.php | 2 +- includes/modules/boxes/bm_best_sellers.php | 2 +- includes/modules/boxes/bm_card_acceptance.php | 8 ++--- includes/modules/boxes/bm_categories.php | 2 +- includes/modules/boxes/bm_currencies.php | 2 +- includes/modules/boxes/bm_information.php | 2 +- includes/modules/boxes/bm_languages.php | 6 ++-- .../modules/boxes/bm_manufacturer_info.php | 4 +-- includes/modules/boxes/bm_manufacturers.php | 2 +- includes/modules/boxes/bm_order_history.php | 2 +- .../boxes/bm_product_notifications.php | 2 +- .../boxes/bm_product_social_bookmarks.php | 6 ++-- includes/modules/boxes/bm_reviews.php | 4 +-- includes/modules/boxes/bm_search.php | 2 +- includes/modules/boxes/bm_shopping_cart.php | 2 +- includes/modules/boxes/bm_specials.php | 2 +- includes/modules/boxes/bm_whats_new.php | 2 +- includes/modules/boxes/templates/specials.php | 2 +- .../modules/boxes/templates/whats_new.php | 2 +- .../checkout_success/cm_cs_downloads.php | 2 +- .../cm_cs_product_notifications.php | 2 +- .../checkout_success/cm_cs_thank_you.php | 2 +- .../content/footer/cm_footer_account.php | 2 +- .../content/footer/cm_footer_contact_us.php | 2 +- .../footer/cm_footer_information_links.php | 2 +- .../modules/content/footer/cm_footer_text.php | 2 +- .../cm_footer_extra_copyright.php | 2 +- .../footer_suffix/cm_footer_extra_icons.php | 2 +- .../content/header/cm_header_breadcrumb.php | 2 +- .../content/header/cm_header_buttons.php | 2 +- .../modules/content/header/cm_header_logo.php | 2 +- .../content/header/cm_header_messagestack.php | 2 +- .../content/header/cm_header_search.php | 2 +- .../modules/content/header/templates/logo.php | 2 +- .../content/index/cm_i_customer_greeting.php | 2 +- .../content/index/cm_i_new_products.php | 2 +- .../modules/content/index/cm_i_text_main.php | 2 +- .../content/index/cm_i_upcoming_products.php | 2 +- .../content/index/templates/new_products.php | 2 +- .../cm_in_category_description.php | 2 +- .../index_nested/cm_in_category_listing.php | 2 +- .../index_nested/cm_in_new_products.php | 2 +- .../templates/category_listing.php | 2 +- .../templates/category_new_products.php | 2 +- .../content/login/cm_create_account_link.php | 2 +- .../modules/content/login/cm_login_form.php | 2 +- .../modules/content/login/cm_paypal_login.php | 6 ++-- .../modules/content/navigation/cm_navbar.php | 6 ++-- .../content/product_info/cm_pi_gtin.php | 2 +- .../content/product_info/cm_pi_reviews.php | 2 +- .../ht_google_adwords_conversion.php | 2 +- .../modules/header_tags/ht_mailchimp_360.php | 4 +-- .../header_tags/ht_product_opengraph.php | 2 +- .../header_tags/ht_twitter_product_card.php | 2 +- .../modules/navbar_modules/nb_account.php | 2 +- includes/modules/navbar_modules/nb_brand.php | 2 +- .../modules/navbar_modules/nb_currencies.php | 2 +- .../navbar_modules/nb_hamburger_button.php | 2 +- includes/modules/navbar_modules/nb_home.php | 2 +- .../modules/navbar_modules/nb_languages.php | 2 +- .../navbar_modules/nb_new_products.php | 2 +- .../modules/navbar_modules/nb_reviews.php | 2 +- .../navbar_modules/nb_shopping_cart.php | 2 +- .../navbar_modules/nb_special_offers.php | 2 +- .../navbar_modules/nb_testimonials.php | 2 +- .../navbar_modules/templates/languages.php | 4 +-- includes/modules/new_products.php | 2 +- includes/modules/payment/braintree_cc.php | 4 +-- includes/modules/payment/psigate.php | 2 +- includes/modules/product_listing.php | 4 +-- includes/modules/shipping/usps.php | 2 +- includes/modules/social_bookmarks/sb_digg.php | 2 +- .../modules/social_bookmarks/sb_email.php | 2 +- .../modules/social_bookmarks/sb_facebook.php | 2 +- .../social_bookmarks/sb_google_plus_one.php | 2 +- .../social_bookmarks/sb_google_plus_share.php | 2 +- .../modules/social_bookmarks/sb_pinterest.php | 2 +- .../modules/social_bookmarks/sb_twitter.php | 2 +- includes/template_bottom.php | 2 +- includes/template_top.php | 2 +- index.php | 10 +++--- install/templates/pages/install_4.php | 15 +------- login.php | 8 ++--- logoff.php | 8 ++--- password_forgotten.php | 8 ++--- password_reset.php | 8 ++--- privacy.php | 8 ++--- product_info.php | 16 ++++----- product_reviews.php | 10 +++--- product_reviews_write.php | 10 +++--- products_new.php | 10 +++--- reviews.php | 10 +++--- shipping.php | 8 ++--- shopping_cart.php | 12 +++---- specials.php | 10 +++--- ssl_check.php | 8 ++--- tell_a_friend.php | 8 ++--- testimonials.php | 8 ++--- 153 files changed, 422 insertions(+), 443 deletions(-) diff --git a/account.php b/account.php index 66a22d40d..b0087a02c 100644 --- a/account.php +++ b/account.php @@ -17,11 +17,11 @@ tep_redirect(tep_href_link('login.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/account.php'); + require('includes/languages/' . $language . '/account.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('account.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -46,6 +46,6 @@ diff --git a/account_edit.php b/account_edit.php index 27cbcc27f..6b4b08c77 100644 --- a/account_edit.php +++ b/account_edit.php @@ -18,7 +18,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/account_edit.php'); + require('includes/languages/' . $language . '/account_edit.php'); if (isset($_POST['action']) && ($_POST['action'] == 'process') && isset($_POST['formid']) && ($_POST['formid'] == $sessiontoken)) { if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($_POST['gender']); @@ -119,7 +119,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_edit.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -221,6 +221,6 @@ diff --git a/account_history.php b/account_history.php index c2d1f71f5..fa12b9ff8 100644 --- a/account_history.php +++ b/account_history.php @@ -17,12 +17,12 @@ tep_redirect(tep_href_link('login.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/account_history.php'); + require('includes/languages/' . $language . '/account_history.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_history.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -92,6 +92,6 @@
diff --git a/account_history_info.php b/account_history_info.php index c5841150d..052dff36c 100644 --- a/account_history_info.php +++ b/account_history_info.php @@ -27,16 +27,16 @@ tep_redirect(tep_href_link('account_history.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/account_history_info.php'); + require('includes/languages/' . $language . '/account_history_info.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_history.php', '', 'SSL')); $breadcrumb->add(sprintf(NAVBAR_TITLE_3, $_GET['order_id']), tep_href_link('account_history_info.php', 'order_id=' . $_GET['order_id'], 'SSL')); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order($_GET['order_id']); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -189,7 +189,7 @@
@@ -199,6 +199,6 @@
diff --git a/account_newsletters.php b/account_newsletters.php index e9850fc41..c325e3c14 100644 --- a/account_newsletters.php +++ b/account_newsletters.php @@ -18,7 +18,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/account_newsletters.php'); + require('includes/languages/' . $language . '/account_newsletters.php'); $newsletter_query = tep_db_query("select customers_newsletter from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'"); $newsletter = tep_db_fetch_array($newsletter_query); @@ -44,7 +44,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_newsletters.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -77,6 +77,6 @@ diff --git a/account_notifications.php b/account_notifications.php index 7a42f76c3..9da31dd1d 100644 --- a/account_notifications.php +++ b/account_notifications.php @@ -18,7 +18,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/account_notifications.php'); + require('includes/languages/' . $language . '/account_notifications.php'); $global_query = tep_db_query("select global_product_notifications from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . (int)$customer_id . "'"); $global = tep_db_fetch_array($global_query); @@ -70,7 +70,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_notifications.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -163,6 +163,6 @@ diff --git a/account_password.php b/account_password.php index c19258f29..00186c2eb 100644 --- a/account_password.php +++ b/account_password.php @@ -18,7 +18,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/account_password.php'); + require('includes/languages/' . $language . '/account_password.php'); if (isset($_POST['action']) && ($_POST['action'] == 'process') && isset($_POST['formid']) && ($_POST['formid'] == $sessiontoken)) { $password_current = tep_db_prepare_input($_POST['password_current']); @@ -60,7 +60,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('account_password.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -117,6 +117,6 @@ diff --git a/address_book.php b/address_book.php index 6f97aae52..96b131718 100644 --- a/address_book.php +++ b/address_book.php @@ -17,12 +17,12 @@ tep_redirect(tep_href_link('login.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/address_book.php'); + require('includes/languages/' . $language . '/address_book.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('address_book.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -94,6 +94,6 @@
diff --git a/address_book_process.php b/address_book_process.php index e7316b2cf..9e491011d 100644 --- a/address_book_process.php +++ b/address_book_process.php @@ -18,7 +18,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/address_book_process.php'); + require('includes/languages/' . $language . '/address_book_process.php'); if (isset($_GET['action']) && ($_GET['action'] == 'deleteconfirm') && isset($_GET['delete']) && is_numeric($_GET['delete']) && isset($_GET['formid']) && ($_GET['formid'] == md5($sessiontoken))) { if ((int)$_GET['delete'] == $customer_default_address_id) { @@ -247,7 +247,7 @@ $breadcrumb->add(NAVBAR_TITLE_ADD_ENTRY, tep_href_link('address_book_process.php', '', 'SSL')); } - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -297,7 +297,7 @@
- + diff --git a/advanced_search.php b/advanced_search.php index 6877d8026..77a523cee 100644 --- a/advanced_search.php +++ b/advanced_search.php @@ -12,11 +12,11 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/advanced_search.php'); + require('includes/languages/' . $language . '/advanced_search.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('advanced_search.php')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?> @@ -215,6 +215,6 @@ function check_form() { diff --git a/advanced_search_result.php b/advanced_search_result.php index 4d49c5092..1658d8780 100644 --- a/advanced_search_result.php +++ b/advanced_search_result.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/advanced_search.php'); + require('includes/languages/' . $language . '/advanced_search.php'); $error = false; @@ -127,7 +127,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('advanced_search.php')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('advanced_search_result.php', tep_get_all_get_params(), 'NONSSL', true, false)); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -316,7 +316,7 @@ $listing_sql = $select_str . $from_str . $where_str . $order_str; - require(DIR_WS_MODULES . 'product_listing.php'); + require('includes/modules/product_listing.php'); ?>
@@ -327,6 +327,6 @@
\ No newline at end of file diff --git a/checkout_confirmation.php b/checkout_confirmation.php index 66910ff6c..4b2ef958d 100644 --- a/checkout_confirmation.php +++ b/checkout_confirmation.php @@ -44,10 +44,10 @@ } // load the selected payment module - require(DIR_WS_CLASSES . 'payment.php'); + require('includes/classes/payment.php'); $payment_modules = new payment($payment); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; $payment_modules->update_status(); @@ -61,10 +61,10 @@ } // load the selected shipping module - require(DIR_WS_CLASSES . 'shipping.php'); + require('includes/classes/shipping.php'); $shipping_modules = new shipping($shipping); - require(DIR_WS_CLASSES . 'order_total.php'); + require('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_total_modules->process(); @@ -82,12 +82,12 @@ } } - require(DIR_WS_LANGUAGES . $language . '/checkout_confirmation.php'); + require('includes/languages/' . $language . '/checkout_confirmation.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('checkout_shipping.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -299,6 +299,6 @@ diff --git a/checkout_payment.php b/checkout_payment.php index 2eb3fb174..d443dc9de 100644 --- a/checkout_payment.php +++ b/checkout_payment.php @@ -63,7 +63,7 @@ } } - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; if (!tep_session_is_registered('comments')) tep_session_register('comments'); @@ -75,15 +75,15 @@ $total_count = $cart->count_contents(); // load all enabled payment modules - require(DIR_WS_CLASSES . 'payment.php'); + require('includes/classes/payment.php'); $payment_modules = new payment; - require(DIR_WS_LANGUAGES . $language . '/checkout_payment.php'); + require('includes/languages/' . $language . '/checkout_payment.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('checkout_shipping.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('checkout_payment.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?> javascript_validation(); ?> @@ -281,6 +281,6 @@ diff --git a/checkout_payment_address.php b/checkout_payment_address.php index b4da2d349..f0a042924 100644 --- a/checkout_payment_address.php +++ b/checkout_payment_address.php @@ -24,7 +24,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/checkout_payment_address.php'); + require('includes/languages/' . $language . '/checkout_payment_address.php'); $error = false; $process = false; @@ -194,7 +194,7 @@ $addresses_count = tep_count_customer_address_book_entries(); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -282,7 +282,7 @@
- + diff --git a/checkout_process.php b/checkout_process.php index 2b9ebbddc..881988f2f 100644 --- a/checkout_process.php +++ b/checkout_process.php @@ -39,17 +39,17 @@ } } - include(DIR_WS_LANGUAGES . $language . '/checkout_process.php'); + include('includes/languages/' . $language . '/checkout_process.php'); // load selected payment module - require(DIR_WS_CLASSES . 'payment.php'); + require('includes/classes/payment.php'); $payment_modules = new payment($payment); // load the selected shipping module - require(DIR_WS_CLASSES . 'shipping.php'); + require('includes/classes/shipping.php'); $shipping_modules = new shipping($shipping); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; // Stock Check @@ -72,7 +72,7 @@ tep_redirect(tep_href_link('checkout_payment.php', 'error_message=' . urlencode(ERROR_NO_PAYMENT_MODULE_SELECTED), 'SSL')); } - require(DIR_WS_CLASSES . 'order_total.php'); + require('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_totals = $order_total_modules->process(); @@ -296,5 +296,5 @@ tep_redirect(tep_href_link('checkout_success.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'application_bottom.php'); + require('includes/application_bottom.php'); ?> diff --git a/checkout_shipping.php b/checkout_shipping.php index 252198b5b..1eb14f287 100644 --- a/checkout_shipping.php +++ b/checkout_shipping.php @@ -41,7 +41,7 @@ } } - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; // register a random ID in the session to check throughout the checkout procedure @@ -67,7 +67,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - require(DIR_WS_CLASSES . 'shipping.php'); + require('includes/classes/shipping.php'); $shipping_modules = new shipping; if ( defined('MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING') && (MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING == 'true') ) { @@ -94,7 +94,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } else { $free_shipping = false; @@ -155,7 +155,7 @@ // method if more than one module is now enabled if ( !tep_session_is_registered('shipping') || ( tep_session_is_registered('shipping') && ($shipping == false) && (tep_count_shipping_modules() > 1) ) ) $shipping = $shipping_modules->cheapest(); - require(DIR_WS_LANGUAGES . $language . '/checkout_shipping.php'); + require('includes/languages/' . $language . '/checkout_shipping.php'); if ( defined('SHIPPING_ALLOW_UNDEFINED_ZONES') && (SHIPPING_ALLOW_UNDEFINED_ZONES == 'False') && ! tep_session_is_registered('shipping') && ($shipping == false) ) { $messageStack->add_session('checkout_address', ERROR_NO_SHIPPING_AVAILABLE_TO_SHIPPING_ADDRESS); @@ -165,7 +165,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('checkout_shipping.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('checkout_shipping.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -363,6 +363,6 @@ diff --git a/checkout_shipping_address.php b/checkout_shipping_address.php index 5c3c9333f..4f78a623e 100644 --- a/checkout_shipping_address.php +++ b/checkout_shipping_address.php @@ -24,9 +24,9 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/checkout_shipping_address.php'); + require('includes/languages/' . $language . '/checkout_shipping_address.php'); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; // if the order contains only virtual products, forward the customer to the billing page as @@ -206,7 +206,7 @@ $addresses_count = tep_count_customer_address_book_entries(); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -289,7 +289,7 @@
- + diff --git a/checkout_success.php b/checkout_success.php index d0c1b9cec..0d21ab8ed 100644 --- a/checkout_success.php +++ b/checkout_success.php @@ -34,12 +34,12 @@ tep_redirect(tep_href_link('index.php')); } - require(DIR_WS_LANGUAGES . $language . '/checkout_success.php'); + require('includes/languages/' . $language . '/checkout_success.php'); $breadcrumb->add(NAVBAR_TITLE_1); $breadcrumb->add(NAVBAR_TITLE_2); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -61,6 +61,6 @@ diff --git a/conditions.php b/conditions.php index 655a1980f..a013b79e5 100644 --- a/conditions.php +++ b/conditions.php @@ -12,11 +12,11 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/conditions.php'); + require('includes/languages/' . $language . '/conditions.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('conditions.php')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -34,6 +34,6 @@
diff --git a/contact_us.php b/contact_us.php index f18f70c1c..e83ddc895 100644 --- a/contact_us.php +++ b/contact_us.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/contact_us.php'); + require('includes/languages/' . $language . '/contact_us.php'); if (isset($_GET['action']) && ($_GET['action'] == 'send') && isset($_POST['formid']) && ($_POST['formid'] == $sessiontoken)) { $error = false; @@ -47,7 +47,7 @@ $breadcrumb->add(NAVBAR_TITLE, tep_href_link('contact_us.php')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -123,6 +123,6 @@ diff --git a/cookie_usage.php b/cookie_usage.php index 27dc0fac7..fdf92eefc 100644 --- a/cookie_usage.php +++ b/cookie_usage.php @@ -12,11 +12,11 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/cookie_usage.php'); + require('includes/languages/' . $language . '/cookie_usage.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('cookie_usage.php')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -47,6 +47,6 @@
diff --git a/create_account.php b/create_account.php index a3d17c609..318a92971 100644 --- a/create_account.php +++ b/create_account.php @@ -13,7 +13,7 @@ require('includes/application_top.php'); // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/create_account.php'); + require('includes/languages/' . $language . '/create_account.php'); $process = false; if (isset($_POST['action']) && ($_POST['action'] == 'process') && isset($_POST['formid']) && ($_POST['formid'] == $sessiontoken)) { @@ -254,7 +254,7 @@ $breadcrumb->add(NAVBAR_TITLE, tep_href_link('create_account.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -514,6 +514,6 @@ diff --git a/create_account_success.php b/create_account_success.php index 665209149..57aaadda5 100644 --- a/create_account_success.php +++ b/create_account_success.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/create_account_success.php'); + require('includes/languages/' . $language . '/create_account_success.php'); $breadcrumb->add(NAVBAR_TITLE_1); $breadcrumb->add(NAVBAR_TITLE_2); @@ -24,7 +24,7 @@ $origin_href = tep_href_link('index.php'); } - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -44,6 +44,6 @@
diff --git a/download.php b/download.php index 5e6823d68..32904f939 100644 --- a/download.php +++ b/download.php @@ -85,13 +85,13 @@ function tep_unlink_temp_dir($dir) if (DOWNLOAD_BY_REDIRECT == 'true') { // This will work only on Unix/Linux hosts - tep_unlink_temp_dir(DIR_FS_DOWNLOAD_PUBLIC); + tep_unlink_temp_dir('pub/'); $tempdir = tep_random_name(); umask(0000); - mkdir(DIR_FS_DOWNLOAD_PUBLIC . $tempdir, 0777); - symlink(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'], DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']); - if (file_exists(DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename'])) { - tep_redirect(tep_href_link(DIR_WS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename'])); + mkdir('pub/' . $tempdir, 0777); + symlink(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'], 'pub/' . $tempdir . '/' . $downloads['orders_products_filename']); + if (file_exists('pub/' . $tempdir . '/' . $downloads['orders_products_filename'])) { + tep_redirect(tep_href_link('pub/' . $tempdir . '/' . $downloads['orders_products_filename'])); } } diff --git a/ext/modules/content/account/braintree/cards.php b/ext/modules/content/account/braintree/cards.php index a39913f13..6659c4d8a 100755 --- a/ext/modules/content/account/braintree/cards.php +++ b/ext/modules/content/account/braintree/cards.php @@ -20,8 +20,8 @@ if ( defined('MODULE_PAYMENT_INSTALLED') && tep_not_null(MODULE_PAYMENT_INSTALLED) && in_array('braintree_cc.php', explode(';', MODULE_PAYMENT_INSTALLED)) ) { if ( !class_exists('braintree_cc') ) { - include(DIR_WS_LANGUAGES . $language . '/modules/payment/braintree_cc.php'); - include(DIR_WS_MODULES . 'payment/braintree_cc.php'); + include('includes/languages/' . $language . '/modules/payment/braintree_cc.php'); + include('includes/modules/payment/braintree_cc.php'); } $braintree_cc = new braintree_cc(); @@ -33,7 +33,7 @@ tep_redirect(tep_href_link('account.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/modules/content/account/cm_account_braintree_cards.php'); + require('includes/languages/' . $language . '/modules/content/account/cm_account_braintree_cards.php'); require('includes/modules/content/account/cm_account_braintree_cards.php'); $braintree_cards = new cm_account_braintree_cards(); @@ -60,7 +60,7 @@ $breadcrumb->add(MODULE_CONTENT_ACCOUNT_BRAINTREE_CARDS_NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(MODULE_CONTENT_ACCOUNT_BRAINTREE_CARDS_NAVBAR_TITLE_2, tep_href_link('ext/modules/content/account/braintree/cards.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>

@@ -111,6 +111,6 @@
diff --git a/ext/modules/content/account/sage_pay/cards.php b/ext/modules/content/account/sage_pay/cards.php index 4616de6cb..22e6f32b4 100755 --- a/ext/modules/content/account/sage_pay/cards.php +++ b/ext/modules/content/account/sage_pay/cards.php @@ -20,8 +20,8 @@ if ( defined('MODULE_PAYMENT_INSTALLED') && tep_not_null(MODULE_PAYMENT_INSTALLED) && in_array('sage_pay_direct.php', explode(';', MODULE_PAYMENT_INSTALLED)) ) { if ( !class_exists('sage_pay_direct') ) { - include(DIR_WS_LANGUAGES . $language . '/modules/payment/sage_pay_direct.php'); - include(DIR_WS_MODULES . 'payment/sage_pay_direct.php'); + include('includes/languages/' . $language . '/modules/payment/sage_pay_direct.php'); + include('includes/modules/payment/sage_pay_direct.php'); } $sage_pay_direct = new sage_pay_direct(); @@ -33,7 +33,7 @@ tep_redirect(tep_href_link('account.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/modules/content/account/cm_account_sage_pay_cards.php'); + require('includes/languages/' . $language . '/modules/content/account/cm_account_sage_pay_cards.php'); require('includes/modules/content/account/cm_account_sage_pay_cards.php'); $sage_pay_cards = new cm_account_sage_pay_cards(); @@ -60,7 +60,7 @@ $breadcrumb->add(MODULE_CONTENT_ACCOUNT_SAGE_PAY_CARDS_NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(MODULE_CONTENT_ACCOUNT_SAGE_PAY_CARDS_NAVBAR_TITLE_2, tep_href_link('ext/modules/content/account/sage_pay/cards.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>

@@ -111,6 +111,6 @@
diff --git a/ext/modules/content/account/set_password.php b/ext/modules/content/account/set_password.php index 5fbdfd4de..dc7e0cf42 100755 --- a/ext/modules/content/account/set_password.php +++ b/ext/modules/content/account/set_password.php @@ -29,7 +29,7 @@ } // needs to be included earlier to set the success message in the messageStack - require(DIR_WS_LANGUAGES . $language . '/modules/content/account/cm_account_set_password.php'); + require('includes/languages/' . $language . '/modules/content/account/cm_account_set_password.php'); if (isset($_POST['action']) && ($_POST['action'] == 'process') && isset($_POST['formid']) && ($_POST['formid'] == $sessiontoken)) { $password_new = tep_db_prepare_input($_POST['password_new']); @@ -61,7 +61,7 @@ $breadcrumb->add(MODULE_CONTENT_ACCOUNT_SET_PASSWORD_NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(MODULE_CONTENT_ACCOUNT_SET_PASSWORD_NAVBAR_TITLE_2, tep_href_link('ext/modules/content/account/set_password.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
@@ -105,6 +105,6 @@ diff --git a/ext/modules/content/account/stripe/cards.php b/ext/modules/content/account/stripe/cards.php index 1e79758ed..0c7bc8f87 100755 --- a/ext/modules/content/account/stripe/cards.php +++ b/ext/modules/content/account/stripe/cards.php @@ -20,8 +20,8 @@ if ( defined('MODULE_PAYMENT_INSTALLED') && tep_not_null(MODULE_PAYMENT_INSTALLED) && in_array('stripe.php', explode(';', MODULE_PAYMENT_INSTALLED)) ) { if ( !class_exists('stripe') ) { - include(DIR_WS_LANGUAGES . $language . '/modules/payment/stripe.php'); - include(DIR_WS_MODULES . 'payment/stripe.php'); + include('includes/languages/' . $language . '/modules/payment/stripe.php'); + include('includes/modules/payment/stripe.php'); } $stripe = new stripe(); @@ -33,7 +33,7 @@ tep_redirect(tep_href_link('account.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/modules/content/account/cm_account_stripe_cards.php'); + require('includes/languages/' . $language . '/modules/content/account/cm_account_stripe_cards.php'); require('includes/modules/content/account/cm_account_stripe_cards.php'); $stripe_cards = new cm_account_stripe_cards(); @@ -62,7 +62,7 @@ $breadcrumb->add(MODULE_CONTENT_ACCOUNT_STRIPE_CARDS_NAVBAR_TITLE_1, tep_href_link('account.php', '', 'SSL')); $breadcrumb->add(MODULE_CONTENT_ACCOUNT_STRIPE_CARDS_NAVBAR_TITLE_2, tep_href_link('ext/modules/content/account/stripe/cards.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>

@@ -113,6 +113,6 @@
diff --git a/ext/modules/payment/inpay/pb_handler.php b/ext/modules/payment/inpay/pb_handler.php index af6957292..69fee37e8 100755 --- a/ext/modules/payment/inpay/pb_handler.php +++ b/ext/modules/payment/inpay/pb_handler.php @@ -158,9 +158,9 @@ if ($invoice_approved) { // for email - include(DIR_WS_LANGUAGES . $language . '/modules/payment/inpay.php'); + include('includes/languages/' . $language . '/modules/payment/inpay.php'); // let's re-create the required arrays - require (DIR_WS_CLASSES.'order.php'); + require ('includes/classes/order.php'); $order = new order($_POST['order_id']); // START STATUS == COMPLETED LOOP // initialized for the email confirmation diff --git a/ext/modules/payment/ipayment/callback_cc.php b/ext/modules/payment/ipayment/callback_cc.php index ea5dc7d34..4162d366d 100755 --- a/ext/modules/payment/ipayment/callback_cc.php +++ b/ext/modules/payment/ipayment/callback_cc.php @@ -13,7 +13,7 @@ chdir('../../../../'); require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/modules/payment/ipayment_cc.php'); + require('includes/languages/' . $language . '/modules/payment/ipayment_cc.php'); require('includes/modules/payment/ipayment_cc.php'); $ipayment_cc = new ipayment_cc(); diff --git a/ext/modules/payment/ipayment/callback_elv.php b/ext/modules/payment/ipayment/callback_elv.php index 289d055c1..c2e642d1a 100755 --- a/ext/modules/payment/ipayment/callback_elv.php +++ b/ext/modules/payment/ipayment/callback_elv.php @@ -13,7 +13,7 @@ chdir('../../../../'); require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/modules/payment/ipayment_elv.php'); + require('includes/languages/' . $language . '/modules/payment/ipayment_elv.php'); require('includes/modules/payment/ipayment_elv.php'); $ipayment_elv = new ipayment_elv(); diff --git a/ext/modules/payment/ipayment/callback_pp.php b/ext/modules/payment/ipayment/callback_pp.php index b02cb3145..345bc9154 100755 --- a/ext/modules/payment/ipayment/callback_pp.php +++ b/ext/modules/payment/ipayment/callback_pp.php @@ -13,7 +13,7 @@ chdir('../../../../'); require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/modules/payment/ipayment_pp.php'); + require('includes/languages/' . $language . '/modules/payment/ipayment_pp.php'); require('includes/modules/payment/ipayment_pp.php'); $ipayment_pp = new ipayment_pp(); diff --git a/ext/modules/payment/moneybookers/checkout.php b/ext/modules/payment/moneybookers/checkout.php index 8a1784f21..35777f7cd 100755 --- a/ext/modules/payment/moneybookers/checkout.php +++ b/ext/modules/payment/moneybookers/checkout.php @@ -41,10 +41,10 @@ } // load the selected payment module - require(DIR_WS_CLASSES . 'payment.php'); + require('includes/classes/payment.php'); $payment_modules = new payment($payment); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; $payment_modules->update_status(); @@ -58,10 +58,10 @@ } // load the selected shipping module - require(DIR_WS_CLASSES . 'shipping.php'); + require('includes/classes/shipping.php'); $shipping_modules = new shipping($shipping); - require(DIR_WS_CLASSES . 'order_total.php'); + require('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_total_modules->process(); @@ -79,14 +79,14 @@ } } - require(DIR_WS_LANGUAGES . $language . '/checkout_confirmation.php'); + require('includes/languages/' . $language . '/checkout_confirmation.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('checkout_shipping.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2); $iframe_url = 'https://www.moneybookers.com/app/payment.pl?sid=' . $_POST['sid']; - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?> @@ -99,6 +99,6 @@
diff --git a/ext/modules/payment/paypal/express.php b/ext/modules/payment/paypal/express.php index 0b3501ef4..f2ddcf95f 100755 --- a/ext/modules/payment/paypal/express.php +++ b/ext/modules/payment/paypal/express.php @@ -13,8 +13,8 @@ chdir('../../../../'); require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/modules/payment/paypal_express.php'); - require(DIR_WS_LANGUAGES . $language . '/create_account.php'); + require('includes/languages/' . $language . '/modules/payment/paypal_express.php'); + require('includes/languages/' . $language . '/create_account.php'); // initialize variables if the customer is not logged in if (!tep_session_is_registered('customer_id')) { @@ -140,7 +140,7 @@ $quotes_array = array(); - include(DIR_WS_CLASSES . 'order.php'); + include('includes/classes/order.php'); $order = new order; if ($cart->get_content_type() != 'virtual') { @@ -148,7 +148,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - include(DIR_WS_CLASSES . 'shipping.php'); + include('includes/classes/shipping.php'); $shipping_modules = new shipping; $free_shipping = false; @@ -177,7 +177,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } @@ -213,7 +213,7 @@ 'tax' => '0'); } - include(DIR_WS_CLASSES . 'order_total.php'); + include('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_totals = $order_total_modules->process(); @@ -466,7 +466,7 @@ tep_session_register('customer_zone_id'); } - include(DIR_WS_CLASSES . 'order.php'); + include('includes/classes/order.php'); $order = new order; if ($cart->get_content_type() != 'virtual') { @@ -474,7 +474,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - include(DIR_WS_CLASSES . 'shipping.php'); + include('includes/classes/shipping.php'); $shipping_modules = new shipping; $free_shipping = false; @@ -503,7 +503,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } @@ -609,7 +609,7 @@ $paypal_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&'; } - include(DIR_WS_CLASSES . 'order.php'); + include('includes/classes/order.php'); $order = new order; $params = array('PAYMENTREQUEST_0_CURRENCYCODE' => $order->info['currency'], @@ -662,7 +662,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - include(DIR_WS_CLASSES . 'shipping.php'); + include('includes/classes/shipping.php'); $shipping_modules = new shipping; $free_shipping = false; @@ -691,7 +691,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } @@ -800,7 +800,7 @@ $item_params['CALLBACKVERSION'] = $paypal_express->api_version; } - include(DIR_WS_CLASSES . 'order_total.php'); + include('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_totals = $order_total_modules->process(); @@ -872,5 +872,5 @@ tep_redirect(tep_href_link('shopping_cart.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'application_bottom.php'); + require('includes/application_bottom.php'); ?> diff --git a/ext/modules/payment/paypal/express_payflow.php b/ext/modules/payment/paypal/express_payflow.php index 182154f2d..1140fac03 100755 --- a/ext/modules/payment/paypal/express_payflow.php +++ b/ext/modules/payment/paypal/express_payflow.php @@ -24,9 +24,9 @@ $customer_default_address_id = 0; } - require(DIR_WS_LANGUAGES . $language . '/modules/payment/paypal_pro_payflow_ec.php'); + require('includes/languages/' . $language . '/modules/payment/paypal_pro_payflow_ec.php'); require('includes/modules/payment/paypal_pro_payflow_ec.php'); - require(DIR_WS_LANGUAGES . $language . '/create_account.php'); + require('includes/languages/' . $language . '/create_account.php'); $paypal_pro_payflow_ec = new paypal_pro_payflow_ec(); @@ -259,7 +259,7 @@ tep_session_register('customer_zone_id'); } - include(DIR_WS_CLASSES . 'order.php'); + include('includes/classes/order.php'); $order = new order; if ($cart->get_content_type() != 'virtual') { @@ -267,7 +267,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - include(DIR_WS_CLASSES . 'shipping.php'); + include('includes/classes/shipping.php'); $shipping_modules = new shipping; $free_shipping = false; @@ -296,7 +296,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } @@ -373,7 +373,7 @@ $paypal_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout'; } - include(DIR_WS_CLASSES . 'order.php'); + include('includes/classes/order.php'); $order = new order; $params = array('CURRENCY' => $order->info['currency'], @@ -425,7 +425,7 @@ $total_count = $cart->count_contents(); // load all enabled shipping modules - include(DIR_WS_CLASSES . 'shipping.php'); + include('includes/classes/shipping.php'); $shipping_modules = new shipping; $free_shipping = false; @@ -454,7 +454,7 @@ if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) { $free_shipping = true; - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php'); + include('includes/languages/' . $language . '/modules/order_total/ot_shipping.php'); } } @@ -547,7 +547,7 @@ } } - include(DIR_WS_CLASSES . 'order_total.php'); + include('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_totals = $order_total_modules->process(); @@ -615,5 +615,5 @@ tep_redirect(tep_href_link('shopping_cart.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'application_bottom.php'); + require('includes/application_bottom.php'); ?> diff --git a/ext/modules/payment/paypal/hosted_checkout.php b/ext/modules/payment/paypal/hosted_checkout.php index e5f0f0556..2a49d48a7 100755 --- a/ext/modules/payment/paypal/hosted_checkout.php +++ b/ext/modules/payment/paypal/hosted_checkout.php @@ -69,5 +69,5 @@ diff --git a/ext/modules/payment/paypal/pro_hosted_ipn.php b/ext/modules/payment/paypal/pro_hosted_ipn.php index 4a8e3ed53..015fa4934 100755 --- a/ext/modules/payment/paypal/pro_hosted_ipn.php +++ b/ext/modules/payment/paypal/pro_hosted_ipn.php @@ -17,7 +17,7 @@ exit; } - require(DIR_WS_LANGUAGES . $language . '/modules/payment/paypal_pro_hs.php'); + require('includes/languages/' . $language . '/modules/payment/paypal_pro_hs.php'); require('includes/modules/payment/paypal_pro_hs.php'); $result = false; diff --git a/ext/modules/payment/paypal/standard_ipn.php b/ext/modules/payment/paypal/standard_ipn.php index fbd96ba55..198296113 100755 --- a/ext/modules/payment/paypal/standard_ipn.php +++ b/ext/modules/payment/paypal/standard_ipn.php @@ -17,7 +17,7 @@ exit; } - require(DIR_WS_LANGUAGES . $language . '/modules/payment/paypal_standard.php'); + require('includes/languages/' . $language . '/modules/payment/paypal_standard.php'); require('includes/modules/payment/paypal_standard.php'); $result = false; diff --git a/ext/modules/payment/sage_pay/checkout.php b/ext/modules/payment/sage_pay/checkout.php index fa16b4e08..1f634ebb1 100755 --- a/ext/modules/payment/sage_pay/checkout.php +++ b/ext/modules/payment/sage_pay/checkout.php @@ -41,10 +41,10 @@ } // load the selected payment module - require(DIR_WS_CLASSES . 'payment.php'); + require('includes/classes/payment.php'); $payment_modules = new payment($payment); - require(DIR_WS_CLASSES . 'order.php'); + require('includes/classes/order.php'); $order = new order; $payment_modules->update_status(); @@ -58,10 +58,10 @@ } // load the selected shipping module - require(DIR_WS_CLASSES . 'shipping.php'); + require('includes/classes/shipping.php'); $shipping_modules = new shipping($shipping); - require(DIR_WS_CLASSES . 'order_total.php'); + require('includes/classes/order_total.php'); $order_total_modules = new order_total; $order_total_modules->process(); @@ -79,7 +79,7 @@ } } - require(DIR_WS_LANGUAGES . $language . '/checkout_confirmation.php'); + require('includes/languages/' . $language . '/checkout_confirmation.php'); $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('checkout_shipping.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2); @@ -90,7 +90,7 @@ $iframe_url = $sage_pay_server_nexturl; } - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?> diff --git a/ext/modules/payment/sage_pay/direct_3dauth.php b/ext/modules/payment/sage_pay/direct_3dauth.php index 16a471c13..52d8fa355 100755 --- a/ext/modules/payment/sage_pay/direct_3dauth.php +++ b/ext/modules/payment/sage_pay/direct_3dauth.php @@ -27,8 +27,8 @@ tep_redirect(tep_href_link('checkout_payment.php', '', 'SSL')); } - require(DIR_WS_LANGUAGES . $language . '/checkout_confirmation.php'); - require(DIR_WS_LANGUAGES . $language . '/modules/payment/sage_pay_direct.php'); + require('includes/languages/' . $language . '/checkout_confirmation.php'); + require('includes/languages/' . $language . '/modules/payment/sage_pay_direct.php'); ?> > @@ -51,4 +51,4 @@ //--> - + diff --git a/ext/modules/payment/sage_pay/redirect.php b/ext/modules/payment/sage_pay/redirect.php index 458053491..edf61bc22 100755 --- a/ext/modules/payment/sage_pay/redirect.php +++ b/ext/modules/payment/sage_pay/redirect.php @@ -32,7 +32,7 @@ } } - require(DIR_WS_LANGUAGES . $language . '/checkout_confirmation.php'); + require('includes/languages/' . $language . '/checkout_confirmation.php'); ?> > @@ -54,4 +54,4 @@ - + diff --git a/ext/modules/payment/sage_pay/server.php b/ext/modules/payment/sage_pay/server.php index 5dddd85b2..5a4cc3403 100755 --- a/ext/modules/payment/sage_pay/server.php +++ b/ext/modules/payment/sage_pay/server.php @@ -17,7 +17,7 @@ exit; } - include(DIR_WS_LANGUAGES . $language . '/modules/payment/sage_pay_server.php'); + include('includes/languages/' . $language . '/modules/payment/sage_pay_server.php'); include('includes/modules/payment/sage_pay_server.php'); $sage_pay_server = new sage_pay_server(); diff --git a/includes/application_top.php b/includes/application_top.php index bd04cd1b0..dd1e69e6f 100755 --- a/includes/application_top.php +++ b/includes/application_top.php @@ -39,7 +39,7 @@ define('PROJECT_VERSION', 'osCommerce Online Merchant v2.3'); // some code to solve compatibility issues - require(DIR_WS_FUNCTIONS . 'compatibility.php'); + require('includes/functions/compatibility.php'); // set the type of request (secure or not) $request_type = (getenv('HTTPS') == 'on') ? 'SSL' : 'NONSSL'; @@ -55,7 +55,7 @@ } // include the list of project database tables - require(DIR_WS_INCLUDES . 'database_tables.php'); + require('includes/database_tables.php'); // include the database functions require(DIR_WS_FUNCTIONS . 'database.php'); @@ -123,10 +123,10 @@ if (USE_CACHE == 'true') include(DIR_WS_FUNCTIONS . 'cache.php'); // include shopping cart class - require(DIR_WS_CLASSES . 'shopping_cart.php'); + require('includes/classes/shopping_cart.php'); // include navigation history class - require(DIR_WS_CLASSES . 'navigation_history.php'); + require('includes/classes/navigation_history.php'); // define how the session functions will be used require(DIR_WS_FUNCTIONS . 'sessions.php'); @@ -169,7 +169,7 @@ $spider_flag = false; if (tep_not_null($user_agent)) { - $spiders = file(DIR_WS_INCLUDES . 'spiders.txt'); + $spiders = file('includes/spiders.txt'); $n=sizeof($spiders); for ($i=0; $i<$n; $i++) { @@ -253,12 +253,12 @@ } // include currencies class and create an instance - require(DIR_WS_CLASSES . 'currencies.php'); + require('includes/classes/currencies.php'); $currencies = new currencies(); // include the mail classes - require(DIR_WS_CLASSES . 'mime.php'); - require(DIR_WS_CLASSES . 'email.php'); + require('includes/classes/mime.php'); + require('includes/classes/email.php'); // set the language if (!tep_session_is_registered('language') || isset($_GET['language'])) { @@ -267,7 +267,7 @@ tep_session_register('languages_id'); } - include(DIR_WS_CLASSES . 'language.php'); + include('includes/classes/language.php'); $lng = new language(); if (isset($_GET['language']) && tep_not_null($_GET['language'])) { @@ -282,7 +282,7 @@ // include the language translations $_system_locale_numeric = setlocale(LC_NUMERIC, 0); - require(DIR_WS_LANGUAGES . $language . '.php'); + require('includes/languages/' . $language . '.php'); setlocale(LC_NUMERIC, $_system_locale_numeric); // Prevent LC_ALL from setting LC_NUMERIC to a locale with 1,0 float/decimal values instead of 1.0 (see bug #634) // currency @@ -306,8 +306,8 @@ // action recorder include('includes/classes/action_recorder.php'); // initialize the message stack for output messages - require(DIR_WS_CLASSES . 'alertbox.php'); - require(DIR_WS_CLASSES . 'message_stack.php'); + require('includes/classes/alertbox.php'); + require('includes/classes/message_stack.php'); $messageStack = new messageStack; // Shopping cart actions @@ -430,10 +430,10 @@ require(DIR_WS_FUNCTIONS . 'validations.php'); // split-page-results - require(DIR_WS_CLASSES . 'split_page_results.php'); + require('includes/classes/split_page_results.php'); // infobox - require(DIR_WS_CLASSES . 'boxes.php'); + require('includes/classes/boxes.php'); // auto activate and expire banners require(DIR_WS_FUNCTIONS . 'banner.php'); @@ -444,7 +444,7 @@ require(DIR_WS_FUNCTIONS . 'specials.php'); tep_expire_specials(); - require(DIR_WS_CLASSES . 'osc_template.php'); + require('includes/classes/osc_template.php'); $oscTemplate = new oscTemplate(); // calculate category path @@ -465,10 +465,10 @@ } // include category tree class - require(DIR_WS_CLASSES . 'category_tree.php'); + require('includes/classes/category_tree.php'); // include the breadcrumb class and start the breadcrumb trail - require(DIR_WS_CLASSES . 'breadcrumb.php'); + require('includes/classes/breadcrumb.php'); $breadcrumb = new breadcrumb; $breadcrumb->add(HEADER_TITLE_TOP, HTTP_SERVER); diff --git a/includes/classes/action_recorder.php b/includes/classes/action_recorder.php index 66fc63d85..b26645cb2 100755 --- a/includes/classes/action_recorder.php +++ b/includes/classes/action_recorder.php @@ -23,9 +23,9 @@ function actionRecorder($module, $user_id = null, $user_name = null) { if (defined('MODULE_ACTION_RECORDER_INSTALLED') && tep_not_null(MODULE_ACTION_RECORDER_INSTALLED)) { if (tep_not_null($module) && in_array($module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1)), explode(';', MODULE_ACTION_RECORDER_INSTALLED))) { if (!class_exists($module)) { - if (file_exists(DIR_WS_MODULES . 'action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1)))) { - include(DIR_WS_LANGUAGES . $language . '/modules/action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1))); - include(DIR_WS_MODULES . 'action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1))); + if (file_exists('includes/modules/action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1)))) { + include('includes/languages/' . $language . '/modules/action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1))); + include('includes/modules/action_recorder/' . $module . '.' . substr($PHP_SELF, (strrpos($PHP_SELF, '.')+1))); } else { return false; } diff --git a/includes/classes/boxes.php b/includes/classes/boxes.php index 285f3f02b..698c43766 100755 --- a/includes/classes/boxes.php +++ b/includes/classes/boxes.php @@ -102,17 +102,17 @@ function infoBoxHeading($contents, $left_corner = true, $right_corner = true, $r $this->table_cellpadding = '0'; if ($left_corner == true) { - $left_corner = tep_image(DIR_WS_IMAGES . 'infobox/corner_left.gif'); + $left_corner = tep_image('images/infobox/corner_left.gif'); } else { - $left_corner = tep_image(DIR_WS_IMAGES . 'infobox/corner_right_left.gif'); + $left_corner = tep_image('images/infobox/corner_right_left.gif'); } if ($right_arrow == true) { - $right_arrow = '' . tep_image(DIR_WS_IMAGES . 'infobox/arrow_right.gif', ICON_ARROW_RIGHT) . ''; + $right_arrow = '' . tep_image('images/infobox/arrow_right.gif', ICON_ARROW_RIGHT) . ''; } else { $right_arrow = ''; } if ($right_corner == true) { - $right_corner = $right_arrow . tep_image(DIR_WS_IMAGES . 'infobox/corner_right.gif'); + $right_corner = $right_arrow . tep_image('images/infobox/corner_right.gif'); } else { $right_corner = $right_arrow . tep_draw_separator('pixel_trans.gif', '11', '14'); } @@ -152,11 +152,11 @@ function contentBoxHeading($contents) { $info_box_contents = array(); $info_box_contents[] = array(array('params' => 'height="14" class="infoBoxHeading"', - 'text' => tep_image(DIR_WS_IMAGES . 'infobox/corner_left.gif')), + 'text' => tep_image('images/infobox/corner_left.gif')), array('params' => 'height="14" class="infoBoxHeading" width="100%"', 'text' => $contents[0]['text']), array('params' => 'height="14" class="infoBoxHeading"', - 'text' => tep_image(DIR_WS_IMAGES . 'infobox/corner_right_left.gif'))); + 'text' => tep_image('images/infobox/corner_right_left.gif'))); $this->tableBox($info_box_contents, true); } diff --git a/includes/classes/order_total.php b/includes/classes/order_total.php index ea6622837..c3427a4fa 100755 --- a/includes/classes/order_total.php +++ b/includes/classes/order_total.php @@ -22,8 +22,8 @@ function order_total() { reset($this->modules); while (list(, $value) = each($this->modules)) { - include(DIR_WS_LANGUAGES . $language . '/modules/order_total/' . $value); - include(DIR_WS_MODULES . 'order_total/' . $value); + include('includes/languages/' . $language . '/modules/order_total/' . $value); + include('includes/modules/order_total/' . $value); $class = substr($value, 0, strrpos($value, '.')); $GLOBALS[$class] = new $class; diff --git a/includes/classes/osc_template.php b/includes/classes/osc_template.php index df6be64b7..bd72e2f30 100755 --- a/includes/classes/osc_template.php +++ b/includes/classes/osc_template.php @@ -85,12 +85,12 @@ function buildBlocks() { $class = basename($module, '.php'); if ( !class_exists($class) ) { - if ( file_exists(DIR_WS_LANGUAGES . $language . '/modules/' . $group . '/' . $module) ) { - include(DIR_WS_LANGUAGES . $language . '/modules/' . $group . '/' . $module); + if ( file_exists('includes/languages/' . $language . '/modules/' . $group . '/' . $module) ) { + include('includes/languages/' . $language . '/modules/' . $group . '/' . $module); } - if ( file_exists(DIR_WS_MODULES . $group . '/' . $module) ) { - include(DIR_WS_MODULES . $group . '/' . $module); + if ( file_exists('includes/modules/' . $group . '/' . $module) ) { + include('includes/modules/' . $group . '/' . $module); } } @@ -118,8 +118,8 @@ function hasContent($group) { function getContent($group) { global $language; - if ( !class_exists('tp_' . $group) && file_exists(DIR_WS_MODULES . 'pages/tp_' . $group . '.php') ) { - include(DIR_WS_MODULES . 'pages/tp_' . $group . '.php'); + if ( !class_exists('tp_' . $group) && file_exists('includes/modules/pages/tp_' . $group . '.php') ) { + include('includes/modules/pages/tp_' . $group . '.php'); } if ( class_exists('tp_' . $group) ) { @@ -130,12 +130,12 @@ function getContent($group) { foreach ( $this->getContentModules($group) as $module ) { if ( !class_exists($module) ) { - if ( file_exists(DIR_WS_MODULES . 'content/' . $group . '/' . $module . '.php') ) { - if ( file_exists(DIR_WS_LANGUAGES . $language . '/modules/content/' . $group . '/' . $module . '.php') ) { - include(DIR_WS_LANGUAGES . $language . '/modules/content/' . $group . '/' . $module . '.php'); + if ( file_exists('includes/modules/content/' . $group . '/' . $module . '.php') ) { + if ( file_exists('includes/languages/' . $language . '/modules/content/' . $group . '/' . $module . '.php') ) { + include('includes/languages/' . $language . '/modules/content/' . $group . '/' . $module . '.php'); } - include(DIR_WS_MODULES . 'content/' . $group . '/' . $module . '.php'); + include('includes/modules/content/' . $group . '/' . $module . '.php'); } } diff --git a/includes/classes/payment.php b/includes/classes/payment.php index 8fbc1df1a..e1cb41792 100755 --- a/includes/classes/payment.php +++ b/includes/classes/payment.php @@ -35,8 +35,8 @@ function payment($module = '') { } for ($i=0, $n=sizeof($include_modules); $i<$n; $i++) { - include(DIR_WS_LANGUAGES . $language . '/modules/payment/' . $include_modules[$i]['file']); - include(DIR_WS_MODULES . 'payment/' . $include_modules[$i]['file']); + include('includes/languages/' . $language . '/modules/payment/' . $include_modules[$i]['file']); + include('includes/modules/payment/' . $include_modules[$i]['file']); $GLOBALS[$include_modules[$i]['class']] = new $include_modules[$i]['class']; } diff --git a/includes/classes/shipping.php b/includes/classes/shipping.php index 9bbf10741..d88772a23 100755 --- a/includes/classes/shipping.php +++ b/includes/classes/shipping.php @@ -33,8 +33,8 @@ function shipping($module = '') { } for ($i=0, $n=sizeof($include_modules); $i<$n; $i++) { - include(DIR_WS_LANGUAGES . $language . '/modules/shipping/' . $include_modules[$i]['file']); - include(DIR_WS_MODULES . 'shipping/' . $include_modules[$i]['file']); + include('includes/languages/' . $language . '/modules/shipping/' . $include_modules[$i]['file']); + include('includes/modules/shipping/' . $include_modules[$i]['file']); $GLOBALS[$include_modules[$i]['class']] = new $include_modules[$i]['class']; } diff --git a/includes/configure.php b/includes/configure.php index 33642773b..8d35e682a 100755 --- a/includes/configure.php +++ b/includes/configure.php @@ -22,15 +22,7 @@ define('HTTPS_COOKIE_PATH', ''); define('DIR_WS_HTTP_CATALOG', ''); define('DIR_WS_HTTPS_CATALOG', ''); - define('DIR_WS_IMAGES', 'images/'); - define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/'); - define('DIR_WS_INCLUDES', 'includes/'); - define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/'); - define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/'); - define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/'); - define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/'); - define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/'); define('DIR_FS_CATALOG', dirname($_SERVER['SCRIPT_FILENAME']) . '/'); define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/'); define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/'); diff --git a/includes/functions/banner.php b/includes/functions/banner.php index 3d89dac6a..225e32c3c 100755 --- a/includes/functions/banner.php +++ b/includes/functions/banner.php @@ -83,7 +83,7 @@ function tep_display_banner($action, $identifier) { if (tep_not_null($banner['banners_html_text'])) { $banner_string = $banner['banners_html_text']; } else { - $banner_string = '' . tep_image(DIR_WS_IMAGES . $banner['banners_image'], $banner['banners_title']) . ''; + $banner_string = '' . tep_image('images/' . $banner['banners_image'], $banner['banners_title']) . ''; } tep_update_banner_display_count($banner['banners_id']); diff --git a/includes/functions/cache.php b/includes/functions/cache.php index 4dbf48fa8..d1e78aea3 100755 --- a/includes/functions/cache.php +++ b/includes/functions/cache.php @@ -104,7 +104,7 @@ function tep_cache_categories_box($auto_expire = false, $refresh = false) { if (($refresh == true) || !read_cache($cache_output, 'categories_box-' . $language . '.cache' . $cPath, $auto_expire)) { if (!class_exists('bm_categories')) { - include(DIR_WS_MODULES . 'boxes/bm_categories.php'); + include('includes/modules/boxes/bm_categories.php'); } $bm_categories = new bm_categories(); @@ -131,7 +131,7 @@ function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) { if (($refresh == true) || !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) { if (!class_exists('bm_manufacturers')) { - include(DIR_WS_MODULES . 'boxes/bm_manufacturers.php'); + include('includes/modules/boxes/bm_manufacturers.php'); } $bm_manufacturers = new bm_manufacturers(); @@ -154,7 +154,7 @@ function tep_cache_also_purchased($auto_expire = false, $refresh = false) { if (isset($_GET['products_id']) && is_numeric($_GET['products_id'])) { if (($refresh == true) || !read_cache($cache_output, 'also_purchased-' . $language . '.cache' . $_GET['products_id'], $auto_expire)) { ob_start(); - include(DIR_WS_MODULES . 'also_purchased_products.php'); + include('includes/modules/also_purchased_products.php'); $cache_output = ob_get_contents(); ob_end_clean(); write_cache($cache_output, 'also_purchased-' . $language . '.cache' . $_GET['products_id']); diff --git a/includes/functions/general.php b/includes/functions/general.php index 8b65c68ec..fdee6a9f8 100755 --- a/includes/functions/general.php +++ b/includes/functions/general.php @@ -1105,7 +1105,7 @@ function tep_create_random_value($length, $type = 'mixed') { $value = ''; if (!class_exists('PasswordHash')) { - include(DIR_WS_CLASSES . 'passwordhash.php'); + include('includes/classes/passwordhash.php'); } $hasher = new PasswordHash(10, true); diff --git a/includes/functions/html_output.php b/includes/functions/html_output.php index 96c3b03c8..754edf045 100755 --- a/includes/functions/html_output.php +++ b/includes/functions/html_output.php @@ -74,7 +74,7 @@ function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $ad //// // The HTML image wrapper function function tep_image($src, $alt = '', $width = '', $height = '', $parameters = '', $responsive = true, $bootstrap_css = '') { - if ( (empty($src) || ($src == DIR_WS_IMAGES)) && (IMAGE_REQUIRED == 'false') ) { + if ( (empty($src) || ($src == 'images/')) && (IMAGE_REQUIRED == 'false') ) { return false; } @@ -130,7 +130,7 @@ function tep_image($src, $alt = '', $width = '', $height = '', $parameters = '', function tep_image_submit($image, $alt = '', $parameters = '') { global $language; - $image_submit = '' . tep_image(DIR_WS_IMAGES . $orders['products_image'], $orders['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; + $also_pur_prods_content .= ' ' . tep_image('images/' . $orders['products_image'], $orders['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . ''; $also_pur_prods_content .= '
'; $also_pur_prods_content .= '
' . $orders['products_name'] . '
'; $also_pur_prods_content .= '
'; diff --git a/includes/modules/boxes/bm_best_sellers.php b/includes/modules/boxes/bm_best_sellers.php index 9fe99453c..cc1a20fac 100644 --- a/includes/modules/boxes/bm_best_sellers.php +++ b/includes/modules/boxes/bm_best_sellers.php @@ -49,7 +49,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/best_sellers.php'); + include('includes/modules/boxes/templates/best_sellers.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_card_acceptance.php b/includes/modules/boxes/bm_card_acceptance.php index dad2932ba..7fccd0162 100755 --- a/includes/modules/boxes/bm_card_acceptance.php +++ b/includes/modules/boxes/bm_card_acceptance.php @@ -37,11 +37,11 @@ function execute() { $output = NULL; foreach ( explode(';', MODULE_BOXES_CARD_ACCEPTANCE_LOGOS) as $logo ) { - $output .= tep_image(DIR_WS_IMAGES . 'card_acceptance/' . basename($logo), null, null, null, null, false); + $output .= tep_image('images/card_acceptance/' . basename($logo), null, null, null, null, false); } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/card_acceptance.php'); + include('includes/modules/boxes/templates/card_acceptance.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); @@ -91,9 +91,9 @@ function bm_card_acceptance_show_logos($text) { function bm_card_acceptance_edit_logos($values, $key) { $files_array = array(); - if ( $dir = @dir(DIR_FS_CATALOG . DIR_WS_IMAGES . 'card_acceptance') ) { + if ( $dir = @dir(DIR_FS_CATALOG . 'images/card_acceptance') ) { while ( $file = $dir->read() ) { - if ( !is_dir(DIR_FS_CATALOG . DIR_WS_IMAGES . 'card_acceptance/' . $file) ) { + if ( !is_dir(DIR_FS_CATALOG . 'images/card_acceptance/' . $file) ) { if ( in_array(substr($file, strrpos($file, '.')+1), array('gif', 'jpg', 'png')) ) { $files_array[] = $file; } diff --git a/includes/modules/boxes/bm_categories.php b/includes/modules/boxes/bm_categories.php index 07b7916e0..487c783a0 100644 --- a/includes/modules/boxes/bm_categories.php +++ b/includes/modules/boxes/bm_categories.php @@ -42,7 +42,7 @@ function execute() { $category_tree = $OSCOM_CategoryTree->getTree(); ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/categories.php'); + include('includes/modules/boxes/templates/categories.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_currencies.php b/includes/modules/boxes/bm_currencies.php index 2055722f1..0920c3f4e 100644 --- a/includes/modules/boxes/bm_currencies.php +++ b/includes/modules/boxes/bm_currencies.php @@ -52,7 +52,7 @@ function execute() { $form_output = tep_draw_form('currencies', tep_href_link($PHP_SELF, '', $request_type, false), 'get') . tep_draw_pull_down_menu('currency', $currencies_array, $currency, 'onchange="this.form.submit();" style="width: 100%"') . $hidden_get_variables . tep_hide_session_id() . ''; ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/currencies.php'); + include('includes/modules/boxes/templates/currencies.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_information.php b/includes/modules/boxes/bm_information.php index a5b93b0a3..7793be420 100644 --- a/includes/modules/boxes/bm_information.php +++ b/includes/modules/boxes/bm_information.php @@ -34,7 +34,7 @@ function execute() { global $oscTemplate; ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/information.php'); + include('includes/modules/boxes/templates/information.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_languages.php b/includes/modules/boxes/bm_languages.php index 3af218d04..c5646c786 100644 --- a/includes/modules/boxes/bm_languages.php +++ b/includes/modules/boxes/bm_languages.php @@ -35,7 +35,7 @@ function execute() { if (substr(basename($PHP_SELF), 0, 8) != 'checkout') { if (!isset($lng) || (isset($lng) && !is_object($lng))) { - include(DIR_WS_CLASSES . 'language.php'); + include('includes/classes/language.php'); $lng = new language; } @@ -43,11 +43,11 @@ function execute() { $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'], NULL, NULL, NULL, false) . ' '; + $languages_string .= ' ' .tep_image('includes/languages/' . $value['directory'] . '/images/' . $value['image'], $value['name'], NULL, NULL, NULL, false) . ' '; } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/languages.php'); + include('includes/modules/boxes/templates/languages.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_manufacturer_info.php b/includes/modules/boxes/bm_manufacturer_info.php index 36de7c612..ddc1e2ace 100644 --- a/includes/modules/boxes/bm_manufacturer_info.php +++ b/includes/modules/boxes/bm_manufacturer_info.php @@ -39,11 +39,11 @@ function execute() { $manufacturer = tep_db_fetch_array($manufacturer_query); $manufacturer_info_string = NULL; - if (tep_not_null($manufacturer['manufacturers_image'])) $manufacturer_info_string .= '
' . tep_image(DIR_WS_IMAGES . $manufacturer['manufacturers_image'], $manufacturer['manufacturers_name']) . '
'; + if (tep_not_null($manufacturer['manufacturers_image'])) $manufacturer_info_string .= '
' . tep_image('images/' . $manufacturer['manufacturers_image'], $manufacturer['manufacturers_name']) . '
'; if (tep_not_null($manufacturer['manufacturers_url'])) $manufacturer_info_string .= '
' . sprintf(MODULE_BOXES_MANUFACTURER_INFO_BOX_HOMEPAGE, $manufacturer['manufacturers_name']) . '
'; ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/manufacturer_info.php'); + include('includes/modules/boxes/templates/manufacturer_info.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_manufacturers.php b/includes/modules/boxes/bm_manufacturers.php index a13f3725e..3134e0bdf 100644 --- a/includes/modules/boxes/bm_manufacturers.php +++ b/includes/modules/boxes/bm_manufacturers.php @@ -82,7 +82,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/manufacturers.php'); + include('includes/modules/boxes/templates/manufacturers.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_order_history.php b/includes/modules/boxes/bm_order_history.php index 7d0c7a767..2142eb11d 100644 --- a/includes/modules/boxes/bm_order_history.php +++ b/includes/modules/boxes/bm_order_history.php @@ -51,7 +51,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/order_history.php'); + include('includes/modules/boxes/templates/order_history.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_product_notifications.php b/includes/modules/boxes/bm_product_notifications.php index 220861d80..303885aa1 100644 --- a/includes/modules/boxes/bm_product_notifications.php +++ b/includes/modules/boxes/bm_product_notifications.php @@ -52,7 +52,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/product_notifications.php'); + include('includes/modules/boxes/templates/product_notifications.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_product_social_bookmarks.php b/includes/modules/boxes/bm_product_social_bookmarks.php index 407673688..cc345e4e3 100644 --- a/includes/modules/boxes/bm_product_social_bookmarks.php +++ b/includes/modules/boxes/bm_product_social_bookmarks.php @@ -42,8 +42,8 @@ function execute() { $class = substr($sbm, 0, strrpos($sbm, '.')); if ( !class_exists($class) ) { - include(DIR_WS_LANGUAGES . $language . '/modules/social_bookmarks/' . $sbm); - include(DIR_WS_MODULES . 'social_bookmarks/' . $class . '.php'); + include('includes/languages/' . $language . '/modules/social_bookmarks/' . $sbm); + include('includes/modules/social_bookmarks/' . $class . '.php'); } $sb = new $class(); @@ -56,7 +56,7 @@ function execute() { if ( !empty($social_bookmarks) ) { ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/product_social_bookmarks.php'); + include('includes/modules/boxes/templates/product_social_bookmarks.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_reviews.php b/includes/modules/boxes/bm_reviews.php index 3913c1178..61f291575 100644 --- a/includes/modules/boxes/bm_reviews.php +++ b/includes/modules/boxes/bm_reviews.php @@ -49,7 +49,7 @@ function execute() { $rand_review_text = tep_break_string(tep_output_string_protected($rand_review['reviews_text']), 15, '-
'); - $reviews_box_contents .= '
' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . tep_draw_stars($random_product['reviews_rating']) . '
'; + $reviews_box_contents .= '
' . tep_image('images/' . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . tep_draw_stars($random_product['reviews_rating']) . '
'; } elseif (isset($_GET['products_id'])) { // display 'write a review' box $reviews_box_contents .= ' ' . MODULE_BOXES_REVIEWS_BOX_WRITE_REVIEW .''; @@ -59,7 +59,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/reviews.php'); + include('includes/modules/boxes/templates/reviews.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_search.php b/includes/modules/boxes/bm_search.php index 4ec328ffb..87befad38 100644 --- a/includes/modules/boxes/bm_search.php +++ b/includes/modules/boxes/bm_search.php @@ -41,7 +41,7 @@ function execute() { ' '; ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/search.php'); + include('includes/modules/boxes/templates/search.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_shopping_cart.php b/includes/modules/boxes/bm_shopping_cart.php index a0a21f82e..74f56f6e0 100644 --- a/includes/modules/boxes/bm_shopping_cart.php +++ b/includes/modules/boxes/bm_shopping_cart.php @@ -66,7 +66,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/shopping_cart.php'); + include('includes/modules/boxes/templates/shopping_cart.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/bm_specials.php b/includes/modules/boxes/bm_specials.php index 662270855..1db9ed5ff 100644 --- a/includes/modules/boxes/bm_specials.php +++ b/includes/modules/boxes/bm_specials.php @@ -35,7 +35,7 @@ function execute() { 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 products p, products_description pd, 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)) { ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/specials.php'); + include('includes/modules/boxes/templates/specials.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); } diff --git a/includes/modules/boxes/bm_whats_new.php b/includes/modules/boxes/bm_whats_new.php index b91c5a198..0f83215d4 100644 --- a/includes/modules/boxes/bm_whats_new.php +++ b/includes/modules/boxes/bm_whats_new.php @@ -45,7 +45,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'boxes/templates/whats_new.php'); + include('includes/modules/boxes/templates/whats_new.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/boxes/templates/specials.php b/includes/modules/boxes/templates/specials.php index 162862e75..abc36b39d 100644 --- a/includes/modules/boxes/templates/specials.php +++ b/includes/modules/boxes/templates/specials.php @@ -3,6 +3,6 @@ ' . MODULE_BOXES_SPECIALS_BOX_TITLE . ''; ?>
- ' . 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'])) . ''; ?> + ' . tep_image('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/includes/modules/boxes/templates/whats_new.php b/includes/modules/boxes/templates/whats_new.php index 8dc88b95e..c9a285a13 100644 --- a/includes/modules/boxes/templates/whats_new.php +++ b/includes/modules/boxes/templates/whats_new.php @@ -1,5 +1,5 @@
- ' . 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 . '
'; ?> + ' . tep_image('images/' . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '
' . $random_product['products_name'] . '
' . $whats_new_price . '
'; ?>
diff --git a/includes/modules/content/checkout_success/cm_cs_downloads.php b/includes/modules/content/checkout_success/cm_cs_downloads.php index 0b779b0ae..206f0cf53 100755 --- a/includes/modules/content/checkout_success/cm_cs_downloads.php +++ b/includes/modules/content/checkout_success/cm_cs_downloads.php @@ -37,7 +37,7 @@ function execute() { if ( DOWNLOAD_ENABLED == 'true' ) { ob_start(); extract($GLOBALS, EXTR_SKIP); - include(DIR_WS_MODULES . 'downloads.php'); + include('includes/modules/downloads.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/checkout_success/cm_cs_product_notifications.php b/includes/modules/content/checkout_success/cm_cs_product_notifications.php index 8556413aa..87655e1c2 100755 --- a/includes/modules/content/checkout_success/cm_cs_product_notifications.php +++ b/includes/modules/content/checkout_success/cm_cs_product_notifications.php @@ -67,7 +67,7 @@ function execute() { $products_notifications = implode('', $products_displayed); ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/product_notifications.php'); + include('includes/modules/content/' . $this->group . '/templates/product_notifications.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/checkout_success/cm_cs_thank_you.php b/includes/modules/content/checkout_success/cm_cs_thank_you.php index 1636508e1..c50facf1c 100755 --- a/includes/modules/content/checkout_success/cm_cs_thank_you.php +++ b/includes/modules/content/checkout_success/cm_cs_thank_you.php @@ -35,7 +35,7 @@ function execute() { global $oscTemplate; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/thank_you.php'); + include('includes/modules/content/' . $this->group . '/templates/thank_you.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer/cm_footer_account.php b/includes/modules/content/footer/cm_footer_account.php index 9004bc2cc..fe5dbed47 100644 --- a/includes/modules/content/footer/cm_footer_account.php +++ b/includes/modules/content/footer/cm_footer_account.php @@ -49,7 +49,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/account.php'); + include('includes/modules/content/' . $this->group . '/templates/account.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer/cm_footer_contact_us.php b/includes/modules/content/footer/cm_footer_contact_us.php index b9b031286..4d033a171 100644 --- a/includes/modules/content/footer/cm_footer_contact_us.php +++ b/includes/modules/content/footer/cm_footer_contact_us.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_FOOTER_CONTACT_US_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/contact_us.php'); + include('includes/modules/content/' . $this->group . '/templates/contact_us.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer/cm_footer_information_links.php b/includes/modules/content/footer/cm_footer_information_links.php index f548ce0d1..bd4510a3c 100644 --- a/includes/modules/content/footer/cm_footer_information_links.php +++ b/includes/modules/content/footer/cm_footer_information_links.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_FOOTER_INFORMATION_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/links.php'); + include('includes/modules/content/' . $this->group . '/templates/links.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer/cm_footer_text.php b/includes/modules/content/footer/cm_footer_text.php index 278b68d1b..e470b9a57 100644 --- a/includes/modules/content/footer/cm_footer_text.php +++ b/includes/modules/content/footer/cm_footer_text.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_FOOTER_TEXT_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/text.php'); + include('includes/modules/content/' . $this->group . '/templates/text.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer_suffix/cm_footer_extra_copyright.php b/includes/modules/content/footer_suffix/cm_footer_extra_copyright.php index cd5289812..dd4a8b28f 100644 --- a/includes/modules/content/footer_suffix/cm_footer_extra_copyright.php +++ b/includes/modules/content/footer_suffix/cm_footer_extra_copyright.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_FOOTER_EXTRA_COPYRIGHT_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/copyright.php'); + include('includes/modules/content/' . $this->group . '/templates/copyright.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/footer_suffix/cm_footer_extra_icons.php b/includes/modules/content/footer_suffix/cm_footer_extra_icons.php index e5bb8f2bc..c49afe968 100644 --- a/includes/modules/content/footer_suffix/cm_footer_extra_icons.php +++ b/includes/modules/content/footer_suffix/cm_footer_extra_icons.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_FOOTER_EXTRA_ICONS_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/icons.php'); + include('includes/modules/content/' . $this->group . '/templates/icons.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/cm_header_breadcrumb.php b/includes/modules/content/header/cm_header_breadcrumb.php index 9cbd771e4..a90b6bc5f 100644 --- a/includes/modules/content/header/cm_header_breadcrumb.php +++ b/includes/modules/content/header/cm_header_breadcrumb.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_HEADER_BREADCRUMB_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/breadcrumb.php'); + include('includes/modules/content/' . $this->group . '/templates/breadcrumb.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/cm_header_buttons.php b/includes/modules/content/header/cm_header_buttons.php index fad1f79e3..4c8870eea 100644 --- a/includes/modules/content/header/cm_header_buttons.php +++ b/includes/modules/content/header/cm_header_buttons.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_HEADER_BUTTONS_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/buttons.php'); + include('includes/modules/content/' . $this->group . '/templates/buttons.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/cm_header_logo.php b/includes/modules/content/header/cm_header_logo.php index 31068ec0d..75c747daa 100644 --- a/includes/modules/content/header/cm_header_logo.php +++ b/includes/modules/content/header/cm_header_logo.php @@ -38,7 +38,7 @@ function execute() { $content_width = (int)MODULE_CONTENT_HEADER_LOGO_CONTENT_WIDTH; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/logo.php'); + include('includes/modules/content/' . $this->group . '/templates/logo.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/cm_header_messagestack.php b/includes/modules/content/header/cm_header_messagestack.php index f71d8a74f..70a7eecc2 100644 --- a/includes/modules/content/header/cm_header_messagestack.php +++ b/includes/modules/content/header/cm_header_messagestack.php @@ -37,7 +37,7 @@ function execute() { if ($messageStack->size('header') > 0) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/messagestack.php'); + include('includes/modules/content/' . $this->group . '/templates/messagestack.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/cm_header_search.php b/includes/modules/content/header/cm_header_search.php index 20562c90e..d4782293b 100644 --- a/includes/modules/content/header/cm_header_search.php +++ b/includes/modules/content/header/cm_header_search.php @@ -47,7 +47,7 @@ function execute() { $search_box .= '
'; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/search.php'); + include('includes/modules/content/' . $this->group . '/templates/search.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/header/templates/logo.php b/includes/modules/content/header/templates/logo.php index e95e1cea3..94b048ca2 100644 --- a/includes/modules/content/header/templates/logo.php +++ b/includes/modules/content/header/templates/logo.php @@ -1,4 +1,4 @@ diff --git a/includes/modules/content/index/cm_i_customer_greeting.php b/includes/modules/content/index/cm_i_customer_greeting.php index bd97d2392..6ed9c979d 100644 --- a/includes/modules/content/index/cm_i_customer_greeting.php +++ b/includes/modules/content/index/cm_i_customer_greeting.php @@ -44,7 +44,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/customer_greeting.php'); + include('includes/modules/content/' . $this->group . '/templates/customer_greeting.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index/cm_i_new_products.php b/includes/modules/content/index/cm_i_new_products.php index d64c91287..37084058c 100644 --- a/includes/modules/content/index/cm_i_new_products.php +++ b/includes/modules/content/index/cm_i_new_products.php @@ -48,7 +48,7 @@ function execute() { if ($num_new_products > 0) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/new_products.php'); + include('includes/modules/content/' . $this->group . '/templates/new_products.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index/cm_i_text_main.php b/includes/modules/content/index/cm_i_text_main.php index 895dc013f..d362bab96 100644 --- a/includes/modules/content/index/cm_i_text_main.php +++ b/includes/modules/content/index/cm_i_text_main.php @@ -39,7 +39,7 @@ function execute() { if (tep_not_null(MODULE_CONTENT_TEXT_MAIN_TEXT)) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/text_main.php'); + include('includes/modules/content/' . $this->group . '/templates/text_main.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index/cm_i_upcoming_products.php b/includes/modules/content/index/cm_i_upcoming_products.php index 32b5bf1fe..0ae80a535 100644 --- a/includes/modules/content/index/cm_i_upcoming_products.php +++ b/includes/modules/content/index/cm_i_upcoming_products.php @@ -41,7 +41,7 @@ function execute() { if (tep_db_num_rows($expected_query) > 0) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/upcoming_products.php'); + include('includes/modules/content/' . $this->group . '/templates/upcoming_products.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index/templates/new_products.php b/includes/modules/content/index/templates/new_products.php index af2b2a14d..71d7ee7d5 100644 --- a/includes/modules/content/index/templates/new_products.php +++ b/includes/modules/content/index/templates/new_products.php @@ -21,7 +21,7 @@ ?>
- +

diff --git a/includes/modules/content/index_nested/cm_in_category_description.php b/includes/modules/content/index_nested/cm_in_category_description.php index b56bd5dc2..082375456 100644 --- a/includes/modules/content/index_nested/cm_in_category_description.php +++ b/includes/modules/content/index_nested/cm_in_category_description.php @@ -39,7 +39,7 @@ function execute() { if (tep_not_null($category['categories_description'])) { ob_start(); - require(DIR_WS_MODULES . 'content/' . $this->group . '/templates/category_description.php'); + require('includes/modules/content/' . $this->group . '/templates/category_description.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index_nested/cm_in_category_listing.php b/includes/modules/content/index_nested/cm_in_category_listing.php index 6d464dfa6..58f37bef8 100644 --- a/includes/modules/content/index_nested/cm_in_category_listing.php +++ b/includes/modules/content/index_nested/cm_in_category_listing.php @@ -56,7 +56,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/category_listing.php'); + include('includes/modules/content/' . $this->group . '/templates/category_listing.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index_nested/cm_in_new_products.php b/includes/modules/content/index_nested/cm_in_new_products.php index 924709488..2c52c96c1 100644 --- a/includes/modules/content/index_nested/cm_in_new_products.php +++ b/includes/modules/content/index_nested/cm_in_new_products.php @@ -43,7 +43,7 @@ function execute() { if ($num_new_products > 0) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/category_new_products.php'); + include('includes/modules/content/' . $this->group . '/templates/category_new_products.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/index_nested/templates/category_listing.php b/includes/modules/content/index_nested/templates/category_listing.php index 4a83c2d6f..19adfb5c1 100644 --- a/includes/modules/content/index_nested/templates/category_listing.php +++ b/includes/modules/content/index_nested/templates/category_listing.php @@ -8,7 +8,7 @@ $cPath_new = tep_get_path($categories['categories_id']); echo '
'; echo '
'; - echo ' ' . tep_image(DIR_WS_IMAGES . $categories['categories_image'], $categories['categories_name'], SUBCATEGORY_IMAGE_WIDTH, SUBCATEGORY_IMAGE_HEIGHT) . ''; + echo ' ' . tep_image('images/' . $categories['categories_image'], $categories['categories_name'], SUBCATEGORY_IMAGE_WIDTH, SUBCATEGORY_IMAGE_HEIGHT) . ''; echo '
'; echo '
' . $categories['categories_name'] . '
'; echo '
'; diff --git a/includes/modules/content/index_nested/templates/category_new_products.php b/includes/modules/content/index_nested/templates/category_new_products.php index eefe3bcaf..fa60905c0 100644 --- a/includes/modules/content/index_nested/templates/category_new_products.php +++ b/includes/modules/content/index_nested/templates/category_new_products.php @@ -21,7 +21,7 @@ ?>
- +

diff --git a/includes/modules/content/login/cm_create_account_link.php b/includes/modules/content/login/cm_create_account_link.php index 996d3d647..1870bf9a7 100755 --- a/includes/modules/content/login/cm_create_account_link.php +++ b/includes/modules/content/login/cm_create_account_link.php @@ -35,7 +35,7 @@ function execute() { global $oscTemplate; ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/create_account_link.php'); + include('includes/modules/content/' . $this->group . '/templates/create_account_link.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/login/cm_login_form.php b/includes/modules/content/login/cm_login_form.php index df21d869c..fcca60ead 100755 --- a/includes/modules/content/login/cm_login_form.php +++ b/includes/modules/content/login/cm_login_form.php @@ -67,7 +67,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/login_form.php'); + include('includes/modules/content/' . $this->group . '/templates/login_form.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/login/cm_paypal_login.php b/includes/modules/content/login/cm_paypal_login.php index 370719d0b..e94348342 100755 --- a/includes/modules/content/login/cm_paypal_login.php +++ b/includes/modules/content/login/cm_paypal_login.php @@ -90,7 +90,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/paypal_login.php'); + include('includes/modules/content/' . $this->group . '/templates/paypal_login.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); @@ -277,8 +277,8 @@ function postLogin() { if (defined('MODULE_PAYMENT_INSTALLED') && tep_not_null(MODULE_PAYMENT_INSTALLED)) { if ( in_array('paypal_express.php', explode(';', MODULE_PAYMENT_INSTALLED)) ) { if ( !class_exists('paypal_express') ) { - include(DIR_WS_LANGUAGES . $language . '/modules/payment/paypal_express.php'); - include(DIR_WS_MODULES . 'payment/paypal_express.php'); + include('includes/languages/' . $language . '/modules/payment/paypal_express.php'); + include('includes/modules/payment/paypal_express.php'); } $ppe = new paypal_express(); diff --git a/includes/modules/content/navigation/cm_navbar.php b/includes/modules/content/navigation/cm_navbar.php index ad81d8f2f..4500e4a00 100644 --- a/includes/modules/content/navigation/cm_navbar.php +++ b/includes/modules/content/navigation/cm_navbar.php @@ -61,8 +61,8 @@ function execute() { $class = substr($nbm, 0, strrpos($nbm, '.')); if ( !class_exists($class) ) { - include(DIR_WS_LANGUAGES . $language . '/modules/navbar_modules/' . $nbm); - require(DIR_WS_MODULES . 'navbar_modules/' . $class . '.php'); + include('includes/languages/' . $language . '/modules/navbar_modules/' . $nbm); + require('includes/modules/navbar_modules/' . $class . '.php'); } $nav = new $class(); @@ -74,7 +74,7 @@ function execute() { if ( !empty($navbar_modules) ) { ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/navbar.php'); + include('includes/modules/content/' . $this->group . '/templates/navbar.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/product_info/cm_pi_gtin.php b/includes/modules/content/product_info/cm_pi_gtin.php index bb2ecd5d7..38e1d1c44 100644 --- a/includes/modules/content/product_info/cm_pi_gtin.php +++ b/includes/modules/content/product_info/cm_pi_gtin.php @@ -41,7 +41,7 @@ function execute() { $gtin = substr($product_info['products_gtin'], 0-MODULE_CONTENT_PRODUCT_INFO_GTIN_LENGTH); ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/gtin.php'); + include('includes/modules/content/' . $this->group . '/templates/gtin.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/content/product_info/cm_pi_reviews.php b/includes/modules/content/product_info/cm_pi_reviews.php index d639a8669..9466774ce 100644 --- a/includes/modules/content/product_info/cm_pi_reviews.php +++ b/includes/modules/content/product_info/cm_pi_reviews.php @@ -50,7 +50,7 @@ function execute() { } ob_start(); - include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/reviews.php'); + include('includes/modules/content/' . $this->group . '/templates/reviews.php'); $template = ob_get_clean(); $oscTemplate->addContent($template, $this->group); diff --git a/includes/modules/header_tags/ht_google_adwords_conversion.php b/includes/modules/header_tags/ht_google_adwords_conversion.php index 7fc6b3ec5..8a301e43a 100755 --- a/includes/modules/header_tags/ht_google_adwords_conversion.php +++ b/includes/modules/header_tags/ht_google_adwords_conversion.php @@ -45,7 +45,7 @@ function execute() { $order_subtotal = tep_db_fetch_array($order_subtotal_query); if (!isset($lng) || (isset($lng) && !is_object($lng))) { - include(DIR_WS_CLASSES . 'language.php'); + include('includes/classes/language.php'); $lng = new language; } diff --git a/includes/modules/header_tags/ht_mailchimp_360.php b/includes/modules/header_tags/ht_mailchimp_360.php index 2f42e3c84..7fedaaa5f 100755 --- a/includes/modules/header_tags/ht_mailchimp_360.php +++ b/includes/modules/header_tags/ht_mailchimp_360.php @@ -31,8 +31,8 @@ function ht_mailchimp_360() { function execute() { global $PHP_SELF; - include(DIR_WS_MODULES . 'header_tags/ht_mailchimp_360/MCAPI.class.php'); - include(DIR_WS_MODULES . 'header_tags/ht_mailchimp_360/mc360.php'); + include('includes/modules/header_tags/ht_mailchimp_360/MCAPI.class.php'); + include('includes/modules/header_tags/ht_mailchimp_360/mc360.php'); $mc360 = new mc360(); $mc360->set_cookies(); diff --git a/includes/modules/header_tags/ht_product_opengraph.php b/includes/modules/header_tags/ht_product_opengraph.php index 0b793043c..edf0f0733 100644 --- a/includes/modules/header_tags/ht_product_opengraph.php +++ b/includes/modules/header_tags/ht_product_opengraph.php @@ -50,7 +50,7 @@ function execute() { $pi = tep_db_fetch_array($pi_query); $products_image = $pi['image']; } - $data['og:image'] = tep_href_link(DIR_WS_IMAGES . $products_image, '', 'NONSSL', false, false); + $data['og:image'] = tep_href_link('images/' . $products_image, '', 'NONSSL', false, false); if ($new_price = tep_get_products_special_price($product_info['products_id'])) { $products_price = $this->format_raw($new_price); diff --git a/includes/modules/header_tags/ht_twitter_product_card.php b/includes/modules/header_tags/ht_twitter_product_card.php index 78ceccfd8..25638be9c 100755 --- a/includes/modules/header_tags/ht_twitter_product_card.php +++ b/includes/modules/header_tags/ht_twitter_product_card.php @@ -66,7 +66,7 @@ function execute() { $products_image = $pi['image']; } - $data['image'] = tep_href_link(DIR_WS_IMAGES . $products_image, '', 'NONSSL', false, false); + $data['image'] = tep_href_link('images/' . $products_image, '', 'NONSSL', false, false); $result = ''; diff --git a/includes/modules/navbar_modules/nb_account.php b/includes/modules/navbar_modules/nb_account.php index 9539946f9..e80349f7f 100644 --- a/includes/modules/navbar_modules/nb_account.php +++ b/includes/modules/navbar_modules/nb_account.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate, $customer_first_name, $customer_id; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/account.php'); + require('includes/modules/navbar_modules/templates/account.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_brand.php b/includes/modules/navbar_modules/nb_brand.php index 86b24a2a1..b07a2b13b 100644 --- a/includes/modules/navbar_modules/nb_brand.php +++ b/includes/modules/navbar_modules/nb_brand.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/brand.php'); + require('includes/modules/navbar_modules/templates/brand.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_currencies.php b/includes/modules/navbar_modules/nb_currencies.php index eacd22465..fe5f3d5bc 100644 --- a/includes/modules/navbar_modules/nb_currencies.php +++ b/includes/modules/navbar_modules/nb_currencies.php @@ -45,7 +45,7 @@ function getOutput() { if (substr(basename($PHP_SELF), 0, 8) != 'checkout') { ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/currencies.php'); + require('includes/modules/navbar_modules/templates/currencies.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_hamburger_button.php b/includes/modules/navbar_modules/nb_hamburger_button.php index db06e2d1d..a312973e0 100644 --- a/includes/modules/navbar_modules/nb_hamburger_button.php +++ b/includes/modules/navbar_modules/nb_hamburger_button.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/hamburger_button.php'); + require('includes/modules/navbar_modules/templates/hamburger_button.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_home.php b/includes/modules/navbar_modules/nb_home.php index a165a2d81..b8f207f75 100644 --- a/includes/modules/navbar_modules/nb_home.php +++ b/includes/modules/navbar_modules/nb_home.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/home.php'); + require('includes/modules/navbar_modules/templates/home.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_languages.php b/includes/modules/navbar_modules/nb_languages.php index 2603c8f5f..5180d1a08 100644 --- a/includes/modules/navbar_modules/nb_languages.php +++ b/includes/modules/navbar_modules/nb_languages.php @@ -45,7 +45,7 @@ function getOutput() { if (substr(basename($PHP_SELF), 0, 8) != 'checkout') { ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/languages.php'); + require('includes/modules/navbar_modules/templates/languages.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_new_products.php b/includes/modules/navbar_modules/nb_new_products.php index e1d723b3d..d271e3433 100644 --- a/includes/modules/navbar_modules/nb_new_products.php +++ b/includes/modules/navbar_modules/nb_new_products.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/new_products.php'); + require('includes/modules/navbar_modules/templates/new_products.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_reviews.php b/includes/modules/navbar_modules/nb_reviews.php index d412601e5..c24f1b721 100644 --- a/includes/modules/navbar_modules/nb_reviews.php +++ b/includes/modules/navbar_modules/nb_reviews.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/reviews.php'); + require('includes/modules/navbar_modules/templates/reviews.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_shopping_cart.php b/includes/modules/navbar_modules/nb_shopping_cart.php index 73028d883..5bdb8e2a8 100644 --- a/includes/modules/navbar_modules/nb_shopping_cart.php +++ b/includes/modules/navbar_modules/nb_shopping_cart.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate, $cart, $currencies; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/shopping_cart.php'); + require('includes/modules/navbar_modules/templates/shopping_cart.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_special_offers.php b/includes/modules/navbar_modules/nb_special_offers.php index cb56897d8..bc1c83e63 100644 --- a/includes/modules/navbar_modules/nb_special_offers.php +++ b/includes/modules/navbar_modules/nb_special_offers.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/special_offers.php'); + require('includes/modules/navbar_modules/templates/special_offers.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/nb_testimonials.php b/includes/modules/navbar_modules/nb_testimonials.php index 4b4cf1e3b..35b8825d1 100644 --- a/includes/modules/navbar_modules/nb_testimonials.php +++ b/includes/modules/navbar_modules/nb_testimonials.php @@ -44,7 +44,7 @@ function getOutput() { global $oscTemplate; ob_start(); - require(DIR_WS_MODULES . 'navbar_modules/templates/testimonials.php'); + require('includes/modules/navbar_modules/templates/testimonials.php'); $data = ob_get_clean(); $oscTemplate->addBlock($data, $this->group); diff --git a/includes/modules/navbar_modules/templates/languages.php b/includes/modules/navbar_modules/templates/languages.php index e5c207616..dc50e6f06 100644 --- a/includes/modules/navbar_modules/templates/languages.php +++ b/includes/modules/navbar_modules/templates/languages.php @@ -2,7 +2,7 @@ catalog_languages) > 1) { @@ -11,7 +11,7 @@ catalog_languages); while (list($key, $value) = each($lng->catalog_languages)) { - echo '
  • ' . tep_image(DIR_WS_LANGUAGES . $value['directory'] . '/images/' . $value['image'], $value['name'], null, null, null, false) . ' ' . $value['name'] . '
    • '; + echo '
  • ' . tep_image('includes/languages/' . $value['directory'] . '/images/' . $value['image'], $value['name'], null, null, null, false) . ' ' . $value['name'] . '
    • '; } ?> diff --git a/includes/modules/new_products.php b/includes/modules/new_products.php index af8df6de1..6301a6fe0 100644 --- a/includes/modules/new_products.php +++ b/includes/modules/new_products.php @@ -25,7 +25,7 @@ while ($new_products = tep_db_fetch_array($new_products_query)) { $new_prods_content .= '
    '; $new_prods_content .= '
    '; - $new_prods_content .= ' ' . tep_image(DIR_WS_IMAGES . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"') . ''; + $new_prods_content .= ' ' . tep_image('images/' . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"') . ''; $new_prods_content .= '
    '; $new_prods_content .= '

    '; $new_prods_content .= '
    '; diff --git a/includes/modules/payment/braintree_cc.php b/includes/modules/payment/braintree_cc.php index 2a53b51bb..7b15ccf83 100755 --- a/includes/modules/payment/braintree_cc.php +++ b/includes/modules/payment/braintree_cc.php @@ -809,7 +809,7 @@ function tep_cfg_braintree_cc_show_client_key($key) { function tep_cfg_braintree_cc_set_merchant_accounts($value, $key) { if ( !class_exists('currencies') ) { - include(DIR_WS_CLASSES . 'currencies.php'); + include('includes/classes/currencies.php'); } $data = array(); @@ -874,7 +874,7 @@ function tep_cfg_braintree_cc_set_merchant_accounts($value, $key) { function tep_cfg_braintree_cc_show_merchant_accounts($value) { if ( !class_exists('currencies') ) { - include(DIR_WS_CLASSES . 'currencies.php'); + include('includes/classes/currencies.php'); } $data = array(); diff --git a/includes/modules/payment/psigate.php b/includes/modules/payment/psigate.php index 875266937..41dc83660 100755 --- a/includes/modules/payment/psigate.php +++ b/includes/modules/payment/psigate.php @@ -102,7 +102,7 @@ function selection() { function pre_confirmation_check() { if (MODULE_PAYMENT_PSIGATE_INPUT_MODE == 'Local') { - include(DIR_WS_CLASSES . 'cc_validation.php'); + include('includes/classes/cc_validation.php'); $cc_validation = new cc_validation(); $result = $cc_validation->validate($_POST['psigate_cc_number'], $_POST['psigate_cc_expires_month'], $_POST['psigate_cc_expires_year']); diff --git a/includes/modules/product_listing.php b/includes/modules/product_listing.php index 713c063d5..d1670ee4b 100644 --- a/includes/modules/product_listing.php +++ b/includes/modules/product_listing.php @@ -111,9 +111,9 @@ if (PRODUCT_LIST_IMAGE > 0) { if (isset($_GET['manufacturers_id']) && tep_not_null($_GET['manufacturers_id'])) { - $prod_list_contents .= ' ' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"', NULL, 'img-responsive thumbnail group list-group-image') . ''; + $prod_list_contents .= ' ' . tep_image('images/' . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"', NULL, 'img-responsive thumbnail group list-group-image') . ''; } else { - $prod_list_contents .= ' ' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"', NULL, 'img-responsive thumbnail group list-group-image') . ''; + $prod_list_contents .= ' ' . tep_image('images/' . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'itemprop="image"', NULL, 'img-responsive thumbnail group list-group-image') . ''; } } diff --git a/includes/modules/shipping/usps.php b/includes/modules/shipping/usps.php index ccaf354d3..abce681e0 100755 --- a/includes/modules/shipping/usps.php +++ b/includes/modules/shipping/usps.php @@ -24,7 +24,7 @@ function usps() { $this->title = MODULE_SHIPPING_USPS_TEXT_TITLE; $this->description = MODULE_SHIPPING_USPS_TEXT_DESCRIPTION; $this->sort_order = MODULE_SHIPPING_USPS_SORT_ORDER; - $this->icon = DIR_WS_ICONS . 'shipping_usps.gif'; + $this->icon = 'images/icons/shipping_usps.gif'; $this->tax_class = MODULE_SHIPPING_USPS_TAX_CLASS; $this->enabled = ((MODULE_SHIPPING_USPS_STATUS == 'True') ? true : false); diff --git a/includes/modules/social_bookmarks/sb_digg.php b/includes/modules/social_bookmarks/sb_digg.php index 09ac0fc02..cc405bcfc 100755 --- a/includes/modules/social_bookmarks/sb_digg.php +++ b/includes/modules/social_bookmarks/sb_digg.php @@ -30,7 +30,7 @@ function sb_digg() { } function getOutput() { - return '' . tep_output_string_protected($this->public_title) . ''; + return '' . tep_output_string_protected($this->public_title) . ''; } function isEnabled() { diff --git a/includes/modules/social_bookmarks/sb_email.php b/includes/modules/social_bookmarks/sb_email.php index e36c1ca5e..e90aa9152 100755 --- a/includes/modules/social_bookmarks/sb_email.php +++ b/includes/modules/social_bookmarks/sb_email.php @@ -30,7 +30,7 @@ function sb_email() { } function getOutput() { - return '' . tep_output_string_protected($this->public_title) . ''; + return '' . tep_output_string_protected($this->public_title) . ''; } function isEnabled() { diff --git a/includes/modules/social_bookmarks/sb_facebook.php b/includes/modules/social_bookmarks/sb_facebook.php index 040362a4b..6472d5ae6 100755 --- a/includes/modules/social_bookmarks/sb_facebook.php +++ b/includes/modules/social_bookmarks/sb_facebook.php @@ -30,7 +30,7 @@ function sb_facebook() { } function getOutput() { - return '' . tep_output_string_protected($this->public_title) . ''; + return '' . tep_output_string_protected($this->public_title) . ''; } function isEnabled() { diff --git a/includes/modules/social_bookmarks/sb_google_plus_one.php b/includes/modules/social_bookmarks/sb_google_plus_one.php index 97e0b20aa..a5b77c696 100755 --- a/includes/modules/social_bookmarks/sb_google_plus_one.php +++ b/includes/modules/social_bookmarks/sb_google_plus_one.php @@ -33,7 +33,7 @@ function getOutput() { global $lng, $languages_id; if (!isset($lng) || (isset($lng) && !is_object($lng))) { - include(DIR_WS_CLASSES . 'language.php'); + include('includes/classes/language.php'); $lng = new language; } diff --git a/includes/modules/social_bookmarks/sb_google_plus_share.php b/includes/modules/social_bookmarks/sb_google_plus_share.php index e428ba0b1..ed5d1ab87 100755 --- a/includes/modules/social_bookmarks/sb_google_plus_share.php +++ b/includes/modules/social_bookmarks/sb_google_plus_share.php @@ -33,7 +33,7 @@ function getOutput() { global $lng, $languages_id; if (!isset($lng) || (isset($lng) && !is_object($lng))) { - include(DIR_WS_CLASSES . 'language.php'); + include('includes/classes/language.php'); $lng = new language; } diff --git a/includes/modules/social_bookmarks/sb_pinterest.php b/includes/modules/social_bookmarks/sb_pinterest.php index 72a9e3a50..c33bd72fb 100755 --- a/includes/modules/social_bookmarks/sb_pinterest.php +++ b/includes/modules/social_bookmarks/sb_pinterest.php @@ -58,7 +58,7 @@ function getOutput() { } } - $params['media'] = tep_href_link(DIR_WS_IMAGES . $image_file, '', 'NONSSL', false); + $params['media'] = tep_href_link('images/' . $image_file, '', 'NONSSL', false); } // url diff --git a/includes/modules/social_bookmarks/sb_twitter.php b/includes/modules/social_bookmarks/sb_twitter.php index ef61c64fe..8d90a5905 100755 --- a/includes/modules/social_bookmarks/sb_twitter.php +++ b/includes/modules/social_bookmarks/sb_twitter.php @@ -30,7 +30,7 @@ function sb_twitter() { } function getOutput() { - return '' . tep_output_string_protected($this->public_title) . ''; + return '' . tep_output_string_protected($this->public_title) . ''; } function isEnabled() { diff --git a/includes/template_bottom.php b/includes/template_bottom.php index b7b73fd50..a5e858299 100755 --- a/includes/template_bottom.php +++ b/includes/template_bottom.php @@ -39,7 +39,7 @@
    - + getBlocks('footer_scripts'); ?> diff --git a/includes/template_top.php b/includes/template_top.php index c2fd5130e..dfdb690fd 100755 --- a/includes/template_top.php +++ b/includes/template_top.php @@ -53,6 +53,6 @@
    - +
    diff --git a/index.php b/index.php index d422abda0..67f48867d 100644 --- a/index.php +++ b/index.php @@ -30,9 +30,9 @@ } } - require(DIR_WS_LANGUAGES . $language . '/index.php'); + require('includes/languages/' . $language . '/index.php'); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); if ($category_depth == 'nested') { $category_query = tep_db_query("select cd.categories_name, c.categories_image, cd.categories_description 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 . "'"); @@ -207,7 +207,7 @@ } } - include(DIR_WS_MODULES . 'product_listing.php'); + include('includes/modules/product_listing.php'); ?>
    @@ -233,6 +233,6 @@ diff --git a/install/templates/pages/install_4.php b/install/templates/pages/install_4.php index 729579d76..388fce48e 100755 --- a/install/templates/pages/install_4.php +++ b/install/templates/pages/install_4.php @@ -125,15 +125,7 @@ ' define(\'HTTP_COOKIE_PATH\', \'' . $http_catalog . '\');' . "\n" . ' define(\'HTTPS_COOKIE_PATH\', \'' . $http_catalog . '\');' . "\n" . ' define(\'DIR_WS_HTTP_CATALOG\', \'' . $http_catalog . '\');' . "\n" . - ' define(\'DIR_WS_HTTPS_CATALOG\', \'' . $http_catalog . '\');' . "\n" . - ' define(\'DIR_WS_IMAGES\', \'images/\');' . "\n" . - ' define(\'DIR_WS_ICONS\', DIR_WS_IMAGES . \'icons/\');' . "\n" . - ' define(\'DIR_WS_INCLUDES\', \'includes/\');' . "\n" . - ' define(\'DIR_WS_FUNCTIONS\', DIR_WS_INCLUDES . \'functions/\');' . "\n" . - ' define(\'DIR_WS_CLASSES\', DIR_WS_INCLUDES . \'classes/\');' . "\n" . - ' define(\'DIR_WS_MODULES\', DIR_WS_INCLUDES . \'modules/\');' . "\n" . - ' define(\'DIR_WS_LANGUAGES\', DIR_WS_INCLUDES . \'languages/\');' . "\n\n" . - ' define(\'DIR_WS_DOWNLOAD_PUBLIC\', \'pub/\');' . "\n" . + ' define(\'DIR_WS_HTTPS_CATALOG\', \'' . $http_catalog . '\');' . "\n\n" . ' define(\'DIR_FS_CATALOG\', \'' . $dir_fs_document_root . '\');' . "\n" . ' define(\'DIR_FS_DOWNLOAD\', DIR_FS_CATALOG . \'download/\');' . "\n" . ' define(\'DIR_FS_DOWNLOAD_PUBLIC\', DIR_FS_CATALOG . \'pub/\');' . "\n\n" . @@ -174,14 +166,9 @@ ' define(\'DIR_WS_CATALOG\', \'' . $http_catalog . '\');' . "\n" . ' define(\'DIR_WS_HTTPS_CATALOG\', \'' . $http_catalog . '\');' . "\n" . ' define(\'DIR_FS_CATALOG\', \'' . $dir_fs_document_root . '\');' . "\n" . - ' define(\'DIR_WS_IMAGES\', \'images/\');' . "\n" . - ' define(\'DIR_WS_ICONS\', DIR_WS_IMAGES . \'icons/\');' . "\n" . ' define(\'DIR_WS_CATALOG_IMAGES\', DIR_WS_CATALOG . \'images/\');' . "\n" . ' define(\'DIR_WS_INCLUDES\', \'includes/\');' . "\n" . ' define(\'DIR_WS_BOXES\', DIR_WS_INCLUDES . \'boxes/\');' . "\n" . - ' define(\'DIR_WS_FUNCTIONS\', DIR_WS_INCLUDES . \'functions/\');' . "\n" . - ' define(\'DIR_WS_CLASSES\', DIR_WS_INCLUDES . \'classes/\');' . "\n" . - ' define(\'DIR_WS_MODULES\', DIR_WS_INCLUDES . \'modules/\');' . "\n" . ' define(\'DIR_WS_LANGUAGES\', DIR_WS_INCLUDES . \'languages/\');' . "\n" . ' define(\'DIR_WS_CATALOG_LANGUAGES\', DIR_WS_CATALOG . \'includes/languages/\');' . "\n" . ' define(\'DIR_FS_CATALOG_LANGUAGES\', DIR_FS_CATALOG . \'includes/languages/\');' . "\n" . diff --git a/login.php b/login.php index 4b6095c13..0a92372a0 100644 --- a/login.php +++ b/login.php @@ -68,11 +68,11 @@ tep_redirect(tep_href_link('index.php')); } - require(DIR_WS_LANGUAGES . $language . '/login.php'); + require('includes/languages/' . $language . '/login.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('login.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    @@ -92,6 +92,6 @@
    diff --git a/logoff.php b/logoff.php index e09682a0f..502faa711 100644 --- a/logoff.php +++ b/logoff.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/logoff.php'); + require('includes/languages/' . $language . '/logoff.php'); $breadcrumb->add(NAVBAR_TITLE); @@ -43,7 +43,7 @@ $cart->reset(); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    @@ -63,6 +63,6 @@
    diff --git a/password_forgotten.php b/password_forgotten.php index 73fbff9dd..99bd1c602 100644 --- a/password_forgotten.php +++ b/password_forgotten.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/password_forgotten.php'); + require('includes/languages/' . $language . '/password_forgotten.php'); $password_reset_initiated = false; @@ -54,7 +54,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('login.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link('password_forgotten.php', '', 'SSL')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    @@ -105,6 +105,6 @@ diff --git a/password_reset.php b/password_reset.php index 4df8a3fab..28a658ac1 100644 --- a/password_reset.php +++ b/password_reset.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/password_reset.php'); + require('includes/languages/' . $language . '/password_reset.php'); $error = false; @@ -84,7 +84,7 @@ $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link('login.php', '', 'SSL')); $breadcrumb->add(NAVBAR_TITLE_2); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    @@ -127,6 +127,6 @@ diff --git a/privacy.php b/privacy.php index 980cf5caa..6f968ecc9 100644 --- a/privacy.php +++ b/privacy.php @@ -12,11 +12,11 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/privacy.php'); + require('includes/languages/' . $language . '/privacy.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('privacy.php')); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    @@ -34,6 +34,6 @@
    diff --git a/product_info.php b/product_info.php index 8001f9a6d..d7f6b48ba 100644 --- a/product_info.php +++ b/product_info.php @@ -16,12 +16,12 @@ tep_redirect(tep_href_link('index.php')); } - require(DIR_WS_LANGUAGES . $language . '/product_info.php'); + require('includes/languages/' . $language . '/product_info.php'); $product_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$_GET['products_id'] . "' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'"); $product_check = tep_db_fetch_array($product_check_query); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); if ($product_check['total'] < 1) { ?> @@ -89,7 +89,7 @@ ' . $pi['htmlcontent'] . '
    '; } - echo tep_image(DIR_WS_IMAGES . $pi['image'], '', '', '', 'id="piGalImg_' . $pi_counter . '"'); + echo tep_image('images/' . $pi['image'], '', '', '', 'id="piGalImg_' . $pi_counter . '"'); } ?> @@ -126,7 +126,7 @@ ?>
    - +
    0) { @@ -231,6 +231,6 @@ diff --git a/product_reviews.php b/product_reviews.php index b9b08d686..b74503792 100644 --- a/product_reviews.php +++ b/product_reviews.php @@ -38,11 +38,11 @@ $products_name = $product_info['products_name']; } - require(DIR_WS_LANGUAGES . $language . '/product_reviews.php'); + require('includes/languages/' . $language . '/product_reviews.php'); $breadcrumb->add(NAVBAR_TITLE, tep_href_link('product_reviews.php', tep_get_all_get_params())); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>
    - ' . tep_image(DIR_WS_IMAGES . $product_info['products_image'], addslashes($product_info['products_name']), SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'hspace="5" vspace="5"') . ''; ?> + ' . tep_image('images/' . $product_info['products_image'], addslashes($product_info['products_name']), SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'hspace="5" vspace="5"') . ''; ?>

    @@ -168,6 +168,6 @@
    diff --git a/product_reviews_write.php b/product_reviews_write.php index db61b91ed..727d1a15a 100644 --- a/product_reviews_write.php +++ b/product_reviews_write.php @@ -12,7 +12,7 @@ require('includes/application_top.php'); - require(DIR_WS_LANGUAGES . $language . '/product_reviews_write.php'); + require('includes/languages/' . $language . '/product_reviews_write.php'); if (!tep_session_is_registered('customer_id')) { $navigation->set_snapshot(); @@ -75,7 +75,7 @@ $breadcrumb->add(NAVBAR_TITLE, tep_href_link('product_reviews.php', tep_get_all_get_params())); - require(DIR_WS_INCLUDES . 'template_top.php'); + require('includes/template_top.php'); ?>