From 342fda94e4162634eeb67c18c1d284e7d78f217f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 18 Feb 2016 15:24:58 -0800 Subject: Provide Zotlabs\Project and System class for querying details about the project/version info. Move these out of /boot.php --- boot.php | 45 ++------------------------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 20f07c452..29f1788b6 100755 --- a/boot.php +++ b/boot.php @@ -45,6 +45,7 @@ require_once('include/Contact.php'); require_once('include/account.php'); require_once('include/AccessList.php'); +require_once('Zotlabs/Project/System.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); @@ -1013,7 +1014,7 @@ class App { '$user_scalable' => $user_scalable, '$baseurl' => $this->get_baseurl(), '$local_channel' => local_channel(), - '$generator' => get_platform_name() . ((get_project_version()) ? ' ' . get_project_version() : ''), + '$generator' => Zotlabs\Project\System::get_platform_name() . ((Zotlabs\Project\System::get_project_version()) ? ' ' . Zotlabs\Project\System::get_project_version() : ''), '$update_interval' => $interval, '$icon' => head_get_icon(), '$head_css' => head_get_css(), @@ -2364,45 +2365,3 @@ function check_cron_broken() { } -function get_platform_name() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['platform_name']) - return $a->config['system']['platform_name']; - return PLATFORM_NAME; -} - -function get_project_version() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version']) - return ''; - return RED_VERSION; -} - -function get_update_version() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version']) - return ''; - return DB_UPDATE_VERSION; -} - - -function get_notify_icon() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['email_notify_icon_url']) - return $a->config['system']['email_notify_icon_url']; - return z_root() . '/images/hz-white-32.png'; -} - -function get_site_icon() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['site_icon_url']) - return $a->config['system']['site_icon_url']; - return z_root() . '/images/hz-32.png'; -} - - -function get_server_role() { - if(UNO) - return 'basic'; - return 'advanced'; -} -- cgit v1.2.3 From 5a7b994e59306519574ce7aaa004f08d7d47ee05 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 18 Feb 2016 19:32:06 -0800 Subject: siteinfo regression with Zotlabs\Project - add an autoloader --- boot.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 29f1788b6..4f58c4139 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,6 @@ require_once('include/Contact.php'); require_once('include/account.php'); require_once('include/AccessList.php'); -require_once('Zotlabs/Project/System.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); @@ -625,6 +624,21 @@ function startup() { } } + +class ZotlabsAutoloader { + static public function loader($className) { + $filename = str_replace('\\', '/', $className) . ".php"; + if (file_exists($filename)) { + include($filename); + if (class_exists($className)) { + return TRUE; + } + } + return FALSE; + } +} + + /** * class: App * @@ -855,6 +869,9 @@ class App { $this->register_template_engine($k); } } + + spl_autoload_register('ZotlabsAutoloader::loader'); + } function get_baseurl($ssl = false) { -- cgit v1.2.3 From 1db3409f36f408bfc49816e1fab3df4b53b8f19e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Feb 2016 16:19:15 -0800 Subject: add router class --- boot.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4f58c4139..2dc542d28 100755 --- a/boot.php +++ b/boot.php @@ -1420,6 +1420,9 @@ function check_config(&$a) { } load_hooks(); + + check_cron_broken(); + } -- cgit v1.2.3 From a9711895cf254a0ca34b1e3f7c8e75bb832e6973 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 20 Feb 2016 19:39:54 +1100 Subject: move accesslist class to namespace --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2dc542d28..03d81b360 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); require_once('include/identity.php'); require_once('include/Contact.php'); require_once('include/account.php'); -require_once('include/AccessList.php'); + define ( 'PLATFORM_NAME', 'hubzilla' ); -- cgit v1.2.3 From dfbe2eaf9856140de84f4d891fd442cdd6872545 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 20 Feb 2016 00:49:37 -0800 Subject: Revert "move accesslist class to namespace" This reverts commit a9711895cf254a0ca34b1e3f7c8e75bb832e6973. --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 03d81b360..2dc542d28 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); require_once('include/identity.php'); require_once('include/Contact.php'); require_once('include/account.php'); - +require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -- cgit v1.2.3 From f1564b4cff5a584d37b12000f68014df49e683d9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 21 Feb 2016 16:49:49 -0800 Subject: retry the move of AccessList to composer format (one or more third-party plugins will likely break as a result) --- boot.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2dc542d28..f1c7d8951 100755 --- a/boot.php +++ b/boot.php @@ -43,12 +43,11 @@ require_once('include/taxonomy.php'); require_once('include/identity.php'); require_once('include/Contact.php'); require_once('include/account.php'); -require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.2.3' ); +define ( 'STD_VERSION', '1.2.4' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1163 ); -- cgit v1.2.3