From 7382cdffe35d2248350759320952ca66d99c199e Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 10 May 2016 11:30:22 +0200
Subject: [PATCH] =?UTF-8?q?Dummy=20f=C3=BCr=20die=20Klasse=20Results=20ein?=
=?UTF-8?q?gef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/MetaGerSearch.php | 8 +
app/Http/routes.php | 2 +
app/MetaGer/Results.php | 25 +-
app/Redis.php | 371 -------------------------
resources/lang/de/fokiNames.php | 10 +
resources/lang/en/fokiNames.php | 10 +
6 files changed, 54 insertions(+), 372 deletions(-)
delete mode 100644 app/Redis.php
create mode 100644 resources/lang/de/fokiNames.php
create mode 100644 resources/lang/en/fokiNames.php
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 192e4f1f0..c7a736f6b 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -3,7 +3,9 @@
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
use App\MetaGer\Forwarder;
+use App\MetaGer\Results;
class MetaGerSearch extends Controller
{
@@ -24,4 +26,10 @@ class MetaGerSearch extends Controller
#return view('index', [ 'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen']);
}
+ public function search(Request $request)
+ {
+ $results = new Results($request);
+ return $results->loadSearchEngines();
+ }
+
}
\ No newline at end of file
diff --git a/app/Http/routes.php b/app/Http/routes.php
index ffc06fa54..eebfb5d12 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -55,6 +55,8 @@
Route::post('kontakt', 'MailController@contactMail');
+ Route::get('meta/meta.ger3', 'MetaGerSearch@search');
+
Route::get('spende', function()
{
return view('spende')
diff --git a/app/MetaGer/Results.php b/app/MetaGer/Results.php
index c71d956e1..e23527f09 100644
--- a/app/MetaGer/Results.php
+++ b/app/MetaGer/Results.php
@@ -1,8 +1,31 @@
<?php
namespace App\MetaGer;
+use Illuminate\Http\Request;
class Results
{
-
+ private $request;
+ private $fokiNames = [];
+ private $fokus;
+ function __construct (Request $request)
+ {
+ $this->request = $request;
+
+ $this->fokiNames[] = trans('fokiNames.web');
+ $this->fokiNames[] = trans('fokiNames.nachrichten');
+ $this->fokiNames[] = trans('fokiNames.wissenschaft');
+ $this->fokiNames[] = trans('fokiNames.produktsuche');
+ $this->fokiNames[] = trans('fokiNames.bilder');
+ $this->fokiNames[] = trans('fokiNames.angepasst');
+ }
+
+ public function loadSearchEngines ()
+ {
+ # Wenn keine persönlichen Einstellungen gesetzt sind, dafür aber ein existierender Fokus von uns,
+ # werden die zu dem Fokus gehörenden Suchmaschinen angeschaltet.
+ return $this->request->input('focus', 'test');
+ return var_dump($this->fokiNames);
+ }
+
}
\ No newline at end of file
diff --git a/app/Redis.php b/app/Redis.php
deleted file mode 100644
index c6a4b7159..000000000
--- a/app/Redis.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-namespace App;
-/**
- * Very simple Redis implementation, all commands passed in cli format
- * Add commands via cmd ( $command [, $variable1 [, $variable2 ] ] ) method
- * Fire commands via get () o set () methods ( first one will return output, usefull for get operations )
- *
- * Usage:
- * $redis = new redis_cli ( '127.0.0.1', 6379 );
- * $redis -> cmd ( 'SET', 'foo', 'bar' ) -> set ();
- * $foo = $redis -> cmd ( 'GET', 'foo' ) -> get ();
- *
- * $redis -> cmd ( 'HSET', 'hash', 'foo', 'bar' ) -> cmd ( 'HSET', 'hash', 'abc', 'def' ) -> set ();
- * $vals = $redis -> cmd ( 'HVALS', 'hash' ) -> get ();
- *
- * $redis -> cmd ( 'KEYS', 'online*' );
- * $total_online = $redis -> get_len ();
- *
- * Based on http://redis.io/topics/protocol
- */
-class Redis
-{
- const INTEGER = ':';
- const INLINE = '+';
- const BULK = '$';
- const MULTIBULK = '*';
- const ERROR = '-';
- const NL = "\r\n";
-
- private $handle = false;
- private $host;
- private $port;
- private $silent_fail;
-
- private $commands = array ();
-
- //Timeout for stream, 30 seconds
- private $timeout = 30;
-
- //Timeout for socket connection
- private $connect_timeout = 3;
-
- //Use this with extreme caution
- private $force_reconnect = false;
-
- //Error handling, debug info
- private $last_used_command = '';
-
- //Error handling function, use set_error_function method ()
- private $error_function = null;
-
- public function __construct ( $host = false, $port = false, $silent_fail = false, $timeout = 60 )
- {
- if ( $host && $port )
- {
- $this -> connect ( $host, $port, $silent_fail, $timeout );
- }
- }
-
- //Main method to establish connection
- public function connect ( $host = '127.0.0.1', $port = 6379, $silent_fail = false, $timeout = 60 )
- {
- $this -> host = $host;
- $this -> port = $port;
- $this -> silent_fail = $silent_fail;
- $this -> timeout = $timeout;
-
- if ( $silent_fail )
- {
- $this -> handle = @fsockopen ( $host, $port, $errno, $errstr, $this -> connect_timeout );
-
- if ( !$this -> handle )
- {
- $this -> handle = false;
- }
- }
- else
- {
- $this -> handle = fsockopen ( $host, $port, $errno, $errstr, $this -> connect_timeout );
- }
-
- if ( is_resource ( $this -> handle ) )
- {
- stream_set_timeout ( $this -> handle, $this -> timeout );
- }
- }
-
- public function reconnect ( )
- {
- $this -> __destruct ();
- $this -> connect ( $this -> host, $this -> port, $this -> silent_fail );
- }
-
- public function __destruct ()
- {
- if ( is_resource ( $this -> handle ) )
- {
- fclose ( $this -> handle );
- }
- }
-
- //Returns all commands array
- public function commands ()
- {
- return $this -> commands;
- }
-
- //Used to push single command to queue
- public function cmd ()
- {
- if ( !$this -> handle )
- {
- return $this;
- }
-
- $args = func_get_args ();
- $rlen = count ( $args );
-
- $output = '*'. $rlen . self::NL;
-
- foreach ( $args as $arg )
- {
- $output .= '$'. strlen ( $arg ) . self::NL . $arg . self::NL;
- }
-
- $this -> commands [] = $output;
-
- return $this;
- }
-
- //Used to push many commands at once, almost always for setting something
- public function set ()
- {
- if ( !$this -> handle )
- {
- return false;
- }
-
- //Total size of commands
- $size = $this -> exec ();
- $response = array ();
-
- for ( $i=0; $i<$size; $i++ )
- {
- $response [] = $this -> get_response ();
- }
-
- if ( $this -> force_reconnect )
- {
- $this -> reconnect ();
- }
-
- return $response;
- }
-
- //Used to get command response
- public function get ( $line = false )
- {
- if ( !$this -> handle )
- {
- return false;
- }
-
- $return = false;
-
- if ( $this -> exec () )
- {
- $return = $this -> get_response ();
-
- if ( $this -> force_reconnect )
- {
- $this -> reconnect ();
- }
-
- }
-
- return $return;
- }
-
- //Used to get length of the returned array. Most useful with `Keys` command
- public function get_len ()
- {
- if ( !$this -> handle )
- {
- return false;
- }
-
- $return = null;
-
- if ( $this -> exec () )
- {
- $char = fgetc ( $this -> handle );
-
- if ( $char == self::BULK )
- {
- $return = sizeof ( $this -> bulk_response () );
- }
- elseif ( $char == self::MULTIBULK )
- {
- $return = sizeof ( $this -> multibulk_response () );
- }
-
- if ( $this -> force_reconnect )
- {
- $this -> reconnect ();
- }
- }
-
- return $return;
- }
-
- //Forces to reconnect after every get() or set(). Use this with extreme caution
- public function set_force_reconnect ( $flag )
- {
- $this -> force_reconnect = $flag;
- return $this;
- }
-
- //Used to parse single command single response
- private function get_response ()
- {
- $return = false;
-
- $char = fgetc ( $this -> handle );
-
- switch ( $char )
- {
- case self::INLINE:
- $return = $this -> inline_response ();
- break;
- case self::INTEGER:
- $return = $this -> integer_response ();
- break;
- case self::BULK:
- $return = $this -> bulk_response ();
- break;
- case self::MULTIBULK:
- $return = $this -> multibulk_response ();
- break;
- case self::ERROR:
- $return = $this -> error_response ();
- break;
- }
-
- return $return;
- }
-
- //For inline responses only
- private function inline_response ()
- {
- return trim ( fgets ( $this -> handle ) );
- }
-
- //For integer responses only
- private function integer_response ()
- {
- return ( int ) trim ( fgets ( $this -> handle ) );
- }
-
- //For error responses only
- private function error_response ()
- {
- $error = fgets ( $this -> handle );
-
- if ( $this -> error_function )
- {
- call_user_func ( $this -> error_function, $error .'('. $this -> last_used_command .')' );
- }
-
- return false;
- }
-
- //For bulk responses only
- private function bulk_response ()
- {
- $return = trim ( fgets ( $this -> handle ) );
-
- if ( $return === '-1' )
- {
- $return = null;
- }
- else
- {
- $return = $this -> read_bulk_response ( $return );
- }
-
- return $return;
- }
-
- //For multibulk responses only
- private function multibulk_response ()
- {
- $size = trim ( fgets ( $this -> handle ) );
- $return = false;
-
- if ( $size === '-1' )
- {
- $return = null;
- }
- else
- {
- $return = array ();
-
- for ( $i = 0; $i < $size; $i++ )
- {
- $tmp = trim ( fgets ( $this -> handle ) );
-
- if ( $tmp === '-1' )
- {
- $return [] = null;
- }
- else
- {
- $return [] = $this -> read_bulk_response ( $tmp );
- }
- }
- }
-
- return $return;
- }
-
- //Sends command to the redis
- private function exec ()
- {
- $size = sizeof ( $this -> commands );
-
- if ( $size < 1 )
- {
- return null;
- }
-
- if ( $this -> error_function )
- {
- $this -> last_used_command = str_replace ( self::NL, '\\r\\n', implode ( ';', $this -> commands ) );
- }
-
- $command = implode ( self::NL, $this -> commands ) . self::NL;
- fwrite ( $this -> handle, $command );
-
- $this -> commands = array ();
- return $size;
- }
-
- //Bulk response reader
- private function read_bulk_response ( $tmp )
- {
- $response = null;
-
- $read = 0;
- $size = ( ( strlen ( $tmp ) > 1 && substr ( $tmp, 0, 1 ) === self::BULK ) ? substr ( $tmp, 1 ) : $tmp );
-
- while ( $read < $size )
- {
- $diff = $size - $read;
-
- $block_size = $diff > 8192 ? 8192 : $diff;
-
- $response .= fread ( $this -> handle, $block_size );
- $read += $block_size;
- }
-
- fgets ( $this -> handle );
-
- return $response;
- }
-
- public function set_error_function ( $func )
- {
- $this -> error_function = $func;
- }
-}
diff --git a/resources/lang/de/fokiNames.php b/resources/lang/de/fokiNames.php
new file mode 100644
index 000000000..26e98681c
--- /dev/null
+++ b/resources/lang/de/fokiNames.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+ 'web' => "web",
+ 'nachrichten' => "nachrichten",
+ 'wissenschaft' => 'wissenschaft',
+ 'produktsuche' => 'produktsuche',
+ 'bilder' => 'bilder',
+ 'angepasst' => 'angepasst'
+];
\ No newline at end of file
diff --git a/resources/lang/en/fokiNames.php b/resources/lang/en/fokiNames.php
new file mode 100644
index 000000000..0c737f771
--- /dev/null
+++ b/resources/lang/en/fokiNames.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+ 'web' => "web",
+ 'nachrichten' => "news",
+ 'wissenschaft' => 'science',
+ 'produktsuche' => 'shopping',
+ 'bilder' => 'picture',
+ 'angepasst' => 'custom'
+];
\ No newline at end of file
--
GitLab