SF.net SVN: postfixadmin:[1021] trunk

[<chr...@us...>]

Revision: 1021
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1021&view=rev
Author:   christian_boltz
Date:     2011-04-09 22:09:37 +0000 (Sat, 09 Apr 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/backup.php
    trunk/broadcast-message.php
    trunk/create-alias-domain.php
    trunk/edit-vacation.php
    trunk/functions.inc.php
    trunk/sendmail.php
    trunk/users/vacation.php

Modified: trunk/backup.php
===================================================================
--- trunk/backup.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/backup.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -25,7 +25,7 @@
 
 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'])

Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/broadcast-message.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -31,7 +31,7 @@
 authentication_require_role('global-admin');
 
 if ($CONF['sendmail'] != 'YES') {
-   header("Location: " . $CONF['postfix_admin_url'] . "/main.php");
+   header("Location: main.php");
    exit;
 }
 

Modified: trunk/create-alias-domain.php
===================================================================
--- trunk/create-alias-domain.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/create-alias-domain.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -34,7 +34,7 @@
 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 @@
 
             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;
         }
     }

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/edit-vacation.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -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_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")
 {

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/functions.inc.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -33,7 +33,7 @@
     }
 
     if (!isset($_SESSION['sessid'])) {
-        header ("Location: " . $CONF['postfix_admin_url'] . "/login.php");
+        header ("Location: login.php");
         exit(0);
     }
     $SESSID_USERNAME = $_SESSION['sessid']['username'];

Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/sendmail.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -34,7 +34,7 @@
 
 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();
 

Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php	2011-04-03 22:14:58 UTC (rev 1020)
+++ trunk/users/vacation.php	2011-04-09 22:09:37 UTC (rev 1021)
@@ -38,7 +38,7 @@
 
 // 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);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.