Merge branch 'patch-2' into 'malio'

fix bug with af2a7d2a

See merge request masivro/malio-theme-for-sspanel!47
QuickEdition(No-js-Encryption)
Masivro 7 years ago
commit 4bb967085a

@ -137,18 +137,20 @@ class UserController extends BaseController
$users = array();
foreach ($users_raw as $user_raw) {
$user_raw = Tools::keyFilter($user_raw, $key_list);
if ($node->sort == 14) {
$user_raw->sha224uuid = hash('sha224', $user_raw->uuid);
}
if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) {
$user_raw = Tools::keyFilter($user_raw, $key_list);
$users[] = $user_raw;
} else if (Config::get('keep_connect') === true) {
$user_raw = Tools::keyFilter($user_raw, $key_list);
// 流量耗尽用户限速至 1Mbps
$user_raw->node_speedlimit = 1;
$users[] = $user_raw;
}
}
$res = [
'ret' => 1,

@ -731,6 +731,11 @@ class UserController extends BaseController
return $this->view()->assign('node', $node)->assign('user', $user)->assign('mu', $mu)->assign('relay_rule_id', $relay_rule_id)->registerClass('URL', URL::class)->display('user/nodeinfo.tpl');
}
break;
case 14:
if ((($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) || $user->is_admin) && ($node->node_bandwidth_limit == 0 || $node->node_bandwidth < $node->node_bandwidth_limit)) {
return $this->view()->assign('node', $node)->assign('user', $user)->registerClass('URL', URL::class)->display('user/nodeinfo.tpl');
}
break;
default:
echo '微笑';
}

Loading…
Cancel
Save