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

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

 interface/web/admin/remote_user_edit.php

@@ -13,6 +13,9 @@
   die;
}

$app->auth->check_module_permissions('admin');
$app->auth->check_security_permissions('admin_allow_remote_users');

// Disable this function in demo mode
if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');