Skip to content

Commit

Permalink
Hardcode Paths
Browse files Browse the repository at this point in the history
  • Loading branch information
gburton committed Aug 16, 2016
1 parent 3175dfa commit 65a7fdc
Show file tree
Hide file tree
Showing 153 changed files with 422 additions and 443 deletions.
8 changes: 4 additions & 4 deletions account.php
Expand Up @@ -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');
?>

<div class="page-header">
Expand All @@ -46,6 +46,6 @@


<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions account_edit.php
Expand Up @@ -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']);
Expand Down Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -221,6 +221,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions account_history.php
Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -92,6 +92,6 @@
</div>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
12 changes: 6 additions & 6 deletions account_history_info.php
Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -189,7 +189,7 @@
</div>

<?php
if (DOWNLOAD_ENABLED == 'true') include(DIR_WS_MODULES . 'downloads.php');
if (DOWNLOAD_ENABLED == 'true') include('includes/modules/downloads.php');
?>

<div class="clearfix"></div>
Expand All @@ -199,6 +199,6 @@
</div>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions account_newsletters.php
Expand Up @@ -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);
Expand All @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -77,6 +77,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions account_notifications.php
Expand Up @@ -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);
Expand Down Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -163,6 +163,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions account_password.php
Expand Up @@ -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']);
Expand Down Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -117,6 +117,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions address_book.php
Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -94,6 +94,6 @@
</div>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
10 changes: 5 additions & 5 deletions address_book_process.php
Expand Up @@ -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) {
Expand Down Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -297,7 +297,7 @@

<div class="contentContainer">

<?php include(DIR_WS_MODULES . 'address_book_details.php'); ?>
<?php include('includes/modules/address_book_details.php'); ?>

<?php
if (isset($_GET['edit']) && is_numeric($_GET['edit'])) {
Expand Down Expand Up @@ -335,6 +335,6 @@
?>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
8 changes: 4 additions & 4 deletions advanced_search.php
Expand Up @@ -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');
?>

<script src="includes/general.js"></script>
Expand Down Expand Up @@ -215,6 +215,6 @@ function check_form() {
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
10 changes: 5 additions & 5 deletions advanced_search_result.php
Expand Up @@ -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;

Expand Down Expand Up @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -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');
?>

<br />
Expand All @@ -327,6 +327,6 @@
</div>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
16 changes: 8 additions & 8 deletions checkout_confirmation.php
Expand Up @@ -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();
Expand All @@ -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();

Expand All @@ -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');
?>

<div class="page-header">
Expand Down Expand Up @@ -299,6 +299,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>
12 changes: 6 additions & 6 deletions checkout_payment.php
Expand Up @@ -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');
Expand All @@ -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');
?>

<?php echo $payment_modules->javascript_validation(); ?>
Expand Down Expand Up @@ -281,6 +281,6 @@
</form>

<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
require('includes/template_bottom.php');
require('includes/application_bottom.php');
?>

0 comments on commit 65a7fdc

Please sign in to comment.