SF.net SVN: postfixadmin:[815] trunk

[<Gin...@us...>]

Revision: 815
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=815&view=rev
Author:   GingerDog
Date:     2010-03-24 12:43:51 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
merge in patch 2972300 - better login behaviour for users

Modified Paths:
--------------
    trunk/functions.inc.php
    trunk/users/index.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2010-03-24 12:33:15 UTC (rev 814)
+++ trunk/functions.inc.php	2010-03-24 12:43:51 UTC (rev 815)
@@ -81,7 +81,12 @@
     if(authentication_has_role($role)) {
         return True;
     }
-    header("Location: " . $CONF['postfix_admin_url'] . "/login.php");
+    if($role === 'user') {
+        header("Location: " . $CONF['postfix_admin_url'] . '/users/login.php');
+    }
+    else {
+        header("Location: " . $CONF['postfix_admin_url'] . "/login.php");
+    }
     exit(0);
 }
 /**

Modified: trunk/users/index.php
===================================================================
--- trunk/users/index.php	2010-03-24 12:33:15 UTC (rev 814)
+++ trunk/users/index.php	2010-03-24 12:43:51 UTC (rev 815)
@@ -24,8 +24,7 @@
  *
  * -none-
  */
-header ("Location: login.php");
+header ("Location: main.php");
 exit;
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>


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