From 42cd046e9055e74edcb6539a9c4d5a2cf735a5ca Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 6 Jan 2021 20:37:04 +0100 Subject: RC1 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c1c9aedf8..af924c553 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2RC' ); +define ( 'STD_VERSION', '5.2RC1' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); -- cgit v1.2.3 From 39c5e855641b96c4b2053f81c892355ac4e9b2a1 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 9 Jan 2021 15:50:57 +0100 Subject: RC2 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index af924c553..5c0f9c19f 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2RC1' ); +define ( 'STD_VERSION', '5.2RC2' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); -- cgit v1.2.3 From fa41527f85f211c013bac3657629f2e23d400d4a Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 9 Jan 2021 19:22:47 +0000 Subject: fix some php8 fatal errors (cherry picked from commit 2522d42c71baee9caba181566948ae4c899885bd) --- boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5c0f9c19f..f9430bcb5 100755 --- a/boot.php +++ b/boot.php @@ -82,11 +82,11 @@ define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub define ( 'DIRECTORY_REALM', 'RED_GLOBAL'); define ( 'DIRECTORY_FALLBACK_MASTER', 'https://hub.netzgemeinde.eu'); -$DIRECTORY_FALLBACK_SERVERS = array( +$DIRECTORY_FALLBACK_SERVERS = [ 'https://hub.netzgemeinde.eu', 'https://zotsite.net', 'https://hub.libranet.de' -); +]; /** @@ -2017,7 +2017,7 @@ function proc_run(){ } $args = array_map('escapeshellarg',$args); - $cmdline = implode($args," "); + $cmdline = implode(' ', $args); if(is_windows()) { $cwd = getcwd(); -- cgit v1.2.3 From 9d1f73e1793fbcb2b9d581f6e687a625795ef3e6 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 11 Jan 2021 19:02:26 +0000 Subject: 5.2RC4 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index f83c18cb3..3424c96ab 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2RC3' ); +define ( 'STD_VERSION', '5.2RC4' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); -- cgit v1.2.3 From 4d2bcbc5837a7d99dc541595ca8087c335242af0 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 13 Jan 2021 09:48:47 +0000 Subject: release 5.2 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3424c96ab..17a9e3959 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2RC4' ); +define ( 'STD_VERSION', '5.2' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); -- cgit v1.2.3 From 254e30bea173e350a24756cbd8cf4acdfe32933e Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 16 Jan 2021 10:33:46 +0100 Subject: version 5.2.1 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 17a9e3959..61622a1fe 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2' ); +define ( 'STD_VERSION', '5.2.1' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); -- cgit v1.2.3 From 67db1c6e9bc474c34cb10029794b64be8c85a393 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Sat, 23 Jan 2021 15:24:24 +0100 Subject: melt diff prod fork 4.6.2 air onto 5.2.1 to 5.2.2 DB 1241 --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 61622a1fe..26a5ef4c4 100755 --- a/boot.php +++ b/boot.php @@ -50,10 +50,10 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2.1' ); +define ( 'STD_VERSION', '5.2.2' ); define ( 'ZOT_REVISION', '6.0' ); -define ( 'DB_UPDATE_VERSION', 1240 ); +define ( 'DB_UPDATE_VERSION', 1241 ); define ( 'PROJECT_BASE', __DIR__ ); -- cgit v1.2.3 From a04ded9cca5d6cf381ae73e18f62b42ec174a5c4 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Fri, 26 Feb 2021 14:38:41 +0100 Subject: repair dd tag and set unique vsn --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 26a5ef4c4..a9ce4b129 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2.2' ); +define ( 'STD_VERSION', '5.2.9' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1241 ); -- cgit v1.2.3 From c26dede97f626b52b7bf8962ed55d1dbda86abe8 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Sun, 28 Feb 2021 21:06:16 +0100 Subject: get dev --- boot.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) mode change 100755 => 100644 boot.php (limited to 'boot.php') diff --git a/boot.php b/boot.php old mode 100755 new mode 100644 index a9ce4b129..4c3e4c00b --- a/boot.php +++ b/boot.php @@ -28,6 +28,8 @@ */ // composer autoloader for all namespaced Classes +use Zotlabs\Lib\Crypto; + require_once('vendor/autoload.php'); require_once('include/config.php'); @@ -50,10 +52,10 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.2.9' ); +define ( 'STD_VERSION', '5.5.1' ); define ( 'ZOT_REVISION', '6.0' ); -define ( 'DB_UPDATE_VERSION', 1241 ); +define ( 'DB_UPDATE_VERSION', 1243 ); define ( 'PROJECT_BASE', __DIR__ ); @@ -601,6 +603,7 @@ define ( 'DBTYPE_POSTGRES', 1 ); function sys_boot() { + // our central App object App::init(); @@ -681,14 +684,18 @@ function sys_boot() { function startup() { - error_reporting(E_ERROR | E_WARNING | E_PARSE); + error_reporting(E_ALL & ~E_NOTICE); + + if (version_compare(PHP_VERSION, '8.0.0') >= 0) { + error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE); + } // Some hosting providers block/disable this @set_time_limit(0); if(function_exists ('ini_set')) { // This has to be quite large to deal with embedded private photos - @ini_set('pcre.backtrack_limit', 500000); + //@ini_set('pcre.backtrack_limit', 500000); // Use cookies to store the session ID on the client side @ini_set('session.use_only_cookies', 1); @@ -1570,7 +1577,7 @@ function fix_system_urls($oldurl, $newurl) { dbesc($channel_address . '@' . $rhs), dbesc($newurl), dbesc(str_replace($oldurl,$newurl,$rv['hubloc_id_url'])), - dbesc(($rv['hubloc_network'] === 'zot6') ? \Zotlabs\Lib\Libzot::sign($newurl,$c[0]['channel_prvkey']) : base64url_encode(rsa_sign($newurl,$c[0]['channel_prvkey']))), + dbesc(($rv['hubloc_network'] === 'zot6') ? \Zotlabs\Lib\Libzot::sign($newurl,$c[0]['channel_prvkey']) : base64url_encode(Crypto::sign($newurl,$c[0]['channel_prvkey']))), dbesc($newhost), dbesc(($rv['hubloc_network'] === 'zot6') ? $newurl . '/zot' : $newurl . '/post'), dbesc($rv['xchan_hash']), @@ -1756,7 +1763,7 @@ function shutdown() { */ function get_account_id() { - if(intval($_SESSION['account_id'])) + if(isset($_SESSION['account_id'])) return intval($_SESSION['account_id']); if(App::$account) @@ -2063,12 +2070,10 @@ function is_site_admin() { if(! session_id()) return false; - if($_SESSION['delegate']) + if(isset($_SESSION['delegate'])) return false; - if((intval($_SESSION['authenticated'])) - && (is_array(App::$account)) - && (App::$account['account_roles'] & ACCOUNT_ROLE_ADMIN)) + if(isset($_SESSION['authenticated']) && is_array(App::$account) && (App::$account['account_roles'] & ACCOUNT_ROLE_ADMIN)) return true; return false; @@ -2250,6 +2255,8 @@ function load_pdl() { $n = 'mod_' . App::$module . '.pdl' ; $u = App::$comanche->get_channel_id(); + $s = ''; + if($u) $s = get_pconfig($u, 'system', $n); if(! $s) -- cgit v1.2.3 From 4cc72db4630822956a90ecb71ea9cf41a79e700d Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Tue, 2 Mar 2021 16:11:18 +0100 Subject: hope not to hurry too fast when saying 5.4RC2. But today & tomorrow is only for the tests --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4c3e4c00b..1a27921b2 100644 --- a/boot.php +++ b/boot.php @@ -52,10 +52,10 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.5.1' ); +define ( 'STD_VERSION', '5.4RC2' ); define ( 'ZOT_REVISION', '6.0' ); -define ( 'DB_UPDATE_VERSION', 1243 ); +define ( 'DB_UPDATE_VERSION', 1244 ); define ( 'PROJECT_BASE', __DIR__ ); -- cgit v1.2.3 From 91f3c722d640bd3bd8c43dba1ab39be16dca8e20 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 6 Apr 2021 07:57:35 +0000 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d91b57f1f..26286d644 100644 --- a/boot.php +++ b/boot.php @@ -52,7 +52,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.5.3' ); +define ( 'STD_VERSION', '5.5.4' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1244 ); -- cgit v1.2.3 From 7ccd7b439f5a029384ecb28911a0df6f6d658231 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 16 Apr 2021 09:14:40 +0000 Subject: floc off google --- boot.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 26286d644..039dda1b8 100644 --- a/boot.php +++ b/boot.php @@ -2460,6 +2460,14 @@ function construct_page() { header("X-Content-Type-Options: nosniff"); } + if (isset(App::$config['system']['perm_policy_header']) && App::$config['system']['perm_policy_header']) { + header("Permissions-Policy: " . App::$config['system']['perm_policy_header']); + } + else { + // opt-out this site from federated browser surveillance + header("Permissions-Policy: interest-cohort=()"); + } + if(isset(App::$config['system']['public_key_pins'])) { header("Public-Key-Pins: " . App::$config['system']['public_key_pins']); } -- cgit v1.2.3