Skip to content

GitLab

Commit de0fc383 authored by Karl's avatar Karl
Browse files

Merge mit Development

parents 97bc659c a982d7f4
Expand all Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/LanguageController.php
View file @ de0fc383
......@@ -49,7 +49,7 @@ class LanguageController extends Controller
->with('deComplete', $deComplete);
}
public function createEditPage($from, $to, $exclude = "")
public function createEditPage($from, $to, $exclude = "", $email = "")
{
$languageFilePath = resource_path() . "/lang/";
$files = scandir($languageFilePath);
......@@ -153,7 +153,8 @@ class LanguageController extends Controller
->with('to', $to)
->with('langTexts', $langTexts)
->with('sum', $sum)
->with('new', $ex["new"]);
->with('new', $ex["new"])
->with('email', $email);
}
private function htmlEscape($t, $to)
......
app/Http/Controllers/MailController.php
View file @ de0fc383
......@@ -117,18 +117,23 @@ class MailController extends Controller
}
public function sendLanguageFile(Request $request, $from, $to, $exclude = "")
public function sendLanguageFile(Request $request, $from, $to, $exclude = "", $email ="")
{
$filename = $request->input('filename');
# Wir erstellen nun zunächst den Inhalt der Datei:
$data = [];
$new = 0;
$emailAddress = "";
foreach ($request->all() as $key => $value) {
if ($key === "filename" || $value === "") {
continue;
}
if($key === "email") {
$emailAddress = $value;
continue;
}
$key = base64_decode($key);
if (strpos($key, "_new_") === 0 && $value !== "") {
$new++;
......@@ -153,11 +158,13 @@ class MailController extends Controller
$output = preg_replace("/\{/si", "[", $output);
$output = preg_replace("/\}/si", "]", $output);
$output = preg_replace("/\": ([\"\[])/si", "\"\t=>\t$1", $output);
$output = "<?php\n\nreturn $output;\n";
$message = "Moin moin,\n\nein Benutzer hat eine Sprachdatei aktualisiert.\nSollten die Texte so in Ordnung sein, ersetzt, oder erstellt die Datei aus dem Anhang in folgendem Pfad:\n$filename\n\nFolgend zusätzlich der Inhalt der Datei:\n\n$output";
// echo $request->old('email');
//echo $request->input('email','test');
// die("");
# Wir haben nun eine Mail an uns geschickt, welche die entsprechende Datei beinhaltet.
# Nun müssen wir den Nutzer eigentlich nur noch zurück leiten und die Letzte bearbeitete Datei ausschließen:
$ex = [];
......@@ -179,10 +186,17 @@ class MailController extends Controller
$ex["new"] += $new;
if ($new > 0) {
Mail::to("dev@suma-ev.de")
if($emailAddress !== "") {
Mail::to("dev@suma-ev.de")
->send(new Sprachdatei($message, $output, basename($filename), $emailAddress));
}
else {
Mail::to("dev@suma-ev.de")
->send(new Sprachdatei($message, $output, basename($filename)));
}
}
$ex = base64_encode(serialize($ex));
return redirect(url('languages/edit', ['from' => $from, 'to' => $to, 'exclude' => $ex]));
return redirect(url('languages/edit', ['from' => $from, 'to' => $to, 'exclude' => $ex, 'email' => $emailAddress]));
}
}
app/Mail/Sprachdatei.php
View file @ de0fc383
......@@ -15,10 +15,10 @@ class Sprachdatei extends Mailable
*
* @return void
*/
public function __construct($message, $fileContent, $filename)
public function __construct($message, $fileContent, $filename, $replyAddress = "noreply@metager.de")
{
$this->subject = "MetaGer - Sprachdatei";
$this->reply = "noreply@metager.de";
$this->reply = $replyAddress;
$this->message = $message;
$this->fileContent = $fileContent;
$this->filename = $filename;
......
app/MetaGer.php
View file @ de0fc383
......@@ -180,13 +180,24 @@ class MetaGer
// augment (boost&adgoal)
// authorize
// misc (WiP)
uasort($this->results, function ($a, $b) {
if ($a->getRank() == $b->getRank()) {
return 0;
}
if ($this->fokus == "nachrichten") {
$this->results = array_filter($this->results, function ($v, $k) {
return !is_null($v->getRank());
}, ARRAY_FILTER_USE_BOTH);
uasort($this->results, function ($a, $b) {
$datea = $a->getDate();
$dateb = $b->getDate();
return $dateb - $datea;
});
} else {
uasort($this->results, function ($a, $b) {
if ($a->getRank() == $b->getRank()) {
return 0;
}
return ($a->getRank() < $b->getRank()) ? 1 : -1;
});
return ($a->getRank() < $b->getRank()) ? 1 : -1;
});
}
# Validate Results
$newResults = [];
......
app/Models/Result.php
View file @ de0fc383
......@@ -62,8 +62,8 @@ class Result
$this->strippedLink = $this->getStrippedLink($this->anzeigeLink);
$this->rank = 0;
$this->partnershop = isset($additionalInformation["partnershop"]) ? $additionalInformation["partnershop"] : false;
$this->image = isset($additionalInformation["image"]) ? $additionalInformation["image"] : "";
$this->price = isset($additionalInformation["price"]) ? $additionalInformation["price"] : 0;
$this->image = isset($additionalInformation["image"]) ? $additionalInformation["image"] : "";
$this->price = isset($additionalInformation["price"]) ? $additionalInformation["price"] : 0;
$this->additionalInformation = $additionalInformation;
}
......@@ -386,6 +386,15 @@ return "https://proxy.suma-ev.de/mger/nph-proxy.cgi/en/w0/" . $tmp;
return $this->rank;
}
public function getDate()
{
if (isset($this->additionalInformation["date"])) {
return $this->additionalInformation["date"];
} else {
return null;
}
}
public function getLangString()
{
$string = "";
......
app/Models/parserSkripte/Onenewspage.php
View file @ de0fc383
......@@ -24,10 +24,11 @@ class Onenewspage extends Searchengine
if (sizeof($res) < 3) {
continue;
}
$title = $res[0];
$link = $res[2];
$anzeigeLink = $link;
$descr = $res[1];
$title = $res[0];
$link = $res[2];
$anzeigeLink = $link;
$descr = $res[1];
$additionalInformation = sizeof($res) > 3 ? ['date' => intval($res[3])] : [];
$this->counter++;
$this->results[] = new \App\Models\Result(
......@@ -37,7 +38,8 @@ class Onenewspage extends Searchengine
$anzeigeLink,
$descr,
$this->gefVon,
$this->counter
$this->counter,
$additionalInformation
);
}
if (count($this->results) > $this->resultCount) {
......
app/Models/parserSkripte/Onenewspagegermany.php
View file @ de0fc383
......@@ -27,15 +27,22 @@ class Onenewspagegermany extends Searchengine
if (sizeof($result) < 3) {
continue;
}
$title = $result[0];
$link = $result[2];
$anzeigeLink = $link;
$descr = $result[1];
$additionalInformation = sizeof($result) > 3 ? ['date' => intval($result[3])] : [];
$counter++;
$this->results[] = new Result(
$this->engine,
trim(strip_tags($result[0])),
$result[2],
$result[2],
$result[1],
$title,
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$counter
$this->counter,
$additionalInformation
);
}
......
app/Models/parserSkripte/Onenewspagevideo.php
View file @ de0fc383
......@@ -23,10 +23,11 @@ class Onenewspagevideo extends Searchengine
if (sizeof($res) < 3) {
continue;
}
$title = $res[0];
$link = $res[2];
$anzeigeLink = $link;
$descr = $res[1];
$title = $res[0];
$link = $res[2];
$anzeigeLink = $link;
$descr = $res[1];
$additionalInformation = sizeof($res) > 3 ? ['date' => intval($res[3])] : [];
$this->counter++;
$this->results[] = new \App\Models\Result(
......@@ -36,7 +37,8 @@ class Onenewspagevideo extends Searchengine
$anzeigeLink,
$descr,
$this->gefVon,
$this->counter
$this->counter,
$additionalInformation
);
}
if (count($this->results) > $this->resultCount) {
......
public/js/all.js
View file @ de0fc383
......@@ -3615,6 +3615,10 @@ function tabs() {
$("#" + fokus + "TabSelector").attr("data-loaded", "1");
$("#" + fokus).html(data);
$("input[name=focus]").val($("#foki li.active a").attr("aria-controls"));
<<<<<<< HEAD
=======
$('iframe').iFrameResize();
>>>>>>> development
getDocumentReadyForUse(fokus);
});
} else {
......
public/js/all.js.map
View file @ de0fc383
This diff is collapsed.
resources/lang/de/index.php
View file @ de0fc383
......@@ -13,6 +13,7 @@ return [
'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
'partnertitle' => 'MetaGer unterstützen, ohne Mehrkosten für Sie',
'mapstitle' => 'Der MetaGer Kartenservice',
'plugin' => 'MetaGer-Plugin hinzufügen',
'plugintitle' => 'MetaGer zu Ihrem Browser hinzufügen',
......
resources/lang/de/team.php
View file @ de0fc383
<?php
return [
'role.1' => 'Geschäftsführer, Vorstand',
'role.1' => 'Geschäftsführender Vorstand/CEO',
'role.2' => 'Büroleiter und Jugendschutzbeauftragter',
'role.3' => 'Pressereferentin',
'role.4' => 'Programmierer',
......@@ -10,5 +10,6 @@ return [
'role.7' => 'Sekretariat',
'contact.1' => 'Fragen/Probleme zu MetaGer etc. bitte immer an <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> mailen, oder das <a href="/kontakt/">Kontaktformular mit Verschlüsselung</a> benutzten, oder am besten: ins <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">MetaGer-Forum</a> schreiben. Wir können bei der Vielzahl der Anfragen nicht immer zeitnah antworten - im <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">MetaGer-Forum</a> können Ihnen wahrscheinlich auch andere MetaGer-Nutzer weiterhelfen, und von den Fragen und Antworten profitieren ALLE.',
'contact.2' => 'Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.',
'contact.2' => 'Und falls Sie jemals eine EMail mit "seltsamem" Inhalt bekommen sollten, auf der unsere Namen und/oder unsere EMail Adressen als Absender genannt sind, dann lesen Sie bitte hier weiter: <a href="https://metager.de/wsb/fakemail/">https://metager.de/wsb/fakemail/</a>',
'contact.3' => 'Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.',
];
resources/lang/en/team.php
View file @ de0fc383
<?php
return [
'role.1' => 'chief executive, chairman',
'role.2' => 'office supervisor und youth protection commissioner',
'role.3' => 'press secretary',
'role.4' => 'programmer',
'role.5' => 'programmer',
'role.6' => 'programmer',
'role.7' => 'secretary',
'contact.1' => 'Please mail your questions/problems about MetaGer etc. to <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> or use the <a href="/en/kontakt/">contact form with encryption</a>, or preferably make a post in the <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">MetaGer-forum</a>. Due to the amount of requests, we can not always answer promptly - in the <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">MetaGer-forum</a> there are probably other users which can help you aswell, and the questions and answers benefit everyone.',
'contact.2' => 'Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc.',
];
"role.1" => "chief executive, chairman",
"role.2" => "office supervisor und youth protection commissioner",
"role.3" => "press secretary",
"role.4" => "programmer",
"role.5" => "programmer",
"role.6" => "programmer",
"role.7" => "secretary",
"contact.1" => "Please mail your questions/problems about MetaGer etc. to <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a> or use the <a href=\"/en/kontakt/\">contact form with encryption</a>, or preferably make a post in the <a href=\"http://forum.suma-ev.de/\" target=\"_blank\" rel=\"noopener\">MetaGer-forum</a>. Due to the amount of requests, we can not always answer promptly - in the <a href=\"http://forum.suma-ev.de/\" target=\"_blank\" rel=\"noopener\">MetaGer-forum</a> there are probably other users which can help you aswell, and the questions and answers benefit everyone.",
"contact.2" => "And: If getting any emails from us with strange contents please read more about this: <a href=\"https://metager.de/wsb/fakemail/\">https://metager.de/wsb/fakemail/</a>",
"contact.3" => "Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc."
];
\ No newline at end of file
resources/lang/es/team.php
View file @ de0fc383
......@@ -9,5 +9,5 @@ return [
"role.6" => " Programador | programadora",
"role.7" => "La oficina",
"contact.1" => "Preguntas, propuestas....escribir un e-mail a <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a> o usan <a href=\"/kontakt/\">formulario contacto cifrado</a> o, mejor usan el foro <a href=\"http://forum.suma-ev.de/\" target=\"_blank\" rel=\"noopener\">MetaGer-Foro</a>.",
"contact.2" => "Solo en caso de emergencia: escribir un e-mail a una persona determinada."
"contact.3" => "Solo en caso de emergencia: escribir un e-mail a una persona determinada."
];
\ No newline at end of file
resources/views/index.blade.php
View file @ de0fc383
......@@ -293,15 +293,14 @@
</div>
</fieldset>
<ul class="list-inline searchform-bonus">
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" rel="noopener" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}</a></li>
<li><a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" rel="noopener" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}</a></li>
<li class="hidden-xs seperator">|</li>
<li id="plug"
@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
class="hidden"
@endunless
>
<a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a>
<a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><span class="glyphicon glyphicon-log-in"></span> {{ trans('index.plugin') }}</a>
</li>
</ul>
<script src="{{ elixir('js/lib.js') }}"></script>
......
resources/views/languages/edit.blade.php
View file @ de0fc383
......@@ -54,6 +54,8 @@
<p>{{ trans('languages.hinweis.1') }}</p>
<p>{!! trans('languages.hinweis.2') !!}</p>
<p>{!! trans('languages.hinweis.3') !!}</p>
<p><b>E-Mail-Adresse für Rückfragen</b> (optional):</p>
<p><input type="email" name="email" form="submit" value="{{$email}}"/></p>
<button class="btn btn-success" type="submit" form="submit">Daten übermitteln</button>
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/editLanguage.js') }}"></script>
......
resources/views/layouts/result.blade.php
View file @ de0fc383
......@@ -75,7 +75,11 @@
{!! $result->descr !!}
</div>
@else
@if( $metager->getFokus() == "nachrichten" )
<div class="description">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }} {{ $result->descr }}</div>
@else
<div class="description">{{ $result->descr }}</div>
@endif
@endif
</div>
</div>
resources/views/team/team.blade.php
View file @ de0fc383
......@@ -30,6 +30,10 @@
<p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
<a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
</li>
<li>
<p>Givi, Aria - {!! trans('team.role.6') !!} -
<a href="mailto:aria@suma-ev.de">aria@suma-ev.de</a></p>
</li>
<li>
<p>Riel, Carsten - {!! trans('team.role.7') !!} -
<a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
......@@ -37,4 +41,5 @@
</ul>
<p>{!! trans('team.contact.1') !!}</p>
<p>{!! trans('team.contact.2') !!}</p>
<p>{!! trans('team.contact.3') !!}</p>
@endsection
routes/web.php
View file @ de0fc383
......@@ -158,8 +158,8 @@ Route::group(
return redirect('https://metager.de/klassik/databund');
});
Route::get('languages', 'LanguageController@createOverview');
Route::get('languages/edit/{from}/{to}/{exclude?}', 'LanguageController@createEditPage');
Route::post('languages/edit/{from}/{to}/{exclude?}', 'MailController@sendLanguageFile');
Route::get('languages/edit/{from}/{to}/{exclude?}/{email?}', 'LanguageController@createEditPage');
Route::post('languages/edit/{from}/{to}/{exclude?}/{email?}', 'MailController@sendLanguageFile');
Route::get('berlin', 'StartpageController@berlin');
Route::group(['prefix' => 'app'], function () {
......
Supports Markdown
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