SF.net SVN: postfixadmin:[1308] trunk

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

Revision: 1308
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1308&view=rev
Author:   christian_boltz
Date:     2011-12-26 16:26:30 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
list-virtual_alias_domain.tpl:
- use edit.php to switch active status for alias domains

edit-active.php:
- remove now superfluous handling of alias domains

configs/menu.conf:
- remove now superfluous url_edit_active (templates for list-mailbox
  and list-alias use hardcoded 'edit-active.php')

Modified Paths:
--------------
    trunk/configs/menu.conf
    trunk/edit-active.php
    trunk/templates/list-virtual_alias_domain.tpl

Modified: trunk/configs/menu.conf
===================================================================
--- trunk/configs/menu.conf	2011-12-26 16:08:24 UTC (rev 1307)
+++ trunk/configs/menu.conf	2011-12-26 16:26:30 UTC (rev 1308)
@@ -33,8 +33,6 @@
 url_user_logout = logout.php
 
 
-url_edit_active = edit-active.php
-
 tr_header = <tr class="header">
 tr_hilightoff = <tr class="hilightoff" onmouseover="className='hilighton';" onmouseout="className='hilightoff';">
 

Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php	2011-12-26 16:08:24 UTC (rev 1307)
+++ trunk/edit-active.php	2011-12-26 16:26:30 UTC (rev 1308)
@@ -32,7 +32,6 @@
 authentication_require_role('admin');
 $SESSID_USERNAME = authentication_get_username();
 
-$fAliasDomain = '';
 $fUsername    = '';
 $fAlias       = '';
 $fDomain      = '';
@@ -40,7 +39,6 @@
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-   if (isset ($_GET['alias_domain'])) $fAliasDomain = escape_string ($_GET['alias_domain']);
    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']);
@@ -81,19 +79,6 @@
             db_log ($fDomain, 'edit_alias_state', $fAlias);
          }
       }
-      if ($fAliasDomain != '')
-      {
-         $result = db_query ("UPDATE $table_alias_domain SET $setSql WHERE alias_domain='$fDomain'");
-         if ($result['rows'] != 1)
-         {
-            $error = 1;
-            flash_error($PALANG['pEdit_alias_domain_result_error']);
-         }
-         else
-         {
-            db_log ($fDomain, 'edit_alias_domain_state', $fDomain);
-         }
-      }
    }
 
    if ($error != 1)

Modified: trunk/templates/list-virtual_alias_domain.tpl
===================================================================
--- trunk/templates/list-virtual_alias_domain.tpl	2011-12-26 16:08:24 UTC (rev 1307)
+++ trunk/templates/list-virtual_alias_domain.tpl	2011-12-26 16:26:30 UTC (rev 1308)
@@ -30,7 +30,7 @@
 					{/if}
 					{if $item.target_domain != $fDomain}</a>{/if}</td>
 				<td>{$item.modified}</td>
-				<td><a href="{#url_edit_active#}?alias_domain=true&amp;domain={$item.alias_domain|escape:"url"}&amp;return={$smarty.config.url_list_virtual|escape:"url"}?domain={$fDomain|escape:"url"}&amp;limit={$current_limit|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
+				<td><a href="{#url_create_alias_domain#}&amp;edit={$item.alias_domain|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 				<td><a href="{#url_create_alias_domain#}&amp;edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td>
 				<td><a href="{#url_delete#}?table=alias_domain&amp;delete={$item.alias_domain|escape:"url"}&amp;domain={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>
 				</tr>

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