From a28e5244ab481c625d6b622889a776254a0f701f Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <gullevek@gullevek.org>
Date: Wed, 28 Mar 2018 10:02:19 +0900
Subject: [PATCH] Fixes & code style changes

---
 www/libs/Class.Basic.inc | 4 +++-
 www/libs/db_pgsql.inc    | 2 +-
 www/libs/gettext.php     | 2 +-
 www/libs/streams.php     | 8 ++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/www/libs/Class.Basic.inc b/www/libs/Class.Basic.inc
index d73c7d6e..989e0854 100644
--- a/www/libs/Class.Basic.inc
+++ b/www/libs/Class.Basic.inc
@@ -327,6 +327,8 @@ class basic
 			if (SET_SESSION_NAME) {
 				// set the session name for possible later check
 				$this->session_name = SET_SESSION_NAME;
+			}
+			if ($this->session_name) {
 				session_name($this->session_name);
 			}
 			// start session
@@ -1010,7 +1012,7 @@ class basic
 				if (($result = basic::array_search_simple($_value, $key, $value)) !== false) {
 					return $result;
 				}
-			} elseif ($_key == $key && $_value = $value) {
+			} elseif ($_key == $key && $_value == $value) {
 				return true;
 			}
 		}
diff --git a/www/libs/db_pgsql.inc b/www/libs/db_pgsql.inc
index 96468d93..ee143c5b 100644
--- a/www/libs/db_pgsql.inc
+++ b/www/libs/db_pgsql.inc
@@ -172,7 +172,7 @@ class db_pgsql
 	{
 		// result type is passed on as is [should be checked]
 		if ($result_type) {
-			return pg_fetch_array($cursor, NULL, $result_type);
+			return pg_fetch_array($cursor, null, $result_type);
 		} else {
 			return pg_fetch_array($cursor);
 		}
diff --git a/www/libs/gettext.php b/www/libs/gettext.php
index 751deee7..71a2fddb 100644
--- a/www/libs/gettext.php
+++ b/www/libs/gettext.php
@@ -244,7 +244,7 @@ class gettext_reader
 			if ($cmp == 0) {
 				// string is exactly in the middle => return it
 				return $half;
-			} else if ($cmp < 0) {
+			} elseif ($cmp < 0) {
 				// The string is in the upper half
 				return $this->find_string($string, $start, $half);
 			} else {
diff --git a/www/libs/streams.php b/www/libs/streams.php
index 34a71e3e..2037fab3 100644
--- a/www/libs/streams.php
+++ b/www/libs/streams.php
@@ -64,7 +64,7 @@ class StringReader
 	{
 		$data = substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if (strlen($this->_str)<$this->_pos) {
+		if (strlen($this->_str) < $this->_pos) {
 			$this->_pos = strlen($this->_str);
 		}
 
@@ -74,7 +74,7 @@ class StringReader
 	public function seekto($pos)
 	{
 		$this->_pos = $pos;
-		if (strlen($this->_str)<$this->_pos) {
+		if (strlen($this->_str) < $this->_pos) {
 			$this->_pos = strlen($this->_str);
 		}
 		return $this->_pos;
@@ -101,7 +101,7 @@ class FileReader
 	public function __construct($filename)
 	{
 		if (file_exists($filename)) {
-			$this->_length=filesize($filename);
+			$this->_length = filesize($filename);
 			$this->_pos = 0;
 			$this->_fd = fopen($filename, 'rb');
 			if (!$this->_fd) {
@@ -165,7 +165,7 @@ class CachedFileReader extends StringReader
 	public function __construct($filename)
 	{
 		if (file_exists($filename)) {
-			$length=filesize($filename);
+			$length = filesize($filename);
 			$fd = fopen($filename, 'rb');
 
 			if (!$fd) {