Beta/2025.1 (#293)

* Update CodeIgniter to 3.1.13

Updates CodeIgniter from 3.1.10 to 3.1.13.

Mostly bug fixes and PHP 8.0 and PHP 8.1 compatibility

Changelog: https://codeigniter.com/userguide3/changelog.html

* Readme update to remove trunk from readme. New default branch is main. Addresses #284

* Updated Docker setup to run PHP 7.4. Updated license. Versioned.

---------

Co-authored-by: Brooke <hi@broo.ke>

Author: cdevroe

Dockerfile

@@ -1,2 +1,2 @@
-FROM php:5.6-apache
-RUN docker-php-ext-install -j$(nproc) mysqli && a2enmod rewrite
+FROM php:7.4-apache
+RUN docker-php-ext-install -j$(nproc) mysqli pdo pdo_mysql && a2enmod rewrite

application/config/config.php

@@ -11,7 +11,7 @@
 | version.point.release
 |
 */
-$config['unmark_version'] = '2020.4';
+$config['unmark_version'] = '2025.1';
 
 /*
 |--------------------------------------------------------------------------

docker-compose.yml

@@ -5,51 +5,60 @@
 ##
 ## Written by Colin Devroe cdevroe.com
 ##
-## Version 1.0 Build 001
+## Version 2.0
 ##
 
-version: '3.3'
-
 services:
   apache:
     container_name: unmark_apache
     build:
       context: ./
-    image: php:5.6-apache
+    platform: linux/amd64
     hostname: apache
     ports:
-    - "80:80"
+    - "8080:80"
     volumes:
       - ./:/var/www/html
       - ./docker-configs/php-custom.ini:/usr/local/etc/php/conf.d/custom.ini
     depends_on:
       - mysql
-    links:
-      - mysql
+    networks:
+      - unmark_network
   mysql:
     container_name: unmark_mysql
-    image: mysql:5.7
+    image: mysql:8.0
+    platform: linux/amd64
     hostname: mysql
-    command: --sql_mode=''
+    command: --default-authentication-plugin=mysql_native_password --sql_mode=''
     ports:
-      - "3306:3306"
+      - "3307:3306"
     volumes:
      - unmark_db_volume:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: unmarkrootmysqlpass
       MYSQL_DATABASE: unmark
       MYSQL_USER: unmarkuser
       MYSQL_PASSWORD: unmarkpass
+    networks:
+      - unmark_network
   phpmyadmin:
     container_name: unmark_phpmyadmin
     image: phpmyadmin/phpmyadmin
-    links:
-      - mysql:db
+    platform: linux/amd64
+    depends_on:
+      - mysql
     ports:
-      - "8082:80"
+      - "8083:80"
     environment:
+      - PMA_HOST=mysql
       - PMA_USER=unmarkuser
       - PMA_PASSWORD=unmarkpass
       - PHP_UPLOAD_MAX_FILESIZE=100MB
+    networks:
+      - unmark_network
 volumes:
   unmark_db_volume:
+
+networks:
+  unmark_network:
+    driver: bridge

license.txt

@@ -1,7 +1,7 @@
 == UNMARK LICENSE ==
 The MIT License (MIT)
 
-Copyright (c) 2013-2019 Colin Devroe, Kyle Ruane, Plain, Unmark
+Copyright (c) 2013-2025 Colin Devroe, Kyle Ruane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ SOFTWARE.
 == CODEIGNITER LICENSE ==
 The MIT License (MIT)
 
-Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+Copyright (c) 2014 - 2025, British Columbia Institute of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

readme.md

@@ -3,8 +3,6 @@ Unmark
 
 The open source to-do application for bookmarks.
 
-**NOTICE June 15, 2020:** The new default branch is named "trunk". ✊
-
 We offer this source code for Unmark completely free. We do so in hopes that Unmark will live on for many years even if we stop maintaining it. You can also use it for free (with a paid upgrade) at [Unmark.it](https://unmark.it/)
 
 To support its further development please consider [subscribing to Unmark.it](https://unmark.it/), [donating via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XSYNN4MGM826N). Or, you can contribute to the code.
@@ -88,7 +86,7 @@ No longer recommended, but do whatever you want!
 - That's it!
 
 #### From git repository
-- Run `git pull origin trunk`
+- Run `git pull origin main`
 - Run `npm update` in the app's root directory
 - Run `grunt` in the app's root directory
 - Navigate to [http://localhost/upgrade](http://localhost/upgrade)
@@ -110,7 +108,7 @@ Another way is to contribute your own code via Pull Requests. Here are some note
 ### Forking and Pull Requests
 
 - Fork [the repository on GitHub](https://github.com/cdevroe/unmark/) into your own account
-- Create your own branch of the trunk branch `git checkout -b your-branch-name`
+- Create your own branch of the main branch `git checkout -b your-branch-name`
 - Update your code and push those code changes back to your fork's branch `git push origin your-branch-name`
 - [Submit a Pull Request](https://github.com/cdevroe/unmark/pulls) using that branch
 - And please accept our _thanks_!

system/.htaccess

@@ -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
@@ -47,7 +48,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		EllisLab Dev Team
- * @link		https://codeigniter.com/user_guide/libraries/benchmark.html
+ * @link		https://codeigniter.com/userguide3/libraries/benchmark.html
  */
 class CI_Benchmark {
 

system/core/Benchmark.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
@@ -46,7 +47,7 @@
  * @subpackage	CodeIgniter
  * @category	Front-controller
  * @author		EllisLab Dev Team
- * @link		https://codeigniter.com/user_guide/
+ * @link		https://codeigniter.com/userguide3/
  */
 
 /**
@@ -55,7 +56,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.10';
+	const CI_VERSION = '3.1.13';
 
 /*
  * ------------------------------------------------------
@@ -434,7 +435,7 @@ function &get_instance()
 		 * ReflectionMethod::isConstructor() is the ONLY reliable check,
 		 * knowing which method will be executed as a constructor.
 		 */
-		elseif ( ! is_callable(array($class, $method)))
+		else
 		{
 			$reflection = new ReflectionMethod($class, $method);
 			if ( ! $reflection->isPublic() OR $reflection->isConstructor())

system/core/CodeIgniter.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
@@ -46,7 +47,7 @@
  * @subpackage	CodeIgniter
  * @category	Common Functions
  * @author		EllisLab Dev Team
- * @link		https://codeigniter.com/user_guide/
+ * @link		https://codeigniter.com/userguide3/
  */
 
 // ------------------------------------------------------------------------
@@ -565,7 +566,7 @@ function set_status_header($code = 200, $text = '')
 			return;
 		}
 
-		$server_protocol = (isset($_SERVER['SERVER_PROTOCOL']) && in_array($_SERVER['SERVER_PROTOCOL'], array('HTTP/1.0', 'HTTP/1.1', 'HTTP/2'), TRUE))
+		$server_protocol = (isset($_SERVER['SERVER_PROTOCOL']) && in_array($_SERVER['SERVER_PROTOCOL'], array('HTTP/1.0', 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0'), TRUE))
 			? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 		header($server_protocol.' '.$code.' '.$text, TRUE, $code);
 	}
@@ -778,11 +779,9 @@ function html_escape($var, $double_encode = TRUE)
 	 */
 	function _stringify_attributes($attributes, $js = FALSE)
 	{
-		$atts = NULL;
-
 		if (empty($attributes))
 		{
-			return $atts;
+			return NULL;
 		}
 
 		if (is_string($attributes))
@@ -792,6 +791,7 @@ function _stringify_attributes($attributes, $js = FALSE)
 
 		$attributes = (array) $attributes;
 
+		$atts = '';
 		foreach ($attributes as $key => $val)
 		{
 			$atts .= ($js) ? $key.'='.$val.',' : ' '.$key.'="'.$val.'"';

system/core/Common.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
@@ -46,7 +47,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		EllisLab Dev Team
- * @link		https://codeigniter.com/user_guide/libraries/config.html
+ * @link		https://codeigniter.com/userguide3/libraries/config.html
  */
 class CI_Config {