--- trunk/tntnet/dynamic/adm_customer_edit.ecpp	2007/11/29 07:34:54	93
+++ trunk/tntnet/dynamic/adm_customer_edit.ecpp	2007/12/06 19:47:03	181
@@ -15,26 +15,27 @@
 
 <%session scope="global">
 std::string userName;
-bool isAdmin;
 </%session>
 
 <%args>
 int id;
 </%args>
 
+<{
+if (userName.size() == 0)
+{
+	reply.setHeader("Location", "index");
+	return HTTP_MOVED_TEMPORARILY;
+}
+}>
+
+
 <&header title="Customer Administration">
 </&header>
 
 
-
 <{
 
-if (userName.size() == 0)
-{
-    reply.setHeader("Refresh", "0; url=login");
-	return HTTP_OK;
-}
-
 if (id == -1)
 	reply.out() << "<h2>New Customer</h2>\n";
 else
@@ -42,7 +43,7 @@
 
 reply.out() << "<a href='adm_customer_list'>";
 reply.sout() << "<< back to customer list";
-reply.out() << "</a><br>";
+reply.out() << "</a><br><br>";
 
 tntdb::Connection conn = tntdb::connect(dburl); 
 
@@ -64,14 +65,17 @@
 
 		//tntdb::Value v = conn.selectValue("SELECT lastval()"); //get the auto-generated id
 		//id = v.getInt();
-		reply.setHeader("Refresh", "0; url=adm_customer_list");
-		return HTTP_OK;
+
+		reply.setHeader("Location", "adm_customer_list");
+		return HTTP_MOVED_TEMPORARILY;
 	}
 	else
 	{
 		tntdb::Statement st = conn.prepare("UPDATE customer SET name=:v1, address=:v2, phonenr=:v3, contactperson=:v4 WHERE id=:v5");
 		st.setString("v1", form_name).setString("v2", form_address).setString("v3", form_phone).setString("v4", form_contact).setInt("v5", id);
 		st.execute();
+
+		reply.out() << "<i>Customer updated</i><br>\n";
 	}
 
 }
@@ -109,7 +113,27 @@
 {
 }>
 
-<form method="post" action="adm_customer_edit">
+<script type="text/javascript" language="JavaScript" src="/md5.js"></script>
+<script type="text/javascript" language="JavaScript" src="/trim.js"></script>
+<script type="text/javascript">
+
+function validateCustomerForm()
+{
+	var form = document.customerform;
+	form.name.value = trim(form.name.value);
+
+	if (form.name.value.length < 3)
+	{
+		alert("Name must at least be 3 characters");
+		return false;
+	}
+
+	return true;
+}
+
+</script>
+
+<form method="post" action="adm_customer_edit" name="customerform" onsubmit="return validateCustomerForm();">
 <table border="0">
 <tr>
   <td>Name: </td>
@@ -136,16 +160,20 @@
 <input type="hidden" name="submit" value="1">
 </form>
 
+<{
+if (id != -1)
+{
+}>
+
 <br>
-<form method="post" action="adm_customer_delete">
+<form method="post" action="adm_customer_delete" onsubmit="return confirm('Are you sure?\\nThis will delete all related installations and logdata','Delete customer');">
 <input type="hidden" name="id" value="<$ id $>">
-<input type="submit" value="Delete">
+<input type="submit" value="Delete this customer">
 </form>
 
 <{
-}
-
-
+} //fi (id != -1)
+} //fi (showForm)
 }>
 
 <&footer>