Merge pull request #344 from MyIgel/master

Prepared routing, added symfony http Closes #336 and closes #337

1 files changed, 17 insertions, 15 deletions

diff --git a/includes/helper/message_helper.php b/includes/helper/message_helper.php
index 1f429c27..4fa0efe3 100644
--- a/includes/helper/message_helper.php
+++ b/includes/helper/message_helper.php
@@ -7,12 +7,12 @@
  */
 function msg()
 {
-    if (!isset($_SESSION['msg'])) {
-        return '';
-    }
-    $msg = $_SESSION['msg'];
-    $_SESSION['msg'] = '';
-    return $msg;
+    $session = session();
+
+    $message = $session->get('msg', '');
+    $session->set('msg', '');
+
+    return $message;
 }
 
 /**
@@ -57,21 +57,23 @@ function success($msg, $immediately = false)
  * @param string $class
  * @param string $msg
  * @param bool   $immediately
- * @return string|null
+ * @return string
  */
 function alert($class, $msg, $immediately = false)
 {
+    $session = session();
+
+    if (empty($msg)) {
+        return '';
+    }
+
     if ($immediately) {
-        if ($msg == '') {
-            return '';
-        }
         return '<div class="alert alert-' . $class . '">' . $msg . '</div>';
     }
 
-    if (!isset($_SESSION['msg'])) {
-        $_SESSION['msg'] = '';
-    }
-    $_SESSION['msg'] .= alert($class, $msg, true);
+    $message = $session->get('msg', '');
+    $message .= alert($class, $msg, true);
+    $session->set('msg', $message);
 
-    return null;
+    return '';
 }