Merge remote-tracking branch 'upstream/master'

1 files changed, 26 insertions, 20 deletions

diff --git a/boot.php b/boot.php
index e19a3d5ec..569162221 100755
--- a/boot.php
+++ b/boot.php
@@ -76,7 +76,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://redmatrix.nl', 
 	'https://whogotzot.com', 
 	'https://red.zottel.red',
-    'https://red.pixelbits.de'
+	'https://red.pixelbits.de'
 );
 
 
@@ -567,7 +567,8 @@ define ( 'ITEM_VERIFIED',        0x2000);  // Signature verification was success
 define ( 'ITEM_RETAINED',        0x4000);  // We looked at this item once to decide whether or not to expire it, and decided not to.
 define ( 'ITEM_RSS',             0x8000);  // Item comes from a feed. Use this to decide whether to link the title
 										   // Don't make us evaluate this same item again.
-define ( 'DBTYPE_MYSQL', 0 );
+
+define ( 'DBTYPE_MYSQL',    0 );
 define ( 'DBTYPE_POSTGRES', 1 );
 										   
 /**
@@ -637,7 +638,7 @@ class App {
 
 	private $perms      = null;            // observer permissions
 	private $widgets    = array();         // widgets for this page
-	private $widgetlist = null;            // widget ordering and inclusion directives
+	//private $widgetlist = null;            // widget ordering and inclusion directives
 
 	public  $groups;
 	public  $language;
@@ -714,13 +715,6 @@ class App {
 	private $hostname;
 	private $baseurl;
 	private $path;
-	private $db;
-
-	private $curl_code;
-	private $curl_headers;
-
-	private $cached_profile_image;
-	private $cached_profile_picdate;
 
 
 	function __construct() {
@@ -849,12 +843,14 @@ class App {
 			&& array_key_exists('baseurl',$this->config['system'])
 			&& strlen($this->config['system']['baseurl'])) {
 			$url = $this->config['system']['baseurl'];
+
 			return $url;
 		}
 
 		$scheme = $this->scheme;
 
 		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+
 		return $this->baseurl;
 	}
 
@@ -881,7 +877,6 @@ class App {
 			if(x($parsed,'path'))
 				$this->path = trim($parsed['path'],'\\/');
 		}
-
 	}
 
 	function get_hostname() {
@@ -955,9 +950,10 @@ class App {
 	function get_widgets($location = '') {
 		if($location && count($this->widgets)) {
 			$ret = array();
-			foreach($widgets as $w)
-				if($w['location'] == $location)
+			foreach($this->widgets as $w) {
+				if ($w['location'] == $location)
 					$ret[] = $w;
+			}
 			$arr = array('location' => $location, 'widgets' => $ret);
 			call_hooks('get_widgets', $arr);
 			return $arr['widgets'];
@@ -1009,7 +1005,6 @@ class App {
 
 		// always put main.js at the end
 		$this->page['htmlhead'] .= head_get_main_js();
-
 	}
 
 	/**
@@ -1019,11 +1014,11 @@ class App {
 	* @param string $name
 	*/
 	function register_template_engine($class, $name = '') {
-		if ($name===""){
+		if ($name === ""){
 			$v = get_class_vars( $class );
-			if(x($v,"name")) $name = $v['name'];
+			if(x($v, "name")) $name = $v['name'];
 		}
-		if ($name===""){
+		if ($name === ""){
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
 			killme();
 		}
@@ -1034,11 +1029,11 @@ class App {
 	* return template engine instance. If $name is not defined,
 	* return engine defined by theme, or default
 	*
-	* @param strin $name Template engine name
+	* @param string $name Template engine name
 	* @return object Template Engine instance
 	*/
 	function template_engine($name = ''){
-		if ($name!=="") {
+		if ($name !== "") {
 			$template_engine = $name;
 		} else {
 			$template_engine = 'smarty3';
@@ -1888,6 +1883,17 @@ function curPageURL() {
 	return $pageURL;
 }
 
+/**
+ * @brief Returns a custom navigation by name???
+ *
+ * If no $navname provided load default page['nav']
+ *
+ * @todo not fully implemented yet
+ *
+ * @param App $a global application object
+ * @param string $navname
+ * @return mixed
+ */
 function get_custom_nav(&$a, $navname) {
 	if(! $navname)
 		return $a->page['nav'];
@@ -1942,7 +1948,7 @@ function construct_page(&$a) {
 
 	if($comanche) {
 		if($a->layout['nav']) {
-			$a->page['nav'] = get_custom_nav($a->layout['nav']);
+			$a->page['nav'] = get_custom_nav($a, $a->layout['nav']);
 		}
 	}