Ahwxord/Librey
1
0
Fork 0
mirror of https://github.com/Ahwxorg/librey/ synced 2024-12-06 19:16:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

include different print and fetch functions for search

Browse Source
This commit is contained in:
davidovski
2023-08-21 17:31:20 +01:00
parent fd93a0e154
commit f59f94fdd5
8 changed files with 54 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api.php
+1 -4
View File
@@ -26,10 +26,7 @@
switch ($type)
{
case 0:
$engine=$config->preferred_engines['text'];
if (is_null($engine))
$engine = "google";
require "engines/$engine/text.php";
require "engines/text.php";
$results = get_text_results($query, $page);
break;
case 1:
engines/ahmia/hidden_service.php
+2 -1
View File
@@ -1,5 +1,5 @@
<?php
function get_hidden_service_results($query)
function get_search_results($query)
{
global $config;
@@ -27,4 +27,5 @@
return $results;
}
require "engines/text.php";
?>
engines/bittorrent/merge.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php
function get_merged_torrent_results($query)
function fetch_search_results($query)
{
global $config;
@@ -76,7 +76,7 @@
return $results;
}
function print_merged_torrent_results($results)
function print_search_results($results)
{
echo "<div class=\"text-result-container\">";
engines/duckduckgo/text.php
+4 -4
View File
@@ -6,11 +6,11 @@
$query_encoded = str_replace("%22", "\"", urlencode($this->query));
$results = array();
// $domain = $config->google_domain;
// $domain = $this->config->google_domain;
$domain = 'com';
$site_language = isset($_COOKIE["google_language_site"]) ? trim(htmlspecialchars($_COOKIE["google_language_site"])) : $config->google_language_site;
$results_language = isset($_COOKIE["google_language_results"]) ? trim(htmlspecialchars($_COOKIE["google_language_results"])) : $config->google_language_results;
$number_of_results = isset($_COOKIE["google_number_of_results"]) ? trim(htmlspecialchars($_COOKIE["google_number_of_results"])) : $config->google_number_of_results;
$site_language = isset($_COOKIE["google_language_site"]) ? trim(htmlspecialchars($_COOKIE["google_language_site"])) : $this->config->google_language_site;
$results_language = isset($_COOKIE["google_language_results"]) ? trim(htmlspecialchars($_COOKIE["google_language_results"])) : $this->config->google_language_results;
$number_of_results = isset($_COOKIE["google_number_of_results"]) ? trim(htmlspecialchars($_COOKIE["google_number_of_results"])) : $this->config->google_number_of_results;
$url = "https://html.duckduckgo.$domain/html/?q=$query_encoded&kd=-1&s=" . 3 * $page;
if (3 > strlen($site_language) && 0 < strlen($site_language))
engines/invidious/video.php
+2 -3
View File
@@ -1,6 +1,5 @@
<?php
function get_video_results($query)
{
function fetch_search_results($query, $page) {
global $config;
$instance_url = $config->invidious_instance_for_video_results;
@@ -38,7 +37,7 @@
return $results;
}
function print_video_results($results)
function print_search_results($results)
{
echo "<div class=\"text-result-container\">";
engines/qwant/image.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
function get_image_results($query, $page)
function fetch_search_results($query, $page)
{
global $config;
@@ -40,7 +40,7 @@
return $results;
}
function print_image_results($results)
function print_search_results($results)
{
echo "<div class=\"image-result-container\">";
engines/text.php
+3 -5
View File
@@ -1,6 +1,5 @@
<?php
function get_text_results($query, $page)
{
function fetch_search_results($query, $page) {
global $config;
$mh = curl_multi_init();
@@ -32,7 +31,7 @@
curl_multi_exec($mh, $running);
} while ($running);
if (curl_getinfo($)['http_code'] != '200')
if (curl_getinfo($engine_request->ch)['http_code'] != '200')
{
require "engines/librex/text.php";
return get_librex_results($query, $page);
@@ -47,8 +46,7 @@
return $results;
}
function print_text_results($results)
{
function print_search_results($results) {
if (empty($results))
return;
search.php
+38 -58
View File
@@ -30,6 +30,40 @@
}
}
function import_search_category($type) {
switch ($type)
{
case 0:
require "engines/text.php";
break;
case 1:
require "engines/qwant/image.php";
break;
case 2:
require "engines/invidious/video.php";
break;
case 3:
if ($config->disable_bittorent_search)
echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
else
require "engines/bittorrent/merge.php";
break;
case 4:
if ($config->disable_hidden_service_search)
echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
else
require "engines/ahmia/hidden_service.php";
break;
default:
require "engines/text.php";
break;
}
}
?>
<title>
@@ -84,64 +118,10 @@
<?php
$page = isset($_REQUEST["p"]) ? (int) $_REQUEST["p"] : 0;
$start_time = microtime(true);
switch ($type)
{
case 0:
require "engines/text.php";
$results = get_text_results($query, $page);
print_elapsed_time($start_time);
print_text_results($results);
break;
case 1:
require "engines/qwant/image.php";
$results = get_image_results($query_encoded, $page);
print_elapsed_time($start_time);
print_image_results($results);
break;
case 2:
require "engines/invidious/video.php";
$results = get_video_results($query_encoded);
print_elapsed_time($start_time);
print_video_results($results);
break;
case 3:
if ($config->disable_bittorent_search)
echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
else
{
require "engines/bittorrent/merge.php";
$results = get_merged_torrent_results($query_encoded);
print_elapsed_time($start_time);
print_merged_torrent_results($results);
}
break;
case 4:
if ($config->disable_hidden_service_search)
echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
else
{
require "engines/ahmia/hidden_service.php";
$results = get_hidden_service_results($query_encoded);
print_elapsed_time($start_time);
print_hidden_service_results($results);
}
break;
default:
$query_parts = explode(" ", $query);
$last_word_query = end($query_parts);
if (substr($query, 0, 1) == "!" || substr($last_word_query, 0, 1) == "!")
check_ddg_bang($query);
require "engines/google/text.php";
$results = get_text_results($query, $page);
print_elapsed_time($start_time);
print_text_results($results);
break;
}
import_search_category($type);
$results = fetch_search_results($query, $page);
print_elapsed_time($start_time);
print_search_results($results);
if (2 > $type)