SF.net SVN: postfixadmin:[1450] trunk

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

Revision: 1450
          http://sourceforge.net/p/postfixadmin/code/1450
Author:   christian_boltz
Date:     2013-04-01 20:25:33 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
list-virtual_mailbox.tpl:
- replace edit-active.php with edit.php?...&active=

edit-active.php:
- finally unused after the above change -> delete

Modified Paths:
--------------
    trunk/templates/list-virtual_mailbox.tpl

Removed Paths:
-------------
    trunk/edit-active.php

Deleted: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php	2013-04-01 19:57:25 UTC (rev 1449)
+++ trunk/edit-active.php	2013-04-01 20:25:33 UTC (rev 1450)
@@ -1,104 +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://www.postfixadmin.com or http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: edit-active.php 
- * Responsible for toggling the active status of a mailbox. 
- *
- * Template File: message.tp
- *
- * Template Variables:
- *
- * none
- *
- * Form POST \ GET Variables:
- *
- * fUsername
- * fDomain
- * fReturn
- */
-require_once('common.php');
-
-authentication_require_role('admin');
-$SESSID_USERNAME = authentication_get_username();
-
-$fUsername    = '';
-$fAlias       = '';
-$fDomain      = '';
-$fReturn      = '';
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-   if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
-   if (isset ($_GET['alias'])) $fAlias = escape_string ($_GET['alias']); else $fAlias = escape_string ($_GET['username']);
-   if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
-   if (isset ($_GET['return'])) $fReturn = escape_string ($_GET['return']);
-
-   if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin') ) )
-   {
-      $error = 1;
-      flash_error($PALANG['pEdit_mailbox_domain_error'] . "<b>$fDomain</b>!");
-   }
-   else
-   {
-      $setSql=('pgsql'==$CONF['database_type']) ? 'active=NOT active' : 'active=1-active';
-      $setSql.=', modified=NOW()';
-      if ($fUsername != '')
-      {
-         $result = db_query ("UPDATE $table_mailbox SET $setSql WHERE username='$fUsername' AND domain='$fDomain'");
-         if ($result['rows'] != 1)
-         {
-            $error = 1;
-            flash_error($PALANG['pEdit_mailbox_result_error']);
-         }
-         else
-         {
-            db_log ($fDomain, 'edit_mailbox_state', $fUsername);
-         }
-      }
-      if ($fAlias != '')
-      {
-         $result = db_query ("UPDATE $table_alias SET $setSql WHERE address='$fAlias' AND domain='$fDomain'");
-         if ($result['rows'] != 1)
-         {
-            $error = 1;
-            flash_error($PALANG['pEdit_mailbox_result_error']);
-         }
-         else
-         {
-            db_log ($fDomain, 'edit_alias_state', $fAlias);
-         }
-      }
-   }
-
-   if ($error != 1)
-   {
-      if ( preg_match( "/^list-virtual.php.*/", $fReturn ) || 
-           preg_match( "/^search.php.*/", $fReturn )    )
-      {
-         //$fReturn appears OK, jump there
-         header ("Location: $fReturn");
-      }
-      else
-      {
-         header ("Location: list-virtual.php?domain=$fDomain");
-      }
-      exit;
-   }
-}
-
-$smarty->assign ('smarty_template', 'message');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>

Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl	2013-04-01 19:57:25 UTC (rev 1449)
+++ trunk/templates/list-virtual_mailbox.tpl	2013-04-01 20:25:33 UTC (rev 1450)
@@ -66,7 +66,8 @@
 				</td>
 			{/if}
 			<td>{$item.modified}</td>
-			<td><a href="edit-active.php?username={$item.username|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
+			<td><a href="{#url_create_mailbox#}&amp;edit={$item.username|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}"
+				>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 			{if $CONF.vacation_control_admin===YES && $CONF.vacation===YES}
 				{if $item.v_active!==-1}
 					{if $item.v_active==1}

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