SF.net SVN: postfixadmin:[796] trunk

[<Seb...@us...>]

Revision: 796
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=796&view=rev
Author:   Sebastian2009
Date:     2010-01-23 11:23:14 +0000 (Sat, 23 Jan 2010)

Log Message:
-----------
- fix bug that no admins and domains can be edited.
- workaround for filename problem.

Modified Paths:
--------------
    trunk/list-admin.php
    trunk/list-domain.php

Added Paths:
-----------
    trunk/templates/adminlistadmin.tpl
    trunk/templates/adminlistdomain.tpl

Removed Paths:
-------------
    trunk/templates/admin_list-admin.tpl
    trunk/templates/admin_list-domain.tpl

Modified: trunk/list-admin.php
===================================================================
--- trunk/list-admin.php	2010-01-14 13:41:02 UTC (rev 795)
+++ trunk/list-admin.php	2010-01-23 11:23:14 UTC (rev 796)
@@ -41,7 +41,7 @@
 }
 $smarty->assign ('admin_properties', $admin_properties);
 $smarty->assign ('tMessage', $tMessage, false);
-$smarty->assign ('smarty_template', 'admin_list-admin');
+$smarty->assign ('smarty_template', 'adminlistadmin');
 $smarty->display ('index.tpl');
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */

Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php	2010-01-14 13:41:02 UTC (rev 795)
+++ trunk/list-domain.php	2010-01-23 11:23:14 UTC (rev 796)
@@ -13,7 +13,7 @@
  * 
  * File: list-domain.php
  * List all domains as a quick overview.
- * Template File: admin_list-domain.tpl
+ * Template File: adminlistdomain.tpl
  *
  * Template Variables:
  *
@@ -98,7 +98,7 @@
 if ($is_superadmin)
 {
 	$smarty->assign('select_options', select_options($list_admins, array ($fUsername)), false);
-	$smarty->assign('smarty_template', 'admin_list-domain');
+	$smarty->assign('smarty_template', 'adminlistdomain');
 }
 else
 {

Deleted: trunk/templates/admin_list-admin.tpl
===================================================================
--- trunk/templates/admin_list-admin.tpl	2010-01-14 13:41:02 UTC (rev 795)
+++ trunk/templates/admin_list-admin.tpl	2010-01-23 11:23:14 UTC (rev 796)
@@ -1,22 +0,0 @@
-{if $admin_properties}
-	<table id="admin_table">
-		{#tr_header#}
-			<td>{$PALANG.pAdminList_admin_username}</td>
-			<td>{$PALANG.pAdminList_admin_count}</td>
-			<td>{$PALANG.pAdminList_admin_modified}</td>
-			<td>{$PALANG.pAdminList_admin_active}</td>
-			<td colspan="2">&nbsp;</td>
-		</tr>
-{foreach from=$admin_properties item=admin}
-		{#tr_hilightoff#}
-			<td><a href="list-domain.php?username={$admin.name|escape:"url"}">{$admin.name}</a></td>
-			<td>{$admin.domain_count}</td>
-			<td>{$admin.modified}</td>
-			<td><a href="{#url_edit_active_admin#}?username={$admin.name|escape:"url"}">{$admin.active}</a></td>
-			<td><a href="{#url_edit_admin#}?username={$admin.name|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.name|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pAdminList_admin_username}: {$admin.name}');">{$PALANG.del}</a></td>
-		</tr>
-{/foreach}
-	</table>
-	<p><a href="{#url_create_admin#}">{$PALANG[$smarty.config.txt_create_admin]}</a></p>
-{/if}

Deleted: trunk/templates/admin_list-domain.tpl
===================================================================
--- trunk/templates/admin_list-domain.tpl	2010-01-14 13:41:02 UTC (rev 795)
+++ trunk/templates/admin_list-domain.tpl	2010-01-23 11:23:14 UTC (rev 796)
@@ -1,41 +0,0 @@
-<div id="overview">
-<form name="frmOverview" method="post" action="">
-	<select name="fUsername" onchange="this.form.submit();">
-	{$select_options}
-	</select>
-	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
-</form>
-{#form_search#}
-</div>
-{if $domain_properties}
-	<table id="admin_table">
-		{#tr_header#}
-			<td>{$PALANG.pAdminList_domain_domain}</td>
-			<td>{$PALANG.pAdminList_domain_description}</td>
-			<td>{$PALANG.pAdminList_domain_aliases}</td>
-			<td>{$PALANG.pAdminList_domain_mailboxes}</td>
-			{if $CONF.quota===YES}<td>{$PALANG.pAdminList_domain_maxquota}</td>{/if}
-			{if $CONF.transport===YES}<td>{$PALANG.pAdminList_domain_transport}</td>{/if}
-			<td>{$PALANG.pAdminList_domain_backupmx}</td>
-			<td>{$PALANG.pAdminList_domain_modified}</td>
-			<td>{$PALANG.pAdminList_domain_active}</td>
-			<td colspan="2">&nbsp;</td>
-		</tr>
-{foreach from=$domain_properties item=domain }
-		{#tr_hilightoff#}
-			<td><a href="{#url_list_virtual#}?domain={$domain.domain|escape:"url"}">{$domain.domain}</a></td>
-			<td>{$domain.description}</td>
-			<td>{$domain.alias_count} / {$domain.aliases}</td>
-			<td>{$domain.mailbox_count} / {$domain.mailboxes}</td>
-			{if $CONF.quota==YES}<td>{$domain.maxquota}</td>{/if}
-			{if $CONF.transport===YES}<td>{$domain.transport}</td>{/if}
-			<td>{$domain.backupmx}</td>
-			<td>{$domain.modified}</td>
-			<td><a href="{#url_edit_active_domain#}?domain={$domain.domain|escape:"url"}">{$domain.active}</a></td>
-			<td><a href="{#url_edit_domain#}?domain={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="{#url_delete#}?table=domain&amp;delete={$domain.domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.pAdminList_admin_domain}: {$domain.domain}')">{$PALANG.del}</a></td>
-		</tr>
-{/foreach}
-	</table>
-{/if}
-<p><a href="{#url_create_domain#}">{$PALANG[$smarty.config.txt_create_domain]}</a></p>

Copied: trunk/templates/adminlistadmin.tpl (from rev 794, trunk/templates/admin_list-admin.tpl)
===================================================================
--- trunk/templates/adminlistadmin.tpl	                        (rev 0)
+++ trunk/templates/adminlistadmin.tpl	2010-01-23 11:23:14 UTC (rev 796)
@@ -0,0 +1,22 @@
+{if $admin_properties}
+	<table id="admin_table">
+		{#tr_header#}
+			<td>{$PALANG.pAdminList_admin_username}</td>
+			<td>{$PALANG.pAdminList_admin_count}</td>
+			<td>{$PALANG.pAdminList_admin_modified}</td>
+			<td>{$PALANG.pAdminList_admin_active}</td>
+			<td colspan="2">&nbsp;</td>
+		</tr>
+{foreach from=$admin_properties item=admin}
+		{#tr_hilightoff#}
+			<td><a href="list-domain.php?username={$admin.name|escape:"url"}">{$admin.name}</a></td>
+			<td>{$admin.domain_count}</td>
+			<td>{$admin.modified}</td>
+			<td><a href="{#url_edit_active_admin#}?username={$admin.name|escape:"url"}">{$admin.active}</a></td>
+			<td><a href="{#url_edit_admin#}?username={$admin.name|escape:"url"}">{$PALANG.edit}</a></td>
+			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.name|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pAdminList_admin_username}: {$admin.name}');">{$PALANG.del}</a></td>
+		</tr>
+{/foreach}
+	</table>
+	<p><a href="{#url_create_admin#}">{$PALANG[$smarty.config.txt_create_admin]}</a></p>
+{/if}

Copied: trunk/templates/adminlistdomain.tpl (from rev 794, trunk/templates/admin_list-domain.tpl)
===================================================================
--- trunk/templates/adminlistdomain.tpl	                        (rev 0)
+++ trunk/templates/adminlistdomain.tpl	2010-01-23 11:23:14 UTC (rev 796)
@@ -0,0 +1,41 @@
+<div id="overview">
+<form name="frmOverview" method="post" action="">
+	<select name="fUsername" onchange="this.form.submit();">
+	{$select_options}
+	</select>
+	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
+</form>
+{#form_search#}
+</div>
+{if $domain_properties}
+	<table id="admin_table">
+		{#tr_header#}
+			<td>{$PALANG.pAdminList_domain_domain}</td>
+			<td>{$PALANG.pAdminList_domain_description}</td>
+			<td>{$PALANG.pAdminList_domain_aliases}</td>
+			<td>{$PALANG.pAdminList_domain_mailboxes}</td>
+			{if $CONF.quota===YES}<td>{$PALANG.pAdminList_domain_maxquota}</td>{/if}
+			{if $CONF.transport===YES}<td>{$PALANG.pAdminList_domain_transport}</td>{/if}
+			<td>{$PALANG.pAdminList_domain_backupmx}</td>
+			<td>{$PALANG.pAdminList_domain_modified}</td>
+			<td>{$PALANG.pAdminList_domain_active}</td>
+			<td colspan="2">&nbsp;</td>
+		</tr>
+{foreach from=$domain_properties item=domain }
+		{#tr_hilightoff#}
+			<td><a href="{#url_list_virtual#}?domain={$domain.domain|escape:"url"}">{$domain.domain}</a></td>
+			<td>{$domain.description}</td>
+			<td>{$domain.alias_count} / {$domain.aliases}</td>
+			<td>{$domain.mailbox_count} / {$domain.mailboxes}</td>
+			{if $CONF.quota==YES}<td>{$domain.maxquota}</td>{/if}
+			{if $CONF.transport===YES}<td>{$domain.transport}</td>{/if}
+			<td>{$domain.backupmx}</td>
+			<td>{$domain.modified}</td>
+			<td><a href="{#url_edit_active_domain#}?domain={$domain.domain|escape:"url"}">{$domain.active}</a></td>
+			<td><a href="{#url_edit_domain#}?domain={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td>
+			<td><a href="{#url_delete#}?table=domain&amp;delete={$domain.domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.pAdminList_admin_domain}: {$domain.domain}')">{$PALANG.del}</a></td>
+		</tr>
+{/foreach}
+	</table>
+{/if}
+<p><a href="{#url_create_domain#}">{$PALANG[$smarty.config.txt_create_domain]}</a></p>


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