Minor changes to ensure that short extensions get all the way up to the

maximum extension limit.

www/aptui/js/extend.js

@@ -429,7 +429,7 @@ window.ShowExtendModal = (function()
 	// Request as much time as possible, up to the maximum allowed
 	// by the reservation system. Put up a modal for confirmation.
 	//
-	function RequestMaxExtension(hours)
+	function RequestMaxExtension(hours, actual)
 	{
 	    $('#restricted_extend_modal #hours').html(hours);
 
@@ -449,7 +449,7 @@ window.ShowExtendModal = (function()
 						    "status",
 						    "RequestExtension",
 						    {"uuid"   : uuid,
-						     "howlong": hours});
+						     "howlong": actual});
 		xmlthing.done(requestcallback);
 	    });
 	    sup.ShowModal('#restricted_extend_modal');
@@ -546,7 +546,7 @@ window.ShowExtendModal = (function()
 		}
 		else if (hours < 24) {
 		    // Different path; request as much as we can get.
-		    RequestMaxExtension(hours);
+		    RequestMaxExtension(hours, later);
 		}
 		else {
 		    // Maximum number of days beyond current expiration!

www/aptui/status.ajax

@@ -363,22 +363,16 @@ function Do_RequestExtension()
 	goto bad;
     }
     $wanted = $ajax_args["howlong"];
-    if (! preg_match("/^\d+$/", $wanted)) {
-        if (strtotime($wanted)) {
-            if (!ISADMIN()) {
-                SPITAJAX_ERROR(1, "Only administrators can use a datetime");
+    if (preg_match("/^\d+$/", $wanted)) {
+        if ($wanted < 1) {
+            SPITAJAX_ERROR(1, "Hours must be an integer greater then 1");
             goto bad;
         }
     }
-        else {
+    elseif (!strtotime($wanted)) {
         SPITAJAX_ERROR(1, "Invalid characters in hours");
         goto bad;
     }
-    }
-    else if ($wanted < 1) {
-        SPITAJAX_ERROR(1, "Hours must be an integer greater then 1");
-        goto bad;
-    }
     if (ISADMIN()) {
 	if (isset($ajax_args["reason"]) && $ajax_args["reason"] != "") {
             $reason = $ajax_args["reason"];