edit-domain.php:

- deleted (obsoleted by create-domain.php)

create-domain.php:
- fixed wrong variable name that broke saving an edited domain

configs/menu.conf, templates/adminlistdomain.tpl
- changed to use create-domain.php?edit= instead of edit-domain?domain=



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1226 a1433add-5e2c-0410-b055-b7f2511e0802

configs/menu.conf

@@ -51,4 +51,4 @@ url_edit_admin = edit-admin.php
 
 [adminlistdomain]
 url_edit_active_domain = edit-active-domain.php
-url_edit_domain = edit-domain.php
+url_edit_domain = create-domain.php

create-domain.php

@@ -13,7 +13,7 @@
  * @license GNU GPL v2 or later. 
  * 
  * File: create-domain.php
- * Allows administrators to create new domains.
+ * Allows administrators to create or edit domains.
  * Template File: admin_edit-domain.tpl
  */
 
@@ -71,7 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
             }
         }
     }
-    if ($edit != "") $field[$id_field] = $edit;
+    if ($edit != "") $values[$id_field] = $edit;
 
     if (!$handler->init($values[$id_field])) {
         $error = 1;

edit-domain.php

@@ -1,136 +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-domain.php 
- * Updates the properties of a domain.
- * Template File: admin_edit-domain.tpl
- *
- * Template Variables:
- *
- * tDescription
- * tAliases
- * tMailboxes
- * tMaxquota
- * tActive
- *
- * Form POST \ GET Variables:
- *
- * fDescription
- * fAliases
- * fMailboxes
- * fMaxquota
- * fActive
- */
-
-require_once('common.php');
-
-authentication_require_role('global-admin');
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-    if (isset ($_GET['domain']))
-    {
-        $domain = escape_string ($_GET['domain']);
-        $domain_properties = get_domain_properties ($domain);
-
-        $tDescription = $domain_properties['description'];
-        $tAliases = $domain_properties['aliases'];
-        $tMailboxes = $domain_properties['mailboxes'];
-        $tDomainquota = $domain_properties['quota'];
-        $tMaxquota = $domain_properties['maxquota'];
-        $tTransport = $domain_properties['transport'];
-        $tBackupmx = $domain_properties['backupmx'];
-        $tActive = $domain_properties['active'];
-    }
-}
-
-if ($_SERVER['REQUEST_METHOD'] == "POST")
-{
-    if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
-
-    $fDescription   =       safepost('description');
-    $fAliases       = (int) safepost('aliases');
-    $fMailboxes     = (int) safepost('mailboxes');
-    $fMaxquota      = (int) safepost('maxquota', 0);
-    $fQuota         = (int) safepost('quota', $CONF['domain_quota_default']);
-    # TODO: check for / error out on values < -1
-
-    $fTransport = $CONF['transport_default'];
-    if($CONF['transport'] != 'NO' && isset ($_POST['transport'])) {
-        $fTransport = escape_string($_POST['transport']);
-        if(!in_array($fTransport, $CONF['transport_options'])) {
-            die("Invalid transport option given; check config.inc.php");
-        }
-    }
-
-    if (isset ($_POST['backupmx'])) $fBackupmx = (int) escape_string ($_POST['backupmx']);
-    if (isset ($_POST['active']))   $fActive   = (int) escape_string ($_POST['active']);
-
-    if ($fBackupmx == 1)
-    {
-        $fBackupmx = 1;
-        $sqlBackupmx = db_get_boolean(True);
-    }
-    else
-    {
-        $fBackupmx = 0;
-        $sqlBackupmx = db_get_boolean(False);
-    }
-
-    if ($fActive == 1) { 
-        $sqlActive = db_get_boolean(True);
-    }
-    else {
-        $sqlActive = db_get_boolean(False);
-    }
-
-    $db_values = array(
-       'description'=> $fDescription,
-       'aliases'    => $fAliases,
-       'mailboxes'  => $fMailboxes,
-       'maxquota'   => $fMaxquota,
-       'quota'      => $fQuota,
-       'backupmx'   => $sqlBackupmx,
-       'active'     => $sqlActive,
-    );
-
-    if($CONF['transport'] != 'NO') { # only change transport if it is allowed in config. Otherwise, keep the old value.
-        $db_values['transport'] =$fTransport;
-    }
-
-    $result = db_update('domain', 'domain', $domain, $db_values);
-
-    if ($result == 1) {
-        header ("Location: list-domain.php");
-        exit;
-    } else {
-        flash_error($PALANG['pAdminEdit_domain_result_error']);
-    }
-}
-
-$smarty->assign ('mode', 'edit');
-$smarty->assign ('errortext', '');
-$smarty->assign ('tDomain', $domain);
-$smarty->assign ('tDescription', $tDescription);
-$smarty->assign ('tAliases', $tAliases);
-$smarty->assign ('tMailboxes', $tMailboxes);
-$smarty->assign ('tMaxquota', $tMaxquota);
-$smarty->assign ('tQuota', $tDomainquota);
-$smarty->assign ('tTransport', select_options($CONF['transport_options'], array($tTransport)), false);
-if ($tBackupmx)	$smarty->assign ('tBackupmx', ' checked="checked"');
-if ($tActive)	$smarty->assign ('tActive', ' checked="checked"');
-$smarty->assign ('smarty_template', 'admin_edit-domain');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */

templates/adminlistdomain.tpl

@@ -34,7 +34,7 @@
 			<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_edit_domain#}?edit={$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}