From e4859d4bd70b1649e7ebe4cbb285a0993a837f85 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Thu, 13 Nov 2014 22:40:06 +0100 Subject: 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. --- boot.php | 43 ++++++++++++++++++++++++------------------- 1 file 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 $class 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']); } } -- cgit v1.2.3 From e8b77fbdff6cfd9455db378b5edb00fece74fea2 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Fri, 14 Nov 2014 00:45:25 +0100 Subject: Fixed a variable conflict in mod/xchan.php. A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php. --- boot.php | 2 +- mod/xchan.php | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index 0feedf7a1..55ae3cc66 100755 --- a/boot.php +++ b/boot.php @@ -950,7 +950,7 @@ class App { 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']; diff --git a/mod/xchan.php b/mod/xchan.php index 714603f6e..69fbdb77d 100644 --- a/mod/xchan.php +++ b/mod/xchan.php @@ -3,16 +3,15 @@ function xchan_content(&$a) { - - $o .= '

Xchan Lookup

'; + $o = '

' . t('Xchan Lookup') . '

'; $o .= '
'; - $o .= 'Lookup xchan beginning with (or webbie): '; - $o .= '
'; - - $o .= '

'; + $o .= t('Lookup xchan beginning with (or webbie): '); + $o .= ''; + $o .= ''; + $o .= '

'; - if(x($_GET,'addr')) { + if(x($_GET, 'addr')) { $addr = trim($_GET['addr']); $r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", @@ -22,15 +21,15 @@ function xchan_content(&$a) { if($r) { foreach($r as $rr) { - $o .= str_replace(array("\n"," "),array("
"," "),print_r($rr,true)) . EOL; + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rr, true)) . EOL; $s = q("select * from hubloc where hubloc_hash like '%s'", dbesc($r[0]['xchan_hash']) ); if($s) { - foreach($s as $rr) - $o .= str_replace(array("\n"," "),array("
"," "),print_r($rr,true)) . EOL; + foreach($s as $rrr) + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rrr, true)) . EOL; } } } -- cgit v1.2.3