diff --git a/include/oembed.php b/include/oembed.php
index a1945894fc..0b8b713667 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -17,10 +17,10 @@ function oembed_replacecb($matches){
/**
* @brief Get data from an URL to embed its content.
- *
+ *
* @param string $embedurl The URL from which the data should be fetched.
* @param bool $no_rich_type If set to true rich type content won't be fetched.
- *
+ *
* @return bool|object Returns object with embed content or false if no embedable
* content exists
*/
@@ -41,8 +41,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
// These media files should now be caught in bbcode.php
// left here as a fallback in case this is called from another source
- $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
- $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
+ $noexts = array("mp3", "mp4", "ogg", "ogv", "oga", "ogm", "webm");
+ $ext = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION);
if (is_null($txt)) {
@@ -74,21 +74,10 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
}
}
- if ($txt==false || $txt=="") {
- $embedly = Config::get("system", "embedly");
- if ($embedly != "") {
- // try embedly service
- $ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl);
- $txt = fetch_url($ourl);
+ $txt = trim($txt);
- logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
- }
- }
-
- $txt=trim($txt);
-
- if ($txt[0]!="{") {
- $txt='{"type":"error"}';
+ if ($txt[0] != "{") {
+ $txt = '{"type":"error"}';
} else { //save in cache
$j = json_decode($txt);
if ($j->type != "error") {
diff --git a/mod/admin.php b/mod/admin.php
index b1bc8de5f2..77093f0859 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -666,7 +666,6 @@ function admin_page_site_post(App $a) {
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
$rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
- $embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : '');
$worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4);
$worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False);
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
@@ -821,9 +820,6 @@ function admin_page_site_post(App $a) {
set_config('system','rino_encrypt', $rino);
}
- set_config('system','embedly', $embedly);
-
-
info(t('Site settings updated.').EOL);
goaway('admin/site');
return; // NOTREACHED
@@ -1053,7 +1049,6 @@ function admin_page_site(App $a) {
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
'$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
- '$embedly' => array('embedly', t("Embedly API key"), get_config('system','embedly'), t("Embedly is used to fetch additional data for web pages. This is an optional parameter.")),
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
'$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index fdba195f17..138d04311b 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -1,6 +1,6 @@