From e7f6cd2cfa2995de8dc3d3dbc145922de8c67747 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Sat, 23 Dec 2017 10:58:51 -0500 Subject: fix dupe bug in content hooks --- Zotlabs/Web/Router.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 12ef315d4..b1bc9655c 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -263,21 +263,21 @@ class Router { } if(! \App::$error) { - $arr = array('content' => \App::$page['content'], 'replace' => false); - call_hooks(\App::$module . '_mod_content', $arr); - \App::$page['content'] = $arr['content']; - if(! $arr['replace']) { - if($this->controller && method_exists($this->controller,'get')) { - $arr = array('content' => $this->controller->get()); - } - elseif(function_exists(\App::$module . '_content')) { - $func = \App::$module . '_content'; - $arr = array('content' => $func($a)); - } - } - call_hooks(\App::$module . '_mod_aftercontent', $arr); - \App::$page['content'] .= $arr['content']; + $arr = array('content' => \App::$page['content'], 'replace' => false); + call_hooks(\App::$module . '_mod_content', $arr); + + if(! $arr['replace']) { + if($this->controller && method_exists($this->controller,'get')) { + $arr = array('content' => $this->controller->get()); + } + elseif(function_exists(\App::$module . '_content')) { + $func = \App::$module . '_content'; + $arr = array('content' => $func($a)); + } + } + call_hooks(\App::$module . '_mod_aftercontent', $arr); + \App::$page['content'] = (($arr['replace']) ? $arr['content'] : \App::$page['content'] . $arr['content']); } } } -} \ No newline at end of file +} -- cgit v1.2.3 From ef952a41b3af7af60c4c3329428c9503c2f39333 Mon Sep 17 00:00:00 2001 From: Matthew Dent Date: Sat, 23 Dec 2017 11:09:37 -0500 Subject: Fix whitespace formatting --- Zotlabs/Web/Router.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index b1bc9655c..a6b780cdc 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -263,20 +263,20 @@ class Router { } if(! \App::$error) { - $arr = array('content' => \App::$page['content'], 'replace' => false); - call_hooks(\App::$module . '_mod_content', $arr); - - if(! $arr['replace']) { - if($this->controller && method_exists($this->controller,'get')) { - $arr = array('content' => $this->controller->get()); - } - elseif(function_exists(\App::$module . '_content')) { - $func = \App::$module . '_content'; - $arr = array('content' => $func($a)); - } - } - call_hooks(\App::$module . '_mod_aftercontent', $arr); - \App::$page['content'] = (($arr['replace']) ? $arr['content'] : \App::$page['content'] . $arr['content']); + $arr = array('content' => \App::$page['content'], 'replace' => false); + call_hooks(\App::$module . '_mod_content', $arr); + + if(! $arr['replace']) { + if($this->controller && method_exists($this->controller,'get')) { + $arr = array('content' => $this->controller->get()); + } + elseif(function_exists(\App::$module . '_content')) { + $func = \App::$module . '_content'; + $arr = array('content' => $func($a)); + } + } + call_hooks(\App::$module . '_mod_aftercontent', $arr); + \App::$page['content'] = (($arr['replace']) ? $arr['content'] : \App::$page['content'] . $arr['content']); } } } -- cgit v1.2.3 From 98fd3118911313c3f365cc535e9357cd92268534 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 7 Jan 2018 19:14:19 +0100 Subject: start with nonactive state for the notifications button and display some text if there are no notifications on small screens only --- Zotlabs/Widget/Notifications.php | 1 + 1 file changed, 1 insertion(+) (limited to 'Zotlabs') diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index a677d84c9..5a0c1f3d5 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -144,6 +144,7 @@ class Notifications { $o = replace_macros(get_markup_template('notifications_widget.tpl'), array( '$module' => \App::$module, '$notifications' => $notifications, + '$no_notifications' => t('Sorry, you have got no notifications at the moment'), '$loading' => t('Loading') )); -- cgit v1.2.3 From 0600817ef75d19d1ec91ba822f8a6938d442824e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 8 Jan 2018 11:11:17 +0100 Subject: fix regression in app categories --- Zotlabs/Module/Apps.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 2f61f2932..c672ea467 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -22,7 +22,8 @@ class Apps extends \Zotlabs\Web\Controller { if(local_channel()) { Zlib\Apps::import_system_apps(); $syslist = array(); - $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $_GET['cat']); + $cat = ((array_key_exists('cat',$_GET) && $_GET['cat']) ? [ escape_tags($_GET['cat']) ] : ''); + $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $cat); if($list) { foreach($list as $x) { $syslist[] = Zlib\Apps::app_encode($x); @@ -43,7 +44,7 @@ class Apps extends \Zotlabs\Web\Controller { return replace_macros(get_markup_template('myapps.tpl'), array( '$sitename' => get_config('system','sitename'), - '$cat' => ((array_key_exists('cat',$_GET) && $_GET['cat']) ? escape_tags($_GET['cat']) : ''), + '$cat' => $cat, '$title' => t('Apps'), '$apps' => $apps, '$authed' => ((local_channel()) ? true : false), -- cgit v1.2.3