Remove Embedly integration

- Remove admin setting input

diff --git a/include/oembed.php b/include/oembed.php
index d0a2bc8643ae42bedb8a91aa0e9d83cf96ef1e47..0b8b713667e7aa1faede525a5a08db1b07b03c0b 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -74,17 +74,6 @@ 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);
-
-                               logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
-                       }
-               }
-
                $txt = trim($txt);
 
                if ($txt[0] != "{") {

diff --git a/mod/admin.php b/mod/admin.php
index b1bc8de5f20393b8c707cc549196b950f28a14ac..77093f08599ca903dbce9f0e71488bd9b9a690dc 100644 (file)
--- 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("<a href='http://embed.ly'>Embedly</a> 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 5dfef2b97f85dbc23262f69825629b9dec42c519..138d04311b5c4bb988649b2066ea422ca4d89008 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -128,7 +128,6 @@
        {{include file="field_input.tpl" field=$basepath}}
        {{include file="field_checkbox.tpl" field=$suppress_tags}}
        {{include file="field_checkbox.tpl" field=$nodeinfo}}
-       {{include file="field_input.tpl" field=$embedly}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$portable_contacts}}</h3>