Fixed name inconsistency

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index a849c94cac0f528192606c7efd20e2c519dec6c6..bb04566458374327e6b9ebb496d3ee6f0dff35e0 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -262,6 +262,9 @@
 ./inc/reset/reset_profile.php:2:// @DEPRECATED
 ./inc/reset/reset_surfbar.php:2:// @DEPRECATED
 ./inc/reset/reset_yoomedia.php:2:// @DEPRECATED
+./templates/de/html/admin/admin_config_cats_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_cats.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_cats_404.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###

diff --git a/inc/language/de.php b/inc/language/de.php
index a0a0c3fe772c9e63af2075378e70a5767af3fa65..cbe6b8df3eec4a64033d1669e178cc9979a00bc9 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -804,7 +804,7 @@ addMessages(array(
        'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <span class=\"data\">v0.2.2</span> oder neuer.",
        '_ON' => "an",
        'MEMBER_CLICK_STATISTICS' => "Mail-Statistik",
-       'ADMIN_SELECT_DEF_REFID' => "Standard Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
+       'ADMIN_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
        'ADMIN_SELECT_REFID_TARGRT' => "Ziel-Seite des Referal-Linkes",
        'ADMIN_REFERAL_TARGET_REGISTER' => "Zur Anmeldeseite",
        'ADMIN_REFERAL_TARGET_INDEX' => "Zur Eingangsseite",

diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index bc8872712f4679a0c22cc7e80d1d62709883d362..b720966c23b19dec3c9fdbbfc35df579580c4bec 100644 (file)
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -58,7 +58,7 @@ if (isFormSent()) {
        // Prepare constants for the template
        $content['timeout']          = createConfigurationTimeSelections('beg_timeout'       , 'Dhm');
        $content['userid_timeout']   = createConfigurationTimeSelections('beg_userid_timeout', 'Dhm');
-       $content['ip_timeout']       = createConfigurationTimeSelections('beg_ip_timeout'    , 'Dhm');
+       $content['beg_ip_timeout']   = createConfigurationTimeSelections('beg_ip_timeout'    , 'Dhm');
        $content['wait_selection']   = createConfigurationTimeSelections('beg_notify_wait'   , 'ms' );
 
        // Init all Y/N selections
@@ -85,7 +85,7 @@ if (isFormSent()) {
        $content['beg_mode_' . strtolower(getBegMode())] = ' checked="checked"';
 
        // Member selection box
-       $content['form_selection'] = addMemberSelectionBox(getBegUserid(), false, true, true, 'beg_userid');
+       $content['beg_userid'] = addMemberSelectionBox(getBegUserid(), false, true, true, 'beg_userid');
 
        // Load form template
        loadTemplate('admin_config_beg', false, $content);

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index f8878843f5b44a3c4e88642c5de1d2f482666aff..478c040521a8dc96190576f58cacd244d4f941e4 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -71,7 +71,7 @@ if (isFormSent()) {
        setConfigEntry('bonus_disable_notify', postRequestParameter('bonus_disable_notify'));
 } else {
        // Transfer options to template
-       $content['form_selection'] = addMemberSelectionBox(getBonusUserId(), false, true, true, 'bonus_userid');
+       $content['bonus_userid'] = addMemberSelectionBox(getBonusUserId(), false, true, true, 'bonus_userid');
 
        // Initialize array for the points list
        $RANKS = explode(';', getConfig('turbo_rates'));

diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index f26d37e2129b571585cae0d2a4ceb8535a418249..e52215da301d59177eb91812d7602822ef9bba6f 100644 (file)
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -68,7 +68,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Transfer options
-       $content['form_selection'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid');
+       $content['doubler_userid'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid');
 
        // Number of rows to display (option lines!!!)
        foreach (array('new','pay','old') as $entry) {

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index ae4eaaa0f424fd4ab9069ec5e121a8e87b1ab4ba..4f79de60ffb8e395baa07c4daf432985f9dc99f1 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -52,7 +52,7 @@ if (!isExtensionActive('other')) {
 // Stop saving data if one input field is !isset
 if (isFormSent()) {
        // Calculate stamps and set calculated stamps
-       setPostRequestParameter('online_timeout'       , createEpocheTimeFromSelections('ip_timeout'           , postRequestArray()));
+       setPostRequestParameter('online_timeout'       , createEpocheTimeFromSelections('online_timeout'       , postRequestArray()));
        setPostRequestParameter('url_tlock'            , createEpocheTimeFromSelections('url_tlock'            , postRequestArray()));
        setPostRequestParameter('profile_lock'         , createEpocheTimeFromSelections('profile_lock'         , postRequestArray()));
        setPostRequestParameter('profile_update'       , createEpocheTimeFromSelections('profile_update'       , postRequestArray()));
@@ -78,7 +78,7 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Time selection boxes
-       $content['online_timeout']   = createConfigurationTimeSelections('ip_timeout'           , 'ms');
+       $content['online_timeout']   = createConfigurationTimeSelections('online_timeout'       , 'ms');
        $content['url_tlock']        = createConfigurationTimeSelections('url_tlock'            , 'WDh');
        $content['profile_lock']     = createConfigurationTimeSelections('profile_lock'         , 'WDh');
        $content['profile_update']   = createConfigurationTimeSelections('profile_update'       , 'YM');

diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php
index 52660d321e0d9fb7ac2d50a74b2d67b859dbd9ac..920f2291dad9153320570324851a959018e63149 100644 (file)
--- a/inc/modules/admin/what-config_refid.php
+++ b/inc/modules/admin/what-config_refid.php
@@ -48,7 +48,7 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Prepare member selection
-       $content['form_selection'] = addMemberSelectionBox(getDefRefid(), false, true, true, 'def_refid');
+       $content['def_refid'] = addMemberSelectionBox(getDefRefid(), false, true, true, 'def_refid');
 
        // Prepare contants for the template
        foreach (array('refid_target_index','refid_target_register','select_user_zero_refid_y','select_user_zero_refid_n') as $entry) {

diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 638390d3bb1f759e6ecf3664e45e3b174762ffe5..02b436b673a744c8b50a927552b4b11b8b78b7d5 100644 (file)
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -43,13 +43,13 @@
                        {--ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT--}:
                </td>
                <td align="center">
-                       $content[ip_timeout]
+                       $content[beg_ip_timeout]
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right" height="20">{--ADMIN_BEG_USERID--}:</td>
                <td class="bottom" align="center">
-                       $content[form_selection]
+                       $content[beg_userid]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl
index a933cf1e91b689cb694e8b4056184b4df11720a0..ae103f10799628b75e2dc97c5559a822d0f51cdc 100644 (file)
--- a/templates/de/html/admin/admin_config_bonus.tpl
+++ b/templates/de/html/admin/admin_config_bonus.tpl
@@ -170,7 +170,7 @@
        <tr>
                <td class="bottom" align="right">{--ADMIN_BONUS_USERID--}:</td>
                <td class="bottom" align="center">
-                       $content[form_selection]
+                       $content[bonus_userid]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl
index 443acc803cdcfdc2ca2d760514c5b3ad90880f1f..65ab9e54be53ee3b44b4107f0f444715bae359fb 100644 (file)
--- a/templates/de/html/admin/admin_config_doubler.tpl
+++ b/templates/de/html/admin/admin_config_doubler.tpl
@@ -100,7 +100,7 @@
                        {--ADMIN_DOUBLER_USERID--}:
                </td>
                <td class="bottom" style="padding-left: 5px">
-                       $content[form_selection]
+                       $content[doubler_userid]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl
index d9e0d7f8f99d644d7ce5224342dfb141a5e15670..341e7eca4c586efa388b6d29fd5dd9a62a4f39ab 100644 (file)
--- a/templates/de/html/admin/admin_config_refid.tpl
+++ b/templates/de/html/admin/admin_config_refid.tpl
@@ -8,9 +8,9 @@
        </tr>
 
        <tr>
-               <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_DEF_REFID--}:</td>
+               <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_DEFAULT_REFID--}:</td>
                <td align="center">
-                       $content[form_selection]
+                       $content[def_refid]
                </td>
        </tr>