From 9e2bdb012eaff23b90ddd08f65ee581f46ff4a9b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 9 Jul 2021 12:02:50 +0200 Subject: fix release date --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 69bc63be5..fde7d849c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Hubzilla 6.0 (2021-07-xx) +Hubzilla 6.0 (2021-07-09) - Implement swipe to right for bringing in left aside - DB update 1247 to clean up bogus entries in updates - DB update 1246 to mark legacy zot xchans and hublocs deleted -- cgit v1.2.3 From f5669c993545ab93e97e55e9f0ea1b2dcffe3573 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 15 Jul 2021 12:07:54 +0200 Subject: chanview: dismiss xchans which are marked deleted --- Zotlabs/Module/Chanview.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php index afeb2aacf..fc1146023 100644 --- a/Zotlabs/Module/Chanview.php +++ b/Zotlabs/Module/Chanview.php @@ -17,19 +17,19 @@ class Chanview extends \Zotlabs\Web\Controller { $r = null; if($_REQUEST['hash']) { - $r = q("select * from xchan where xchan_hash = '%s'", + $r = q("select * from xchan where xchan_hash = '%s' and xchan_deleted = 0", dbesc($_REQUEST['hash']) ); } if($_REQUEST['address']) { - $r = q("select * from xchan where xchan_addr = '%s'", + $r = q("select * from xchan where xchan_addr = '%s' and xchan_deleted = 0", dbesc(punify($_REQUEST['address'])) ); } elseif(local_channel() && intval($_REQUEST['cid'])) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d and abook_id = %d", + WHERE abook_channel = %d and abook_id = %d and xchan_deleted = 0", intval(local_channel()), intval($_REQUEST['cid']) ); @@ -39,7 +39,7 @@ class Chanview extends \Zotlabs\Web\Controller { // if somebody re-installed they will have more than one xchan, use the most recent name date as this is // the most useful consistently ascending table item we have. - $r = q("select * from xchan where xchan_url = '%s' order by xchan_name_date desc", + $r = q("select * from xchan where xchan_url = '%s' and xchan_deleted = 0 order by xchan_name_date desc", dbesc($_REQUEST['url']) ); } @@ -71,7 +71,7 @@ class Chanview extends \Zotlabs\Web\Controller { if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $_REQUEST['url'] && intval($zf['signature']['header_valid'])) { Libzot::import_xchan($zf['data']); - $r = q("select * from xchan where xchan_url = '%s'", + $r = q("select * from xchan where xchan_url = '%s' and xchan_deleted = 0", dbesc($_REQUEST['url']) ); if($r) { @@ -80,7 +80,7 @@ class Chanview extends \Zotlabs\Web\Controller { } if(! $r) { if(discover_by_webbie($_REQUEST['url'])) { - $r = q("select * from xchan where xchan_url = '%s'", + $r = q("select * from xchan where xchan_url = '%s' and xchan_deleted = 0", dbesc($_REQUEST['url']) ); if($r) { -- cgit v1.2.3 From c68f2bc2d16c3c9fd351eba1d61914683cd89c8a Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Fri, 16 Jul 2021 11:12:32 +0200 Subject: Fix link to source on clones --- Zotlabs/Module/Item.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 518352667..8c9bf2708 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -280,9 +280,10 @@ class Item extends Controller { if(argc() > 1 && argv(1) !== 'drop') { - $x = q("select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' ", + $x = q("select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' or uuid = '%s'", dbesc(z_root() . '/item/' . argv(1)), - dbesc(z_root() . '/activity/' . argv(1)) + dbesc(z_root() . '/activity/' . argv(1)), + dbesc(argv(1)) ); if($x) { foreach($x as $xv) { -- cgit v1.2.3 From 62606bf006c83c7a7ad44121feebedd81cd43a79 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 16 Jul 2021 11:42:54 +0200 Subject: photo upload: always show the textarea so that text and tags can be added even if no status post is sent --- view/js/mod_photos.js | 13 ------------- view/tpl/photos_upload.tpl | 9 +++------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index 41b8ed560..1ce410a1b 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -8,24 +8,11 @@ $(document).ready(function() { UploadInit(); } - //$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) { - //$("#photo-edit-newtag").val('@' + data.name); - //}); - $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); $('textarea').editor_autocomplete(baseurl+"/acl"); $('textarea').bbco_autocomplete('bbcode'); - showHideBodyTextarea(); - }); -function showHideBodyTextarea() { - if( $('#id_visible').is(':checked')) - $('#body-textarea').slideDown(); - else - $('#body-textarea').slideUp(); -} - // initialize function UploadInit() { diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index ea173049b..0565a0a35 100644 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -20,10 +20,8 @@ {{include file="field_input.tpl" field=$caption}} - {{include file="field_checkbox.tpl" field=$visible}} -
{{include file="field_textarea.tpl" field=$body}} -
+ {{include file="field_checkbox.tpl" field=$visible}}
{{if $lockstate}} @@ -40,10 +38,9 @@ {{if $uploader}} {{include file="field_input.tpl" field=$caption}} - {{include file="field_checkbox.tpl" field=$visible}} -
{{include file="field_textarea.tpl" field=$body}} -
+ {{include file="field_checkbox.tpl" field=$visible}} +
{{if $lockstate}}