X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fsearch.php;h=1776a925520f1671597e5fa458f010bde6674e94;hb=1f7f964bb7200d4f658742a999c07f1dd6cbe97c;hp=5fc96178501f557c73329779bca13aa95aa427e7;hpb=46338f5e8752f2ec1fbc0f744e3c76c1b6ef27c5;p=friendica.git diff --git a/mod/search.php b/mod/search.php index 5fc9617850..1776a92552 100644 --- a/mod/search.php +++ b/mod/search.php @@ -1,4 +1,8 @@ $rr['id'], - 'term' => $rr['term'], - 'encodedterm' => urlencode($rr['term']), - 'delete' => t('Remove term'), - 'selected' => ($search==$rr['term']), + 'id' => $rr['id'], + 'term' => $rr['term'], + 'encodedterm' => urlencode($rr['term']), + 'delete' => t('Remove term'), + 'selected' => ($search==$rr['term']), ); } @@ -27,10 +31,10 @@ function search_saved_searches() { $tpl = get_markup_template("saved_searches_aside.tpl"); $o .= replace_macros($tpl, array( - '$title' => t('Saved Searches'), - '$add' => '', - '$searchbox' => '', - '$saved' => $saved, + '$title' => t('Saved Searches'), + '$add' => '', + '$searchbox' => '', + '$saved' => $saved, )); } @@ -90,11 +94,44 @@ function search_content(&$a) { return; } + if(get_config('system','local_search') AND !local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a search."))); + killme(); + //notice(t('Public access denied.').EOL); + //return; + } + + if (get_config('system','permit_crawling') AND !local_user()) { + // Default values: + // 10 requests are "free", after the 11th only a call per minute is allowed + + $free_crawls = intval(get_config('system','free_crawls')); + if ($free_crawls == 0) + $free_crawls = 10; + + $crawl_permit_period = intval(get_config('system','crawl_permit_period')); + if ($crawl_permit_period == 0) + $crawl_permit_period = 10; + + $remote = $_SERVER["REMOTE_ADDR"]; + $result = Cache::get("remote_search:".$remote); + if (!is_null($result)) { + $resultdata = json_decode($result); + if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) { + http_status_exit(429, + array("title" => t("Too Many Requests"), + "description" => t("Only one search per minute is permitted for not logged in users."))); + killme(); + } + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => $resultdata->accesses + 1)), CACHE_HOUR); + } else + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR); + } + nav_set_selected('search'); - require_once("include/bbcode.php"); - require_once('include/security.php'); - require_once('include/conversation.php'); $o = '