SF.net SVN: postfixadmin:[1569] trunk

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

Revision: 1569
          http://sourceforge.net/p/postfixadmin/code/1569
Author:   christian_boltz
Date:     2013-11-11 00:13:31 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
As a side effect of the previous commit (r1568), we can use login.php
for logout.

This means:
- change logout URL to login.php in menu.conf and users_main.tpl
- delete logout.php and users/logout.php

Revision Links:
--------------
    http://sourceforge.net/p/postfixadmin/code/1568

Modified Paths:
--------------
    trunk/configs/menu.conf
    trunk/templates/users_main.tpl

Removed Paths:
-------------
    trunk/logout.php
    trunk/users/logout.php

Modified: trunk/configs/menu.conf
===================================================================
--- trunk/configs/menu.conf	2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/configs/menu.conf	2013-11-11 00:13:31 UTC (rev 1569)
@@ -24,14 +24,14 @@
 # viewlog
 url_viewlog = viewlog.php
 # logout
-url_logout = logout.php
+url_logout = login.php
 
 # user-menu
 url_user_main = main.php
 url_user_edit_alias = edit-alias.php
 url_user_vacation = vacation.php
 url_user_password = password.php
-url_user_logout = logout.php
+url_user_logout = login.php
 
 
 tr_header = <tr class="header">

Deleted: trunk/logout.php
===================================================================
--- trunk/logout.php	2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/logout.php	2013-11-11 00:13:31 UTC (rev 1569)
@@ -1,32 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: logout.php
- * De-authenticates a user.
- * Template File: -none-
- *
- * Template Variables: -none-
- *
- * Form POST \ GET Variables: -none-
- */
-
-require_once('common.php');
-
-session_unset ();
-session_destroy ();
-
-header ("Location: login.php");
-exit;
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>

Modified: trunk/templates/users_main.tpl
===================================================================
--- trunk/templates/users_main.tpl	2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/templates/users_main.tpl	2013-11-11 00:13:31 UTC (rev 1569)
@@ -15,7 +15,7 @@
 		<td>{$PALANG.pUsersMain_password}</td>
 	</tr>
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="logout.php">{$PALANG.pMenu_logout}</a></td>
+		<td nowrap="nowrap"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
 		<td>{$PALANG.pMain_logout}</td>
 	</tr>
 </table>

Deleted: trunk/users/logout.php
===================================================================
--- trunk/users/logout.php	2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/users/logout.php	2013-11-11 00:13:31 UTC (rev 1569)
@@ -1,33 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: logout.php
- * De-authenticates a user.
- *
- * Template File: -none-
- *
- * Template Variables: -none-
- *
- * Form POST \ GET Variables: -none-
- */
-
-require_once('../common.php');
-
-session_unset ();
-session_destroy ();
-
-header ("Location: login.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.