From e615265d3b51e27f0f664cea193b6353975d6f7d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 29 Aug 2011 04:25:44 -0400
Subject: [PATCH] Fixed php notice in session library.
---
interface/web/mail/mail_transport_edit.php | 109 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 18 deletions(-)
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 161321d..614824b 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -41,11 +41,8 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
@@ -59,23 +56,77 @@
// we will check only users, not admins
if($_SESSION["s"]["user"]["typ"] == 'user') {
-
- // Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- // Check if the user may add another mailbox.
- if($client["limit_mailrouting"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id");
- if($tmp["number"] >= $client["limit_mailrouting"]) {
- $app->error($app->tform->wordbook["limit_mailrouting_txt"]);
- }
+ if(!$app->tform->checkClientLimit('limit_mailrouting')) {
+ $app->error($app->tform->wordbook["limit_mailrouting_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_mailrouting')) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_mailrouting_txt"]);
}
}
parent::onShowNew();
}
+ function onShowEnd() {
+ global $app, $conf;
+
+ $tmp_parts = explode(":",$this->dataRecord["transport"]);
+ if(!empty($this->id) && !stristr($this->dataRecord["transport"],':')) {
+ $rec["type"] = 'custom';
+ } else {
+ if(empty($this->id) && empty($tmp_parts[0])) {
+ $rec["type"] = 'smtp';
+ } else {
+ $rec["type"] = $tmp_parts[0];
+ }
+ }
+ if(@$tmp_parts[2] != '') {
+ $dest = @$tmp_parts[1].':'.@$tmp_parts[2];
+ } elseif($tmp_parts[1] != '') {
+ $dest = $tmp_parts[1];
+ } else {
+ $dest = $this->dataRecord["transport"];
+ }
+ if(@substr($dest,0,1) == '[') {
+ $rec["mx"] = 'checked="CHECKED"';
+ $rec["destination"] = @str_replace(']','',@str_replace('[','',$dest));
+ } else {
+ $rec["mx"] = '';
+ $rec["destination"] = @$dest;
+ }
+
+ $types = array('smtp' => 'smtp','uucp' => 'uucp','slow' => 'slow', 'error' => 'error', 'custom' => 'custom','' => 'null');
+ $type_select = '';
+ if(is_array($types)) {
+ foreach( $types as $key => $val) {
+ $selected = ($key == $rec["type"])?'SELECTED':'';
+ $type_select .= "<option value='$key' $selected>$val</option>\r\n";
+ }
+ }
+ $rec["type"] = $type_select;
+ $app->tpl->setVar($rec);
+ unset($type);
+ unset($types);
+
+ parent::onShowEnd();
+ }
+
+ function onBeforeUpdate() {
+ global $app, $conf;
+
+ //* Check if the server has been changed
+ // We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
+ if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $rec = $app->db->queryOneRecord("SELECT server_id from mail_transport WHERE transport_id = ".$this->id);
+ if($rec['server_id'] != $this->dataRecord["server_id"]) {
+ //* Add a error message and switch back to old server
+ $app->tform->errorMessage .= $app->lng('The Server can not be changed.');
+ $this->dataRecord["server_id"] = $rec['server_id'];
+ }
+ unset($rec);
+ }
+ }
+
function onSubmit() {
global $app, $conf;
@@ -85,7 +136,7 @@
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
- // Check if the user may add another mailbox.
+ // Check if the user may add another transport.
if($this->id == 0 && $client["limit_mailrouting"] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id");
if($tmp["number"] >= $client["limit_mailrouting"]) {
@@ -95,6 +146,28 @@
}
} // end if user is not admin
+ //* Compose transport field
+ if($this->dataRecord["mx"] == 'y') {
+ if(stristr($this->dataRecord["destination"],':')) {
+ $tmp_parts = explode(":",$this->dataRecord["destination"]);
+ $transport = '['.$tmp_parts[0].']:'.$tmp_parts[1];
+ } else {
+ $transport = '['.$this->dataRecord["destination"].']';
+ }
+ } else {
+ $transport = $this->dataRecord["destination"];
+ }
+
+ if($this->dataRecord["type"] == 'custom') {
+ $this->dataRecord["transport"] = $transport;
+ } else {
+ $this->dataRecord["transport"] = $this->dataRecord["type"].':'.$transport;
+ }
+
+ unset($this->dataRecord["type"]);
+ unset($this->dataRecord["mx"]);
+ unset($this->dataRecord["destination"]);
+
parent::onSubmit();
}
--
Gitblit v1.9.1