From 3aa0651a2a5a89027a5929e50948639fac95a0d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 6 Jul 2011 05:50:06 +0000 Subject: [PATCH] Checking new member registrations is now done with list_user (was: chk_regs) and makes what-chk_regs.php and two templates deprecated --- DOCS/TODOs.txt | 11 ++- inc/extensions/ext-user.php | 13 ++- inc/language/de.php | 1 + inc/language/user_de.php | 2 + inc/libs/task_functions.php | 2 +- inc/modules/admin/what-chk_regs.php | 86 +------------------ inc/template-functions.php | 6 ++ .../de/html/admin/admin_list_chk_reg.tpl | 21 +---- .../de/html/admin/admin_list_chk_reg_row.tpl | 14 +-- 9 files changed, 30 insertions(+), 126 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 08135b567d..3f99346055 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -193,10 +193,10 @@ ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array' ./inc/template-functions.php:1058: // @TODO Deprecate this thing ./inc/template-functions.php:1069: // @TODO Deprecate this thing -./inc/template-functions.php:1156: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/template-functions.php:1189: // @TODO Add a little more infos here -./inc/template-functions.php:1500:// @TODO Lame description for this function -./inc/template-functions.php:1522: // @TODO Move this in a filter +./inc/template-functions.php:1162: // @TODO This can be easily moved out after the merge from EL branch to this is complete +./inc/template-functions.php:1195: // @TODO Add a little more infos here +./inc/template-functions.php:1506:// @TODO Lame description for this function +./inc/template-functions.php:1528: // @TODO Move this in a filter ./inc/template-functions.php:189: * @TODO On some pages this is buggy ./inc/template-functions.php:265: // @TODO Remove this sanity-check if all is fine ./inc/template-functions.php:586:// @TODO $simple/$constants are deprecated @@ -250,6 +250,7 @@ ./inc/loader/load_cache-them.php:2:// @DEPRECATED ./inc/loader/load-extensions.php:2:// @DEPRECATED ./inc/modules/admin/admin-inc.php:439:// @DEPRECATED +./inc/modules/admin/what-chk_regs.php:2:// @DEPRECATED ./inc/modules/admin/what-config_admins.php:2:// @DEPRECATED ./inc/modules/admin/what-config_email.php:2:// @DEPRECATED ./inc/reset/reset_100_bonus.php:2:// @DEPRECATED @@ -309,6 +310,8 @@ ./templates/de/html/admin/admin_config_payouts_edit_row.tpl:1: ./templates/de/html/admin/admin_config_payouts_edit.tpl:1: ./templates/de/html/admin/admin_list_cats_404.tpl:1: +./templates/de/html/admin/admin_list_chk_reg_row.tpl:1: +./templates/de/html/admin/admin_list_chk_reg.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/extensions/ext-user.php b/inc/extensions/ext-user.php index 20529d418d..a66f87ce8c 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.4.0'); +setThisExtensionVersion('0.4.1'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0')); +setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -161,7 +161,6 @@ INDEX (`stats_type`) // Admin menu addAdminMenuSql('user',NULL,'Mitglieder-Management','Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben und abziehen und und und...',3); addAdminMenuSql('user','del_user','Mitglied löschen','Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.',1); - addAdminMenuSql('user','chk_regs','Anmeldungen prüfen','Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den Mitglied gleich wieder löschen!',2); addAdminMenuSql('user','lock_user','Mitglied sperren / entsperren','Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.',3); addAdminMenuSql('user','list_user','Mitglied auflisten','Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.',4); addAdminMenuSql('user','add_points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben','Buchen Sie einem Mitglied direkt {OPEN_CONFIG}POINTS{CLOSE_CONFIG} auf. Sie können dazu auch einen Kommentar mitsenden.',5); @@ -442,6 +441,14 @@ PRIMARY KEY (`id`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Das Mitgliederguthaben musste repariert werden, da für Referal-Ebene 0, noch NULL geschrieben wurde."); break; + + case '0.4.1': // SQL queries for v0.4.1 + // Add special fix include to fix filters + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='chk_regs' LIMIT 1"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Überflüssiges Menü chk_regs entfernt, dies kann mit list_user übernommen werden."); + break; } // END - switch break; diff --git a/inc/language/de.php b/inc/language/de.php index c59498b2b5..b3578e0a24 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1111,6 +1111,7 @@ addMessages(array( 'ADMIN_LIST_ALL_ACCOUNTS' => "Alle Mitglieder-Accounts auflisten", 'ADMIN_LIST_STATUS_LOCKED_ACCOUNTS' => "Alle gesperrten Mitglieder-Accounts auflisten", 'ADMIN_LIST_STATUS_CONFIRMED_ACCOUNTS' => "Alle bestätigten Mitglieder-Accounts auflisten", + 'ADMIN_LIST_STATUS_UNCONFIRMED_ACCOUNTS' => "Alle unbestätigten Mitglieder-Accounts auflisten", 'ADMIN_LIST_MODE_CONFIRMED_ACCOUNTS' => "Alle bestätigten Mitglieder-Accounts auflisten", 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referals auflisten", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index edd876dfa3..c7cdba8f88 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -62,6 +62,8 @@ addMessages(array( 'ADMIN_USER_ACTION_LINK_UNLOCK_USER_TITLE' => "Mitglied entsperren", 'ADMIN_USER_ACTION_LINK_ADD_POINTS_TITLE' => "Dem Mitglied {?POINTS?} aufbuchen", 'ADMIN_USER_ACTION_LINK_SUB_POINTS_TITLE' => "Dem Mitglied {?POINTS?} abziehen", + 'ADMIN_USER_ACTION_LINK_CONFIRM_ACCOUNT_TITLE' => "Das Mitgliederaccount bestätigen", + 'ADMIN_USER_ACTION_LINK_CONFIRM_ACCOUNT' => "Bestätigen", )); // [EOF] diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index e1daec9d31..b81f425a94 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -102,7 +102,7 @@ function outputAdvancedOverview (&$result_main) { $value = getTotalUnconfirmedUser(); if ($value > 0) { - $content['unconfirmed_members'] = '' . $value . ''; + $content['unconfirmed_members'] = '' . $value . ''; } // END - if diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php index 2237a90812..f551ef47b7 100644 --- a/inc/modules/admin/what-chk_regs.php +++ b/inc/modules/admin/what-chk_regs.php @@ -1,87 +1,3 @@ $content['gender'], - 'surname' => $content['surname'], - 'family' => $content['family'], - 'email' => '' . $content['email'] . '', - 'remote_addr' => $content['REMOTE_ADDR'], - 'refid' => $content['refid'], - 'user_hash' => $content['user_hash'], - 'userid' => $content['userid'], - ); - - // Load row template and switch color - $OUT .= loadTemplate('admin_list_chk_reg_row', true, $content); - } // END - while - - // Load main template - loadTemplate('admin_list_chk_reg', false, $OUT); -} else { - // No registrations left - or all has confirmed their email address... :-) - displayMessage('{--ADMIN_ALL_CONFIRMED_EMAIL--}'); -} - -// Free memory -SQL_FREERESULT($result); - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/template-functions.php b/inc/template-functions.php index f042d3e079..4cf5587975 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1075,6 +1075,12 @@ function generateMemberAdminActionLinks ($userid) { $OUT .= '--}|'; } // END - foreach + // Add special link, in case of the account is unconfirmed + if ($status == 'UNCONFIRMED') { + // Add it + $OUT .= '{--ADMIN_USER_ACTION_LINK_CONFIRM_ACCOUNT--}|'; + } // END - if + // Finish navigation link $OUT = substr($OUT, 0, -1) . ']'; diff --git a/templates/de/html/admin/admin_list_chk_reg.tpl b/templates/de/html/admin/admin_list_chk_reg.tpl index 39caff4632..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_chk_reg.tpl +++ b/templates/de/html/admin/admin_list_chk_reg.tpl @@ -1,20 +1 @@ -
- - - - - - - - - - - - - - - $content -
- {--ADMIN_UNCONFIRMED_ACCOUNTS--}: -
{--_USERID--}{--GENDER--}{--SURNAME--}{--FAMILY--}{--EMAIL--}{--REMOTE_IP--}{--REFERAL_USERID--}{--ADMIN_CONFIRM_ACCOUNT--}
-
+ diff --git a/templates/de/html/admin/admin_list_chk_reg_row.tpl b/templates/de/html/admin/admin_list_chk_reg_row.tpl index 90a3c388b2..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_chk_reg_row.tpl +++ b/templates/de/html/admin/admin_list_chk_reg_row.tpl @@ -1,13 +1 @@ - - {%pipe,generateUserProfileLink=$content[userid]%} - {%pipe,translateGender=$content[gender]%} - $content[surname] - $content[family] - $content[email] - $content[remote_addr] - {%pipe,generateUserProfileLink=$content[refid]%} - - {--ADMIN_CONFIRM_ACCOUNT--} - - + -- 2.39.2