From 6cb497bc2778eb4ebc8fd5ef87f7b2cb0949cab5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 15 Jul 2016 19:05:43 +0200
Subject: [dozmod] Error feedback on mailtest; check-all for image-delete;
 longer timeouts for dozmod calls

---
 modules-available/dozmod/page.inc.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'modules-available/dozmod/page.inc.php')

diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php
index f0cbe3f4..60c6c24a 100644
--- a/modules-available/dozmod/page.inc.php
+++ b/modules-available/dozmod/page.inc.php
@@ -60,6 +60,7 @@ class Page_DozMod extends Page
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 			if ($row['latexptime'] > $NOW && $row['latdelstate'] === 'KEEP') {
 				$row['hasNewerClass'] = 'glyphicon-ok green';
+				$row['checked'] = 'checked';
 			} else {
 				$row['hasNewerClass'] = 'glyphicon-remove red';
 			}
@@ -119,7 +120,7 @@ class Page_DozMod extends Page
 				));
 			}
 			if (!empty($images)) {
-				$ret = Download::asStringPost('http://127.0.0.1:9080/do/delete-images', false, 2, $code);
+				$ret = Download::asStringPost('http://127.0.0.1:9080/do/delete-images', false, 10, $code);
 				if ($code == 999) {
 					$ret .= "\nConnection to DMSD failed.";
 				}
@@ -140,7 +141,12 @@ class Page_DozMod extends Page
 			if (!preg_match('/.+@.+\..+/', $data['recipient'])) {
 				$result = 'No recipient given!';
 			} else {
-				$result = Download::asStringPost('http://127.0.0.1:9080/do/mailtest', $data, 2, $code);
+				$result = Download::asStringPost('http://127.0.0.1:9080/do/mailtest', $data, 10, $code);
+				if ($code == 999) {
+					$result .= "\nTimeout.";
+				} elseif ($code != 200) {
+					$result .= "\nReturn code $code";
+				}
 			}
 			die($result);
 		}
-- 
cgit v1.2.3-55-g7522