RELEASE 3.6.7.

ivantcholakov · Aug 25, 2022 · c78a2d2 · c78a2d2
1 parent 9afe994
commit c78a2d2
Show file tree

Hide file tree

Showing 37 changed files with 357 additions and 556 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012 - 2021 Ivan Tcholakov, Gwenaël Gallon
+Copyright (c) 2012 - 2022 Ivan Tcholakov, Gwenaël Gallon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ https://www.codeigniter.com/userguide3/
 Requirements
 ------------
 
-PHP 7.2.5 or higher, Apache 2.2 - 2.4 (mod_rewrite should be enabled).
+PHP 7.3.0 or higher, Apache 2.2 - 2.4 (mod_rewrite should be enabled).
 For database support seek information within CodeIgniter 3 documentation.
 
 For UTF-8 encoded sites it is highly recommendable the following PHP extensions to be installed:

diff --git a/platform/application/modules/playground/controllers/Ajax_queue_controller.php b/platform/application/modules/playground/controllers/Ajax_queue_controller.php
@@ -33,7 +33,7 @@ public function index() {
     public function test() {
 
         $i = (int) $this->input->get('i');
-        @usleep(1000 - i * 250);
+        @ usleep(1000 - $i * 250);
         $this->output->set_header('Content-type: text/html; charset=utf-8', true);
         $this->output->set_output('result '.$i);
     }
@@ -49,11 +49,13 @@ private function get_test_script_1() {
         $.ajax({
             url: '<?php echo site_uri('playground/ajax-queue/test'); ?>',
             type: 'GET',
+            cache: false,
             mode: 'queue',
             data: {
                 i: i
             },
             success: function(html) {
+                $('#queued_ajax_segment .loader').removeClass('active');
                 $('#queued_ajax').append('<li>' + html + '</li>');
             }
         });
@@ -79,11 +81,13 @@ private function get_test_script_2() {
         $.ajax({
             url: '<?php echo site_uri('playground/ajax-queue/test'); ?>',
             type: 'GET',
+            cache: false,
 
             data: {
                 i: i
             },
             success: function(html) {
+                $('#ordinary_ajax_segment .loader').removeClass('active');
                 $('#ordinary_ajax').append('<li>' + html + '</li>');
             }
         });

diff --git a/platform/application/modules/playground/controllers/Handlebars_controller.php b/platform/application/modules/playground/controllers/Handlebars_controller.php
@@ -43,7 +43,7 @@ protected function _get_data() {
 
         $csv = (string) @ file_get_contents(APPPATH.'demo_data/countries.csv');
 
-        $items = preg_split('/\r\n|\r|\n/m', $csv, null, PREG_SPLIT_NO_EMPTY);
+        $items = preg_split('/\r\n|\r|\n/m', $csv, -1, PREG_SPLIT_NO_EMPTY);
 
         foreach ($items as & $item) {
 

diff --git a/platform/application/modules/playground/controllers/Mustache_controller.php b/platform/application/modules/playground/controllers/Mustache_controller.php
@@ -43,7 +43,7 @@ protected function _get_data() {
 
         $csv = (string) @ file_get_contents(APPPATH.'demo_data/countries.csv');
 
-        $items = preg_split('/\r\n|\r|\n/m', $csv, null, PREG_SPLIT_NO_EMPTY);
+        $items = preg_split('/\r\n|\r|\n/m', $csv, -1, PREG_SPLIT_NO_EMPTY);
 
         foreach ($items as & $item) {
 

diff --git a/platform/application/modules/playground/controllers/Parser_test_controller.php b/platform/application/modules/playground/controllers/Parser_test_controller.php
@@ -45,7 +45,7 @@ protected function _get_data() {
 
         $csv = (string) @ file_get_contents(APPPATH.'demo_data/countries.csv');
 
-        $items = preg_split('/\r\n|\r|\n/m', $csv, null, PREG_SPLIT_NO_EMPTY);
+        $items = preg_split('/\r\n|\r|\n/m', $csv, -1, PREG_SPLIT_NO_EMPTY);
 
         foreach ($items as & $item) {
 

diff --git a/platform/application/modules/playground/controllers/Twig_parser_controller.php b/platform/application/modules/playground/controllers/Twig_parser_controller.php
@@ -93,7 +93,7 @@ protected function _get_country_data() {
 
         $csv = (string) @ file_get_contents(APPPATH.'demo_data/countries.csv');
 
-        $items = preg_split('/\r\n|\r|\n/m', $csv, null, PREG_SPLIT_NO_EMPTY);
+        $items = preg_split('/\r\n|\r|\n/m', $csv, -1, PREG_SPLIT_NO_EMPTY);
 
         foreach ($items as & $item) {
 

diff --git a/platform/application/modules/playground/controllers/datatables/Datatables_controller.php b/platform/application/modules/playground/controllers/datatables/Datatables_controller.php
@@ -26,7 +26,7 @@ public function index() {
 
         $csv = (string) @ file_get_contents(APPPATH.'demo_data/countries.csv');
 
-        $items = preg_split('/\r\n|\r|\n/m', $csv, null, PREG_SPLIT_NO_EMPTY);
+        $items = preg_split('/\r\n|\r|\n/m', $csv, -1, PREG_SPLIT_NO_EMPTY);
 
         $id = 0;
 

diff --git a/platform/application/modules/playground/views/ajax_queue.html.twig b/platform/application/modules/playground/views/ajax_queue.html.twig
@@ -14,7 +14,10 @@ The MIT License, http://opensource.org/licenses/MIT
 
                     <h3>Results:</h3>
 
-                    <ul id="queued_ajax"></ul>
+                    <div id="queued_ajax_segment" class="ui segment">
+                        <div class="ui active loader"></div>
+                        <ul id="queued_ajax"></ul>
+                    </div>
 
                 </div>
 
@@ -27,7 +30,10 @@ The MIT License, http://opensource.org/licenses/MIT
 
                     <h3>Results:</h3>
 
-                    <ul id="ordinary_ajax"></ul>
+                    <div id="ordinary_ajax_segment" class="ui segment">
+                        <div class="ui active loader"></div>
+                        <ul id="ordinary_ajax"></ul>
+                    </div>
 
                 </div>
 

diff --git a/platform/bootstrap/versions.php b/platform/bootstrap/versions.php
@@ -4,14 +4,14 @@
  * CodeIgniter Version
  * @var    string
  */
-define('CI_VERSION', '3.1.11');
+define('CI_VERSION', '3.1.13');
 
 
 /**
  * Platform (Application Starter) Version
  * @var    string
  */
-define('PLATFORM_VERSION', '3.6.6');
+define('PLATFORM_VERSION', '3.6.7');
 
 
 /**
@@ -47,7 +47,7 @@
  * Minimum Required PHP Version
  * @var    string
  */
-define('PLATFORM_PHP_VERSION_MIN', '7.2.5');
+define('PLATFORM_PHP_VERSION_MIN', '7.3.0');
 
 
 if (version_compare(PHP_VERSION, PLATFORM_PHP_VERSION_MIN, '<')) {

diff --git a/platform/common/classes/Parser/Twig/Loader/Filesystem.php b/platform/common/classes/Parser/Twig/Loader/Filesystem.php
@@ -80,7 +80,7 @@ protected function findTemplate($name, bool $throw = true)
 
             $file = $ci->parser->find_file($path.'/'.$shortname, $detected_parser, $detected_extension, $detected_filename, 'twig');
 
-            if (is_file($file)) {
+            if ($file != '' && is_file($file)) {
 
                 if (false !== $realpath = realpath($file)) {
                     return $this->cache[$name] = $realpath;

diff --git a/platform/common/config/config.php b/platform/common/config/config.php
@@ -188,7 +188,7 @@
 | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
 |
 */
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-=+';
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-=+\p{L}';
 
 /*
 |--------------------------------------------------------------------------
@@ -384,6 +384,10 @@
 |
 |    The session cookie name, must contain only [0-9a-z_-] characters
 |
+| 'sess_samesite'
+|
+|    Session cookie SameSite attribute: Lax (default), Strict or None
+|
 | 'sess_expiration'
 |
 |    The number of SECONDS you want the session to last.
@@ -424,6 +428,7 @@
 */
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ac584bae';
+$config['sess_samesite'] = 'Lax';
 $config['sess_expiration'] = 4 * 60 * 60;  // 4 hours
 $config['sess_save_path'] = is_really_writable(WRITABLEPATH) ? WRITABLEPATH.'sessions/' : NULL;
 $config['sess_match_ip'] = FALSE;

diff --git a/platform/common/config/email.php b/platform/common/config/email.php
@@ -4,6 +4,7 @@
 $config['protocol']         = IS_WINDOWS_OS ? 'smtp' : 'mail';  // 'mail', 'sendmail', or 'smtp'
 $config['mailpath']         = '/usr/sbin/sendmail';
 $config['smtp_host']        = 'localhost';
+$config['smtp_auth']        = null;                     // Whether to use SMTP authentication, boolean TRUE/FALSE. If this option is omited or if it is NULL, then SMTP authentication is used when both $config['smtp_user'] and $config['smtp_pass'] are non-empty strings.
 $config['smtp_user']        = '';
 $config['smtp_pass']        = '';
 $config['smtp_port']        = 25;
@@ -25,6 +26,20 @@
 $config['bcc_batch_size']   = 200;
 $config['encoding']         = '8bit';                   // The body encoding. For CodeIgniter: '8bit' or '7bit'. For PHPMailer: '8bit', '7bit', 'binary', 'base64', or 'quoted-printable'.
 
+// XOAUTH2 mechanism for authentication.
+// See https://github.com/PHPMailer/PHPMailer/wiki/Using-Gmail-with-XOAUTH2
+$config['oauth_type']          = '';                    // XOAUTH2 authentication mechanism:
+                                                        // ''                  - disabled;
+                                                        // 'xoauth2'           - custom implementation;
+                                                        // 'xoauth2_google'    - Google provider;
+                                                        // 'xoauth2_yahoo'     - Yahoo provider;
+                                                        // 'xoauth2_microsoft' - Microsoft provider.
+$config['oauth_instance']      = null;                  // Initialized instance of \PHPMailer\PHPMailer\OAuth (OAuthTokenProvider interface) that contains a custom token provider. Needed for 'xoauth2' custom implementation only. 
+$config['oauth_user_email']    = '';                    // If this option is an empty string or null, $config['smtp_user'] will be used.
+$config['oauth_client_id']     = '';
+$config['oauth_client_secret'] = '';
+$config['oauth_refresh_token'] = '';
+
 // DKIM Signing
 // See https://yomotherboard.com/how-to-setup-email-server-dkim-keys/
 // See http://stackoverflow.com/questions/24463425/send-mail-in-phpmailer-using-dkim-keys
@@ -43,7 +58,7 @@
 $config['mailpath']         = '/usr/sbin/sendmail';
 $config['smtp_host']        = 'smtp.gmail.com';
 $config['smtp_user']        = '[email protected]';
-$config['smtp_pass']        = 'yourpassword';
+$config['smtp_pass']        = '';
 $config['smtp_port']        = 587;
 $config['smtp_timeout']     = 30;
 $config['smtp_crypto']      = 'tls';
@@ -62,4 +77,9 @@
 $config['bcc_batch_mode']   = false;
 $config['bcc_batch_size']   = 200;
 $config['encoding']         = '8bit';
+
+$config['oauth_type']          = 'xoauth2_google';
+$config['oauth_client_id']     = '237644427849-g8d0pnkd1jh3idcjdbopvkse2hvj0tdp.apps.googleusercontent.com';
+$config['oauth_client_secret'] = 'mklHhrns6eF-qjwuiLpSB4DL';
+$config['oauth_refresh_token'] = '1/7Jt8_RHX86Pk09VTfQd4O_ZqKbmuV7HpMNz-rqJ4KdQMEudVrK5jSpoR30zcRFq6';
 */
diff --git a/platform/common/config/mimes.php b/platform/common/config/mimes.php
@@ -162,7 +162,7 @@
     'cdr'   => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
     'wma'   => array('audio/x-ms-wma', 'video/x-ms-asf'),
     'jar'   => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),
-    'svg'   => array('image/svg+xml', 'application/xml', 'text/xml'),
+    'svg'   => array('image/svg+xml', 'image/svg', 'application/xml', 'text/xml'),
     'vcf'   => 'text/x-vcard',
     'srt'   => array('text/srt', 'text/plain'),
     'vtt'   => array('text/vtt', 'text/plain'),

diff --git a/platform/common/core/Common.php b/platform/common/core/Common.php
@@ -471,11 +471,9 @@ function & _get_simple_twig_instance($charset = null) {
      */
     function _stringify_attributes($attributes, $js = FALSE)
     {
-        $atts = NULL;
-
         if (empty($attributes))
         {
-            return $atts;
+            return NULL;
         }
 
         // Added by Ivan Tcholakov, 03-JAN-2016.
@@ -492,6 +490,7 @@ function _stringify_attributes($attributes, $js = FALSE)
 
         $attributes = (array) $attributes;
 
+        $atts = '';
         foreach ($attributes as $key => $val)
         {
             $atts .= ($js) ? $key.'='.$val.',' : ' '.$key.'="'.$val.'"';

diff --git a/platform/common/database/DB.php b/platform/common/database/DB.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0

diff --git a/platform/common/database/DB_cache.php b/platform/common/database/DB_cache.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0

diff --git a/platform/common/database/DB_driver.php b/platform/common/database/DB_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
@@ -1604,6 +1605,7 @@ protected function _get_operator($str)
 				'\s+EXISTS\s*\(.*\)',        // EXISTS(sql)
 				'\s+NOT EXISTS\s*\(.*\)',    // NOT EXISTS(sql)
 				'\s+BETWEEN\s+',                 // BETWEEN value AND value
+				'\s+NOT BETWEEN\s+',             // NOT BETWEEN value AND value
 				'\s+IN\s*\(.*\)',            // IN(list)
 				'\s+NOT IN\s*\(.*\)',        // NOT IN (list)
 				'\s+LIKE\s+\S.*('.$_les.')?',    // LIKE 'expr'[ ESCAPE '%s']

diff --git a/platform/common/database/DB_query_builder.php b/platform/common/database/DB_query_builder.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0

diff --git a/platform/common/database/drivers/mysql/mysql_driver.php b/platform/common/database/drivers/mysql/mysql_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
@@ -179,7 +180,7 @@ public function db_connect($persistent = FALSE)
 			}
 
 			//
-                        }
+			}
 			//
 		}