SF.net SVN: postfixadmin:[1396] trunk

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

Revision: 1396
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1396&view=rev
Author:   christian_boltz
Date:     2012-05-28 18:07:33 +0000 (Mon, 28 May 2012)
Log Message:
-----------
config.inc.php:
- remove the (now superfluous) $CONF['postfix_admin_url'] config option

debian/patches/db_credentials:
- remove the section that sets $CONF['postfix_admin_url']

functions.inc.php - authentication_require_role():
- also remove $CONF['postfix_admin_url'] from comments
- remove the './' part from the redirect

Combined with the previous two commits, this fixes
https://sourceforge.net/tracker/?func=detail&aid=3039042&group_id=191583&atid=937964

Modified Paths:
--------------
    trunk/config.inc.php
    trunk/debian/patches/db_credentials
    trunk/functions.inc.php

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2012-05-28 18:01:31 UTC (rev 1395)
+++ trunk/config.inc.php	2012-05-28 18:07:33 UTC (rev 1396)
@@ -29,10 +29,6 @@
 // To create the hash, visit setup.php in a browser and type a password into the field,
 // on submission it will be echoed out to you as a hashed value.
 $CONF['setup_password'] = 'changeme';
-// Postfix Admin Path
-// Set the location of your Postfix Admin installation here.
-// YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
-$CONF['postfix_admin_url'] = '';
 
 // Language config
 // Language files are located in './languages', change as required..

Modified: trunk/debian/patches/db_credentials
===================================================================
--- trunk/debian/patches/db_credentials	2012-05-28 18:01:31 UTC (rev 1395)
+++ trunk/debian/patches/db_credentials	2012-05-28 18:07:33 UTC (rev 1396)
@@ -1,7 +1,7 @@
 Description: This patch sets the dbconfig placeholders in config.inc.php.
 Forwarded: not-needed
 Author: Norman Messtorff <no...@no...>
-Last-Update: 2011-12-18
+Last-Update: 2012-05-28
 
 Index: postfixadmin/config.inc.php
 ===================================================================
@@ -28,15 +28,6 @@
  
  // In order to setup Postfixadmin, you MUST specify a hashed password here.
  // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -32,7 +37,7 @@
- // Postfix Admin Path
- // Set the location of your Postfix Admin installation here.
- // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
--$CONF['postfix_admin_url'] = '';
-+$CONF['postfix_admin_url'] = '/postfixadmin';
- 
- // Language config
- // Language files are located in './languages', change as required..
 @@ -85,11 +90,11 @@
  // mysql = MySQL 3.23 and 4.0, 4.1 or 5
  // mysqli = MySQL 4.1+ 

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2012-05-28 18:01:31 UTC (rev 1395)
+++ trunk/functions.inc.php	2012-05-28 18:07:33 UTC (rev 1396)
@@ -78,8 +78,7 @@
 /**
  * Used to enforce that $user has a particular role when 
  * viewing a page.
- * If they are lacking a role, redirect them to 
- * $CONF['postfix_admin_url']/login.php
+ * If they are lacking a role, redirect them to login.php
  *
  * Note, user < admin < global-admin
  */
@@ -90,7 +89,7 @@
         return True;
     }
 
-    header("Location: ./login.php");
+    header("Location: login.php");
     exit(0);
 }
 /**

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