SF.net SVN: postfixadmin:[1225] trunk

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

Revision: 1225
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1225&view=rev
Author:   christian_boltz
Date:     2011-10-19 21:09:54 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
Add edit mode to create-domain.php

create-domain.php:
- add edit mode (use ?edit=example.com)
- use $id_field instead of hardcoded 'domain'
- redirect to list-domain after saving in edit mode
- rename some variables

edit-domain.php:
- rename some smarty variables

templates/admin_edit-domain.tpl:
- rename some smarty variables
- add two hidden fields "edit" and "domain", both contain $tDomain
  (only in edit mode)

Modified Paths:
--------------
    trunk/create-domain.php
    trunk/edit-domain.php
    trunk/templates/admin_edit-domain.tpl

Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php	2011-10-19 20:21:43 UTC (rev 1224)
+++ trunk/create-domain.php	2011-10-19 21:09:54 UTC (rev 1225)
@@ -22,10 +22,42 @@
 authentication_require_role('global-admin');
 
 $error = 0;
+$errortext = "";
+$mode = 'create';
 
-$handler = new DomainHandler(1);
+$edit = safepost('edit', safeget('edit'));
+$new  = 0;
+if ($edit == "") $new = 1;
+
+$listview = 'list-domain.php';
+
+$handler     = new DomainHandler($new);
 $form_fields = $handler->getStruct();
+$id_field    = $handler->getId_field();
 
+
+if ($edit != "") {
+    $mode = 'edit';
+
+    if (!$handler->init($edit)) {
+        flash_error(join("<br />", $handler->errormsg));
+        header ("Location: $listview");
+        exit;
+    }
+
+    if ($_SERVER['REQUEST_METHOD'] == "GET") { # read values from database
+        if (!$handler->view()) {
+            flash_error(join("<br />", $handler->errormsg));
+            header ("Location: $listview");
+            exit;
+        } else {
+            $values = $handler->return;
+            $values[$id_field] = $edit;
+        }
+    }
+}
+
+
 if ($_SERVER['REQUEST_METHOD'] == "POST") {
 
     foreach($form_fields as $key => $field) {
@@ -39,31 +71,40 @@
             }
         }
     }
+    if ($edit != "") $field[$id_field] = $edit;
 
-    if (!$handler->init($values['domain'])) {
+    if (!$handler->init($values[$id_field])) {
         $error = 1;
-        $pAdminCreate_domain_domain_text_error = join("<br />", $handler->errormsg);
+        $errortext = join("<br />", $handler->errormsg);
     }
 
     if (!$handler->set($values)) {
         $error = 1;
-        $pAdminCreate_domain_domain_text_error = join("<br />", $handler->errormsg);
+        $errortext = join("<br />", $handler->errormsg);
     }
 
     if ($error != 1) {
         if (!$handler->store()) {
-            $pAdminCreate_domain_domain_text_error = join("\n", $handler->errormsg);
+            $errortext = join("\n", $handler->errormsg);
         } else {
-            flash_info($PALANG['pAdminCreate_domain_result_success'] . " (" . $values['domain'] . ")"); # TODO: use a sprintf string
+            flash_info($PALANG['pAdminCreate_domain_result_success'] . " (" . $values[$id_field] . ")");
+            # TODO: - use a sprintf string
+            # TODO: - get the success message from DomainHandler
+            # TODO: - use a different success message for create and edit
+
             if (count($handler->errormsg)) { # might happen if domain_postcreation fails
                 flash_error(join("<br />", $handler->errormsg));
             }
+
+            if ($edit != "") {
+                header ("Location: $listview");
+                exit;
+            }
         }
     }
 }
 
-
-if ($error != 1) {
+if ($error != 1 && $new) { # no error and not in edit mode - reset fields to default for new item
     $values = array();
     foreach (array_keys($form_fields) as $key) {
         $values[$key] = $form_fields[$key]['default'];
@@ -84,8 +125,8 @@
     }
 }
 
-$smarty->assign ('mode', 'create');
-$smarty->assign ('pAdminCreate_domain_domain_text_error', $pAdminCreate_domain_domain_text_error, false);
+$smarty->assign ('mode', $mode);
+$smarty->assign ('errortext', $errortext, false); # non-escaped
 $smarty->assign ('smarty_template', 'admin_edit-domain');
 $smarty->display ('index.tpl');
 

Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php	2011-10-19 20:21:43 UTC (rev 1224)
+++ trunk/edit-domain.php	2011-10-19 21:09:54 UTC (rev 1225)
@@ -120,8 +120,8 @@
 }
 
 $smarty->assign ('mode', 'edit');
-$smarty->assign ('pAdminCreate_domain_domain_text_error', '');
-$smarty->assign ('domain', $domain);
+$smarty->assign ('errortext', '');
+$smarty->assign ('tDomain', $domain);
 $smarty->assign ('tDescription', $tDescription);
 $smarty->assign ('tAliases', $tAliases);
 $smarty->assign ('tMailboxes', $tMailboxes);

Modified: trunk/templates/admin_edit-domain.tpl
===================================================================
--- trunk/templates/admin_edit-domain.tpl	2011-10-19 20:21:43 UTC (rev 1224)
+++ trunk/templates/admin_edit-domain.tpl	2011-10-19 21:09:54 UTC (rev 1225)
@@ -14,13 +14,14 @@
 		<td class="label"><label>{$PALANG.pAdminEdit_domain_domain}:</label></td>
 		<td>
 {if $mode == 'edit'}
-			<em>{$domain}</em>
+			<em>{$tDomain}</em>
+			<input type="hidden" name="edit" value="{$tDomain}" />
 {else}
 			<input class="flat" type="text" name="domain" value="{$tDomain}" />
 {/if}
 		</td>
 		<td>&nbsp;</td>
-		<td><span class="error_msg">{$pAdminCreate_domain_domain_text_error}</span></td>
+		<td><span class="error_msg">{$errortext}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pAdminEdit_domain_description}:</label></td>

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