From 0b786c8a2efe117ed9357a6d6836f123cb4911c6 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 29 Jul 2014 14:42:01 -0400
Subject: [PATCH] Fixed: FS#3584 - Misspelling in Postfix Whitelist
---
interface/web/mail/webmailer.php | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/interface/web/mail/webmailer.php b/interface/web/mail/webmailer.php
index e731992..3a10c0f 100644
--- a/interface/web/mail/webmailer.php
+++ b/interface/web/mail/webmailer.php
@@ -28,25 +28,25 @@
*/
-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 = 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!");
+ 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