From 517ed50cc4e716f1d34fbfc3a1befcba591eb698 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Oct 2012 19:44:10 +0000 Subject: [PATCH] Extension ext-user (sub-id tracking) continued: - Editing/deleting of sub ids by admin basicly finished - Renamed some templates to have separate templates for admin action and member action - Removed comments in inc/filters.php so build-mails will only be sent if at least one row as been affected - Other minor things fixed --- .gitattributes | 8 ++ inc/filters.php | 4 +- inc/functions.php | 4 +- inc/language/de.php | 2 +- inc/language/user_de.php | 17 ++- inc/module-functions.php | 5 +- inc/mysql-manager.php | 4 +- .../de/emails/admin/admin_coupon_cashed.tpl | 2 +- .../admin_delete_mem_delete_user_subids.tpl | 21 +++ .../emails/admin/admin_delete_user_subids.tpl | 2 +- .../admin/admin_edit_mem_edit_user_subids.tpl | 21 +++ .../emails/admin/admin_edit_user_subids.tpl | 2 +- .../member_delete_mem_delete_user_subids.tpl | 17 +++ .../member/member_delete_user_subids.tpl | 2 +- .../member_edit_mem_edit_user_subids.tpl | 17 +++ .../emails/member/member_edit_user_subids.tpl | 2 +- .../de/html/admin/admin_admins_mails_edit.tpl | 2 +- .../html/admin/admin_delete_user_subids.tpl | 24 ++++ .../admin/admin_delete_user_subids_row.tpl | 13 ++ .../de/html/admin/admin_edit_admin_menu.tpl | 2 +- .../admin_edit_config_network_type_form.tpl | 12 +- .../html/admin/admin_edit_forced_ads_row.tpl | 16 +-- .../admin/admin_edit_forced_campaigns_row.tpl | 14 +- .../admin/admin_edit_forced_costs_row.tpl | 6 +- .../de/html/admin/admin_edit_guest_menu.tpl | 2 +- templates/de/html/admin/admin_edit_mods.tpl | 2 +- .../html/admin/admin_edit_points_data_row.tpl | 10 +- .../html/admin/admin_edit_surfbar_actions.tpl | 2 +- .../admin/admin_edit_surfbar_actions_row.tpl | 6 +- .../de/html/admin/admin_edit_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_edit_user_subids.tpl | 24 ++++ .../html/admin/admin_edit_user_subids_row.tpl | 13 ++ .../de/html/admin/admin_list_task_delete.tpl | 8 +- .../xml/admin/admin_delete_do_user_subid.xml | 82 +++++++++++ .../admin/admin_delete_show_user_subid.xml | 106 ++++++++++++++ .../xml/admin/admin_edit_do_forced_ads.xml | 2 +- .../xml/admin/admin_edit_do_user_subid.xml | 87 ++++++++++++ .../xml/admin/admin_edit_show_user_subid.xml | 132 ++++++++++++++++++ theme/org/theme.php | 13 +- theme/schleuder/theme.php | 10 +- theme/ship-simu/theme.php | 13 +- 41 files changed, 652 insertions(+), 81 deletions(-) create mode 100644 templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl create mode 100644 templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl create mode 100644 templates/de/emails/member/member_delete_mem_delete_user_subids.tpl create mode 100644 templates/de/emails/member/member_edit_mem_edit_user_subids.tpl create mode 100644 templates/de/html/admin/admin_delete_user_subids.tpl create mode 100644 templates/de/html/admin/admin_delete_user_subids_row.tpl create mode 100644 templates/de/html/admin/admin_edit_user_subids.tpl create mode 100644 templates/de/html/admin/admin_edit_user_subids_row.tpl create mode 100644 templates/xml/admin/admin_delete_do_user_subid.xml create mode 100644 templates/xml/admin/admin_delete_show_user_subid.xml create mode 100644 templates/xml/admin/admin_edit_do_user_subid.xml create mode 100644 templates/xml/admin/admin_edit_show_user_subid.xml diff --git a/.gitattributes b/.gitattributes index e36d721622..85ea562c34 100644 --- a/.gitattributes +++ b/.gitattributes @@ -903,12 +903,14 @@ templates/de/emails/admin/admin_coupon_code.tpl svneol=native#text/plain templates/de/emails/admin/admin_coupon_purge.tpl svneol=native#text/plain templates/de/emails/admin/admin_coupon_purge_row.tpl svneol=native#text/plain templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain +templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain 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_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 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain @@ -1042,11 +1044,13 @@ templates/de/emails/member/member_coupon.tpl svneol=native#text/plain templates/de/emails/member/member_coupon_code.tpl svneol=native#text/plain templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain +templates/de/emails/member/member_delete_mem_delete_user_subids.tpl svneol=native#text/plain templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/member/member_delete_user_subids.tpl svneol=native#text/plain 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_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 templates/de/emails/member/member_forced_campaign_pending_active.tpl svneol=native#text/plain @@ -1338,6 +1342,8 @@ templates/de/html/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_surfbar_urls_row.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_transfer_row.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_user.tpl svneol=native#text/plain +templates/de/html/admin/admin_delete_user_subids.tpl svneol=native#text/plain +templates/de/html/admin/admin_delete_user_subids_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_admin_menu_form.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_admin_menu_row.tpl svneol=native#text/plain @@ -1406,6 +1412,8 @@ templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain templates/de/html/admin/admin_email_archiv.tpl svneol=native#text/plain templates/de/html/admin/admin_email_archiv_row.tpl svneol=native#text/plain templates/de/html/admin/admin_email_nav_row.tpl svneol=native#text/plain diff --git a/inc/filters.php b/inc/filters.php index 4bdb699670..d69f999d26 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1238,10 +1238,10 @@ 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'] == 1) { + if ($filterData['affected'] > 0) { // Then call the proper function call_user_func_array('sendGenericBuildMails', $filterData); - //} // END - if + } // END - if // Return data return $filterData; diff --git a/inc/functions.php b/inc/functions.php index a97a707f38..951f7e0e18 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2329,7 +2329,7 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti setPostRequestElement('userid', getMemberId()); // Call generic change method - $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles); + $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles, 'mem_edit'); // Was this fine? if ($affected == countPostSelection($idColumn[0])) { @@ -2371,7 +2371,7 @@ function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunc setPostRequestElement('userid', getMemberId()); // Call generic function - $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles); + $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles, 'mem_delete'); // Was this fine? if ($affected == countPostSelection($idColumn[0])) { diff --git a/inc/language/de.php b/inc/language/de.php index 6d31a0c127..6625f85f98 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -47,7 +47,7 @@ addMessages(array( 'MODULE_REGISTRY_404' => "Modul {%pipe,getModule%} existiert nicht.", 'MODULE_REGISTRY_LOCKED_404' => "Gsperrtes Modul {%pipe,getModule%} existiert nicht.", 'MODULE_REGISTRY_IS_LOCKED' => "Das Modul {%pipe,getModule%} wurde gesperrt.", - 'MODULE_ERROR_404' => "Fehler: Modul nicht gefunden", + 'MODULE_ERROR_404_TITLE' => "Fehler: Modul nicht gefunden", 'UNKNOWN_MODULE_DETECTED_TITLE' => "Unbekanntes Modul '%s'", 'MAILER_WARNING' => "Warnung", 'DIE_CONFIG_CHANGED_YOU' => "Sie haben Ihre Config-Datei editiert! Auf Wiedersehen...", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index 92d20973b2..99dce95edb 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -138,6 +138,8 @@ addMessages(array( 'ADMIN_DELETE_USER_SUBID_SUBMIT' => "Sub-Id löschen", 'ADMIN_EDIT_USER_SUBID_SUBMIT' => "Sub-Id editieren", 'ADMIN_DELETE_USER_SUBID_STATS_SUBMIT' => "Sub-Id Logbuch *sofort* löschen", + 'ADMIN_CHANGE_USER_SUBID_SUBMIT' => "Sub-Ids ändern", + 'ADMIN_REMOVE_USER_SUBID_SUBMIT' => "Sub-Ids löschen", // Member/admin - sub ids - notices 'MEMBER_ADD_USER_SUBIDS_NOTICE' => "Hinweise: Mit Sub-Ids haben Sie die Möglichkeit, die Aufrufe Ihres Referral-Linkes noch genauer zu verfolgen. Zum Beispiel können Sie jedem Besuchertausch oder fremden Paidmailer eine eigene Sub-Id vergeben, indem Sie diese hier zuerst eingeben und dann am Ende des Referral-Linkes mit &subid=Ihre Sub-Id anhängen. Bewerben Sie nun diesen erweiterten Link. Sobald Aufrufe auf diesen erfolgen, können Sie bei der jeweiligen Sub-Id auf "Aufruf-Statistik" klicken, um eine detailierte Statistik zu erhalten. Leerzeichen oder Bindestrichen werden automatisch in Unterstriche umgewandelt, es wurden nur Zeichen von A-Z (klein- und grossgeschrieben) und alle Zahlenzeichen sowie Unterstriche angenommen.", @@ -153,13 +155,21 @@ addMessages(array( 'MEMBER_DELETE_USER_SUBIDS_TITLE' => "Ausgewählte Sub-Ids löschen", 'MEMBER_SUBID_STATS_TITLE' => "Aufrufstatistik für Ihre Sub-Ids", + // Admin - sub ids - titles + 'ADMIN_EDIT_USER_SUBID_TITLE' => "Ausgewählte Sub-Ids ändern", + 'ADMIN_DELETE_USER_SUBID_TITLE' => "Ausgewählte Sub-Ids löschen", + // Admin/member - sub ids - subject lines 'ADMIN_ADD_USER_SUBIDS_SUBJECT' => "Sub-Id wurde hinzugefügt", - 'ADMIN_EDIT_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id geändert", - 'ADMIN_DELETE_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id gelöscht", + 'ADMIN_EDIT_USER_SUBIDS_SUBJECT' => "Änderung einer Sub-Id", + 'ADMIN_MEM_EDIT_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id geändert", + 'ADMIN_DELETE_USER_SUBIDS_SUBJECT' => "Eine Sub-Id wurde gelöscht", + 'ADMIN_MEM_DELETE_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id gelöscht", 'MEMBER_ADD_USER_SUBIDS_SUBJECT' => "Neue Sub-Id hinzugefügt", 'MEMBER_EDIT_USER_SUBIDS_SUBJECT' => "Änderung Ihrer Sub-Id", - 'MEMBER_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id ist gelöscht", + 'MEMBER_MEM_EDIT_USER_SUBIDS_SUBJECT' => "Änderung Ihrer Sub-Id", + 'MEMBER_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id wurde gelöscht", + 'MEMBER_MEM_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id ist gelöscht", // Admin - sub ids - action link 'ADMIN_USER_ACTION_LINK_LIST_USER_SUBID_TITLE' => "Sub-Ids des Mitgliedes auflisten und Statistik einsehen", @@ -172,6 +182,7 @@ addMessages(array( 'ADMIN_LIST_USER_SUBID_STATS_TITLE' => "Aufruflogbuch vom Mitglied {%get,generateUserProfileLink=userid%} und Sub-Id {%get,getSubId=id%}", 'ADMIN_USER_SUBID_STATS_LINK' => "Logbucheinträge auflisten", 'ADMIN_USER_SUBID_NO_SELECTIONS' => "Sie haben keine Einträge ausgewählt oder es liegt ein Fehler vor. Bitte melden Sie dies im Bug-Tracker (auch wie es dazu gekommen ist).", + 'ADMIN_CHANGE_USER_SUBID' => "Sub-Id ändern:", // Generic - subids 'SUBID_VALUE' => "Sub-Id:", diff --git a/inc/module-functions.php b/inc/module-functions.php index 83f166696c..9c1c823b64 100644 --- a/inc/module-functions.php +++ b/inc/module-functions.php @@ -81,7 +81,7 @@ function getModuleTitle ($module) { // Is it 'error'? if ($module == 'error') { // Error (real module was not found) - $data['title'] = '{--MODULE_ERROR_404--}'; + $data['title'] = '{--MODULE_ERROR_404_TITLE--}'; } else { // No name found $data['title'] = '{%message,UNKNOWN_MODULE_DETECTED_TITLE=' . $module . '%}'; @@ -420,9 +420,6 @@ function loadModule () { // By default all modules are invalid $isModuleValid = false; - // Init module state as 'failed' (always failed first) - $moduleState = 'failed'; - // Construct module name $GLOBALS['module_inc'] = sprintf("inc/modules/%s.php", getModule()); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index db1db43c10..3aa4beb6de 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -2089,7 +2089,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = } // Edit rows by given id numbers -function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) { +function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $subject = '') { // Change them all $affected = '0'; foreach (postRequestElement($idColumn[0]) as $id => $sel) { @@ -2178,7 +2178,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun 'table_name' => $tableName, 'content' => $content, 'id' => $id, - 'subject' => '', + 'subject' => $subject, 'userid_column' => $userIdColumn, 'raw_userid' => $rawUserId, 'affected' => $edited, diff --git a/templates/de/emails/admin/admin_coupon_cashed.tpl b/templates/de/emails/admin/admin_coupon_cashed.tpl index a1504cdd36..9af883785f 100644 --- a/templates/de/emails/admin/admin_coupon_cashed.tpl +++ b/templates/de/emails/admin/admin_coupon_cashed.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -es wurde soeben ein Gutschein durch ein Mitglied eingelöst. +es wurde soeben ein Gutschein von einem Mitglied eingelöst. Hier sind alle Daten des Gutscheins: ------------------------------------ diff --git a/templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl b/templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl new file mode 100644 index 0000000000..59fcea36ad --- /dev/null +++ b/templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl @@ -0,0 +1,21 @@ +Hallo Administrator, + +Das Mitglied $content[userid] hat soeben eine Sub-Id gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +Sub-Id Kennung: $content[id] +------------------------------------------ +Sub-Id: $content[subid] +------------------------------------------ +Hinzugefügt: $content[subid_added] +------------------------------------------ +Vorname: {%user,surname=$content[userid]%} +Nachname: {%user,family=$content[userid]%} +Email-Adresse: {%user,email=$content[userid]%} +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_delete_user_subids.tpl b/templates/de/emails/admin/admin_delete_user_subids.tpl index 59fcea36ad..86666ae02c 100644 --- a/templates/de/emails/admin/admin_delete_user_subids.tpl +++ b/templates/de/emails/admin/admin_delete_user_subids.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Das Mitglied $content[userid] hat soeben eine Sub-Id gelöscht. +es wurde soeben eine Sub-Id von einem Administrator gelöscht. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl b/templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl new file mode 100644 index 0000000000..d04ba87702 --- /dev/null +++ b/templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl @@ -0,0 +1,21 @@ +Hallo Administrator, + +Das Mitglied $content[userid] hat soeben eine Sub-Id geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +Sub-Id Kennung: $content[id] +------------------------------------------ +Sub-Id: $content[subid] +------------------------------------------ +Hinzugefügt: $content[subid_added] +------------------------------------------ +Vorname: {%user,surname=$content[userid]%} +Nachname: {%user,family=$content[userid]%} +Email-Adresse: {%user,email=$content[userid]%} +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_edit_user_subids.tpl b/templates/de/emails/admin/admin_edit_user_subids.tpl index d04ba87702..d5a467ca0a 100644 --- a/templates/de/emails/admin/admin_edit_user_subids.tpl +++ b/templates/de/emails/admin/admin_edit_user_subids.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Das Mitglied $content[userid] hat soeben eine Sub-Id geändert. +es wurde soeben eine Sub-Id von einem Administrator geändert. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl b/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl new file mode 100644 index 0000000000..9ce7ab432c --- /dev/null +++ b/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl @@ -0,0 +1,17 @@ +Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}, + +Sie haben soeben eine Ihrer Sub-Id gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +Sub-Id Kennung: $content[id] +------------------------------------------ +Sub-Id: $content[subid] +------------------------------------------ +Hinzugefügt: $content[subid_added] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_delete_user_subids.tpl b/templates/de/emails/member/member_delete_user_subids.tpl index 9ce7ab432c..1d48a1443b 100644 --- a/templates/de/emails/member/member_delete_user_subids.tpl +++ b/templates/de/emails/member/member_delete_user_subids.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}, -Sie haben soeben eine Ihrer Sub-Id gelöscht. +eine Ihrer Sub-Ids wurde soeben durch einen Administrator gelöscht. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl b/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl new file mode 100644 index 0000000000..68cd83bbf3 --- /dev/null +++ b/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl @@ -0,0 +1,17 @@ +Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}, + +Sie haben soeben eine Ihrer Sub-Id geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +Sub-Id Kennung: $content[id] +------------------------------------------ +Sub-Id: $content[subid] +------------------------------------------ +Hinzugefügt: $content[subid_added] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_edit_user_subids.tpl b/templates/de/emails/member/member_edit_user_subids.tpl index 68cd83bbf3..240cbb3ce4 100644 --- a/templates/de/emails/member/member_edit_user_subids.tpl +++ b/templates/de/emails/member/member_edit_user_subids.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}, -Sie haben soeben eine Ihrer Sub-Id geändert. +einer Ihrer Sub-Ids wurde soeben durch einen Administrator geändert. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl index 76fda6e1c7..0cfa2c00af 100644 --- a/templates/de/html/admin/admin_admins_mails_edit.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit.tpl @@ -17,7 +17,7 @@ $content - + diff --git a/templates/de/html/admin/admin_delete_user_subids.tpl b/templates/de/html/admin/admin_delete_user_subids.tpl new file mode 100644 index 0000000000..a1b757b060 --- /dev/null +++ b/templates/de/html/admin/admin_delete_user_subids.tpl @@ -0,0 +1,24 @@ +
+
+ + + + + + + + + +$content + + + +
+ {--ADMIN_DELETE_USER_SUBID_TITLE--} +
{--ID_SELECT--}{--SUBID_VALUE--}{--SUBID_ADDED--}
+ + + +
+
+
diff --git a/templates/de/html/admin/admin_delete_user_subids_row.tpl b/templates/de/html/admin/admin_delete_user_subids_row.tpl new file mode 100644 index 0000000000..0aa903c564 --- /dev/null +++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl @@ -0,0 +1,13 @@ + + + $content[id] + + + + {--SUBID_VALUE--} + $content[subid] + + + $content[subid_added] + + diff --git a/templates/de/html/admin/admin_edit_admin_menu.tpl b/templates/de/html/admin/admin_edit_admin_menu.tpl index 43ac8a7d5a..27e04bb204 100644 --- a/templates/de/html/admin/admin_edit_admin_menu.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu.tpl @@ -12,7 +12,7 @@ $content[rows] - + diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl index e32a887ed1..450452c9fd 100644 --- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl @@ -11,32 +11,32 @@
- {--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--} + {--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--} {%template,NoYesSelectionBox=set_all%}
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})
+ {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--}) $content[network_max_reload_time] ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME--}
+ {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS--}
+ {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT--}
+ {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC--}
+ {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC
diff --git a/templates/de/html/admin/admin_edit_forced_ads_row.tpl b/templates/de/html/admin/admin_edit_forced_ads_row.tpl index 2c70a09aea..9892c4a9b8 100644 --- a/templates/de/html/admin/admin_edit_forced_ads_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_ads_row.tpl @@ -5,37 +5,37 @@ $content[forced_ads_added] - {--ADMIN_CHANGE_FORCED_ADS_AD_URL--}
+ {--ADMIN_CHANGE_FORCED_ADS_AD_URL--} - {--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--}
+ {--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--} - {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}
+ {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--} - {--ADMIN_CHANGE_FORCED_ADS_WIDTH--}
+ {--ADMIN_CHANGE_FORCED_ADS_WIDTH--} - {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}
+ {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--} - {--ADMIN_CHANGE_FORCED_ADS_USERID--}
+ {--ADMIN_CHANGE_FORCED_ADS_USERID--} $content[forced_ads_userid] - {--ADMIN_CHANGE_FORCED_ADS_TYPE--}
+ {--ADMIN_CHANGE_FORCED_ADS_TYPE--} @@ -43,7 +43,7 @@ - {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}
+ {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--} 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 9077e3e9d2..f04793b2aa 100644 --- a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl @@ -5,38 +5,38 @@ $content[forced_campaign_created] - {--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--} - {--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--} - {--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--} $content[forced_campaign_reload_lock] - {--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--} - {--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--} {%template,ForcedAdSelectionBox=$content[forced_ads_id]%} - {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--} $content[forced_campaign_userid] - {--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--}
+ {--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--} {%template,ForcedCostsSelectionBox=$content[forced_costs_id]%} diff --git a/templates/de/html/admin/admin_edit_forced_costs_row.tpl b/templates/de/html/admin/admin_edit_forced_costs_row.tpl index 394a7dd741..43d37ab645 100644 --- a/templates/de/html/admin/admin_edit_forced_costs_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_costs_row.tpl @@ -1,17 +1,17 @@ - {--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--}
+ {--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--} ({?POINTS?}) - {--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--}
+ {--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--} ({?POINTS?}) - {--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--}
+ {--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--} diff --git a/templates/de/html/admin/admin_edit_guest_menu.tpl b/templates/de/html/admin/admin_edit_guest_menu.tpl index 58e5899fdc..9afacc1e92 100644 --- a/templates/de/html/admin/admin_edit_guest_menu.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu.tpl @@ -11,7 +11,7 @@ $content[rows] - + diff --git a/templates/de/html/admin/admin_edit_mods.tpl b/templates/de/html/admin/admin_edit_mods.tpl index 6ebfb0b520..b5b5380c69 100644 --- a/templates/de/html/admin/admin_edit_mods.tpl +++ b/templates/de/html/admin/admin_edit_mods.tpl @@ -17,7 +17,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_points_data_row.tpl b/templates/de/html/admin/admin_edit_points_data_row.tpl index c357f479f4..81da17b8a9 100644 --- a/templates/de/html/admin/admin_edit_points_data_row.tpl +++ b/templates/de/html/admin/admin_edit_points_data_row.tpl @@ -5,20 +5,20 @@
({%pipe,translatePointsSubject=$content[subject]%})
- {--ADMIN_POINTS_ACCOUNT_COLUMN_NAME--}
+ {--ADMIN_POINTS_ACCOUNT_COLUMN_NAME {%pipe,translatePointsAccountType=$content[column_name]%} - {--ADMIN_CHANGE_POINTS_LOCKED_MODE--}
+ {--ADMIN_CHANGE_POINTS_LOCKED_MODE - {--ADMIN_CHANGE_POINTS_PAYMENT_METHOD--}
+ {--ADMIN_CHANGE_POINTS_PAYMENT_METHOD @@ -27,13 +27,13 @@ - {--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT--}
+ {--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT - {--ADMIN_POINTS_ACCOUNT_PROVIDER--}
+ {--ADMIN_POINTS_ACCOUNT_PROVIDER {%pipe,translatePointsAccountProvider=$content[account_provider]%} diff --git a/templates/de/html/admin/admin_edit_surfbar_actions.tpl b/templates/de/html/admin/admin_edit_surfbar_actions.tpl index 4396f8d56d..4954f4ed11 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions.tpl @@ -9,7 +9,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl index f3750ab957..9dac53adb3 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl @@ -5,18 +5,18 @@ $content[actions_id] - {--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--}
+ {--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS {%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%} - {--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--}
+ {--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION {%template,SurfbarActionsActionSelectionBox=$content[actions_id]%} - {--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--}
+ {--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS {%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%} diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index d3e9ecd12e..b5e5951e7a 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -13,7 +13,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_user_subids.tpl b/templates/de/html/admin/admin_edit_user_subids.tpl new file mode 100644 index 0000000000..46cc969490 --- /dev/null +++ b/templates/de/html/admin/admin_edit_user_subids.tpl @@ -0,0 +1,24 @@ +
+
+ + + + + + + + + +$content + + + +
+ {--ADMIN_EDIT_USER_SUBID_TITLE--} +
{--ID_SELECT--}{--SUBID_VALUE--}{--SUBID_ADDED--}
+ + + +
+
+
diff --git a/templates/de/html/admin/admin_edit_user_subids_row.tpl b/templates/de/html/admin/admin_edit_user_subids_row.tpl new file mode 100644 index 0000000000..fa72be2207 --- /dev/null +++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl @@ -0,0 +1,13 @@ + + + $content[id] + + + + {--ADMIN_CHANGE_USER_SUBID--} + + + + $content[subid_added] + + diff --git a/templates/de/html/admin/admin_list_task_delete.tpl b/templates/de/html/admin/admin_list_task_delete.tpl index ffc3efa269..4ffec561ca 100644 --- a/templates/de/html/admin/admin_list_task_delete.tpl +++ b/templates/de/html/admin/admin_list_task_delete.tpl @@ -19,10 +19,10 @@ $content[rows] - - - - + + + + diff --git a/templates/xml/admin/admin_delete_do_user_subid.xml b/templates/xml/admin/admin_delete_do_user_subid.xml new file mode 100644 index 0000000000..39fd0bdc77 --- /dev/null +++ b/templates/xml/admin/admin_delete_do_user_subid.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_delete_show_user_subid.xml b/templates/xml/admin/admin_delete_show_user_subid.xml new file mode 100644 index 0000000000..14539c2c0c --- /dev/null +++ b/templates/xml/admin/admin_delete_show_user_subid.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_edit_do_forced_ads.xml b/templates/xml/admin/admin_edit_do_forced_ads.xml index a2df42ff15..3818cea1e0 100644 --- a/templates/xml/admin/admin_edit_do_forced_ads.xml +++ b/templates/xml/admin/admin_edit_do_forced_ads.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_edit_show_user_subid.xml b/templates/xml/admin/admin_edit_show_user_subid.xml new file mode 100644 index 0000000000..74a562eda3 --- /dev/null +++ b/templates/xml/admin/admin_edit_show_user_subid.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme/org/theme.php b/theme/org/theme.php index fa72890eb4..d62b43ac79 100644 --- a/theme/org/theme.php +++ b/theme/org/theme.php @@ -62,14 +62,13 @@ $GLOBALS['theme_data']['version'] = '0.0.0'; if (empty($GLOBALS['theme_mode'])) $GLOBALS['theme_mode'] = 'load'; // Switch mode -switch ($GLOBALS['theme_mode']) -{ -case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' - break; +switch ($GLOBALS['theme_mode']) { + case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' + break; -case 'load': // Do stuff while theme is loaded normally - break; -} + case 'load': // Do stuff while theme is loaded normally + break; +} // END - if // [EOF] ?> diff --git a/theme/schleuder/theme.php b/theme/schleuder/theme.php index e460dc737c..375e188366 100644 --- a/theme/schleuder/theme.php +++ b/theme/schleuder/theme.php @@ -62,12 +62,12 @@ $GLOBALS['theme_data']['version'] = '0.0.0'; if (empty($GLOBALS['theme_mode'])) $GLOBALS['theme_mode'] = 'load'; switch ($GLOBALS['theme_mode']) { -case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' - break; + case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' + break; -case 'load': // Do stuff while theme is loaded normally - break; -} + case 'load': // Do stuff while theme is loaded normally + break; +} // END - if // [EOF] ?> diff --git a/theme/ship-simu/theme.php b/theme/ship-simu/theme.php index 1e81721814..512c37cd7e 100644 --- a/theme/ship-simu/theme.php +++ b/theme/ship-simu/theme.php @@ -61,14 +61,13 @@ $GLOBALS['theme_data']['version'] = '0.0.0'; // Switch mode if (empty($GLOBALS['theme_mode'])) $GLOBALS['theme_mode'] = 'load'; -switch ($GLOBALS['theme_mode']) -{ -case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' - break; +switch ($GLOBALS['theme_mode']) { + case 'test': // Do stuff while testing the theme: The admin clicked on 'Import' + break; -case 'load': // Do stuff while theme is loaded normally - break; -} + case 'load': // Do stuff while theme is loaded normally + break; +} // END - switch // [EOF] ?> -- 2.30.2