mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-17 22:11:26 +02:00
- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)
- use getenv instead of $_ENV (with $_ENV the case could be wrong) - permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently) - implemented max login attempts - changed the expected return parameters for logins/sessions - added acp page for editing report/denial reasons - other fixes here and there git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -42,7 +42,6 @@ class ucp_prefs
|
||||
'notifypm' => true,
|
||||
'popuppm' => false,
|
||||
'allowpm' => true,
|
||||
'report_pm_notify' => false
|
||||
);
|
||||
|
||||
foreach ($var_ary as $var => $default)
|
||||
@@ -63,7 +62,6 @@ class ucp_prefs
|
||||
if (!sizeof($error))
|
||||
{
|
||||
$user->optionset('popuppm', $popuppm);
|
||||
$user->optionset('report_pm_notify', $report_pm_notify);
|
||||
|
||||
$sql_ary = array(
|
||||
'user_allow_pm' => $allowpm,
|
||||
@@ -113,9 +111,6 @@ class ucp_prefs
|
||||
$popuppm = (isset($popuppm)) ? $popuppm : $user->optionget('popuppm');
|
||||
$popup_pm_yes = ($popuppm) ? ' checked="checked"' : '';
|
||||
$popup_pm_no = (!$popuppm) ? ' checked="checked"' : '';
|
||||
$report_pm_notify = (isset($report_pm_notify)) ? $report_pm_notify : $user->optionget('report_pm_notify');
|
||||
$report_pm_notify_yes = ($report_pm_notify) ? ' checked="checked"' : '';
|
||||
$report_pm_notify_no = (!$report_pm_notify) ? ' checked="checked"' : '';
|
||||
$dst = (isset($dst)) ? $dst : $user->data['user_dst'];
|
||||
$dst_yes = ($dst) ? ' checked="checked"' : '';
|
||||
$dst_no = (!$dst) ? ' checked="checked"' : '';
|
||||
@@ -160,8 +155,6 @@ class ucp_prefs
|
||||
'NOTIFY_PM_NO' => $notify_pm_no,
|
||||
'POPUP_PM_YES' => $popup_pm_yes,
|
||||
'POPUP_PM_NO' => $popup_pm_no,
|
||||
'REPORT_PM_YES' => $report_pm_notify_yes,
|
||||
'REPORT_PM_NO' => $report_pm_notify_no,
|
||||
'DST_YES' => $dst_yes,
|
||||
'DST_NO' => $dst_no,
|
||||
'NOTIFY_EMAIL' => ($notifymethod == NOTIFY_EMAIL) ? 'checked="checked"' : '',
|
||||
|
Reference in New Issue
Block a user