Skip to content

Commit

Permalink
Version 1.7.0 for 1.5.7g
Browse files Browse the repository at this point in the history
  • Loading branch information
@webchills
webchills committed Dec 8, 2023
1 parent 1d389c0 commit 14e7292
Show file tree
Hide file tree
Showing 18 changed files with 331 additions and 297 deletions.
24 changes: 17 additions & 7 deletions GEAENDERTE DATEIEN/includes/templates/DEINTEMPLATE/common/html_header.php
View file
@@ -1,15 +1,15 @@
<?php
/**
* Zen Cart German Specific
* Zen Cart German Specific (158 code in 157 / zencartpro adaptations)
* Common Template
*
* outputs the html header. i,e, everything that comes before the \</head\> tag <br />
* outputs the html header. i,e, everything that comes before the \</head\> tag
*
* @copyright Copyright 2003-2022 Zen Cart Development Team
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: html_header.php for Tabbed Products Pro 2022-03-30 19:16:39Z webchills $
* @version $Id: html_header.php for Tabbed Products Pro 2023-12-08 19:16:39Z webchills $
*/
if (!defined('IS_ADMIN_FLAG')) {
die('Illegal Access');
Expand All @@ -31,14 +31,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?>>
<head>
<?php
// -----
// Provide a notification that the <head> tag has been rendered for the current page; some scripts need to be
// inserted just after that tag's rendered.
//
$zco_notifier->notify('NOTIFY_HTML_HEAD_TAG_START', $current_page_base);
?>
<meta charset="<?php echo CHARSET; ?>" />
<link rel="dns-prefetch" href="https://cdnjs.cloudflare.com">
<link rel="dns-prefetch" href="https://code.jquery.com">
<title><?php echo META_TAG_TITLE; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />

<meta name="keywords" content="<?php echo META_TAG_KEYWORDS; ?>" />
<meta name="description" content="<?php echo META_TAG_DESCRIPTION; ?>" />
<meta name="language" content="<?php echo META_TAG_LANGUAGE; ?>" />
<meta http-equiv="imagetoolbar" content="no" />
<meta name="author" content="<?php echo STORE_NAME ?>" />
<meta name="generator" content="Zen-Cart 1.5.7 - deutsche Version, http://www.zen-cart-pro.at" />
<meta name="generator" content="Zen-Cart - deutsche Version, https://www.zen-cart-pro.at" />
<?php if (defined('ROBOTS_PAGES_TO_SKIP') && in_array($current_page_base,explode(",",constant('ROBOTS_PAGES_TO_SKIP'))) || $current_page_base=='down_for_maintenance' || $robotsNoIndex === true) { ?>
<meta name="robots" content="noindex, nofollow" />
<?php } ?>
Expand Down Expand Up @@ -73,7 +83,7 @@
<?php echo rss_feed_link_alternate();?>
<?php } ?>

<script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4" crossorigin="anonymous"%3E%3C/script%3E'));</script>
<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous"></script>
<script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript type="text/javascript" src="<?php echo $template->get_template_dir('.js',DIR_WS_TEMPLATE, $current_page_base,'jscript'); ?>/jquery.min.js"%3E%3C/script%3E'));</script>

<?php
Expand Down
73 changes: 38 additions & 35 deletions GEAENDERTE DATEIEN/includes/templates/DEINTEMPLATE/common/tpl_main_page.php
View file
@@ -1,42 +1,42 @@
<?php
/**
* Common Template - tpl_main_page.php
* Zen Cart German Specific
* Governs the overall layout of an entire page<br />
* Normally consisting of a header, left side column. center column. right side column and footer<br />
* For customizing, this file can be copied to /templates/your_template_dir/pagename<br />
* example: to override the privacy page<br />
* - make a directory /templates/my_template/privacy<br />
* - copy /templates/templates_defaults/common/tpl_main_page.php to /templates/my_template/privacy/tpl_main_page.php<br />
* <br />
* to override the global settings and turn off columns un-comment the lines below for the correct column to turn off<br />
* to turn off the header and/or footer uncomment the lines below<br />
* Note: header can be disabled in the tpl_header.php<br />
* Note: footer can be disabled in the tpl_footer.php<br />
* <br />
* $flag_disable_header = true;<br />
* $flag_disable_left = true;<br />
* $flag_disable_right = true;<br />
* $flag_disable_footer = true;<br />
* <br />
* // example to not display right column on main page when Always Show Categories is OFF<br />
* <br />
* if ($current_page_base == 'index' and $cPath == '') {<br />
* $flag_disable_right = true;<br />
* }<br />
* <br />
* example to not display right column on main page when Always Show Categories is ON and set to categories_id 3<br />
* <br />
* if ($current_page_base == 'index' and $cPath == '' or $cPath == '3') {<br />
* $flag_disable_right = true;<br />
* }<br />
* Zen Cart German Specific (zencartpro adaptations)
* Governs the overall layout of an entire page
* Normally consisting of a header, left side column. center column. right side column and footer
* For customizing, this file can be copied to /templates/your_template_dir/pagename
* example: to override the privacy page
* - make a directory /templates/my_template/privacy
* - copy /templates/templates_defaults/common/tpl_main_page.php to /templates/my_template/privacy/tpl_main_page.php
*
* to override the global settings and turn off columns un-comment the lines below for the correct column to turn off
* to turn off the header and/or footer uncomment the lines below
* Note: header can be disabled in the tpl_header.php
* Note: footer can be disabled in the tpl_footer.php
*
* $flag_disable_header = true;
* $flag_disable_left = true;
* $flag_disable_right = true;
* $flag_disable_footer = true;
*
* // example to not display right column on main page when Always Show Categories is OFF
*
* if ($current_page_base == 'index' and $cPath == '') {
* $flag_disable_right = true;
* }
*
* example to not display right column on main page when Always Show Categories is ON and set to categories_id 3
*
* if ($current_page_base == 'index' and $cPath == '' or $cPath == '3') {
* $flag_disable_right = true;
* }
*
* @copyright Copyright 2003-2022 Zen Cart Development Team
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: tpl_main_page.php for Tabbed Products Pro 2022-03-30 18:49:16Z webchills $
* @version $Id: tpl_main_page.php for Tabbed Products Pro 2023-12-08 18:49:16Z webchills $
*/
if (!defined('IS_ADMIN_FLAG')) {
die('Illegal Access');
Expand Down Expand Up @@ -104,7 +104,8 @@
*
*/
?>
<div id="navColumnOneWrapper" style="width: <?php echo (int)BOX_WIDTH_LEFT; ?>px"><?php require(DIR_WS_MODULES . zen_get_module_directory('column_left.php')); ?></div></td>
<div id="navColumnOneWrapper" style="width: <?php echo (int)BOX_WIDTH_LEFT; ?>px"><?php require(DIR_WS_MODULES . zen_get_module_directory('column_left.php')); ?></div>
</td>
<?php
}
?>
Expand Down Expand Up @@ -146,7 +147,8 @@
<?php
}
}
?></td>
?>
</td>

<?php
//if (COLUMN_RIGHT_STATUS == 0 || (CUSTOMERS_APPROVAL == '1' and $_SESSION['customer_id'] == '') || (CUSTOMERS_APPROVAL_AUTHORIZATION == 1 && CUSTOMERS_AUTHORIZATION_COLUMN_RIGHT_OFF == 'true' && $_SESSION['customers_authorization'] != 0)) {
Expand All @@ -156,14 +158,15 @@
}
if (!isset($flag_disable_right) || !$flag_disable_right) {
?>
<td id="navColumnTwo" class="columnRight" style="width: <?php echo (int)COLUMN_WIDTH_RIGHT; ?>"px>
<td id="navColumnTwo" class="columnRight" style="width: <?php echo (int)COLUMN_WIDTH_RIGHT; ?>px">
<?php
/**
* prepares and displays right column sideboxes
*
*/
?>
<div id="navColumnTwoWrapper" style="width: <?php echo (int)BOX_WIDTH_RIGHT; ?>"px><?php require(DIR_WS_MODULES . zen_get_module_directory('column_right.php')); ?></div></td>
<div id="navColumnTwoWrapper" style="width: <?php echo (int)BOX_WIDTH_RIGHT; ?>px"><?php require(DIR_WS_MODULES . zen_get_module_directory('column_right.php')); ?></div>
</td>
<?php
}
?>
Expand Down
37 changes: 19 additions & 18 deletions ...E DATEIEN/includes/templates/DEINTEMPLATE/templates/tpl_document_general_info_display.php
View file
@@ -1,15 +1,15 @@
<?php
/**
* Page Template
* Zen Cart German Specific
* Loaded automatically by index.php?main_page=document_general_info.<br />
* Zen Cart German Specific (zencartpro adaptations)
* Loaded automatically by index.php?main_page=document_general_info.
* Displays template according to "document-general" product-type needs
*
* @copyright Copyright 2003-2022 Zen Cart Development Team
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: tpl_document_general_info_display.php for Tabbed Products Pro 2022-03-30 18:47:36Z webchills $
* @version $Id: tpl_document_general_info_display.php for Tabbed Products Pro 2023-12-08 18:47:36Z webchills $
*/
?>

Expand Down Expand Up @@ -48,7 +48,7 @@

<!--bof Main Product Image -->
<?php
if (zen_not_null($products_image)) {
if (!empty($products_image) || !empty($enable_additional_images_without_main_image)) {
?>
<?php
/**
Expand All @@ -69,7 +69,7 @@
<?php
// base price
if ($show_onetime_charges_description == 'true') {
$one_time = '<span >' . TEXT_ONETIME_CHARGE_SYMBOL . TEXT_ONETIME_CHARGE_DESCRIPTION . '</span><br />';
$one_time = '<span>' . TEXT_ONETIME_CHARGE_SYMBOL . TEXT_ONETIME_CHARGE_DESCRIPTION . '</span><br>';
} else {
$one_time = '';
}
Expand All @@ -93,7 +93,7 @@
<div id="productDescription" class="docGeneral biggerText"><?php echo stripslashes($products_description); ?></div>
<?php } ?>
<!--eof Product description -->
<br class="clearBoth" />
<br class="clearBoth">

<!--bof Add to Cart Box -->
<?php
Expand All @@ -105,10 +105,10 @@
$display_qty = (($flag_show_product_info_in_cart_qty == 1 and $_SESSION['cart']->in_cart($_GET['products_id'])) ? '<p>' . PRODUCTS_ORDER_QTY_TEXT_IN_CART . $_SESSION['cart']->get_quantity($_GET['products_id']) . '</p>' : '');
if ($products_qty_box_status == 0 or $products_quantity_order_max== 1) {
// hide the quantity box and default to 1
$the_button = '<input type="hidden" name="cart_quantity" value="1" />' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
$the_button = '<input type="hidden" name="cart_quantity" value="1">' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
} else {
// show the quantity box
$the_button = PRODUCTS_ORDER_QTY_TEXT . '<input type="text" name="cart_quantity" value="' . $products_get_buy_now_qty . '" maxlength="6" size="4" aria-label="' . ARIA_QTY_ADD_TO_CART . '"><br />' . zen_get_products_quantity_min_units_display((int)$_GET['products_id']) . '<br />' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
$the_button = PRODUCTS_ORDER_QTY_TEXT . '<input type="text" name="cart_quantity" value="' . $products_get_buy_now_qty . '" maxlength="6" size="4" aria-label="' . ARIA_QTY_ADD_TO_CART . '"><br>' . zen_get_products_quantity_min_units_display((int)$_GET['products_id']) . '<br>' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
}
$display_button = zen_get_buy_now_button($_GET['products_id'], $the_button);
?>
Expand All @@ -131,7 +131,7 @@
<?php echo (($flag_show_product_info_quantity == 1) ? '<li>' . $products_quantity . TEXT_PRODUCT_QUANTITY . '</li>' : '') . "\n"; ?>
<?php echo (($flag_show_product_info_manufacturer == 1 and !empty($manufacturers_name)) ? '<li>' . TEXT_PRODUCT_MANUFACTURER . $manufacturers_name . '</li>' : ' ') . "\n"; ?>
</ul>
<br class="clearBoth" />
<br class="clearBoth">
<?php
}
?>
Expand All @@ -140,11 +140,12 @@
if ($flag_show_ask_a_question) {
?>
<!-- bof Ask a Question -->
<br />
<span id="productQuestions" class="biggerText">
<b><?php echo '<a href="' . zen_href_link(FILENAME_ASK_A_QUESTION, 'pid=' . $_GET['products_id'], 'SSL') . '">' . ASK_A_QUESTION . '</a>'; ?></b>
<br>
<span id="productQuestions" class="">
<?php echo '<a href="' . zen_href_link(FILENAME_ASK_A_QUESTION, 'pid=' . $_GET['products_id'], 'SSL') . '">' . zen_image_button(BUTTON_IMAGE_ASK_A_QUESTION, BUTTON_ASK_A_QUESTION_ALT, ' id="askAQuestionButton"') . '</a>'; ?>
</span>
<br class="clearBoth" />
<br class="clearBoth">
<br>
<!-- eof Ask a Question -->
<?php
}
Expand All @@ -156,7 +157,7 @@
?>
<?php
/**
* display the product atributes
* display the product attributes
*/
require($template->get_template_dir('/tpl_modules_attributes.php',DIR_WS_TEMPLATE, $current_page_base,'templates'). '/tpl_modules_attributes.php'); ?>
<?php
Expand Down Expand Up @@ -202,11 +203,11 @@
// if more than 0 reviews, then show reviews button; otherwise, show the "write review" button
if ($reviews->fields['count'] > 0 ) { ?>
<div id="productReviewLink" class="buttonRow back"><?php echo '<a href="' . zen_href_link(FILENAME_PRODUCT_REVIEWS, zen_get_all_get_params()) . '">' . zen_image_button(BUTTON_IMAGE_REVIEWS, BUTTON_REVIEWS_ALT) . '</a>'; ?></div>
<br class="clearBoth" />
<br class="clearBoth">
<p class="reviewCount"><?php echo ($flag_show_product_info_reviews_count == 1 ? TEXT_CURRENT_REVIEWS . ' ' . $reviews->fields['count'] : ''); ?></p>
<?php } else { ?>
<div id="productReviewLink" class="buttonRow back"><?php echo '<a href="' . zen_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, zen_get_all_get_params(array())) . '">' . zen_image_button(BUTTON_IMAGE_WRITE_REVIEW, BUTTON_WRITE_REVIEW_ALT) . '</a>'; ?></div>
<br class="clearBoth" />
<br class="clearBoth">
<?php
}
}
Expand Down Expand Up @@ -234,7 +235,7 @@

<!--bof Product URL -->
<?php
if (zen_not_null($products_url)) {
if (!empty($products_url)) {
if ($flag_show_product_info_url == 1) {
?>
<p id="productInfoLink" class="docGeneral centeredContent"><?php echo sprintf(TEXT_MORE_INFORMATION, zen_href_link(FILENAME_REDIRECT, 'action=product&products_id=' . zen_output_string_protected($_GET['products_id']), 'NONSSL', true, false)); ?></p>
Expand Down
31 changes: 16 additions & 15 deletions ...E DATEIEN/includes/templates/DEINTEMPLATE/templates/tpl_document_product_info_display.php
View file
Expand Up @@ -2,14 +2,14 @@
/**
* Page Template
* Zen Cart German Specific
* Loaded automatically by index.php?main_page=document_product_info.<br />
* Loaded automatically by index.php?main_page=document_product_info.
* Displays template according to "document-product" product-type needs
*
* @copyright Copyright 2003-2022 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: tpl_document_product_info_display.php for Tabbed Products Pro 2022-03-30 18:47:36Z webchills $
* @version $Id: tpl_document_product_info_display.php for Tabbed Products Pro 2023-12-08 18:47:36Z webchills $
*/
?>

Expand Down Expand Up @@ -48,7 +48,7 @@

<!--bof Main Product Image -->
<?php
if (zen_not_null($products_image)) {
if (!empty($products_image) || !empty($enable_additional_images_without_main_image)) {
?>
<?php
/**
Expand All @@ -69,7 +69,7 @@
<?php
// base price
if ($show_onetime_charges_description == 'true') {
$one_time = '<span >' . TEXT_ONETIME_CHARGE_SYMBOL . TEXT_ONETIME_CHARGE_DESCRIPTION . '</span><br />';
$one_time = '<span>' . TEXT_ONETIME_CHARGE_SYMBOL . TEXT_ONETIME_CHARGE_DESCRIPTION . '</span><br>';
} else {
$one_time = '';
}
Expand All @@ -93,7 +93,7 @@
<div id="productDescription" class="docProduct biggerText"><?php echo stripslashes($products_description); ?></div>
<?php } ?>
<!--eof Product description -->
<br class="clearBoth" />
<br class="clearBoth">

<!--bof Add to Cart Box -->
<?php
Expand All @@ -105,10 +105,10 @@
$display_qty = (($flag_show_product_info_in_cart_qty == 1 and $_SESSION['cart']->in_cart($_GET['products_id'])) ? '<p>' . PRODUCTS_ORDER_QTY_TEXT_IN_CART . $_SESSION['cart']->get_quantity($_GET['products_id']) . '</p>' : '');
if ($products_qty_box_status == 0 or $products_quantity_order_max== 1) {
// hide the quantity box and default to 1
$the_button = '<input type="hidden" name="cart_quantity" value="1" />' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
$the_button = '<input type="hidden" name="cart_quantity" value="1">' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
} else {
// show the quantity box
$the_button = PRODUCTS_ORDER_QTY_TEXT . '<input type="text" name="cart_quantity" value="' . $products_get_buy_now_qty . '" maxlength="6" size="4" aria-label="' . ARIA_QTY_ADD_TO_CART . '"><br />' . zen_get_products_quantity_min_units_display((int)$_GET['products_id']) . '<br />' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
$the_button = PRODUCTS_ORDER_QTY_TEXT . '<input type="text" name="cart_quantity" value="' . $products_get_buy_now_qty . '" maxlength="6" size="4" aria-label="' . ARIA_QTY_ADD_TO_CART . '"><br>' . zen_get_products_quantity_min_units_display((int)$_GET['products_id']) . '<br>' . zen_draw_hidden_field('products_id', (int)$_GET['products_id']) . zen_image_submit(BUTTON_IMAGE_IN_CART, BUTTON_IN_CART_ALT);
}
$display_button = zen_get_buy_now_button($_GET['products_id'], $the_button);
?>
Expand Down Expand Up @@ -140,11 +140,12 @@
if ($flag_show_ask_a_question) {
?>
<!-- bof Ask a Question -->
<br />
<span id="productQuestions" class="biggerText">
<b><?php echo '<a href="' . zen_href_link(FILENAME_ASK_A_QUESTION, 'pid=' . $_GET['products_id'], 'SSL') . '">' . ASK_A_QUESTION . '</a>'; ?></b>
<br>
<span id="productQuestions" class="">
<?php echo '<a href="' . zen_href_link(FILENAME_ASK_A_QUESTION, 'pid=' . $_GET['products_id'], 'SSL') . '">' . zen_image_button(BUTTON_IMAGE_ASK_A_QUESTION, BUTTON_ASK_A_QUESTION_ALT, ' id="askAQuestionButton"') . '</a>'; ?>
</span>
<br class="clearBoth" />
<br class="clearBoth">
<br>
<!-- eof Ask a Question -->
<?php
}
Expand All @@ -156,7 +157,7 @@
?>
<?php
/**
* display the product atributes
* display the product attributes
*/
require($template->get_template_dir('/tpl_modules_attributes.php',DIR_WS_TEMPLATE, $current_page_base,'templates'). '/tpl_modules_attributes.php'); ?>
<?php
Expand Down Expand Up @@ -202,11 +203,11 @@
// if more than 0 reviews, then show reviews button; otherwise, show the "write review" button
if ($reviews->fields['count'] > 0 ) { ?>
<div id="productReviewLink" class="buttonRow back"><?php echo '<a href="' . zen_href_link(FILENAME_PRODUCT_REVIEWS, zen_get_all_get_params()) . '">' . zen_image_button(BUTTON_IMAGE_REVIEWS, BUTTON_REVIEWS_ALT) . '</a>'; ?></div>
<br class="clearBoth" />
<br class="clearBoth">
<p class="reviewCount"><?php echo ($flag_show_product_info_reviews_count == 1 ? TEXT_CURRENT_REVIEWS . ' ' . $reviews->fields['count'] : ''); ?></p>
<?php } else { ?>
<div id="productReviewLink" class="buttonRow back"><?php echo '<a href="' . zen_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, zen_get_all_get_params(array())) . '">' . zen_image_button(BUTTON_IMAGE_WRITE_REVIEW, BUTTON_WRITE_REVIEW_ALT) . '</a>'; ?></div>
<br class="clearBoth" />
<br class="clearBoth">
<?php
}
}
Expand Down Expand Up @@ -234,7 +235,7 @@

<!--bof Product URL -->
<?php
if (zen_not_null($products_url)) {
if (!empty($products_url)) {
if ($flag_show_product_info_url == 1) {
?>
<p id="productInfoLink" class="docProduct centeredContent"><?php echo sprintf(TEXT_MORE_INFORMATION, zen_href_link(FILENAME_REDIRECT, 'action=product&products_id=' . zen_output_string_protected($_GET['products_id']), 'NONSSL', true, false)); ?></p>
Expand Down

0 comments on commit 14e7292

Please sign in to comment.