Permalink
Browse files

Removed deprecated code

  • Loading branch information...
1 parent 7cf7e9c commit c9da0bdcf8975e1fe25e011733d68e9dfdd0156e @acidvertigo acidvertigo committed Aug 16, 2011
@@ -29,9 +29,9 @@ function ht_category_title() {
}
function execute() {
- global $PHP_SELF, $oscTemplate, $categories, $current_category_id, $languages_id;
+ global $oscTemplate, $categories, $current_category_id, $languages_id;
- if (basename($PHP_SELF) == FILENAME_DEFAULT) {
+ if (basename($_SERVER['PHP_SELF']) == FILENAME_DEFAULT) {
// $categories is set in application_top.php to add the category to the breadcrumb
if (isset($categories) && (sizeof($categories) == 1) && isset($categories['categories_name'])) {
$oscTemplate->setTitle($categories['categories_name'] . ', ' . $oscTemplate->getTitle());
@@ -29,7 +29,7 @@ function ht_google_analytics() {
}
function execute() {
- global $PHP_SELF, $oscTemplate, $customer_id;
+ global $oscTemplate, $customer_id;
if (tep_not_null(MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_ID)) {
if (MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_JS_PLACEMENT != 'Header') {
@@ -41,7 +41,7 @@ function execute() {
_gaq.push([\'_setAccount\', \'' . tep_output_string(MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_ID) . '\']);
_gaq.push([\'_trackPageview\']);' . "\n";
- if ( (MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_EC_TRACKING == 'True') && (basename($PHP_SELF) == FILENAME_CHECKOUT_SUCCESS) && tep_session_is_registered('customer_id') ) {
+ if ( (MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_EC_TRACKING == 'True') && (basename($_SERVER['PHP_SELF']) == FILENAME_CHECKOUT_SUCCESS) && tep_session_is_registered('customer_id') ) {
$order_query = tep_db_query("select orders_id, billing_city, billing_state, billing_country from " . TABLE_ORDERS . " where customers_id = '" . (int)$customer_id . "' order by date_purchased desc limit 1");
if (tep_db_num_rows($order_query) == 1) {
@@ -29,15 +29,14 @@ 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');
$mc360 = new mc360();
$mc360->set_cookies();
- if (basename($PHP_SELF) == FILENAME_CHECKOUT_SUCCESS) {
+ if (basename($_SERVER['PHP_SELF']) == FILENAME_CHECKOUT_SUCCESS) {
$mc360->process();
}
}
@@ -29,16 +29,16 @@ function ht_manufacturer_title() {
}
function execute() {
- global $PHP_SELF, $HTTP_GET_VARS, $oscTemplate, $manufacturers, $languages_id;
+ global $oscTemplate, $manufacturers, $languages_id;
- if (basename($PHP_SELF) == FILENAME_DEFAULT) {
- if (isset($HTTP_GET_VARS['manufacturers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {
+ if (basename($_SERVER['PHP_SELF']) == FILENAME_DEFAULT) {
+ if (isset($_GET['manufacturers_id']) && is_numeric($_GET['manufacturers_id'])) {
// $manufacturers is set in application_top.php to add the manufacturer to the breadcrumb
if (isset($manufacturers) && (sizeof($manufacturers) == 1) && isset($manufacturers['manufacturers_name'])) {
$oscTemplate->setTitle($manufacturers['manufacturers_name'] . ', ' . $oscTemplate->getTitle());
} else {
// $manufacturers is not set so a database query is needed
- $manufacturers_query = tep_db_query("select manufacturers_name from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'");
+ $manufacturers_query = tep_db_query("select manufacturers_name from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'");
if (tep_db_num_rows($manufacturers_query)) {
$manufacturers = tep_db_fetch_array($manufacturers_query);
@@ -29,12 +29,12 @@ function ht_product_title() {
}
function execute() {
- global $PHP_SELF, $oscTemplate, $HTTP_GET_VARS, $languages_id, $product_check;
+ global $oscTemplate, $languages_id, $product_check;
- if (basename($PHP_SELF) == FILENAME_PRODUCT_INFO) {
- if (isset($HTTP_GET_VARS['products_id'])) {
+ if (basename($_SERVER['PHP_SELF']) == FILENAME_PRODUCT_INFO) {
+ if (isset($_GET['products_id'])) {
if ($product_check['total'] > 0) {
- $product_info_query = tep_db_query("select pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'");
+ $product_info_query = tep_db_query("select pd.products_name 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_info = tep_db_fetch_array($product_info_query);
$oscTemplate->setTitle($product_info['products_name'] . ', ' . $oscTemplate->getTitle());

0 comments on commit c9da0bd

Please sign in to comment.