]> git.mxchange.org Git - mailer.git/commitdiff
Extension ext-user (sub-id tracking) continued:
authorquix0r <quix0r@mxchange.org>
Wed, 17 Oct 2012 19:44:10 +0000 (19:44 +0000)
committerquix0r <quix0r@mxchange.org>
Wed, 17 Oct 2012 19:44:10 +0000 (19:44 +0000)
- 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

41 files changed:
.gitattributes
inc/filters.php
inc/functions.php
inc/language/de.php
inc/language/user_de.php
inc/module-functions.php
inc/mysql-manager.php
templates/de/emails/admin/admin_coupon_cashed.tpl
templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_delete_user_subids.tpl
templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_edit_user_subids.tpl
templates/de/emails/member/member_delete_mem_delete_user_subids.tpl [new file with mode: 0644]
templates/de/emails/member/member_delete_user_subids.tpl
templates/de/emails/member/member_edit_mem_edit_user_subids.tpl [new file with mode: 0644]
templates/de/emails/member/member_edit_user_subids.tpl
templates/de/html/admin/admin_admins_mails_edit.tpl
templates/de/html/admin/admin_delete_user_subids.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_user_subids_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_admin_menu.tpl
templates/de/html/admin/admin_edit_config_network_type_form.tpl
templates/de/html/admin/admin_edit_forced_ads_row.tpl
templates/de/html/admin/admin_edit_forced_campaigns_row.tpl
templates/de/html/admin/admin_edit_forced_costs_row.tpl
templates/de/html/admin/admin_edit_guest_menu.tpl
templates/de/html/admin/admin_edit_mods.tpl
templates/de/html/admin/admin_edit_points_data_row.tpl
templates/de/html/admin/admin_edit_surfbar_actions.tpl
templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
templates/de/html/admin/admin_edit_surfbar_urls.tpl
templates/de/html/admin/admin_edit_user_subids.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_user_subids_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_task_delete.tpl
templates/xml/admin/admin_delete_do_user_subid.xml [new file with mode: 0644]
templates/xml/admin/admin_delete_show_user_subid.xml [new file with mode: 0644]
templates/xml/admin/admin_edit_do_forced_ads.xml
templates/xml/admin/admin_edit_do_user_subid.xml [new file with mode: 0644]
templates/xml/admin/admin_edit_show_user_subid.xml [new file with mode: 0644]
theme/org/theme.php
theme/schleuder/theme.php
theme/ship-simu/theme.php

index e36d72162205d671ea0437a0835f962bfb015656..85ea562c3493cf6f8613e2642d97ce948ba74d8c 100644 (file)
@@ -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
index 4bdb699670d53af0b484ed6de81bc42c4f41fc6c..d69f999d2665876f910ffce9d93b02fa7b4c264a 100644 (file)
@@ -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;
index a97a707f38f92cd91a6f27b93344005022294721..951f7e0e18285968e922fe0cdf65fa1a2b20af41 100644 (file)
@@ -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])) {
index 6d31a0c1274bcf7c92363041610a66c542fa7048..6625f85f987402129f984120b708c4833fb378d1 100644 (file)
@@ -47,7 +47,7 @@ addMessages(array(
        'MODULE_REGISTRY_404' => "Modul <span class=\"data\">{%pipe,getModule%}</span> existiert nicht.",
        'MODULE_REGISTRY_LOCKED_404' => "Gsperrtes Modul <span class=\"data\">{%pipe,getModule%}</span> existiert nicht.",
        'MODULE_REGISTRY_IS_LOCKED' => "Das Modul <span class=\"data\">{%pipe,getModule%}</span> wurde gesperrt.",
-       'MODULE_ERROR_404' => "Fehler: Modul nicht gefunden",
+       'MODULE_ERROR_404_TITLE' => "Fehler: Modul nicht gefunden",
        'UNKNOWN_MODULE_DETECTED_TITLE' => "Unbekanntes Modul &#39;%s&#39;",
        'MAILER_WARNING' => "Warnung",
        'DIE_CONFIG_CHANGED_YOU' => "Sie haben Ihre Config-Datei editiert! Auf Wiedersehen...",
index 92d20973b23ecfec5741670da826a169aef5c41c..99dce95edb626de36cf38cfa0e6964b6c5f08018 100644 (file)
@@ -138,6 +138,8 @@ addMessages(array(
        'ADMIN_DELETE_USER_SUBID_SUBMIT' => "Sub-Id l&ouml;schen",
        'ADMIN_EDIT_USER_SUBID_SUBMIT' => "Sub-Id editieren",
        'ADMIN_DELETE_USER_SUBID_STATS_SUBMIT' => "Sub-Id Logbuch *sofort* l&ouml;schen",
+       'ADMIN_CHANGE_USER_SUBID_SUBMIT' => "Sub-Ids &auml;ndern",
+       'ADMIN_REMOVE_USER_SUBID_SUBMIT' => "Sub-Ids l&ouml;schen",
 
        // Member/admin - sub ids - notices
        'MEMBER_ADD_USER_SUBIDS_NOTICE' => "<strong>Hinweise:</strong> Mit Sub-Ids haben Sie die M&ouml;glichkeit, die Aufrufe Ihres Referral-Linkes noch genauer zu verfolgen. Zum Beispiel k&ouml;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 <strong>&amp;subid=<em>Ihre Sub-Id</em></strong> anh&auml;ngen. Bewerben Sie nun diesen erweiterten Link. Sobald Aufrufe auf diesen erfolgen, k&ouml;nnen Sie bei der jeweiligen Sub-Id auf &quot;Aufruf-Statistik&quot; 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&auml;hlte Sub-Ids l&ouml;schen",
        'MEMBER_SUBID_STATS_TITLE' => "Aufrufstatistik f&uuml;r Ihre Sub-Ids",
 
+       // Admin - sub ids - titles
+       'ADMIN_EDIT_USER_SUBID_TITLE' => "Ausgew&auml;hlte Sub-Ids &auml;ndern",
+       'ADMIN_DELETE_USER_SUBID_TITLE' => "Ausgew&auml;hlte Sub-Ids l&ouml;schen",
+
        // Admin/member - sub ids - subject lines
        'ADMIN_ADD_USER_SUBIDS_SUBJECT' => "Sub-Id wurde hinzugef&uuml;gt",
-       'ADMIN_EDIT_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id ge&auml;ndert",
-       'ADMIN_DELETE_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id gel&ouml;scht",
+       'ADMIN_EDIT_USER_SUBIDS_SUBJECT' => "&Auml;nderung einer Sub-Id",
+       'ADMIN_MEM_EDIT_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id ge&auml;ndert",
+       'ADMIN_DELETE_USER_SUBIDS_SUBJECT' => "Eine Sub-Id wurde gel&ouml;scht",
+       'ADMIN_MEM_DELETE_USER_SUBIDS_SUBJECT' => "Mitglied hat eine Sub-Id gel&ouml;scht",
        'MEMBER_ADD_USER_SUBIDS_SUBJECT' => "Neue Sub-Id hinzugef&uuml;gt",
        'MEMBER_EDIT_USER_SUBIDS_SUBJECT' => "&Auml;nderung Ihrer Sub-Id",
-       'MEMBER_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id ist gel&ouml;scht",
+       'MEMBER_MEM_EDIT_USER_SUBIDS_SUBJECT' => "&Auml;nderung Ihrer Sub-Id",
+       'MEMBER_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id wurde gel&ouml;scht",
+       'MEMBER_MEM_DELETE_USER_SUBIDS_SUBJECT' => "Ihre Sub-Id ist gel&ouml;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 <span class=\"data\">{%get,generateUserProfileLink=userid%}</span> und Sub-Id <span class=\"data\">{%get,getSubId=id%}</span>",
        'ADMIN_USER_SUBID_STATS_LINK' => "Logbucheintr&auml;ge auflisten",
        'ADMIN_USER_SUBID_NO_SELECTIONS' => "Sie haben keine Eintr&auml;ge ausgew&auml;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 &auml;ndern:",
 
        // Generic - subids
        'SUBID_VALUE' => "Sub-Id:",
index 83f166696cfa57c302559d5a3277d5e9ff1dc281..9c1c823b6428e5719345c9e556ce854afab029a5 100644 (file)
@@ -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());
 
index db1db43c106c11241a12ca79cf5915854f839db0..3aa4beb6de620e091c911eecf5e59e4bdfe295c1 100644 (file)
@@ -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,
index a1504cdd36185a455d7e8ac10c466ac4e066b3ab..9af883785f7d5e54ea69e3e589d5b1c41699e1e2 100644 (file)
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
-es wurde soeben ein Gutschein durch ein Mitglied eingel&ouml;st.
+es wurde soeben ein Gutschein von einem Mitglied eingel&ouml;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 (file)
index 0000000..59fcea3
--- /dev/null
@@ -0,0 +1,21 @@
+Hallo Administrator,
+
+Das Mitglied $content[userid] hat soeben eine Sub-Id gel&ouml;scht.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+Sub-Id Kennung: $content[id]
+------------------------------------------
+Sub-Id: $content[subid]
+------------------------------------------
+Hinzugef&uuml;gt: $content[subid_added]
+------------------------------------------
+Vorname: {%user,surname=$content[userid]%}
+Nachname: {%user,family=$content[userid]%}
+Email-Adresse: {%user,email=$content[userid]%}
+------------------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
index 59fcea36adee5b4f49ff1047e990dc5f0f22c05c..86666ae02ca313e1db29cd0efef9cc598a1d9148 100644 (file)
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
-Das Mitglied $content[userid] hat soeben eine Sub-Id gel&ouml;scht.
+es wurde soeben eine Sub-Id von einem Administrator gel&ouml;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 (file)
index 0000000..d04ba87
--- /dev/null
@@ -0,0 +1,21 @@
+Hallo Administrator,
+
+Das Mitglied $content[userid] hat soeben eine Sub-Id ge&auml;ndert.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+Sub-Id Kennung: $content[id]
+------------------------------------------
+Sub-Id: $content[subid]
+------------------------------------------
+Hinzugef&uuml;gt: $content[subid_added]
+------------------------------------------
+Vorname: {%user,surname=$content[userid]%}
+Nachname: {%user,family=$content[userid]%}
+Email-Adresse: {%user,email=$content[userid]%}
+------------------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
index d04ba87702aa4abbc74ec312fa156cd2e325ea2b..d5a467ca0ae80554cc6228843df4ee839ac016d2 100644 (file)
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
-Das Mitglied $content[userid] hat soeben eine Sub-Id ge&auml;ndert.
+es wurde soeben eine Sub-Id von einem Administrator ge&auml;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 (file)
index 0000000..9ce7ab4
--- /dev/null
@@ -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&ouml;scht.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+Sub-Id Kennung: $content[id]
+------------------------------------------
+Sub-Id: $content[subid]
+------------------------------------------
+Hinzugef&uuml;gt: $content[subid_added]
+------------------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})
index 9ce7ab432c51a6a52c328aca2ab2a9288e939890..1d48a1443b29d36300ab16712979a14208c9ed62 100644 (file)
@@ -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&ouml;scht.
+eine Ihrer Sub-Ids wurde soeben durch einen Administrator gel&ouml;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 (file)
index 0000000..68cd83b
--- /dev/null
@@ -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&auml;ndert.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+Sub-Id Kennung: $content[id]
+------------------------------------------
+Sub-Id: $content[subid]
+------------------------------------------
+Hinzugef&uuml;gt: $content[subid_added]
+------------------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})
index 68cd83bbf3152b3c600037c7df9f5dd27bff6ead..240cbb3ce41edf341279c6ce259b488e86a522a6 100644 (file)
@@ -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&auml;ndert.
+einer Ihrer Sub-Ids wurde soeben durch einen Administrator ge&auml;ndert.
 
 Hier sind alle Daten dazu:
 ------------------------------------------
index 76fda6e1c7e2e5ac566471e0ca95d033da2fcc33..0cfa2c00af89a2dd81aeb45567c3d88d19a053ac 100644 (file)
@@ -17,7 +17,7 @@
        $content
        <tr>
                <td colspan="2" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_EDIT_ADMINS_MAILS_SUBMIT--}" />
                </td>
        </tr>
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 (file)
index 0000000..a1b757b
--- /dev/null
@@ -0,0 +1,24 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid%}&amp;userid={%get,bigintval=userid%}&amp;do=delete_user_subids" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
+<tr>
+       <td align="center" colspan="3" class="table_header">
+               <strong>{--ADMIN_DELETE_USER_SUBID_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--SUBID_VALUE--}</strong></td>
+       <td class="header_column bottom" align="center"><strong>{--SUBID_ADDED--}</strong></td>
+</tr>
+$content
+<tr>
+       <td class="table_footer" colspan="3">
+               <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_REMOVE_USER_SUBID_SUBMIT--}" />
+       </td>
+</tr>
+</table>
+</form>
+</div>
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 (file)
index 0000000..0aa903c
--- /dev/null
@@ -0,0 +1,13 @@
+<tr>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               <strong>$content[id]</strong>
+               <input type="hidden" name="id[$content[id]]" value="1" /></strong>
+       </td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               <legend for="subid[$content[id]]">{--SUBID_VALUE--}</legend>
+               $content[subid]
+       </td>
+       <td align="center" class="bottom {%template,ColorSwitch%}">
+               $content[subid_added]
+       </td>
+</tr>
index 43ac8a7d5a83cbd8c1f3b2b052dbc490ff9af340..27e04bb204a5ee3b6871edf1da8baad2650dd458 100644 (file)
@@ -12,7 +12,7 @@
 $content[rows]
 <tr>
        <td colspan="5" class="table_footer">
-               <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_MENUS--}" />
                <input type="submit" class="form_delete submit" name="delete" value="{--ADMIN_DELETE_MENUS--}" />
        </td>
index e32a887ed10ba26305f077bda1072f30f155df54..450452c9fd8bfec644c6226f5cfab91bb2bc9b9a 100644 (file)
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--}
+               <legend for="set_all">{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--}</legend>
                {%template,NoYesSelectionBox=set_all%}
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})<br />
+               <legend for="network_max_reload_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})</legend>
                $content[network_max_reload_time] ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME--}<br />
+               <legend for="network_min_waiting_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME</legend>
                <input type="text" class="form_normal" name="network_min_waiting_time" size="5" maxlength="20" value="$content[network_min_waiting_time]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS--}<br />
+               <legend for="network_min_remain_clicks">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS</legend>
                <input type="text" class="form_normal" name="network_min_remain_clicks" size="5" maxlength="20" value="$content[network_min_remain_clicks]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT--}<br />
+               <legend for="network_min_payment">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT</legend>
                <input type="text" class="form_normal" name="network_min_payment" size="7" maxlength="20" value="$content[network_min_payment]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC--}<br />
+               <legend for="network_allow_erotic">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC</legend>
                <input type="text" class="form_normal" name="network_allow_erotic" size="5" maxlength="20" value="$content[network_allow_erotic]" />
        </div>
 
index 2c70a09aea4183d5bbbc770c22a43069ac729864..9892c4a9b804e836c5e4c50c9affaf0d6636fca0 100644 (file)
@@ -5,37 +5,37 @@
                <strong>$content[forced_ads_added]</strong>
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_AD_URL--}<br />
+               <legend for="forced_ads_ad_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_AD_URL--}</legend>
                <input type="text" class="form_field" name="forced_ads_ad_url[$content[forced_ads_id]]" size="20" maxlength="255" value="$content[forced_ads_ad_url]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--}<br />
+               <legend for="forced_ads_alt_text[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--}</legend>
                <input type="text" class="form_field" name="forced_ads_alt_text[$content[forced_ads_id]]" size="15" maxlength="255" value="$content[forced_ads_alt_text]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}<br />
+               <legend for="forced_ads_click_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}</legend>
                <input type="text" class="form_field" name="forced_ads_click_url[$content[forced_ads_id]]" size="30" maxlength="255" value="$content[forced_ads_click_url]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_WIDTH--}<br />
+               <legend for="forced_ads_width[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_WIDTH--}</legend>
                <input type="text" class="form_field" name="forced_ads_width[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_width]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}<br />
+               <legend for="forced_ads_height[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}</legend>
                <input type="text" class="form_field" name="forced_ads_height[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_height]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_USERID--}<br />
+               <legend for="">{--ADMIN_CHANGE_FORCED_ADS_USERID--}</legend>
                $content[forced_ads_userid]
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_ADS_TYPE--}<br />
+               <legend for="forced_ads_type[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_TYPE--}</legend>
                <select name="forced_ads_type[$content[forced_ads_id]]" class="form_select" size="1">
                        {%pipe,generateForcedAdsTypeOptions=$content[forced_ads_type]%}
                </select>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}<br />
+               <legend for="forced_ads_framebreaker[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}</legend>
                <select name="forced_ads_framebreaker[$content[forced_ads_id]]" class="form_select" size="1">
                        {%pipe,generateYesNoOptions=$content[forced_ads_framebreaker]%}
                </select>
index 9077e3e9d2ff745e96af6e03d45b6799fa75bfe4..f04793b2aa7b9bd97c278f7246b3f42672c59c5c 100644 (file)
@@ -5,38 +5,38 @@
                <strong>$content[forced_campaign_created]</strong>
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--}<br />
+               <legend for="forced_campaign_ordered_clicks[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--}</legend>
                <input type="text" class="form_field" name="forced_campaign_ordered_clicks[$content[forced_campaign_id]]" size="5" maxlength="20" value="{%pipe,translateComma=$content[forced_campaign_ordered_clicks]%}" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--}<br />
+               <legend for="forced_campaign_payment_api[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--}</legend>
                <input type="text" class="form_field" name="forced_campaign_payment_api[$content[forced_campaign_id]]" size="5" maxlength="20" value="{%pipe,translateComma=$content[forced_campaign_payment_api]%}" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--}<br />
+               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--}</legend>
                $content[forced_campaign_reload_lock]
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--}<br />
+               <legend for="forced_campaign_minimum_stay[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--}</legend>
                <input type="text" class="form_field" name="forced_campaign_minimum_stay[$content[forced_campaign_id]]" size="5" maxlength="20" value="$content[forced_campaign_minimum_stay]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--}<br />
+               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--}</legend>
                {%template,ForcedAdSelectionBox=$content[forced_ads_id]%}
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--}<br />
+               <legend for="forced_campaign_userid_raw">{--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--}</legend>
                $content[forced_campaign_userid]
                <input type="hidden" name="forced_campaign_userid_raw" value="$content[forced_campaign_userid_raw]" />
        </td>
        <td class="{%template,ColorSwitch%} bottom">
-               {--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--}<br />
+               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--}</legend>
                {%template,ForcedCostsSelectionBox=$content[forced_costs_id]%}
        </td>
 </tr>
index 394a7dd741f5020931d864c2d917256e8b77140d..43d37ab64569ff600fd8cebf6bbd0dec8c67582c 100644 (file)
@@ -1,17 +1,17 @@
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--}<br />
+               <legend for="forced_costs_price_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--}</legend>
                <input type="hidden" name="forced_costs_id[$content[forced_costs_id]]" value="1" />
                <input type="text" class="form_field" name="forced_costs_price_click[$content[forced_costs_id]]" size="10" maxlength="20" value="{%pipe,translateComma=$content[forced_costs_price_click]%}" /> ({?POINTS?})
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--}<br />
+               <legend for="forced_costs_payment_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--}</legend>
                <input type="text" class="form_field" name="forced_costs_payment_click[$content[forced_costs_id]]" size="10" maxlength="20" value="{%pipe,translateComma=$content[forced_costs_payment_click]%}" /> ({?POINTS?})
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               {--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--}<br />
+               <legend for="forced_costs_visibility[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--}</legend>
                <select name="forced_costs_visibility[$content[forced_costs_id]]" class="form_select" size="1">
                        {%pipe,generateForcedCostsVisibilityOptions=$content[forced_costs_visibility]%}
                </select>
index 58e5899fdcf992cc185ed943e38396c8c89facbc..9afacc1e92e8e9bab9024bba3b3a16f64b488858 100644 (file)
@@ -11,7 +11,7 @@
 $content[rows]
 <tr>
        <td colspan="5" class="table_footer">
-               <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_MENUS--}" />
                <input type="submit" class="form_submit" name="status" value="{--ADMIN_CHANGE_MENUS--}" />
                <input type="submit" class="form_delete submit" name="delete" value="{--ADMIN_DELETE_MENUS--}" />
index 6ebfb0b5200c9aefd7891e87f07d2dd067d2baa5..b5b5380c69a398bdfefa7020419abeadf9bf200d 100644 (file)
@@ -17,7 +17,7 @@
 $content
 <tr>
        <td colspan="6" class="table_footer">
-               <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="form_submit" name="do_edit" value="{--SAVE_CHANGES--}" />
        </td>
 </tr>
index c357f479f42521b2e5929f17eb4c4e89cbb39429..81da17b8a971af34a00f53c467176f4d397286d0 100644 (file)
@@ -5,20 +5,20 @@
                <div class="tiny">({%pipe,translatePointsSubject=$content[subject]%})</div>
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_POINTS_ACCOUNT_COLUMN_NAME--}<br />
+               <legend for="column_name">{--ADMIN_POINTS_ACCOUNT_COLUMN_NAME</legend>
                <strong>{%pipe,translatePointsAccountType=$content[column_name]%}</strong>
        </td>
 </tr>
 
 <tr>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_POINTS_LOCKED_MODE--}<br />
+               <legend for="locked_mode[$content[id]]">{--ADMIN_CHANGE_POINTS_LOCKED_MODE</legend>
                <select name="locked_mode[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsLockedModeOptions=$content[locked_mode]%}
                </select>
        </td>
        <td class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_POINTS_PAYMENT_METHOD--}<br />
+               <legend for="payment_method[$content[id]]">{--ADMIN_CHANGE_POINTS_PAYMENT_METHOD</legend>
                <select name="payment_method[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsPaymentMethodOptions=$content[payment_method]%}
                </select>
 
 <tr>
        <td class="bottom {%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT--}<br />
+               <legend for="notify_recipient[$content[id]]">{--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT</legend>
                <select name="notify_recipient[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsNotifyRecipientOptions=$content[notify_recipient]%}
                </select>
        </td>
        <td class="bottom {%template,ColorSwitch%}">
-               {--ADMIN_POINTS_ACCOUNT_PROVIDER--}<br />
+               <legend for="account_provider">{--ADMIN_POINTS_ACCOUNT_PROVIDER</legend>
                <strong>{%pipe,translatePointsAccountProvider=$content[account_provider]%}</strong>
        </td>
 </tr>
index 4396f8d56d7070c42f47949877db0514837762b0..4954f4ed11ccf29f1a3295b898d6ebca70a42e94 100644 (file)
@@ -9,7 +9,7 @@
 $content
 <tr>
        <td class="table_footer" colspan="2">
-               <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" name="do_edit" class="form_submit" value="{--ADMIN_CHANGE_SURFBAR_ACTIONS_SUBMIT--}" />
        </td>
 </tr>
index f3750ab95740c14f0374692df7a83168945f2e85..9dac53adb3995994dafcd4d095f480c1a1e9ebd8 100644 (file)
@@ -5,18 +5,18 @@
                <strong>$content[actions_id]</strong>
        </td>
        <td align="center" class="{%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--}<br />
+               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS</legend>
                {%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%}
        </td>
 </tr>
 
 <tr>
        <td align="center" class="bottom {%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--}<br />
+               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION</legend>
                {%template,SurfbarActionsActionSelectionBox=$content[actions_id]%}
        </td>
        <td align="center" class="bottom {%template,ColorSwitch%}">
-               {--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--}<br />
+               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS</legend>
                {%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%}
        </td>
 </tr>
index d3e9ecd12eb6810d43ac3d476fee509e799842b0..b5e5951e7a6ebe96274723e3c4724c6e3f3fd784 100644 (file)
@@ -13,7 +13,7 @@
 $content
 <tr>
        <td class="table_footer" colspan="2">
-               <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" name="do_edit" class="form_submit" value="{--ADMIN_SURFBAR_EDIT_URL_NOW_SUBMIT--}" />
        </td>
 </tr>
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 (file)
index 0000000..46cc969
--- /dev/null
@@ -0,0 +1,24 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid%}&amp;userid={%get,bigintval=userid%}&amp;do=edit_user_subids" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
+<tr>
+       <td align="center" colspan="3" class="table_header">
+               <strong>{--ADMIN_EDIT_USER_SUBID_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--SUBID_VALUE--}</strong></td>
+       <td class="header_column bottom" align="center"><strong>{--SUBID_ADDED--}</strong></td>
+</tr>
+$content
+<tr>
+       <td class="table_footer" colspan="3">
+               <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_CHANGE_USER_SUBID_SUBMIT--}" />
+       </td>
+</tr>
+</table>
+</form>
+</div>
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 (file)
index 0000000..fa72be2
--- /dev/null
@@ -0,0 +1,13 @@
+<tr>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               <strong>$content[id]</strong>
+               <input type="hidden" name="id[$content[id]]" value="1" /></strong>
+       </td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               <legend for="subid[$content[id]]">{--ADMIN_CHANGE_USER_SUBID--}</legend>
+               <input type="text" class="form_field" name="subid[$content[id]]" size="20" maxlength="255" value="$content[subid]" />
+       </td>
+       <td align="center" class="bottom {%template,ColorSwitch%}">
+               $content[subid_added]
+       </td>
+</tr>
index ffc3efa269bfbc848a6b707dd4d3a553569cd219..4ffec561ca0e1165c05cc545e2e858862d77ebd2 100644 (file)
@@ -19,10 +19,10 @@ $content[rows]
 <tr>
        <td colspan="7" align="center" class="table_footer">
                <input type="reset" value="{--ADMIN_UNSELECT_ALL--}" class="form_reset" />
-               <input type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="form_submit" />
-               <input type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="form_submit" />
-               <input type="submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" class="form_submit" />
-               <input type="submit" name="delete" value="{--ADMIN_TASK_DELETE_ENTRIES--}" class="form_delete" />
+               <input type="submit" class="form_submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" />
+               <input type="submit" class="form_submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" />
+               <input type="submit" class="form_submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" />
+               <input type="submit" class="form_delete" name="delete" value="{--ADMIN_TASK_DELETE_ENTRIES--}" />
        </td>
 </tr>
 </table>
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 (file)
index 0000000..39fd0bd
--- /dev/null
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for doing deletions on user's sub ids.
+
+@author                Roland Haeder <webmaster@mxchange.org>
+@version       0.2.1-FINAL
+@copyright     (c) 2003 - 2009 by Roland Haeder
+@copyright     (c) 2009 - 2012 by Mailer Developer Team
+@license       GNU GPL 2.0 or any newer version
+@link          http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+       <!--
+       Call-back function which should all following parameter handled over
+       to. This will always be type of string but we like homogene XMLs.
+       //-->
+       <callback-function type="string" value="adminDeleteEntriesConfirm" />
+       <!--
+       Name of the database table where the entries should be read/write from/to.
+       //-->
+       <database-table name="" type="string" value="user_subids" />
+       <!--
+       The following three lists must have the same count of list entries, else an
+       error may occur.
+       //-->
+       <!--
+       And all column names to read/write, leave this list tag empty for all (*).
+       //-->
+       <database-column-list>
+       </database-column-list>
+       <!--
+       "Filter" call-back functions to call back for piping the fetched data
+       through (can be left empty, no call-back function will be called)
+       //-->
+       <callback-function-list>
+       </callback-function-list>
+       <!--
+       Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+       is provided, we have more than two parameters to handle over to the
+       call-back function. See function handleExtraValues() for details.
+       //-->
+       <extra-parameter-list>
+       </extra-parameter-list>
+       <!--
+       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       //-->
+       <enable-modify-entries name="" type="bool" value="true" />
+       <!--
+       The table column which should be taken for the ids (see first parameter).
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-id-column name="" type="string" value="id" />
+       <!--
+       The table column which should be taken for user ids
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-userid-column name="" type="string" value="userid" />
+       <!--
+       Raw userid column ($key) to skip which is always an invalid (?) entry
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <raw-userid-column-key name="" type="string" value="userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
+</admin-entry-meta-data>
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 (file)
index 0000000..14539c2
--- /dev/null
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for deleting forced ads.
+
+@author                Roland Haeder <webmaster@mxchange.org>
+@version       0.2.1-FINAL
+@copyright     (c) 2003 - 2009 by Roland Haeder
+@copyright     (c) 2009 - 2012 by Mailer Developer Team
+@license       GNU GPL 2.0 or any newer version
+@link          http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+       <!--
+       Call-back function which should all following parameter handled over
+       to. This will always be type of string but we like homogene XMLs.
+       //-->
+       <callback-function type="string" value="adminDeleteEntriesConfirm" />
+       <!--
+       Name of the database table where the entries should be read/write from/to.
+       //-->
+       <database-table name="" type="string" value="user_subids" />
+       <!--
+       The following three lists must have the same count of list entries, else an
+       error may occur.
+       //-->
+       <!--
+       And all column names to read/write, leave this list tag empty for all (*).
+       //-->
+       <database-column-list>
+               <!--
+               A column name list entry. The type is always string, or do you have
+               numerical column names?
+               //-->
+               <database-column-list-entry name="" type="string" table="" value="id" alias="" function="" />
+               <database-column-list-entry name="" type="string" table="" value="userid" alias="" function="" />
+               <database-column-list-entry name="added_list" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
+               <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />
+       </database-column-list>
+       <!--
+       "Filter" call-back functions to call back for piping the fetched data
+       through (can be left empty, no call-back function will be called)
+       //-->
+       <callback-function-list>
+               <!--
+               A call-back function list entry
+               //-->
+               <callback-function-list-entry name="" type="string" value="bigintval" />
+               <callback-function-list-entry name="added_list" type="string" value="generateDateTime" />
+       </callback-function-list>
+       <!--
+       Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+       is provided, we have more than two parameters to handle over to the
+       call-back function. See function handleExtraValues() for details.
+       //-->
+       <extra-parameter-list>
+               <!--
+               A one-dimensional array with some entries
+               //-->
+               <extra-parameter-list-entry name="" type="array" value="added">
+                       <!--
+                       Our 'added' array
+                       //-->
+                       <extra-parameter-added-list>
+                               <!--
+                               A bool entry in the 'bar' array, all other types are added in a
+                               similar way.
+                               //-->
+                               <extra-parameter-added-list-entry name="" type="int" value="2" />
+                       </extra-parameter-added-list>
+               </extra-parameter-list-entry>
+       </extra-parameter-list>
+       <!--
+       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       //-->
+       <enable-modify-entries name="" type="bool" value="false" />
+       <!--
+       The table column which should be taken for the ids (see first parameter).
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-id-column name="" type="string" value="id" />
+       <!--
+       The table column which should be taken for user ids
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-userid-column name="" type="string" value="userid" />
+       <!--
+       Raw userid column ($key) to skip which is always an invalid (?) entry
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <raw-userid-column-key name="" type="string" value="userid" />
+</admin-entry-meta-data>
index a2df42ff156578f3f01b93ca1e19340439e266d8..3818cea1e0b302b2cb4bba6e85c228c72b462c81 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-This template provides meta data for doing edits on forced costs
+This template provides meta data for doing edits on forced ads
 
 @author                Roland Haeder <webmaster@mxchange.org>
 @version       0.2.1-FINAL
diff --git a/templates/xml/admin/admin_edit_do_user_subid.xml b/templates/xml/admin/admin_edit_do_user_subid.xml
new file mode 100644 (file)
index 0000000..6ab3c76
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for doing edits on user's subids
+
+@author                Roland Haeder <webmaster@mxchange.org>
+@version       0.2.1-FINAL
+@copyright     (c) 2003 - 2009 by Roland Haeder
+@copyright     (c) 2009 - 2012 by Mailer Developer Team
+@license       GNU GPL 2.0 or any newer version
+@link          http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+       <!--
+       Call-back function which should all following parameter handled over
+       to. This will always be type of string but we like homogene XMLs.
+       //-->
+       <callback-function type="string" value="adminEditEntriesConfirm" />
+       <!--
+       Name of the database table where the entries should be read/write from/to.
+       //-->
+       <database-table name="" type="string" value="user_subids" />
+       <!--
+       The following three lists must have the same count of list entries, else an
+       error may occur.
+       //-->
+       <!--
+       And all column names to read/write, leave this list tag empty for all (*).
+       //-->
+       <database-column-list>
+       </database-column-list>
+       <!--
+       "Filter" call-back functions to call back for piping the fetched data
+       through (can be left empty, no call-back function will be called)
+       //-->
+       <callback-function-list>
+       </callback-function-list>
+       <!--
+       Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+       is provided, we have more than two parameters to handle over to the
+       call-back function. See function handleExtraValues() for details.
+       //-->
+       <extra-parameter-list>
+       </extra-parameter-list>
+       <!--
+       Columns for converting single time selections into a timestamp
+       //-->
+       <time-columns-list>
+       </time-columns-list>
+       <!--
+       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       //-->
+       <enable-modify-entries name="" type="bool" value="true" />
+       <!--
+       The table column which should be taken for the ids (see first parameter).
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-id-column name="" type="string" value="id" />
+       <!--
+       The table column which should be taken for user ids
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-userid-column name="" type="string" value="userid" />
+       <!--
+       Raw userid column ($key) to skip which is always an invalid (?) entry
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <raw-userid-column-key name="" type="string" value="" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
+</admin-entry-meta-data>
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 (file)
index 0000000..74a562e
--- /dev/null
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for editing user's sub ids.
+
+@author                Roland Haeder <webmaster@mxchange.org>
+@version       0.2.1-FINAL
+@copyright     (c) 2003 - 2009 by Roland Haeder
+@copyright     (c) 2009 - 2012 by Mailer Developer Team
+@license       GNU GPL 2.0 or any newer version
+@link          http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+       <!--
+       Call-back function which should all following parameter handled over
+       to. This will always be type of string but we like homogene XMLs.
+       //-->
+       <callback-function type="string" value="adminEditEntriesConfirm" />
+       <!--
+       Name of the database table where the entries should be read/write from/to.
+       //-->
+       <database-table name="" type="string" value="user_subids" />
+       <!--
+       The following three lists must have the same count of list entries, else an
+       error may occur.
+       //-->
+       <!--
+       And all column names to read/write, leave this list tag empty for all (*).
+       //-->
+       <database-column-list>
+               <!--
+               A column name list entry. The type is always string, or do you have
+               numerical column names?
+               //-->
+               <database-column-list-entry name="" type="string" table="" value="id" alias="" function="" />
+               <database-column-list-entry name="added_list" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
+               <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />
+       </database-column-list>
+       <!--
+       "Filter" call-back functions to call back for piping the fetched data
+       through (can be left empty, no call-back function will be called)
+       //-->
+       <callback-function-list>
+               <!--
+               A call-back function list entry
+               //-->
+               <callback-function-list-entry name="" type="string" value="bigintval" />
+               <callback-function-list-entry name="added_list" type="string" value="generateDateTime" />
+       </callback-function-list>
+       <!--
+       Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+       is provided, we have more than two parameters to handle over to the
+       call-back function. See function handleExtraValues() for details.
+       //-->
+       <extra-parameter-list>
+               <!--
+               A one-dimensional array with some entries
+               //-->
+               <extra-parameter-list-entry name="" type="array" value="member">
+                       <!--
+                       Our 'member' array
+                       //-->
+                       <extra-parameter-member-list>
+                               <!--
+                               A bool entry in the 'member' array, all other types are added in a
+                               similar way.
+                               //-->
+                               <extra-parameter-member-list-entry name="" type="bool" value="false" />
+                               <extra-parameter-member-list-entry name="" type="bool" value="true" />
+                               <extra-parameter-member-list-entry name="" type="bool" value="true" />
+                               <!--
+                               The brackets [] are required for addMemberSelectionBox(),
+                               please read there for details.
+                               //-->
+                               <extra-parameter-member-list-entry name="" type="string" value="userid[]" />
+                       </extra-parameter-member-list>
+               </extra-parameter-list-entry>
+               <!--
+               A one-dimensional array with some entries
+               //-->
+               <extra-parameter-list-entry name="" type="array" value="added">
+                       <!--
+                       Our 'added' array
+                       //-->
+                       <extra-parameter-added-list>
+                               <!--
+                               A bool entry in the 'added' array, all other types are added in a
+                               similar way.
+                               //-->
+                               <extra-parameter-added-list-entry name="" type="int" value="2" />
+                       </extra-parameter-added-list>
+               </extra-parameter-list-entry>
+       </extra-parameter-list>
+       <!--
+       Columns for converting single time selections into a timestamp
+       //-->
+       <time-columns-list>
+       </time-columns-list>
+       <!--
+       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       //-->
+       <enable-modify-entries name="" type="bool" value="false" />
+       <!--
+       The table column which should be taken for the ids (see first parameter).
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-id-column name="" type="string" value="id" />
+       <!--
+       The table column which should be taken for user ids
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-userid-column name="" type="string" value="userid" />
+       <!--
+       Raw userid column ($key) to skip which is always an invalid (?) entry
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <raw-userid-column-key name="" type="string" value="userid" />
+</admin-entry-meta-data>
index fa72890eb4b3c998a7d88bcc1e7cc54d652549cc..d62b43ac79121af1677b9cd6333f680e0507ead5 100644 (file)
@@ -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]
 ?>
index e460dc737ca8b584edc861d4db43a340c39301f0..375e18836680cb839f75bc0974ace32585b84563 100644 (file)
@@ -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]
 ?>
index 1e817218149b4b8e188e577d931c310959422ec8..512c37cd7e98e9325edd79894e14a6136db48652 100644 (file)
@@ -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]
 ?>