From d66262f00e9f14aaa6dcaa6fdaf788c2bd1967bb Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sat, 9 Apr 2011 22:09:37 +0000
Subject: [PATCH] Remove usage of $CONF['postfix_admin_url'] in various
 Location: headers to avoid problems with wrong values of
 $CONF['postfix_admin_url'].

https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3039042&group_id=191583
contains the technical details and reasons.

Note: $CONF['postfix_admin_url'] is still used at some places that are
a bit harder to change.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1021 a1433add-5e2c-0410-b055-b7f2511e0802
---
 backup.php              | 2 +-
 broadcast-message.php   | 2 +-
 create-alias-domain.php | 4 ++--
 edit-vacation.php       | 4 ++--
 functions.inc.php       | 2 +-
 sendmail.php            | 2 +-
 users/vacation.php      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backup.php b/backup.php
index 5f6a542f..0e859cdf 100644
--- a/backup.php
+++ b/backup.php
@@ -25,7 +25,7 @@ require_once('common.php');
 
 authentication_require_role('global-admin');
 
-(($CONF['backup'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
+(($CONF['backup'] == 'NO') ? header("Location: main.php") && exit : '1');
 
 // TODO: make backup supported for postgres
 if ('pgsql'==$CONF['database_type'])
diff --git a/broadcast-message.php b/broadcast-message.php
index 5a3f463a..d407b381 100644
--- a/broadcast-message.php
+++ b/broadcast-message.php
@@ -31,7 +31,7 @@ require_once('common.php');
 authentication_require_role('global-admin');
 
 if ($CONF['sendmail'] != 'YES') {
-   header("Location: " . $CONF['postfix_admin_url'] . "/main.php");
+   header("Location: main.php");
    exit;
 }
 
diff --git a/create-alias-domain.php b/create-alias-domain.php
index 3164c78e..fdc52dac 100644
--- a/create-alias-domain.php
+++ b/create-alias-domain.php
@@ -34,7 +34,7 @@ require_once('common.php');
 authentication_require_role('admin');
 
 if (!boolconf('alias_domain')) {
-   header("Location: " . $CONF['postfix_admin_url'] . "/main.php");
+   header("Location: main.php");
    exit;
 }
 
@@ -128,7 +128,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
             flash_info($PALANG['pCreate_alias_domain_success']);
             # we would have to update the list of domains available for aliasing. Doing a redirect is easier.
-            header("Location: " . $CONF['postfix_admin_url'] . "/create-alias-domain.php");
+            header("Location: create-alias-domain.php");
             exit;
         }
     }
diff --git a/edit-vacation.php b/edit-vacation.php
index f9c77889..fc3d5058 100644
--- a/edit-vacation.php
+++ b/edit-vacation.php
@@ -38,7 +38,7 @@
 require_once('common.php');
 
 if($CONF['vacation'] == 'NO') { 
-   header("Location: " . $CONF['postfix_admin_url'] . "/list-virtual.php");
+   header("Location: list-virtual.php");
    exit(0);
 }
 
@@ -60,7 +60,7 @@ $vacation_domain = $CONF['vacation_domain'];
 $vacation_goto = preg_replace('/@/', '#', $fUsername);
 $vacation_goto = $vacation_goto . '@' . $vacation_domain;
 
-$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=$fDomain";
+$fCanceltarget = "list-virtual.php?domain=$fDomain";
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
diff --git a/functions.inc.php b/functions.inc.php
index 13f7dbc6..9d5c2d08 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -33,7 +33,7 @@ function authentication_get_username()
     }
 
     if (!isset($_SESSION['sessid'])) {
-        header ("Location: " . $CONF['postfix_admin_url'] . "/login.php");
+        header ("Location: login.php");
         exit(0);
     }
     $SESSID_USERNAME = $_SESSION['sessid']['username'];
diff --git a/sendmail.php b/sendmail.php
index 1f705548..2514ae12 100644
--- a/sendmail.php
+++ b/sendmail.php
@@ -34,7 +34,7 @@ require_once('common.php');
 
 authentication_require_role('admin');
 
-(($CONF['sendmail'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
+(($CONF['sendmail'] == 'NO') ? header("Location: main.php") && exit : '1');
 
 $SESSID_USERNAME = authentication_get_username();
 
diff --git a/users/vacation.php b/users/vacation.php
index f1da1150..b4036c35 100644
--- a/users/vacation.php
+++ b/users/vacation.php
@@ -38,7 +38,7 @@ $USERID_USERNAME = authentication_get_username();
 
 // is vacation support enabled in $CONF ?
 if($CONF['vacation'] == 'NO') {
-    header("Location: " . $CONF['postfix_admin_url'] . "/users/main.php");
+    header("Location: main.php");
     exit(0);
 }