aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-11-13 22:40:06 +0100
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-11-13 22:40:06 +0100
commite4859d4bd70b1649e7ebe4cbb285a0993a837f85 (patch)
tree914a15e056dd7740a165d87017275fe14182a69a
parent109cb936632c693d3f24afb9e2ce533797ad1a7f (diff)
downloadvolse-hubzilla-e4859d4bd70b1649e7ebe4cbb285a0993a837f85.tar.gz
volse-hubzilla-e4859d4bd70b1649e7ebe4cbb285a0993a837f85.tar.bz2
volse-hubzilla-e4859d4bd70b1649e7ebe4cbb285a0993a837f85.zip
Changed two strange looking places in boot.php.
There have been two places that looked wrong, but I don't know how I can test them. So please review and test if I am not wrong.
-rwxr-xr-xboot.php43
1 files changed, 24 insertions, 19 deletions
diff --git a/boot.php b/boot.php
index d883dcc28..0feedf7a1 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'
);
@@ -635,7 +635,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;
@@ -712,13 +712,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() {
@@ -847,12 +840,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;
}
@@ -879,7 +874,6 @@ class App {
if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/');
}
-
}
function get_hostname() {
@@ -953,9 +947,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'];
@@ -1007,7 +1002,6 @@ class App {
// always put main.js at the end
$this->page['htmlhead'] .= head_get_main_js();
-
}
/**
@@ -1017,11 +1011,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();
}
@@ -1032,11 +1026,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';
@@ -1886,6 +1880,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'];
@@ -1940,7 +1945,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']);
}
}