changed release to 20240415 with latest fixes

zencartpro · Apr 15, 2024 · f1cbdc8 · f1cbdc8
1 parent a828013
commit f1cbdc8
Show file tree

Hide file tree

Showing 13 changed files with 220 additions and 17 deletions.
diff --git a/...ERTE DATEIEN/includes/templates/template_default/templates/tpl_ask_a_question_default.php b/...ERTE DATEIEN/includes/templates/template_default/templates/tpl_ask_a_question_default.php
@@ -71,8 +71,10 @@
 <?php echo zen_draw_input_field('telephone', ($telephone), ' size="20" id="telephone" autocomplete="off" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required', 'tel'); ?>
 <br class="clearBoth">
 
+<div class="contact">
 <label for="enquiry"><?php echo ENTRY_ENQUIRY; ?></label>
 <?php echo zen_draw_textarea_field('enquiry', '30', '7', $enquiry, 'id="enquiry" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required'); ?>
+</div>
 
 <div class="email-pot">
 <label for="email-us"></label>

diff --git a/...AENDERTE DATEIEN/includes/templates/template_default/templates/tpl_contact_us_default.php b/...AENDERTE DATEIEN/includes/templates/template_default/templates/tpl_contact_us_default.php
@@ -72,9 +72,12 @@
 <label class="inputLabel" for="telephone"><?php echo ENTRY_TELEPHONE_NUMBER; ?></label>
 <?php echo zen_draw_input_field('telephone', ($telephone), ' size="20" id="telephone" autocomplete="off"', 'tel'); ?>
 <br class="clearBoth">
+
+<div class="contact">
 <label for="enquiry"><?php echo ENTRY_ENQUIRY; ?></label>
 <?php echo zen_draw_textarea_field('enquiry', '30', '7', $enquiry, 'id="enquiry" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required'); ?>
-
+<div>
+
 <div class="email-pot">
 <label for="email-us"></label>
 <?php echo zen_draw_input_field(SPAM_TEST_TEXT, '', ' id="email-us" title="do not fill in!" placeholder="do not fill in!" autocomplete="off"', 'email'); ?>
@@ -92,4 +95,4 @@
   }
 ?>
 </form>
-</div>
+</div>
diff --git a/...UF-157h/3 - DATENBANKAKTUALISIERUNG/DEINADMIN/includes/init_includes/init_157h_update.php b/...UF-157h/3 - DATENBANKAKTUALISIERUNG/DEINADMIN/includes/init_includes/init_157h_update.php
@@ -5,7 +5,7 @@
 * @copyright Portions Copyright 2003 osCommerce
 * Zen Cart German Version - www.zen-cart-pro.at
 * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
-* @version $Id: init_157h_update.php 2024-04-08 08:12:51Z webchills $
+* @version $Id: init_157h_update.php 2024-04-15 06:55:51Z webchills $
 */
 
 if (!defined('IS_ADMIN_FLAG')) {
@@ -315,7 +315,7 @@
 // 
 //
 $db->Execute("REPLACE INTO product_type_layout_language (configuration_title , configuration_key , languages_id, configuration_description, last_modified, date_added) VALUES 
-('20240408', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());");
+('20240415', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());");
 
 // -----
 // Version History aktualisieren

diff --git a/...TE-VON-157-AUF-157h/PROFI - DATENBANKAKTUALISIERUNG VIA PHPMYADMIN/updatebefehle-157h.sql b/...TE-VON-157-AUF-157h/PROFI - DATENBANKAKTUALISIERUNG VIA PHPMYADMIN/updatebefehle-157h.sql
@@ -317,7 +317,7 @@ CREATE TABLE customers_to_groups (
 );
 
 REPLACE INTO product_type_layout_language (configuration_title , configuration_key , languages_id, configuration_description, last_modified, date_added) VALUES 
-('20240408', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());
+('20240415', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());
 
 
 ## Now set to new version

diff --git a/UPDATE-VON-157-AUF-157h/changelog-157h-versus-157.txt b/UPDATE-VON-157-AUF-157h/changelog-157h-versus-157.txt
@@ -54,7 +54,7 @@ Detaillierte Updateanleitung für das Update solch älterer Versionen:
 
 ---------------------------------------------------------------------------------------------
 Changelog Zen Cart 1.5.7g deutsch gegenüber 1.5.7 deutsch
-2024-04-08
+2024-04-15
 ---------------------------------------------------------------------------------------------
 
 ---------------------------------------------------------------------------------------------

diff --git a/...ERTE DATEIEN/includes/templates/template_default/templates/tpl_ask_a_question_default.php b/...ERTE DATEIEN/includes/templates/template_default/templates/tpl_ask_a_question_default.php
@@ -0,0 +1,98 @@
+<?php
+/** 
+ * Zen Cart German Specific (158 code in 157)
+ * @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_ask_a_question.php 2023-10-26 16:51:51Z webchills $
+ */
+?>
+<div class="centerColumn" id="askAQuestion">
+
+<?php echo zen_draw_form('ask_a_question', zen_href_link(FILENAME_ASK_A_QUESTION, 'action=send&pid=' . (int)$_GET['pid'], 'SSL')); ?>
+
+<?php if (CONTACT_US_STORE_NAME_ADDRESS== '1') { ?>
+<address><?php echo nl2br(STORE_NAME_ADDRESS); ?></address>
+<?php } ?>
+<h1><?php echo $heading_title . $product_details['products_name']; ?></h1>
+
+
+<?php
+  if (isset($_GET['action']) && ($_GET['action'] == 'success')) {
+?>
+
+<div class="mainContent success"><?php echo TEXT_SUCCESS; ?></div>
+
+<div class="buttonRow"><?php echo zen_back_link() . zen_image_button(BUTTON_IMAGE_BACK, BUTTON_BACK_ALT) . '</a>'; ?></div>
+
+<?php
+  } else {
+?>
+
+<?php echo '<a href="' . zen_href_link(zen_get_info_page((int)$_GET['pid']), 'products_id=' . (int)$_GET['pid'], 'SSL') . '">' . zen_image(DIR_WS_IMAGES . $product_details['products_image'], $product_details['products_name'], IMAGE_PRODUCT_LISTING_WIDTH, IMAGE_PRODUCT_LISTING_HEIGHT) . '</a>'; ?>
+
+<div id="contactUsNoticeContent" class="content">
+<?php
+/**
+ * require html_define for the contact_us page
+ */
+  require($define_page);
+?>
+</div>
+
+<?php if ($messageStack->size('contact') > 0) echo $messageStack->output('contact'); ?>
+
+<fieldset id="contactUsForm">
+<legend><?php echo $form_title; ?></legend>
+<div class="alert forward"><?php echo FORM_REQUIRED_INFORMATION; ?></div>
+<br class="clearBoth">
+
+<?php
+// show dropdown if set
+    if (!empty(CONTACT_US_LIST)){
+?>
+<label class="inputLabel" for="send-to"><?php echo SEND_TO_TEXT; ?></label>
+<?php echo zen_draw_pull_down_menu('send_to',  $send_to_array, 0, 'id="send-to"') . '<span class="alert">' . ENTRY_REQUIRED_SYMBOL . '</span>'; ?>
+<br class="clearBoth">
+<?php
+    }
+?>
+
+<label class="inputLabel" for="contactname"><?php echo ENTRY_NAME; ?></label>
+<?php echo zen_draw_input_field('contactname', $name, ' size="40" id="contactname" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" autofocus required'); ?>
+<br class="clearBoth">
+
+<label class="inputLabel" for="email-address"><?php echo ENTRY_EMAIL; ?></label>
+<?php echo zen_draw_input_field('email', ($email_address), ' size="40" id="email-address" autocomplete="off" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required', 'email'); ?>
+<br class="clearBoth">
+
+<label class="inputLabel" for="telephone"><?php echo ENTRY_TELEPHONE; ?></label>
+<?php echo zen_draw_input_field('telephone', ($telephone), ' size="20" id="telephone" autocomplete="off" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required', 'tel'); ?>
+<br class="clearBoth">
+
+<div class="contact">
+<label for="enquiry"><?php echo ENTRY_ENQUIRY; ?></label>
+<?php echo zen_draw_textarea_field('enquiry', '30', '7', $enquiry, 'id="enquiry" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required'); ?>
+</div>
+
+<div class="email-pot">
+<label for="email-us"></label>
+<?php echo zen_draw_input_field(SPAM_TEST_TEXT, '', ' id="email-us" title="do not fill in!" placeholder="do not fill in!" autocomplete="off"', 'email'); ?>
+</div>
+
+<div class="email-pot">
+<p><?php echo HUMAN_TEXT_NOT_DISPLAYED; ?></p>
+<?php echo zen_draw_radio_field(SPAM_TEST_USER, 'H1', '', 'id="user-1"') . '<span class="input-group-addon"><i class="fa fa-male fa-2x"></i></span>' . zen_draw_radio_field(SPAM_TEST_USER, 'C2', '', 'id="user-2"') . '<span class="input-group-addon"><i class="fa fa-laptop fa-2x"></i></span>'; ?>
+</div>
+
+</fieldset>
+
+<div class="buttonRow forward"><?php echo zen_image_submit(BUTTON_IMAGE_SEND, BUTTON_SEND_ALT); ?></div>
+<div class="buttonRow back"><?php echo zen_back_link() . zen_image_button(BUTTON_IMAGE_BACK, BUTTON_BACK_ALT) . '</a>'; ?></div>
+<?php
+  }
+?>
+</form>
+</div>
+
diff --git a/...AENDERTE DATEIEN/includes/templates/template_default/templates/tpl_contact_us_default.php b/...AENDERTE DATEIEN/includes/templates/template_default/templates/tpl_contact_us_default.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Page Template
+ * Zen Cart German Specific (158 code in 157 / zencartpro adaptations)
+ * Loaded automatically by index.php?main_page=contact_us.
+ * Displays contact us page form.
+ *
+ * @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_contact_us_default.php 2023-10-26 16:49:16Z webchills $
+ */
+?>
+<div class="centerColumn" id="contactUsDefault">
+
+<?php echo zen_draw_form('contact_us', zen_href_link(FILENAME_CONTACT_US, 'action=send', 'SSL')); ?>
+
+<?php if (CONTACT_US_STORE_NAME_ADDRESS== '1') { ?>
+<address><?php echo nl2br(STORE_NAME_ADDRESS, false); ?></address>
+<?php } ?>
+
+<?php
+  if (isset($_GET['action']) && ($_GET['action'] == 'success')) {
+?>
+
+<div class="mainContent success"><?php echo TEXT_SUCCESS; ?></div>
+
+<div class="buttonRow"><?php echo zen_back_link() . zen_image_button(BUTTON_IMAGE_BACK, BUTTON_BACK_ALT) . '</a>'; ?></div>
+
+<?php
+  } else {
+?>
+
+<?php if (DEFINE_CONTACT_US_STATUS >= '1' and DEFINE_CONTACT_US_STATUS <= '2') { ?>
+<div id="contactUsNoticeContent" class="content">
+<?php
+/**
+ * require html_define for the contact_us page
+ */
+  require($define_page);
+?>
+</div>
+<?php } ?>
+
+<?php if ($messageStack->size('contact') > 0) echo $messageStack->output('contact'); ?>
+
+<fieldset id="contactUsForm">
+<legend><?php echo HEADING_TITLE; ?></legend>
+<div class="alert forward"><?php echo FORM_REQUIRED_INFORMATION; ?></div>
+<br class="clearBoth">
+
+<?php
+// show dropdown if set
+    if (CONTACT_US_LIST !== '') {
+?>
+<label class="inputLabel" for="send-to"><?php echo SEND_TO_TEXT; ?></label>
+<?php echo zen_draw_pull_down_menu('send_to',  $send_to_array, $send_to_default, 'id="send-to" required size="' . count($send_to_array) . '"') . '<span class="alert">' . ENTRY_REQUIRED_SYMBOL . '</span>'; ?>
+<br class="clearBoth">
+<?php
+    }
+?>
+
+<label class="inputLabel" for="contactname"><?php echo ENTRY_NAME; ?></label>
+<?php echo zen_draw_input_field('contactname', $name, ' size="40" id="contactname" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required'); ?>
+<br class="clearBoth">
+
+<label class="inputLabel" for="email-address"><?php echo ENTRY_EMAIL; ?></label>
+<?php echo zen_draw_input_field('email', ($email_address), ' size="40" id="email-address" autocomplete="off" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required', 'email'); ?>
+<br class="clearBoth">
+
+<label class="inputLabel" for="telephone"><?php echo ENTRY_TELEPHONE_NUMBER; ?></label>
+<?php echo zen_draw_input_field('telephone', ($telephone), ' size="20" id="telephone" autocomplete="off"', 'tel'); ?>
+<br class="clearBoth">
+
+<div class="contact">
+<label for="enquiry"><?php echo ENTRY_ENQUIRY; ?></label>
+<?php echo zen_draw_textarea_field('enquiry', '30', '7', $enquiry, 'id="enquiry" placeholder="' . ENTRY_REQUIRED_SYMBOL . '" required'); ?>
+<div>
+
+<div class="email-pot">
+<label for="email-us"></label>
+<?php echo zen_draw_input_field(SPAM_TEST_TEXT, '', ' id="email-us" title="do not fill in!" placeholder="do not fill in!" autocomplete="off"', 'email'); ?>
+</div>
+
+<div class="email-pot">
+<p><?php echo HUMAN_TEXT_NOT_DISPLAYED; ?></p>
+<?php echo zen_draw_radio_field(SPAM_TEST_USER, 'H1', '', 'id="user-1"') . '<span class="input-group-addon"><i class="fa fa-male fa-2x"></i></span>' . zen_draw_radio_field(SPAM_TEST_USER, 'C2', '', 'id="user-2"') . '<span class="input-group-addon"><i class="fa fa-laptop fa-2x"></i></span>'; ?>
+</div>
+</fieldset>
+
+<div class="buttonRow forward"><?php echo zen_image_submit(BUTTON_IMAGE_SEND, BUTTON_SEND_ALT); ?></div>
+<div class="buttonRow back"><?php echo zen_back_link() . zen_image_button(BUTTON_IMAGE_BACK, BUTTON_BACK_ALT) . '</a>'; ?></div>
+<?php
+  }
+?>
+</form>
+</div>
diff --git a/...UF-157h/3 - DATENBANKAKTUALISIERUNG/DEINADMIN/includes/init_includes/init_157h_update.php b/...UF-157h/3 - DATENBANKAKTUALISIERUNG/DEINADMIN/includes/init_includes/init_157h_update.php
@@ -5,7 +5,7 @@
 * @copyright Portions Copyright 2003 osCommerce
 * Zen Cart German Version - www.zen-cart-pro.at
 * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
-* @version $Id: init_157h_update.php 2024-04-08 08:49:51Z webchills $
+* @version $Id: init_157h_update.php 2024-04-15 06:58:51Z webchills $
 */
 
 if (!defined('IS_ADMIN_FLAG')) {
@@ -96,7 +96,7 @@
 // 
 //
 $db->Execute("REPLACE INTO product_type_layout_language (configuration_title , configuration_key , languages_id, configuration_description, last_modified, date_added) VALUES 
-('20240408', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());");
+('20240415', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());");
 
 // -----
 // Version History aktualisieren

diff --git a/UPDATE-VON-157g-AUF-157h/changelog-157h-versus-157g.txt b/UPDATE-VON-157g-AUF-157h/changelog-157h-versus-157g.txt
@@ -23,7 +23,7 @@ Verbesserungen:
 
 ---------------------------------------------------------------------------------------------
 Changelog Zen Cart 1.5.7h deutsch gegenüber 1.5.7g deutsch
-2024-04-08
+2024-04-15
 ---------------------------------------------------------------------------------------------
 
 ---------------------------------------------------------------------------------------------
@@ -170,6 +170,8 @@ includes\templates\template_default\sideboxes\tpl_currencies.php
 includes\templates\template_default\sideboxes\tpl_manufacturers_select.php
 includes\templates\template_default\shopvote\shopvote_badge_and_reviews.php
 includes\templates\template_default\templates\tpl_ajax_checkout_confirmation_default.php
+includes\templates\template_default\templates\tpl_ask_a_question_default.php
+includes\templates\template_default\templates\tpl_contact_us_default.php
 includes\templates\template_default\templates\tpl_modules_products_all_listing.php
 includes\templates\template_default\templates\tpl_modules_products_featured_listing.php
 includes\templates\template_default\templates\tpl_modules_products_new_listing.php

diff --git a/UPLOAD/install.txt b/UPLOAD/install.txt
@@ -1,13 +1,13 @@
 Zen Cart 1.5.7h deutsch 
 
-Version vom 08.04.2024
+Version vom 15.04.2024
 
 #####################################################################################################################################
 
 1.5.7h deutsch ist ein sehr umfangreicher Service Pack für 1.5.7 deutsch
 Es integriert die fast vollständige Codebasis der aktuellen amerikanischen Version 1.5.8 und ein Großteil der amerikanischen Version 2.0.0 in die deutsche Zen Cart Version 1.5.7.
 Damit wird PHP 8.2.x vollständig unterstützt.
-Die integrierten Module und 3rd Party Komponenten werden auf den Stand von März 2024 gebracht.
+Die integrierten Module und 3rd Party Komponenten werden auf den Stand von April 2024 gebracht.
 
 Die Umstellung der Sprachdateien, die die amerikanische Version 1.5.8 bereits mitbringt, wird in einer für Herbst 2024 geplanten deutschen Zen Cart Version 2.0.0 mit vollständiger PHP 8.3/8.4 Unterstützung nachgezogen.
 Dadurch kann in 1.5.7h weiterhin mit den gewohnten Sprachdefinitionen gearbeitet werden. 

diff --git a/UPLOAD/zc_install/sql/install/mysql_zencart.sql b/UPLOAD/zc_install/sql/install/mysql_zencart.sql
@@ -6,7 +6,7 @@
 # * 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: mysql_zencart.sql 2024-04-08 08:05:16Z webchills $
+# * @version $Id: mysql_zencart.sql 2024-04-15 06:55:16Z webchills $
 #
 
 ############ IMPORTANT INSTRUCTIONS ###############
@@ -5369,5 +5369,5 @@ INSERT INTO configuration_language (configuration_title, configuration_key, conf
 
 
 REPLACE INTO product_type_layout_language (configuration_title , configuration_key , languages_id, configuration_description, last_modified, date_added)
-VALUES ('20240408', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Übersetzungen', now(), now());
+VALUES ('20240415', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Übersetzungen', now(), now());
 ##### End of SQL setup for Zen Cart German.
diff --git a/UPLOAD/zc_install/sql/updates/mysql_upgrade_zencart_157.sql b/UPLOAD/zc_install/sql/updates/mysql_upgrade_zencart_157.sql
@@ -7,7 +7,7 @@
 # * 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: mysql_upgrade_zencart_157.sql 2024-04-08 08:06:59Z webchills $
+# * @version $Id: mysql_upgrade_zencart_157.sql 2024-04-15 06:55:59Z webchills $
 #
 
 ############ IMPORTANT INSTRUCTIONS ###############
@@ -1531,7 +1531,7 @@ INSERT INTO product_type_layout_language (configuration_title, configuration_key
 #############
 
 REPLACE INTO product_type_layout_language (configuration_title , configuration_key , languages_id, configuration_description, last_modified, date_added) VALUES 
-('20240408', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());
+('20240415', 'LANGUAGE_VERSION', '43', 'Datum der deutschen Uebersetzungen', now(), now());
 
 #############
 

diff --git a/liesmich.txt b/liesmich.txt
@@ -1,13 +1,13 @@
 Zen Cart 1.5.7h deutsch 
 
-Version vom 08.04.2024
+Version vom 15.04.2024
 
 #####################################################################################################################################
 
 1.5.7h deutsch ist ein sehr umfangreicher Service Pack für 1.5.7 deutsch
 Es integriert die fast vollständige Codebasis der aktuellen amerikanischen Version 1.5.8 und ein Großteil der amerikanischen Version 2.0.0 in die deutsche Zen Cart Version 1.5.7.
 Damit wird PHP 8.2.x vollständig unterstützt.
-Die integrierten Module und 3rd Party Komponenten werden auf den Stand von März 2024 gebracht.
+Die integrierten Module und 3rd Party Komponenten werden auf den Stand von April 2024 gebracht.
 
 Die Umstellung der Sprachdateien, die die amerikanische Version 1.5.8 bereits mitbringt, wird in einer für Herbst 2024 geplanten deutschen Zen Cart Version 2.0.0 mit vollständiger PHP 8.3/8.4 Unterstützung nachgezogen.
 Dadurch kann in 1.5.7h weiterhin mit den gewohnten Sprachdefinitionen gearbeitet werden.
-Original file line number
+Diff line change
@@ Expand Up @@
     ---------------------------------------------------------------------------------------------
     Changelog Zen Cart 1.5.7g deutsch gegenüber 1.5.7 deutsch
--04-08
+-04-15
     ---------------------------------------------------------------------------------------------
     ---------------------------------------------------------------------------------------------
@@ Expand Down @@