From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable
---
interface/web/mail/webmailer.php | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/interface/web/mail/webmailer.php b/interface/web/mail/webmailer.php
index 2cff5da..3a10c0f 100644
--- a/interface/web/mail/webmailer.php
+++ b/interface/web/mail/webmailer.php
@@ -28,15 +28,15 @@
*/
-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('mail');
/* get the id of the mail (must be int!) */
if (!isset($_GET['id'])){
- die ("No E-Mail selected!");
+ die ("No E-Mail selected!");
}
$emailId = $app->functions->intval($_GET['id']);
@@ -46,7 +46,7 @@
$dbData = $app->db->queryOneRecord("SELECT server_id FROM mail_user WHERE mailuser_id = " . $emailId);
$serverId = $app->functions->intval($dbData['server_id']);
if ($serverId == 0){
- die ("No E-Mail - Server found!");
+ die ("No E-Mail - Server found!");
}
$serverData = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$serverId);
@@ -55,14 +55,21 @@
$global_config = $app->getconf->get_global_config('mail');
if($global_config['webmail_url'] != '') {
- header('Location:' . $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');
+ 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