Commit 2a557901 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'development' into 'master'

Development

See merge request !1801
parents bfe8e698 724524ef
......@@ -16,7 +16,6 @@ class AppendLogs extends Command
*/
protected $signature = 'logs:gather';
const LOGKEY = "metager.logs";
const LOGKEYTAZ = "metager.tazlogs";
/**
* The console command description.
......@@ -43,7 +42,6 @@ class AppendLogs extends Command
public function handle()
{
$this->handleMGLogs();
$this->handleTazLogs();
}
private function handleMGLogs()
......@@ -76,45 +74,4 @@ class AppendLogs extends Command
Log::info("Added " . sizeof($elements) . " lines to todays log!");
}
}
private function handleTazLogs()
{
$redis = null;
if (env("REDIS_CACHE_DRIVER", "redis") === "redis") {
$redis = Redis::connection('cache');
} elseif (env("REDIS_CACHE_DRIVER", "redis") === "redis-sentinel") {
$redis = RedisSentinel::connection('cache');
}
if ($redis === null) {
Log::error("No valid Redis Connection specified");
return;
}
$elements = [];
$reply = $redis->pipeline(function ($pipe) use ($elements) {
$pipe->lrange(\App\Console\Commands\AppendLogs::LOGKEYTAZ, 0, -1);
$pipe->del(\App\Console\Commands\AppendLogs::LOGKEYTAZ);
});
$elements = $reply[0];
if (!is_array($elements) || sizeof($elements) <= 0) {
return;
}
if (file_put_contents(\App\Console\Commands\AppendLogs::getTazLogFile(), implode(PHP_EOL, $elements) . PHP_EOL, FILE_APPEND) === false) {
Log::error("Konnte Log Zeile(n) nicht schreiben");
$redis->lpush(\App\Console\Commands\AppendLogs::LOGKEYTAZ, array_reverse($elements));
} else {
Log::info("Added " . sizeof($elements) . " lines to todays TAZ log!");
}
}
public static function getTazLogFile()
{
$logpath = storage_path("logs/metager/taz/" . date("Y") . "/" . date("m") . "/");
if (!file_exists($logpath)) {
mkdir($logpath, 0777, true);
}
$logpath .= date("d") . ".log";
return $logpath;
}
}
......@@ -44,21 +44,6 @@ class StartpageController extends Controller
$lang = 'all';
}
/**
* Logging Requests from Taz advertisement
*/
if ($request->filled("key") && $request->input("key", "") === "taz") {
$logEntry = date("H:i:s");
$referer = request()->headers->get('referer');
$logEntry .= " ref=$referer";
if (env("REDIS_CACHE_DRIVER", "redis") === "redis") {
Redis::connection('cache')->rpush(\App\Console\Commands\AppendLogs::LOGKEYTAZ, $logEntry);
} elseif (env("REDIS_CACHE_DRIVER", "redis") === "redis-sentinel") {
RedisSentinel::connection('cache')->rpush(\App\Console\Commands\AppendLogs::LOGKEYTAZ, $logEntry);
}
}
return view('index')
->with('title', trans('titles.index'))
->with('homeIcon')
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
viewBox="0 0 26.458333 26.458334"
version="1.1"
id="svg8"
sodipodi:docname="transparency-metaindex.svg"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1848"
inkscape:window-height="1016"
id="namedview36"
showgrid="true"
showguides="false"
inkscape:zoom="5.7875767"
inkscape:cx="5.8557222"
inkscape:cy="53.822709"
inkscape:window-x="72"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="text911">
<inkscape:grid
type="xygrid"
id="grid122" />
</sodipodi:namedview>
<defs
id="defs2" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<rect
style="fill:#e6e6e6;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.13229167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect909-6-2"
width="7.9315391"
height="2.6432762"
x="13.727304"
y="20.554008" />
<rect
style="fill:#e6e6e6;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.13229167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect909-6"
width="7.6572466"
height="2.6432741"
x="4.8710895"
y="20.536762" />
<rect
style="fill:#e6e6e6;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.13229167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect909"
width="4.8228703"
height="3.32901"
x="10.583333"
y="1.3229166" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:1.41111112px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
x="10.880346"
y="2.5947182"
id="text118"><tspan
sodipodi:role="line"
id="tspan116"
x="10.880346"
y="2.5947182"
style="stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">Meta-</tspan><tspan
sodipodi:role="line"
x="10.880346"
y="4.3586073"
style="stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="tspan120">Index</tspan></text>
<path
inkscape:connector-curvature="0"
d="m 24.949406,12.521681 a 7.2760415,7.2760415 0 0 1 -7.276041,7.276041 7.2760415,7.2760415 0 0 1 -7.276042,-7.276041 7.2760415,7.2760415 0 0 1 7.276042,-7.2760417 7.2760415,7.2760415 0 0 1 7.276041,7.2760417 z"
style="fill:none;stroke:#000000;stroke-width:0.30427101;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path886" />
<path
inkscape:connector-curvature="0"
d="M 16.061008,12.606157 A 7.276041,7.276041 0 0 1 8.7849674,19.882198 7.276041,7.276041 0 0 1 1.5089264,12.606157 7.276041,7.276041 0 0 1 8.7849674,5.3301163 7.276041,7.276041 0 0 1 16.061008,12.606157 Z"
style="fill:none;stroke:#000000;stroke-width:0.30427101;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path886-9" />
<g
style="font-style:normal;font-weight:normal;font-size:2.11666989px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458299"
id="text911"
aria-label="Index A">
<path
inkscape:connector-curvature="0"
id="path44"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 5.354164,22.542856 v -1.456244 h 0.1974043 v 1.456244 z" />
<path
inkscape:connector-curvature="0"
id="path46"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 6.5995679,22.542856 v -0.709002 q 0,-0.110587 -0.021704,-0.171566 -0.021704,-0.06098 -0.069247,-0.08785 -0.047542,-0.02687 -0.1395266,-0.02687 -0.1343589,0 -0.2118737,0.09198 -0.077515,0.09198 -0.077515,0.255282 v 0.648023 H 5.8936668 v -0.879534 q 0,-0.195337 -0.0062,-0.238745 H 6.063167 q 0.00103,0.0052 0.00207,0.02791 0.00103,0.02274 0.00207,0.05271 0.00207,0.02894 0.00413,0.110588 h 0.0031 q 0.064079,-0.115756 0.1477948,-0.163298 0.08475,-0.04858 0.2098066,-0.04858 0.1839684,0 0.2687179,0.09198 0.085783,0.09095 0.085783,0.301791 v 0.745175 z" />
<path
inkscape:connector-curvature="0"
id="path48"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 7.7726247,22.363022 q -0.051677,0.107487 -0.1374596,0.153996 -0.084749,0.04651 -0.2108401,0.04651 -0.2118737,0 -0.3121262,-0.142627 -0.099219,-0.142628 -0.099219,-0.432016 0,-0.584978 0.4113451,-0.584978 0.1271242,0 0.2118737,0.04651 0.084749,0.04651 0.136426,0.147795 h 0.00207 l -0.00207,-0.125058 V 21.009099 H 7.95866 v 1.303282 q 0,0.174667 0.0062,0.230477 H 7.7870941 q -0.0031,-0.01654 -0.00723,-0.07648 -0.0031,-0.05994 -0.0031,-0.103353 z M 7.2083172,21.982683 q 0,0.234611 0.062012,0.335897 0.062012,0.101286 0.2015384,0.101286 0.1581301,0 0.2294437,-0.109554 0.071314,-0.109554 0.071314,-0.340032 0,-0.222209 -0.071314,-0.325562 -0.071314,-0.103353 -0.2273767,-0.103353 -0.1405601,0 -0.2036054,0.104387 -0.062012,0.103353 -0.062012,0.336931 z" />
<path
inkscape:connector-curvature="0"
id="path50"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 8.3865417,22.022991 q 0,0.192236 0.079582,0.296623 0.079582,0.104386 0.2325443,0.104386 0.1209231,0 0.1932702,-0.04858 0.073381,-0.04858 0.099219,-0.12299 l 0.1632978,0.04651 q -0.1002525,0.264584 -0.4557869,0.264584 -0.2480472,0 -0.378272,-0.147795 -0.1291913,-0.147795 -0.1291913,-0.43925 0,-0.276986 0.1291913,-0.424781 0.1302248,-0.147795 0.3710373,-0.147795 0.4929939,0 0.4929939,0.59428 v 0.02481 z m 0.6056487,-0.142628 q -0.015503,-0.176733 -0.089917,-0.257349 -0.074414,-0.08165 -0.2139408,-0.08165 -0.1353924,0 -0.2149743,0.09095 -0.078548,0.08992 -0.084749,0.248047 z" />
<path
inkscape:connector-curvature="0"
id="path52"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="M 10.106336,22.542856 9.8055786,22.083969 9.5027542,22.542856 H 9.3022493 L 9.7001585,21.968213 9.3208529,21.424577 h 0.2056725 l 0.2790532,0.435116 0.2769864,-0.435116 h 0.207739 l -0.3793054,0.541569 0.4030764,0.57671 z" />
<path
inkscape:connector-curvature="0"
id="path54"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 12.014233,22.542856 -0.166399,-0.425814 h -0.663526 l -0.167432,0.425814 h -0.204639 l 0.59428,-1.456244 h 0.224276 l 0.584978,1.456244 z m -0.498162,-1.307416 -0.0093,0.02894 q -0.02584,0.08578 -0.07648,0.220142 l -0.186035,0.478525 h 0.54467 l -0.187069,-0.480592 q -0.02894,-0.07131 -0.05788,-0.161231 z" />
<text
id="text871"
y="23.8125"
x="6.080193"
style="font-style:normal;font-weight:normal;font-size:1.41111112px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07000425"
xml:space="preserve"><tspan
style="stroke-width:0.07000425"
y="25.061003"
x="6.080193"
id="tspan869"
sodipodi:role="line" /></text>
</g>
<g
style="font-style:normal;font-weight:normal;font-size:2.11666989px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458299"
id="text911-6"
aria-label="Index B">
<path
inkscape:connector-curvature="0"
id="path57"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 14.23791,22.538137 v -1.456244 h 0.197404 v 1.456244 z" />
<path
inkscape:connector-curvature="0"
id="path59"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 15.483314,22.538137 v -0.709001 q 0,-0.110588 -0.0217,-0.171566 -0.0217,-0.06098 -0.06925,-0.08785 -0.04754,-0.02687 -0.139526,-0.02687 -0.134359,0 -0.211874,0.09198 -0.07752,0.09198 -0.07752,0.255282 v 0.648023 h -0.186035 v -0.879534 q 0,-0.195337 -0.0062,-0.238745 h 0.1757 q 10e-4,0.0052 0.0021,0.0279 10e-4,0.02274 0.0021,0.05271 0.0021,0.02894 0.0041,0.110588 h 0.0031 q 0.06408,-0.115756 0.147795,-0.163298 0.08475,-0.04858 0.209806,-0.04858 0.183969,0 0.268718,0.09198 0.08578,0.09095 0.08578,0.301791 v 0.745175 z" />
<path
inkscape:connector-curvature="0"
id="path61"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 16.656371,22.358303 q -0.05168,0.107487 -0.13746,0.153996 -0.08475,0.04651 -0.21084,0.04651 -0.211874,0 -0.312126,-0.142627 -0.09922,-0.142627 -0.09922,-0.432016 0,-0.584978 0.411345,-0.584978 0.127124,0 0.211874,0.04651 0.08475,0.04651 0.136426,0.147795 h 0.0021 l -0.0021,-0.125057 v -0.464055 h 0.186035 v 1.303281 q 0,0.174667 0.0062,0.230477 H 16.67084 q -0.0031,-0.01654 -0.0072,-0.07648 -0.0031,-0.05995 -0.0031,-0.103353 z m -0.564308,-0.380339 q 0,0.234611 0.06201,0.335897 0.06201,0.101286 0.201539,0.101286 0.15813,0 0.229443,-0.109554 0.07131,-0.109554 0.07131,-0.340031 0,-0.222209 -0.07131,-0.325562 -0.07131,-0.103353 -0.227376,-0.103353 -0.140561,0 -0.203606,0.104386 -0.06201,0.103353 -0.06201,0.336931 z" />
<path
inkscape:connector-curvature="0"
id="path63"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 17.270288,22.018272 q 0,0.192236 0.07958,0.296623 0.07958,0.104386 0.232544,0.104386 0.120923,0 0.19327,-0.04858 0.07338,-0.04858 0.09922,-0.122991 l 0.163298,0.04651 q -0.100253,0.264584 -0.455787,0.264584 -0.248047,0 -0.378272,-0.147795 -0.129191,-0.147795 -0.129191,-0.43925 0,-0.276986 0.129191,-0.424781 0.130225,-0.147795 0.371037,-0.147795 0.492994,0 0.492994,0.59428 v 0.02481 z m 0.605649,-0.142627 q -0.0155,-0.176734 -0.08992,-0.257349 -0.07441,-0.08165 -0.21394,-0.08165 -0.135393,0 -0.214975,0.09095 -0.07855,0.08992 -0.08475,0.248048 z" />
<path
inkscape:connector-curvature="0"
id="path65"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="M 18.990082,22.538137 18.689325,22.07925 18.3865,22.538137 h -0.200505 l 0.39791,-0.574642 -0.379306,-0.543637 h 0.205673 l 0.279053,0.435116 0.276986,-0.435116 h 0.207739 l -0.379305,0.54157 0.403077,0.576709 z" />
<path
inkscape:connector-curvature="0"
id="path67"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666989px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.26458299"
d="m 21.108819,22.127826 q 0,0.194304 -0.141594,0.302824 -0.141593,0.107487 -0.393775,0.107487 h -0.591179 v -1.456244 h 0.529168 q 0.512631,0 0.512631,0.353468 0,0.129191 -0.07235,0.217041 -0.07235,0.08785 -0.204639,0.117822 0.173633,0.02067 0.267684,0.116789 0.09405,0.09509 0.09405,0.240813 z m -0.283187,-0.668694 q 0,-0.117823 -0.08062,-0.168466 -0.08061,-0.05064 -0.233577,-0.05064 h -0.331764 v 0.460955 h 0.331764 q 0.15813,0 0.235645,-0.05891 0.07855,-0.05995 0.07855,-0.182935 z m 0.08372,0.653191 q 0,-0.257349 -0.361736,-0.257349 h -0.367937 v 0.525033 h 0.38344 q 0.180868,0 0.26355,-0.06718 0.08268,-0.06718 0.08268,-0.200505 z" />
</g>
<path
inkscape:connector-curvature="0"
id="path864"
d="M 7.9370838,19.660474 C 6.6501619,19.494004 5.4156795,18.978853 4.3864975,18.178807 3.7775082,17.705403 3.0721131,16.893587 2.657246,16.188667 1.7038009,14.568626 1.4363038,12.581916 1.9267961,10.763592 2.187124,9.7985195 2.6814809,8.8471329 3.3205343,8.0813515 5.6145242,5.3324505 9.5342982,4.6995804 12.554142,6.5905326 L 12.888181,6.7996998 12.5224,7.1542417 c -1.22308,1.1854979 -1.968543,2.6282875 -2.216427,4.2897333 -0.08651,0.57983 -0.08699,1.609326 -10e-4,2.163653 0.271941,1.753296 1.128404,3.34061 2.414402,4.474695 l 0.278592,0.245683 -0.296981,0.197175 c -0.888817,0.590113 -1.933193,0.981952 -2.9845486,1.119773 -0.4509172,0.05911 -1.379728,0.06721 -1.7793393,0.01552 z"
style="fill:#d31629;fill-opacity:1;stroke:#d31629;stroke-width:0.121708;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path866"
d="M 12.954631,17.814621 C 12.072831,17.009532 11.460994,16.132967 11.049333,15.084947 10.53582,13.777628 10.43783,12.189192 10.785017,10.800369 11.1133,9.4871695 11.862172,8.2242521 12.854266,7.3107367 L 13.17254,7.0176712 13.339928,7.158008 c 1.374068,1.1520109 2.276985,2.8251571 2.500956,4.634389 0.0495,0.399876 0.04953,1.2199 7.3e-5,1.620139 -0.204571,1.654815 -0.904584,3.082099 -2.087389,4.256029 -0.229282,0.227561 -0.43687,0.413747 -0.461307,0.413747 -0.02444,0 -0.17637,-0.120461 -0.33763,-0.267691 z"
style="fill:#f47216;fill-opacity:1;stroke:#f47216;stroke-width:0.09525;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path868"
d="m 17.093121,19.603669 c -0.05057,-0.0073 -0.239497,-0.0317 -0.419839,-0.05422 -0.927199,-0.115771 -1.897931,-0.474522 -2.802776,-1.035814 l -0.298805,-0.185353 0.347015,-0.331748 c 1.22067,-1.166968 1.9879,-2.657274 2.237331,-4.345906 0.07931,-0.536951 0.07936,-1.558837 9.6e-5,-2.096317 C 15.896842,9.7960324 15.016742,8.1582283 13.726539,7.0329805 L 13.455776,6.7968357 13.794154,6.5781009 c 0.894576,-0.5782728 1.861214,-0.939311 2.931192,-1.0947958 0.626402,-0.091026 1.727315,-0.056319 2.345257,0.073936 2.169011,0.4572016 3.973706,1.8399635 4.948225,3.7913431 0.999989,2.0023808 1.008845,4.2827058 0.02445,6.2962328 -1.057881,2.163841 -3.155228,3.647731 -5.552388,3.928358 -0.414303,0.0485 -1.160423,0.06478 -1.39777,0.03049 z"
style="fill:#f4e116;fill-opacity:1;stroke:#f4e116;stroke-width:0.09525;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</svg>
......@@ -5,8 +5,9 @@ return [
'disclaimer.1' => 'Aktuell können wir unsere Apps nur für Android Geräte zur Verfügung stellen. Apple macht es uns leider zu schwer. Wir bitten hierfür um Verständnis.',
'head.2' => 'MetaGer App',
'metager.1' => 'Diese App bringt die volle Power unserer Suchmaschine auf ihr Smartphone. Durchsuchen Sie das Internet unter Wahrung ihrer Privatsphäre mit nur einem Fingerwisch.',
'metager.2' => 'Sie können die App für unsere Suche entweder über den Google Playstore installieren, oder sie datengeschützt manuell von unserem Server auf ihrem Smartphone installieren.',
'metager.2' => 'Sie können die App für unsere Suche entweder über F-Droid oder den Google Playstore installieren, oder sie datengeschützt manuell von unserem Server auf ihrem Smartphone installieren.',
'metager.playstore' => 'Google Playstore',
'metager.fdroid' => 'F-Droid Store',
'metager.manuell' => 'Manuelle Installation',
'head.3' => 'MetaGer Maps App',
'maps.playstore' => 'Google Playstore',
......
......@@ -12,10 +12,10 @@ Röselerstr. 3
D-30159 Hannover
Deutschland/Germany',
'info.3' => 'Kontakt:
Tel.: ++49-(0)511-34000070
Tel.: +4951134000070
EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
<a href="/kontakt/">Verschlüsselndes Kontaktformular</a>',
'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel',
'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel, Manuela Branz',
'info.6' => 'Jugendschutzbeauftragte: Manuela Branz <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" ist ein gemeinnütziger
Verein, eingetragen in das Vereinsregister beim Amtsgericht Hannover
......
......@@ -26,6 +26,7 @@ return [
'nav26' => 'MetaGer-Fanshop',
'nav27' => 'MetaGer Maps',
'nav28' => 'Einstellungen',
'nav29' => 'Transparenzerklärung',
'navigationToggle' => 'Navigation anzeigen',
'titles.tips' => 'Tips',
'plugin' => 'MetaGer Plugin',
......
......@@ -26,4 +26,5 @@ return [
'key' => 'Mitgliederschlüssel - MetaGer',
'settings' => 'Sucheinstellungen (:fokus)',
'allSettings' => 'Alle Sucheinstellungen - MetaGer',
'transparency' => 'Transparenzerklärung - MetaGer',
];
<?php
return [
'head.1' => 'Transparenzerklärung',
'head.2' => 'MetaGer ist transparent',
'head.3' => 'Was ist eine Metasuchmaschine überhaupt?',
'head.4' => 'Was ist der Vorteil einer Metasuchmaschine?',
'head.5' => 'Wie setzt sich unser Ranking zusammen?',
'text.1' => 'MetaGer ist transparent. Unser <a href=":sourcecode">Quellcode</a> ist <a href=":license">frei lizensiert</a> und für alle öffentlich einsehbar. Wir verzichten auf die Speicherung von Nutzerdaten und legen Wert auf Datenschutz sowie Privatsphäre. Deshalb gewähren wir anonymen Zugang zu den Suchergebnissen. Dies ist durch einen anonymen Proxy und TOR-hidden-Zugang möglich. Hinzu kommt eine transparente Organisationsstruktur, da MetaGer von dem gemeinnützigen Verein <a href=":sumalink">SUMA-EV</a> getragen wird, in dem jede/r Mitglied werden kann.',
'text.2.1' => 'Um zu erklären, was Metasuchmaschinen sind, ergibt es Sinn, vorerst kurz grob zu erklären wie die Indexierung von normalen Suchmaschinen funktioniert. Diese Suchmaschinen beziehen ihre Suchergebnisse aus einer Datenbank von Webseiten, die man auch Index nennt. Die Suchmaschinen betreiben sogenannte „Crawler“, die Webseiten sammeln und diese zum Index (Datenbestand) hinzufügen. Der Crawler startet mit einer Menge von Webseiten und öffnet alle dort verlinkten Webseiten. Diese werden indexiert, also dem Index hinzugefügt. Anschließend öffnet der Crawler die auf diesen Webseiten verlinkten Webseiten und fährt so fort.',
'text.2.2' => 'Eine Metasuchmaschine vereint die Ergebnisse mehrerer Suchmaschinen unter sich und wertet diese erneut nach eigenem Schema aus. Sie sammelt alle Ergebnisse der verschiedenen Suchmaschinen und wertet diese erneut nach eigenem Schema aus. Das heißt, dass die Metasuchmaschine keinen eigenen Index hat. Deshalb verwenden Metasuchmaschinen auch keine Crawler. Sie nutzen den Index von anderen Suchmaschinen.',
'text.3' => 'Ein klarer Vorteil von Metasuchmaschinen ist es, dass der Nutzer nur eine einzige Suchanfrage braucht, um an die Ergebnisse mehrerer Suchmaschinen zu kommen. Die Metasuchmaschine gibt die relevanten Ergebnisse in einer nochmals sortierten Ergebnisliste aus. MetaGer ist keine reine Metasuchmaschine, da wir auch kleine eigene Indexe verwenden.',
'text.4' => 'Wir übernehmen das Ranking unserer Quell-Suchmaschinen und gewichten diese. Diese Bewertungen werden dann in Punktzahlen umgewandelt. Außerdem wird das Vorkommen der Suchbegriffe in der URL und im Snippet, sowie das übermäßige Vorkommen von besonderen Zeichen (andere Schriftzeichen wie Kyrillisch) berücksichtigt. Zudem verwenden wir noch eine Sperrliste, um einzelne Seiten aus der Ergebnisliste zu entfernen. Wir sperren Webseiten in der Anzeige, wenn wir rechtlich dazu verpflichtet sind. Außerdem behalten wir uns vor, Webseiten mit nachweislich fehlerhaften Informationen, Webseiten von extrem schlechter Qualität und andere besonders zweifelhafte Webseiten zu sperren.',
'text.5' => 'Sollte es weitere Fragen oder Unklarheiten geben, können Sie gerne unser <a href=":contact">Kontaktformular</a> nutzen und uns Ihre Fragen stellen!',
];
......@@ -7,6 +7,7 @@ return [
"metager.1" => "This App brings the full Metager power to your smartphone. Search the web with one touch while preserving your privacy.",
"metager.2" => "There are two ways to get our App: install via the Google Playstore or (better for your privacy) get it directly from our server.",
"metager.playstore" => "Google Playstore",
'metager.fdroid' => 'F-Droid Store',
"metager.manuell" => "Manual Installation",
"head.3" => "MetaGer Maps App",
"maps.playstore" => "Google Playstore",
......@@ -21,4 +22,4 @@ return [
"list.1" => "Open the settings menu to allow the installation: Settings => System => Security. Please check \"Unknown Sources\" there.",
"list.2" => "Please use \"Manual Installation\" here to download the file.",
"list.3" => "Now open the file on your device. This will install the App."
];
\ No newline at end of file
];
......@@ -11,10 +11,10 @@ Röselerstr. 3
D-30159 Hannover
Deutschland/Germany',
'info.3' => 'Contact:
Tel.: ++49-(0)511-34000070
Tel.: +4951134000070
EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
<a href="/kontakt/">encrypted contact form</a>',
'info.4' => 'Board: Dominik Hebeler, Carsten Riel',
'info.4' => 'Board: Dominik Hebeler, Carsten Riel, Manuela Branz',
'info.6' => 'Youth Protection Commissioner: Manuela Branz <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" is a charitable association, registered in the register of associations at the Amtsgericht Hannover
under VR200033.
......
......@@ -26,6 +26,7 @@ return [
'nav26' => 'MetaGer-Fanshop',
'nav27' => 'MetaGer Maps',
'nav28' => 'Settings',
'nav29' => 'Transparency statement',
"navigationToggle" => "show navigation",
'titles.tips' => 'Tips',
'plugin' => 'MetaGer Plugin',
......
......@@ -25,4 +25,6 @@ return [
'plugin' => 'Plugin - MetaGer',
'key' => 'Ad-Free-Key - MetaGer',
'allSettings' => 'All Settings - MetaGer',
'transparency' => 'Transparency statement - MetaGer',
];
<?php
return [
'head.1' => 'Transparency statement',
'head.2' => 'MetaGer is transparent',
'head.3' => 'What is a metasearch engine?',
'head.4' => 'What is the advantage of a metasearch engine?',
'head.5' => 'How is our ranking made up?',
'text.1' => 'MetaGer is transparent. Our <a href=":sourcecode">source code</a> is <a href=":sourcecode">Quellcode</a>freely licensed</a> and publicly available for all to see. We do not store user data and value data protection and privacy. Therefore we grant anonymous access to the search results. This is possible through an anonymous proxy and TOR-hidden access. In addition, MetaGer has a transparent organizational structure, since it is supported by the non-profit association <a href=":sumalink">SUMA-EV</a>, of which anyone can become a member.',
'text.2.1' => 'To explain what metasearch engines are, it makes sense to first briefly explain roughly how the indexing of regular search engines works. Regular search engines obtain their search results from a database of web pages, which is also called an index. The search engines use so-called "crawlers", which collect web pages and add them to the index (database). The crawler starts with a set of web pages and opens all the web pages linked there. These are indexed, i.e. added to the index. Then the crawler opens the web pages linked on these web pages and continues in this way.',
'text.2.2' => 'A metasearch engine combines the results of several search engines and evaluates them again according to its own criteria.This means that the metasearch engine does not have its own index. Therefore, metasearch engines do not use crawlers. They use the index of other search engines.',
'text.3' => 'A clear advantage of metasearch engines is that the user only needs a single search query to access the results of several search engines. The metasearch engine outputs the relevant results in a once again sorted list of results. MetaGer is not a pure metasearch engine, as we also use small indexes of our own.',
'text.4' => 'We take the rankings from our source search engines and weigh them. These rankings are then converted into scores. Additional points are awarded or deducted for the occurrence of the search terms in the URL and in the snippet, as well as the excessive occurrence of special characters (e.g. other character sets such as Cyrillic). We also use a blocking list to remove individual pages from the results list. We block web pages in the display if we are legally obliged to do so. We also reserve the right to block web pages with demonstrably incorrect information, web pages of extremely poor quality and other particularly dubious web pages.',
'text.5' => 'If there are any further questions or uncertainties, please feel free to use our <a href=":contact">contact form</a> and ask us your questions!',
];
......@@ -7,6 +7,7 @@ return [
"metager.1" => "Con esta aplicación, obtiene toda la potencia de nuestro motor de búsqueda en su smartphone.\r\nBusque en Internet con solo deslizar un dedo mientras que mantiene su privacidad.",
"metager.2" => "Puede instalar la aplicación para nuestra búsqueda a través de Google Playstore o instalarla manualmente desde nuestro servidor en su smartphone, protegida de datos.",
"metager.playstore" => "Google Playstore",
'metager.fdroid' => 'F-Droid Store',
"metager.manuell" => "Instalación manual",
"head.3" => "Aplicación Maps MetaGer",
"maps.playstore" => "Google Playstore",
......
......@@ -5,8 +5,8 @@ return [
"headline.1" => "<a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV - Verein für freien Wissenszugang (e.V.)</a> en cooperación con la <a href=\"http://www.uni-hannover.de/\" target=\"_blank\" rel=\"noopener\">universidad Leibniz Hannover</a>",
"info.1" => "Articulo de Wikipedia de <a href=\"http://de.wikipedia.org/wiki/Suma_e.V.\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a>",
"info.2" => " SUMA-EV Röselerstr. 3 D-30159 Hannover Deutschland/Germany",
"info.3" => "Contacto: Tel.: ++49-(0)511-34000070 EMail: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a><a href=\"/kontakt/\"> - Public-PGP-Key</a> <a href=\"/kontakt/\">Formulario encriptado</a>",
"info.4" => "Junta directiva: Dominik Hebeler, Carsten Riel",
"info.3" => "Contacto: Tel.: +4951134000070 EMail: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a><a href=\"/kontakt/\"> - Public-PGP-Key</a> <a href=\"/kontakt/\">Formulario encriptado</a>",
"info.4" => "Junta directiva: Dominik Hebeler, Carsten Riel, Manuela Branz",
"info.6" => "Encargado de protección de menores: Manuela Branz <a href=\"mailto:jugendschutz@metager.de\">jugendschutz@metager.de</a>",
"info.8" => "\"SUMA-EV - Verein für freien Wissenszugang\" es una asociación sin fines de lucro, registrado en el registro de asociaciones del Amtsgericht Hannover bajo numero VR200033. Número de identificación a efectos del IVA: DE 300 464 091 La \"Gottfried Wilhelm Leibniz Universität Hannover\" es una entidad del derecho publico.",
"info.9" => "Exención de responsabilidad",
......
......@@ -5,16 +5,19 @@
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
padding: 8px;
margin: 4px;
overflow: auto;
}
.card-heavy {
.card;
box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24);
margin: 8px;
overflow: auto;
}
.card-light {
.card;
box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.12), 0px 0px 1px 0px rgba(0, 0, 0, 0.24);
margin: 4px;
overflow: auto;
}
\ No newline at end of file
......@@ -8,3 +8,5 @@
@import "./start-page.less";
@import "./widget.less";
@import "./settings.less";
@import "./transparency.less";
#transparency-metaindex-img {
width: 20em;
float: left;
}
\ No newline at end of file
......@@ -9,6 +9,11 @@
<h2>{{ trans('app.head.2') }}</h2>
<p>{{ trans('app.metager.1') }}</p>
<p>{{ trans('app.metager.2') }}</p>
@if(in_array(LaravelLocalization::getCurrentLocale(), ["en", "es", "de"]))
<p><a href="https://f-droid.org/{{ LaravelLocalization::getCurrentLocale() }}/packages/de.metager.metagerapp.fdroid/">{{ trans('app.metager.fdroid') }}</a></p>
@else
<p><a href="https://f-droid.org/en/packages/de.metager.metagerapp.fdroid/">{{ trans('app.metager.fdroid') }}</a></p>
@endif
<p><a href="https://play.google.com/store/apps/details?id=de.metager.metagerapp">{{ trans('app.metager.playstore') }}</a></p>
<p><a href="{!! url('app/metager') !!}">{{ trans('app.metager.manuell') }}</a></p>
</div>
......
......@@ -63,7 +63,7 @@
<ul class="story-links">
<li><a class="story-button" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">{{ trans('mg-story.btn-about-us') }}</a></li>
<li><a class="story-button" href="https://gitlab.metager.de/open-source/MetaGer" target="_blank"><nobr>{{ trans('mg-story.btn-mg-code') }}</nobr></a></li>
<!--<li><a class="story-button" href="https://metager.de/about">{{ trans('mg-story.btn-mg-algorithm') }}</a></li>-->
<li><a class="story-button" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "transparency") }}">{{ trans('mg-story.btn-mg-algorithm') }}</a></li>
</ul>
</section>
......
......@@ -91,6 +91,9 @@
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" >{{ trans('sidebar.nav22') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/transparency/") }}" >{{ trans('sidebar.nav29') }}</a>
</li>
<li>
<a href="{{ action('Assoziator@asso') }}" >{{ trans('sidebar.nav11') }}</a>
</li>
......
@extends('layouts.subPages')
@section('title', $title )
@section('content')
<div>
<h1 class="page-title">{{ trans('transparency.head.1') }}</h1>
<div class="card-heavy">
<h2>{{ trans('transparency.head.2') }}</h2>
<p>{!! trans('transparency.text.1', ["sourcecode" => "https://gitlab.metager.de/open-source/MetaGer", "license" => "https://gitlab.metager.de/open-source/MetaGer/-/blob/development/LICENSE", "sumalink" => "https://suma-ev.de"]) !!}</p>
</div>
<div class="card-heavy">
<h2>{{ trans('transparency.head.3') }}</h2>
<img src="/img/transparency-metaindex.svg" id="transparency-metaindex-img">
<p>{{ trans('transparency.text.2.1') }}</p>
<p>{{ trans('transparency.text.2.2') }}</p>
</div>
<div class="card-heavy">
<h2>{{ trans('transparency.head.4') }}</h2>
<p>{{ trans('transparency.text.3') }}</p>
</div>
<div class="card-heavy">
<h2>{{ trans('transparency.head.5') }}</h2>
<p>{{ trans('transparency.text.4') }}</p>
</div>
<div class="card-heavy">
<p>{!! trans('transparency.text.5', ["contact" => LaravelLocalization::getLocalizedUrl(LaravelLocalization::getCurrentLocale(), route('contact'))]) !!}</p>
</div>
</div>
@endsection
......@@ -61,7 +61,7 @@ Route::group(
->with('title', trans('titles.kontakt'))
->with('navbarFocus', 'kontakt')
->with('url', $url);
});
})->name("contact");
Route::post('kontakt', 'MailController@contactMail');
......@@ -108,6 +108,12 @@ Route::group(
->with('navbarFocus', 'datenschutz');
});
Route::get('transparency', function () {
return view('transparency')
->with('title', trans('titles.transparency'))
->with('navbarFocus', 'kontakt');
});
Route::get('hilfe', function () {
return view('hilfe')
->with('title', trans('titles.hilfe'))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment