diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-17 16:26:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-17 16:26:44 +0100 |
| commit | b1e4b232b94f20b896fdecc1a3346e9cf116e96e (patch) | |
| tree | c0d72fe70032f8920aacb1502ca6c044812874fc /phpBB/includes/ucp/ucp_remind.php | |
| parent | 63f222ca90101cadfb0bfa0b4e2faefecea849b3 (diff) | |
| parent | 3c223b3a5d87a4bf7ecf623879398689842b0227 (diff) | |
| download | forums-b1e4b232b94f20b896fdecc1a3346e9cf116e96e.tar forums-b1e4b232b94f20b896fdecc1a3346e9cf116e96e.tar.gz forums-b1e4b232b94f20b896fdecc1a3346e9cf116e96e.tar.bz2 forums-b1e4b232b94f20b896fdecc1a3346e9cf116e96e.tar.xz forums-b1e4b232b94f20b896fdecc1a3346e9cf116e96e.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/ucp/ucp_remind.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index a44f077693..7040370627 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -30,7 +30,7 @@ class ucp_remind function main($id, $mode) { global $config, $phpbb_root_path, $phpEx, $request; - global $db, $user, $template, $phpbb_container; + global $db, $user, $template, $phpbb_container, $phpbb_dispatcher; if (!$config['allow_password_reset']) { @@ -43,10 +43,30 @@ class ucp_remind if ($submit) { - $sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason - FROM ' . USERS_TABLE . " - WHERE user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "' - AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; + $sql_array = array( + 'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason', + 'FROM' => array(USERS_TABLE => 'u'), + 'WHERE' => "user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "' + AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'" + ); + + /** + * Change SQL query for fetching user data + * + * @event core.ucp_remind_modify_select_sql + * @var string email User's email from the form + * @var string username User's username from the form + * @var array sql_array Fully assembled SQL query with keys SELECT, FROM, WHERE + * @since 3.1.11-RC1 + */ + $vars = array( + 'email', + 'username', + 'sql_array', + ); + extract($phpbb_dispatcher->trigger_event('core.ucp_remind_modify_select_sql', compact($vars))); + + $sql = $db->sql_build_query('SELECT', $sql_array); $result = $db->sql_query($sql); $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); |