CI3 - Updates & Fixes 3.1.11

Reconix · Reconix · commit c89a39dba324 · 2019-10-08T23:38:22.000+01:00
CI3 Updates &amp; Fixes 3.1.11
diff --git a/ForgeIgniter/config/mimes.php b/ForgeIgniter/config/mimes.php
@@ -140,7 +140,7 @@
 	'f4v'   =>	array('video/mp4', 'video/x-f4v'),
 	'flv'	=>	'video/x-flv',
 	'webm'	=>	'video/webm',
-	'aac'   =>	'audio/x-acc',
+	'aac'   =>	array('audio/x-aac', 'audio/aac'),
 	'm4u'   =>	'application/vnd.mpegurl',
 	'm3u'   =>	'text/plain',
 	'xspf'  =>	'application/xspf+xml',
diff --git a/ForgeIgniter/system/core/CodeIgniter.php b/ForgeIgniter/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.10';
+	const CI_VERSION = '3.1.11';
 
 /*
  * ------------------------------------------------------
diff --git a/ForgeIgniter/system/core/Controller.php b/ForgeIgniter/system/core/Controller.php
@@ -58,6 +58,13 @@ class CI_Controller {
 	 */
 	private static $instance;
 
+	/**
+	 * CI_Loader
+	 *
+	 * @var	CI_Loader
+	 */
+	public $load;
+
 	/**
 	 * Class constructor
 	 *
diff --git a/ForgeIgniter/system/core/Log.php b/ForgeIgniter/system/core/Log.php
@@ -247,11 +247,11 @@ public function write_log($level, $msg)
 	 * @param	string	$level 	The error level
 	 * @param	string	$date 	Formatted date string
 	 * @param	string	$message 	The log message
-	 * @return	string	Formatted log line with a new line character '\n' at the end
+	 * @return	string	Formatted log line with a new line character at the end
 	 */
 	protected function _format_line($level, $date, $message)
 	{
-		return $level.' - '.$date.' --> '.$message."\n";
+		return $level.' - '.$date.' --> '.$message.PHP_EOL;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/ForgeIgniter/system/core/Security.php b/ForgeIgniter/system/core/Security.php
@@ -228,6 +228,7 @@ public function csrf_verify()
 
 		// Check CSRF token validity, but don't error on mismatch just yet - we'll want to regenerate
 		$valid = isset($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name])
+			&& is_string($_POST[$this->_csrf_token_name]) && is_string($_COOKIE[$this->_csrf_cookie_name])
 			&& hash_equals($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name]);
 
 		// We kill this since we're done and we don't want to pollute the _POST array
diff --git a/ForgeIgniter/system/database/DB_result.php b/ForgeIgniter/system/database/DB_result.php
@@ -381,7 +381,7 @@ public function set_row($key, $value = NULL)
 	 */
 	public function custom_row_object($n, $type)
 	{
-		isset($this->custom_result_object[$type]) OR $this->custom_result_object($type);
+		isset($this->custom_result_object[$type]) OR $this->custom_result_object[$type] = $this->custom_result_object($type);
 
 		if (count($this->custom_result_object[$type]) === 0)
 		{
diff --git a/ForgeIgniter/system/database/drivers/mysql/mysql_driver.php b/ForgeIgniter/system/database/drivers/mysql/mysql_driver.php
@@ -383,7 +383,7 @@ public function insert_id()
 	 */
 	protected function _list_tables($prefix_limit = FALSE)
 	{
-		$sql = 'SHOW TABLES FROM '.$this->escape_identifiers($this->database);
+		$sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char;
 
 		if ($prefix_limit !== FALSE && $this->dbprefix !== '')
 		{
diff --git a/ForgeIgniter/system/database/drivers/mysqli/mysqli_driver.php b/ForgeIgniter/system/database/drivers/mysqli/mysqli_driver.php
@@ -429,7 +429,7 @@ public function insert_id()
 	 */
 	protected function _list_tables($prefix_limit = FALSE)
 	{
-		$sql = 'SHOW TABLES FROM '.$this->escape_identifiers($this->database);
+		$sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char;
 
 		if ($prefix_limit !== FALSE && $this->dbprefix !== '')
 		{
diff --git a/ForgeIgniter/system/database/drivers/oci8/oci8_forge.php b/ForgeIgniter/system/database/drivers/oci8/oci8_forge.php
@@ -81,6 +81,13 @@ class CI_DB_oci8_forge extends CI_DB_forge {
 	 */
 	protected $_unsigned		= FALSE;
 
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var	string
+	 */
+	protected $_null		= 'NULL';
+
 	// --------------------------------------------------------------------
 
 	/**
diff --git a/ForgeIgniter/system/database/drivers/pdo/pdo_result.php b/ForgeIgniter/system/database/drivers/pdo/pdo_result.php
@@ -133,7 +133,7 @@ public function field_data()
 
 				$retval[$i]			= new stdClass();
 				$retval[$i]->name		= $field['name'];
-				$retval[$i]->type		= $field['native_type'];
+				$retval[$i]->type		= isset($field['native_type']) ? $field['native_type'] : null;
 				$retval[$i]->max_length		= ($field['len'] > 0) ? $field['len'] : NULL;
 				$retval[$i]->primary_key	= (int) ( ! empty($field['flags']) && in_array('primary_key', $field['flags'], TRUE));
 			}
diff --git a/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
@@ -150,7 +150,7 @@ protected function _alter_table($alter_type, $table, $field)
 			if ( ! empty($field[$i]['default']))
 			{
 				$sqls[] = $sql.' ALTER COLUMN '.$this->db->escape_identifiers($field[$i]['name'])
-					.' SET DEFAULT '.$field[$i]['default'];
+					.' SET '.$field[$i]['default'];
 			}
 
 			if (isset($field[$i]['null']))
diff --git a/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
@@ -279,7 +279,7 @@ protected function _trans_rollback()
 	 */
 	protected function _list_tables($prefix_limit = FALSE)
 	{
-		$sql = 'SHOW TABLES';
+		$sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char;
 
 		if ($prefix_limit === TRUE && $this->dbprefix !== '')
 		{
diff --git a/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
@@ -74,6 +74,13 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge {
 	 */
 	protected $_unsigned		= FALSE;
 
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var	string
+	 */
+	protected $_null		= 'NULL';
+
 	// --------------------------------------------------------------------
 
 	/**
diff --git a/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -98,7 +98,7 @@ public function __construct($params)
 
 			if ( ! empty($this->username))
 			{
-				$this->dsn .= ';username='.$this->username;
+				$this->dsn .= ';user='.$this->username;
 				empty($this->password) OR $this->dsn .= ';password='.$this->password;
 			}
 		}
diff --git a/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/ForgeIgniter/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
@@ -130,7 +130,7 @@ protected function _alter_table($alter_type, $table, $field)
 			if ( ! empty($field[$i]['default']))
 			{
 				$sqls[] = $sql.' ALTER COLUMN '.$this->db->escape_identifiers($field[$i]['name'])
-					.' SET DEFAULT '.$field[$i]['default'];
+					.' SET '.$field[$i]['default'];
 			}
 
 			if (isset($field[$i]['null']))
diff --git a/ForgeIgniter/system/database/drivers/postgre/postgre_forge.php b/ForgeIgniter/system/database/drivers/postgre/postgre_forge.php
@@ -125,7 +125,7 @@ protected function _alter_table($alter_type, $table, $field)
 			if ( ! empty($field[$i]['default']))
 			{
 				$sqls[] = $sql.' ALTER COLUMN '.$this->db->escape_identifiers($field[$i]['name'])
-					.' SET DEFAULT '.$field[$i]['default'];
+					.' SET '.$field[$i]['default'];
 			}
 
 			if (isset($field[$i]['null']))
diff --git a/ForgeIgniter/system/libraries/Cache/drivers/Cache_redis.php b/ForgeIgniter/system/libraries/Cache/drivers/Cache_redis.php
@@ -76,6 +76,13 @@ class CI_Cache_redis extends CI_Driver
 	 */
 	protected $_serialized = array();
 
+	/**
+	 * del()/delete() method name depending on phpRedis version
+	 *
+	 * @var	string
+	 */
+	protected static $_delete_name;
+
 	// ------------------------------------------------------------------------
 
 	/**
@@ -97,6 +104,10 @@ public function __construct()
 			return;
 		}
 
+		isset(static::$_delete_name) OR static::$_delete_name = version_compare(phpversion('phpredis'), '5', '>=')
+			? 'del'
+			: 'delete';
+
 		$CI =& get_instance();
 
 		if ($CI->config->load('redis', TRUE, TRUE))
@@ -135,10 +146,6 @@ public function __construct()
 		{
 			log_message('error', 'Cache: Redis connection refused ('.$e->getMessage().')');
 		}
-
-		// Initialize the index of serialized values.
-		$serialized = $this->_redis->sMembers('_ci_redis_serialized');
-		empty($serialized) OR $this->_serialized = array_flip($serialized);
 	}
 
 	// ------------------------------------------------------------------------
@@ -153,7 +160,7 @@ public function get($key)
 	{
 		$value = $this->_redis->get($key);
 
-		if ($value !== FALSE && isset($this->_serialized[$key]))
+		if ($value !== FALSE && $this->_redis->sIsMember('_ci_redis_serialized', $key))
 		{
 			return unserialize($value);
 		}
@@ -184,9 +191,8 @@ public function save($id, $data, $ttl = 60, $raw = FALSE)
 			isset($this->_serialized[$id]) OR $this->_serialized[$id] = TRUE;
 			$data = serialize($data);
 		}
-		elseif (isset($this->_serialized[$id]))
+		else
 		{
-			$this->_serialized[$id] = NULL;
 			$this->_redis->sRemove('_ci_redis_serialized', $id);
 		}
 
@@ -203,16 +209,12 @@ public function save($id, $data, $ttl = 60, $raw = FALSE)
 	 */
 	public function delete($key)
 	{
-		if ($this->_redis->delete($key) !== 1)
+		if ($this->_redis->{static::$_delete_name}($key) !== 1)
 		{
 			return FALSE;
 		}
 
-		if (isset($this->_serialized[$key]))
-		{
-			$this->_serialized[$key] = NULL;
-			$this->_redis->sRemove('_ci_redis_serialized', $key);
-		}
+		$this->_redis->sRemove('_ci_redis_serialized', $key);
 
 		return TRUE;
 	}
@@ -228,7 +230,7 @@ public function delete($key)
 	 */
 	public function increment($id, $offset = 1)
 	{
-		return $this->_redis->incr($id, $offset);
+		return $this->_redis->incrBy($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
@@ -242,7 +244,7 @@ public function increment($id, $offset = 1)
 	 */
 	public function decrement($id, $offset = 1)
 	{
-		return $this->_redis->decr($id, $offset);
+		return $this->_redis->decrBy($id, $offset);
 	}
 
 	// ------------------------------------------------------------------------
diff --git a/ForgeIgniter/system/libraries/Form_validation.php b/ForgeIgniter/system/libraries/Form_validation.php
@@ -1208,6 +1208,13 @@ public function valid_url($str)
 			$str = $matches[2];
 		}
 
+		// Apparently, FILTER_VALIDATE_URL doesn't reject digit-only names for some reason ...
+		// See https://github.com/bcit-ci/CodeIgniter/issues/5755
+		if (ctype_digit($str))
+		{
+			return FALSE;
+		}
+
 		// PHP 7 accepts IPv6 addresses within square brackets as hostnames,
 		// but it appears that the PR that came in with https://bugs.php.net/bug.php?id=68039
 		// was never merged into a PHP 5 branch ... https://3v4l.org/8PsSN
diff --git a/ForgeIgniter/system/libraries/Session/Session_driver.php b/ForgeIgniter/system/libraries/Session/Session_driver.php
@@ -184,25 +184,4 @@ protected function _release_lock()
 
 		return TRUE;
 	}
-
-	// ------------------------------------------------------------------------
-
-	/**
-	 * Fail
-	 *
-	 * Drivers other than the 'files' one don't (need to) use the
-	 * session.save_path INI setting, but that leads to confusing
-	 * error messages emitted by PHP when open() or write() fail,
-	 * as the message contains session.save_path ...
-	 * To work around the problem, the drivers will call this method
-	 * so that the INI is set just in time for the error message to
-	 * be properly generated.
-	 *
-	 * @return	mixed
-	 */
-	protected function _fail()
-	{
-		ini_set('session.save_path', config_item('sess_save_path'));
-		return $this->_failure;
-	}
 }
diff --git a/ForgeIgniter/system/libraries/Session/drivers/Session_database_driver.php b/ForgeIgniter/system/libraries/Session/drivers/Session_database_driver.php
diff --git a/ForgeIgniter/system/libraries/Session/drivers/Session_files_driver.php b/ForgeIgniter/system/libraries/Session/drivers/Session_files_driver.php
diff --git a/ForgeIgniter/system/libraries/Session/drivers/Session_memcached_driver.php b/ForgeIgniter/system/libraries/Session/drivers/Session_memcached_driver.php
diff --git a/ForgeIgniter/system/libraries/Session/drivers/Session_redis_driver.php b/ForgeIgniter/system/libraries/Session/drivers/Session_redis_driver.php

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`* @var string`
`56`	`56`	`*`
`57`	`57`	`*/`
`58`		`- const CI_VERSION = '3.1.10';`
	`58`	`+ const CI_VERSION = '3.1.11';`
`59`	`59`
`60`	`60`	`/*`
`61`	`61`	`* ------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -247,11 +247,11 @@ public function write_log($level, $msg)`
`247`	`247`	`* @param string $level The error level`
`248`	`248`	`* @param string $date Formatted date string`
`249`	`249`	`* @param string $message The log message`
`250`		`- * @return string Formatted log line with a new line character '\n' at the end`
	`250`	`+ * @return string Formatted log line with a new line character at the end`
`251`	`251`	`*/`
`252`	`252`	`protected function _format_line($level, $date, $message)`
`253`	`253`	`{`
`254`		`- return $level.' - '.$date.' --> '.$message."\n";`
	`254`	`+ return $level.' - '.$date.' --> '.$message.PHP_EOL;`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`// --------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ public function set_row($key, $value = NULL)`
`381`	`381`	`*/`
`382`	`382`	`public function custom_row_object($n, $type)`
`383`	`383`	`{`
`384`		`- isset($this->custom_result_object[$type]) OR $this->custom_result_object($type);`
	`384`	`+ isset($this->custom_result_object[$type]) OR $this->custom_result_object[$type] = $this->custom_result_object($type);`
`385`	`385`
`386`	`386`	`if (count($this->custom_result_object[$type]) === 0)`
`387`	`387`	`{`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ public function insert_id()`
`383`	`383`	`*/`
`384`	`384`	`protected function _list_tables($prefix_limit = FALSE)`
`385`	`385`	`{`
`386`		`- $sql = 'SHOW TABLES FROM '.$this->escape_identifiers($this->database);`
	`386`	`+ $sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char;`
`387`	`387`
`388`	`388`	`if ($prefix_limit !== FALSE && $this->dbprefix !== '')`
`389`	`389`	`{`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ public function insert_id()`
`429`	`429`	`*/`
`430`	`430`	`protected function _list_tables($prefix_limit = FALSE)`
`431`	`431`	`{`
`432`		`- $sql = 'SHOW TABLES FROM '.$this->escape_identifiers($this->database);`
	`432`	`+ $sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char;`
`433`	`433`
`434`	`434`	`if ($prefix_limit !== FALSE && $this->dbprefix !== '')`
`435`	`435`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function field_data()`
`133`	`133`
`134`	`134`	`$retval[$i] = new stdClass();`
`135`	`135`	`$retval[$i]->name = $field['name'];`
`136`		`- $retval[$i]->type = $field['native_type'];`
	`136`	`+ $retval[$i]->type = isset($field['native_type']) ? $field['native_type'] : null;`
`137`	`137`	`$retval[$i]->max_length = ($field['len'] > 0) ? $field['len'] : NULL;`
`138`	`138`	`$retval[$i]->primary_key = (int) ( ! empty($field['flags']) && in_array('primary_key', $field['flags'], TRUE));`
`139`	`139`	`}`