Enhance - remove statsh/pop from messages class (#2671)

statsh/pop was present to work around a bad implementation in loginphp.
This removes the now redundant code.
This commit is contained in:
Mafoo
2017-06-10 15:59:21 +01:00
committed by FusionPBX
parent 71b217dff2
commit 8a2afdcdd0

View File

@@ -28,8 +28,6 @@
if (!class_exists('messages')) {
class messages {
private $messages;
static function add($message, $mood = NULL, $delay = NULL) {
$_SESSION["messages"][] = array(message => $message, mood => $mood, delay => $delay);
}
@@ -60,34 +58,6 @@ if (!class_exists('messages')) {
}
return $html;
}
public function stash() {
if (strlen($_SESSION['message']) > 0) {
add($_SESSION['message'], $_SESSION['message_mood'], $_SESSION['message_delay']);
unset($_SESSION['message'], $_SESSION['message_mood'], $_SESSION['message_delay']);
}
if (is_array($this->messages)) {
if (is_array($_SESSION["messages"])) {
$this->messages = array_merge($this->messages, $_SESSION["messages"]);
}
}
else {
$this->messages = $_SESSION["messages"];
}
unset($_SESSION['messages']);
}
public function pop() {
if (is_array($_SESSION["messages"])) {
if (is_array($this->messages)) {
$_SESSION["messages"] = array_merge($_SESSION["messages"], $this->messages);
}
}
else {
$_SESSION["messages"] = $this->messages;
}
unset($this->messages);
}
}
}