From cf5285f86d067ac23505cc4910cb6961134e8372 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 5 May 2017 01:05:42 +0300
Subject: [PATCH] Class property initialization flaws.

---
 ajax.php                                | 2 +-
 library/includes/bbcode.php             | 4 ++--
 library/includes/cache/apc.php          | 2 +-
 library/includes/cache/common.php       | 2 +-
 library/includes/cache/file.php         | 4 ++--
 library/includes/cache/memcache.php     | 6 +++---
 library/includes/cache/redis.php        | 6 +++---
 library/includes/cache/sqlite.php       | 6 +++---
 library/includes/cache/xcache.php       | 2 +-
 library/includes/core/mysql.php         | 8 ++++----
 library/includes/datastore/apc.php      | 2 +-
 library/includes/datastore/common.php   | 2 +-
 library/includes/datastore/file.php     | 4 ++--
 library/includes/datastore/memcache.php | 6 +++---
 library/includes/datastore/redis.php    | 6 +++---
 library/includes/datastore/sqlite.php   | 4 ++--
 library/includes/datastore/xcache.php   | 2 +-
 library/includes/functions.php          | 2 +-
 library/includes/sessions.php           | 2 +-
 19 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/ajax.php b/ajax.php
index 267b6225c..b9464057d 100644
--- a/ajax.php
+++ b/ajax.php
@@ -129,7 +129,7 @@ class ajax_common
         'index_data' => array('guest'),
     );
 
-    public $action = null;
+    public $action;
 
     /**
      *  Constructor
diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php
index 11cda280c..2567748d9 100644
--- a/library/includes/bbcode.php
+++ b/library/includes/bbcode.php
@@ -409,8 +409,8 @@ function add_search_words($post_id, $post_message, $topic_title = '', $only_retu
 class bbcode
 {
     public $tpl = array(); // шаблоны для замены тегов
-    public $smilies = null;    // смайлы
-    public $found_spam = null;    // найденные спам "слова"
+    public $smilies;    // смайлы
+    public $found_spam;    // найденные спам "слова"
     public $del_words = array(); // см. get_words_rate()
     public $tidy_cfg = array(
         'drop-empty-paras' => false,
diff --git a/library/includes/cache/apc.php b/library/includes/cache/apc.php
index e74692ce0..06fadfeb9 100644
--- a/library/includes/cache/apc.php
+++ b/library/includes/cache/apc.php
@@ -31,7 +31,7 @@ class cache_apc extends cache_common
 {
     public $used = true;
     public $engine = 'APC';
-    public $prefix = null;
+    public $prefix;
 
     public function __construct($prefix = null)
     {
diff --git a/library/includes/cache/common.php b/library/includes/cache/common.php
index f6ee31c55..544032df6 100644
--- a/library/includes/cache/common.php
+++ b/library/includes/cache/common.php
@@ -77,7 +77,7 @@ class cache_common
     public $dbg = array();
     public $dbg_id = 0;
     public $dbg_enabled = false;
-    public $cur_query = null;
+    public $cur_query;
 
     public function debug($mode, $cur_query = null)
     {
diff --git a/library/includes/cache/file.php b/library/includes/cache/file.php
index ca347e5fe..44887714c 100644
--- a/library/includes/cache/file.php
+++ b/library/includes/cache/file.php
@@ -31,8 +31,8 @@ class cache_file extends cache_common
 {
     public $used = true;
     public $engine = 'Filecache';
-    public $dir = null;
-    public $prefix = null;
+    public $dir;
+    public $prefix;
 
     public function __construct($dir, $prefix = null)
     {
diff --git a/library/includes/cache/memcache.php b/library/includes/cache/memcache.php
index 7459d4772..c0ef44f56 100644
--- a/library/includes/cache/memcache.php
+++ b/library/includes/cache/memcache.php
@@ -31,9 +31,9 @@ class cache_memcache extends cache_common
 {
     public $used = true;
     public $engine = 'Memcache';
-    public $cfg = null;
-    public $prefix = null;
-    public $memcache = null;
+    public $cfg;
+    public $prefix;
+    public $memcache;
     public $connected = false;
 
     public function __construct($cfg, $prefix = null)
diff --git a/library/includes/cache/redis.php b/library/includes/cache/redis.php
index 7da101309..ef685741f 100644
--- a/library/includes/cache/redis.php
+++ b/library/includes/cache/redis.php
@@ -31,9 +31,9 @@ class cache_redis extends cache_common
 {
     public $used = true;
     public $engine = 'Redis';
-    public $cfg = null;
-    public $redis = null;
-    public $prefix = null;
+    public $cfg;
+    public $redis;
+    public $prefix;
     public $connected = false;
 
     public function __construct($cfg, $prefix = null)
diff --git a/library/includes/cache/sqlite.php b/library/includes/cache/sqlite.php
index 0792ff90a..f1a9c4028 100644
--- a/library/includes/cache/sqlite.php
+++ b/library/includes/cache/sqlite.php
@@ -30,8 +30,8 @@ if (!defined('BB_ROOT')) {
 class cache_sqlite extends cache_common
 {
     public $used = true;
-    public $db = null;
-    public $prefix = null;
+    public $db;
+    public $prefix;
     public $cfg = array(
         'db_file_path' => '/path/to/cache.db.sqlite',
         'table_name' => 'cache',
@@ -137,7 +137,7 @@ class sqlite_common extends cache_common
         'shard_val' => 0,          #  для string - кол. начальных символов, для int - делитель (будет использован остаток от деления)
     );
     public $engine = 'SQLite';
-    public $dbh = null;
+    public $dbh;
     public $connected = false;
     public $shard_val = false;
 
diff --git a/library/includes/cache/xcache.php b/library/includes/cache/xcache.php
index 3dfd04530..aec0622df 100644
--- a/library/includes/cache/xcache.php
+++ b/library/includes/cache/xcache.php
@@ -31,7 +31,7 @@ class cache_xcache extends cache_common
 {
     public $used = true;
     public $engine = 'XCache';
-    public $prefix = null;
+    public $prefix;
 
     public function __construct($prefix = null)
     {
diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php
index 9834248df..625a1a719 100644
--- a/library/includes/core/mysql.php
+++ b/library/includes/core/mysql.php
@@ -34,10 +34,10 @@ class sql_db
 {
     public $cfg = [];
     public $cfg_keys = ['dbhost', 'dbname', 'dbuser', 'dbpasswd', 'charset', 'persist'];
-    private $link = null;
-    public $result = null;
+    private $link;
+    public $result;
     public $db_server = '';
-    public $selected_db = null;
+    public $selected_db;
     public $inited = false;
 
     public $locked = false;
@@ -53,7 +53,7 @@ class sql_db
     public $dbg = [];
     public $dbg_id = 0;
     public $dbg_enabled = false;
-    public $cur_query = null;
+    public $cur_query;
 
     public $do_explain = false;
     public $explain_hold = '';
diff --git a/library/includes/datastore/apc.php b/library/includes/datastore/apc.php
index afdbe03a0..805d500ba 100644
--- a/library/includes/datastore/apc.php
+++ b/library/includes/datastore/apc.php
@@ -30,7 +30,7 @@ if (!defined('BB_ROOT')) {
 class datastore_apc extends datastore_common
 {
     public $engine = 'APC';
-    public $prefix = null;
+    public $prefix;
 
     public function __construct($prefix = null)
     {
diff --git a/library/includes/datastore/common.php b/library/includes/datastore/common.php
index 24af5fb9e..b7d1af60a 100644
--- a/library/includes/datastore/common.php
+++ b/library/includes/datastore/common.php
@@ -149,7 +149,7 @@ class datastore_common
     public $dbg = array();
     public $dbg_id = 0;
     public $dbg_enabled = false;
-    public $cur_query = null;
+    public $cur_query;
 
     public function debug($mode, $cur_query = null)
     {
diff --git a/library/includes/datastore/file.php b/library/includes/datastore/file.php
index 9941383f7..b8905b4e2 100644
--- a/library/includes/datastore/file.php
+++ b/library/includes/datastore/file.php
@@ -29,8 +29,8 @@ if (!defined('BB_ROOT')) {
 
 class datastore_file extends datastore_common
 {
-    public $dir = null;
-    public $prefix = null;
+    public $dir;
+    public $prefix;
     public $engine = 'Filecache';
 
     public function __construct($dir, $prefix = null)
diff --git a/library/includes/datastore/memcache.php b/library/includes/datastore/memcache.php
index c39799ba9..e9b7cf0e7 100644
--- a/library/includes/datastore/memcache.php
+++ b/library/includes/datastore/memcache.php
@@ -29,11 +29,11 @@ if (!defined('BB_ROOT')) {
 
 class datastore_memcache extends datastore_common
 {
-    public $cfg = null;
-    public $memcache = null;
+    public $cfg;
+    public $memcache;
     public $connected = false;
     public $engine = 'Memcache';
-    public $prefix = null;
+    public $prefix;
 
     public function __construct($cfg, $prefix = null)
     {
diff --git a/library/includes/datastore/redis.php b/library/includes/datastore/redis.php
index 83b5e7fad..7bcf8740e 100644
--- a/library/includes/datastore/redis.php
+++ b/library/includes/datastore/redis.php
@@ -29,9 +29,9 @@ if (!defined('BB_ROOT')) {
 
 class datastore_redis extends datastore_common
 {
-    public $cfg = null;
-    public $redis = null;
-    public $prefix = null;
+    public $cfg;
+    public $redis;
+    public $prefix;
     public $connected = false;
     public $engine = 'Redis';
 
diff --git a/library/includes/datastore/sqlite.php b/library/includes/datastore/sqlite.php
index 33526fe6d..06fd90d59 100644
--- a/library/includes/datastore/sqlite.php
+++ b/library/includes/datastore/sqlite.php
@@ -30,8 +30,8 @@ if (!defined('BB_ROOT')) {
 class datastore_sqlite extends datastore_common
 {
     public $engine = 'SQLite';
-    public $db = null;
-    public $prefix = null;
+    public $db;
+    public $prefix;
     public $cfg = array(
         'db_file_path' => '/path/to/datastore.db.sqlite',
         'table_name' => 'datastore',
diff --git a/library/includes/datastore/xcache.php b/library/includes/datastore/xcache.php
index 084bbcd95..f039a3e64 100644
--- a/library/includes/datastore/xcache.php
+++ b/library/includes/datastore/xcache.php
@@ -29,7 +29,7 @@ if (!defined('BB_ROOT')) {
 
 class datastore_xcache extends datastore_common
 {
-    public $prefix = null;
+    public $prefix;
     public $engine = 'XCache';
 
     public function __construct($prefix = null)
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 0e5c963ff..a5fb3549b 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -682,7 +682,7 @@ class html_common
 {
     public $options = '';
     public $attr = array();
-    public $cur_attr = null;
+    public $cur_attr;
     public $max_length = HTML_SELECT_MAX_LENGTH;
     public $selected = array();
 
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index 7e5458e34..972035776 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -85,7 +85,7 @@ class user_common
     /**
      *  Shortcuts
      */
-    public $id = null;
+    public $id;
 
     /**
      *  Misc