diff --git a/buffer/buffer.php b/buffer/buffer.php index f41ecf97..9d14fd83 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -271,6 +271,7 @@ function buffer_send(App $a, &$b) $client_id = Config::get("buffer", "client_id"); $client_secret = Config::get("buffer", "client_secret"); $access_token = PConfig::get($b['uid'], "buffer","access_token"); + $callback_url = ""; if ($access_token) { $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token); diff --git a/catavatar/avatars/body_12.png b/catavatar/avatars/body_12.png index a6329aff..b1070c0f 100644 Binary files a/catavatar/avatars/body_12.png and b/catavatar/avatars/body_12.png differ diff --git a/catavatar/avatars/fur_5.png b/catavatar/avatars/fur_5.png index f85aa695..76a9efd8 100644 Binary files a/catavatar/avatars/fur_5.png and b/catavatar/avatars/fur_5.png differ diff --git a/catavatar/avatars/fur_6.png b/catavatar/avatars/fur_6.png index e76c3909..144dacab 100644 Binary files a/catavatar/avatars/fur_6.png and b/catavatar/avatars/fur_6.png differ diff --git a/ifttt/ifttt.png b/ifttt/ifttt.png index 8a8b62f3..364edb08 100644 Binary files a/ifttt/ifttt.png and b/ifttt/ifttt.png differ diff --git a/jappixmini/jappix/img/wait/wait-medium.png b/jappixmini/jappix/img/wait/wait-medium.png index 14a5fd66..4b9a780b 100644 Binary files a/jappixmini/jappix/img/wait/wait-medium.png and b/jappixmini/jappix/img/wait/wait-medium.png differ diff --git a/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png index ee0b63f8..1b1972b5 100644 Binary files a/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png and b/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index 6cfe95fe..e608409b 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -142,6 +142,10 @@ function leistungsschutzrecht_is_member_site($url) { return false; } + if (count($hostname) <= 2) { + return false; + } + $site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1]; return (isset($sites[$site])); diff --git a/mastodoncustomemojis/README.md b/mastodoncustomemojis/README.md deleted file mode 100644 index 5dda7fa3..00000000 --- a/mastodoncustomemojis/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Mastodon Custom Emojis -====================== - -Main author Hypolite Petovan. - -Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images. - -## License - -The _Mastodon Custom Emojis_ addon is licensed under the [3-clause BSD license][2] see the LICENSE file in the addons directory. - -[1]: http://opensource.org/licenses/BSD-3-Clause diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php deleted file mode 100644 index d7ce7426..00000000 --- a/mastodoncustomemojis/mastodoncustomemojis.php +++ /dev/null @@ -1,95 +0,0 @@ -page['htmlhead'] .= << - - - -HTML; -} - -function mastodoncustomemojis_put_item_in_cache(Friendica\App $a, &$hook_data) -{ - // Mastodon uses OStatus, skipping other network protocols - if ($hook_data['item']['network'] != Friendica\Core\Protocol::OSTATUS) { - return; - } - - $emojis = mastodoncustomemojis_get_custom_emojis_for_author($hook_data['item']['author-link']); - - $hook_data["rendered-html"] = Friendica\Content\Smilies::replaceFromArray($hook_data["rendered-html"], $emojis); -} - -function mastodoncustomemojis_get_custom_emojis_for_author($author_link) -{ - $return = ['texts' => [], 'icons' => []]; - - $url_parts = parse_url($author_link); - - $api_base_url = $url_parts['scheme'] . '://' . $url_parts['host'] . ($url_parts['port'] ? ':' . $url_parts['port'] : ''); - - $cache_key = 'mastodoncustomemojis:' . $api_base_url; - - $emojis = Friendica\Core\Cache::get($cache_key); - if (empty($emojis)) { - // Reset the emojis array - $emojis = $return; - - $api_url = $api_base_url . '/api/v1/custom_emojis'; - - $ret = Friendica\Util\Network::fetchUrlFull($api_url); - - if ($ret['success']) { - $emojis_array = json_decode($ret['body'], true); - - if (is_array($emojis_array)) { - foreach ($emojis_array as $emoji) { - $emojis['texts'][] = ':' . $emoji['shortcode'] . ':'; - $emojis['icons'][] = ':' . $emoji['shortcode'] . ':'; - } - } - } - - Friendica\Core\Cache::set($cache_key, $emojis, Friendica\Core\Cache::WEEK); - - $return = $emojis; - } - - return $return; -} diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 9e02a74d..5c28a8f4 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -983,10 +983,24 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru function pumpio_get_contact($uid, $contact, $no_insert = false) { - GContact::update(["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, - "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, - "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, - "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]); + $gcontact = ["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + "name" => $contact->displayName, "hide" => true, + "nick" => $contact->preferredUsername, + "addr" => str_replace("acct:", "", $contact->id)]; + + if (!empty($contact->location->displayName)) { + $gcontact["location"] = $contact->location->displayName; + } + + if (!empty($contact->summary)) { + $gcontact["about"] = $contact->summary; + } + + if (!empty($contact->image->url)) { + $gcontact["photo"] = $contact->image->url; + } + + GContact::update($gcontact); $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) { @@ -1047,7 +1061,9 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) */ } - Contact::updateAvatar($contact->image->url, $uid, $contact_id); + if (!empty($contact->image->url)) { + Contact::updateAvatar($contact->image->url, $uid, $contact_id); + } return $contact_id; } @@ -1109,6 +1125,8 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $receiptians = array_merge($receiptians, $post->to); } + $public = false; + foreach ($receiptians AS $receiver) { if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) { $public = true; diff --git a/smiley_pack/icons/confused/shrug.gif b/smiley_pack/icons/confused/shrug.gif index df56f507..31ce007f 100644 Binary files a/smiley_pack/icons/confused/shrug.gif and b/smiley_pack/icons/confused/shrug.gif differ diff --git a/smiley_pack/icons/devilangel/angel.gif b/smiley_pack/icons/devilangel/angel.gif index dca2d829..8e585416 100644 Binary files a/smiley_pack/icons/devilangel/angel.gif and b/smiley_pack/icons/devilangel/angel.gif differ diff --git a/smiley_pack/icons/fight/army.gif b/smiley_pack/icons/fight/army.gif index e35a1383..75067008 100644 Binary files a/smiley_pack/icons/fight/army.gif and b/smiley_pack/icons/fight/army.gif differ diff --git a/smiley_pack/icons/fight/crusader.gif b/smiley_pack/icons/fight/crusader.gif index ef1f9ad6..95848aea 100644 Binary files a/smiley_pack/icons/fight/crusader.gif and b/smiley_pack/icons/fight/crusader.gif differ diff --git a/smiley_pack/icons/fight/dead.gif b/smiley_pack/icons/fight/dead.gif index 738a1986..31adaba3 100644 Binary files a/smiley_pack/icons/fight/dead.gif and b/smiley_pack/icons/fight/dead.gif differ diff --git a/smiley_pack/icons/fight/gangs.gif b/smiley_pack/icons/fight/gangs.gif index fe8e4cfd..2c655b1f 100644 Binary files a/smiley_pack/icons/fight/gangs.gif and b/smiley_pack/icons/fight/gangs.gif differ diff --git a/smiley_pack/icons/food/cake.gif b/smiley_pack/icons/food/cake.gif index 9e4f08f5..22d0ebd9 100644 Binary files a/smiley_pack/icons/food/cake.gif and b/smiley_pack/icons/food/cake.gif differ diff --git a/smiley_pack/icons/happy/cloud9.gif b/smiley_pack/icons/happy/cloud9.gif index 61979d4a..801c1a39 100644 Binary files a/smiley_pack/icons/happy/cloud9.gif and b/smiley_pack/icons/happy/cloud9.gif differ diff --git a/smiley_pack/icons/respect/bravo.gif b/smiley_pack/icons/respect/bravo.gif index c8f24849..34f72abb 100644 Binary files a/smiley_pack/icons/respect/bravo.gif and b/smiley_pack/icons/respect/bravo.gif differ diff --git a/smiley_pack/icons/sad/crying.png b/smiley_pack/icons/sad/crying.png index 7d378a04..62b9646d 100644 Binary files a/smiley_pack/icons/sad/crying.png and b/smiley_pack/icons/sad/crying.png differ diff --git a/smileybutton/view/smoothly.png b/smileybutton/view/smoothly.png index 5c617be1..312a0c33 100644 Binary files a/smileybutton/view/smoothly.png and b/smileybutton/view/smoothly.png differ diff --git a/smileybutton/view/vier.png b/smileybutton/view/vier.png index c30940e4..440f6a37 100644 Binary files a/smileybutton/view/vier.png and b/smileybutton/view/vier.png differ diff --git a/smilies_adult/icons/bong.gif b/smilies_adult/icons/bong.gif index 2d06a652..4b671226 100644 Binary files a/smilies_adult/icons/bong.gif and b/smilies_adult/icons/bong.gif differ diff --git a/smilies_adult/icons/drunk.gif b/smilies_adult/icons/drunk.gif index 1e433b12..4a1c064a 100644 Binary files a/smilies_adult/icons/drunk.gif and b/smilies_adult/icons/drunk.gif differ diff --git a/sniper/100x100.jpg b/sniper/100x100.jpg index 002ea22b..315bd664 100644 Binary files a/sniper/100x100.jpg and b/sniper/100x100.jpg differ diff --git a/sniper/100x75.jpg b/sniper/100x75.jpg index 94d9462c..693e7c9d 100644 Binary files a/sniper/100x75.jpg and b/sniper/100x75.jpg differ diff --git a/sniper/100x80.jpg b/sniper/100x80.jpg index 0734ed15..594391e2 100644 Binary files a/sniper/100x80.jpg and b/sniper/100x80.jpg differ diff --git a/sniper/120x90hotshotsniper.jpg b/sniper/120x90hotshotsniper.jpg index 96ec1a97..52d0f005 100644 Binary files a/sniper/120x90hotshotsniper.jpg and b/sniper/120x90hotshotsniper.jpg differ diff --git a/sniper/125x125.jpg b/sniper/125x125.jpg index 7fd9e10d..047a505f 100644 Binary files a/sniper/125x125.jpg and b/sniper/125x125.jpg differ diff --git a/sniper/140x90.jpg b/sniper/140x90.jpg index b2d4f1d3..e98df44e 100644 Binary files a/sniper/140x90.jpg and b/sniper/140x90.jpg differ diff --git a/sniper/150x150.jpg b/sniper/150x150.jpg index 606d5f4c..225d1e9c 100644 Binary files a/sniper/150x150.jpg and b/sniper/150x150.jpg differ diff --git a/sniper/180x135.jpg b/sniper/180x135.jpg index 3cf2fa0a..6fdfaf32 100644 Binary files a/sniper/180x135.jpg and b/sniper/180x135.jpg differ diff --git a/sniper/250x180.jpg b/sniper/250x180.jpg index 6afb6342..41fbe9f6 100644 Binary files a/sniper/250x180.jpg and b/sniper/250x180.jpg differ diff --git a/sniper/300x200.jpg b/sniper/300x200.jpg index 90aaefe4..0aeef9a7 100644 Binary files a/sniper/300x200.jpg and b/sniper/300x200.jpg differ diff --git a/sniper/300x300.jpg b/sniper/300x300.jpg index 9edc48f7..d4d4f274 100644 Binary files a/sniper/300x300.jpg and b/sniper/300x300.jpg differ diff --git a/sniper/32x32.jpg b/sniper/32x32.jpg index 8e5eb4a6..8b4c2093 100644 Binary files a/sniper/32x32.jpg and b/sniper/32x32.jpg differ diff --git a/sniper/335x185.jpg b/sniper/335x185.jpg index 15d2e768..9bb38c1a 100644 Binary files a/sniper/335x185.jpg and b/sniper/335x185.jpg differ diff --git a/sniper/60x60.jpg b/sniper/60x60.jpg index 760c9a47..4ad72577 100644 Binary files a/sniper/60x60.jpg and b/sniper/60x60.jpg differ diff --git a/sniper/70x45.jpg b/sniper/70x45.jpg index 64c1aae0..b722a5a0 100644 Binary files a/sniper/70x45.jpg and b/sniper/70x45.jpg differ diff --git a/sniper/70x60.jpg b/sniper/70x60.jpg index 7415a0d2..58152198 100644 Binary files a/sniper/70x60.jpg and b/sniper/70x60.jpg differ diff --git a/sniper/73x80.jpg b/sniper/73x80.jpg index c1d5f993..9f6753ec 100644 Binary files a/sniper/73x80.jpg and b/sniper/73x80.jpg differ diff --git a/sniper/75x57.jpg b/sniper/75x57.jpg index a0dd0bc7..54753f1e 100644 Binary files a/sniper/75x57.jpg and b/sniper/75x57.jpg differ diff --git a/sniper/80x60.jpg b/sniper/80x60.jpg index 69a06a39..dfd0b371 100644 Binary files a/sniper/80x60.jpg and b/sniper/80x60.jpg differ diff --git a/sniper/80x70.jpg b/sniper/80x70.jpg index a906d7cc..2f416fa6 100644 Binary files a/sniper/80x70.jpg and b/sniper/80x70.jpg differ diff --git a/sniper/80x80hotshotsniper.jpg b/sniper/80x80hotshotsniper.jpg index 65e5a41c..db26ff6a 100644 Binary files a/sniper/80x80hotshotsniper.jpg and b/sniper/80x80hotshotsniper.jpg differ diff --git a/sniper/81x67.jpg b/sniper/81x67.jpg index 757f4b01..0a4d7fdc 100644 Binary files a/sniper/81x67.jpg and b/sniper/81x67.jpg differ diff --git a/statusnet/signinwithstatusnet.png b/statusnet/signinwithstatusnet.png index eb33b66b..a33998d5 100644 Binary files a/statusnet/signinwithstatusnet.png and b/statusnet/signinwithstatusnet.png differ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 6fc5b8a9..62c3f41b 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -586,11 +586,11 @@ function statusnet_post_hook(App $a, &$b) logger('statusnet_post send, result: ' . print_r($result, true) . "\nmessage: " . $msg, LOGGER_DEBUG . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true)); - if ($result->source) { + if (!empty($result->source)) { PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source)); } - if ($result->error) { + if (!empty($result->error)) { logger('Send to GNU Social failed: "' . $result->error . '"'); } elseif ($iscomment) { logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']); @@ -819,7 +819,7 @@ function statusnet_fetchtimeline(App $a, $uid) continue; } - if (is_object($post->retweeted_status)) { + if (!empty($post->retweeted_status)) { continue; } @@ -1554,12 +1554,12 @@ function statusnet_is_retweet(App $a, $uid, $body) $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $link = $matches[1]; } preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $link = $matches[1]; } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index b2dec5b5..9617a3a0 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -412,7 +412,7 @@ function tumblr_send(&$a,&$b) { $params['caption'] = '

'.$title."

". "

".$params['caption']."

"; - if (trim($params['caption']) == "") + if (empty($params['caption'])) $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); $consumer_key = Config::get('tumblr','consumer_key'); diff --git a/twitter/twitter.php b/twitter/twitter.php index d9baf1bd..e8431241 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -605,11 +605,11 @@ function twitter_post_hook(App $a, &$b) $result = $connection->post($url, $post); logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG); - if ($result->source) { + if (!empty($result->source)) { Config::set("twitter", "application_name", strip_tags($result->source)); } - if ($result->errors) { + if (!empty($result->errors)) { logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"'); $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid'])); @@ -725,9 +725,15 @@ function twitter_expire(App $a, $b) return; } - $r = dba::select('item', ['id'], ['deleted' => true, 'network' => NETWORK_TWITTER]); + $r = dba::select('item', ['id', 'iaid', 'icid'], ['deleted' => true, 'network' => NETWORK_TWITTER]); while ($row = dba::fetch($r)) { dba::delete('item', ['id' => $row['id']]); + if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) { + dba::delete('item-activity', ['id' => $row['iaid']]); + } + if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) { + dba::delete('item-content', ['id' => $row['icid']]); + } } dba::close($r); @@ -1772,12 +1778,12 @@ function twitter_is_retweet(App $a, $uid, $body) $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $link = $matches[1]; } preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $link = $matches[1]; } diff --git a/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg index 9f7acf1a..47006b45 100644 Binary files a/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg and b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg differ diff --git a/xmpp/converse/css/images/bitcoin_qr_code.png b/xmpp/converse/css/images/bitcoin_qr_code.png index d7d063d4..7ba47ef6 100644 Binary files a/xmpp/converse/css/images/bitcoin_qr_code.png and b/xmpp/converse/css/images/bitcoin_qr_code.png differ diff --git a/xmpp/converse/css/images/header.jpg b/xmpp/converse/css/images/header.jpg index c98ab88a..1bab8adf 100644 Binary files a/xmpp/converse/css/images/header.jpg and b/xmpp/converse/css/images/header.jpg differ diff --git a/xmpp/converse/css/images/overlay.png b/xmpp/converse/css/images/overlay.png index dfbadc3c..2141c781 100644 Binary files a/xmpp/converse/css/images/overlay.png and b/xmpp/converse/css/images/overlay.png differ diff --git a/xmpp/converse/css/images/user.png b/xmpp/converse/css/images/user.png index 0a431713..f6a362d7 100644 Binary files a/xmpp/converse/css/images/user.png and b/xmpp/converse/css/images/user.png differ