prohibit inline control structures on helpers

1 files changed, 17 insertions, 23 deletions

diff --git a/includes/helper/message_helper.php b/includes/helper/message_helper.php
index 26bad871..a0cc6eb7 100644
--- a/includes/helper/message_helper.php
+++ b/includes/helper/message_helper.php
@@ -4,8 +4,9 @@
  * Gibt zwischengespeicherte Fehlermeldungen zurück und löscht den Zwischenspeicher
  */
 function msg() {
-  if (! isset($_SESSION['msg']))
+  if (! isset($_SESSION['msg'])) {
     return "";
+  }
   $msg = $_SESSION['msg'];
   $_SESSION['msg'] = "";
   return $msg;
@@ -15,44 +16,37 @@ function msg() {
  * Rendert eine Information
  */
 function info($msg, $immediatly = false) {
-  if ($immediatly) {
-    if ($msg == "")
-      return "";
-    return '<div class="alert alert-info">' . $msg . '</div>';
-  } else {
-    if (! isset($_SESSION['msg']))
-      $_SESSION['msg'] = "";
-    $_SESSION['msg'] .= info($msg, true);
-  }
+  return alert('info', $msg, $immediatly);
 }
 
 /**
  * Rendert eine Fehlermeldung
  */
 function error($msg, $immediatly = false) {
-  if ($immediatly) {
-    if ($msg == "")
-      return "";
-    return '<div class="alert alert-danger">' . $msg . '</div>';
-  } else {
-    if (! isset($_SESSION['msg']))
-      $_SESSION['msg'] = "";
-    $_SESSION['msg'] .= error($msg, true);
-  }
+  return alert('danger', $msg, $immediatly);
 }
 
 /**
  * Rendert eine Erfolgsmeldung
  */
 function success($msg, $immediatly = false) {
+  return alert('success', $msg, $immediatly);
+}
+
+/**
+ * Renders an alert with given alert-* class.
+ */
+function alert($class, $msg, $immediatly = false) {
   if ($immediatly) {
-    if ($msg == "")
+    if ($msg == "") {
       return "";
-    return '<div class="alert alert-success">' . $msg . '</div>';
+    }
+    return '<div class="alert alert-' . $class . '">' . $msg . '</div>';
   } else {
-    if (! isset($_SESSION['msg']))
+    if (! isset($_SESSION['msg'])) {
       $_SESSION['msg'] = "";
-    $_SESSION['msg'] .= success($msg, true);
+    }
+    $_SESSION['msg'] .= alert($class, $msg, true);
   }
 }