Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/monitor/show_munin.php

@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

//* Check permissions for module
$app->auth->check_module_permissions('monitor');
@@ -47,9 +47,9 @@
$app->tpl->setVar("list_head_txt", $title);

if($_SESSION["s"]["user"]["typ"] == 'admin'){
	

   $app->uses('getconf');
   $server_config = $app->getconf->get_server_config($_SESSION['monitor']['server_id'],'server');
   $server_config = $app->getconf->get_server_config($_SESSION['monitor']['server_id'], 'server');

   $munin_url = trim($server_config['munin_url']);
   if($munin_url != ''){
@@ -58,17 +58,17 @@
      $munin_password = trim($server_config['munin_password']);
      $auth_string = '';
      if($munin_user != ''){
         $auth_string = $munin_user;
         $auth_string = rawurlencode($munin_user);
      }
      if($munin_user != '' && $munin_password != ''){
         $auth_string .= ':'.$munin_password;
         $auth_string .= ':'.rawurlencode($munin_password);
      }
      if($auth_string != '') $auth_string .= '@';
	

      $munin_url_parts = parse_url($munin_url);
  

      $munin_url = $munin_url_parts['scheme'].'://'.$auth_string.$munin_url_parts['host'].(isset($munin_url_parts['port']) ? ':' . $munin_url_parts['port'] : '').(isset($munin_url_parts['path']) ? $munin_url_parts['path'] : '').(isset($munin_url_parts['query']) ? '?' . $munin_url_parts['query'] : '').(isset($munin_url_parts['fragment']) ? '#' . $munin_url_parts['fragment'] : '');
		

      $app->tpl->setVar("munin_url", $munin_url);
   } else {
      $app->tpl->setVar("no_munin_url_defined_txt", $app->lng("no_munin_url_defined_txt"));