X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=01d8eb2a1333b3670eba575961df4338d9b6952f;hb=2270e73fcd231013929d5f9e7475fc8b0d872149;hp=685a76a13185e26baf02960e43bf2e4a17896776;hpb=a598f17e6d95d8a82df2994d61bfab74271dfe58;p=friendica.git

diff --git a/index.php b/index.php
index 685a76a131..01d8eb2a13 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-
+error_reporting(E_ERROR | E_WARNING | E_PARSE);
 /**
  *
  * Friendika
@@ -19,11 +19,11 @@ $a = new App;
 /**
  *
  * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist, we are running in installation mode.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.
  *
  */
 
-$install = ((file_exists('.htconfig.php')) ? false : true);
+$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
 
 @include(".htconfig.php");
 
@@ -113,6 +113,13 @@ else
 	check_config($a);
 
 
+$arr = array('app_menu' => $a->apps);
+
+call_hooks('app_menu', $arr);
+
+$a->apps = $arr['app_menu'];
+
+
 /**
  *
  * We have already parsed the server path into $->argc and $a->argv
@@ -132,13 +139,17 @@ else
  * further processing.
  */
 
-
 if(strlen($a->module)) {
-	if(file_exists("mod/{$a->module}.php")) {
+	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((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
 		include("mod/{$a->module}.php");
 		$a->module_loaded = true;
 	}
-	else {
+	if(! $a->module_loaded) {
 		if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
 			logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
 			goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
@@ -150,6 +161,8 @@ if(strlen($a->module)) {
 	}
 }
 
+
+
 /* initialise content region */
 
 if(! x($a->page,'content'))
@@ -234,25 +247,16 @@ $a->page['content'] .=  '<div id="pause"></div>';
  *
  */
 
-if($a->module != 'install')
+if($a->module != 'install') {
 	require_once('nav.php');
+	nav($a);
+}
 
 /**
- *
  * Build the page - now that we have all the components
- * Make sure the desired theme exists, though if the default theme doesn't exist we're stuffed.
- *
  */
 
-$default_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : 'default');
-if((x($_SESSION,'theme')) && (! file_exists('view/theme/' . $_SESSION['theme'] . '/style.css')))
-	unset($_SESSION['theme']);
-
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
-	'$stylesheet' => $a->get_baseurl() . '/view/theme/'
-		. ((x($_SESSION,'theme')) ? $_SESSION['theme'] : $default_theme)
-		. '/style.css'
-	));
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url()));
 
 $page    = $a->page;
 $profile = $a->profile;