Ticket #1659: Datenschutz Checkbox Überarbeitung.patch

File Datenschutz Checkbox Überarbeitung.patch, 54.0 KB (added by Torsten Riemer, 6 years ago)
  • _installer/includes/sql/modified.sql

     
    14651465INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'ACCOUNT_OPTIONS', 'account', 5, 100, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'account\', \'guest\', \'both\'),');
    14661466INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DELETE_GUEST_ACCOUNT', 'true', 5, 110, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    14671467INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'GUEST_ACCOUNT_EDIT', 'false', 5, 120, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    1468 INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_PRIVACY_CHECK', 'true', 5, 130, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
     1468INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_PRIVACY_CHECK', 'false', 5, 130, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    14691469
    14701470# configuration_group_id 6, Module Options
    14711471INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'MODULE_PAYMENT_INSTALLED', '', 6, 0, NULL, NOW(), NULL, NULL);
     
    16791679INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'NEW_SIGNUP_GIFT_VOUCHER_AMOUNT', '0', 17, 4, NULL, NOW(), NULL, NULL);
    16801680INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'NEW_SIGNUP_DISCOUNT_COUPON', '', 17, 5, NULL, NOW(), NULL, NULL);
    16811681INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'ACTIVATE_SHIPPING_STATUS', 'true', 17, 6, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    1682 INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_CONDITIONS_ON_CHECKOUT', 'false', 17, 7, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
     1682INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_CONDITIONS_ON_CHECKOUT', 'true', 17, 7, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
     1683INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'SIGN_CONDITIONS_ON_CHECKOUT', 'false', 17, 7, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16831684INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'SHOW_IP_LOG', 'false', 17, 8, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16841685INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'SAVE_IP_LOG', 'false', 17, 8, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\', \'xxx\'),');
    16851686INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_HEADQUARTER_ON_CHECKOUT', 'true', 17, 8, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
     
    16881689INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'ACTIVATE_NAVIGATOR', 'false', 17, 10, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16891690INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'QUICKLINK_ACTIVATED', 'true', 17, 11, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16901691INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'ACTIVATE_REVERSE_CROSS_SELLING', 'true', 17, 12, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    1691 INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_PRIVACY_ON_CHECKOUT', 'true', 17, 12, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
     1692INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_PRIVACY_ON_CHECKOUT', 'false', 17, 12, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16921693INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_REVOCATION_ON_CHECKOUT', 'true', 17, 13, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16931694INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT', 'false', 17, 13, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16941695INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'REVOCATION_ID', '9', 17, 14, NULL, NOW(), NULL, 'xtc_cfg_select_content(\'REVOCATION_ID\',');
  • admin/includes/configuration_installer.php

     
    322322  $values[] = "(NULL, 'MODULE_NEWSLETTER_VOUCHER_AMOUNT', '0', '17', '20', NULL, NOW(), NULL, NULL);";
    323323  $values[] = "(NULL, 'MODULE_NEWSLETTER_DISCOUNT_COUPON', '', '17', '21', NULL, NOW(), NULL, NULL);";
    324324  $values[] = "(NULL, 'DISPLAY_HEADQUARTER_ON_CHECKOUT', 'true', '17', '8', NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'), ');";
     325  $values[] = "(NULL, 'SIGN_CONDITIONS_ON_CHECKOUT', 'false', '17', '7', NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'), ');";
    325326
    326327  $values_update[] = array (
    327328                           'values' => "set_function = 'xtc_cfg_select_content(\'REVOCATION_ID\','",
  • checkout_confirmation.php

     
    5454}
    5555
    5656// if conditions are not accepted, redirect the customer to the payment method selection page
    57 if (DISPLAY_CONDITIONS_ON_CHECKOUT == 'true') {
     57if (SIGN_CONDITIONS_ON_CHECKOUT == 'true') {
    5858  if ((!isset($_POST['conditions']) || $_POST['conditions'] == false) && !isset($_GET['conditions'])) {
    5959    $error = str_replace('\n', '<br />', ERROR_CONDITIONS_NOT_ACCEPTED);
    6060    xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
  • checkout_payment.php

     
    256256  $shop_content_data = $main->getContentData(3);
    257257  $smarty->assign('AGB', '<div class="agbframe">' . $shop_content_data['content_text'] . '</div>');
    258258  $smarty->assign('AGB_LINK', $main->getContentLink(3, MORE_INFO,'SSL'));
     259}
     260//check if sign conditions on checkout page is true
     261if (SIGN_CONDITIONS_ON_CHECKOUT == 'true') {
    259262  $smarty->assign('AGB_checkbox', '<input type="checkbox" value="conditions" name="conditions" id="conditions"'.(isset($_GET['step']) && $_GET['step'] == 'step2' ? ' checked="checked"' : '').' />');
    260263}
    261264
  • create_account.php

     
    636636}
    637637if (DISPLAY_PRIVACY_CHECK == 'true') {
    638638  $smarty->assign('PRIVACY_CHECKBOX', xtc_draw_checkbox_field('privacy', 'privacy', $privacy, 'id="privacy"'));
    639   $smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    640639}
     640$smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    641641$smarty->assign('FORM_END', '</form>');
    642642$smarty->assign('language', $_SESSION['language']);
    643643$smarty->assign('BUTTON_SUBMIT', xtc_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE));
  • create_guest_account.php

     
    484484}
    485485if (DISPLAY_PRIVACY_CHECK == 'true') {
    486486  $smarty->assign('PRIVACY_CHECKBOX', xtc_draw_checkbox_field('privacy', 'privacy', $privacy, 'id="privacy"'));
    487   $smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    488487}
     488$smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    489489$smarty->assign('FORM_END', '</form>');
    490490$smarty->assign('language', $_SESSION['language']);
    491491$smarty->assign('BUTTON_SUBMIT', xtc_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE));
  • lang/english/admin/configuration.php

     
    465465define('SESSION_RECREATE_DESC' , 'Recreate the session to generate a new session ID when a customer logs on or creates an account (PHP >=4.1 needed). (Default &quot;false&quot;)'.SESSION_WARNING);
    466466
    467467define('DISPLAY_CONDITIONS_ON_CHECKOUT_TITLE' , 'Display Conditions on Checkout');
    468 define('DISPLAY_CONDITIONS_ON_CHECKOUT_DESC' , 'Display terms and conditions and request approval on checkout');
     468define('DISPLAY_CONDITIONS_ON_CHECKOUT_DESC' , 'Display terms and conditions on checkout');
     469define('SIGN_CONDITIONS_ON_CHECKOUT_TITLE' , 'Sign Conditions on Checkout');
     470define('SIGN_CONDITIONS_ON_CHECKOUT_DESC' , 'Request approval of terms and conditions and on checkout');
    469471
    470472define('META_MIN_KEYWORD_LENGTH_TITLE' , 'Min. Meta-Keyword Length');
    471473define('META_MIN_KEYWORD_LENGTH_DESC' , 'min. length of a single keyword (generated from products description)');
     
    610612define('REVOCATION_ID_TITLE','Revocation');
    611613define('REVOCATION_ID_DESC','Select content to display revocation');
    612614define('DISPLAY_REVOCATION_ON_CHECKOUT_TITLE','Display right of revocation?');
    613 define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Display right of revocation on checkout_confirmation?<br/><b>Attention:</b>Display Conditions on Checkout must be enabled.');
     615define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Display right of revocation on checkout_confirmation?<br/><b>Attention:</b> "Sign Conditions on Checkout" must be enabled.');
    614616
    615617// BOF - Tomcraft - 2009-10-03 - Paypal Express Modul
    616618define('PAYPAL_MODE_TITLE','PayPal Mode:');
     
    10101012define('CHECK_CHEAPEST_SHIPPING_MODUL_DESC', 'Shall the cheapest shipping method be preselected in checkout for the customer?');
    10111013
    10121014define('DISPLAY_PRIVACY_CHECK_TITLE', 'Show privacy checkbox');
    1013 define('DISPLAY_PRIVACY_CHECK_DESC', 'Shall the privacy checkbox be displayed during account creation? (Obligation for B2C businesses)');
     1015define('DISPLAY_PRIVACY_CHECK_DESC', 'Shall the privacy checkbox be displayed during account creation?)');
    10141016
    10151017define('SHOW_SELFPICKUP_FREE_TITLE', 'Shipping module "Self Pickup" on "free shipping"');
    10161018define('SHOW_SELFPICKUP_FREE_DESC', 'Shall the shipping module "Self Pickup (selfpickup)" be displayed upon reaching the amount for "free shipping" in module "Shipping (ot_shipping)"?');
  • lang/english/lang_english.conf

     
    4343heading_personal = 'Your data'
    4444heading_text = 'Our newsletter'
    4545text_email = 'Your e-mail address'
    46 text_in = 'subscribe to our newsletter'
     46text_in = 'I would like to receive interesting offers by e-mail. My e-mail address will not be shared with other companies. This consent to use my e-mail address for advertising purposes can be revoked at any time with effect for the future.'
    4747text_zusatz = 'I would like to receive interesting offers by e-mail. My e-mail address will not be shared with other companies. This consent to use my e-mail address for advertising purposes can be revoked at any time with effect for the future.'
    48 text_out = 'cancel newsletter subscription'
     48text_out = 'Cancel newsletter subscription'
    4949text_sec_code = 'Security code'
    5050text_inp_code = 'Enter here'
    5151
     
    234234text_contact_us = 'How to reach us'
    235235text_thanks = 'Thank you'
    236236text_data = 'Your data'
     237text_privacy_accept = 'I have read the Privacy Policy note. I agree that my details and data will be collected and stored electronically to answer my request. Note: You can revoke your consent at any time for the future by e-mailing %s.'
    237238
    238239#logout
    239240[logoff]
     
    275276text_password = 'Your password:'
    276277text_confirmation = 'Confirm password:'
    277278text_must = '* necessary information '
    278 text_privacy_accept = 'I have read the privacy policy.'
     279#text_privacy_accept = 'I have read the privacy policy.'
     280text_privacy_accept = 'Please note our privacy policy.'
    279281text_password_policy = 'A secure password should be %s characters in length and should include uppercase and lowercase letters and numbers and special characters.'
    280282text_sec_code = 'Security code'
    281283text_inp_code = 'Enter here'
     
    367369title_comments_short = 'Your comments'
    368370text_accept_revocation = 'I confirm that the right of withdrawal expires for virtual products.'
    369371text_nopayment = 'Please confirm that you have read our general terms and conditions as well as our conditions of delivery and proceed with the order.'
    370 text_privacy_accept = 'I have read the privacy policy.'
     372#text_privacy_accept = 'I have read the privacy policy.'
     373text_privacy_accept = 'Please note our privacy policy.'
    371374
    372375# Selection of Dispatch options
    373376[checkout_shipping]
  • lang/german/admin/configuration.php

     
    463463define('SESSION_RECREATE_TITLE' , 'Session erneuern');
    464464define('SESSION_RECREATE_DESC' , 'Erneuern der Session und Zuweisung einer neuen Session-ID sobald sich ein Benutzer einloggt oder registriert (PHP >=4.1 needed). (Standard &quot;false&quot;)'.SESSION_WARNING);
    465465
    466 define('DISPLAY_CONDITIONS_ON_CHECKOUT_TITLE' , 'Unterzeichnen der AGB');
    467 define('DISPLAY_CONDITIONS_ON_CHECKOUT_DESC' , 'Anzeigen und Unterzeichnen der AGB beim Bestellvorgang.');
     466define('DISPLAY_CONDITIONS_ON_CHECKOUT_TITLE' , 'Anzeigen der AGB');
     467define('DISPLAY_CONDITIONS_ON_CHECKOUT_DESC' , 'Anzeigen der AGB beim Bestellvorgang.');
     468define('SIGN_CONDITIONS_ON_CHECKOUT_TITLE' , 'Unterzeichnen der AGB');
     469define('SIGN_CONDITIONS_ON_CHECKOUT_DESC' , 'Unterzeichnen der AGB beim Bestellvorgang.');
    468470
    469471define('META_MIN_KEYWORD_LENGTH_TITLE' , 'Minimum L&auml;nge Meta-Keywords');
    470472define('META_MIN_KEYWORD_LENGTH_DESC' , 'Minimum L&auml;nge der automatisch erzeugten Meta-Keywords (Artikelbeschreibung)');
     
    609611define('REVOCATION_ID_TITLE','Widerrufsrecht');
    610612define('REVOCATION_ID_DESC','W&auml;hle den Content zur Anzeige des Widerrufsrechts.');
    611613define('DISPLAY_REVOCATION_ON_CHECKOUT_TITLE','Anzeige Widerrufsrecht?');
    612 define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Widerrufsrecht auf checkout_confirmation anzeigen?<br/><b>Hinweis:</b> Anzeigen und Unterzeichnen der AGB muss aktiv sein.');
     614define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Widerrufsrecht auf checkout_confirmation anzeigen?<br/><b>Hinweis:</b> "Unterzeichnen der AGB" muss aktiv sein.');
    613615
    614616// BOF - Tomcraft - 2009-10-03 - Paypal Express Modul
    615617define('PAYPAL_MODE_TITLE','PayPal-Modus:');
     
    10021004define('CHECK_CHEAPEST_SHIPPING_MODUL_DESC', 'Soll im Checkout die kosteng&uuml;nstigste Versandart f&uuml;r den Kunden vorausgew&auml;hlt werden?');
    10031005
    10041006define('DISPLAY_PRIVACY_CHECK_TITLE', 'Privatsph&auml;re Checkbox anzeigen');
    1005 define('DISPLAY_PRIVACY_CHECK_DESC', 'Soll w&auml;hrend der Konto-Erstellung die Privatsph&auml;re-Checkbox angezeigt werden? (Bei B2C-Gesch&auml;ften Pflicht!)');
     1007define('DISPLAY_PRIVACY_CHECK_DESC', 'Soll w&auml;hrend der Konto-Erstellung die Privatsph&auml;re-Checkbox angezeigt werden?');
    10061008
    10071009define('SHOW_SELFPICKUP_FREE_TITLE', 'Versandmodul "Selbstabholung" bei "versandkostenfrei"');
    10081010define('SHOW_SELFPICKUP_FREE_DESC', 'Soll das Versandmodul "Selbstabholung (selfpickup)" bei Erreichen des im Modul "Versandkosten (ot_shiping)" eingestellten Betrages f&uuml;r "versandkostenfrei" angezeigt werden?');
  • lang/german/lang_german.conf

     
    4343heading_personal = 'Ihre Daten'
    4444heading_text = 'Unser Newsletter'
    4545text_email = 'Ihre E-Mail-Adresse'
    46 text_in = 'Ich m&ouml;chte den Newsletter abonnieren (Abmeldung jederzeit m&ouml;glich).'
     46text_in = 'Ich m&ouml;chte regelm&auml;&szlig;ig interessante Angebote per E-Mail erhalten. Meine E-Mail-Adresse wird nicht an andere Unternehmen weitergegeben. Diese Einwilligung zur Nutzung meiner E-Mail-Adresse f&uuml;r Werbezwecke kann ich jederzeit mit Wirkung f&uuml;r die Zukunft widerrufen.'
    4747text_zusatz = 'Ich m&ouml;chte regelm&auml;&szlig;ig interessante Angebote per E-Mail erhalten. Meine E-Mail-Adresse wird nicht an andere Unternehmen weitergegeben. Diese Einwilligung zur Nutzung meiner E-Mail-Adresse f&uuml;r Werbezwecke kann ich jederzeit mit Wirkung f&uuml;r die Zukunft widerrufen.'
    48 text_out = 'austragen'
     48text_out = 'Vom Newsletter abmelden'
    4949text_sec_code = 'Sicherheitscode'
    5050text_inp_code = 'Hier eingeben'
    5151
     
    233233text_contact_us = 'So erreichen Sie uns'
    234234text_thanks = 'Vielen Dank'
    235235text_data = 'Ihre Daten'
     236text_privacy_accept = 'Ich habe die Datenschutzerkl&auml;rung zur Kenntnis genommen. Ich stimme zu, dass meine Angaben und Daten zur Beantwortung meiner Anfrage elektronisch erhoben und gespeichert werden. Hinweis: Sie k&ouml;nnen Ihre Einwilligung jederzeit f&uuml;r die Zukunft per E-Mail an %s widerrufen.'
    236237
    237238#abmelden
    238239[logoff]
     
    273274text_password = 'Ihr Passwort:'
    274275text_confirmation = 'Passwort best&auml;tigen'
    275276text_must = '* notwendige Informationen'
    276 text_privacy_accept = 'Ich habe die Datenschutzrichtlinien zur Kenntnis genommen.'
     277#text_privacy_accept = 'Ich habe die Datenschutzerkl&auml;rung zur Kenntnis genommen.'
     278text_privacy_accept = 'Bitte beachten Sie unsere Datenschutzerkl&auml;rung.'
    277279text_password_policy = 'Ein sicheres Passwort muss mindestens %s Zeichen lang sein und sollte neben Gro&szlig;- und Kleinbuchstaben auch Zahlen sowie Sonderzeichen enthalten.'
    278280text_sec_code = 'Sicherheitscode'
    279281text_inp_code = 'Hier eingeben'
     
    366368title_comments_short = 'Ihre Anmerkungen'
    367369text_accept_revocation = 'Hiermit nehme ich zur Kenntnis, dass das Widerrufsrecht bei digitalen Artikeln erlischt.'
    368370text_nopayment = 'Sie m&uuml;ssen nun lediglich unsere AGB zur Kenntnis nehmen und den Bestellprozess mit Weiter fortsetzen'
    369 text_privacy_accept = 'Ich habe die Datenschutzrichtlinien zur Kenntnis genommen.'
     371#text_privacy_accept = 'Ich habe die Datenschutzrichtlinien zur Kenntnis genommen.'
     372text_privacy_accept = 'Bitte beachten Sie unsere Datenschutzerkl&auml;rung.'
    370373
    371374# Auswahl der Versandart
    372375[checkout_shipping]
  • media/content/contact_us.php

     
    7878      $error = true;
    7979    }
    8080
    81     if (DISPLAY_PRIVACY_CHECK == 'true' && empty($privacy)) {
     81    //if (DISPLAY_PRIVACY_CHECK == 'true' && empty($privacy)) {
    8282      $messageStack->add('contact_us', ENTRY_PRIVACY_ERROR);
    8383      $error = true;
    84     }
     84    //}
    8585
    8686    if (check_secure_form($_POST) === false) {
    8787      $messageStack->add('contact_us', ENTRY_TOKEN_ERROR);
     
    214214      $smarty->assign('VVIMG', $mod_captcha->get_image_code());
    215215      $smarty->assign('INPUT_CODE', $mod_captcha->get_input_code());
    216216    }
    217     if (DISPLAY_PRIVACY_CHECK == 'true') {
     217    //if (DISPLAY_PRIVACY_CHECK == 'true') {
    218218      $smarty->assign('PRIVACY_CHECKBOX', xtc_draw_checkbox_field('privacy', 'privacy', $privacy, 'id="privacy"'));
    219       $smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    220     }
     219    //}
     220    $smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    221221    $smarty->assign('INPUT_NAME', xtc_draw_input_field('name', ((isset($name)) ? $name : ''), 'size="30"'));
    222222    $smarty->assign('INPUT_EMAIL', xtc_draw_input_field('email', ((isset($email)) ? $email : ''), 'size="30"'));
    223223    $smarty->assign('INPUT_PHONE', xtc_draw_input_field('phone', ((isset($phone)) ? $phone : ''), 'size="30"'));
  • newsletter.php

     
    131131$smarty->assign('FORM_END', '</form>');
    132132if (DISPLAY_PRIVACY_CHECK == 'true') {
    133133  $smarty->assign('PRIVACY_CHECKBOX', xtc_draw_checkbox_field('privacy', 'privacy', $privacy, 'id="privacy"'));
    134   $smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    135134}
    136 
     135$smarty->assign('PRIVACY_LINK', $main->getContentLink(2, MORE_INFO, $request_type));
    137136$smarty->assign('language', $_SESSION['language']);
    138137$smarty->caching = 0;
    139138$main_content = $smarty->fetch(CURRENT_TEMPLATE.'/module/newsletter.html');
  • templates/tpl_modified/mail/english/newsletter_mail.html

     
    1414      <font size="2" face="Tahoma, Verdana, sans-serif"><b>Thank you for subscribing!</b><br />
    1515                        <br />
    1616                        {if isset($LINK)}
     17                        You receive this e-mail because you want to receive our newsletter.<br />
     18                        <br />
    1719      Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!<br />
    1820      <br />
    1921      <b>Your activation link:</b><br />
    2022      <a href="{$LINK}">{$LINK}</a><br />
     23      <br />
     24      If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.<br />
     25      <br />
     26      Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.<br />
    2127      {/if}
    2228
    2329      {if $SEND_GIFT == true}
  • templates/tpl_modified/mail/english/newsletter_mail.txt

     
    22Thank you for subscribing!
    33
    44{if isset($LINK)}
     5You receive this e-mail because you want to receive our newsletter.
     6
    57Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!
    68
    79Your activation link:
    810{$LINK}
     11
     12If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.
     13
     14Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.
    915{/if}
    1016
    1117{if $SEND_GIFT == true}
  • templates/tpl_modified/mail/german/newsletter_mail.html

     
    1616                        {if isset($LINK)}
    1717      Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen m&ouml;chten.<br />
    1818      <br />
    19       Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.
     19      Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.<br />
     20      <br />
     21      <b>Ihr Aktivierungslink:</b><br />
     22      <a href="{$LINK}">{$LINK}</a><br />
     23      <br />
    2024      Sollten Sie sich nicht f&uuml;r unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht w&uuml;nschen, bitten wir Sie,
    2125      den Aktivierungslink einfach zu ignorieren.<br />
    2226      <br />
    23       <b>Ihr Aktivierungslink:</b><br />
    24       <a href="{$LINK}">{$LINK}</a><br />
     27      Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerkl&auml;rung.<br />
    2528      {/if}
    2629     
    2730      {if $SEND_GIFT == true}
  • templates/tpl_modified/mail/german/newsletter_mail.txt

     
    33
    44{if isset($LINK)}
    55Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen möchten.
     6
    67Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse für den Newsletterempfang freigeschaltet wird.
    78
     9Ihr Aktivierungslink:
     10{$LINK}
     11
    812Sollten Sie sich nicht für unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht wünschen,
    913bitten wir Sie, den Aktivierungslink einfach zu ignorieren.
    10      
    11 Ihr Aktivierungslink:
    12 {$LINK}
     14
     15Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerklärung.
    1316{/if}
    1417
    1518{if $SEND_GIFT == true}
  • templates/tpl_modified/module/checkout_payment.html

     
    7070        </div>
    7171      </div>
    7272      <div class="checkoutconditions">
     73      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     74        {if $smarty.const.SIGN_CONDITIONS_ON_CHECKOUT == 'true'}{$AGB_checkbox} {/if}<strong><label for="conditions">{#text_accept_agb#}</label></strong>&nbsp;{$AGB_LINK}
     75      {else}
    7376        {$AGB_checkbox} <strong><label for="conditions">{#text_accept_agb#}</label></strong>&nbsp;{$AGB_LINK}
     77      {/if}
    7478      </div>
    7579      {if isset($PRIVACY_checkbox)}
    7680        <div class="checkoutconditions">
  • templates/tpl_modified/module/contact_us.html

     
    5252          <td><span class="fieldtext">{#text_message#}</span><span class="stern">{$INPUT_TEXT}<span class="inputRequirement_textarea"> *</span></span></td>
    5353        </tr>
    5454      </table>   
    55       {if $PRIVACY_CHECKBOX}
    56       <br />
    57       <table>
    58         <tr>
    59           <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
    60           <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
    61         </tr>
    62       </table>
     55      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     56        <br />
     57        <table>
     58          <tr>
     59            {if $PRIVACY_CHECKBOX}<td class="checkbox">{$PRIVACY_CHECKBOX}</td>{/if}
     60            <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#|sprintf:$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</label></strong> {$PRIVACY_LINK}</td>
     61          </tr>
     62        </table>
     63      {else}
     64        {if $PRIVACY_CHECKBOX}
     65        <br />
     66        <table>
     67          <tr>
     68            <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
     69            <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     70          </tr>
     71        </table>
     72        {/if}
    6373      {/if}
    6474    </div>
    6575    <div class="button_right">{$BUTTON_SUBMIT}</div>
  • templates/tpl_modified/module/create_account.html

     
    116116      {/if}
    117117    </table>
    118118  </div>
    119   {if $PRIVACY_CHECKBOX}
    120   <br />
    121   <table>
    122     <tr>
    123       <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
    124       <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
    125     </tr>
    126   </table>
     119  {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     120    <br />
     121    <table>
     122      <tr>
     123        {if $PRIVACY_CHECKBOX}<td class="checkbox">{$PRIVACY_CHECKBOX}</td>{/if}
     124        <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     125      </tr>
     126    </table>
     127  {else}
     128    {if $PRIVACY_CHECKBOX}
     129    <br />
     130    <table>
     131      <tr>
     132        <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
     133        <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     134      </tr>
     135    </table>
     136    {/if}
    127137  {/if}
    128138</div>
    129139<br class="clearfix" />
  • templates/tpl_modified/module/create_account_guest.html

     
    110110    </table>
    111111    {/if}
    112112  </div>
    113   {if $PRIVACY_CHECKBOX}
    114   <br />
    115   <table>
    116     <tr>
    117       <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
    118       <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
    119     </tr>
    120   </table>
     113  {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     114    <br />
     115    <table>
     116      <tr>
     117        {if $PRIVACY_CHECKBOX}<td class="checkbox">{$PRIVACY_CHECKBOX}</td>{/if}
     118        <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     119      </tr>
     120    </table>
     121  {else}
     122    {if $PRIVACY_CHECKBOX}
     123    <br />
     124    <table>
     125      <tr>
     126        <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
     127        <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     128      </tr>
     129    </table>
     130    {/if}
    121131  {/if}
    122132</div>
    123133<br class="clearfix" />
  • templates/tpl_modified/module/newsletter.html

     
    3939          </td>
    4040        </tr>
    4141      </table>
    42       {if $PRIVACY_CHECKBOX}
    43       <br />
    44       <table>
    45         <tr>
    46           <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
    47           <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
    48         </tr>
    49       </table>
     42      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     43        <br />
     44        <table>
     45          <tr>
     46            {if $PRIVACY_CHECKBOX}<td class="checkbox">{$PRIVACY_CHECKBOX}</td>{/if}
     47            <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     48          </tr>
     49        </table>
     50      {else}
     51        {if $PRIVACY_CHECKBOX}
     52        <br />
     53        <table>
     54          <tr>
     55            <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
     56            <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     57          </tr>
     58        </table>
     59        {/if}
    5060      {/if}
    5161    </div>
    5262    <div class="button_right">{$BUTTON_SEND}</div>
  • templates/tpl_modified_responsive/mail/english/newsletter_mail.html

     
    1414      <font size="2" face="Tahoma, Verdana, sans-serif"><b>Thank you for subscribing!</b><br />
    1515                        <br />
    1616                        {if isset($LINK)}
     17                        You receive this e-mail because you want to receive our newsletter.<br />
     18                        <br />
    1719      Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!<br />
    1820      <br />
    1921      <b>Your activation link:</b><br />
    2022      <a href="{$LINK}">{$LINK}</a><br />
     23      <br />
     24      If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.<br />
     25      <br />
     26      Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.<br />
    2127      {/if}
    2228
    2329      {if $SEND_GIFT == true}
  • templates/tpl_modified_responsive/mail/english/newsletter_mail.txt

     
    22Thank you for subscribing!
    33
    44{if isset($LINK)}
     5You receive this e-mail because you want to receive our newsletter.
     6
    57Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!
    68
    79Your activation link:
    810{$LINK}
     11
     12If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.
     13
     14Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.
    915{/if}
    1016
    1117{if $SEND_GIFT == true}
  • templates/tpl_modified_responsive/mail/german/newsletter_mail.html

     
    1616                        {if isset($LINK)}
    1717      Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen m&ouml;chten.<br />
    1818      <br />
    19       Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.
     19      Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.<br />
     20      <br />
     21      <b>Ihr Aktivierungslink:</b><br />
     22      <a href="{$LINK}">{$LINK}</a><br />
     23      <br />
    2024      Sollten Sie sich nicht f&uuml;r unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht w&uuml;nschen, bitten wir Sie,
    2125      den Aktivierungslink einfach zu ignorieren.<br />
    2226      <br />
    23       <b>Ihr Aktivierungslink:</b><br />
    24       <a href="{$LINK}">{$LINK}</a><br />
     27      Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerkl&auml;rung.<br />
    2528      {/if}
    2629     
    2730      {if $SEND_GIFT == true}
  • templates/tpl_modified_responsive/mail/german/newsletter_mail.txt

     
    33
    44{if isset($LINK)}
    55Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen möchten.
     6
    67Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse für den Newsletterempfang freigeschaltet wird.
    78
     9Ihr Aktivierungslink:
     10{$LINK}
     11
    812Sollten Sie sich nicht für unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht wünschen,
    913bitten wir Sie, den Aktivierungslink einfach zu ignorieren.
    10      
    11 Ihr Aktivierungslink:
    12 {$LINK}
     14
     15Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerklärung.
    1316{/if}
    1417
    1518{if $SEND_GIFT == true}
  • templates/tpl_modified_responsive/module/checkout_payment.html

     
    7373      </div>
    7474      <div class="checkoutconditions">
    7575        <div class="cus_check cus_check_small">
     76        {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     77          {if $smarty.const.SIGN_CONDITIONS_ON_CHECKOUT == 'true'}{$AGB_checkbox}{/if}<label for="conditions"><strong>{#text_accept_agb#}</strong>&nbsp;{$AGB_LINK}</label>
     78        {else}
    7679          {$AGB_checkbox}<label for="conditions"><strong>{#text_accept_agb#}</strong>&nbsp;{$AGB_LINK}</label>
     80        {/if}
    7781        </div>
    7882      </div>
    7983      {if isset($PRIVACY_checkbox)}
  • templates/tpl_modified_responsive/module/contact_us.html

     
    5252          <td><span class="fieldtext">{#text_message#}</span><span class="stern">{$INPUT_TEXT}<span class="inputRequirement_textarea"> *</span></span></td>
    5353        </tr>
    5454      </table>   
    55       {if $PRIVACY_CHECKBOX}
    56       <br />
    57       <div class="cus_check cus_check_small">
    58         {$PRIVACY_CHECKBOX}
    59         <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
    60       </div>
     55      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     56        <br />
     57        <div class="cus_check cus_check_small">
     58          {if $PRIVACY_CHECKBOX}{$PRIVACY_CHECKBOX}{/if}
     59          <label for="privacy"><strong>{#text_privacy_accept#|sprintf:$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</strong> {$PRIVACY_LINK}</label>
     60        </div>
     61      {else}
     62        {if $PRIVACY_CHECKBOX}
     63        <br />
     64        <div class="cus_check cus_check_small">
     65          {$PRIVACY_CHECKBOX}
     66          <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
     67        </div>
     68        {/if}
    6169      {/if}
    6270    </div>
    6371    <div class="button_right cf"><div class="cssButtonPos4">{$BUTTON_SUBMIT}</div></div>
  • templates/tpl_modified_responsive/module/create_account.html

     
    112112        </tr>
    113113      {/if}
    114114    </table>
    115     {if $PRIVACY_CHECKBOX}
     115    {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
    116116      <br />
    117117      <div class="cus_check cus_check_small">
    118         {$PRIVACY_CHECKBOX}
     118        {if $PRIVACY_CHECKBOX}{$PRIVACY_CHECKBOX}{/if}
    119119        <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
    120120      </div>
     121    {else}
     122      {if $PRIVACY_CHECKBOX}
     123        <br />
     124        <div class="cus_check cus_check_small">
     125          {$PRIVACY_CHECKBOX}
     126          <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
     127        </div>
     128      {/if}
    121129    {/if}
    122130  </div>
    123131</div>
  • templates/tpl_modified_responsive/module/create_account_guest.html

     
    106106      {/if}
    107107    </table>
    108108    {/if}
    109     {if $PRIVACY_CHECKBOX}
     109    {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
    110110      <br />
    111111      <div class="cus_check cus_check_small">
    112         {$PRIVACY_CHECKBOX}
     112        {if $PRIVACY_CHECKBOX}{$PRIVACY_CHECKBOX}{/if}
    113113        <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
    114114      </div>
     115    {else}
     116      {if $PRIVACY_CHECKBOX}
     117        <br />
     118        <div class="cus_check cus_check_small">
     119          {$PRIVACY_CHECKBOX}
     120          <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
     121        </div>
     122      {/if}
    115123    {/if}
    116124  </div>
    117125</div>
  • templates/tpl_modified_responsive/module/newsletter.html

     
    3737          </td>
    3838        </tr>
    3939      </table>
    40       {if $PRIVACY_CHECKBOX}
     40      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
    4141        <br />
    4242        <div class="cus_check cus_check_small cus_mb_10">
    43           {$PRIVACY_CHECKBOX}
     43          {if $PRIVACY_CHECKBOX}{$PRIVACY_CHECKBOX}{/if}
    4444          <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
    4545        </div>
     46      {else}
     47        {if $PRIVACY_CHECKBOX}
     48          <br />
     49          <div class="cus_check cus_check_small cus_mb_10">
     50            {$PRIVACY_CHECKBOX}
     51            <label for="privacy"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</label>
     52          </div>
     53        {/if}
    4654      {/if}
    4755      <div class="button_right cf"><div class="cssButtonPos4">{$BUTTON_SEND}</div></div>
    4856    </div>
  • templates/xtc5/mail/english/newsletter_mail.html

     
    11<p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><b>Thank you for subscribing!</b></p>
    22{if isset($LINK)}
     3<p>You receive this e-mail because you want to receive our newsletter.</p>
    34<p>Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!</p>
    45<p><b>Your activation link:</b></p>
    56<p><a href="{$LINK}">{$LINK}</a></p>
     7<p>If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.</p>
     8<p>Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.</p>
    69{/if}
    710{if $SEND_GIFT == true}
    811<br />
  • templates/xtc5/mail/english/newsletter_mail.txt

     
    22Thank you for subscribing!
    33
    44{if isset($LINK)}
     5You receive this e-mail because you want to receive our newsletter.
     6
    57Please click the following activation link to receive newsletters. If you haven't subscribed to this service, please ignore this e-mail!
    68
    79Your activation link:
    810{$LINK}
     11
     12If you have not registered for our newsletter or do not wish to receive the newsletter, please ignore the activation link.
     13
     14Your consent to the dispatch of our newsletter is revocable at any time. The newsletter is sent according to our privacy policy.
    915{/if}
    1016
    1117{if $SEND_GIFT == true}
  • templates/xtc5/mail/german/newsletter_mail.html

     
    11<p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><b>Vielen Dank f&uuml;r die Anmeldung zu unserem Newsletter.</b></p>
    22{if isset($LINK)}
    3 <p>Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen mo&uml;chten.
    4 Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.
    5 Sollten Sie sich nicht f&uuml;r unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht w&uuml;nschen, bitten wir Sie, den Aktivierungslink einfach zu ignorieren.</p>
     3<p>Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen m&ouml;chten.</p>
     4<p>Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse f&uuml;r den Newsletterempfang freigeschaltet wird.</p>
    65<p><b>Ihr Aktivierungslink:</b></p>
    76<p><a href="{$LINK}">{$LINK}</a></p>
     7<p>Sollten Sie sich nicht f&uuml;r unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht w&uuml;nschen, bitten wir Sie, den Aktivierungslink einfach zu ignorieren.</p>
     8<p>Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerkl&auml;rung.</p>
    89{/if}
    910{if $SEND_GIFT == true}
    1011<br />
     
    2223<br />
    2324Geben Sie einfach Ihren pers&ouml;nlichen Code {$COUPON_CODE} w&auml;hrend des Bezahlvorganges ein.<br />
    2425{/if}
     26
    2527[SIGNATUR]
     28 No newline at end of file
  • templates/xtc5/mail/german/newsletter_mail.txt

     
    33
    44{if isset($LINK)}
    55Sie erhalten diese E-Mail, weil Sie unseren Newsletter empfangen möchten.
     6
    67Bitte klicken Sie auf den Aktivierungslink, damit Ihre E-Mail-Adresse für den Newsletterempfang freigeschaltet wird.
    78
     9Ihr Aktivierungslink:
     10{$LINK}
     11
    812Sollten Sie sich nicht für unseren Newsletter eingetragen haben bzw. den Empfang des Newsletters nicht wünschen,
    913bitten wir Sie, den Aktivierungslink einfach zu ignorieren.
    10      
    11 Ihr Aktivierungslink:
    12 {$LINK}
     14
     15Ihre Einwilligung in den Versand unseres Newsletters ist jederzeit widerruflich. Der Newsletter-Versand erfolgt entsprechend unserer Datenschutzerklärung.
    1316{/if}
    1417
    1518{if $SEND_GIFT == true}
  • templates/xtc5/module/checkout_payment.html

     
    3131    <div class="checkoutagb">{$AGB}</div>
    3232    <table width="100%" border="0" cellspacing="0" cellpadding="4">
    3333      <tr>
     34      {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     35        {if $smarty.const.SIGN_CONDITIONS_ON_CHECKOUT == 'true'}<td>{$AGB_checkbox}</td>{/if}
     36        <td width="100%"{if $smarty.const.SIGN_CONDITIONS_ON_CHECKOUT == 'false'} colspan="2"{/if}><strong><label for="conditions">{#text_accept_agb#}</label></strong>&nbsp;{$AGB_LINK}</td>
     37      {else}
    3438        <td>{$AGB_checkbox}</td>
    3539        <td width="100%"><strong><label for="conditions">{#text_accept_agb#}</label></strong>&nbsp;{$AGB_LINK}</td>
     40      {/if}
    3641      </tr>
    3742      {if isset($PRIVACY_checkbox)}
    3843      <tr>
  • templates/xtc5/module/contact_us.html

     
    6464      <th>{#text_hint#}</th>
    6565    </tr>
    6666  </table>
    67   {if $PRIVACY_CHECKBOX}
    68   <table width="100%" border="0" cellspacing="0" cellpadding="4">
    69     <tr>
    70       <td>{$PRIVACY_CHECKBOX}</td>
    71       <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
    72     </tr>
    73   </table>
     67  {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     68    <table width="100%" border="0" cellspacing="0" cellpadding="4">
     69      <tr>
     70        {if $PRIVACY_CHECKBOX}<td>{$PRIVACY_CHECKBOX}</td>{/if}
     71        <td width="100%"><strong>{#text_privacy_accept#|sprintf:$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</strong> {$PRIVACY_LINK}</td>
     72      </tr>
     73    </table>
     74  {else}
     75    {if $PRIVACY_CHECKBOX}
     76    <table width="100%" border="0" cellspacing="0" cellpadding="4">
     77      <tr>
     78        <td>{$PRIVACY_CHECKBOX}</td>
     79        <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
     80      </tr>
     81    </table>
     82    {/if}
    7483  {/if}
    7584</div>
    7685{$FORM_END}
  • templates/xtc5/module/create_account.html

     
    142142  {/if}
    143143</table>
    144144</div>
    145 {if $PRIVACY_CHECKBOX}
    146 <table width="100%" border="0" cellspacing="0" cellpadding="4">
    147   <tr>
    148     <td>{$PRIVACY_CHECKBOX}</td>
    149     <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
    150   </tr>
    151 </table>
     145{if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     146  <table width="100%" border="0" cellspacing="0" cellpadding="4">
     147    <tr>
     148      {if $PRIVACY_CHECKBOX}<td>{$PRIVACY_CHECKBOX}</td>{/if}
     149      <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
     150    </tr>
     151  </table>
     152{else}
     153  {if $PRIVACY_CHECKBOX}
     154  <table width="100%" border="0" cellspacing="0" cellpadding="4">
     155    <tr>
     156      <td>{$PRIVACY_CHECKBOX}</td>
     157      <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
     158    </tr>
     159  </table>
     160  {/if}
    152161{/if}
    153162<p>{$BUTTON_SUBMIT}</p>
    154163<p>{#text_must#}</p>
  • templates/xtc5/module/create_account_guest.html

     
    132132  {/if}
    133133</table>
    134134{/if}
    135 {if $PRIVACY_CHECKBOX}
    136 <table width="100%" border="0" cellspacing="0" cellpadding="4">
    137   <tr>
    138     <td>{$PRIVACY_CHECKBOX}</td>
    139     <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
    140   </tr>
    141 </table>
     135{if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     136  <table width="100%" border="0" cellspacing="0" cellpadding="4">
     137    <tr>
     138      {if $PRIVACY_CHECKBOX}<td>{$PRIVACY_CHECKBOX}</td>{/if}
     139      <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
     140    </tr>
     141  </table>
     142{else}
     143  {if $PRIVACY_CHECKBOX}
     144  <table width="100%" border="0" cellspacing="0" cellpadding="4">
     145    <tr>
     146      <td>{$PRIVACY_CHECKBOX}</td>
     147      <td width="100%"><strong>{#text_privacy_accept#}</strong> {$PRIVACY_LINK}</td>
     148    </tr>
     149  </table>
     150  {/if}
    142151{/if}
    143152<p>{$BUTTON_SUBMIT}</p>
    144153{$FORM_END}
     154 No newline at end of file
  • templates/xtc5/module/newsletter.html

     
    4343        <td>{$BUTTON_SEND}</td>
    4444      </tr>
    4545    </table>
    46     {if $PRIVACY_CHECKBOX}
    47     <br />
    48     <table>
    49       <tr>
    50         <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
    51         <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
    52       </tr>
    53     </table>
     46    {if isset($smarty.const.SIGN_CONDITIONS_ON_CHECKOUT)}
     47      <br />
     48      <table>
     49        <tr>
     50          {if $PRIVACY_CHECKBOX}<td class="checkbox">{$PRIVACY_CHECKBOX}</td>{/if}
     51          <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     52        </tr>
     53      </table>
     54    {else}
     55      {if $PRIVACY_CHECKBOX}
     56      <br />
     57      <table>
     58        <tr>
     59          <td class="checkbox">{$PRIVACY_CHECKBOX}</td>
     60          <td class="midi td_full"><strong><label for="privacy">{#text_privacy_accept#}</label></strong> {$PRIVACY_LINK}</td>
     61        </tr>
     62      </table>
     63      {/if}
    5464    {/if}
    5565  </div>
    5666  {$FORM_END}