From 4ab083ca9879fa469df647307da2629aa2cc6691 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Wed, 13 Dec 2017 20:32:51 +0100
Subject: [PATCH] AbstractException.php: small recode SendMail.php: in error
message show commandline. test.html: remove
---
.../qfq/qfq/exceptions/AbstractException.php | 4 +++-
extension/qfq/qfq/report/SendMail.php | 2 +-
test.html | 17 -----------------
3 files changed, 4 insertions(+), 19 deletions(-)
delete mode 100644 test.html
diff --git a/extension/qfq/qfq/exceptions/AbstractException.php b/extension/qfq/qfq/exceptions/AbstractException.php
index 447d6fb0f..7bc3c7289 100644
--- a/extension/qfq/qfq/exceptions/AbstractException.php
+++ b/extension/qfq/qfq/exceptions/AbstractException.php
@@ -89,12 +89,14 @@ class AbstractException extends \Exception {
// Layout
$debug = '<tr bgcolor="#dddddd"><td colspan="2">Exception</td></tr>';
foreach ($this->messageArray as $key => $value) {
+ // Array to string
if (is_array($value)) {
$value = var_export($value, true);
}
- if ($value !== '' && $value !== false)
+ if (!empty($value)) {
$debug .= "<tr>" . "<td>$key</td>" . "<td>" . htmlspecialchars($value) . "</td>" . "</tr>";
+ }
}
$debug = "<table border=1>" . $debug . "</table>";
}
diff --git a/extension/qfq/qfq/report/SendMail.php b/extension/qfq/qfq/report/SendMail.php
index bf344f176..1f280da42 100644
--- a/extension/qfq/qfq/report/SendMail.php
+++ b/extension/qfq/qfq/report/SendMail.php
@@ -169,7 +169,7 @@ class SendMail {
}
if ($rc != 0) {
- $output = $rc . " - " . implode('<br>', $arr);
+ $output = $rc . " - " . implode('<br>', $arr) . " - " . $cmd;
throw new UserFormException("Error sendmail failed: " . $output, ERROR_SENDMAIL);
}
}
diff --git a/test.html b/test.html
deleted file mode 100644
index d09bd0273..000000000
--- a/test.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="col-md-6 col-sm-9">
-
- <!-- CONTENT ELEMENT, uid:4/html [begin] -->
- <div id="c4">
- <!-- Raw HTML content: [begin] -->
- <a href="?u10" class="button-big blue play">U10</a>
- <a href="?u12" class="button-big blue crayon">U12</a>
- <a href="?u14" class="button-big blue library">U14</a>
- <a href="?fs" class="button-big blue promo font-big">Frühstudium</a>
- <a href="?u18" class="button-big blue blackboard">U18</a>
- <a href="?olympics" class="button-big blue track font-big">Olympics</a>
- <!-- Raw HTML content: [end] -->
- </div>
- <!-- CONTENT ELEMENT, uid:4/html [end] -->
-
-
-</div>
\ No newline at end of file
--
GitLab