makes notification PHP7 compatible

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/notification/helpers/XMLStream.php b/modules/notification/helpers/XMLStream.php
index 346a768..fa04b4f 100644
--- a/modules/notification/helpers/XMLStream.php
+++ b/modules/notification/helpers/XMLStream.php
@@ -617,7 +617,7 @@ class XMLStream {
 						if ($searchxml !== null) {

 							if($handler[2] === null) $handler[2] = $this;

 							$this->log->log("Calling {$handler[1]}",  XMPPLog::LEVEL_DEBUG);

-							$handler[2]->$handler[1]($this->xmlobj[2]);

+                                                        call_user_func([$handler[2], $handler[1]], $this->xmlobj[2]);

 						}

 					}

 				}

@@ -631,13 +631,13 @@ class XMLStream {
 				if($searchxml !== null and $searchxml->name == $handler[0] and ($searchxml->ns == $handler[1] or (!$handler[1] and $searchxml->ns == $this->default_ns))) {

 					if($handler[3] === null) $handler[3] = $this;

 					$this->log->log("Calling {$handler[2]}",  XMPPLog::LEVEL_DEBUG);

-					$handler[3]->$handler[2]($this->xmlobj[2]);

+                                        call_user_func([$handler[3], $handler[2]], $this->xmlobj[2]);

 				}

 			}

 			foreach($this->idhandlers as $id => $handler) {

 				if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {

 					if($handler[1] === null) $handler[1] = $this;

-					$handler[1]->$handler[0]($this->xmlobj[2]);

+					call_user_func([$handler[1], $handler[0]], $this->xmlobj[2]);

 					#id handlers are only used once

 					unset($this->idhandlers[$id]);

 					break;

@@ -691,7 +691,7 @@ class XMLStream {
 				if($handler[2] === null) {

 					$handler[2] = $this;

 				}

-				$handler[2]->$handler[1]($payload);

+                                call_user_func([$handler[2], $handler[1]], $payload);

 			}

 		}

 		foreach($this->until as $key => $until) {

diff --git a/modules/user/lib/PasswordHash.php b/modules/user/lib/PasswordHash.php
index d6783c0..62bc056 100644
--- a/modules/user/lib/PasswordHash.php
+++ b/modules/user/lib/PasswordHash.php
@@ -30,7 +30,7 @@ class PasswordHash {
 	var $portable_hashes;
 	var $random_state;
 
-	function PasswordHash($iteration_count_log2, $portable_hashes)
+	function __construct($iteration_count_log2, $portable_hashes)
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';