ini_get('mbstring.func_overload'): Avoid deprecation notices.

Signed-off-by:Ivan Tcholakov <[email protected]>
ivantcholakov · Feb 27, 2021 · dd3c9c8 · dd3c9c8
1 parent 0d02912
commit dd3c9c8
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 3 deletions.
diff --git a/platform/common/core/Core_Log.php b/platform/common/core/Core_Log.php
@@ -10,6 +10,11 @@ public function __construct()
     {
         $config =& get_config();
 
+        // Modified by Ivan Tcholakov, 27-FEB-2021.
+        //isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+        isset(self::$func_overload) OR self::$func_overload = (defined('MB_OVERLOAD_STRING') && ((int) @ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING));
+        //
+
         $this->_log_path = ($config['log_path'] !== '') ? $config['log_path'] : APPPATH.'logs/';
         file_exists($this->_log_path) OR mkdir($this->_log_path, DIR_WRITE_MODE, TRUE);
         $this->_file_permissions = FILE_WRITE_MODE;

diff --git a/platform/common/core/Core_Output.php b/platform/common/core/Core_Output.php
@@ -11,6 +11,11 @@ class Core_Output extends CI_Output {
 
     public function __construct()
     {
+        // Modified by Ivan Tcholakov, 27-FEB-2021.
+        //isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+        isset(self::$func_overload) OR self::$func_overload = (defined('MB_OVERLOAD_STRING') && ((int) @ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING));
+        //
+
         parent::__construct();
 
         // Added by Ivan Tcholakov, 24-JAN-2016.

diff --git a/platform/common/libraries/Encryption.php b/platform/common/libraries/Encryption.php
@@ -0,0 +1,18 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed.');
+
+class Encryption extends CI_Encryption {
+
+
+    public function __construct(array $params = array())
+    {
+        // Modified by Ivan Tcholakov, 27-FEB-2021.
+        //isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+        isset(self::$func_overload) OR self::$func_overload = (defined('MB_OVERLOAD_STRING') && ((int) @ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING));
+        //
+
+        parent::__construct();
+    }
+
+}
diff --git a/platform/common/libraries/Session/drivers/Session_files_driver.php b/platform/common/libraries/Session/drivers/Session_files_driver.php
@@ -100,7 +100,12 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle
 	 */
 	public function __construct(&$params)
 	{
-		parent::__construct($params);
+		// Modified and moved here by Ivan Tcholakov, 27-FEB-2021.
+		//isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+		isset(self::$func_overload) OR self::$func_overload = (defined('MB_OVERLOAD_STRING') && ((int) @ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING));
+		//
+
+                parent::__construct($params);
 
 		if (isset($this->_config['save_path']))
 		{
@@ -114,8 +119,6 @@ public function __construct(&$params)
 		}
 
 		$this->_sid_regexp = $this->_config['_sid_regexp'];
-
-		isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
 	}
 
 	// ------------------------------------------------------------------------

diff --git a/platform/common/libraries/Zip.php b/platform/common/libraries/Zip.php
@@ -0,0 +1,17 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Zip extends CI_Zip {
+
+    public function __construct()
+    {
+        // Modified by Ivan Tcholakov, 27-FEB-2021.
+        //isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+        isset(self::$func_overload) OR self::$func_overload = (defined('MB_OVERLOAD_STRING') && ((int) @ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING));
+        //
+
+        parent::__construct();
+    }
+
+}