From c29f622b90a58a783787b27736cd9738e6be50c2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Dec 2015 16:21:15 -0800 Subject: introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin with 0.11.1 since it is an incompatible interface change to 0.11. --- boot.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 8d99c300e..38eb5bbf4 100755 --- a/boot.php +++ b/boot.php @@ -48,6 +48,7 @@ require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); +define ( 'STD_VERSION', '0.11.1' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1160 ); @@ -65,10 +66,10 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); //define ( 'NULL_DATE', '0000-00-00 00:00:00' ); define ( 'TEMPLATE_BUILD_PATH', 'store/[data]/smarty3' ); -define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000 -define ( 'DIRECTORY_MODE_PRIMARY', 0x0001); -define ( 'DIRECTORY_MODE_SECONDARY', 0x0002); -define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); +define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // A directory client +define ( 'DIRECTORY_MODE_PRIMARY', 0x0001); // There can only be *one* primary directory server in a directory_realm. +define ( 'DIRECTORY_MODE_SECONDARY', 0x0002); // All other mirror directory servers +define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub with itself as directory server. // We will look for upstream directories whenever me make contact // with other sites, but if this is a new installation and isn't -- cgit v1.2.3 From 9f3ea71d5d9e1e42d1d1e44a8070d90814962ad2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Dec 2015 20:45:21 -0800 Subject: non-functional changes (changes to comments, etc.) --- boot.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 38eb5bbf4..2b1f3cb4e 100755 --- a/boot.php +++ b/boot.php @@ -622,10 +622,10 @@ class App { public $poi = null; // "person of interest", generally a referenced connection private $oauth_key = null; // consumer_id of oauth request, if used public $layout = array(); // Comanche parsed template - public $pdl = null; + public $pdl = null; // Comanche page description private $perms = null; // observer permissions private $widgets = array(); // widgets for this page - //private $widgetlist = null; // widget ordering and inclusion directives + public $groups; public $language; @@ -1158,7 +1158,7 @@ function z_root() { } /** - * @brief Return absolut URL for given $path. + * @brief Return absolute URL for given $path. * * @param string $path * @@ -1470,12 +1470,6 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { $tpl = get_markup_template("logout.tpl"); } else { -// There's no such thing as login_head.tpl, has never been in Red, removed from Friendica 1 Jun 2013... - -// $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"), array( -// '$baseurl' => $a->get_baseurl(true) -// )); - $tpl = get_markup_template("login.tpl"); if(strlen($a->query_string)) $_SESSION['login_return_url'] = $a->query_string; -- cgit v1.2.3 From 366e735ad87c30cf6562e496e3e6a158148a035e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 3 Dec 2015 14:44:03 -0800 Subject: time to tag the sucker --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2b1f3cb4e..3a012300e 100755 --- a/boot.php +++ b/boot.php @@ -48,7 +48,7 @@ require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); -define ( 'STD_VERSION', '0.11.1' ); +define ( 'STD_VERSION', '1.0' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1160 ); -- cgit v1.2.3 From 70c5f347c4104c9cd64617630d2772821c83ad37 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 3 Dec 2015 18:27:49 -0800 Subject: remove non-working directory server from the project fallback list. --- boot.php | 1 - 1 file changed, 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3a012300e..36031f537 100755 --- a/boot.php +++ b/boot.php @@ -84,7 +84,6 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.site', 'https://red.zottel.red', 'https://gravizot.de', - 'https://blablanet.com', 'https://my.federated.social' ); -- cgit v1.2.3 From 615c97132d37027833744a6a00da4ebc08840309 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 3 Dec 2015 19:18:12 -0800 Subject: add hubzilla.nl as fallback --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 36031f537..48d81ff59 100755 --- a/boot.php +++ b/boot.php @@ -84,7 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.site', 'https://red.zottel.red', 'https://gravizot.de', - 'https://my.federated.social' + 'https://my.federated.social', + 'https://hubzilla.nl' ); -- cgit v1.2.3 From 36ef1d1bc63d6c2040947ee9c18ba16072ffb76e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 5 Dec 2015 13:24:58 -0800 Subject: move the instance stuff to abook where it belongs --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 48d81ff59..d80d5fd07 100755 --- a/boot.php +++ b/boot.php @@ -51,7 +51,7 @@ define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H' define ( 'STD_VERSION', '1.0' ); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1160 ); +define ( 'DB_UPDATE_VERSION', 1161 ); /** -- cgit v1.2.3 From 79340c514715b5353333d8882fba450c9e42cc7e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 8 Dec 2015 11:08:00 -0800 Subject: change to fallback server list --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d80d5fd07..c6397c06a 100755 --- a/boot.php +++ b/boot.php @@ -83,7 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zothub.com', 'https://hubzilla.site', 'https://red.zottel.red', - 'https://gravizot.de', + 'https://hub.pixelbits.de', 'https://my.federated.social', 'https://hubzilla.nl' ); @@ -1324,7 +1324,7 @@ function check_config(&$a) { * */ - $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); + $r = q("SELECT * FROM addon WHERE installed = 1"); if($r) $installed = $r; else -- cgit v1.2.3 From bb0e4044bf08bbac9d73a3e3b75d74c33dcacd7f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 13 Dec 2015 15:35:45 -0800 Subject: remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2. --- boot.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c6397c06a..8ab4556d2 100755 --- a/boot.php +++ b/boot.php @@ -704,11 +704,18 @@ class App { 'smarty3' => '}}' ); + // These represent the URL which was used to access the page + private $scheme; private $hostname; - private $baseurl; private $path; + // This is our standardised URL - regardless of what was used + // to access the page + + private $baseurl; + + /** * App constructor. */ -- cgit v1.2.3 From f0d90005eaf211638dc8dcc497e962bb79f4e023 Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 16 Dec 2015 09:06:20 +0100 Subject: remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 8ab4556d2..1da56d07e 100755 --- a/boot.php +++ b/boot.php @@ -82,7 +82,7 @@ define ( 'DIRECTORY_FALLBACK_MASTER', 'https://zothub.com'); $DIRECTORY_FALLBACK_SERVERS = array( 'https://zothub.com', 'https://hubzilla.site', - 'https://red.zottel.red', + 'https://hubzilla.zottel.net', 'https://hub.pixelbits.de', 'https://my.federated.social', 'https://hubzilla.nl' -- cgit v1.2.3