X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/b6dd1aafb4c9cddf89b06c2eeac1b5277046ad9f..9da4f9396351fe3a5877fc3a782d97edc5607ca3:/domain.mlt

diff --git a/domain.mlt b/domain.mlt
index 9b7889d..0493788 100644
--- a/domain.mlt
+++ b/domain.mlt
@@ -4,14 +4,19 @@ val admin = Group.inGroupName "server";
 
 if $"req" <> "" then
 	val dom = $"req";
-	if Util.validDomain dom then
+	if not (Util.validDomain dom) then
+		%><h3>Invalid domain name</h3><%
+	elseif String.isPrefix "www." dom and $"want_www" = "" then
+	        val base = String.extract (dom, 4, NONE)
+	        %><h3>Are you sure you want to request a domain that begins with "www."?</h3>
+		<p>You probably meant to request <tt><% base %></tt> instead, which would grant you the ability to configure <tt><% dom %></tt> as well.  Unless you've registered <tt><% dom %></tt> directly with your registrar, you will be unable to configure it without the right to set nameservers for <tt><% base %></tt>.</p>
+		<p><a href="?req=<% Web.urlEncode dom %>&want_www=1&msg=<% Web.urlEncode ($"msg") %>">Yes, go ahead and place the request!</a></p><%
+	else
 		val id = Domain.add (Init.getUserId(), dom, $"msg");
 		if not (Domain.notifyNew id) then
 			%><h3>Error sending e-mail notification</h3><%
 		end
 		%><h3>Request added</h3><%
-	else
-		%><h3>Invalid domain name</h3><%
 	end
 
 elseif $"cmd" = "open" then
@@ -22,7 +27,7 @@ elseif $"cmd" = "open" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -31,7 +36,7 @@ elseif $"cmd" = "open" then
 	<br>
 	<a href="domain?mod=<% #id req %>">[Modify]</a>
 	<a href="domain?del=<% #id req %>">[Delete]</a><br>
-	To set up, run: <tt>domtool.real mkdom <% #data req %>&nbsp;<% name %></tt>
+	To set up, run: <tt>domtool-admin grant <% name %> domain <% #data req %></tt>
 <% end %>
 
 <%	end
@@ -43,7 +48,7 @@ elseif $"cmd" = "list" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td colspan="2"><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -67,7 +72,7 @@ elseif $"mod" <> "" then
 <input type="hidden" name="save" value="<% id %>">
 <table class="blanks">
 <tr> <td>Requestor:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Status</b>:</td> <td><select name="status">
 	<option value="0"<% if #status req = Domain.NEW then %> selected<% end %>>New</option>
 	<option value="1"<% if #status req = Domain.INSTALLED then %> selected<% end %>>Installed</option>
@@ -86,10 +91,8 @@ elseif $"mod" <> "" then
 	val oldStatus = #status req;
 	val newStatus = Domain.statusFromInt (Web.stoi ($"status"));
 	Domain.modify {req with data = $"dom", msg = $"msg", status = newStatus};
-	if oldStatus <> newStatus then
-		if not (Domain.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
-			%><h3>Error sending e-mail notification</h3><%
-		end
+	if not (Domain.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
+		%><h3>Error sending e-mail notification</h3><%
 	end
 	%><h3>Request modified</h3>
 	Back to: <a href="domain?cmd=open">open requests</a>, <a href="domain?cmd=list">all requests</a>