Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

 interface/web/admin/users_del.php

@@ -44,6 +44,7 @@

//* Check permissions for module
$app->auth->check_module_permissions('admin');
$app->auth->check_security_permissions('admin_allow_del_cpuser');
if($conf['demo_mode'] == true && $_REQUEST['id'] <= 3) $app->error('This function is disabled in demo mode.');

$app->uses("tform_actions");