From 53a63bee7a3dc419272e6dc2fc7c801e99ef0712 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 28 Jun 2011 08:19:00 +0000 Subject: [PATCH] Fixed name inconsistency --- DOCS/TODOs.txt | 3 +++ inc/language/de.php | 2 +- inc/modules/admin/what-config_beg.php | 4 ++-- inc/modules/admin/what-config_bonus.php | 2 +- inc/modules/admin/what-config_doubler.php | 2 +- inc/modules/admin/what-config_other.php | 4 ++-- inc/modules/admin/what-config_refid.php | 2 +- templates/de/html/admin/admin_config_beg.tpl | 4 ++-- templates/de/html/admin/admin_config_bonus.tpl | 2 +- templates/de/html/admin/admin_config_doubler.tpl | 2 +- templates/de/html/admin/admin_config_refid.tpl | 4 ++-- 11 files changed, 17 insertions(+), 14 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index a849c94cac..bb04566458 100644 --- 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: +./templates/de/html/admin/admin_config_cats.tpl:1: +./templates/de/html/admin/admin_list_cats_404.tpl:1: ./templates/de/html/admin/admin_reset_pass_done.tpl:1: ./templates/de/html/admin/admin_send_reset_link.tpl:1: ### ### template-warnings.log follows: ### ### diff --git a/inc/language/de.php b/inc/language/de.php index a0a0c3fe77..cbe6b8df3e 100644 --- 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 v0.2.2 oder neuer.", '_ON' => "an", 'MEMBER_CLICK_STATISTICS' => "Mail-Statistik", - 'ADMIN_SELECT_DEF_REFID' => "Standard Referal-Id bei Anmeldung über keinen Ref-Link", + 'ADMIN_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung über keinen 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 bc8872712f..b720966c23 100644 --- 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 f8878843f5..478c040521 100644 --- 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 f26d37e212..e52215da30 100644 --- 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 ae4eaaa0f4..4f79de60ff 100644 --- 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 52660d321e..920f2291da 100644 --- 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 638390d3bb..02b436b673 100644 --- 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--}: - $content[ip_timeout] + $content[beg_ip_timeout] {--ADMIN_BEG_USERID--}: - $content[form_selection] + $content[beg_userid] diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index a933cf1e91..ae103f1079 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -170,7 +170,7 @@ {--ADMIN_BONUS_USERID--}: - $content[form_selection] + $content[bonus_userid] diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 443acc803c..65ab9e54be 100644 --- 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--}: - $content[form_selection] + $content[doubler_userid] diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index d9e0d7f8f9..341e7eca4c 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -8,9 +8,9 @@ - {--ADMIN_SELECT_DEF_REFID--}: + {--ADMIN_SELECT_DEFAULT_REFID--}: - $content[form_selection] + $content[def_refid] -- 2.30.2