Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 interface/web/remote/monitor.php

@@ -13,7 +13,7 @@

$type = addslashes($_GET['type']);
$token = addslashes($_GET['token']);
$server_id = intval($_GET['server']);
$server_id = $app->functions->intval($_GET['server']);

$app->uses('getconf');
$interface_config = $app->getconf->get_global_config('misc');