From 96a270e713e9bc75a6199ff76d5f4831b732ff15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 10 Nov 2012 17:06:21 +0000 Subject: [PATCH] Mostly ext-forced continued: - Missing email templates for forced ads and campaigns added - More fixes for XML callback-handlers - Added new (temporary) configuration variable DEBUG_BUILD_MAILS to allow easy debugging of "build mails" --- .gitattributes | 3 + DOCS/TODOs.txt | 14 +-- inc/config-local.php.dist | 3 + inc/email-functions.php | 5 +- inc/filters.php | 2 +- inc/language/forced_de.php | 11 ++- inc/libs/forced_functions.php | 8 +- inc/mysql-manager.php | 12 +-- inc/wrapper-functions.php | 14 ++- .../de/emails/admin/admin_add_forced_ads.tpl | 4 +- .../admin/admin_add_forced_campaigns.tpl | 4 +- .../emails/admin/admin_add_forced_costs.tpl | 2 +- .../de/emails/admin/admin_add_grade_data.tpl | 2 +- .../emails/admin/admin_autopurge_points.tpl | 2 +- .../de/emails/admin/admin_coupon_code.tpl | 2 +- .../admin/admin_delete_surfbar_urls.tpl | 2 +- .../de/emails/admin/admin_edit_forced_ads.tpl | 4 +- .../admin/admin_edit_forced_campaigns.tpl | 31 +++++++ .../emails/admin/admin_edit_forced_costs.tpl | 2 +- .../emails/admin/admin_edit_surfbar_urls.tpl | 2 +- .../de/emails/admin/admin_holiday_unlock.tpl | 2 +- .../de/emails/admin/admin_report_bug.tpl | 2 +- .../emails/member/member_edit_forced_ads.tpl | 35 ++++++++ .../member/member_edit_forced_campaigns.tpl | 31 +++++++ .../admin/admin_edit_forced_campaigns_row.tpl | 4 +- .../admin/admin_edit_do_forced_campaigns.xml | 88 +++++++++++++++++++ 26 files changed, 251 insertions(+), 40 deletions(-) create mode 100644 templates/de/emails/admin/admin_edit_forced_campaigns.tpl create mode 100644 templates/de/emails/member/member_edit_forced_ads.tpl create mode 100644 templates/de/emails/member/member_edit_forced_campaigns.tpl create mode 100644 templates/xml/admin/admin_edit_do_forced_campaigns.xml diff --git a/.gitattributes b/.gitattributes index a1f294a5e6..08acc8d1bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -888,6 +888,7 @@ templates/de/emails/admin/admin_delete_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_earning_added.tpl svneol=native#text/plain templates/de/emails/admin/admin_earning_updated.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_forced_ads.tpl svneol=native#text/plain +templates/de/emails/admin/admin_edit_forced_campaigns.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain @@ -1015,6 +1016,8 @@ templates/de/emails/member/member_delete_user_subids.tpl svneol=native#text/plai templates/de/emails/member/member_doubler.tpl svneol=native#text/plain templates/de/emails/member/member_earning_added.tpl svneol=native#text/plain templates/de/emails/member/member_earning_updated.tpl svneol=native#text/plain +templates/de/emails/member/member_edit_forced_ads.tpl svneol=native#text/plain +templates/de/emails/member/member_edit_forced_campaigns.tpl svneol=native#text/plain templates/de/emails/member/member_edit_mem_edit_user_subids.tpl svneol=native#text/plain templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/member/member_edit_user_subids.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index e0baf6e4b2..20aa9a9232 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -11,7 +11,7 @@ ./inc/email-functions.php:109: * @TODO Rewrite this to an extension 'smtp' ./inc/email-functions.php:227:// @TODO $rawUserId is currently unused ./inc/expression-functions.php:173:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again -./inc/expression-functions.php:46: // @TODO is escapeQuotes() enougth for strings with single/double quotes? +./inc/expression-functions.php:46: // @TODO is escapeQuotes() enough for strings with single/double quotes? ./inc/extensions/ext-html_mail.php:136: // @TODO Move these arrays into config ./inc/extensions/ext-menu.php:52: // @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => (edit|add)_(admin|guest|member)_menu ./inc/extensions/ext-network.php:100: // @TODO network_type_handler is an internal name and needs documentation @@ -57,10 +57,10 @@ ./inc/functions.php:1102: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? ./inc/functions.php:1188: // @TODO Are these convertions still required? ./inc/functions.php:1209:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:1796: // @TODO Find a way to cache this -./inc/functions.php:1901: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:2108: // @TODO Rename column data_type to e.g. mail_status -./inc/functions.php:2458:// @TODO cacheFiles is not yet supported +./inc/functions.php:1814: // @TODO Find a way to cache this +./inc/functions.php:1919: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2126: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:2476:// @TODO cacheFiles is not yet supported ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/header.php:66:// @TODO Find a way to not use direct module comparison ./inc/install-functions.php:91: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); @@ -200,8 +200,8 @@ ./inc/template-functions.php:288: // @TODO Remove these sanity checks if all is fine ./inc/template-functions.php:625:// @TODO $simple/$constants are deprecated ./inc/template-functions.php:723: // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates -./inc/wrapper-functions.php:3031: // @TODO Find a way to not use direct module comparison -./inc/wrapper-functions.php:500:// @TODO Do some more sanity check here +./inc/wrapper-functions.php:2970: // @TODO Find a way to not use direct module comparison +./inc/wrapper-functions.php:512:// @TODO Do some more sanity check here ./inc/xml-functions.php:240: // @TODO Handle characters ./mailid.php:102: // @TODO Rewrite this to a filter ./mailid.php:145: // @TODO Rewrite this to a filter diff --git a/inc/config-local.php.dist b/inc/config-local.php.dist index d98b9dc8a5..87a2e3024c 100644 --- a/inc/config-local.php.dist +++ b/inc/config-local.php.dist @@ -101,6 +101,9 @@ setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N'); // CFG: DEBUG-REGEX (comment in to debug regular expressions) //setConfigEntry('DEBUG_REGEX', 'Y'); +// CFG: DEBUG-BUILD-MAILS +//setConfigEntry('DEBUG_BUILD_MAILS', 'Y'); + // CFG: ALLOW-TESTER-ACCOUNTS (comment in to allow tester accounts being re-included) //setConfigEntry('ALLOW_TESTER_ACCOUNTS', 'Y'); diff --git a/inc/email-functions.php b/inc/email-functions.php index e0cf2a251e..1bd2e4e7d7 100644 --- a/inc/email-functions.php +++ b/inc/email-functions.php @@ -245,7 +245,10 @@ function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart = } // END - if // Is the raw userid set? - if (postRequestElement($userIdColumn[0], $id) > 0) { + if (isValidUserId(postRequestElement($userIdColumn[0], $id))) { + // Set it in content + $content[$userIdColumn[0]] = bigintval(postRequestElement($userIdColumn[0], $id)); + // Load email template if (!empty($subjectPart)) { $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content); diff --git a/inc/filters.php b/inc/filters.php index e1c892448f..5f2dc52d18 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1259,7 +1259,7 @@ function FILTER_INIT_SESSION ($filterData) { // Filter for sending "build mail" to admin function FILTER_SEND_BUILD_MAIL ($filterData) { // Was one line updated? - if ($filterData['affected'] > 0) { + if (($filterData['affected'] > 0) || (isDebugBuildMailsEnabled())) { // Then call the proper function call_user_func_array('sendGenericBuildMails', $filterData); } // END - if diff --git a/inc/language/forced_de.php b/inc/language/forced_de.php index 3200142cf7..8ac5d6e025 100644 --- a/inc/language/forced_de.php +++ b/inc/language/forced_de.php @@ -55,6 +55,7 @@ addMessages(array( 'ADMIN_ENTER_FORCED_ALTERNATE_TEXT' => "Alternativen Text/Titel des Forced-Werbemittels eingeben:", 'ADMIN_ENTER_FORCED_AD_WIDTH' => "Breite (in Pixel) des Forced-Werbemittels eingeben:", 'ADMIN_ENTER_FORCED_AD_HEIGHT' => "Höhe (in Pixel) des Forced-Werbemittels eingeben:", + 'ADMIN_FORCED_ADS_ID' => "Forced-Werbemittel-Id", 'ADMIN_FORCED_ADS_CLICK_URL' => "Klick-URL", 'ADMIN_FORCED_ADS_WIDTH' => "Breite (in Pixel) bei PopUp/Banner", 'ADMIN_FORCED_ADS_HEIGHT' => "Höhe (in Pixel) bei PopUp/Banner", @@ -83,9 +84,10 @@ addMessages(array( 'ADMIN_SELECT_FORCED_AD' => "Forced-Werbemittel auswählen:", 'ADMIN_SELECT_FORCED_CAMPAIGN_USERID' => "Mitgliedsaccount auswählen, dass dieser Kampagne zugewiesen werden soll:", 'ADMIN_SELECT_FORCED_COSTS' => "Forced-Preis auswählen:", - 'ADMIN_FORCED_CAMPAIGN_ADS_ID' => "Verknüpftes Forced-Werbemittel:", - 'ADMIN_FORCED_CAMPAIGN_USERID' => "Verknüpftes Mitgliedsaccount:", - 'ADMIN_FORCED_CAMPAIGN_COSTS_ID' => "Verknüpfte Forced-Kosten:", + 'ADMIN_FORCED_CAMPAIGN_ID' => "Forced-Kampagnen-Id", + 'ADMIN_FORCED_CAMPAIGN_ADS_ID' => "Verknüpftes Forced-Werbemittel", + 'ADMIN_FORCED_CAMPAIGN_USERID' => "Verknüpftes Mitgliedsaccount", + 'ADMIN_FORCED_CAMPAIGN_COSTS_ID' => "Verknüpfte Forced-Kosten", 'ADMIN_FORCED_CAMPAIGN_STATUS' => "Kampagnen-Status", 'ADMIN_FORCED_CAMPAIGN_ORDERED_CLICKS' => "Klicks übrig", 'ADMIN_FORCED_CAMPAIGN_PAYMENT_API' => "Vergütung von API", @@ -177,9 +179,12 @@ addMessages(array( 'ADMIN_ADD_FORCED_COSTS_SUBJECT' => "Forced-Preis hinzugefügt", 'ADMIN_EDIT_FORCED_COSTS_SUBJECT' => "Änderung an Forced-Preisen", 'ADMIN_ADD_FORCED_CAMPAIGNS_SUBJECT' => "Forced-Kampagne erstellt", + 'ADMIN_EDIT_FORCED_CAMPAIGNS_SUBJECT' => "Änderung an einer Forced-Kampagne", 'ADMIN_FORCED_NOTIFY_CAMPAIGN_PENDING_ACTIVE_SUBJECT' => "Eine Forced-Kampagne wurde freigeschaltet", // Member - subject lines + 'MEMBER_EDIT_FORCED_ADS_SUBJECT' => "Änderung Ihres Forced-Werbemittels", + 'MEMBER_EDIT_FORCED_CAMPAIGNS_SUBJECT' => "Änderung Ihrer Forced-Kampagne", 'MEMBER_FORCED_NOTIFY_CAMPAIGN_PENDING_ACTIVE_SUBJECT' => "Ihre Forced-Kampagne wurde freigeschaltet", // All - earning names diff --git a/inc/libs/forced_functions.php b/inc/libs/forced_functions.php index 21a7327a31..eb6ac6cb64 100644 --- a/inc/libs/forced_functions.php +++ b/inc/libs/forced_functions.php @@ -424,7 +424,7 @@ function doForcedNotifyAdmin ($messageType, $content) { // Notify the user about the performed action function doForcedNotifyMember ($messageType, $content) { // Skip notification if userid is NULL - if (is_null($content['forced_campaign_userid'])) { + if (!isValidUserId($content['forced_campaign_userid'])) { // NULL is silently ignored return TRUE; } // END - if @@ -502,7 +502,7 @@ function doTemplateForcedAdSelectionBox ($templateName, $clear, $default = NULL) $forcedAds = getArrayFromForcedAdsByType(); // Handle it over to generateSelectionBoxFromArray() - $content = generateSelectionBoxFromArray($forcedAds, 'forced_ads_id', 'forced_ads_id', '', '', '', $default, 'forced_ads_type'); + $content = generateSelectionBoxFromArray($forcedAds, 'forced_ads_id', 'forced_ads_id', '', '', '', $default, 'forced_ads_type', FALSE, TRUE); // Return prepared content return $content; @@ -514,7 +514,7 @@ function doTemplateForcedCostsSelectionBox ($templateName, $clear, $default = NU $forcedCosts = getArrayFromForcedCostsByVisibility(); // Handle it over to generateSelectionBoxFromArray() - $content = generateSelectionBoxFromArray($forcedCosts, 'forced_costs_id', 'forced_costs_id', '', '', '', $default, '', TRUE); + $content = generateSelectionBoxFromArray($forcedCosts, 'forced_costs_id', 'forced_costs_id', '', '', '', $default, '', TRUE, TRUE); // Return prepared content return $content; @@ -523,7 +523,7 @@ function doTemplateForcedCostsSelectionBox ($templateName, $clear, $default = NU // Template helper function to create selection box for foreced campaign userid function doTemplateForcedCampaignUseridSelectionBox ($templateName, $clear, $default = NULL) { // Generate the selection box without all - $content = addMemberSelectionBox($default, FALSE, TRUE, TRUE, 'forced_campaign_userid'); + $content = addMemberSelectionBox($default, FALSE, TRUE, TRUE, 'forced_campaign_userid[]'); // Return prepared content return $content; diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 2b48644bdf..419859d5cb 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -2116,14 +2116,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun // "Walk" through all entries foreach (postRequestArray() as $key => $entries) { // Skip raw userid which is always invalid - if (($key == $rawUserId[0]) || ($key == 'do_edit')) { + if (($key == $rawUserId[0]) || ($key == ($rawUserId[0] . '_raw')) || ($key == 'do_edit')) { // Continue with next field //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]); continue; } // END - if // Debug message - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=
'.print_r($entries,TRUE).'
'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=
'.print_r($entries,TRUE).'
'); // Is entries an array? if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) { @@ -2147,7 +2147,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun //* BUG: */ die($key.'/
'.print_r($search, TRUE).'
=
'.print_r($columns, TRUE).'
'); // Debug message - /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!'); // Add normal entries as well $content[$key] = $entries; @@ -2156,7 +2156,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun $entries = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search); // Debug message - /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!'); // Add key/value pair to SQL string $sql .= addKeyValueSql($key, $entries); @@ -2164,8 +2164,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun } // END - foreach // Finish SQL command - $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id); - if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) { + $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . $id; + if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) { // Add user id as well $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0])); } // END - if diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index d8f3143357..da71a257df 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -443,6 +443,18 @@ function isDebugRegularExpressionEnabled () { return $GLOBALS[__FUNCTION__]; } +// Checks whether debugging of build mails is enabled +function isDebugBuildMailsEnabled () { + // Is cache set? + if (!isset($GLOBALS[__FUNCTION__])) { + // Simply check it + $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('DEBUG_BUILD_MAILS')) && (getConfig('DEBUG_BUILD_MAILS') == 'Y')); + } // END - if + + // Return it + return $GLOBALS[__FUNCTION__]; +} + // Checks whether the cache instance is valid function isCacheInstanceValid () { // Is there cache? @@ -1291,7 +1303,7 @@ function isValidUserId ($userid) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$userid])) { // Check it out - $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid > 0)); + $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid != 'NULL') && ($userid > 0)); } // END - if // Return cache diff --git a/templates/de/emails/admin/admin_add_forced_ads.tpl b/templates/de/emails/admin/admin_add_forced_ads.tpl index 78cbc4499a..a8d568d1e0 100644 --- a/templates/de/emails/admin/admin_add_forced_ads.tpl +++ b/templates/de/emails/admin/admin_add_forced_ads.tpl @@ -1,10 +1,10 @@ Hallo Administrator, -Es wurde soeben Forced-Werbemittel hinzugefügt. +es wurde soeben Forced-Werbemittel hinzugefügt. Hier sind alle Daten dazu: ------------------------------------------ -Forced-Werbemittel-Id: $content[id] +{--ADMIN_FORCED_ADS_ID--}: $content[id] ------------------------------------------ {--ADMIN_FORCED_ADS_AD_URL--}: $content[forced_ads_ad_url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_add_forced_campaigns.tpl b/templates/de/emails/admin/admin_add_forced_campaigns.tpl index 283472540a..4fab61e21e 100644 --- a/templates/de/emails/admin/admin_add_forced_campaigns.tpl +++ b/templates/de/emails/admin/admin_add_forced_campaigns.tpl @@ -1,10 +1,10 @@ Hallo Administrator, -Es wurde soeben Forced-Kampagne hinzugefügt. +es wurde soeben Forced-Kampagne hinzugefügt. Hier sind alle Daten dazu: ------------------------------------------ -Forced-Kampagnen-Id: $content[id] +{--ADMIN_FORCED_CAMPAIGN_ID--} $content[id] ------------------------------------------ {--ADMIN_FORCED_CAMPAIGN_ORDERED_CLICKS--}: {%pipe,translateComma=$content[forced_campaign_ordered_clicks]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_add_forced_costs.tpl b/templates/de/emails/admin/admin_add_forced_costs.tpl index cf73fd9516..0170fbc007 100644 --- a/templates/de/emails/admin/admin_add_forced_costs.tpl +++ b/templates/de/emails/admin/admin_add_forced_costs.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde soeben Forced-Preise hinzugefügt. +es wurde soeben Forced-Preise hinzugefügt. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_add_grade_data.tpl b/templates/de/emails/admin/admin_add_grade_data.tpl index c5ec92d2c9..fbbec3673c 100644 --- a/templates/de/emails/admin/admin_add_grade_data.tpl +++ b/templates/de/emails/admin/admin_add_grade_data.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde soeben eine Accounstufe hinzugefügt. +es wurde soeben eine Accounstufe hinzugefügt. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_autopurge_points.tpl b/templates/de/emails/admin/admin_autopurge_points.tpl index fe400ff718..538c9f6edf 100644 --- a/templates/de/emails/admin/admin_autopurge_points.tpl +++ b/templates/de/emails/admin/admin_autopurge_points.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurden soeben {%pipe,translateComma=$content%} {?POINTS?} durch die automatische Loeschung von Bestätigungslinks in den Jackpot transferiert! +es wurden soeben {%pipe,translateComma=$content%} {?POINTS?} durch die automatische Loeschung von Bestätigungslinks in den Jackpot transferiert! Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script diff --git a/templates/de/emails/admin/admin_coupon_code.tpl b/templates/de/emails/admin/admin_coupon_code.tpl index deb38a45a0..7417d23efa 100644 --- a/templates/de/emails/admin/admin_coupon_code.tpl +++ b/templates/de/emails/admin/admin_coupon_code.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde soeben ein Gutschein erstellt. +es wurde soeben ein Gutschein erstellt. Hier sind alle Daten des Gutscheins: (keine Codes) -------------------------------------------------- diff --git a/templates/de/emails/admin/admin_delete_surfbar_urls.tpl b/templates/de/emails/admin/admin_delete_surfbar_urls.tpl index 7b31e1426d..51db99fbbd 100644 --- a/templates/de/emails/admin/admin_delete_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_delete_surfbar_urls.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde eine URL aus der Surfbar gelöscht. +es wurde eine URL aus der Surfbar gelöscht. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_forced_ads.tpl b/templates/de/emails/admin/admin_edit_forced_ads.tpl index a5e2c6e7cf..eeadb24725 100644 --- a/templates/de/emails/admin/admin_edit_forced_ads.tpl +++ b/templates/de/emails/admin/admin_edit_forced_ads.tpl @@ -1,10 +1,10 @@ Hallo Administrator, -Es wurde soeben Forced-Werbemittel geändert. +es wurde soeben Forced-Werbemittel geändert. Hier sind alle Daten dazu: ------------------------------------------ -Forced-Werbemittel-Id: $content[forced_ads_id] +{--ADMIN_FORCED_ADS_ID--}: $content[forced_ads_id] ------------------------------------------ {--ADMIN_FORCED_ADS_AD_URL--}: $content[forced_ads_ad_url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_forced_campaigns.tpl b/templates/de/emails/admin/admin_edit_forced_campaigns.tpl new file mode 100644 index 0000000000..c5df1362a6 --- /dev/null +++ b/templates/de/emails/admin/admin_edit_forced_campaigns.tpl @@ -0,0 +1,31 @@ +Hallo Administrator, + +es wurde soeben Forced-Kampagne geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ID--}: $content[forced_campaign_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ADS_ID--}: $content[forced_ads_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_COSTS_ID--}: $content[forced_costs_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_USERID--}: {%pipe,convertZeroToNull=$content[forced_campaign_userid]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_CREATED--}: $content[forced_campaign_created] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ORDERED_CLICKS--}: {%pipe,translateComma=$content[forced_campaign_ordered_clicks]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_PAYMENT_API--}: {%pipe,translateComma=$content[forced_campaign_payment_api]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_MINIMUM_STAY--}: {%pipe,createFancyTime=$content[forced_campaign_minimum_stay]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_RELOAD_LOCK--}: {%pipe,createFancyTime=$content[forced_campaign_reload_lock]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_STATUS--}: {%pipe,translateForcedCampaignStatus=$content[forced_campaign_status]%} +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_edit_forced_costs.tpl b/templates/de/emails/admin/admin_edit_forced_costs.tpl index 36a7e46be1..95431d53a2 100644 --- a/templates/de/emails/admin/admin_edit_forced_costs.tpl +++ b/templates/de/emails/admin/admin_edit_forced_costs.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde soeben Forced-Preise geändert. +es wurde soeben Forced-Preise geändert. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl index d486231604..d4941d9f08 100644 --- a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde eine URL aus der Surfbar geändert. +es wurde eine URL aus der Surfbar geändert. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_holiday_unlock.tpl b/templates/de/emails/admin/admin_holiday_unlock.tpl index 5d1bc9e165..b3a9aa34b7 100644 --- a/templates/de/emails/admin/admin_holiday_unlock.tpl +++ b/templates/de/emails/admin/admin_holiday_unlock.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurden folgende Mitglieder-Account durch die Urlaubsschaltung wieder freigegeben: +es wurden folgende Mitglieder-Account durch die Urlaubsschaltung wieder freigegeben: -------------------------------- $content diff --git a/templates/de/emails/admin/admin_report_bug.tpl b/templates/de/emails/admin/admin_report_bug.tpl index 51e42f3563..1981f441dc 100644 --- a/templates/de/emails/admin/admin_report_bug.tpl +++ b/templates/de/emails/admin/admin_report_bug.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurde soeben ein Bug im {?mt_word?}-Script erkannt. Hier ist der Fehlertext: +es wurde soeben ein Bug im {?mt_word?}-Script erkannt. Hier ist der Fehlertext: ------------------------------ Fehlermeldung: $content[message] diff --git a/templates/de/emails/member/member_edit_forced_ads.tpl b/templates/de/emails/member/member_edit_forced_ads.tpl new file mode 100644 index 0000000000..d28dfaaf9e --- /dev/null +++ b/templates/de/emails/member/member_edit_forced_ads.tpl @@ -0,0 +1,35 @@ +Hallo {%user,gender,translateGender=$content[forced_ads_userid]%} {%user,surname=$content[forced_ads_userid]%} {%user,family=$content[forced_ads_userid]%}, + +es wurde soeben eines Ihrer Forced-Werbemittel geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ADMIN_FORCED_ADS_ID--}: $content[forced_ads_id] +------------------------------------------ +{--ADMIN_FORCED_ADS_AD_URL--}: $content[forced_ads_ad_url] +------------------------------------------ +{--ADMIN_FORCED_ADS_ALTERNATE_TEXT--}: $content[forced_ads_alt_text] +------------------------------------------ +{--ADMIN_FORCED_ADS_CLICK_URL--}: $content[forced_ads_click_url] +------------------------------------------ +{--ADMIN_FORCED_ADS_WIDTH--}: {%pipe,translateComma=$content[forced_ads_width]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_HEIGHT--}: {%pipe,translateComma=$content[forced_ads_height]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_USERID--}: $content[forced_ads_userid] +------------------------------------------ +{--ADMIN_FORCED_ADS_TYPE--}: {%pipe,translateForcedAdsType=$content[forced_ads_type]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_HAS_FRAMEBREAKER--}: {%pipe,translateYesNo=$content[forced_ads_framebreaker]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_VIEWS_COUNTER--}: {%pipe,translateComma=$content[forced_ads_views_counter]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_CLICKS_COUNTER--}: {%pipe,translateComma=$content[forced_ads_clicks_counter]%} +------------------------------------------ +{--ADMIN_FORCED_ADS_ADDED--}: $content[forced_ads_added] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_edit_forced_campaigns.tpl b/templates/de/emails/member/member_edit_forced_campaigns.tpl new file mode 100644 index 0000000000..eaadce0057 --- /dev/null +++ b/templates/de/emails/member/member_edit_forced_campaigns.tpl @@ -0,0 +1,31 @@ +Hallo {%user,gender,translateGender=$content[forced_campaign_userid]%} {%user,surname=$content[forced_campaign_userid]%} {%user,family=$content[forced_campaign_userid]%}, + +es wurde soeben einer Ihrer Forced-Kampagnen geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ID--}: $content[forced_campaign_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ADS_ID--}: $content[forced_ads_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_COSTS_ID--}: $content[forced_costs_id] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_USERID--}: {%pipe,convertZeroToNull=$content[forced_campaign_userid]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_CREATED--}: $content[forced_campaign_created] +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_ORDERED_CLICKS--}: {%pipe,translateComma=$content[forced_campaign_ordered_clicks]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_PAYMENT_API--}: {%pipe,translateComma=$content[forced_campaign_payment_api]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_MINIMUM_STAY--}: {%pipe,createFancyTime=$content[forced_campaign_minimum_stay]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_RELOAD_LOCK--}: {%pipe,createFancyTime=$content[forced_campaign_reload_lock]%} +------------------------------------------ +{--ADMIN_FORCED_CAMPAIGN_STATUS--}: {%pipe,translateForcedCampaignStatus=$content[forced_campaign_status]%} +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl index f04793b2aa..386e198540 100644 --- a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl @@ -31,9 +31,9 @@ - {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--} + {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--} $content[forced_campaign_userid] - + {--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--} diff --git a/templates/xml/admin/admin_edit_do_forced_campaigns.xml b/templates/xml/admin/admin_edit_do_forced_campaigns.xml new file mode 100644 index 0000000000..e01db822bc --- /dev/null +++ b/templates/xml/admin/admin_edit_do_forced_campaigns.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5