Events: Now with guid.

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index c15dfae3fea8d981cf74efe685f9fef59078413f..790f577ba6e17511b6be30b39c3de963da5114a8 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -104,20 +104,30 @@ function search_content(&$a) {
        }
 
        if (get_config('system','permit_crawling') AND !local_user()) {
-               // To-Do:
-               // - 10 requests are "free", after the 11th only a call per minute is allowed
+               // 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)) {
-                       if ($result > (time() - 60)) {
+                       $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, time(), CACHE_HOUR);
+                       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');
@@ -137,7 +147,7 @@ function search_content(&$a) {
        }
 
 
-       $o .= search($search,'search-box','/search',((local_user()) ? true : false), false);
+       $o .= search($search,'search-box','search',((local_user()) ? true : false), false);
 
        if(strpos($search,'#') === 0) {
                $tag = true;
@@ -207,11 +217,10 @@ function search_content(&$a) {
                        FROM `item`
                                INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                               AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND (`item`.`private` OR NOT `item`.`network` IN ('%s', '%s', '%s'))))
+                               AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
                                $sql_extra
                        GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ",
-                               intval(local_user()), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
-                               intval($a->pager['start']), intval($a->pager['itemspage']));
+                               intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage']));
        }
 
        if(! count($r)) {