Commit dd0503cd authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge with Development

parents da69a4b2 61705e5b
......@@ -5,3 +5,4 @@
Homestead.json
Homestead.yaml
.env
.orig
......@@ -38,13 +38,32 @@ class Search implements ShouldQueue
*/
public function handle()
{
$this->fp = $this->getFreeSocket();
if ($this->fp) {
if ($this->writeRequest()) {
$this->readAnswer();
}
$url = "";
if($this->port === "443"){
$url = "https://";
}else{
$url = "http://";
}
$url .= $this->host . $this->getString;
$ch = curl_init($url);
curl_setopt_array($ch, array(
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => $url,
CURLOPT_USERAGENT => $this->useragent,
CURLOPT_FOLLOWLOCATION => TRUE,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_MAXCONNECTS => 50,
CURLOPT_LOW_SPEED_LIMIT => 500,
CURLOPT_LOW_SPEED_TIME => 5,
CURLOPT_TIMEOUT => 10
));
$result = curl_exec($ch);
curl_close($ch);
Redis::hset('search.' . $this->hash, $this->name, $result);
}
private function readAnswer()
......
......@@ -882,7 +882,7 @@ class MetaGer
{
$this->request = $request;
# Sichert, dass der request in UTF-8 formatiert ist
if ($request->input('encoding', '') !== "utf8") {
if ($request->input('encoding', 'utf8') !== "utf8") {
# In früheren Versionen, als es den Encoding Parameter noch nicht gab, wurden die Daten in ISO-8859-1 übertragen
$input = $request->all();
foreach ($input as $key => $value) {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -90,7 +90,7 @@ function popovers() {
$(this).popover("destroy");
$(this).popover({
//html : true,
//title : "<span class='glyphicon glyphicon-cog'></span> Optionen",
//title : "<i class="fa fa-cog" aria-hidden="true"></i> Optionen",
content: $(this).parent().find(".content").html()
});
});
......@@ -229,8 +229,8 @@ function productWidget() {
easing: 'cubic-bezier(0.25, 0, 0.25, 1)',
speed: 600,
pager: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<i class="fa fa-chevron-left" aria-hidden="true"></i></span><span class="sr-only">Previous</span>',
nextHtml: '<i class="fa fa-chevron-right" aria-hidden="true"></i><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -273,8 +273,8 @@ function productWidget() {
pager: false,
enableTouch: false,
enableDrag: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<a class="fa fa-chevron-left" aria-hidden="true"></a><span class="sr-only">Previous</span>',
nextHtml: '<a class="fa fa-chevron-right" aria-hidden="true"></a><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -332,14 +332,14 @@ function createCustomFocuses() {
* @if( $metager->getFokus() === "produktsuche" )
* <li id="produktsucheTabSelector" class="active tab-selector" role="presentation" data-loaded="1">
* <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
* @else
* <li id="produktsucheTabSelector" class="tab-selector" role="presentation" data-loaded="0">
* <a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche', false) !!}">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
......@@ -366,10 +366,11 @@ function addFocus(focus, active = false) {
var searchLink = generateSearchLinkForFocus(focus)
focusElementLink.setAttribute("data-href", searchLink);
focusElementLink.setAttribute("href", searchLink);
// create <span> glyphicon
var focusElementIcon = document.createElement("span");
focusElementIcon.classList.add("glyphicon");
focusElementIcon.classList.add("glyphicon-cog");
// create <a> icon
var focusElementIcon = document.createElement("a");
focusElementIcon.classList.add("fa");
focusElementIcon.classList.add("fa-cog");
focusElementIcon.setAttribute("aria-hidden", "true");
// create <span> focusname
var focusElementName = document.createElement("span");
focusElementName.classList.add("hidden-xs");
......
......@@ -49,8 +49,8 @@ function setActionListeners() {
$("#addFocusBtn").click(function() {
showFocusCreateDialog("");
});
$("#save-focus-btn").click(saveFocus);
$("#delete-focus-btn").click(deleteFocus);
$(".save-focus-btn").click(saveFocus);
$(".delete-focus-btn").click(deleteFocus);
}
function setSettings() {
......@@ -79,7 +79,7 @@ function setSettings() {
$("fieldset.mobile input#bilder").attr("id", "angepasst");
$("fieldset.mobile label#bilder-label").attr("id", "anpassen-label");
$("fieldset.mobile label#anpassen-label").attr("for", "angepasst");
$("fieldset.mobile label#anpassen-label span.glyphicon").attr("class", "glyphicon glyphicon-cog");
$("fieldset.mobile label#anpassen-label a.fa").attr("class", "fa fa-cog");
$("fieldset.mobile label#anpassen-label span.content").html("angepasst");
}
}
......@@ -258,6 +258,9 @@ function saveFocus() {
*/
function deleteFocus() {
var oldId = document.getElementById("original-id").value;
if ($('#' + oldId).prop('checked')) {
setFocusToDefault()
}
localStorage.removeItem(oldId);
removeFocusById(oldId);
$("#create-focus-modal").modal("hide");
......@@ -287,10 +290,10 @@ function alreadyInUse(name) {
*
* <input id="NAME" class="hide" type="radio" name="focus" value="NAME" form="searchForm" checked required>
* <label id="NAME-label" for="NAME">
* <span class="glyphicon glyphicon-star"></span>
* <i class="fa fa-star" aria-hidden="true"></i>
* <span class="content">NAME</span>
* <button class="btn btn-default">
* <span class="glyphicon glyphicon-pencil"></span>
* <i class="fa fa-pencil" aria-hidden="true"></i>
* </button>
* </label>
*/
......@@ -318,14 +321,15 @@ function addFocus(name) {
newFocusLabel.classList.add("focus-label");
newFocusLabel.classList.add("custom-focus-label");
newFocusLabel.htmlFor = id;
// create glyphicon
var newFocusGlyphicon = document.createElement("span");
newFocusGlyphicon.classList.add("glyphicon");
newFocusGlyphicon.classList.add("glyphicon-star");
// create <i> icon
var newFocusIcon = document.createElement("i");
newFocusIcon.classList.add("fa");
newFocusIcon.classList.add("fa-star");
newFocusIcon.setAttribute("aria-hidden", "true");
// create content
var newFocusContent = document.createElement("span");
newFocusGlyphicon.classList.add("content");
newFocusContent.textContent = name;
newFocusIcon.classList.add("content");
newFocusContent.textContent = " " + name;
// create edit button
var newFocusEditLink = document.createElement("a");
newFocusEditLink.classList.add("focus-edit");
......@@ -335,18 +339,19 @@ function addFocus(name) {
newFocusEditLink.onclick = function() {
showFocusEditDialog(id);
}
var newFocusEditLinkGlyphicon = document.createElement("span");
newFocusEditLinkGlyphicon.classList.add("glyphicon");
newFocusEditLinkGlyphicon.classList.add("glyphicon-pencil");
var newFocusEditLinkIcon = document.createElement("i");
newFocusEditLinkIcon.classList.add("fa");
newFocusEditLinkIcon.classList.add("fa-pencil");
newFocusEditLinkIcon.setAttribute("aria-hidden", "true");
// add new elements
var addFocusBtn = document.getElementById("addFocusBtn");
foki.insertBefore(wrapper, addFocusBtn);
wrapper.appendChild(newFocus);
wrapper.appendChild(newFocusLabel);
newFocusLabel.appendChild(newFocusGlyphicon);
newFocusLabel.appendChild(newFocusIcon);
newFocusLabel.appendChild(newFocusContent);
wrapper.appendChild(newFocusEditLink);
newFocusEditLink.appendChild(newFocusEditLinkGlyphicon);
newFocusEditLink.appendChild(newFocusEditLinkIcon);
}
/**
* Remove the focuses html-elements
......@@ -403,4 +408,12 @@ function resetOptions() {
localStorage.removeItem(key);
}
}
}
function setFocusToDefault() {
setFocus('web')
}
function setFocus(focusID) {
$('#' + focusID).prop('checked', true)
}
\ No newline at end of file
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-95d76cf16b.js",
"js/scriptStartPage.js": "js/scriptStartPage-330e649107.js",
"js/scriptResultPage.js": "js/scriptResultPage-357d27fe23.js",
"js/scriptStartPage.js": "js/scriptStartPage-a59b8ddf71.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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