diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-02-18 13:54:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-02-18 13:54:12 +0000 |
| commit | 26a6d215d0897afa82eea9b0cc0fca79d4544da5 (patch) | |
| tree | 50645d56ce20cb6fa5e18a2eb1036deba65a1068 /phpBB/includes/acp/acp_email.php | |
| parent | f2f0dc78929228619f8644d6553a02a8d1572242 (diff) | |
| download | forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.gz forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.bz2 forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.xz forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.zip | |
- fix some tiny bugs
- fix module system (sometimes the layout is broken due to falsly deactivated categories)
- auth updates (setting permissions)
- fix "category jumping" bug in acp
- u_action is defined by the module itself
git-svn-id: file:///svn/phpbb/trunk@5558 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 597d8a1115..b870a451db 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -13,6 +13,8 @@ */ class acp_email { + var $u_action; + function main($id, $mode) { global $config, $db, $user, $auth, $template, $cache; @@ -22,8 +24,6 @@ class acp_email $this->tpl_name = 'acp_email'; $this->page_title = 'ACP_MASS_EMAIL'; - $u_action = "{$phpbb_admin_path}index.$phpEx$SID&i=$id&mode=$mode"; - // Set some vars $submit = (isset($_POST['submit'])) ? true : false; $error = array(); @@ -87,7 +87,7 @@ class acp_email if (!($row = $db->sql_fetchrow($result))) { - trigger_error($user->lang['NO_USER'] . adm_back_link($u_action)); + trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action)); } $db->sql_freeresult($result); @@ -186,7 +186,7 @@ class acp_email add_log('admin', 'LOG_MASS_EMAIL', $group_name); $message = (!$errored) ? $user->lang['EMAIL_SENT'] : sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . $phpbb_admin_path . "index.$phpEx$SID&i=logs&mode=critical" . '">', '</a>'); - trigger_error($message . adm_back_link($u_action)); + trigger_error($message . adm_back_link($this->u_action)); } } @@ -206,7 +206,7 @@ class acp_email $template->assign_vars(array( 'S_WARNING' => (sizeof($error)) ? true : false, 'WARNING_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', - 'U_ACTION' => $u_action, + 'U_ACTION' => $this->u_action, 'S_GROUP_OPTIONS' => $select_list, 'USERNAMES' => $usernames, 'U_FIND_USERNAME' => $phpbb_root_path . "memberlist.$phpEx$SID&mode=searchuser&form=acp_email&field=usernames", |