diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-09 14:31:54 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-09 14:31:54 -0800 |
| commit | c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea (patch) | |
| tree | 7f2f309ffdb50c4e31b3e3acaa4c43183b186e68 /include | |
| parent | 15d422db80234d220f0ead0b5554f82f50e571e7 (diff) | |
| download | volse-hubzilla-c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea.tar.gz volse-hubzilla-c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea.tar.bz2 volse-hubzilla-c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea.zip | |
more cleanup
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 35 | ||||
| -rw-r--r-- | include/text.php | 6 |
2 files changed, 3 insertions, 38 deletions
diff --git a/include/items.php b/include/items.php index 033863c42..58305aa63 100755 --- a/include/items.php +++ b/include/items.php @@ -248,8 +248,6 @@ function can_comment_on_post($observer_xchan, $item) { } if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) return true; - if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'diaspora')) - return true; if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname())) return true; @@ -766,8 +764,6 @@ function import_author_xchan($x) { if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) { $y = import_author_zot($x); } - if(! $y) - $y = import_author_diaspora($x); if($x['network'] === 'rss') { $y = import_author_rss($x); @@ -781,36 +777,6 @@ function import_author_xchan($x) { } /** - * @brief Imports an author from Diaspora. - * - * @param array $x an associative array with - * * \e string \b address - * @return boolean|string false on error, otherwise xchan_hash of the new entry - */ -function import_author_diaspora($x) { - if(! $x['address']) - return false; - - $r = q("select * from xchan where xchan_addr = '%s' limit 1", - dbesc($x['address']) - ); - if($r) { - logger('in_cache: ' . $x['address'], LOGGER_DATA); - return $r[0]['xchan_hash']; - } - - if(discover_by_webbie($x['address'])) { - $r = q("select xchan_hash from xchan where xchan_addr = '%s' limit 1", - dbesc($x['address']) - ); - if($r) - return $r[0]['xchan_hash']; - } - - return false; -} - -/** * @brief Imports an author from a RSS feed. * * @param array $x an associative array with @@ -819,6 +785,7 @@ function import_author_diaspora($x) { * * \e string \b guid * @return boolean|string */ + function import_author_rss($x) { if(! $x['url']) return false; diff --git a/include/text.php b/include/text.php index 9d76f9d78..fe3206b32 100644 --- a/include/text.php +++ b/include/text.php @@ -1183,8 +1183,7 @@ function list_smilies() { ':coffee', ':facepalm', ':like', - ':dislike', - ':hubzilla' + ':dislike' ); $icons = array( @@ -1219,8 +1218,7 @@ function list_smilies() { '<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />', - '<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />', - '<img class="smiley" src="' . z_root() . '/images/hz-16.png" alt=":hubzilla" />', + '<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />' ); |