Merge remote-tracking branch 'upstream/master'

1 files changed, 23 insertions, 45 deletions

diff --git a/boot.php b/boot.php
index 20f07c452..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  );
@@ -624,6 +623,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
  *
@@ -854,6 +868,9 @@ class App {
 				$this->register_template_engine($k);
 			}
 		}
+
+		spl_autoload_register('ZotlabsAutoloader::loader');
+
 	}
 
 	function get_baseurl($ssl = false) {
@@ -1013,7 +1030,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(),
@@ -1402,6 +1419,9 @@ function check_config(&$a) {
 	}
 
 	load_hooks();
+
+	check_cron_broken();
+
 }
 
 
@@ -2364,45 +2384,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';
-}