static App

6 files changed, 66 insertions, 62 deletions

diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php
index ca57c50a3..f87f827bb 100644
--- a/Zotlabs/Project/System.php
+++ b/Zotlabs/Project/System.php
@@ -6,21 +6,21 @@ class System {
 
 	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'];
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name'])
+			return \App::$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'])
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$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'])
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
 			return '';
 		return DB_UPDATE_VERSION;
 	}
@@ -28,15 +28,15 @@ class System {
 
 	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'];
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
+			return \App::$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'];
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
+			return \App::$config['system']['site_icon_url'];
 		return z_root() . '/images/hz-32.png';
 	}
 
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index fde443e6f..720940953 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -243,7 +243,7 @@ class Browser extends DAV\Browser\Plugin {
 			));
 
 		$a = get_app();
-		$a->page['content'] = $html;
+		\App::$page['content'] = $html;
 		load_pdl($a);
 
 		$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index e38d76914..0347ce087 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -53,7 +53,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 		logger('directory ' . $ext_path, LOGGER_DATA);
 		$this->ext_path = $ext_path;
 		// remove "/cloud" from the beginning of the path
-		$modulename = get_app()->module; 
+		$modulename = \App::$module; 
 		$this->red_path = ((strpos($ext_path, '/' . $modulename) === 0) ? substr($ext_path, strlen($modulename) + 1) : $ext_path);
 		if (! $this->red_path) {
 			$this->red_path = '/';
@@ -114,7 +114,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
-		$modulename = get_app()->module;
+		$modulename = \App::$module;
 		if ($this->red_path === '/' && $name === $modulename) {
 			return new Directory('/' . $modulename, $this->auth);
 		}
@@ -332,7 +332,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 
 			require_once('include/photos.php');
 			$args = array( 'resource_id' => $hash, 'album' => $album, 'os_path' => $f, 'filename' => $name, 'getimagesize' => $x, 'directory' => $direct);
-			$p = photo_upload($c[0],get_app()->get_observer(),$args);
+			$p = photo_upload($c[0],\App::get_observer(),$args);
 		}
 
 	}
@@ -393,7 +393,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 	public function childExists($name) {
 		// On /cloud we show a list of available channels.
 		// @todo what happens if no channels are available?
-		$modulename = get_app()->module;
+		$modulename = \App::$module;
 		if ($this->red_path === '/' && $name === $modulename) {
 			//logger('We are at ' $modulename . ' show a channel list', LOGGER_DEBUG);
 			return true;
@@ -417,7 +417,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 
 		logger('GetDir: ' . $this->ext_path, LOGGER_DEBUG);
 		$this->auth->log();
-		$modulename = get_app()->module;
+		$modulename = \App::$module;
 
 		$file = $this->ext_path;
 
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 2a2a8b938..a4bf3f49d 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -173,7 +173,7 @@ class File extends DAV\Node implements DAV\IFile {
 		if($is_photo) {
 			require_once('include/photos.php');
 			$args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_path' => $f, 'filename' => $r[0]['filename'], 'getimagesize' => $gis, 'directory' => $direct );
-			$p = photo_upload($c[0],get_app()->get_observer(),$args);
+			$p = photo_upload($c[0],\App::get_observer(),$args);
 		}
 
 		// update the folder's lastmodified timestamp
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index 900ac1e26..e2e920f39 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -9,9 +9,9 @@ class Router {
 
 		/**
 		 *
-		 * We have already parsed the server path into $a->argc and $a->argv
+		 * We have already parsed the server path into App::$argc and App::$argv
 		 *
-		 * $a->argv[0] is our module name. We will load the file mod/{$a->argv[0]}.php
+		 * App::$argv[0] is our module name. We will load the file mod/{App::$argv[0]}.php
 		 * and use it for handling our URL request.
 		 * The module file contains a few functions that we call in various circumstances
 		 * and in the following order:
@@ -25,7 +25,9 @@ class Router {
 		 * further processing.
 		 */
 
-		if(strlen($a->module)) {
+		$module = \App::$module;
+
+		if(strlen($module)) {
 
 			/**
 			 *
@@ -34,14 +36,14 @@ class Router {
 			 *
 			 */
 
-			if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
-				include_once("addon/{$a->module}/{$a->module}.php");
-				if(function_exists($a->module . '_module'))
-					$a->module_loaded = true;
+			if(is_array(\App::$plugins) && in_array(\App::$module,\App::$plugins) && file_exists("addon/{$module}/{\$module}.php")) {
+				include_once("addon/{$module}/{$module}.php");
+				if(function_exists($module . '_module'))
+					\App::$module_loaded = true;
 			}
 
-			if((strpos($a->module,'admin') === 0) && (! is_site_admin())) {
-				$a->module_loaded = false;
+			if((strpos($module,'admin') === 0) && (! is_site_admin())) {
+				\App::$module_loaded = false;
 				notice( t('Permission denied.') . EOL);
 				goaway(z_root());
 			}
@@ -51,17 +53,19 @@ class Router {
 			 * Otherwise, look for the standard program module in the 'mod' directory
 			 */
 
-			if(! $a->module_loaded) {
-				if(file_exists("mod/site/{$a->module}.php")) {
-					include_once("mod/site/{$a->module}.php");
-					$a->module_loaded = true;
+			if(! (\App::$module_loaded)) {
+				if(file_exists("mod/site/{$module}.php")) {
+					include_once("mod/site/{$module}.php");
+					\App::$module_loaded = true;
 				}
-				elseif(file_exists("mod/{$a->module}.php")) {
-					include_once("mod/{$a->module}.php");
-					$a->module_loaded = true;
+				elseif(file_exists("mod/{$module}.php")) {
+					include_once("mod/{$module}.php");
+					\App::$module_loaded = true;
 				}
+				else logger("mod/{$module}.php not found.");
 			}
 
+
 			/**
 			 * This provides a place for plugins to register module handlers which don't otherwise exist on the system.
 			 * If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
@@ -69,10 +73,10 @@ class Router {
 			 * The plugin should catch at least one of the module hooks for this URL. 
 			 */
 
-			$x = array('module' => $a->module, 'installed' => false);
+			$x = array('module' => $module, 'installed' => false);
 			call_hooks('module_loaded', $x);
 			if($x['installed'])
-				$a->module_loaded = true;
+				\App::$module_loaded = true;
 
 			/**
 			 * The URL provided does not resolve to a valid module.
@@ -85,14 +89,14 @@ class Router {
 			 * Otherwise we are going to emit a 404 not found.
 	 		 */
 
-			if(! $a->module_loaded) {
+			if(! (\App::$module_loaded)) {
 
 				// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
 				if((x($_SERVER, 'QUERY_STRING')) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
 					killme();
 				}
 
-				if((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && $a->config['system']['dreamhost_error_hack']) {
+				if((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && \App::$config['system']['dreamhost_error_hack']) {
 					logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
 					goaway(z_root() . $_SERVER['REQUEST_URI']);
 				}
@@ -100,13 +104,13 @@ class Router {
 				logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
 				header($_SERVER['SERVER_PROTOCOL'] . ' 404 ' . t('Not Found'));
 				$tpl = get_markup_template('404.tpl');
-				$a->page['content'] = replace_macros($tpl, array(
+				\App::$page['content'] = replace_macros($tpl, array(
 						'$message' => t('Page not found.')
 				));
 
 				// pretend this is a module so it will initialise the theme
-				$a->module = '404';
-				$a->module_loaded = true;
+				\App::$module = '404';
+				\App::$module_loaded = true;
 			}
 		}
 	}
@@ -118,8 +122,8 @@ class Router {
 		 * Call module functions
 		 */
 
-		if($a->module_loaded) {
-			$a->page['page_title'] = $a->module;
+		if(\App::$module_loaded) {
+			\App::$page['page_title'] = \App::$module;
 			$placeholder = '';
 
 			/**
@@ -129,11 +133,11 @@ class Router {
 			 * to over-ride them.
 			 */
 
-			if(function_exists($a->module . '_init')) {
+			if(function_exists(\App::$module . '_init')) {
 				$arr = array('init' => true, 'replace' => false);		
-				call_hooks($a->module . '_mod_init', $arr);
+				call_hooks(\App::$module . '_mod_init', $arr);
 				if(! $arr['replace']) {
-					$func = $a->module . '_init';
+					$func = \App::$module . '_init';
 					$func($a);
 				}
 			}
@@ -167,32 +171,32 @@ class Router {
 				$func = str_replace('-', '_', current_theme()) . '_init';
 				$func($a);
 			}
-			elseif (x($a->theme_info, 'extends') && file_exists('view/theme/' . $a->theme_info['extends'] . '/php/theme.php')) {
-				require_once('view/theme/' . $a->theme_info['extends'] . '/php/theme.php');
-				if(function_exists(str_replace('-', '_', $a->theme_info['extends']) . '_init')) {
-					$func = str_replace('-', '_', $a->theme_info['extends']) . '_init';
+			elseif (x(\App::$theme_info, 'extends') && file_exists('view/theme/' . \App::$theme_info['extends'] . '/php/theme.php')) {
+				require_once('view/theme/' . \App::$theme_info['extends'] . '/php/theme.php');
+				if(function_exists(str_replace('-', '_', \App::$theme_info['extends']) . '_init')) {
+					$func = str_replace('-', '_', \App::$theme_info['extends']) . '_init';
 					$func($a);
 				}
 			}
 
-			if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
-				&& (function_exists($a->module . '_post'))
+			if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! \App::$error)
+				&& (function_exists(\App::$module . '_post'))
 				&& (! x($_POST, 'auth-params'))) {		
-				call_hooks($a->module . '_mod_post', $_POST);
-				$func = $a->module . '_post';
+				call_hooks(\App::$module . '_mod_post', $_POST);
+				$func = \App::$module . '_post';
 				$func($a);
 			}
 
-			if((! $a->error) && (function_exists($a->module . '_content'))) {
-				$arr = array('content' => $a->page['content'], 'replace' => false);
-				call_hooks($a->module . '_mod_content', $arr);
-				$a->page['content'] = $arr['content'];
+			if((! \App::$error) && (function_exists(\App::$module . '_content'))) {
+				$arr = array('content' => \App::$page['content'], 'replace' => false);
+				call_hooks(\App::$module . '_mod_content', $arr);
+				\App::$page['content'] = $arr['content'];
 				if(! $arr['replace']) {
-					$func = $a->module . '_content';
+					$func = \App::$module . '_content';
 					$arr = array('content' => $func($a));
 				}
-				call_hooks($a->module . '_mod_aftercontent', $arr);
-				$a->page['content'] .= $arr['content'];
+				call_hooks(\App::$module . '_mod_aftercontent', $arr);
+				\App::$page['content'] .= $arr['content'];
 			}
 		}
 	}
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php
index fed253923..f764172fa 100644
--- a/Zotlabs/Zot/Auth.php
+++ b/Zotlabs/Zot/Auth.php
@@ -132,7 +132,7 @@ class Auth {
 			// tell them to logout if they're logged in locally as anything but the target remote account
 			// in which case just shut up because they don't need to be doing this at all.
 
-			if (get_app()->channel['channel_hash'] == $hubloc['xchan_hash']) {
+			if (\App::$channel['channel_hash'] == $hubloc['xchan_hash']) {
 				return true;
 			}
 			else {
@@ -242,9 +242,9 @@ class Auth {
 
 		$arr = array('xchan' => $hubloc, 'url' => $this->desturl, 'session' => $_SESSION);
 		call_hooks('magic_auth_success',$arr);
-		get_app()->set_observer($hubloc);
+		\App::set_observer($hubloc);
 		require_once('include/security.php');
-		get_app()->set_groups(init_groups_visitor($_SESSION['visitor_id']));
+		\App::set_groups(init_groups_visitor($_SESSION['visitor_id']));
 		info(sprintf( t('Welcome %s. Remote authentication successful.'),$hubloc['xchan_name']));
 		logger('mod_zot: auth success from ' . $hubloc['xchan_addr']);
 		$this->success = true;
@@ -341,5 +341,5 @@ class Auth {
  * Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is 
  * a string whose contents are not defined by protocol. Example: "basic" or "gold".
  *
- * @param[in,out] App &$a
+ * @param[in,out] \App &$a
  */