Noscrape is now enabled all the time.

diff --git a/mod/admin.php b/mod/admin.php
index 2a923f4cab560c8a87f03948e396181b22ab14f6..76ecf1f45b74693ddf0a8c49c78e1d55e8559dda 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -372,7 +372,6 @@ function admin_page_site_post(&$a){
        $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
        $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
        $proxy_disabled         =       ((x($_POST,'proxy_disabled'))           ? True                                          : False);
-       $disable_noscrape = ((x($_POST,'disable_noscrape')) ? true : false);
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
                        q("update `contact` set
@@ -500,7 +499,6 @@ function admin_page_site_post(&$a){
        set_config('system','temppath', $temppath);
        set_config('system','basepath', $basepath);
        set_config('system','proxy_disabled', $proxy_disabled);
-       set_config('system','disable_noscrape', $disable_noscrape);
 
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
@@ -668,8 +666,6 @@ function admin_page_site(&$a) {
                '$proxy_disabled'       => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
 
                '$relocate_url'     => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
-
-               '$disable_noscrape'=> array('disable_noscrape', t("Disable noscrape"), get_config('system','disable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping. Disabling it will cause higher load on your server and the directory server.")),
        '$form_security_token' => get_form_security_token("admin_site")
 
        ));

diff --git a/mod/friendica.php b/mod/friendica.php
index ba212762950e65981e309682489e6fdf06c4e040..7b99f9e6fb46a969e27197689c817a431a0d1421 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -38,11 +38,8 @@ function friendica_init(&$a) {
                        'site_name' => $a->config['sitename'],
                        'platform' => FRIENDICA_PLATFORM,
                        'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
+                       'no_scrape_url' => $a->get_baseurl().'/noscrape'
                );
-               
-               //Enable noscrape?
-               if(!get_config('system','disable_noscrape'))
-                       $data['no_scrape_url'] = $a->get_baseurl().'/noscrape';
 
                echo json_encode($data);
                killme();

diff --git a/mod/noscrape.php b/mod/noscrape.php
index a859efd41ef922aa29f2d3f2ceac6a4134a2d451..10df72eeb869f33238e14e966dfa11b8df3231ea 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -2,9 +2,6 @@
 
 function noscrape_init(&$a) {
 
-       if(get_config('system','disable_noscrape'))
-               killme();
-
        if($a->argc > 1)
                $which = $a->argv[1];
        else

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 24ff751bea86a97ed4bcaf08bd49b5dfb87233f2..0baed8a8a0d7df84345cb0c3be9bb2a96dc5e231 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -111,7 +111,6 @@
        {{include file="field_checkbox.tpl" field=$suppress_language}}
 
        <h3>{{$performance}}</h3>
-       {{include file="field_checkbox.tpl" field=$disable_noscrape}}
        {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
        {{include file="field_input.tpl" field=$itemcache}}
        {{include file="field_input.tpl" field=$itemcache_duration}}