From b139e5bb0054b97beff22bae65f145bc29874e08 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 25 Mar 2024 12:26:06 +0100 Subject: Fix smarty deprecation warning in category widget. --- view/tpl/categories_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index fd27dca44..a7be796d6 100644 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -5,7 +5,7 @@ -- cgit v1.2.3 From 01c6fd03b7e82d89967b4e348b75d90310375de9 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 14:15:28 +0000 Subject: fix typo after get_config -> Confi::Get conversion --- Zotlabs/Storage/Directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index b62f268d3..a68fdcf26 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -3,7 +3,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; -use Zotlabz\Lib\Config; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; /** -- cgit v1.2.3 From 842df8a7991688ccb0770dcca0119acf728e1c8b Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 16:09:53 +0000 Subject: add the observer hash to the cache key in categories_widget() --- Zotlabs/Daemon/Cache_query.php | 5 ++++- include/contact_widgets.php | 7 +++++-- include/taxonomy.php | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php index 8e5c6b2ea..d5788795f 100644 --- a/Zotlabs/Daemon/Cache_query.php +++ b/Zotlabs/Daemon/Cache_query.php @@ -12,6 +12,7 @@ class Cache_query { if(! $argc == 3) return; + $r = null; $key = $argv[1]; $pid = Config::Get('procid', $key, false); @@ -29,8 +30,10 @@ class Cache_query { $arr = json_decode(base64_decode($argv[0]), true); $r = call_user_func_array('q', $arr); - if($r) + + if(is_array($r)) { Cache::set($key, serialize($r)); + } Config::Delete('procid', $key); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 43aae4b25..3589653c1 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,6 +2,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function findpeople_widget() { @@ -71,7 +72,9 @@ function categories_widget($baseurl,$selected = '') { $item_normal = item_normal(); - $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; + $observer = get_observer_hash(); + + $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); if (! $content) { @@ -97,7 +100,7 @@ function categories_widget($baseurl,$selected = '') { dbesc(ACTIVITY_UPDATE) ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } if (!$content) { diff --git a/include/taxonomy.php b/include/taxonomy.php index 49b364154..45287fa63 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -7,6 +7,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function file_tag_encode($s) { @@ -358,7 +359,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { } } - $key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type); + $key = __FUNCTION__ . '_' . md5($site . $recent . $safemode . $limit . $type); $content = Cache::get($key, '5 MINUTE'); if(! $content) { @@ -378,7 +379,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { (intval($count) ? "LIMIT $count" : '') ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } $r = unserialize($content); -- cgit v1.2.3 From 637f39f2828a70bc053e8c0f8f2253dc04ae358c Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 17:15:05 +0000 Subject: tilt the piin --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 30b9ba64c..56194c735 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -996,6 +996,10 @@ img.mail-conv-sender-photo { margin-top: 2em; } +.wall-item-pinned i { + transform: rotate(45deg); +} + .wall-item-content-wrapper { background-color: var(--bs-tertiary-bg); } -- cgit v1.2.3 From 9ecd38911e6094e2867d490e2da5f65ecedf0370 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 17:31:53 +0000 Subject: add observer to the permissions query. this should not be necessary but it makes it clear why it should be included in the cache key (cherry picked from commit 57e32a79125072d27ebc76ca26acac64db5cb4fc) --- include/contact_widgets.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3589653c1..84f688d36 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -68,12 +68,11 @@ function categories_widget($baseurl,$selected = '') { require_once('include/security.php'); - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + $observer = get_observer_hash(); + $sql_extra = item_permissions_sql(App::$profile['profile_uid'], $observer); $item_normal = item_normal(); - $observer = get_observer_hash(); - $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); -- cgit v1.2.3 From c052b7fa9982e82fa25fe0e84ee3462da30ac157 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 19:47:17 +0000 Subject: allow to run additional site specific commands at the end of util/udall --- util/udall | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/udall b/util/udall index 44f37e86e..50ef56bfe 100755 --- a/util/udall +++ b/util/udall @@ -5,7 +5,7 @@ if [ ! -d .git ]; then fi git pull -if [ -d extend ] ; then +if [ -d extend ]; then for a in theme addon widget ; do if [ -d extend/$a ]; then for b in `ls extend/$a` ; do @@ -15,3 +15,8 @@ if [ -d extend ] ; then fi done fi + +# Allow to run additional site specific commands +if [ -f util/udall_extra ]; then + source util/udall_extra +fi -- cgit v1.2.3