From 2b2a12a71d37940e3fee838ff68b18b9eef90c76 Mon Sep 17 00:00:00 2001 From: gburton Date: Wed, 23 Oct 2019 13:05:21 +0100 Subject: [PATCH 1/9] New style Categories page for Admin Makes it a lot more flexible. --- admin/categories.php | 442 +++++++++--------- .../includes/languages/english/categories.php | 8 +- 2 files changed, 218 insertions(+), 232 deletions(-) diff --git a/admin/categories.php b/admin/categories.php index e16484d9b..dfb4db5df 100755 --- a/admin/categories.php +++ b/admin/categories.php @@ -5,7 +5,7 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2015 osCommerce + Copyright (c) 2019 osCommerce Released under the GNU General Public License */ @@ -17,6 +17,8 @@ $action = (isset($_GET['action']) ? $_GET['action'] : ''); + $OSCOM_Hooks->call('categories', 'productPreAction'); + if (tep_not_null($action)) { switch ($action) { case 'setflag': @@ -41,7 +43,7 @@ $sql_data_array = array_merge($sql_data_array, $insert_sql_data); - tep_db_perform(TABLE_CATEGORIES, $sql_data_array); + tep_db_perform('categories', $sql_data_array); $categories_id = tep_db_insert_id(); } elseif ($action == 'update_category') { @@ -49,7 +51,7 @@ $sql_data_array = array_merge($sql_data_array, $update_sql_data); - tep_db_perform(TABLE_CATEGORIES, $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "'"); + tep_db_perform('categories', $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "'"); } $languages = tep_get_languages(); @@ -74,9 +76,9 @@ $sql_data_array = array_merge($sql_data_array, $insert_sql_data); - tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array); + tep_db_perform('categories_description', $sql_data_array); } elseif ($action == 'update_category') { - tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "' and language_id = '" . (int)$languages[$i]['id'] . "'"); + tep_db_perform('categories_description', $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "' and language_id = '" . (int)$languages[$i]['id'] . "'"); } } @@ -84,7 +86,7 @@ $categories_image->set_destination(DIR_FS_CATALOG_IMAGES); if ($categories_image->parse() && $categories_image->save()) { - tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'"); + tep_db_query("update categories set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'"); } tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath . '&cID=' . $categories_id)); @@ -98,7 +100,7 @@ $products_delete = array(); for ($i=0, $n=sizeof($categories); $i<$n; $i++) { - $product_ids_query = tep_db_query("select products_id from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$categories[$i]['id'] . "'"); + $product_ids_query = tep_db_query("select products_id from products_to_categories where categories_id = '" . (int)$categories[$i]['id'] . "'"); while ($product_ids = tep_db_fetch_array($product_ids_query)) { $products[$product_ids['products_id']]['categories'][] = $categories[$i]['id']; @@ -113,7 +115,7 @@ } $category_ids = substr($category_ids, 0, -2); - $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$key . "' and categories_id not in (" . $category_ids . ")"); + $check_query = tep_db_query("select count(*) as total from products_to_categories where products_id = '" . (int)$key . "' and categories_id not in (" . $category_ids . ")"); $check = tep_db_fetch_array($check_query); if ($check['total'] < '1') { $products_delete[$key] = $key; @@ -139,10 +141,10 @@ $product_categories = $_POST['product_categories']; for ($i=0, $n=sizeof($product_categories); $i<$n; $i++) { - tep_db_query("delete from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$product_id . "' and categories_id = '" . (int)$product_categories[$i] . "'"); + tep_db_query("delete from products_to_categories where products_id = '" . (int)$product_id . "' and categories_id = '" . (int)$product_categories[$i] . "'"); } - $product_categories_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$product_id . "'"); + $product_categories_query = tep_db_query("select count(*) as total from products_to_categories where products_id = '" . (int)$product_id . "'"); $product_categories = tep_db_fetch_array($product_categories_query); if ($product_categories['total'] == '0') { @@ -150,6 +152,8 @@ } } + $OSCOM_Hooks->call('categories', 'productActionDelete'); + tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath)); break; case 'move_category_confirm': @@ -164,7 +168,7 @@ tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath . '&cID=' . $categories_id)); } else { - tep_db_query("update " . TABLE_CATEGORIES . " set parent_id = '" . (int)$new_parent_id . "', last_modified = now() where categories_id = '" . (int)$categories_id . "'"); + tep_db_query("update categories set parent_id = '" . (int)$new_parent_id . "', last_modified = now() where categories_id = '" . (int)$categories_id . "'"); tep_redirect(tep_href_link('categories.php', 'cPath=' . $new_parent_id . '&cID=' . $categories_id)); } @@ -175,9 +179,11 @@ $products_id = tep_db_prepare_input($_POST['products_id']); $new_parent_id = tep_db_prepare_input($_POST['move_to_category_id']); - $duplicate_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$new_parent_id . "'"); + $duplicate_check_query = tep_db_query("select count(*) as total from products_to_categories where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$new_parent_id . "'"); $duplicate_check = tep_db_fetch_array($duplicate_check_query); - if ($duplicate_check['total'] < 1) tep_db_query("update " . TABLE_PRODUCTS_TO_CATEGORIES . " set categories_id = '" . (int)$new_parent_id . "' where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$current_category_id . "'"); + if ($duplicate_check['total'] < 1) tep_db_query("update products_to_categories set categories_id = '" . (int)$new_parent_id . "' where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$current_category_id . "'"); + + $OSCOM_Hooks->call('categories', 'productActionMove'); tep_redirect(tep_href_link('categories.php', 'cPath=' . $new_parent_id . '&pID=' . $products_id)); break; @@ -209,16 +215,16 @@ $sql_data_array = array_merge($sql_data_array, $insert_sql_data); - tep_db_perform(TABLE_PRODUCTS, $sql_data_array); + tep_db_perform('products', $sql_data_array); $products_id = tep_db_insert_id(); - tep_db_query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$current_category_id . "')"); + tep_db_query("insert into products_to_categories (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$current_category_id . "')"); } elseif ($action == 'update_product') { $update_sql_data = array('products_last_modified' => 'now()'); $sql_data_array = array_merge($sql_data_array, $update_sql_data); - tep_db_perform(TABLE_PRODUCTS, $sql_data_array, 'update', "products_id = '" . (int)$products_id . "'"); + tep_db_perform('products', $sql_data_array, 'update', "products_id = '" . (int)$products_id . "'"); } $languages = tep_get_languages(); @@ -238,9 +244,9 @@ $sql_data_array = array_merge($sql_data_array, $insert_sql_data); - tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array); + tep_db_perform('products_description', $sql_data_array); } elseif ($action == 'update_product') { - tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', "products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "'"); + tep_db_perform('products_description', $sql_data_array, 'update', "products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "'"); } } @@ -261,7 +267,7 @@ $sql_data_array['image'] = tep_db_prepare_input($t->filename); } - tep_db_perform(TABLE_PRODUCTS_IMAGES, $sql_data_array, 'update', "products_id = '" . (int)$products_id . "' and id = '" . (int)$matches[1] . "'"); + tep_db_perform('products_images', $sql_data_array, 'update', "products_id = '" . (int)$products_id . "' and id = '" . (int)$matches[1] . "'"); $piArray[] = (int)$matches[1]; } elseif (preg_match('/^products_image_large_new_([0-9]+)$/', $key, $matches)) { @@ -277,17 +283,17 @@ $sql_data_array['image'] = tep_db_prepare_input($t->filename); $sql_data_array['sort_order'] = $pi_sort_order; - tep_db_perform(TABLE_PRODUCTS_IMAGES, $sql_data_array); + tep_db_perform('products_images', $sql_data_array); $piArray[] = tep_db_insert_id(); } } } - $product_images_query = tep_db_query("select image from " . TABLE_PRODUCTS_IMAGES . " where products_id = '" . (int)$products_id . "' and id not in (" . implode(',', $piArray) . ")"); + $product_images_query = tep_db_query("select image from products_images where products_id = '" . (int)$products_id . "' and id not in (" . implode(',', $piArray) . ")"); if (tep_db_num_rows($product_images_query)) { while ($product_images = tep_db_fetch_array($product_images_query)) { - $duplicate_image_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_IMAGES . " where image = '" . tep_db_input($product_images['image']) . "'"); + $duplicate_image_query = tep_db_query("select count(*) as total from products_images where image = '" . tep_db_input($product_images['image']) . "'"); $duplicate_image = tep_db_fetch_array($duplicate_image_query); if ($duplicate_image['total'] < 2) { @@ -297,9 +303,11 @@ } } - tep_db_query("delete from " . TABLE_PRODUCTS_IMAGES . " where products_id = '" . (int)$products_id . "' and id not in (" . implode(',', $piArray) . ")"); + tep_db_query("delete from products_images where products_id = '" . (int)$products_id . "' and id not in (" . implode(',', $piArray) . ")"); } + $OSCOM_Hooks->call('categories', 'productActionSave'); + tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath . '&pID=' . $products_id)); break; case 'copy_to_confirm': @@ -309,41 +317,45 @@ if ($_POST['copy_as'] == 'link') { if ($categories_id != $current_category_id) { - $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$categories_id . "'"); + $check_query = tep_db_query("select count(*) as total from products_to_categories where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$categories_id . "'"); $check = tep_db_fetch_array($check_query); if ($check['total'] < '1') { - tep_db_query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$categories_id . "')"); + tep_db_query("insert into products_to_categories (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$categories_id . "')"); } } else { $messageStack->add_session(ERROR_CANNOT_LINK_TO_SAME_CATEGORY, 'error'); } } elseif ($_POST['copy_as'] == 'duplicate') { - $product_query = tep_db_query("select products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id, products_gtin from " . TABLE_PRODUCTS . " where products_id = '" . (int)$products_id . "'"); + $product_query = tep_db_query("select products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id, products_gtin from products where products_id = '" . (int)$products_id . "'"); $product = tep_db_fetch_array($product_query); - tep_db_query("insert into " . TABLE_PRODUCTS . " (products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_gtin) values ('" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "', '" . tep_db_input($product['products_gtin']) . "')"); + tep_db_query("insert into products (products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_gtin) values ('" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "', '" . tep_db_input($product['products_gtin']) . "')"); $dup_products_id = tep_db_insert_id(); - $description_query = tep_db_query("select language_id, products_name, products_description, products_url, products_seo_title, products_seo_description, products_seo_keywords from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id = '" . (int)$products_id . "'"); + $description_query = tep_db_query("select language_id, products_name, products_description, products_url, products_seo_title, products_seo_description, products_seo_keywords from products_description where products_id = '" . (int)$products_id . "'"); while ($description = tep_db_fetch_array($description_query)) { - tep_db_query("insert into " . TABLE_PRODUCTS_DESCRIPTION . " (products_id, language_id, products_name, products_description, products_url, products_viewed, products_seo_title, products_seo_description, products_seo_keywords) values ('" . (int)$dup_products_id . "', '" . (int)$description['language_id'] . "', '" . tep_db_input($description['products_name']) . "', '" . tep_db_input($description['products_description']) . "', '" . tep_db_input($description['products_url']) . "', '0', '" . tep_db_input($description['products_seo_title']) . "', '" . tep_db_input($description['products_seo_description']) . "', '" . tep_db_input($description['products_seo_keywords']) . "')"); + tep_db_query("insert into products_description (products_id, language_id, products_name, products_description, products_url, products_viewed, products_seo_title, products_seo_description, products_seo_keywords) values ('" . (int)$dup_products_id . "', '" . (int)$description['language_id'] . "', '" . tep_db_input($description['products_name']) . "', '" . tep_db_input($description['products_description']) . "', '" . tep_db_input($description['products_url']) . "', '0', '" . tep_db_input($description['products_seo_title']) . "', '" . tep_db_input($description['products_seo_description']) . "', '" . tep_db_input($description['products_seo_keywords']) . "')"); } - $product_images_query = tep_db_query("select image, htmlcontent, sort_order from " . TABLE_PRODUCTS_IMAGES . " where products_id = '" . (int)$products_id . "'"); + $product_images_query = tep_db_query("select image, htmlcontent, sort_order from products_images where products_id = '" . (int)$products_id . "'"); while ($product_images = tep_db_fetch_array($product_images_query)) { - tep_db_query("insert into " . TABLE_PRODUCTS_IMAGES . " (products_id, image, htmlcontent, sort_order) values ('" . (int)$dup_products_id . "', '" . tep_db_input($product_images['image']) . "', '" . tep_db_input($product_images['htmlcontent']) . "', '" . tep_db_input($product_images['sort_order']) . "')"); + tep_db_query("insert into products_images (products_id, image, htmlcontent, sort_order) values ('" . (int)$dup_products_id . "', '" . tep_db_input($product_images['image']) . "', '" . tep_db_input($product_images['htmlcontent']) . "', '" . tep_db_input($product_images['sort_order']) . "')"); } - tep_db_query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$dup_products_id . "', '" . (int)$categories_id . "')"); + tep_db_query("insert into products_to_categories (products_id, categories_id) values ('" . (int)$dup_products_id . "', '" . (int)$categories_id . "')"); $products_id = $dup_products_id; } } + $OSCOM_Hooks->call('categories', 'productActionCopy'); + tep_redirect(tep_href_link('categories.php', 'cPath=' . $categories_id . '&pID=' . $products_id)); break; } } + $OSCOM_Hooks->call('categories', 'productPostAction'); + // check if the catalog image directory exists if (is_dir(DIR_FS_CATALOG_IMAGES)) { if (!tep_is_writable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE, 'error'); @@ -353,23 +365,25 @@ require('includes/template_top.php'); + $base_url = ($request_type == 'SSL') ? HTTPS_SERVER . DIR_WS_HTTPS_ADMIN : HTTP_SERVER . DIR_WS_ADMIN; + if ($action == 'new_product') { $parameters = array('products_name' => '', - 'products_description' => '', - 'products_url' => '', - 'products_id' => '', - 'products_quantity' => '', - 'products_model' => '', - 'products_image' => '', - 'products_larger_images' => array(), - 'products_price' => '', - 'products_weight' => '', - 'products_date_added' => '', - 'products_last_modified' => '', - 'products_date_available' => '', - 'products_status' => '', - 'products_tax_class_id' => '', - 'manufacturers_id' => ''); + 'products_description' => '', + 'products_url' => '', + 'products_id' => '', + 'products_quantity' => '', + 'products_model' => '', + 'products_image' => '', + 'products_larger_images' => array(), + 'products_price' => '', + 'products_weight' => '', + 'products_date_added' => '', + 'products_last_modified' => '', + 'products_date_available' => '', + 'products_status' => '', + 'products_tax_class_id' => '', + 'manufacturers_id' => ''); $parameters['products_gtin'] = ''; $parameters['products_seo_description'] = ''; $parameters['products_seo_keywords'] = ''; @@ -378,12 +392,12 @@ $pInfo = new objectInfo($parameters); if (isset($_GET['pID']) && empty($_POST)) { - $product_query = tep_db_query("select pd.products_name, pd.products_description, pd.products_url, p.products_id, p.products_quantity, p.products_model, p.products_image, p.products_price, p.products_weight, p.products_date_added, p.products_last_modified, date_format(p.products_date_available, '%Y-%m-%d') as products_date_available, p.products_status, p.products_tax_class_id, p.manufacturers_id, p.products_gtin from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$_GET['pID'] . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'"); + $product_query = tep_db_query("select pd.*, p.*, date_format(p.products_date_available, '%Y-%m-%d') as products_date_available from products p, products_description pd where p.products_id = '" . (int)$_GET['pID'] . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'"); $product = tep_db_fetch_array($product_query); $pInfo->objectInfo($product); - $product_images_query = tep_db_query("select id, image, htmlcontent, sort_order from " . TABLE_PRODUCTS_IMAGES . " where products_id = '" . (int)$product['products_id'] . "' order by sort_order"); + $product_images_query = tep_db_query("select id, image, htmlcontent, sort_order from products_images where products_id = '" . (int)$product['products_id'] . "' order by sort_order"); while ($product_images = tep_db_fetch_array($product_images_query)) { $pInfo->products_larger_images[] = array('id' => $product_images['id'], 'image' => $product_images['image'], @@ -393,14 +407,14 @@ } $manufacturers_array = array(array('id' => '', 'text' => TEXT_NONE)); - $manufacturers_query = tep_db_query("select manufacturers_id, manufacturers_name from " . TABLE_MANUFACTURERS . " order by manufacturers_name"); + $manufacturers_query = tep_db_query("select manufacturers_id, manufacturers_name from manufacturers order by manufacturers_name"); while ($manufacturers = tep_db_fetch_array($manufacturers_query)) { $manufacturers_array[] = array('id' => $manufacturers['manufacturers_id'], 'text' => $manufacturers['manufacturers_name']); } $tax_class_array = array(array('id' => '0', 'text' => TEXT_NONE)); - $tax_class_query = tep_db_query("select tax_class_id, tax_class_title from " . TABLE_TAX_CLASS . " order by tax_class_title"); + $tax_class_query = tep_db_query("select tax_class_id, tax_class_title from tax_class order by tax_class_title"); while ($tax_class = tep_db_fetch_array($tax_class_query)) { $tax_class_array[] = array('id' => $tax_class['tax_class_id'], 'text' => $tax_class['tax_class_title']); @@ -417,7 +431,7 @@ $form_action = (isset($_GET['pID'])) ? 'update_product' : 'insert_product'; ?> - - - - - - - - - - - - - - - - - - - - call('categories', 'productTab'); ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +

+ +
+
    +
  • ' . SECTION_HEADING_GENERAL . ''; ?>
    • +
  • ' . SECTION_HEADING_DATA . ''; ?>
    • +
  • ' . SECTION_HEADING_IMAGES . ''; ?>
    • +
+ +
+
- - + + + - - - - - + +
+
products_date_available, 'id="products_date_available"') . ' (YYYY-MM-DD)'; ?>
manufacturers_id); ?>
products_id) ? '' : tep_get_products_name($pInfo->products_id, $languages[$i]['id']))); ?>
products_id) ? '' : tep_get_products_seo_title($pInfo->products_id, $languages[$i]['id'])), 'style="width: 500px;"'); ?>
- - - - - - - - - - - - - + + - - - - + + - - - + + - - - - - - + + + + + + + - - - - - - + + + - - -
products_tax_class_id, 'onchange="updateGross()"'); ?>
products_price, 'onkeyup="updateGross()"'); ?>
products_price, 'onkeyup="updateNet()"'); ?>products_id) ? '' : tep_get_products_name($pInfo->products_id, $languages[$i]['id'])), 'style="width: 500px;"'); ?>
- - - - -
 products_id) ? '' : tep_get_products_description($pInfo->products_id, $languages[$i]['id']))); ?>
products_id) ? '' : tep_get_products_description($pInfo->products_id, $languages[$i]['id']))); ?>
products_quantity); ?>' . TEXT_PRODUCTS_URL_WITHOUT_HTTP . ''; ?>products_id, $languages[$i]['id'])), 'style="width: 500px;"'); ?>
products_model); ?>
products_id) ? '' : tep_get_products_seo_title($pInfo->products_id, $languages[$i]['id'])), 'style="width: 500px;"'); ?>
products_id) ? '' : tep_get_products_seo_description($pInfo->products_id, $languages[$i]['id']))); ?>
products_gtin); ?>
products_id, $languages[$i]['id']), 'style="width: 500px;" placeholder="' . PLACEHOLDER_COMMA_SEPARATION . '"'); ?>
-
' . TEXT_PRODUCTS_MAIN_IMAGE . ' (' . SMALL_IMAGE_WIDTH . ' x ' . SMALL_IMAGE_HEIGHT . 'px)
' . (tep_not_null($pInfo->products_image) ? '' . $pInfo->products_image . ' | ' : '') . tep_draw_file_field('products_image'); ?>
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
products_date_available, 'id="products_date_available" style="width: 500px;"') . ' (YYYY-MM-DD)'; ?>
manufacturers_id, 'style="width: 500px;"'); ?>
products_tax_class_id, 'style="width: 500px;" onchange="updateGross()"'); ?>
products_price, 'style="width: 200px;" onkeyup="updateGross()"'); ?>
products_price, 'style="width: 200px;" onkeyup="updateNet()"'); ?>
products_quantity, 'style="width: 200px;"'); ?>
products_model, 'style="width: 500px;"'); ?>
products_weight, 'style="width: 200px;"'); ?>
products_gtin, 'style="width: 500px;"'); ?>
+
-
    +
    +
    ' . TEXT_PRODUCTS_MAIN_IMAGE . '
    ' . (tep_not_null($pInfo->products_image) ? '' . $pInfo->products_image . ' | ' : '') . tep_draw_file_field('products_image'); ?>
    + +
      products_larger_images as $pi) { $pi_counter++; - echo '
    • ' . TEXT_PRODUCTS_LARGE_IMAGE . '
      ' . tep_draw_file_field('products_image_large_' . $pi['id']) . '
      ' . $pi['image'] . '

      ' . TEXT_PRODUCTS_LARGE_IMAGE_HTML_CONTENT . '
      ' . tep_draw_textarea_field('products_image_htmlcontent_' . $pi['id'], 'soft', '70', '3', $pi['htmlcontent']) . '
      • '; + echo '
    • ' . TEXT_PRODUCTS_LARGE_IMAGE . '
      ' . tep_draw_file_field('products_image_large_' . $pi['id']) . '
      ' . $pi['image'] . '

      ' . TEXT_PRODUCTS_LARGE_IMAGE_HTML_CONTENT . '
      ' . tep_draw_textarea_field('products_image_htmlcontent_' . $pi['id'], 'soft', '70', '3', $pi['htmlcontent']) . '
      • '; } ?> -
    - - +
+ +
+ +

@@ -648,85 +680,33 @@ function showPiDelConfirm(piId) { $('#piDelConfirm').dialog('open'); } +
-
' . TEXT_PRODUCTS_URL_WITHOUT_HTTP . ''; ?>products_id, $languages[$i]['id']))); ?>
products_weight); ?>
- - - - -
 products_id) ? '' : tep_get_products_seo_description($pInfo->products_id, $languages[$i]['id']))); ?>
- - - - -
 products_id, $languages[$i]['id']), 'placeholder="' . PLACEHOLDER_COMMA_SEPARATION . '" style="width: 300px;"'); ?>
- - - - - - products_date_added) ? $pInfo->products_date_added : date('Y-m-d'))) . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link('categories.php', 'cPath=' . $cPath . (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : ''))); ?> - - - +
+ products_date_added) ? $pInfo->products_date_added : date('Y-m-d'))) . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link('categories.php', 'cPath=' . $cPath . (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : ''))); ?> +
+ Date: Wed, 23 Oct 2019 13:10:14 +0100 Subject: [PATCH 2/9] Introduce Bootstrap into Admin --- admin/includes/functions/html_output.php | 62 ++++++++++++++++++- admin/includes/template_top.php | 2 + includes/hooks/admin/siteWide/bootStrap.php | 38 ++++++++++++ includes/hooks/admin/siteWide/fontAwesome.php | 29 +++++++++ 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 includes/hooks/admin/siteWide/bootStrap.php create mode 100644 includes/hooks/admin/siteWide/fontAwesome.php diff --git a/admin/includes/functions/html_output.php b/admin/includes/functions/html_output.php index b96e70821..d35cd1a6d 100755 --- a/admin/includes/functions/html_output.php +++ b/admin/includes/functions/html_output.php @@ -430,4 +430,64 @@ function tep_draw_button($title = null, $icon = null, $link = null, $priority = return $button; } -?> + +//// +// Output a Bootstrap Button + function tep_draw_bootstrap_button($title = null, $icon = null, $link = null, $priority = null, $params = null, $style = null) { + $types = array('submit', 'button', 'reset'); + + if ( !is_array($params) ) $params = array(); + + if ( !isset($params['type']) ) { + $params['type'] = 'submit'; + } + + if ( !in_array($params['type'], $types) ) { + $params['type'] = 'submit'; + } + + if ( ($params['type'] == 'submit') && isset($link) ) { + $params['type'] = 'button'; + } + + if (!isset($priority)) { + $priority = 'secondary'; + } + + $button = NULL; + + if ( ($params['type'] == 'button') && isset($link) ) { + $button .= ''; + } else { + $button .= ''; + } + + return $button; + } \ No newline at end of file diff --git a/admin/includes/template_top.php b/admin/includes/template_top.php index b9784fe2d..8012d85d2 100755 --- a/admin/includes/template_top.php +++ b/admin/includes/template_top.php @@ -23,6 +23,8 @@ call('siteWide', 'injectSiteStart'); + if (tep_not_null(JQUERY_DATEPICKER_I18N_CODE)) { ?> diff --git a/includes/hooks/admin/siteWide/bootStrap.php b/includes/hooks/admin/siteWide/bootStrap.php new file mode 100644 index 000000000..eec99918c --- /dev/null +++ b/includes/hooks/admin/siteWide/bootStrap.php @@ -0,0 +1,38 @@ +sitestart .= '' . PHP_EOL; + $this->sitestart .= '' . PHP_EOL; + + return $this->sitestart; + } + + function listen_injectSiteEnd() { + $this->siteend .= '' . PHP_EOL; + $this->siteend .= '' . PHP_EOL; + $this->siteend .= '' . PHP_EOL; + + return $this->siteend; + } + +} diff --git a/includes/hooks/admin/siteWide/fontAwesome.php b/includes/hooks/admin/siteWide/fontAwesome.php new file mode 100644 index 000000000..360a75324 --- /dev/null +++ b/includes/hooks/admin/siteWide/fontAwesome.php @@ -0,0 +1,29 @@ +sitestart .= '' . PHP_EOL; + $this->sitestart .= '' . PHP_EOL; + + return $this->sitestart; + } + +} From e3594ddf992e1a3ddf34ce8823463ee321ecc5a8 Mon Sep 17 00:00:00 2001 From: gburton Date: Wed, 23 Oct 2019 13:12:39 +0100 Subject: [PATCH 3/9] Login Page Bootstrapped and Prettified TY @Omar_one for guidance and idea --- admin/images/CE-Phoenix.png | Bin 0 -> 16935 bytes admin/includes/languages/english/login.php | 11 +-- admin/includes/template_bottom.php | 2 +- admin/includes/template_top.php | 4 +- admin/login.php | 102 ++++++++++----------- 5 files changed, 54 insertions(+), 65 deletions(-) create mode 100644 admin/images/CE-Phoenix.png diff --git a/admin/images/CE-Phoenix.png b/admin/images/CE-Phoenix.png new file mode 100644 index 0000000000000000000000000000000000000000..9dfdcae007cab1dcf286d3863c56997e9c0b4bd1 GIT binary patch literal 16935 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 literal 0 HcmV?d00001 diff --git a/admin/includes/languages/english/login.php b/admin/includes/languages/english/login.php index 0abc5b16f..e1c5dd5f0 100755 --- a/admin/includes/languages/english/login.php +++ b/admin/includes/languages/english/login.php @@ -5,17 +5,17 @@ osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com - Copyright (c) 2007 osCommerce + Copyright (c) 2019 osCommerce Released under the GNU General Public License */ -define('HEADING_TITLE', 'Administrator Login'); +define('HEADING_TITLE', ' Secure Login Access'); -define('TEXT_USERNAME', 'Username:'); -define('TEXT_PASSWORD', 'Password:'); +define('TEXT_USERNAME', 'Username'); +define('TEXT_PASSWORD', 'Password'); -define('TEXT_CREATE_FIRST_ADMINISTRATOR', 'No administrators exist in the database table. Please fill in the following information to create the first administrator. (A manual login is still required after this step)'); +define('TEXT_CREATE_FIRST_ADMINISTRATOR', '
No administrators exist in the database table. Please use this form to create the first administrator.
A manual login is still required after this step.
'); define('ERROR_INVALID_ADMINISTRATOR', 'Error: Invalid administrator login attempt.'); @@ -23,4 +23,3 @@ define('BUTTON_CREATE_ADMINISTRATOR', 'Create Administrator'); define('ERROR_ACTION_RECORDER', 'Error: The maximum number of login attempts has been reached. Please try again in %s minutes.'); -?> diff --git a/admin/includes/template_bottom.php b/admin/includes/template_bottom.php index 2a2d0c4d0..48a75700e 100755 --- a/admin/includes/template_bottom.php +++ b/admin/includes/template_bottom.php @@ -14,7 +14,7 @@ call('siteWide', 'injectSiteEnd'); ?> diff --git a/admin/includes/template_top.php b/admin/includes/template_top.php index 8012d85d2..886461266 100755 --- a/admin/includes/template_top.php +++ b/admin/includes/template_top.php @@ -42,10 +42,10 @@ - - diff --git a/admin/login.php b/admin/login.php index e257c0b0a..0ada4bb4b 100755 --- a/admin/login.php +++ b/admin/login.php @@ -36,7 +36,7 @@ $actionRecorder = new actionRecorderAdmin('ar_admin_login', null, $username); if ($actionRecorder->canPerform()) { - $check_query = tep_db_query("select id, user_name, user_password from " . TABLE_ADMINISTRATORS . " where user_name = '" . tep_db_input($username) . "'"); + $check_query = tep_db_query("select id, user_name, user_password from administrators where user_name = '" . tep_db_input($username) . "'"); if (tep_db_num_rows($check_query) == 1) { $check = tep_db_fetch_array($check_query); @@ -44,7 +44,7 @@ if (tep_validate_password($password, $check['user_password'])) { // migrate old hashed password to new phpass password if (tep_password_type($check['user_password']) != 'phpass') { - tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_password = '" . tep_encrypt_password($password) . "' where id = '" . (int)$check['id'] . "'"); + tep_db_query("update administrators set user_password = '" . tep_encrypt_password($password) . "' where id = '" . (int)$check['id'] . "'"); } tep_session_register('admin'); @@ -95,14 +95,14 @@ break; case 'create': - $check_query = tep_db_query("select id from " . TABLE_ADMINISTRATORS . " limit 1"); + $check_query = tep_db_query("select id from administrators limit 1"); if (tep_db_num_rows($check_query) == 0) { $username = tep_db_prepare_input($_POST['username']); $password = tep_db_prepare_input($_POST['password']); if ( !empty($username) ) { - tep_db_query("insert into " . TABLE_ADMINISTRATORS . " (user_name, user_password) values ('" . tep_db_input($username) . "', '" . tep_db_input(tep_encrypt_password($password)) . "')"); + tep_db_query("insert into administrators (user_name, user_password) values ('" . tep_db_input($username) . "', '" . tep_db_input(tep_encrypt_password($password)) . "')"); } } @@ -123,64 +123,54 @@ } } - $admins_check_query = tep_db_query("select id from " . TABLE_ADMINISTRATORS . " limit 1"); + $admins_check_query = tep_db_query("select id from administrators limit 1"); if (tep_db_num_rows($admins_check_query) < 1) { $messageStack->add(TEXT_CREATE_FIRST_ADMINISTRATOR, 'warning'); } require('includes/template_top.php'); + + if ($messageStack->size > 0) echo $messageStack->output(); + ?> - - - - - - - - -
- - - - 1) { -?> - - - - - - -
'; ?>
- - 0) { - $heading[] = array('text' => '' . HEADING_TITLE . ''); - - $contents = array('form' => tep_draw_form('login', 'login.php', 'action=process')); - $contents[] = array('text' => TEXT_USERNAME . '
' . tep_draw_input_field('username')); - $contents[] = array('text' => '
' . TEXT_PASSWORD . '
' . tep_draw_password_field('password')); - $contents[] = array('align' => 'center', 'text' => '
' . tep_draw_button(BUTTON_LOGIN, 'key')); - } else { - $heading[] = array('text' => '' . HEADING_TITLE . ''); - - $contents = array('form' => tep_draw_form('login', 'login.php', 'action=create')); - $contents[] = array('text' => TEXT_CREATE_FIRST_ADMINISTRATOR); - $contents[] = array('text' => '
' . TEXT_USERNAME . '
' . tep_draw_input_field('username')); - $contents[] = array('text' => '
' . TEXT_PASSWORD . '
' . tep_draw_password_field('password')); - $contents[] = array('align' => 'center', 'text' => '
' . tep_draw_button(BUTTON_CREATE_ADMINISTRATOR, 'key')); - } - - $box = new box; - echo $box->infoBox($heading, $contents); -?> - -
+
+
+
+
+
+ +
+ 0) { + echo tep_draw_form('login', 'login.php', 'action=process'); + $button_text = BUTTON_LOGIN; + $intro_text = null; + } + else { + echo tep_draw_form('login', 'login.php', 'action=create'); + $button_text = BUTTON_CREATE_ADMINISTRATOR; + $intro_text = TEXT_CREATE_FIRST_ADMINISTRATOR; + } + ?> + +
    +
    • +
    • +
    • +
+ 1) { + ?> +
+ '; ?> +
+ +
+
+
Date: Wed, 23 Oct 2019 17:34:27 +0100 Subject: [PATCH 4/9] Hardcode container-fluid and move out to template_*.php It will affect all pages minimally, until each is updated properly for Bootstrap. --- admin/includes/template_bottom.php | 13 +++++++------ admin/includes/template_top.php | 2 ++ admin/login.php | 3 +-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/admin/includes/template_bottom.php b/admin/includes/template_bottom.php index 48a75700e..33aab2ddc 100755 --- a/admin/includes/template_bottom.php +++ b/admin/includes/template_bottom.php @@ -11,15 +11,16 @@ */ ?> - + -call('siteWide', 'injectSiteEnd'); -?> + echo $OSCOM_Hooks->call('siteWide', 'injectSiteEnd'); + ?> -
+
+ diff --git a/admin/includes/template_top.php b/admin/includes/template_top.php index 886461266..1582652de 100755 --- a/admin/includes/template_top.php +++ b/admin/includes/template_top.php @@ -42,6 +42,8 @@ +
+ size > 0) echo $messageStack->output(); ?> -
+
@@ -170,7 +170,6 @@ ?>
-
Date: Thu, 24 Oct 2019 14:46:40 +0100 Subject: [PATCH 5/9] 1.0.3.0 --- includes/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/version.php b/includes/version.php index 97cb20662..12cf88d3c 100755 --- a/includes/version.php +++ b/includes/version.php @@ -1 +1 @@ -1.0.2.8 \ No newline at end of file +1.0.3.0 \ No newline at end of file From 4d85166b2ff8b549236d9c1f4178b0575c58d8ec Mon Sep 17 00:00:00 2001 From: gburton Date: Thu, 24 Oct 2019 15:21:46 +0100 Subject: [PATCH 6/9] Remove outdated Banner System --- admin/banner_manager.php | 440 ------------------ admin/banner_statistics.php | 154 ------ admin/includes/boxes/tools.php | 5 - admin/includes/database_tables.php | 2 - admin/includes/functions/general.php | 32 -- admin/includes/functions/html_graphs.php | 206 +------- admin/includes/graphs/banner_daily.php | 53 --- admin/includes/graphs/banner_infobox.php | 47 -- admin/includes/graphs/banner_monthly.php | 51 -- admin/includes/graphs/banner_yearly.php | 45 -- admin/includes/languages/english.php | 3 - .../languages/english/banner_manager.php | 67 --- .../languages/english/banner_statistics.php | 34 -- admin/popup_image.php | 54 --- includes/application_top.php | 5 - includes/functions/banner.php | 125 ----- install/oscommerce.sql | 29 -- redirect.php | 10 - 18 files changed, 1 insertion(+), 1361 deletions(-) delete mode 100755 admin/banner_manager.php delete mode 100755 admin/banner_statistics.php delete mode 100755 admin/includes/graphs/banner_daily.php delete mode 100755 admin/includes/graphs/banner_infobox.php delete mode 100755 admin/includes/graphs/banner_monthly.php delete mode 100755 admin/includes/graphs/banner_yearly.php delete mode 100755 admin/includes/languages/english/banner_manager.php delete mode 100755 admin/includes/languages/english/banner_statistics.php delete mode 100755 admin/popup_image.php delete mode 100755 includes/functions/banner.php diff --git a/admin/banner_manager.php b/admin/banner_manager.php deleted file mode 100755 index a86fcc2ac..000000000 --- a/admin/banner_manager.php +++ /dev/null @@ -1,440 +0,0 @@ -add_session(SUCCESS_BANNER_STATUS_UPDATED, 'success'); - } else { - $messageStack->add_session(ERROR_UNKNOWN_STATUS_FLAG, 'error'); - } - - tep_redirect(tep_href_link('banner_manager.php', 'page=' . $_GET['page'] . '&bID=' . $_GET['bID'])); - break; - case 'insert': - case 'update': - if (isset($_POST['banners_id'])) $banners_id = tep_db_prepare_input($_POST['banners_id']); - $banners_title = tep_db_prepare_input($_POST['banners_title']); - $banners_url = tep_db_prepare_input($_POST['banners_url']); - $new_banners_group = tep_db_prepare_input($_POST['new_banners_group']); - $banners_group = (empty($new_banners_group)) ? tep_db_prepare_input($_POST['banners_group']) : $new_banners_group; - $banners_html_text = tep_db_prepare_input($_POST['banners_html_text']); - $banners_image_local = tep_db_prepare_input($_POST['banners_image_local']); - $banners_image_target = tep_db_prepare_input($_POST['banners_image_target']); - $db_image_location = ''; - $expires_date = tep_db_prepare_input($_POST['expires_date']); - $expires_impressions = tep_db_prepare_input($_POST['expires_impressions']); - $date_scheduled = tep_db_prepare_input($_POST['date_scheduled']); - - $banner_error = false; - if (empty($banners_title)) { - $messageStack->add(ERROR_BANNER_TITLE_REQUIRED, 'error'); - $banner_error = true; - } - - if (empty($banners_group)) { - $messageStack->add(ERROR_BANNER_GROUP_REQUIRED, 'error'); - $banner_error = true; - } - - if (empty($banners_html_text)) { - if (empty($banners_image_local)) { - $banners_image = new upload('banners_image'); - $banners_image->set_destination(DIR_FS_CATALOG_IMAGES . $banners_image_target); - if ( ($banners_image->parse() == false) || ($banners_image->save() == false) ) { - $banner_error = true; - } - } - } - - if ($banner_error == false) { - $db_image_location = (tep_not_null($banners_image_local)) ? $banners_image_local : $banners_image_target . $banners_image->filename; - $sql_data_array = array('banners_title' => $banners_title, - 'banners_url' => $banners_url, - 'banners_image' => $db_image_location, - 'banners_group' => $banners_group, - 'banners_html_text' => $banners_html_text, - 'expires_date' => 'null', - 'expires_impressions' => 0, - 'date_scheduled' => 'null'); - - if ($action == 'insert') { - $insert_sql_data = array('date_added' => 'now()', - 'status' => '1'); - - $sql_data_array = array_merge($sql_data_array, $insert_sql_data); - - tep_db_perform(TABLE_BANNERS, $sql_data_array); - - $banners_id = tep_db_insert_id(); - - $messageStack->add_session(SUCCESS_BANNER_INSERTED, 'success'); - } elseif ($action == 'update') { - tep_db_perform(TABLE_BANNERS, $sql_data_array, 'update', "banners_id = '" . (int)$banners_id . "'"); - - $messageStack->add_session(SUCCESS_BANNER_UPDATED, 'success'); - } - - if (tep_not_null($expires_date)) { - $expires_date = substr($expires_date, 0, 4) . substr($expires_date, 5, 2) . substr($expires_date, 8, 2); - - tep_db_query("update " . TABLE_BANNERS . " set expires_date = '" . tep_db_input($expires_date) . "', expires_impressions = null where banners_id = '" . (int)$banners_id . "'"); - } elseif (tep_not_null($expires_impressions)) { - tep_db_query("update " . TABLE_BANNERS . " set expires_impressions = '" . tep_db_input($expires_impressions) . "', expires_date = null where banners_id = '" . (int)$banners_id . "'"); - } - - if (tep_not_null($date_scheduled)) { - $date_scheduled = substr($date_scheduled, 0, 4) . substr($date_scheduled, 5, 2) . substr($date_scheduled, 8, 2); - - tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_scheduled = '" . tep_db_input($date_scheduled) . "' where banners_id = '" . (int)$banners_id . "'"); - } - - tep_redirect(tep_href_link('banner_manager.php', (isset($_GET['page']) ? 'page=' . $_GET['page'] . '&' : '') . 'bID=' . $banners_id)); - } else { - $action = 'new'; - } - break; - case 'deleteconfirm': - $banners_id = tep_db_prepare_input($_GET['bID']); - - if (isset($_POST['delete_image']) && ($_POST['delete_image'] == 'on')) { - $banner_query = tep_db_query("select banners_image from " . TABLE_BANNERS . " where banners_id = '" . (int)$banners_id . "'"); - $banner = tep_db_fetch_array($banner_query); - - if (is_file(DIR_FS_CATALOG_IMAGES . $banner['banners_image'])) { - if (tep_is_writable(DIR_FS_CATALOG_IMAGES . $banner['banners_image'])) { - unlink(DIR_FS_CATALOG_IMAGES . $banner['banners_image']); - } else { - $messageStack->add_session(ERROR_IMAGE_IS_NOT_WRITEABLE, 'error'); - } - } else { - $messageStack->add_session(ERROR_IMAGE_DOES_NOT_EXIST, 'error'); - } - } - - tep_db_query("delete from " . TABLE_BANNERS . " where banners_id = '" . (int)$banners_id . "'"); - tep_db_query("delete from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . (int)$banners_id . "'"); - - if (function_exists('imagecreate') && tep_not_null($banner_extension)) { - if (is_file('images/graphs/banner_infobox-' . $banners_id . '.' . $banner_extension)) { - if (tep_is_writable('images/graphs/banner_infobox-' . $banners_id . '.' . $banner_extension)) { - unlink('images/graphs/banner_infobox-' . $banners_id . '.' . $banner_extension); - } - } - - if (is_file('images/graphs/banner_yearly-' . $banners_id . '.' . $banner_extension)) { - if (tep_is_writable('images/graphs/banner_yearly-' . $banners_id . '.' . $banner_extension)) { - unlink('images/graphs/banner_yearly-' . $banners_id . '.' . $banner_extension); - } - } - - if (is_file('images/graphs/banner_monthly-' . $banners_id . '.' . $banner_extension)) { - if (tep_is_writable('images/graphs/banner_monthly-' . $banners_id . '.' . $banner_extension)) { - unlink('images/graphs/banner_monthly-' . $banners_id . '.' . $banner_extension); - } - } - - if (is_file('images/graphs/banner_daily-' . $banners_id . '.' . $banner_extension)) { - if (tep_is_writable('images/graphs/banner_daily-' . $banners_id . '.' . $banner_extension)) { - unlink('images/graphs/banner_daily-' . $banners_id . '.' . $banner_extension); - } - } - } - - $messageStack->add_session(SUCCESS_BANNER_REMOVED, 'success'); - - tep_redirect(tep_href_link('banner_manager.php', 'page=' . $_GET['page'])); - break; - } - } - -// check if the graphs directory exists - $dir_ok = false; - if (function_exists('imagecreate') && tep_not_null($banner_extension)) { - if (is_dir('images/graphs')) { - if (tep_is_writable('images/graphs')) { - $dir_ok = true; - } else { - $messageStack->add(ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE, 'error'); - } - } else { - $messageStack->add(ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST, 'error'); - } - } - - require('includes/template_top.php'); -?> - - - - - - - - '', - 'date_scheduled' => '', - 'banners_title' => '', - 'banners_url' => '', - 'banners_group' => '', - 'banners_image' => '', - 'banners_html_text' => '', - 'expires_impressions' => ''); - - $bInfo = new objectInfo($parameters); - - if (isset($_GET['bID'])) { - $form_action = 'update'; - - $bID = tep_db_prepare_input($_GET['bID']); - - $banner_query = tep_db_query("select banners_title, banners_url, banners_image, banners_group, banners_html_text, status, date_format(date_scheduled, '%Y/%m/%d') as date_scheduled, date_format(expires_date, '%Y/%m/%d') as expires_date, expires_impressions, date_status_change from " . TABLE_BANNERS . " where banners_id = '" . (int)$bID . "'"); - $banner = tep_db_fetch_array($banner_query); - - $bInfo->objectInfo($banner); - } elseif (tep_not_null($_POST)) { - $bInfo->objectInfo($_POST); - } - - $groups_array = array(); - $groups_query = tep_db_query("select distinct banners_group from " . TABLE_BANNERS . " order by banners_group"); - while ($groups = tep_db_fetch_array($groups_query)) { - $groups_array[] = array('id' => $groups['banners_group'], 'text' => $groups['banners_group']); - } -?> - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
banners_title, '', true); ?>
banners_url); ?>
banners_group) . TEXT_BANNERS_NEW_GROUP . '
' . tep_draw_input_field('new_banners_group', '', '', ((sizeof($groups_array) > 0) ? false : true)); ?>
' . DIR_FS_CATALOG_IMAGES . tep_draw_input_field('banners_image_local', (isset($bInfo->banners_image) ? $bInfo->banners_image : '')); ?>
banners_html_text); ?>
date_scheduled, 'id="date_scheduled"') . ' (YYYY-MM-DD)'; ?>
expires_date, 'id="expires_date"') . ' (YYYY-MM-DD)' . TEXT_BANNERS_OR_AT . '
' . tep_draw_input_field('expires_impressions', $bInfo->expires_impressions, 'maxlength="7" size="7"') . ' ' . TEXT_BANNERS_IMPRESSIONS; ?>
- - - -
- - - - -
' . TEXT_BANNERS_INSERT_NOTE . '
' . TEXT_BANNERS_EXPIRCY_NOTE . '
' . TEXT_BANNERS_SCHEDULE_NOTE; ?>
- - - '' . $bInfo->banners_title . ''); - - $contents = array('form' => tep_draw_form('banners', 'banner_manager.php', 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id . '&action=deleteconfirm')); - $contents[] = array('text' => TEXT_INFO_DELETE_INTRO); - $contents[] = array('text' => '
' . $bInfo->banners_title . ''); - if ($bInfo->banners_image) $contents[] = array('text' => '
' . tep_draw_checkbox_field('delete_image', 'on', true) . ' ' . TEXT_INFO_DELETE_IMAGE); - $contents[] = array('align' => 'center', 'text' => '
' . tep_draw_button(IMAGE_DELETE, 'trash', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link('banner_manager.php', 'page=' . $_GET['page'] . '&bID=' . $_GET['bID']))); - break; - default: - if (is_object($bInfo)) { - $heading[] = array('text' => '' . $bInfo->banners_title . ''); - - $contents[] = array('align' => 'center', 'text' => tep_draw_button(IMAGE_EDIT, 'document', tep_href_link('banner_manager.php', 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id . '&action=new')) . tep_draw_button(IMAGE_DELETE, 'trash', tep_href_link('banner_manager.php', 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id . '&action=delete')) . tep_draw_button(IMAGE_DETAILS, 'info', tep_href_link('banner_statistics.php', 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id))); - $contents[] = array('text' => '
' . TEXT_BANNERS_DATE_ADDED . ' ' . tep_date_short($bInfo->date_added)); - - if ( (function_exists('imagecreate')) && ($dir_ok) && ($banner_extension) ) { - $banner_id = $bInfo->banners_id; - $days = '3'; - include('includes/graphs/banner_infobox.php'); - $contents[] = array('align' => 'center', 'text' => '
' . tep_image('images/graphs/banner_infobox-' . $banner_id . '.' . $banner_extension)); - } else { - include('includes/functions/html_graphs.php'); - $contents[] = array('align' => 'center', 'text' => '
' . tep_banner_graph_infoBox($bInfo->banners_id, '3')); - } - - $contents[] = array('text' => tep_image('images/graph_hbar_blue.gif', 'Blue', '5', '5') . ' ' . TEXT_BANNERS_BANNER_VIEWS . '
' . tep_image('images/graph_hbar_red.gif', 'Red', '5', '5') . ' ' . TEXT_BANNERS_BANNER_CLICKS); - - if ($bInfo->date_scheduled) $contents[] = array('text' => '
' . sprintf(TEXT_BANNERS_SCHEDULED_AT_DATE, tep_date_short($bInfo->date_scheduled))); - - if ($bInfo->expires_date) { - $contents[] = array('text' => '
' . sprintf(TEXT_BANNERS_EXPIRES_AT_DATE, tep_date_short($bInfo->expires_date))); - } elseif ($bInfo->expires_impressions) { - $contents[] = array('text' => '
' . sprintf(TEXT_BANNERS_EXPIRES_AT_IMPRESSIONS, $bInfo->expires_impressions)); - } - - if ($bInfo->date_status_change) $contents[] = array('text' => '
' . sprintf(TEXT_BANNERS_STATUS_CHANGE, tep_date_short($bInfo->date_status_change))); - } - break; - } - - if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) { - echo ' ' . "\n"; - } -?> - -
- - - - - - - -banners_id)) { - echo ' ' . "\n"; - } else { - echo ' ' . "\n"; - } -?> - - - - - - - - - - -
 
' . tep_image('images/icon_popup.gif', 'View Banner') . ' ' . $banners['banners_title']; ?> -' . tep_image('images/icon_status_red_light.gif', 'Set Inactive', 10, 10) . ''; - } else { - echo '' . tep_image('images/icon_status_green_light.gif', 'Set Active', 10, 10) . '  ' . tep_image('images/icon_status_red.gif', 'Inactive', 10, 10); - } -?>' . tep_image('images/icons/statistics.gif', ICON_STATISTICS) . ' '; if (isset($bInfo) && is_object($bInfo) && ($banners['banners_id'] == $bInfo->banners_id)) { echo tep_image('images/icon_arrow_right.gif', ''); } else { echo '' . tep_image('images/icon_info.gif', IMAGE_ICON_INFO) . ''; } ?> 
- - - - - - - -
display_count($banners_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $_GET['page'], TEXT_DISPLAY_NUMBER_OF_BANNERS); ?>display_links($banners_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $_GET['page']); ?>
' . "\n"; - - $box = new box; - echo $box->infoBox($heading, $contents); - - echo '
- - diff --git a/admin/banner_statistics.php b/admin/banner_statistics.php deleted file mode 100755 index bb51c5205..000000000 --- a/admin/banner_statistics.php +++ /dev/null @@ -1,154 +0,0 @@ -add(ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE, 'error'); - } - } else { - $messageStack->add(ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST, 'error'); - } - } - - $banner_query = tep_db_query("select banners_title from " . TABLE_BANNERS . " where banners_id = '" . (int)$_GET['bID'] . "'"); - $banner = tep_db_fetch_array($banner_query); - - $years_array = array(); - $years_query = tep_db_query("select distinct year(banners_history_date) as banner_year from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . (int)$_GET['bID'] . "'"); - while ($years = tep_db_fetch_array($years_query)) { - $years_array[] = array('id' => $years['banner_year'], - 'text' => $years['banner_year']); - } - - $months_array = array(); - for ($i=1; $i<13; $i++) { - $months_array[] = array('id' => $i, - 'text' => strftime('%B', mktime(0,0,0,$i))); - } - - $type_array = array(array('id' => 'daily', - 'text' => STATISTICS_TYPE_DAILY), - array('id' => 'monthly', - 'text' => STATISTICS_TYPE_MONTHLY), - array('id' => 'yearly', - 'text' => STATISTICS_TYPE_YEARLY)); - - require('includes/template_top.php'); -?> - - - - - - - - - - - - - - - - - -
- - - - - -

-'; - break; - default: - case 'daily': - echo TITLE_MONTH . ' ' . tep_draw_pull_down_menu('month', $months_array, (isset($_GET['month']) ? $_GET['month'] : date('n')), 'onchange="this.form.submit();"') . '
' . TITLE_YEAR . ' ' . tep_draw_pull_down_menu('year', $years_array, (isset($_GET['year']) ? $_GET['year'] : date('Y')), 'onchange="this.form.submit();"') . ''; - break; - } -?> -
- - - - - - - -' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; - } -?> -
' . $stats[$i][0] . '' . number_format($stats[$i][1]) . '' . number_format($stats[$i][2]) . '
- -
- - diff --git a/admin/includes/boxes/tools.php b/admin/includes/boxes/tools.php index 93a29b05d..f44e43655 100755 --- a/admin/includes/boxes/tools.php +++ b/admin/includes/boxes/tools.php @@ -23,11 +23,6 @@ 'title' => BOX_TOOLS_BACKUP, 'link' => tep_href_link('backup.php') ), - array( - 'code' => 'banner_manager.php', - 'title' => BOX_TOOLS_BANNER_MANAGER, - 'link' => tep_href_link('banner_manager.php') - ), array( 'code' => 'define_language.php', 'title' => BOX_TOOLS_DEFINE_LANGUAGE, diff --git a/admin/includes/database_tables.php b/admin/includes/database_tables.php index 1fe69c1bf..496724631 100755 --- a/admin/includes/database_tables.php +++ b/admin/includes/database_tables.php @@ -15,8 +15,6 @@ define('TABLE_ADDRESS_BOOK', 'address_book'); define('TABLE_ADDRESS_FORMAT', 'address_format'); define('TABLE_ADMINISTRATORS', 'administrators'); - define('TABLE_BANNERS', 'banners'); - define('TABLE_BANNERS_HISTORY', 'banners_history'); define('TABLE_CATEGORIES', 'categories'); define('TABLE_CATEGORIES_DESCRIPTION', 'categories_description'); define('TABLE_CONFIGURATION', 'configuration'); diff --git a/admin/includes/functions/general.php b/admin/includes/functions/general.php index 4dd19912d..850806db2 100755 --- a/admin/includes/functions/general.php +++ b/admin/includes/functions/general.php @@ -728,18 +728,6 @@ function tep_cfg_get_zone_name($zone_id) { } } -//// -// Sets the status of a banner - function tep_set_banner_status($banners_id, $status) { - if ($status == '1') { - return tep_db_query("update " . TABLE_BANNERS . " set status = '1', expires_impressions = NULL, expires_date = NULL, date_status_change = NULL where banners_id = '" . $banners_id . "'"); - } elseif ($status == '0') { - return tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_status_change = now() where banners_id = '" . $banners_id . "'"); - } else { - return -1; - } - } - //// // Sets the status of a product function tep_set_product_status($products_id, $status) { @@ -1141,26 +1129,6 @@ function tep_get_tax_class_title($tax_class_id) { } } - function tep_banner_image_extension() { - if (function_exists('imagetypes')) { - if (imagetypes() & IMG_PNG) { - return 'png'; - } elseif (imagetypes() & IMG_JPG) { - return 'jpg'; - } elseif (imagetypes() & IMG_GIF) { - return 'gif'; - } - } elseif (function_exists('imagecreatefrompng') && function_exists('imagepng')) { - return 'png'; - } elseif (function_exists('imagecreatefromjpeg') && function_exists('imagejpeg')) { - return 'jpg'; - } elseif (function_exists('imagecreatefromgif') && function_exists('imagegif')) { - return 'gif'; - } - - return false; - } - //// // Wrapper function for round() for php3 compatibility function tep_round($value, $precision) { diff --git a/admin/includes/functions/html_graphs.php b/admin/includes/functions/html_graphs.php index 69e869778..8116788ac 100755 --- a/admin/includes/functions/html_graphs.php +++ b/admin/includes/functions/html_graphs.php @@ -361,208 +361,4 @@ function double_vertical_graph($names, $values, $bars, $vals, $dvalues, $dbars) return $double_vertical_graph_string; } - -//// -// draws a double vertical bar graph for the banner views vs clicks statistics - function tep_banner_graph_infoBox($banner_id, $days) { - $names = array(); - $values = array(); - $dvalues = array(); - - $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and to_days(now()) - to_days(banners_history_date) < " . $days . " order by banners_history_date"); - while ($banner_stats = tep_db_fetch_array($banner_stats_query)) { - $names[] = $banner_stats['name']; - $values[] = $banner_stats['value']; - $dvalues[] = $banner_stats['dvalue']; - } - $largest = @max($values); - - $bars = array(); - $dbars = array(); - for ($i = 0, $n = sizeof($values); $i < $n; $i++) { - $bars[$i] = 'images/graph_hbar_blue.gif'; - $dbars[$i] = 'images/graph_hbar_red.gif'; - } - - $graph_vals = @array('vlabel'=>TEXT_BANNERS_DATA, - 'hlabel'=>TEXT_BANNERS_LAST_3_DAYS, - 'type'=>'3', - 'cellpadding'=>'', - 'cellspacing'=>'1', - 'border'=>'', - 'width'=>'', - 'vfcolor'=>'#ffffff', - 'hfcolor'=>'#ffffff', - 'vbgcolor'=>'#81a2b6', - 'hbgcolor'=>'#81a2b6', - 'vfstyle'=>'Verdana, Arial, Helvetica', - 'hfstyle'=>'Verdana, Arial, Helvetica', - 'scale'=>100/$largest, - 'namebgcolor'=>'#f3f5fe', - 'valuebgcolor'=>'#f3f5fe', - 'namefcolor'=>'', - 'valuefcolor'=>'#0000d0', - 'namefstyle'=>'Verdana, Arial, Helvetica', - 'valuefstyle'=>'', - 'doublefcolor'=>'#ff7339'); - - return html_graph($names, $values, $bars, $graph_vals, $dvalues, $dbars); - } - -//// -// draws a double vertical bar graph for the banner views vs clicks statistics - function tep_banner_graph_yearly($banner_id) { - global $banner; - - $banner_stats_query = tep_db_query("select year(banners_history_date) as year, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' group by year(banners_history_date)"); - while ($banner_stats = tep_db_fetch_array($banner_stats_query)) { - $names[] = $banner_stats['year']; - $values[] = (($banner_stats['value']) ? $banner_stats['value'] : '0'); - $dvalues[] = (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'); - } - - $largest = @max($values); - - $bars = array(); - $dbars = array(); - for ($i = 0, $n = sizeof($values); $i < $n; $i++) { - $bars[$i] = 'images/graph_hbar_blue.gif'; - $dbars[$i] = 'images/graph_hbar_red.gif'; - } - - $graph_vals = @array('vlabel'=>TEXT_BANNERS_DATA, - 'hlabel'=>sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $banner['banners_title']), - 'type'=>'3', - 'cellpadding'=>'', - 'cellspacing'=>'1', - 'border'=>'', - 'width'=>'', - 'vfcolor'=>'#ffffff', - 'hfcolor'=>'#ffffff', - 'vbgcolor'=>'#81a2b6', - 'hbgcolor'=>'#81a2b6', - 'vfstyle'=>'Verdana, Arial, Helvetica', - 'hfstyle'=>'Verdana, Arial, Helvetica', - 'scale'=>100/$largest, - 'namebgcolor'=>'#f3f5fe', - 'valuebgcolor'=>'#f3f5fe', - 'namefcolor'=>'', - 'valuefcolor'=>'#0000d0', - 'namefstyle'=>'Verdana, Arial, Helvetica', - 'valuefstyle'=>'', - 'doublefcolor'=>'#ff7339'); - - return html_graph($names, $values, $bars, $graph_vals, $dvalues, $dbars); - } - -//// -// draws a double vertical bar graph for the banner views vs clicks statistics - function tep_banner_graph_monthly($banner_id) { - global $banner; - - $year = (($_GET['year']) ? $_GET['year'] : date('Y')); - - for ($i=1; $i<13; $i++) { - $names[] = strftime('%b', mktime(0,0,0,$i)); - $values[] = '0'; - $dvalues[] = '0'; - } - - $banner_stats_query = tep_db_query("select month(banners_history_date) as banner_month, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and year(banners_history_date) = '" . $year . "' group by month(banners_history_date)"); - while ($banner_stats = tep_db_fetch_array($banner_stats_query)) { - $names[($banner_stats['banner_month']-1)] = strftime('%b', mktime(0,0,0,$banner_stats['banner_month'])); - $values[($banner_stats['banner_month']-1)] = (($banner_stats['value']) ? $banner_stats['value'] : '0'); - $dvalues[($banner_stats['banner_month']-1)] = (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'); - } - - $largest = @max($values); - - $bars = array(); - $dbars = array(); - for ($i = 0, $n = sizeof($values); $i < $n; $i++) { - $bars[$i] = 'images/graph_hbar_blue.gif'; - $dbars[$i] = 'images/graph_hbar_red.gif'; - } - - $graph_vals = @array('vlabel'=>TEXT_BANNERS_DATA, - 'hlabel'=>sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $banner['banners_title'], date('Y')), - 'type'=>'3', - 'cellpadding'=>'', - 'cellspacing'=>'1', - 'border'=>'', - 'width'=>'', - 'vfcolor'=>'#ffffff', - 'hfcolor'=>'#ffffff', - 'vbgcolor'=>'#81a2b6', - 'hbgcolor'=>'#81a2b6', - 'vfstyle'=>'Verdana, Arial, Helvetica', - 'hfstyle'=>'Verdana, Arial, Helvetica', - 'scale'=>100/$largest, - 'namebgcolor'=>'#f3f5fe', - 'valuebgcolor'=>'#f3f5fe', - 'namefcolor'=>'', - 'valuefcolor'=>'#0000d0', - 'namefstyle'=>'Verdana, Arial, Helvetica', - 'valuefstyle'=>'', - 'doublefcolor'=>'#ff7339'); - - return html_graph($names, $values, $bars, $graph_vals, $dvalues, $dbars); - } - -//// -// draws a double vertical bar graph for the banner views vs clicks statistics - function tep_banner_graph_daily($banner_id) { - global $banner; - - $year = (isset($_GET['year']) ? $_GET['year'] : date('Y')); - $month = (isset($_GET['month']) ? $_GET['month'] : date('n')); - - $days = (date('t', mktime(0,0,0,$month))+1); - $stats = array(); - for ($i=1; $i<$days; $i++) { - $names[] = $i; - $values[] = '0'; - $dvalues[] = '0'; - } - - $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as banner_day, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and month(banners_history_date) = '" . $month . "' and year(banners_history_date) = '" . $year . "'"); - while ($banner_stats = tep_db_fetch_array($banner_stats_query)) { - $names[($banner_stats['banner_day']-1)] = $banner_stats['banner_day']; - $values[($banner_stats['banner_day']-1)] = (($banner_stats['value']) ? $banner_stats['value'] : '0'); - $dvalues[($banner_stats['banner_day']-1)] = (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'); - } - - $largest = @max($values); - - $bars = array(); - $dbars = array(); - for ($i = 0, $n = sizeof($values); $i < $n; $i++) { - $bars[$i] = 'images/graph_hbar_blue.gif'; - $dbars[$i] = 'images/graph_hbar_red.gif'; - } - - $graph_vals = @array('vlabel'=>TEXT_BANNERS_DATA, - 'hlabel'=>sprintf(TEXT_BANNERS_DAILY_STATISTICS, $banner['banners_title'], strftime('%B', mktime(0,0,0,$month)), $year), - 'type'=>'3', - 'cellpadding'=>'', - 'cellspacing'=>'1', - 'border'=>'', - 'width'=>'', - 'vfcolor'=>'#ffffff', - 'hfcolor'=>'#ffffff', - 'vbgcolor'=>'#81a2b6', - 'hbgcolor'=>'#81a2b6', - 'vfstyle'=>'Verdana, Arial, Helvetica', - 'hfstyle'=>'Verdana, Arial, Helvetica', - 'scale'=>100/$largest, - 'namebgcolor'=>'#f3f5fe', - 'valuebgcolor'=>'#f3f5fe', - 'namefcolor'=>'', - 'valuefcolor'=>'#0000d0', - 'namefstyle'=>'Verdana, Arial, Helvetica', - 'valuefstyle'=>'', - 'doublefcolor'=>'#ff7339'); - - return html_graph($names, $values, $bars, $graph_vals, $dvalues, $dbars); - } -?> + \ No newline at end of file diff --git a/admin/includes/graphs/banner_daily.php b/admin/includes/graphs/banner_daily.php deleted file mode 100755 index d8272c673..000000000 --- a/admin/includes/graphs/banner_daily.php +++ /dev/null @@ -1,53 +0,0 @@ -SetFileFormat($banner_extension); - $graph->SetIsInline(1); - $graph->SetPrintImage(0); - - $graph->SetSkipBottomTick(1); - $graph->SetDrawYGrid(1); - $graph->SetPrecisionY(0); - $graph->SetPlotType('lines'); - - $graph->SetPlotBorderType('left'); - $graph->SetTitleFontSize('4'); - $graph->SetTitle(sprintf(TEXT_BANNERS_DAILY_STATISTICS, $banner['banners_title'], strftime('%B', mktime(0,0,0,$month)), $year)); - - $graph->SetBackgroundColor('white'); - - $graph->SetVertTickPosition('plotleft'); - $graph->SetDataValues($stats); - $graph->SetDataColors(array('blue','red'),array('blue', 'red')); - - $graph->DrawGraph(); - - $graph->PrintImage(); -?> diff --git a/admin/includes/graphs/banner_infobox.php b/admin/includes/graphs/banner_infobox.php deleted file mode 100755 index 3ce6f7efa..000000000 --- a/admin/includes/graphs/banner_infobox.php +++ /dev/null @@ -1,47 +0,0 @@ -SetFileFormat($banner_extension); - $graph->SetIsInline(1); - $graph->SetPrintImage(0); - - $graph->draw_vert_ticks = 0; - $graph->SetSkipBottomTick(1); - $graph->SetDrawXDataLabels(0); - $graph->SetDrawYGrid(0); - $graph->SetPlotType('bars'); - $graph->SetDrawDataLabels(1); - $graph->SetLabelScalePosition(1); - $graph->SetMarginsPixels(15,15,15,30); - - $graph->SetTitleFontSize('4'); - $graph->SetTitle(TEXT_BANNERS_LAST_3_DAYS); - - $graph->SetDataValues($stats); - $graph->SetDataColors(array('blue','red'),array('blue', 'red')); - - $graph->DrawGraph(); - - $graph->PrintImage(); -?> diff --git a/admin/includes/graphs/banner_monthly.php b/admin/includes/graphs/banner_monthly.php deleted file mode 100755 index 513fa5836..000000000 --- a/admin/includes/graphs/banner_monthly.php +++ /dev/null @@ -1,51 +0,0 @@ -SetFileFormat($banner_extension); - $graph->SetIsInline(1); - $graph->SetPrintImage(0); - - $graph->SetSkipBottomTick(1); - $graph->SetDrawYGrid(1); - $graph->SetPrecisionY(0); - $graph->SetPlotType('lines'); - - $graph->SetPlotBorderType('left'); - $graph->SetTitleFontSize('4'); - $graph->SetTitle(sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $banner['banners_title'], $year)); - - $graph->SetBackgroundColor('white'); - - $graph->SetVertTickPosition('plotleft'); - $graph->SetDataValues($stats); - $graph->SetDataColors(array('blue','red'),array('blue', 'red')); - - $graph->DrawGraph(); - - $graph->PrintImage(); -?> diff --git a/admin/includes/graphs/banner_yearly.php b/admin/includes/graphs/banner_yearly.php deleted file mode 100755 index 30aef8089..000000000 --- a/admin/includes/graphs/banner_yearly.php +++ /dev/null @@ -1,45 +0,0 @@ -SetFileFormat($banner_extension); - $graph->SetIsInline(1); - $graph->SetPrintImage(0); - - $graph->SetSkipBottomTick(1); - $graph->SetDrawYGrid(1); - $graph->SetPrecisionY(0); - $graph->SetPlotType('lines'); - - $graph->SetPlotBorderType('left'); - $graph->SetTitleFontSize('4'); - $graph->SetTitle(sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $banner['banners_title'])); - - $graph->SetBackgroundColor('white'); - - $graph->SetVertTickPosition('plotleft'); - $graph->SetDataValues($stats); - $graph->SetDataColors(array('blue','red'),array('blue', 'red')); - - $graph->DrawGraph(); - - $graph->PrintImage(); -?> diff --git a/admin/includes/languages/english.php b/admin/includes/languages/english.php index 0aa26a9f3..da7d811a2 100755 --- a/admin/includes/languages/english.php +++ b/admin/includes/languages/english.php @@ -104,7 +104,6 @@ function tep_date_raw($date, $reverse = false) { define('BOX_HEADING_TOOLS', 'Tools'); define('BOX_TOOLS_ACTION_RECORDER', 'Action Recorder'); define('BOX_TOOLS_BACKUP', 'Database Backup'); -define('BOX_TOOLS_BANNER_MANAGER', 'Banner Manager'); define('BOX_TOOLS_DEFINE_LANGUAGE', 'Define Languages'); define('BOX_TOOLS_MAIL', 'Send Email'); define('BOX_TOOLS_NEWSLETTER_MANAGER', 'Newsletter Manager'); @@ -212,7 +211,6 @@ function tep_date_raw($date, $reverse = false) { define('IMAGE_MODULE_INSTALL', 'Install Module'); define('IMAGE_MODULE_REMOVE', 'Remove Module'); define('IMAGE_MOVE', 'Move'); -define('IMAGE_NEW_BANNER', 'New Banner'); define('IMAGE_NEW_CATEGORY', 'New Category'); define('IMAGE_NEW_COUNTRY', 'New Country'); define('IMAGE_NEW_CURRENCY', 'New Currency'); @@ -259,7 +257,6 @@ function tep_date_raw($date, $reverse = false) { // constants for use in tep_prev_next_display function define('TEXT_RESULT_PAGE', 'Page %s of %d'); -define('TEXT_DISPLAY_NUMBER_OF_BANNERS', 'Displaying %d to %d (of %d banners)'); define('TEXT_DISPLAY_NUMBER_OF_COUNTRIES', 'Displaying %d to %d (of %d countries)'); define('TEXT_DISPLAY_NUMBER_OF_CUSTOMERS', 'Displaying %d to %d (of %d customers)'); define('TEXT_DISPLAY_NUMBER_OF_CURRENCIES', 'Displaying %d to %d (of %d currencies)'); diff --git a/admin/includes/languages/english/banner_manager.php b/admin/includes/languages/english/banner_manager.php deleted file mode 100755 index e472a52eb..000000000 --- a/admin/includes/languages/english/banner_manager.php +++ /dev/null @@ -1,67 +0,0 @@ -Banner Notes:
  • Use an image or HTML text for the banner - not both.
  • HTML Text has priority over an image
'); -define('TEXT_BANNERS_INSERT_NOTE', 'Image Notes:
  • Uploading directories must have proper user (write) permissions setup!
  • Do not fill out the \'Save To\' field if you are not uploading an image to the webserver (ie, you are using a local (serverside) image).
  • The \'Save To\' field must be an existing directory with an ending slash (eg, banners/).
'); -define('TEXT_BANNERS_EXPIRCY_NOTE', 'Expiry Notes:
  • Only one of the two fields should be submitted
  • If the banner is not to expire automatically, then leave these fields blank
'); -define('TEXT_BANNERS_SCHEDULE_NOTE', 'Schedule Notes:
  • If a schedule is set, the banner will be activated on that date.
  • All scheduled banners are marked as deactive until their date has arrived, to which they will then be marked active.
'); - -define('TEXT_BANNERS_DATE_ADDED', 'Date Added:'); -define('TEXT_BANNERS_SCHEDULED_AT_DATE', 'Scheduled At: %s'); -define('TEXT_BANNERS_EXPIRES_AT_DATE', 'Expires At: %s'); -define('TEXT_BANNERS_EXPIRES_AT_IMPRESSIONS', 'Expires At: %s impressions'); -define('TEXT_BANNERS_STATUS_CHANGE', 'Status Change: %s'); - -define('TEXT_BANNERS_DATA', 'D
A
T
A'); -define('TEXT_BANNERS_LAST_3_DAYS', 'Last 3 Days'); -define('TEXT_BANNERS_BANNER_VIEWS', 'Banner Views'); -define('TEXT_BANNERS_BANNER_CLICKS', 'Banner Clicks'); - -define('TEXT_INFO_DELETE_INTRO', 'Are you sure you want to delete this banner?'); -define('TEXT_INFO_DELETE_IMAGE', 'Delete banner image'); - -define('SUCCESS_BANNER_INSERTED', 'Success: The banner has been inserted.'); -define('SUCCESS_BANNER_UPDATED', 'Success: The banner has been updated.'); -define('SUCCESS_BANNER_REMOVED', 'Success: The banner has been removed.'); -define('SUCCESS_BANNER_STATUS_UPDATED', 'Success: The status of the banner has been updated.'); - -define('ERROR_BANNER_TITLE_REQUIRED', 'Error: Banner title required.'); -define('ERROR_BANNER_GROUP_REQUIRED', 'Error: Banner group required.'); -define('ERROR_IMAGE_DIRECTORY_DOES_NOT_EXIST', 'Error: Target directory does not exist: %s'); -define('ERROR_IMAGE_DIRECTORY_NOT_WRITEABLE', 'Error: Target directory is not writeable: %s'); -define('ERROR_IMAGE_DOES_NOT_EXIST', 'Error: Image does not exist.'); -define('ERROR_IMAGE_IS_NOT_WRITEABLE', 'Error: Image can not be removed.'); -define('ERROR_UNKNOWN_STATUS_FLAG', 'Error: Unknown status flag.'); - -define('ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST', 'Error: Graphs directory does not exist. Please create a \'graphs\' directory inside \'images\'.'); -define('ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE', 'Error: Graphs directory is not writeable.'); -?> diff --git a/admin/includes/languages/english/banner_statistics.php b/admin/includes/languages/english/banner_statistics.php deleted file mode 100755 index 4666edf10..000000000 --- a/admin/includes/languages/english/banner_statistics.php +++ /dev/null @@ -1,34 +0,0 @@ -a
t
a'); -define('TEXT_BANNERS_DAILY_STATISTICS', '%s Daily Statistics For %s %s'); -define('TEXT_BANNERS_MONTHLY_STATISTICS', '%s Monthly Statistics For %s'); -define('TEXT_BANNERS_YEARLY_STATISTICS', '%s Yearly Statistics'); - -define('STATISTICS_TYPE_DAILY', 'Daily'); -define('STATISTICS_TYPE_MONTHLY', 'Monthly'); -define('STATISTICS_TYPE_YEARLY', 'Yearly'); - -define('TITLE_TYPE', 'Type:'); -define('TITLE_YEAR', 'Year:'); -define('TITLE_MONTH', 'Month:'); - -define('ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST', 'Error: Graphs directory does not exist. Please create a \'graphs\' directory inside \'images\'.'); -define('ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE', 'Error: Graphs directory is not writeable.'); -?> \ No newline at end of file diff --git a/admin/popup_image.php b/admin/popup_image.php deleted file mode 100755 index c858968e1..000000000 --- a/admin/popup_image.php +++ /dev/null @@ -1,54 +0,0 @@ - - -> - -<?php echo $page_title; ?> - - - - - - - - - - diff --git a/includes/application_top.php b/includes/application_top.php index bf376d972..f2dea84bf 100755 --- a/includes/application_top.php +++ b/includes/application_top.php @@ -328,11 +328,6 @@ // split-page-results require('includes/classes/split_page_results.php'); -// auto activate and expire banners - require('includes/functions/banner.php'); - tep_activate_banners(); - tep_expire_banners(); - // auto expire special products require('includes/functions/specials.php'); tep_expire_specials(); diff --git a/includes/functions/banner.php b/includes/functions/banner.php deleted file mode 100755 index 09ba1229d..000000000 --- a/includes/functions/banner.php +++ /dev/null @@ -1,125 +0,0 @@ -= $banners['date_scheduled']) { - tep_set_banner_status($banners['banners_id'], '1'); - } - } - } - } - -//// -// Auto expire banners - function tep_expire_banners() { - $banners_query = tep_db_query("select b.banners_id, b.expires_date, b.expires_impressions, sum(bh.banners_shown) as banners_shown from banners b, banners_history bh where b.status = '1' and b.banners_id = bh.banners_id group by b.banners_id"); - if (tep_db_num_rows($banners_query)) { - while ($banners = tep_db_fetch_array($banners_query)) { - if (tep_not_null($banners['expires_date'])) { - if (date('Y-m-d H:i:s') >= $banners['expires_date']) { - tep_set_banner_status($banners['banners_id'], '0'); - } - } elseif (tep_not_null($banners['expires_impressions'])) { - if ( ($banners['expires_impressions'] > 0) && ($banners['banners_shown'] >= $banners['expires_impressions']) ) { - tep_set_banner_status($banners['banners_id'], '0'); - } - } - } - } - } - -//// -// Display a banner from the specified group or banner id ($identifier) - function tep_display_banner($action, $identifier) { - if ($action == 'dynamic') { - $banners_query = tep_db_query("select count(*) as count from banners where status = '1' and banners_group = '" . tep_db_input($identifier) . "'"); - $banners = tep_db_fetch_array($banners_query); - if ($banners['count'] > 0) { - $banner = tep_random_select("select banners_id, banners_title, banners_image, banners_html_text from banners where status = '1' and banners_group = '" . tep_db_input($identifier) . "'"); - } else { - return 'TEP ERROR! (tep_display_banner(' . $action . ', ' . $identifier . ') -> No banners with group \'' . $identifier . '\' found!'; - } - } elseif ($action == 'static') { - if (is_array($identifier)) { - $banner = $identifier; - } else { - $banner_query = tep_db_query("select banners_id, banners_title, banners_image, banners_html_text from banners where status = '1' and banners_id = '" . (int)$identifier . "'"); - if (tep_db_num_rows($banner_query)) { - $banner = tep_db_fetch_array($banner_query); - } else { - return 'TEP ERROR! (tep_display_banner(' . $action . ', ' . $identifier . ') -> Banner with ID \'' . $identifier . '\' not found, or status inactive'; - } - } - } else { - return 'TEP ERROR! (tep_display_banner(' . $action . ', ' . $identifier . ') -> Unknown $action parameter value - it must be either \'dynamic\' or \'static\''; - } - - if (tep_not_null($banner['banners_html_text'])) { - $banner_string = $banner['banners_html_text']; - } else { - $banner_string = '' . tep_image('images/' . $banner['banners_image'], htmlspecialchars($banner['banners_title'])) . ''; - } - - tep_update_banner_display_count($banner['banners_id']); - - return $banner_string; - } - -//// -// Check to see if a banner exists - function tep_banner_exists($action, $identifier) { - if ($action == 'dynamic') { - return tep_random_select("select banners_id, banners_title, banners_image, banners_html_text from banners where status = '1' and banners_group = '" . tep_db_input($identifier) . "'"); - } elseif ($action == 'static') { - $banner_query = tep_db_query("select banners_id, banners_title, banners_image, banners_html_text from banners where status = '1' and banners_id = '" . (int)$identifier . "'"); - return tep_db_fetch_array($banner_query); - } else { - return false; - } - } - -//// -// Update the banner display statistics - function tep_update_banner_display_count($banner_id) { - $banner_check_query = tep_db_query("select count(*) as count from banners_history where banners_id = '" . (int)$banner_id . "' and date_format(banners_history_date, '%Y%m%d') = date_format(now(), '%Y%m%d')"); - $banner_check = tep_db_fetch_array($banner_check_query); - - if ($banner_check['count'] > 0) { - tep_db_query("update banners_history set banners_shown = banners_shown + 1 where banners_id = '" . (int)$banner_id . "' and date_format(banners_history_date, '%Y%m%d') = date_format(now(), '%Y%m%d')"); - } else { - tep_db_query("insert into banners_history (banners_id, banners_shown, banners_history_date) values ('" . (int)$banner_id . "', 1, now())"); - } - } - -//// -// Update the banner click statistics - function tep_update_banner_click_count($banner_id) { - tep_db_query("update banners_history set banners_clicked = banners_clicked + 1 where banners_id = '" . (int)$banner_id . "' and date_format(banners_history_date, '%Y%m%d') = date_format(now(), '%Y%m%d')"); - } -?> diff --git a/install/oscommerce.sql b/install/oscommerce.sql index ae2950625..9a53f57dd 100755 --- a/install/oscommerce.sql +++ b/install/oscommerce.sql @@ -63,35 +63,6 @@ CREATE TABLE administrators ( PRIMARY KEY (id) ) CHARACTER SET utf8 COLLATE utf8_unicode_ci; -DROP TABLE IF EXISTS banners; -CREATE TABLE banners ( - banners_id int NOT NULL auto_increment, - banners_title varchar(64) NOT NULL, - banners_url varchar(255) NOT NULL, - banners_image varchar(64) NOT NULL, - banners_group varchar(10) NOT NULL, - banners_html_text text, - expires_impressions int(7) DEFAULT '0', - expires_date datetime DEFAULT NULL, - date_scheduled datetime DEFAULT NULL, - date_added datetime NOT NULL, - date_status_change datetime DEFAULT NULL, - status int(1) DEFAULT '1' NOT NULL, - PRIMARY KEY (banners_id), - KEY idx_banners_group (banners_group) -) CHARACTER SET utf8 COLLATE utf8_unicode_ci; - -DROP TABLE IF EXISTS banners_history; -CREATE TABLE banners_history ( - banners_history_id int NOT NULL auto_increment, - banners_id int NOT NULL, - banners_shown int(5) NOT NULL DEFAULT '0', - banners_clicked int(5) NOT NULL DEFAULT '0', - banners_history_date datetime NOT NULL, - PRIMARY KEY (banners_history_id), - KEY idx_banners_history_banners_id (banners_id) -) CHARACTER SET utf8 COLLATE utf8_unicode_ci; - DROP TABLE IF EXISTS categories; CREATE TABLE categories ( categories_id int NOT NULL auto_increment, diff --git a/redirect.php b/redirect.php index 4ce65bddb..8f7c5bcf1 100644 --- a/redirect.php +++ b/redirect.php @@ -13,16 +13,6 @@ require('includes/application_top.php'); switch ($_GET['action']) { - case 'banner': - $banner_query = tep_db_query("select banners_url from banners where banners_id = '" . (int)$_GET['goto'] . "'"); - if (tep_db_num_rows($banner_query)) { - $banner = tep_db_fetch_array($banner_query); - tep_update_banner_click_count($_GET['goto']); - - tep_redirect($banner['banners_url']); - } - break; - case 'url': if (isset($_GET['goto']) && tep_not_null($_GET['goto'])) { $check_query = tep_db_query("select products_url from products_description where products_url = '" . tep_db_input($_GET['goto']) . "' limit 1"); From 7eebb6d7accf2d19192a16b37b5c6f20b976fe2f Mon Sep 17 00:00:00 2001 From: gburton Date: Thu, 24 Oct 2019 15:32:26 +0100 Subject: [PATCH 7/9] Full width Buy Button --- install/oscommerce.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/oscommerce.sql b/install/oscommerce.sql index 9a53f57dd..38b7e573d 100755 --- a/install/oscommerce.sql +++ b/install/oscommerce.sql @@ -1538,7 +1538,7 @@ insert into configuration (configuration_title, configuration_key, configuration insert into configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Sort Order', 'MODULE_CONTENT_PI_DATE_AVAILABLE_SORT_ORDER', '70', 'Sort order of display. Lowest is displayed first.', '6', '0', now()); insert into configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Enable Buy Button', 'MODULE_CONTENT_PI_BUY_STATUS', 'True', 'Should this module be shown on the product info page?', '6', '1', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now()); -insert into configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Content Width', 'MODULE_CONTENT_PI_BUY_CONTENT_WIDTH', '6', 'What width container should the content be shown in?', '6', '1', 'tep_cfg_select_option(array(\'12\', \'11\', \'10\', \'9\', \'8\', \'7\', \'6\', \'5\', \'4\', \'3\', \'2\', \'1\'), ', now()); +insert into configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Content Width', 'MODULE_CONTENT_PI_BUY_CONTENT_WIDTH', '12', 'What width container should the content be shown in?', '6', '1', 'tep_cfg_select_option(array(\'12\', \'11\', \'10\', \'9\', \'8\', \'7\', \'6\', \'5\', \'4\', \'3\', \'2\', \'1\'), ', now()); insert into configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Sort Order', 'MODULE_CONTENT_PI_BUY_SORT_ORDER', '100', 'Sort order of display. Lowest is displayed first.', '6', '0', now()); #Product Reviews From 3cdde49a85229f1861f389f3bab6719864c5b540 Mon Sep 17 00:00:00 2001 From: gburton Date: Thu, 24 Oct 2019 15:33:07 +0100 Subject: [PATCH 8/9] Installer --- install/templates/main_page.php | 2 +- install/templates/pages/install_4.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/templates/main_page.php b/install/templates/main_page.php index 620ac34ac..770472a68 100755 --- a/install/templates/main_page.php +++ b/install/templates/main_page.php @@ -34,7 +34,7 @@
-
    +
    • osCommerce Website
    • Support
    • Documentation
      • diff --git a/install/templates/pages/install_4.php b/install/templates/pages/install_4.php index e80c75441..b748254e4 100755 --- a/install/templates/pages/install_4.php +++ b/install/templates/pages/install_4.php @@ -197,8 +197,9 @@
      -
      1), 'btn-success btn-block'); ?>
      1), 'btn-info btn-block'); ?>
      +
      1), 'btn-success btn-block'); ?>
      +
      1), 'btn-danger btn-block'); ?>
From 35c52a1579f983a634e866e0ee8c3344f2d0629f Mon Sep 17 00:00:00 2001 From: gburton Date: Thu, 24 Oct 2019 21:43:42 +0100 Subject: [PATCH 9/9] Add Form Injection TY @raiwa for idea --- checkout_confirmation.php | 4 +++- checkout_payment.php | 4 ++++ checkout_payment_address.php | 2 ++ checkout_shipping.php | 4 ++++ checkout_shipping_address.php | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/checkout_confirmation.php b/checkout_confirmation.php index 7c92dd9e2..d5d95ebd8 100644 --- a/checkout_confirmation.php +++ b/checkout_confirmation.php @@ -227,8 +227,10 @@ call('siteWide', 'injectFormDisplay'); ?> - +
+ + call('siteWide', 'injectFormDisplay'); + ?>
diff --git a/checkout_payment_address.php b/checkout_payment_address.php index 15cb525dc..faebfe617 100644 --- a/checkout_payment_address.php +++ b/checkout_payment_address.php @@ -269,6 +269,8 @@ call('siteWide', 'injectFormDisplay'); ?>
diff --git a/checkout_shipping.php b/checkout_shipping.php index ae4934770..0ec24d1a0 100644 --- a/checkout_shipping.php +++ b/checkout_shipping.php @@ -291,6 +291,10 @@
+ call('siteWide', 'injectFormDisplay'); + ?> +
diff --git a/checkout_shipping_address.php b/checkout_shipping_address.php index e3b381dcf..6024956f4 100644 --- a/checkout_shipping_address.php +++ b/checkout_shipping_address.php @@ -278,6 +278,8 @@ call('siteWide', 'injectFormDisplay'); ?>