From be4a8a9d03c12d001b662d46ebf22017e3debec6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 20 Nov 2012 10:01:59 -0500
Subject: [PATCH] Set default umask to 022 in server.sh file.
---
interface/web/mail/webmailer.php | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/interface/web/mail/webmailer.php b/interface/web/mail/webmailer.php
index 5eb70ea..2cff5da 100644
--- a/interface/web/mail/webmailer.php
+++ b/interface/web/mail/webmailer.php
@@ -32,31 +32,37 @@
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'] != '') {
+ header('Location:' . $global_config['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';
+ header('Location:' . $http . '://' . $serverData['server_name'] . '/webmail');
+}
exit;
?>
\ No newline at end of file
--
Gitblit v1.9.1