Skip to content

Commit ac33833

Browse files
committed
Web UI: Move the ban reasons to a single place
1 parent d67ff7a commit ac33833

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

config.php-distr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ define('USER_TIMEOUT', 24*60*60);
6565
define('GUEST_WAIT', 10);
6666
define('INVITE_VALID_FROM_BANNED', false);
6767
define('ALLOW_BANNED_INVITE_REG', false);
68+
define('BAN_REASONS', 'guest|parsing|commerce|public|inherit|weak|left');
6869

6970
// Daemons
7071
define('GEO_PORTION', 100);

index.html

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,10 @@
6969
}
7070
function banReasonStr(error)
7171
{
72-
switch (error)
73-
{
74-
case 'guest':
75-
return '%l10n_ban_guest%';
76-
case 'parsing':
77-
return '%l10n_ban_parsing%';
78-
case 'commerce':
79-
return '%l10n_ban_commerce%';
80-
case 'public':
81-
return '%l10n_ban_public%';
82-
case 'inherit':
83-
return '%l10n_ban_inherit%';
84-
case 'weak':
85-
return '%l10n_ban_weak%';
86-
case 'left':
87-
return '%l10n_ban_left%';
88-
default:
72+
if (error in BanReasons)
73+
return BanReasons[error];
74+
else
8975
return '%l10n_err_unknown%';
90-
}
9176
}
9277
function encodeHTML(str, spaces)
9378
{
@@ -368,6 +353,7 @@
368353
}
369354

370355
var ProfileInfo = {%profile%};
356+
var BanReasons = %ban_reasons%;
371357

372358
function initmenu()
373359
{

index.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function preparePage(&$content)
7070
global $broadcast;
7171
$content = str_replace('%broadcast%', $broadcast, $content);
7272

73-
global $UserManager, $l10n, $profile, $lat, $lon, $rad;
73+
global $UserManager, $l10n, $ban_reasons, $profile, $lat, $lon, $rad;
7474
$ViewLogin = $UserManager->Login;
7575
$ViewNick = $UserManager->Nick;
7676
$ViewLevel = $UserManager->Level;
@@ -99,6 +99,7 @@ function preparePage(&$content)
9999
if (empty($ViewWAPI)) $ViewWAPI = $l10n['no_access'];
100100

101101
$content = str_replace('%login_str%', ($UserManager->isLogged() ? $l10n['menu_logout'] : $l10n['menu_login']), $content);
102+
$content = str_replace('%ban_reasons%', json_encode($ban_reasons), $content);
102103
$content = str_replace('%profile%', $profile, $content);
103104
$content = str_replace('%isUser%', (int)$UserManager->isLogged(), $content);
104105
$content = str_replace('%login%', htmlspecialchars($ViewLogin), $content);
@@ -203,8 +204,14 @@ function setFloat($in, &$out)
203204
}
204205
}
205206

207+
$ban_reasons = array();
206208
$profile = 'isUser: %isUser%, Nickname: "%nick%", Level: %user_access_level%, invites: %user_invites%, viewUser: "%view_user%"';
207209

210+
foreach (explode('|', BAN_REASONS) as $reason)
211+
{
212+
$ban_reasons[$reason] = $l10n["ban_$reason"];
213+
}
214+
208215
$theme_base = 'themes';
209216
$themes = scandir("$theme_base/");
210217
$filter = array();

user.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@
9393
userBoxTimeout = null;
9494
for (var i = -2; i <= 3; i++)
9595
$('select#user_level').append($('<option>').val(i).text(levelToText(i)));
96-
var br = ['', 'guest', 'parsing', 'commerce', 'public', 'inherit', 'weak', 'left'];
96+
var br = [''];
97+
for (var reason in BanReasons)
98+
{
99+
br.push(reason);
100+
};
97101
br.forEach(function(reason)
98102
{
99103
$('select#ban_reason').append($('<option>').val(reason).text(reason));

0 commit comments

Comments
 (0)