From dab3e9035363a1173439fb16c6e06eede62b573e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Apr 2017 13:26:50 -0700 Subject: provide a broken feed as a separate module --- Zotlabs/Module/Ofeed.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++ Zotlabs/Module/Wfinger.php | 2 +- Zotlabs/Module/Xrd.php | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Zotlabs/Module/Ofeed.php diff --git a/Zotlabs/Module/Ofeed.php b/Zotlabs/Module/Ofeed.php new file mode 100644 index 000000000..2b7acff99 --- /dev/null +++ b/Zotlabs/Module/Ofeed.php @@ -0,0 +1,48 @@ + 1) { + + if(observer_prohibited(true)) { + killme(); + } + + $channel = channelx_by_nick(argv(1)); + if(! $channel) { + killme(); + } + + + logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']); + + echo get_public_feed($channel,$params); + + killme(); + } + + } + +} diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 118ec5e7c..9623a676b 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -107,7 +107,7 @@ class Wfinger extends \Zotlabs\Web\Controller { [ 'rel' => 'http://schemas.google.com/g/2010#updates-from', 'type' => 'application/atom+xml', - 'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1' + 'href' => z_root() . '/ofeed/' . $r[0]['channel_address'] ], [ diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php index 7fd81e490..7b36576e0 100644 --- a/Zotlabs/Module/Xrd.php +++ b/Zotlabs/Module/Xrd.php @@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller { '$aliases' => $aliases, '$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'], '$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'], - '$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1', + '$atom' => z_root() . '/ofeed/' . $r[0]['channel_address'], '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'], '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'], -- cgit v1.2.3 From 2778e63d6c51b5ca77d9a309ddb7390b239fa491 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Apr 2017 19:47:05 -0700 Subject: issues from hubzilla:#737 --- Zotlabs/Lib/DB_Upgrade.php | 2 +- Zotlabs/Lib/NativeWiki.php | 4 ++-- Zotlabs/Lib/NativeWikiPage.php | 15 +++++++++++++-- install/update.php | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php index 55c69bcca..bb72e7a05 100644 --- a/Zotlabs/Lib/DB_Upgrade.php +++ b/Zotlabs/Lib/DB_Upgrade.php @@ -83,7 +83,7 @@ class DB_Upgrade { file_put_contents($lockfile, $x); $r = q("select account_language from account where account_email = '%s' limit 1", - dbesc(App::$config['system']['admin_email']) + dbesc(\App::$config['system']['admin_email']) ); push_lang(($r) ? $r[0]['account_language'] : 'en'); diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 7786ec25a..4301feaa0 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -101,11 +101,11 @@ class NativeWiki { static public function sync_a_wiki_item($uid,$id,$resource_id) { - $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = %d )) ", + $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ", intval($uid), intval($id), dbesc(NWIKI_ITEM_RESOURCE_TYPE), - intval($resource_id) + dbesc($resource_id) ); if($r) { xchan_query($r); diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index bd40367c9..ed3df436c 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -21,12 +21,23 @@ class NativeWikiPage { $sql_extra = item_permissions_sql($channel_id,$observer_hash); $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0 - $sql_extra group by mid order by created asc", + $sql_extra order by created asc", dbesc($resource_id), intval($channel_id) ); if($r) { - $items = fetch_post_tags($r,true); + $x = []; + $y = []; + + foreach($r as $rv) { + if(! in_array($rv['mid'],$x)) { + $y[] = $rv; + $x[] = $rv['mid']; + } + } + + $items = fetch_post_tags($y,true); + foreach($items as $page_item) { $title = get_iconfig($page_item['id'],'nwikipage','pagetitle',t('(No Title)')); if(urldecode($title) !== 'Home') { diff --git a/install/update.php b/install/update.php index 84f1a799c..ce65d1db9 100644 --- a/install/update.php +++ b/install/update.php @@ -2512,8 +2512,8 @@ function update_r1187() { function update_r1188() { - $r1 = q("alter table channel add channel_password varchar(255) not null "); - $r2 = q("alter table channel add channel_salt varchar(255) not null "); + $r1 = q("alter table channel add channel_password varchar(255) not null default '' "); + $r2 = q("alter table channel add channel_salt varchar(255) not null default '' "); if($r1 && $r2) return UPDATE_SUCCESS; -- cgit v1.2.3 From ab32372f8fa8bd2e831a907ce5f1232b84a8d083 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 27 Apr 2017 16:50:37 -0700 Subject: update feedutils with as:author changes, also update tests --- include/feedutils.php | 24 ++++++++++++++++-------- tests/unit/includes/FeedutilsText.php | 9 ++++++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/include/feedutils.php b/include/feedutils.php index ed3308829..06a342a3f 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -79,7 +79,7 @@ function get_feed_for($channel, $observer_hash, $params) { $feed_author = ''; if(intval($params['compat']) === 1) { - $feed_author = atom_author('author',$channel['channel_address'],$channel['xchan_url'],300,300,$channel['xchan_photo_mimetype'],$channel['xchan_photo_l']); + $feed_author = atom_author('author',$channel['channel_address'],$channel['channel_name'],$channel['xchan_url'],300,300,$channel['xchan_photo_mimetype'],$channel['xchan_photo_l']); } $atom .= replace_macros($feed_template, array( @@ -1241,11 +1241,12 @@ function handle_feed($uid, $abook_id, $url) { * @param string $photo Fully qualified URL to a profile/avator photo * @return string */ -function atom_author($tag, $name, $uri, $h, $w, $type, $photo) { +function atom_author($tag, $nick, $name, $uri, $h, $w, $type, $photo) { $o = ''; if(! $tag) return $o; + $nick = xmlify($nick); $name = xmlify($name); $uri = xmlify($uri); $h = intval($h); @@ -1254,10 +1255,12 @@ function atom_author($tag, $name, $uri, $h, $w, $type, $photo) { $o .= "<$tag>\r\n"; $o .= " $uri\r\n"; - $o .= " $name\r\n"; + $o .= " $nick\r\n"; $o .= " $uri\r\n"; $o .= ' ' . "\r\n"; $o .= ' ' . "\r\n"; + $o .= ' ' . $nick . '' . "\r\n"; + $o .= ' ' . $name . '' . "\r\n"; call_hooks('atom_author', $o); @@ -1296,12 +1299,17 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0) { $o = "\r\n\r\n\r\n"; - if(is_array($author)) - $o .= atom_author('author',$author['xchan_name'],$author['xchan_url'],80,80,$author['xchan_photo_mimetype'],$author['xchan_photo_m']); - else - $o .= atom_author('author',$item['author']['xchan_name'],$item['author']['xchan_url'],80,80,$item['author']['xchan_photo_mimetype'], $item['author']['xchan_photo_m']); + if(is_array($author)) { + $reddress = substr($author['xchan_addr'],0,strpos($author['xchan_addr'],'@')); + $o .= atom_author('author',$reddress,$author['xchan_name'],$author['xchan_url'],80,80,$author['xchan_photo_mimetype'],$author['xchan_photo_m']); + } + else { + $reddress = substr($item['author']['xchan_addr'],0,strpos($item['author']['xchan_addr'],'@')); + $o .= atom_author('author',$reddress,$item['author']['xchan_name'],$item['author']['xchan_url'],80,80,$item['author']['xchan_photo_mimetype'], $item['author']['xchan_photo_m']); + } - $o .= atom_author('zot:owner',$item['owner']['xchan_name'],$item['owner']['xchan_url'],80,80,$item['owner']['xchan_photo_mimetype'],$item['owner']['xchan_photo_m']); + $reddress = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@')); + $o .= atom_author('zot:owner',$reddress,$item['owner']['xchan_name'],$item['owner']['xchan_url'],80,80,$item['owner']['xchan_photo_mimetype'],$item['owner']['xchan_photo_m']); if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) { $parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']); diff --git a/tests/unit/includes/FeedutilsText.php b/tests/unit/includes/FeedutilsText.php index e3eaa91a7..932a1b3a1 100644 --- a/tests/unit/includes/FeedutilsText.php +++ b/tests/unit/includes/FeedutilsText.php @@ -38,15 +38,18 @@ class FeedutilsTest extends UnitTestCase { }*/ public function test_atom_author() { - $this->assertEquals('', atom_author('', 'name', 'uri', 72, 72, 'png', 'photourl')); + $this->assertEquals('', atom_author('', 'nick', 'name', 'uri', 72, 72, 'png', 'photourl')); $a = ' - name + uri + nick uri + nick + name '; - $this->assertXmlStringEqualsXmlString($a, atom_author('tag', 'name', 'uri', 72, 72, 'png', 'http://photourl')); + $this->assertXmlStringEqualsXmlString($a, atom_author('tag', 'nick', 'name', 'uri', 72, 72, 'png', 'http://photourl')); } } -- cgit v1.2.3 From 635b8ff73aca5d1a8ba6ea5bb575f3f2838d41a0 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 29 Apr 2017 12:42:46 -0400 Subject: Update api_zot.bb Fix incorrect parameter name --- doc/developer/api_zot.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/api_zot.bb b/doc/developer/api_zot.bb index 1314f90b5..ddca65b4d 100644 --- a/doc/developer/api_zot.bb +++ b/doc/developer/api_zot.bb @@ -28,7 +28,7 @@ GET /api/z/1.0/files Options: - - hash + - filehash return only entries matching hash (exactly) - filename -- cgit v1.2.3