From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Mon, 14 Oct 2013 08:57:25 -0400 Subject: [PATCH] Added missing empty directories from svn import --- interface/web/mail/webmailer.php | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/interface/web/mail/webmailer.php b/interface/web/mail/webmailer.php index 5eb70ea..7b3e862 100644 --- a/interface/web/mail/webmailer.php +++ b/interface/web/mail/webmailer.php @@ -32,31 +32,44 @@ require_once('../../lib/app.inc.php'); //* Check permissions for module -$app->auth->check_module_permissions('sites'); +$app->auth->check_module_permissions('mail'); /* get the id of the mail (must be int!) */ if (!isset($_GET['id'])){ die ("No E-Mail selected!"); } -$emailId = intval($_GET['id']); +$emailId = $app->functions->intval($_GET['id']); /* * Get the data to connect to the database */ $dbData = $app->db->queryOneRecord("SELECT server_id FROM mail_user WHERE mailuser_id = " . $emailId); -$serverId = intval($dbData['server_id']); +$serverId = $app->functions->intval($dbData['server_id']); if ($serverId == 0){ die ("No E-Mail - Server found!"); } -$serverData = $app->db->queryOneRecord( - "SELECT server_name FROM server WHERE server_id = " . - $serverId); +$serverData = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$serverId); + +$app->uses('getconf'); +$global_config = $app->getconf->get_global_config('mail'); + +if($global_config['webmail_url'] != '') { + $webmail_url = $global_config['webmail_url']; + $webmail_url = str_replace('[SERVERNAME]', $serverData['server_name'], $webmail_url); + header('Location:' . $webmail_url); +} else { /* * We only redirect to the login-form, so there is no need, to check any rights */ -isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http'; -header('location:' . $http . '://' . $serverData['server_name'] . '/webmail'); + isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http'; + if($web_config['server_type'] == 'nginx') { + header('Location: http://' . $serverData['server_name'] . ':8081/webmail'); + } else { + header('Location: ' . $http . '://' . $serverData['server_name'] . '/webmail'); + } + isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http'; +} exit; ?> \ No newline at end of file -- Gitblit v1.9.1