diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b3a51c49cea7015c8aa1f6bcd641efac491a913..85bf311314dfe656581cb40e07363d819f3b4c59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ update(144.76.113.134):
- which composer
- which git
- which php7.0
+ - which sqlite3
script:
# Pfad zum neu geklonten Repo
- path=`pwd`
@@ -16,14 +17,15 @@ update(144.76.113.134):
- git clone "$path" MetaGer_neu
- cd MetaGer_neu
- composer update
- - chmod -R 777 storage
- - chmod -R 777 bootstrap/cache
+ - php artisan queue:restart
- scp metager@metager3.de:~/.env .
- scp metager@metager3.de:~/sumas.xml config/
- scp metager@metager3.de:~/sumasEn.xml config/
- scp metager@metager3.de:~/blacklistUrl.txt config/
- scp metager@metager3.de:~/blacklistDomains.txt config/
- chmod 777 config/sumas.xml config/sumasEn.xml
+ - chmod -R 777 storage
+ - chmod -R 777 bootstrap/cache
- cd ~/
- rm -rf MetaGer
- mv MetaGer_neu MetaGer
@@ -38,6 +40,7 @@ update(metager3.de):
- which composer
- which git
- which php7.0
+ - which sqlite3
script:
# Pfad zum neu geklonten Repo
- path=`pwd`
@@ -46,14 +49,15 @@ update(metager3.de):
- git clone "$path" MetaGer_neu
- cd MetaGer_neu
- composer update
- - chmod -R 777 storage
- - chmod -R 777 bootstrap/cache
+ - php artisan queue:restart
- scp metager@metager3.de:~/.env .
- scp metager@metager3.de:~/sumas.xml config/
- scp metager@metager3.de:~/sumasEn.xml config/
- scp metager@metager3.de:~/blacklistUrl.txt config/
- scp metager@metager3.de:~/blacklistDomains.txt config/
- chmod 777 config/sumas.xml config/sumasEn.xml
+ - chmod -R 777 storage
+ - chmod -R 777 bootstrap/cache
- cd ~/
- rm -rf MetaGer
- mv MetaGer_neu MetaGer
\ No newline at end of file
diff --git a/LICENSES.md b/LICENSES.md
deleted file mode 100644
index 0b1d9c9172f0901e4e51c370d531dad93478a191..0000000000000000000000000000000000000000
--- a/LICENSES.md
+++ /dev/null
@@ -1,651 +0,0 @@
-# Projects used by MetaGer
-
-## [Laravel](https://laravel.com/)
-https://github.com/laravel/laravel
-
-The MIT License (MIT)
-
-Copyright (c) <Taylor Otwell>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-# MetaGer source code
-
-Other MetaGer source code, unless otherwise noted, is licensed under the AGPL v3 license:
-
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
- A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
- The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
- An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU Affero General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Remote Network Interaction; Use with the GNU General Public License.
-
- Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/app/Http/Controllers/SitesearchController.php b/app/Http/Controllers/SitesearchController.php
new file mode 100644
index 0000000000000000000000000000000000000000..8b590f76ea9edcebe9edd8a711ed250e6ae72a4c
--- /dev/null
+++ b/app/Http/Controllers/SitesearchController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App;
+
+
+class SitesearchController extends Controller
+{
+ public function loadPage(Request $request)
+ {
+ return view('widget.sitesearch')
+ ->with('title', trans('titles.sitesearch'))
+ ->with('css', 'sitesearch.css')
+ ->with('site', $request->input('site', ''))
+ ->with('navbarFocus', 'dienste');
+ }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 14afaca2eee7e7a793b565032f1e389f779ee644..5eddf7a4804f8a7414d27b563afe3e655f93386c 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -7,6 +7,7 @@ use Jenssegers\Agent\Agent;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Response;
+use App;
class StartpageController extends Controller
{
@@ -48,7 +49,9 @@ class StartpageController extends Controller
->with('sprueche', $request->input('param_sprueche', 'off'))
->with('tab', $request->input('param_sprueche', 'off'))
->with('focusPages', $focusPages)
- ->with('browser', $browser);
+ ->with('browser', $browser)
+ ->with('navbarFocus', 'suche');
+
}
public function loadPage($subpage)
@@ -102,4 +105,51 @@ class StartpageController extends Controller
return $response;
return $link;
}
+
+ public function loadSettings (Request $request)
+ {
+ $sumaFile = "";
+ if(App::isLocale('en'))
+ $sumaFile = config_path() . "/sumasEn.xml";
+ else
+ $sumaFile = config_path() . "/sumas.xml";
+
+ $xml = simplexml_load_file($sumaFile);
+ $sumas = $xml->xpath("suma");
+
+ $foki = [];
+ foreach($sumas as $suma)
+ {
+ if( (!isset($suma['disabled']) || $suma['disabled'] === "") && ( !isset($suma['userSelectable']) || $suma['userSelectable']->__toString() === "1") )
+ {
+ if( isset($suma['type']) )
+ {
+ $f = explode(",", $suma['type']->__toString());
+ foreach($f as $tmp)
+ {
+ $displayName = $suma['displayName']->__toString();
+ $url = isset($suma['homepage']) ? $suma['homepage']->__toString() : "https://metager.de";
+ $service = $suma['service']->__toString();
+ $foki[$tmp][$suma['name']->__toString()] = [ 'displayName' => $displayName, 'url' => $url, 'service' => $service];
+ }
+ }else
+ {
+ $displayName = $suma['displayName']->__toString();
+ $url = isset($suma['homepage']) ? $suma['homepage']->__toString() : "https://metager.de";
+ $service = $suma['service']->__toString();
+ $foki["andere"][$suma['name']->__toString()] = [ 'displayName' => $displayName, 'url' => $url, 'service' => $service];
+ }
+ }
+ }
+
+ return view('settings1')
+ ->with('foki', $foki)
+ ->with('title', 'Einstellungen')
+ ->with('css', 'settings.css')
+ ->with('js', ['settings.js'])
+ ->with('navbarFocus', 'suche');
+ die(var_dump($foki));
+
+ return $xml->saveXML();
+ }
}
\ No newline at end of file
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index bae3ad9634bb87faebd2c07b83537f1c96fb3e80..f4c0d947f94ece6504ef7eee535bcfb16bb57c57 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -50,5 +50,9 @@ class Kernel extends HttpKernel
'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+
+ 'localize' => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRoutes::class,
+ 'localizationRedirect' => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRedirectFilter::class,
+ 'localeSessionRedirect' => \Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect::class
];
}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 0a14c8b4190df79a2f5bd3f8f4599fbef5e1f809..73ad12bd75ba6002b28103cff878f1d450c606b8 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -11,96 +11,109 @@
|
*/
- Route::group(['prefix' => LaravelLocalization::setLocale()], function()
- {
- /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
- /* Route::get('/', function()
- {
- return view('index', [
- 'title' => trans('titles.index'),
- 'homeIcon']);
- }); */
+ Route::group(
+ [
+ 'prefix' => LaravelLocalization::setLocale()/*,
+ 'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]*/
+ ],
+ function()
+ {
+ /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
- Route::get('/', 'StartpageController@loadStartPage');
+ Route::get('/', 'StartpageController@loadStartPage');
- Route::get('impressum', function()
- {
- return view('impressum')
- ->with('title', trans('titles.impressum'))
- ->with('css', 'impressum.css');
- });
+ Route::get('impressum', function()
+ {
+ return view('impressum')
+ ->with('title', trans('titles.impressum'))
+ ->with('css', 'impressum.css')
+ ->with('navbarFocus', 'kontakt');
+ });
- Route::get('about', function()
- {
- return view('about')
- ->with('title', trans('titles.about'))
- ->with('css', 'about.css');
- });
- Route::get('team', function()
- {
- return view('team.team')
- ->with('title', trans('titles.team'))
- ->with('css', 'team.css');
- });
- Route::get('team/pubkey-wsb', function()
- {
- return view('team.pubkey-wsb')
- ->with('title', trans('titles.team'));
- });
+ Route::get('about', function()
+ {
+ return view('about')
+ ->with('title', trans('titles.about'))
+ ->with('css', 'about.css')
+ ->with('navbarFocus', 'kontakt');
+ });
+ Route::get('team', function()
+ {
+ return view('team.team')
+ ->with('title', trans('titles.team'))
+ ->with('css', 'team.css')
+ ->with('navbarFocus', 'kontakt');
+ });
+ Route::get('team/pubkey-wsb', function()
+ {
+ return view('team.pubkey-wsb')
+ ->with('title', trans('titles.team'))
+ ->with('navbarFocus', 'kontakt');
+ });
- Route::get('kontakt', function()
- {
- return view('kontakt.kontakt')
- ->with('title', trans('titles.kontakt'))
- ->with('css', 'kontakt.css')
- ->with('js', ['openpgp.min.js','kontakt.js']);
- });
+ Route::get('kontakt', function()
+ {
+ return view('kontakt.kontakt')
+ ->with('title', trans('titles.kontakt'))
+ ->with('css', 'kontakt.css')
+ ->with('js', ['openpgp.min.js','kontakt.js'])
+ ->with('navbarFocus', 'kontakt');
+ });
- Route::post('kontakt', 'MailController@contactMail');
+ Route::post('kontakt', 'MailController@contactMail');
- Route::get('spende', function()
- {
- return view('spende')
- ->with('title', trans('titles.spende'))
- ->with('css', 'donation.css');
- });
- Route::post('spende', 'MailController@donation');
+ Route::get('spende', function()
+ {
+ return view('spende')
+ ->with('title', trans('titles.spende'))
+ ->with('css', 'donation.css')
+ ->with('navbarFocus', 'foerdern');
+ });
+
+ Route::post('spende', 'MailController@donation');
- Route::get('datenschutz', function()
- {
- return view('datenschutz')
- ->with('title', trans('titles.datenschutz'))
- ->with('css', 'privacy.css');
- });
+ Route::get('datenschutz', function()
+ {
+ return view('datenschutz')
+ ->with('title', trans('titles.datenschutz'))
+ ->with('css', 'privacy.css')
+ ->with('navbarFocus', 'datenschutz');
+ });
- Route::get('hilfe', function()
- {
- return view('hilfe')
- ->with('title', trans('titles.hilfe'))
- ->with('css', 'help.css');
- });
+ Route::get('hilfe', function()
+ {
+ return view('hilfe')
+ ->with('title', trans('titles.hilfe'))
+ ->with('css', 'help.css')
+ ->with('navbarFocus', 'dienste');
+ });
- Route::get('widget', function()
- {
- return view('widget')
- ->with('title', trans('titles.widget'))
- ->with('css', 'widget.css');
+ Route::get('widget', function()
+ {
+ return view('widget.widget')
+ ->with('title', trans('titles.widget'))
+ ->with('css', 'widget.css')
+ ->with('navbarFocus', 'dienste');
});
-
- Route::get('settings', function()
+
+ Route::get('sitesearch', 'SitesearchController@loadPage');
+
+ Route::get('websearch', function()
{
- return view('settings')
- ->with('title', 'Einstellungen') // TODO Titel übersetzen
- ->with('css', 'settings.css')
- ->with('js', ['settings.js']);
- });
+ return view('widget.websearch')
+ ->with('title', trans('titles.websearch'))
+ ->with('css', 'websearch.css')
+ ->with('navbarFocus', 'dienste');
+ });
+
+ Route::get('settings', 'StartpageController@loadSettings');
-
- Route::get('meta/meta.ger3', 'MetaGerSearch@search');
- Route::get('meta/picture', 'Pictureproxy@get');
- Route::get('clickstats', 'LogController@clicklog');
+
+ Route::get('meta/meta.ger3', 'MetaGerSearch@search');
+ Route::get('meta/picture', 'Pictureproxy@get');
+ Route::get('clickstats', 'LogController@clicklog');
- Route::get('qt', 'MetaGerSearch@quicktips');
- Route::get('tips', 'MetaGerSearch@tips');
- Route::get('opensearch.xml', 'StartpageController@loadPlugin');
- });
+ Route::get('qt', 'MetaGerSearch@quicktips');
+ Route::get('tips', 'MetaGerSearch@tips');
+ Route::get('opensearch.xml', 'StartpageController@loadPlugin');
+ });
diff --git a/app/Jobs/Search.php b/app/Jobs/Search.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5c4669f5b07e4229a55d53d5561781fdaef9e0a
--- /dev/null
+++ b/app/Jobs/Search.php
@@ -0,0 +1,328 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Jobs\Job;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Http\Request;
+use Redis;
+
+class Search extends Job implements ShouldQueue
+{
+ use InteractsWithQueue, SerializesModels;
+
+ protected $hash, $host, $port, $name, $getString, $useragent, $fp, $sumaFile;
+ protected $buffer_length = 8192;
+
+ /**
+ * Create a new job instance.
+ *
+ * @return void
+ */
+ public function __construct($hash, $host, $port, $name, $getString, $useragent, $sumaFile)
+ {
+ $this->hash = $hash;
+ $this->host = $host;
+ $this->port = $port;
+ $this->name = $name;
+ $this->getString = $getString;
+ $this->useragent = $useragent;
+ $this->sumaFile = $sumaFile;
+ }
+
+ /**
+ * Execute the job.
+ *
+ * @return void
+ */
+ public function handle(Request $request)
+ {
+ $this->fp = $this->getFreeSocket();
+
+ if(!$this->fp)
+ {
+ $this->disable($this->sumaFile, "Die Suchmaschine " . $this->name . " wurde für 1h deaktiviert, weil keine Verbindung aufgebaut werden konnte");
+ }else
+ {
+ if($this->writeRequest())
+ {
+ $this->readAnswer();
+ }
+ }
+ }
+
+ public function disable($sumaFile, $message)
+ {
+ $xml = simplexml_load_file($sumaFile);
+ $xml->xpath("//sumas/suma[@name='" . $this->name . "']")['0']['disabled'] = date(DATE_RFC822, mktime(date("H")+1,date("i"), date("s"), date("m"), date("d"), date("Y")));
+ $xml->saveXML($sumaFile);
+ }
+
+ private function readAnswer ()
+ {
+ $time = microtime(true);
+ $headers = '';
+ $body = '';
+ $length = 0;
+
+ if(!$this->fp)
+ {
+ return;
+ }
+
+ // get headers FIRST
+ $c = 0;
+ stream_set_blocking($this->fp, 1);
+ do
+ {
+ // use fgets() not fread(), fgets stops reading at first newline
+ // or buffer which ever one is reached first
+ $data = fgets($this->fp, 8192);
+ // a sincle CRLF indicates end of headers
+ if ($data === false || $data == "\r\n" || feof($this->fp) ) {
+ // break BEFORE OUTPUT
+ break;
+ }
+ if( sizeof(($tmp = explode(": ", $data))) === 2 )
+ $headers[trim($tmp[0])] = trim($tmp[1]);
+ $c++;
+ }
+ while (true);
+
+ // end of headers
+ if(sizeof($headers) > 1){
+ $bodySize = 0;
+ if( isset($headers["Transfer-Encoding"]) && $headers["Transfer-Encoding"] === "chunked" )
+ {
+ $body = $this->readChunked();
+
+ }elseif( isset($headers['Content-Length']) )
+ {
+ $length = trim($headers['Content-Length']);
+ if(is_numeric($length) && $length >= 1)
+ $body = $this->readBody($length);
+ $bodySize = strlen($body);
+ }else
+ {
+ exit;
+ }
+ }else
+ {
+ return;
+ }
+
+ Redis::del($this->host . "." . $this->socketNumber);
+ if( isset($headers["Content-Encoding"]) && $headers['Content-Encoding'] === "gzip")
+ {
+ $body = $this->gunzip($body);
+ }
+ Redis::hset('search.' . $this->hash, $this->name, $body);
+ Redis::expire('search.' . $this->hash, 5);
+ }
+
+ private function readBody($length)
+ {
+ $theData = '';
+ $done = false;
+ stream_set_blocking($this->fp, 0);
+ $startTime = time();
+ $lastTime = $startTime;
+ while (!feof($this->fp) && !$done && (($startTime + 1) > time()) && $length !== 0)
+ {
+ usleep(100);
+ $theNewData = fgets($this->fp, 8192);
+ $theData .= $theNewData;
+ $length -= strlen($theNewData);
+ $done = (trim($theNewData) === '0');
+
+ }
+ return $theData;
+ }
+
+ private function readChunked()
+ {
+ $body = '';
+ // read from chunked stream
+ // loop though the stream
+ do
+ {
+ // NOTE: for chunked encoding to work properly make sure
+ // there is NOTHING (besides newlines) before the first hexlength
+
+ // get the line which has the length of this chunk (use fgets here)
+ $line = fgets($this->fp, 8192);
+
+ // if it's only a newline this normally means it's read
+ // the total amount of data requested minus the newline
+ // continue to next loop to make sure we're done
+ if ($line == "\r\n") {
+ continue;
+ }
+
+ // the length of the block is sent in hex decode it then loop through
+ // that much data get the length
+ // NOTE: hexdec() ignores all non hexadecimal chars it finds
+ $length = hexdec($line);
+
+ if (!is_int($length)) {
+ trigger_error('Most likely not chunked encoding', E_USER_ERROR);
+ }
+
+ // zero is sent when at the end of the chunks
+ // or the end of the stream or error
+ if ($line === false || $length < 1 || feof($this->fp)) {
+ if($length <= 0)
+ fgets($this->fp, 8192);
+ // break out of the streams loop
+ break;
+ }
+
+ // loop though the chunk
+ do
+ {
+ // read $length amount of data
+ // (use fread here)
+ $data = fread($this->fp, $length);
+
+ // remove the amount received from the total length on the next loop
+ // it'll attempt to read that much less data
+ $length -= strlen($data);
+
+ // PRINT out directly
+ // you could also save it directly to a file here
+
+ // store in string for later use
+ $body .= $data;
+
+ // zero or less or end of connection break
+ if ($length <= 0 || feof($this->fp))
+ {
+ // break out of the chunk loop
+ if($length <= 0)
+ fgets($this->fp, 8192);
+ break;
+ }
+ }
+ while (true);
+ // end of chunk loop
+ }
+ while (true);
+ // end of stream loop
+ return $body;
+ }
+
+ private function gunzip($zipped) {
+ $offset = 0;
+ if (substr($zipped,0,2) == "\x1f\x8b")
+ $offset = 2;
+ if (substr($zipped,$offset,1) == "\x08")
+ {
+ try
+ {
+ return gzinflate(substr($zipped, $offset + 8));
+ } catch (\Exception $e)
+ {
+ abort(500, "Fehler beim unzip des Ergebnisses von folgendem Anbieter: " . $this->name);
+ }
+ }
+ return "Unknown Format";
+ }
+
+ private function writeRequest ()
+ {
+
+ $out = "GET " . $this->getString . " HTTP/1.1\r\n";
+ $out .= "Host: " . $this->host . "\r\n";
+ $out .= "User-Agent: " . $this->useragent . "\r\n";
+ $out .= "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n";
+ $out .= "Accept-Language: de,en-US;q=0.7,en;q=0.3\r\n";
+ $out .= "Accept-Encoding: gzip, deflate, br\r\n";
+ $out .= "Connection: keep-alive\r\n\r\n";
+ # Anfrage senden:
+ $sent = 0; $string = $out; $time = microtime(true);
+ while(true)
+ {
+ try{
+ $tmp = fwrite($this->fp, $string);
+ }catch(\ErrorException $e)
+ {
+ # Irgendwas ist mit unserem Socket passiert. Wir brauchen einen neuen:
+ fclose($this->fp);
+ Redis::del($this->name . "." . $this->socketNumber);
+ $this->fp = $this->getFreeSocket();
+ $sent = 0;
+ $string = $out;
+ continue;
+ }
+ if($tmp){
+ $sent += $tmp;
+ $string = substr($string, $tmp);
+ }
+
+ if($sent >= strlen($out))
+ break;
+ }
+ if( $sent === strlen($out) )
+ {
+ return true;
+ }
+ return false;
+ }
+
+ private function getFreeSocket()
+ {
+ # Je nach Auslastung des Servers ( gleichzeitige Abfragen ), kann es sein, dass wir mehrere Sockets benötigen um die Abfragen ohne Wartezeit beantworten zu können.
+ # pfsockopen öffnet dabei einen persistenten Socket, der also auch zwischen den verschiedenen php Prozessen geteilt werden kann.
+ # Wenn der Hostname mit einem bereits erstellten Socket übereinstimmt, wird die Verbindung also aufgegriffen und fortgeführt.
+ # Allerdings dürfen wir diesen nur verwenden, wenn er nicht bereits von einem anderen Prozess zur Kommunikation verwendet wird.
+ # Wenn dem so ist, probieren wir den nächsten Socket zu verwenden.
+ # Dies festzustellen ist komplizierter, als man sich das vorstellt. Folgendes System sollte funktionieren:
+ # 1. Stelle fest, ob dieser Socket neu erstellt wurde, oder ob ein existierender geöffnet wurde.
+ $counter = 0; $fp = null;
+ do
+ {
+
+ if( intval(Redis::exists($this->host . ".$counter")) === 0 )
+ {
+ Redis::set($this->host . ".$counter", 1);
+ Redis::expire($this->host . ".$counter", 5);
+ $this->socketNumber = $counter;
+
+ try
+ {
+ $fp = pfsockopen($this->getHost() . ":" . $this->port . "/$counter", $this->port, $errstr, $errno, 1);
+ }catch(\ErrorException $e)
+ {
+ break;
+ }
+ # Wir gucken, ob der Lesepuffer leer ist:
+ stream_set_blocking($fp, 0);
+ $string = fgets($fp, 8192);
+ if( $string !== false || feof($fp) )
+ {
+ fclose($fp);
+ continue;
+ }
+ break;
+ }
+ $counter++;
+ }while(true);
+ return $fp;
+ }
+
+ private function getHost()
+ {
+ $return = "";
+ if( $this->port === "443" )
+ {
+ $return .= "tls://";
+ }else
+ {
+ $return .= "tcp://";
+ }
+ $return .= $this->host;
+ return $return;
+ }
+}
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 37c4b5cca3183ea8c46befcf0f78bcf1efdafd8e..2d8dffb3e83bfe29f5366967ea9fda61aa5fdfe6 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -52,8 +52,6 @@ class MetaGer
function __construct()
{
$this->starttime = microtime(true);
- define('CRLF', "\r\n");
- define('BUFFER_LENGTH', 8192);
if( file_exists(config_path() . "/blacklistDomains.txt") && file_exists(config_path() . "/blacklistUrl.txt") )
{
# Blacklists einlesen:
@@ -70,6 +68,12 @@ class MetaGer
$this->languageDetect->setNameMode("2");
}
+ public function getHashCode ()
+ {
+ $string = url()->full();
+ return md5($string);
+ }
+
public function rankAll ()
{
foreach( $this->engines as $engine )
@@ -278,7 +282,6 @@ class MetaGer
public function createSearchEngines (Request $request)
{
-
#die(SocketRocket::get("tls", "dominik-pfennig.de", "", 443));
# Überprüfe, welche Sumas eingeschaltet sind
@@ -312,7 +315,7 @@ class MetaGer
if(!(isset($suma['disabled']) && $suma['disabled']->__toString() === "1"))
{
- if($suma["name"]->__toString() === "overture")
+ if($suma["name"]->__toString() === "overture" || $suma["name"]->__toString() === "overtureAds")
{
$overtureEnabled = TRUE;
}
@@ -336,7 +339,7 @@ class MetaGer
){
if(!(isset($suma['disabled']) && $suma['disabled']->__toString() === "1"))
{
- if($suma["name"]->__toString() === "overture")
+ if($suma["name"]->__toString() === "overture" || $suma["name"]->__toString() === "overtureAds")
{
$overtureEnabled = TRUE;
}
@@ -353,6 +356,8 @@ class MetaGer
$this->errors[] = "Achtung: Sie haben in ihren Einstellungen keine Suchmaschine ausgewählt.";
}
+
+
$engines = [];
foreach($enabledSearchengines as $engine){
@@ -360,8 +365,8 @@ class MetaGer
{
continue;
}
- # Wenn diese Suchmaschine gar nicht eingeschaltet sein soll
+ # Wenn diese Suchmaschine gar nicht eingeschaltet sein soll
$path = "App\Models\parserSkripte\\" . ucfirst($engine["package"]->__toString());
$time = microtime();
@@ -378,43 +383,51 @@ class MetaGer
$this->sockets[$tmp->name] = $tmp->fp;
}
}
+
# Nun passiert ein elementarer Schritt.
# Wir warten auf die Antwort der Suchmaschinen, da wir vorher nicht weiter machen können.
# aber natürlich nicht ewig.
# Die Verbindung steht zu diesem Zeitpunkt und auch unsere Request wurde schon gesendet.
# Wir geben der Suchmaschine nun bis zu 500ms Zeit zu antworten.
-
- # Jetzt lesen wir alles aus, was da ist und verwerfen den Rest:
$enginesToLoad = count($engines);
$loadedEngines = 0;
- $time = 0;
+ $timeStart = microtime(true);
+
while( true )
{
+ $time = (microtime(true) - $timeStart) * 1000;
+ $loadedEngines = intval(Redis::hlen('search.' . $this->getHashCode()));
+ $canBreak = true;
+ if( $overtureEnabled && !Redis::hexists('search.' . $this->getHashCode(), 'overture') && !Redis::hexists('search.' . $this->getHashCode(), 'overtureAds'))
+ $canBreak = false;
+
+
# Abbruchbedingung
if($time < 500)
{
- if($loadedEngines >= $enginesToLoad)
+ if($loadedEngines >= $enginesToLoad && $canBreak)
break;
}elseif( $time >= 500 && $time < $this->time)
{
- if( ($loadedEngines / ($enginesToLoad * 1.0)) >= 0.8 )
+ if( ($loadedEngines / ($enginesToLoad * 1.0)) >= 0.8 && $canBreak )
break;
}else
{
break;
}
- foreach($engines as $engine)
+ usleep(50000);
+ }
+
+
+ foreach($engines as $engine)
+ {
+ if(!$engine->loaded)
{
- if(!$engine->loaded)
- {
- $success = $engine->retrieveResults();
- if($engine->loaded)
- $loadedEngines += 1;
- }
+ $engine->retrieveResults();
}
- usleep(50000);
- $time += 50;
}
+
+ # und verwerfen den Rest:
foreach( $engines as $engine )
{
if( !$engine->loaded )
diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php
index 977d3f27fc0e894f34746f738e9885bc3f7765ad..cb508ff46edcb506b6b43c9e91885a039a261e73 100644
--- a/app/Models/Searchengine.php
+++ b/app/Models/Searchengine.php
@@ -4,9 +4,13 @@ namespace App\Models;
use App\MetaGer;
use Log;
use Redis;
+use App\Jobs\Search;
+use Illuminate\Foundation\Bus\DispatchesJobs;
-abstract class Searchengine
+
+abstract class Searchengine
{
+ use DispatchesJobs;
protected $ch; # Curl Handle zum erhalten der Ergebnisse
public $fp;
@@ -58,67 +62,20 @@ abstract class Searchengine
$this->startTime = microtime();
$this->getString = $this->generateGetString($metager->getQ(), $metager->getUrl(), $metager->getLanguage(), $metager->getCategory());
- $counter = 0;
- # Wir benötigen einen verfügbaren Socket, über den wir kommunizieren können:
- $time = microtime(true);
- $this->fp = $this->getFreeSocket();
-
- $this->setStatistic("connection_time", ((microtime(true)-$time) / 1000000));
- if(!$this->fp)
- {
- $this->disable($metager->getSumaFile(), "Die Suchmaschine " . $this->name . " wurde für 1h deaktiviert, weil keine Verbindung aufgebaut werden konnte");
- }else
- {
- $time = microtime(true);
- $this->writeRequest();
- $this->setStatistic("write_time", ((microtime(true)-$time) / 1000000));
- }
+ $this->hash = $metager->getHashCode();
+
+ # Die Anfragen an die Suchmaschinen werden nun von der Laravel-Queue bearbeitet:
+ # Hinweis: solange in der .env der QUEUE_DRIVER auf "sync" gestellt ist, werden die Abfragen
+ # nacheinander abgeschickt.
+ # Sollen diese Parallel verarbeitet werden, muss ein anderer QUEUE_DRIVER verwendet werden.
+ # siehe auch: https://laravel.com/docs/5.2/queues
+ $this->dispatch(new Search($this->hash, $this->host, $this->port, $this->name, $this->getString, $this->useragent, $metager->getSumaFile()));
}
public abstract function loadResults($result);
- private function writeRequest ()
- {
- $out = "GET " . $this->getString . " HTTP/1.1\r\n";
- $out .= "Host: " . $this->host . "\r\n";
- $out .= "User-Agent: " . $this->useragent . "\r\n";
- $out .= "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n";
- $out .= "Accept-Language: de,en-US;q=0.7,en;q=0.3\r\n";
- $out .= "Accept-Encoding: gzip, deflate, br\r\n";
- $out .= "Connection: keep-alive\r\n\r\n";
-
- # Anfrage senden:
- $sent = 0; $string = $out; $time = microtime(true);
- while(true)
- {
- try{
- $tmp = fwrite($this->fp, $string);
- }catch(\ErrorException $e)
- {
- # Irgendwas ist mit unserem Socket passiert. Wir brauchen einen neuen:
- fclose($this->fp);
- Redis::del($this->name . "." . $this->socketNumber);
- $this->fp = $this->getFreeSocket();
- $sent = 0;
- $string = $out;
- continue;
- }
- if($tmp){
- $sent += $tmp;
- $string = substr($string, $tmp);
- }else
- abort(500, "Fehler beim schreiben.");
-
- if(((microtime(true) - $time) / 1000000) >= 500)
- {
- abort(500, "Konnte die Request Daten nicht an: " . $this->name . " senden");
- }
-
- if($sent >= strlen($out))
- break;
- }
- }
+
public function rank (\App\MetaGer $metager)
{
@@ -128,47 +85,7 @@ abstract class Searchengine
}
}
- private function getFreeSocket()
- {
- # Je nach Auslastung des Servers ( gleichzeitige Abfragen ), kann es sein, dass wir mehrere Sockets benötigen um die Abfragen ohne Wartezeit beantworten zu können.
- # pfsockopen öffnet dabei einen persistenten Socket, der also auch zwischen den verschiedenen php Prozessen geteilt werden kann.
- # Wenn der Hostname mit einem bereits erstellten Socket übereinstimmt, wird die Verbindung also aufgegriffen und fortgeführt.
- # Allerdings dürfen wir diesen nur verwenden, wenn er nicht bereits von einem anderen Prozess zur Kommunikation verwendet wird.
- # Wenn dem so ist, probieren wir den nächsten Socket zu verwenden.
- # Dies festzustellen ist komplizierter, als man sich das vorstellt. Folgendes System sollte funktionieren:
- # 1. Stelle fest, ob dieser Socket neu erstellt wurde, oder ob ein existierender geöffnet wurde.
- $counter = 0; $fp = null;
- do
- {
-
- if( intval(Redis::exists($this->host . ".$counter")) === 0 )
- {
- Redis::set($this->host . ".$counter", 1);
- Redis::expire($this->host . ".$counter", 5);
- $this->socketNumber = $counter;
-
- try
- {
- $fp = pfsockopen($this->getHost() . ":" . $this->port . "/$counter", $this->port, $errstr, $errno, 1);
- }catch(\ErrorException $e)
- {
- break;
- }
- # Wir gucken, ob der Lesepuffer leer ist:
- stream_set_blocking($fp, 0);
- if(fgets($fp, BUFFER_LENGTH) !== false)
- {
- Log::error("Der Lesepuffer von: " . $this->name . " war nach dem Erstellen nicht leer. Musste den Socket neu starten.");
- fclose($fp);
- $fp = pfsockopen($this->getHost() . ":" . $this->port . "/$counter", $this->port, $errstr, $errno, 1);
- }
- break;
- }
- $counter++;
- }while(true);
-
- return $fp;
- }
+
private function setStatistic($key, $val)
{
@@ -179,13 +96,7 @@ abstract class Searchengine
$this->$key = $newVal;
}
- public function disable($sumaFile, $message)
- {
- Log::info($message);
- $xml = simplexml_load_file($sumaFile);
- $xml->xpath("//sumas/suma[@name='" . $this->name . "']")['0']['disabled'] = date(DATE_RFC822, mktime(date("H")+1,date("i"), date("s"), date("m"), date("d"), date("Y")));
- $xml->saveXML($sumaFile);
- }
+
public function enable($sumaFile, $message)
{
@@ -200,192 +111,38 @@ abstract class Searchengine
fclose($this->fp);
}
- public function retrieveResults()
+ public function getSocket()
{
- $time = microtime(true);
- $headers = '';
- $body = '';
- $length = 0;
- if(!$this->fp)
- {
- return;
- }
- // get headers FIRST
- $c = 0;
- stream_set_blocking($this->fp, 0);
- do
+ $number = Redis::hget('search.' . $this->hash, $this->name);
+ if( $number === null )
{
- // use fgets() not fread(), fgets stops reading at first newline
- // or buffer which ever one is reached first
- $data = fgets($this->fp, BUFFER_LENGTH);
- // a sincle CRLF indicates end of headers
- if ($data === false || $data == CRLF || feof($this->fp) || ((microtime()-$time)/1000000) > 100 ) {
- // break BEFORE OUTPUT
- break;
- }
- if( sizeof(($tmp = explode(": ", $data))) === 2 )
- $headers[trim($tmp[0])] = trim($tmp[1]);
- $c++;
- }
- while (true);
- // end of headers
- if(sizeof($headers) > 1){
- $bodySize = 0;
- stream_set_blocking($this->fp, 1);
- if( isset($headers["Transfer-Encoding"]) && $headers["Transfer-Encoding"] === "chunked" )
- {
- $body = $this->readChunked();
-
- }elseif( isset($headers['Content-Length']) )
- {
- $length = trim($headers['Content-Length']);
- if(is_numeric($length) && $length >= 1)
- $body = $this->readBody($length);
- $bodySize = strlen($body);
- }else
- {
- die("Konnte nicht herausfinden, wie ich die Serverantwort von: " . $this->name . " auslesen soll. Header war: " . print_r($headers));
- }
- $this->loaded = true;
+ die("test");
+ return null;
}else
{
- return;
+ return pfsockopen($this->getHost() . ":" . $this->port . "/$number", $this->port, $errstr, $errno, 1);
}
+ }
- Redis::del($this->host . "." . $this->socketNumber);
- $this->setStatistic("read_time", ((microtime(true)-$time) / 1000000));
- if( isset($headers["Content-Encoding"]) && $headers['Content-Encoding'] === "gzip")
+ public function retrieveResults()
+ {
+ if( Redis::hexists('search.' . $this->hash, $this->name))
{
- $body = $this->gunzip($body);
+ $body = Redis::hget('search.' . $this->hash, $this->name);
+ $this->loadResults($body);
+ $this->loaded = true;
+ Redis::hdel('search.' . $this->hash, $this->name);
+ return true;
}
- #print_r($headers);
- #print($body);
- #print("\r\n". $bodySize);
- #exit;
- #die(print_r($headers));
- // $body and $headers should contain your stream data
- $this->loadResults($body);
- #print(print_r($headers, TRUE) . $body);
- #exit;
+ return false;
+
}
public function shutdown()
{
- if( $this->fp )
- fclose($this->fp);
Redis::del($this->host . "." . $this->socketNumber);
}
- private function readBody($length)
- {
- $theData = '';
- $done = false;
- stream_set_blocking($this->fp, 0);
- $startTime = time();
- $lastTime = $startTime;
- while (!feof($this->fp) && !$done && (($startTime + 1) > time()) && $length !== 0)
- {
- usleep(100);
- $theNewData = fgets($this->fp, BUFFER_LENGTH);
- $theData .= $theNewData;
- $length -= strlen($theNewData);
- $done = (trim($theNewData) === '0');
-
- }
- return $theData;
- }
-
- private function readChunked()
- {
- $body = '';
- // read from chunked stream
- // loop though the stream
- do
- {
- // NOTE: for chunked encoding to work properly make sure
- // there is NOTHING (besides newlines) before the first hexlength
-
- // get the line which has the length of this chunk (use fgets here)
- $line = fgets($this->fp, BUFFER_LENGTH);
-
- // if it's only a newline this normally means it's read
- // the total amount of data requested minus the newline
- // continue to next loop to make sure we're done
- if ($line == CRLF) {
- continue;
- }
-
- // the length of the block is sent in hex decode it then loop through
- // that much data get the length
- // NOTE: hexdec() ignores all non hexadecimal chars it finds
- $length = hexdec($line);
-
- if (!is_int($length)) {
- trigger_error('Most likely not chunked encoding', E_USER_ERROR);
- }
-
- // zero is sent when at the end of the chunks
- // or the end of the stream or error
- if ($line === false || $length < 1 || feof($this->fp)) {
- if($length <= 0)
- fgets($this->fp, BUFFER_LENGTH);
- // break out of the streams loop
- break;
- }
-
- // loop though the chunk
- do
- {
- // read $length amount of data
- // (use fread here)
- $data = fread($this->fp, $length);
-
- // remove the amount received from the total length on the next loop
- // it'll attempt to read that much less data
- $length -= strlen($data);
-
- // PRINT out directly
- #print $data;
- #flush();
- // you could also save it directly to a file here
-
- // store in string for later use
- $body .= $data;
-
- // zero or less or end of connection break
- if ($length <= 0 || feof($this->fp))
- {
- // break out of the chunk loop
- if($length <= 0)
- fgets($this->fp, BUFFER_LENGTH);
- break;
- }
- }
- while (true);
- // end of chunk loop
- }
- while (true);
- // end of stream loop
- return $body;
- }
-
- private function gunzip($zipped) {
- $offset = 0;
- if (substr($zipped,0,2) == "\x1f\x8b")
- $offset = 2;
- if (substr($zipped,$offset,1) == "\x08")
- {
- try
- {
- return gzinflate(substr($zipped, $offset + 8));
- } catch (\Exception $e)
- {
- abort(500, "Fehler beim unzip des Ergebnisses von folgendem Anbieter: " . $this->name);
- }
- }
- return "Unknown Format";
- }
-
protected function getHost()
{
$return = "";
diff --git a/app/Models/parserSkripte/Beammachine.php b/app/Models/parserSkripte/Beammachine.php
new file mode 100644
index 0000000000000000000000000000000000000000..102f080619a8c1717c0457d585b1fe5225f200ed
--- /dev/null
+++ b/app/Models/parserSkripte/Beammachine.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace app\Models\parserSkripte;
+use App\Models\Searchengine;
+
+class Beammachine extends Searchengine
+{
+ public $results = [];
+
+ function __construct (\SimpleXMLElement $engine, \App\MetaGer $metager)
+ {
+ parent::__construct($engine, $metager);
+ }
+
+ public function loadResults ($result)
+ {
+ $results = trim($result);
+
+ foreach( explode("\n", $results) as $result )
+ {
+ $res = explode("|", $result);
+ if(sizeof($res) < 3)
+ {
+ continue;
+ }
+ $title = $res[0];
+ $link = $res[1];
+ $anzeigeLink = $link;
+ $descr = $res[2];
+
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter
+ );
+ }
+
+
+ }
+}
diff --git a/app/Models/parserSkripte/Dart.php b/app/Models/parserSkripte/Dart.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d0674aa50df5018caacc292e097f21dab6ce8c7
--- /dev/null
+++ b/app/Models/parserSkripte/Dart.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace app\Models\parserSkripte;
+use App\Models\Searchengine;
+use Symfony\Component\DomCrawler\Crawler;
+
+class Dart extends Searchengine
+{
+ public $results = [];
+
+ function __construct (\SimpleXMLElement $engine, \App\MetaGer $metager)
+ {
+ parent::__construct($engine, $metager);
+ }
+
+ public function loadResults ($result)
+ {
+
+ $crawler = new Crawler($result);
+ $crawler->filter('table#search-results > tr > td')->each(function (Crawler $node, $i)
+ {
+ $i = $i - ( 6 * $this->counter);
+ if($i === 0)
+ return;
+ if($i === 1)
+ {
+ $this->description = $node->text();
+ $this->link = "http://www.dart-europe.eu/" . $node->filter('a')->attr('href');
+ }
+ if($i === 2)
+ $this->title = $node->text();
+ if($i === 3)
+ $this->title .= " (" . $node->text() . ")";
+ if($i === 4)
+ $this->title .= " " . $node->text();
+ if($i === 5)
+ {
+ $this->title .= "|" . $node->text();
+ $title = $this->title;
+ $this->title = "";
+ $link = $this->link;
+ $this->link = "";
+ $anzeigeLink = $link;
+ $descr = $this->description;
+ $this->description = "";
+
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter
+ );
+ }
+ } );
+
+
+
+ }
+}
diff --git a/app/Models/parserSkripte/Goyax.php b/app/Models/parserSkripte/Goyax.php
index d93ccdbcdd20cf65df42d437d29505badad58fba..ccade3a7e1298e8e85f30f3e065f5a0f7726560d 100644
--- a/app/Models/parserSkripte/Goyax.php
+++ b/app/Models/parserSkripte/Goyax.php
@@ -2,33 +2,27 @@
namespace app\Models\parserSkripte;
use App\Models\Searchengine;
+use Symfony\Component\DomCrawler\Crawler;
class Goyax extends Searchengine
{
public $results = [];
- function __construct (\SimpleXMLElement $engine, \App\MetaGer $metager)
+ function __construct (\SimpleXMLElement $engine, \App\MetaGer $metager)
{
parent::__construct($engine, $metager);
}
public function loadResults ($result)
{
- die($result);
- $results = trim($result);
- foreach( explode("\n", $results) as $result )
+ $crawler = new Crawler($result);
+ $crawler->filter('tr.treffer')->each(function (Crawler $node, $i)
{
-
- $res = explode("|", $result);
- if(sizeof($res) < 3)
- {
- continue;
- }
- $title = $res[0];
- $link = $res[2];
+ $title = $node->filter('td.name')->text();
+ $link = "http://www.goyax.de" . $node->filter('td.name > a')->attr('href');
$anzeigeLink = $link;
- $descr = $res[1];
+ $descr = "Aktie: " . $node->filter('td.waehrung')->text() . " " . $node->filter('td.isin')->text();
$this->counter++;
$this->results[] = new \App\Models\Result(
@@ -39,9 +33,10 @@ class Goyax extends Searchengine
$descr,
$this->gefVon,
$this->counter
- );
- }
+ );
+ } );
+
}
-}
\ No newline at end of file
+}
diff --git a/app/Models/parserSkripte/Loklak.php b/app/Models/parserSkripte/Loklak.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0aea9ac102b09ed431c343c873d51f1bfba92a3
--- /dev/null
+++ b/app/Models/parserSkripte/Loklak.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace app\Models\parserSkripte;
+use App\Models\Searchengine;
+use Log;
+
+class Loklak extends Searchengine
+{
+ public $results = [];
+
+ function __construct (\SimpleXMLElement $engine, \App\MetaGer $metager)
+ {
+ parent::__construct($engine, $metager);
+ }
+
+ public function loadResults ($result)
+ {
+ if(!$result)
+ {
+ return;
+ }
+ $results = json_decode($result, true);
+ if( !isset($results['statuses']) )
+ return;
+ foreach($results['statuses'] as $result)
+ {
+ $title = $result["screen_name"];
+ $link = $result['link'];
+ $anzeigeLink = $link;
+ $descr = $result["text"];
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter
+ );
+ }
+ }
+}
diff --git a/config/database.php b/config/database.php
index 076fc54e5d82e13b4cf00bdf7499b5090c647789..57cc7e5c76b968776b5e2d60571a7ada84e7e565 100755
--- a/config/database.php
+++ b/config/database.php
@@ -48,7 +48,7 @@ return [
'sqlite' => [
'driver' => 'sqlite',
- 'database' => env('DB_DATABASE', database_path('database.sqlite')),
+ 'database' => database_path(env('DB_DATABASE', 'database.sqlite')),
'prefix' => '',
],
diff --git a/config/laravellocalization.php b/config/laravellocalization.php
index fed09e0f475351655e55056ae2022ab4a3f730d3..5060d6ca3938659c1a3037656c26d45284f745e0 100755
--- a/config/laravellocalization.php
+++ b/config/laravellocalization.php
@@ -307,6 +307,6 @@ return [
// IMPORTANT - When hideDefaultLocaleInURL is set to true, the unlocalized root is treated as the applications default locale "app.locale".
// Because of this language negotiation using the Accept-Language header will NEVER occur when hideDefaultLocaleInURL is true.
//
- 'hideDefaultLocaleInURL' => false,
+ 'hideDefaultLocaleInURL' => true,
];
diff --git a/database/metager.sqlite b/database/metager.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/database/migrations/2016_06_14_132524_create_jobs_table.php b/database/migrations/2016_06_14_132524_create_jobs_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..81b2d29f2b9eb6f7c3f245c517b2293485c8dc44
--- /dev/null
+++ b/database/migrations/2016_06_14_132524_create_jobs_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateJobsTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('jobs', function (Blueprint $table) {
+ $table->bigIncrements('id');
+ $table->string('queue');
+ $table->longText('payload');
+ $table->tinyInteger('attempts')->unsigned();
+ $table->tinyInteger('reserved')->unsigned();
+ $table->unsignedInteger('reserved_at')->nullable();
+ $table->unsignedInteger('available_at');
+ $table->unsignedInteger('created_at');
+ $table->index(['queue', 'reserved', 'reserved_at']);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('jobs');
+ }
+}
diff --git a/database/migrations/2016_06_14_132551_create_failed_jobs_table.php b/database/migrations/2016_06_14_132551_create_failed_jobs_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d733b6bf029a112fc5885f57501c6dc85963afe
--- /dev/null
+++ b/database/migrations/2016_06_14_132551_create_failed_jobs_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFailedJobsTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('failed_jobs', function (Blueprint $table) {
+ $table->increments('id');
+ $table->text('connection');
+ $table->text('queue');
+ $table->longText('payload');
+ $table->timestamp('failed_at')->useCurrent();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('failed_jobs');
+ }
+}
diff --git a/database/migrations/2016_06_14_132601_create_failed_jobs_table.php b/database/migrations/2016_06_14_132601_create_failed_jobs_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d733b6bf029a112fc5885f57501c6dc85963afe
--- /dev/null
+++ b/database/migrations/2016_06_14_132601_create_failed_jobs_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFailedJobsTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('failed_jobs', function (Blueprint $table) {
+ $table->increments('id');
+ $table->text('connection');
+ $table->text('queue');
+ $table->longText('payload');
+ $table->timestamp('failed_at')->useCurrent();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('failed_jobs');
+ }
+}
diff --git a/public/css/503.css b/public/css/503.css
new file mode 100644
index 0000000000000000000000000000000000000000..497bd97249ddcf2ea7a695f7029bb900399fd71c
--- /dev/null
+++ b/public/css/503.css
@@ -0,0 +1,29 @@
+html, body {
+ height: 100%;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ color: #B0BEC5;
+ display: table;
+ font-weight: 100;
+ font-family: 'Lato';
+}
+
+.container {
+ text-align: center;
+ display: table-cell;
+ vertical-align: middle;
+}
+
+.content {
+ text-align: center;
+ display: inline-block;
+}
+
+.title {
+ font-size: 72px;
+ margin-bottom: 40px;
+}
diff --git a/public/css/quicktips.css b/public/css/quicktips.css
new file mode 100644
index 0000000000000000000000000000000000000000..3cda80cd19d82bda9fda26b5708acdb78b6de941
--- /dev/null
+++ b/public/css/quicktips.css
@@ -0,0 +1,43 @@
+.quicktip {
+ margin-bottom:15px;
+ padding: 10px;
+ line-height: 1.2 !important;
+ font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+ color: #000;
+ border-left: 3px solid #FB0;
+ font-size: 14px;
+}
+
+.wikiqtextract {
+ font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.wikiqtextract p {
+ margin-bottom:0;
+}
+
+.quicktip a {
+ color: #00F;
+}
+
+.qtheader {
+ font-family: verdana,arial,helvetica,sans-serif;
+}
+
+.mutelink {
+ color:black!important;
+}
+
+#spruch {
+ margin-bottom:20px;
+ padding: 5px;
+ line-height: 1.2 !important;
+ color: #070;
+ border-left: 3px solid #070;
+ font-size: 16px;
+ font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.author {
+ float: right !important;
+}
diff --git a/public/css/sitesearch.css b/public/css/sitesearch.css
new file mode 100644
index 0000000000000000000000000000000000000000..6f136ed0f51eda78045f4e35cf08322c141c98d7
--- /dev/null
+++ b/public/css/sitesearch.css
@@ -0,0 +1,68 @@
+button.metager-searchbutton {
+ height: 30px!important;
+ width: 100px!important;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC!important;
+ padding: 6px 12px!important;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1!important;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE!important;
+}
+
+main.mg-panel {
+ text-align: left;
+}
+
+code {
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+}
+
+.metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+}
+.metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+}
+.metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+}
\ No newline at end of file
diff --git a/public/css/styleResultPage.css b/public/css/styleResultPage.css
index cfd178a1fa9a073e996a01225adf3bc0dc8c3195..86884153cb57deecacfa36413f6dee3fe9c7c5b7 100644
--- a/public/css/styleResultPage.css
+++ b/public/css/styleResultPage.css
@@ -432,28 +432,15 @@ a:hover
color:green;
}
/* Style für den Footer */
-.footer{
- padding: 15px 0;
- margin-top:50px;
- margin-bottom: 0;
-}
-.footer a{
- color:black;
-}
-.footer li{
- width:49%;
- padding:0;
- margin:0;
- text-align:center;
-}
-.footer .left{
- text-align:right;
- padding-right:20px;
+footer{
+ text-align: center;
+
}
-.footer .right{
- text-align:left;
- padding-left:20px;
+
+footer a{
+ color: black!important;
}
+
/* Ein resetter für Floats */
.clearfix{
clear:both;
diff --git a/public/css/styleResultPageMobile.css b/public/css/styleResultPageMobile.css
index 87ef3e072db479b173927f08b122639b47282816..25fb74401413a794682126d184de25654dc5c454 100644
--- a/public/css/styleResultPageMobile.css
+++ b/public/css/styleResultPageMobile.css
@@ -52,10 +52,7 @@ header nav {
.result{
padding:0;
}
-.result > .resultInformation{
- margin-left:0;
- padding-left:0;
-}
+
.result .link a{
white-space:nowrap;
overflow:hidden;
diff --git a/public/css/websearch.css b/public/css/websearch.css
new file mode 100644
index 0000000000000000000000000000000000000000..2b96d29bf3a84bff6491a8f7d0756fda2f8f90ce
--- /dev/null
+++ b/public/css/websearch.css
@@ -0,0 +1,50 @@
+main.mg-panel {
+ text-align: left;
+}
+
+code {
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+}
+
+.metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+}
+
+.metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+}
+
+.metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+}
\ No newline at end of file
diff --git a/public/css/welcome.css b/public/css/welcome.css
new file mode 100644
index 0000000000000000000000000000000000000000..ba69802a283394b6b19577df300767800c327af6
--- /dev/null
+++ b/public/css/welcome.css
@@ -0,0 +1,27 @@
+html, body {
+ height: 100%;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ display: table;
+ font-weight: 100;
+ font-family: 'Lato';
+}
+
+.container {
+ text-align: center;
+ display: table-cell;
+ vertical-align: middle;
+}
+
+.content {
+ text-align: center;
+ display: inline-block;
+}
+
+.title {
+ font-size: 96px;
+}
diff --git a/public/index.php b/public/index.php
index 79a6cbfc5b5b79827ca11c38bbac1d0aabb64378..76ed52b9c96dfdf120c03a00f9698c40ca756d04 100644
--- a/public/index.php
+++ b/public/index.php
@@ -9,21 +9,24 @@
# Unser erster Schritt wird sein, IP-Adresse und USER-Agent zu anonymisieren, damit
# nicht einmal wir selbst noch Zugriff auf die Daten haben:
-if( !isset($_SERVER['HTTP_X_FORWARDED_FOR'] ))
+if( !isset($_SERVER['HTTP_X_FORWARDED_FOR']) && isset($_SERVER['REMOTE_ADDR']) )
{
$_SERVER['REMOTE_ADDR'] = preg_replace("/(\d+)\.(\d+)\.\d+.\d+/s", "$1.$2.0.0", $_SERVER['REMOTE_ADDR']);
-}else
+}elseif( isset($_SERVER['HTTP_X_FORWARDED_FOR']))
{
$_SERVER['HTTP_X_FORWARDED_FOR'] = preg_replace("/(\d+)\.(\d+)\.\d+.\d+/s", "$1.$2.0.0", $_SERVER['HTTP_X_FORWARDED_FOR']);
}
-$agentPieces = explode(" ", $_SERVER['HTTP_USER_AGENT']);
-
-for($i = 0; $i < count($agentPieces); $i++)
+if( isset($_SERVER['HTTP_USER_AGENT']) )
{
- $agentPieces[$i] = preg_replace("/(\d+\.\d+)/s", "0.0", $agentPieces[$i]);
- $agentPieces[$i] = preg_replace("/([^\/]*)\/\w+/s", "$1/0.0", $agentPieces[$i]);
+ $agentPieces = explode(" ", $_SERVER['HTTP_USER_AGENT']);
+
+ for($i = 0; $i < count($agentPieces); $i++)
+ {
+ $agentPieces[$i] = preg_replace("/(\d+\.\d+)/s", "0.0", $agentPieces[$i]);
+ $agentPieces[$i] = preg_replace("/([^\/]*)\/\w+/s", "$1/0.0", $agentPieces[$i]);
+ }
+ $_SERVER['HTTP_USER_AGENT'] = implode(" ", $agentPieces);
}
-$_SERVER['HTTP_USER_AGENT'] = implode(" ", $agentPieces);
/*
|--------------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index 57c1d177d77cbaff62017800a8f8741e5c19537e..5f115efeae8c0d45435d60c6876b89d94d72a689 100644
--- a/readme.md
+++ b/readme.md
@@ -8,6 +8,13 @@ Während wir daran arbeiten sie soweit fertig zu stellen, dass alles exakt so fu
ein Mechanismus für den automatischen Deploy dafür, dass zu jedem beliebigen Zeitpunkt der Master-Branch in seiner aktuellen Version
über die Adresse https://metager3.de ( Entwicklungsserver ) erreichbar ist.
+## MetaGer zu langsam?
+Damit MetaGer so schnell wird, wie auf unserem Live-Server, erfordert es ein wenig Konfigurationsarbeit. Der Grund, warum die Version nach dem Checkout langsamer als normal ist, ist der, dass die eingestellten Suchmaschinen im Standard synchron abgefragt werden.
+Das heißt, dass bei einer Suche mit 20 Suchmaschinen eine Suchmaschine nach der anderen abgefragt wird.
+Die parallele abarbeitung kann mit Hilfe von Laravels Queue-System ( https://laravel.com/docs/5.2/queues ) hergestellt werden.
+Im Standard, ist in der Datei ".env" QUEUE_DRIVER=sync gesetzt.
+Wir verwenden auf unseren Servern den QUEUE_DRIVER=redis und haben mit Hilfe von Supervisor ( https://laravel.com/docs/5.2/queues#supervisor-configuration ) eine Menge queue:worker Prozesse am laufen, die für eine parallele bearbeitung sorgen.
+
## Offizielle Dokumentation
Die Dokumentation ist im Wiki des Gitlab-Projektes zu finden.
@@ -27,4 +34,4 @@ zögere biite nicht ein Ticket zu schreiben oder eine Mail an [office@suma-ev.de
Der MetaGer-eigene Code, sofern nicht anders anders angegeben, steht unter der [AGPL-Lizenz Version 3](https://www.gnu.org/licenses/agpl-3.0).
-Eine Liste der Projekte, auf denen MetaGer basiert, und deren Lizenzen sind in der Datei LICENSES.md zu finden.
\ No newline at end of file
+Eine Liste der Projekte, auf denen MetaGer basiert, und deren Lizenzen sind in der Datei LICENSE zu finden.
diff --git a/resources/lang/de/404.php b/resources/lang/de/404.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3b46c81c907382eec7c2cdc97e5939d3c03e17d
--- /dev/null
+++ b/resources/lang/de/404.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+ '1' => 'Fehler 404, Seite nicht gefunden',
+ '2' => 'Möglicherweise haben Sie einen falschen oder veralteten Link eingegeben.',
+];
\ No newline at end of file
diff --git a/resources/lang/de/500.php b/resources/lang/de/500.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a2ccaae6db5b9950f6da067f0db76a8653da7b8
--- /dev/null
+++ b/resources/lang/de/500.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+ '1' => 'Ups. Das hätte nicht passieren dürfen.',
+ '2' => 'Bei Ihrer Anfrage ist etwas schief gegangen. Wir versuchen, möglichst schnell, der Sache auf den Grund zu gehen.',
+];
\ No newline at end of file
diff --git a/resources/lang/de/sitesearch.php b/resources/lang/de/sitesearch.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e8a77433389f24346106f7406a723ea116658d2
--- /dev/null
+++ b/resources/lang/de/sitesearch.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+ 'head.1' => 'MetaGer Sitesearch-Widget',
+ 'head.2' => 'Hier finden Sie ein Metager-Widget für Ihre Webseite.',
+ 'head.3' => 'Website auf der gesucht werden soll',
+ 'head.4' => 'Website eingeben...',
+ 'head.5' => 'Generieren',
+
+ 'generated.1' => 'Vorschau',
+ 'generated.2' => 'Sicher suchen & finden mit MetaGer',
+ 'generated.3' => 'Suche mit MetaGer...',
+ 'generated.4' => 'Suchen',
+ 'generated.5' => 'Code',
+ 'generated.6' => 'de',
+];
\ No newline at end of file
diff --git a/resources/lang/de/staticPages.php b/resources/lang/de/staticPages.php
index 0adea0d775f15af68c03bd89c7c9eadc92eb52bd..495558211891501c8ba7eb9d29b73b232eed1e26 100644
--- a/resources/lang/de/staticPages.php
+++ b/resources/lang/de/staticPages.php
@@ -19,7 +19,10 @@ return [
'nav16' => 'Fördern',
'nav17' => 'Einkaufen bei MetaGer-Fördershops',
'nav18' => 'Kontakt',
+ 'nav19' => 'Sprache',
+
'navigationToggle' => 'Navigation anzeigen',
+
'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ',
'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.'
];
\ No newline at end of file
diff --git a/resources/lang/de/titles.php b/resources/lang/de/titles.php
index bd320e15dc26f01fe7da74fab8ef28b7106b91d6..c2cd27479bbf39b32d2db96ba61b85955493ddc2 100644
--- a/resources/lang/de/titles.php
+++ b/resources/lang/de/titles.php
@@ -9,5 +9,8 @@ return [
'spende' => 'Spenden - MetaGer',
'datenschutz' => 'Datenschutz und Privatsphäre - MetaGer',
'hilfe' => 'Hilfe - MetaGer',
- 'widget' => 'MetaGer Widget'
+ 'widget' => 'MetaGer Widget',
+ 'settings' => 'Einstellungen',
+ 'websearch' => 'Websuche-Widget - MetaGer',
+ 'sitesearch' => 'Sitesearch-Widget - MetaGer',
];
\ No newline at end of file
diff --git a/resources/lang/de/websearch.php b/resources/lang/de/websearch.php
new file mode 100644
index 0000000000000000000000000000000000000000..0834a7d25aecffac131ccfab3df919bdd7aeb777
--- /dev/null
+++ b/resources/lang/de/websearch.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+ 'head.1' => 'MetaGer Websuche-Widget',
+ 'head.2' => 'Hier finden Sie ein Metager-Widget für Ihre Webseite.',
+ 'head.3' => 'Vorschau',
+ 'head.4' => 'Sicher suchen & finden mit MetaGer',
+ 'head.5' => 'Suche mit MetaGer...',
+ 'head.6' => 'all',
+ 'head.7' => 'Code',
+ 'head.8' => 'Suchen',
+];
\ No newline at end of file
diff --git a/resources/lang/en/404.php b/resources/lang/en/404.php
new file mode 100644
index 0000000000000000000000000000000000000000..be3c32e39e925b2f482cc94cd856056bfe2c19c2
--- /dev/null
+++ b/resources/lang/en/404.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+ '1' => 'Error 404, Page not found',
+ '2' => 'Maybe you entered a wrong or old link.',
+];
\ No newline at end of file
diff --git a/resources/lang/en/500.php b/resources/lang/en/500.php
new file mode 100644
index 0000000000000000000000000000000000000000..32ed51d7b2a93a70edf2a7f862fe7c0d1fe10a42
--- /dev/null
+++ b/resources/lang/en/500.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+ '1' => 'Oops. That should not have happened.',
+ '2' => 'Something went wrong with your request. We are drilling down on it as soon as possible.',
+];
\ No newline at end of file
diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php
index ee0e65aab89f6097a9de32f1b6e8401539e5a26d..8e6a98219e9b65e576726f6303e025b0329f12ab 100644
--- a/resources/lang/en/about.php
+++ b/resources/lang/en/about.php
@@ -5,19 +5,19 @@ return [
'head.2' => 'What are the advantages of using MetaGer?',
'list.1' => 'Privacy is quite natural for us: Completely built in and automatically applied to every search.',
- 'list.2' => 'More About it',
+ 'list.2' => 'More about privacy',
'list.3' => 'We do not work profit-oriented, we are a',
'list.4' => 'charitable association:',
'list.5' => 'Our goal is not to enrich ourselves with your clicks or even your data.',
- 'list.6' => 'primarily is a',
- 'list.7' => 'META-search-engine:',
+ 'list.6' => 'is primarily a',
+ 'list.7' => 'meta search engine:',
'list.8' => 'We query up to 50 search engines. Thus we can offer real variety in results.',
- 'list.9' => 'For our results, we do not prefer ',
- 'list.10' => 'what is clicked more often:',
+ 'list.9' => 'For our results, we do not prefer results',
+ 'list.10' => 'that are clicked more often:',
'list.11' => 'This also gives you variety, instead of mainstream.',
- 'list.12' => 'MetaGer is being online since 20 years: ',
+ 'list.12' => 'MetaGer is online since about 20 years: ',
'list.13' => 'Our experience is your advantage - we know what we do.',
'list.14' => 'But we are not perfect as well: If you encounter something weird: Please',
'list.15' => 'contact us!',
'list.16' => 'We take your hints real serious: YOU are most important for us.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/datenschutz.php b/resources/lang/en/datenschutz.php
index 04db7282ca0657a82edf35ab74cf015b8fce450a..d608f11ff7077f2e9d31b1468743f10503908984 100644
--- a/resources/lang/en/datenschutz.php
+++ b/resources/lang/en/datenschutz.php
@@ -3,31 +3,31 @@
return [
'head' => 'Privacy',
- 'general.1' => 'For us Privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small list of our approach. A more detailed description why we are the only real secure search engine can be found',
+ 'general.1' => 'For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach. A more detailed description why we are the most secure search engine can be found',
'general.2' => 'here',
'policy.1' => 'Our Approach/Policy:',
'policy.2' => 'Neither do we save your IP, nor the',
'policy.3' => '"fingerprint" of your Browser',
- 'policy.4' => '(Which most likely could identify you aswell).',
+ 'policy.4' => '(Which most likely could identify you as well).',
'policy.5' => 'We do not set cookies or use tracking-pixel or similar technology, to "track" our users (tracking = following a users digital movement on the internet).',
- 'policy.6' => 'The data transmission from MetaGer is only done encrypted via the https-protocol.',
- 'policy.7' => 'We offer access via the anonymous TOR-network, the',
- 'policy.8' => 'MetaGer-TOR-hidden Service.',
+ 'policy.6' => 'The data transmission from MetaGer is only done encrypted via the https protocol.',
+ 'policy.7' => 'We offer access via the anonymous TOR network, the',
+ 'policy.8' => 'MetaGer hidden service.',
'policy.9' => 'Since the access via the TOR-network seems complicated to many users and sometimes is also slow, we offer a different way, to visit the result pages anonymously: By clicking on the link "open anonymously". Doing this your personal information will be protected on this click and even on all following clicks.',
- 'policy.10' => 'We show as few advertisements as possible, clearly marking them, and as for financing we rely on our users. Your',
+ 'policy.10' => 'We show as few advertisements as possible, clearly marking them, and financially rely on our users, their',
'policy.11' => 'Donations',
- 'policy.12' => 'and subscriptions to',
- 'policy.13' => 'Metager is operated and developed by the charitable german Organisation',
- 'policy.14' => 'in Cooperation with the',
- 'policy.15' => 'Leibniz Universität Hannover',
+ 'policy.12' => 'and membership fees for',
+ 'policy.13' => 'Metager is operated and developed by the charitable german organisation',
+ 'policy.14' => 'in Ccooperation with the',
+ 'policy.15' => 'Leibniz University Hanover',
'policy.16' => '.',
- 'policy.17' => 'Our Servers are exclusively located in germany. Therefore they are governed by the german privacy law, which is said to be the most rigorous in the world.',
+ 'policy.17' => 'Our Servers are exclusively located in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.',
'policy.18' => 'Since the',
'policy.19' => 'revealments of Edward Snowden in June 2013',
- 'policy.20' => 'numerous search engines position with the self-description, that searching with them was save, because the user\'s IP adress was not saved. No matter how honourable these descriptions are - fact is that many search engines at least partially host their servers in the USA. This is also true for those search engines, which are still praised as recommendable. Because these search engines are,',
+ 'policy.20' => 'numerous search engines claim that they protect theit users privacy, because the user\'s IP adress is not saved. No matter how honourable these descriptions are - fact is that many search engines at least partially host their servers in the USA. Because these search engines are,',
'policy.21' => 'as per the Patriot Act and US law',
'policy.22' => ', fully unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).',
'twitter' => 'What others say about our privacy-concept on twitter:',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/fokiNames.php b/resources/lang/en/fokiNames.php
index a7e8fcc4f7b704dcb68993ccfe0dca6e9495aba5..f685ce9176e06c927b05cf235760a6b403867e06 100644
--- a/resources/lang/en/fokiNames.php
+++ b/resources/lang/en/fokiNames.php
@@ -5,6 +5,6 @@ return [
'news' => "nachrichten",
'science' => 'wissenschaft',
'shopping' => 'produktsuche',
- 'picture' => 'bilder',
+ 'images' => 'bilder',
'custom' => 'angepasst'
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 8ab6811988b1f2eb87b4d1d029f0e76524eb45ed..4bb7e11df4ff443afe48209c831b63058b688682 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -1,13 +1,13 @@
<?php
return [
- 'head.1' => 'MetaGer - Support',
- 'head.2' => 'The MetaGer-Support tries to offer help for every level of skills: The professional should not be forced to read lengthy explanations, while the beginner should learn to understand what happens here, and how IT happens.',
+ 'head.1' => 'MetaGer - Help',
+ 'head.2' => 'The MetaGer help tries to offer help for every level of skill: The professional should not be forced to read lengthy explanations, while the beginner should learn to understand what happens here, and how it happens.',
- 'help.1' => 'Help Information About the Usage of Metager',
+ 'help.1' => 'Usage',
'help.2' => 'General Settings',
- 'help.3' => 'All settings can be found at the searchfocus "customize".',
- 'help.4' => 'On the left hand side of the input field you will find a drop of color, which allows you to customize the color.',
+ 'help.3' => 'All settings can be found at the search focus "customize".',
+ 'help.4' => 'On the left hand side of the input field you will find a drop icon, which allows you to customize the color.',
'help.5' => 'A plugin for most browsers can be found easily via the link next to the search field, where browser should be preset.',
'help.6' => 'Personal Settings',
'help.7' => 'Selection of the Search Focus',
@@ -24,10 +24,10 @@ return [
'help.18' => 'If you want to exclude MetaGer-results, which contain words (stopwords), you can do this by first typing in your searchwords as usual, then typing a blank (" ") followed by a minus ("-") and the words you want to exclude from your search.',
'help.19' => 'An Example: You are looking for a new car, but you definitely do not want a BMW. Therefore your input would be: car new -BMW',
'help.20' => 'Multi Word Search',
- 'help.21' => 'By default, a multi word search looks for documents, in which all words appear. The search for multiple terms shows almost equal results with or without quotation marks. However, if you have a longer citation or something liek that, you should use quatation marks.',
+ 'help.21' => 'By default, a multi word search looks for documents, in which all words appear. The search for multiple terms shows almost equal results with or without quotation marks. However, if you have a longer citation or something like that, you should use quatation marks.',
'help.22' => 'Example: a search for "in den öden Fensterhöhlen" will provide many results, but it gets interesting (and more exact) when you search for: Schiller "in den öden Fensterhöhlen"',
'help.23' => 'Upper and Lower Case',
- 'help.24' => 'is not distinguished for search, it is a purely contentual search.',
+ 'help.24' => 'are usually not distinguished.',
'help.25' => 'Search Word Associator',
'help.26' => 'The headline above conveys a big problem of retrieving information from the internet: When searching in a certain field of expertise, the technical terms and conceptual field are not always known. To deduce this conceptual field with a click of your mouse, we developed the',
'help.27' => 'MetaGer-Web-Assoziator',
@@ -121,4 +121,4 @@ The MetaGer-TOR-Hidden-Service - accessible under:',
4) Then click on the button "MetaGer hidden öffnen"
Now use MetaGer as anonymous, as modern internet technology allows for. Once you have installed the "Tor Browser", you can also access the MetaGer-TOR-Hidden-Service directly under: http://b7cxf4dkdsko6ah2.onion/tor/. If you want to know more about the TOR-Hidden-Service: under https://www.torproject.org/docs/hidden-services.html.en there is a good explanation. In these times of total internet surveillance we should do what we can, to impede espionage for the sureillors - or at least "throw a wrench in the works".
',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/impressum.php b/resources/lang/en/impressum.php
index 187e9e6e41da3799975352405aff342ce8c247e7..1599bb5e1b8ba6c9cee1cb9bf076faeccac77689 100644
--- a/resources/lang/en/impressum.php
+++ b/resources/lang/en/impressum.php
@@ -19,4 +19,4 @@ under',
'info.10' => 'The "Gottfried Wilhelm Leibniz Universität Hannover" is a statutory body.',
'info.11' => 'Liability Note',
'info.12' => 'Despite thorough content control we do not take responsability for any content of external links. For the content of external links only their operators are reliable.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/index.php b/resources/lang/en/index.php
index 8ff2b2c28ca0f7415c6cfe406586c0a70a45a4fa..5513ce4505c392531449a4266211150fd789f2bc 100644
--- a/resources/lang/en/index.php
+++ b/resources/lang/en/index.php
@@ -7,7 +7,7 @@ return [
'foki.produkte' => 'Shopping',
'foki.anpassen' => 'customize',
- 'conveyor' => 'Purchase at supporting MetaGer Shops',
+ 'conveyor' => 'Purchase at affiliate shops',
'plugin' => 'Add the MetaGer-Plugin',
@@ -68,4 +68,4 @@ return [
'plugin.edge.3' => 'Scroll down and click on "View advanced settings"',
'plugin.edge.4' => 'Scroll down until you reach "Search in adress bar with" and click "Change"',
'plugin.edge.5' => 'Select "MetaGer: Search and Find Savely, Protect Privacy..." and click on "Set as default"',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/kontakt.php b/resources/lang/en/kontakt.php
index 2efc9cac4bbf4dc6930cc2d39fef7d8384a2a0ce..652649b15853eee4a0a631bdc77697d3bba92d1b 100644
--- a/resources/lang/en/kontakt.php
+++ b/resources/lang/en/kontakt.php
@@ -3,7 +3,7 @@
return [
'headline.1' => 'Contact',
'headline.2' => 'Forum',
- 'headline.3' => 'Please ask questions first at our',
+ 'headline.3' => 'Please ask your question first at our',
'headline.4' => 'This way others can benefit from an answer.',
'form.1' => 'Secure Contact Form',
@@ -23,4 +23,4 @@ We use Javascript for this.',
'letter.1' => 'By Letter Mail',
'letter.2' => 'We prefer digital contact. However, if you consider it neccessary to contact us postally, you can mail us at:',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 38190cecaa4684e4e71e20ebdf1a1d9e4273b68d..df9519072a3552430010cf7bea48404b6f857fc0 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -7,7 +7,7 @@ return [
'head.4' => '',
'allgemein.1' => 'General',
- 'allgemein.2' => 'disable sayings',
+ 'allgemein.2' => 'disable quotes',
'allgemein.3' => 'open links in same tab',
'allgemein.4' => 'select language',
'allgemein.5' => 'all languages',
@@ -31,7 +31,7 @@ return [
'suchmaschinen.11' => 'diving',
'suchmaschinen.12' => 'regenerative energies',
'suchmaschinen.13' => 'astronomy',
- 'suchmaschinen.14' => 'stock & finances',
+ 'suchmaschinen.14' => 'stocks & finances',
'suchmaschinen.15' => 'with archive',
'suchmaschinen.16' => 'germany, with archive',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/sitesearch.php b/resources/lang/en/sitesearch.php
new file mode 100644
index 0000000000000000000000000000000000000000..5bb494c9dbe5ddc103b30c0c2029f9cf5ea14389
--- /dev/null
+++ b/resources/lang/en/sitesearch.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+ 'head.1' => 'MetaGer Sitesearch-Widget',
+ 'head.2' => 'Here you find a Metager-Widget for your website.',
+ 'head.3' => 'Website to search on',
+ 'head.4' => 'Enter website...',
+ 'head.5' => 'Generate',
+
+ 'generated.1' => 'Preview',
+ 'generated.2' => 'Search & and find safely with MetaGer',
+ 'generated.3' => 'Search with MetaGer...',
+ 'generated.4' => 'Search',
+ 'generated.5' => 'Code',
+ 'generated.6' => 'en',
+];
\ No newline at end of file
diff --git a/resources/lang/en/staticPages.php b/resources/lang/en/staticPages.php
index 5d61d987ebcdf210470a83e5707e0731af9a71b8..19035128835529338c22eab9bed36f38c20a289c 100644
--- a/resources/lang/en/staticPages.php
+++ b/resources/lang/en/staticPages.php
@@ -17,9 +17,12 @@ return [
'nav14' => 'TOR-Hidden-Service',
'nav15' => 'Tools',
'nav16' => 'Support',
- 'nav17' => 'Purchase at MetaGer Supporting Shops',
+ 'nav17' => 'Purchase at affiliate shops',
'nav18' => 'Contact',
+ 'nav19' => 'Language',
+
'navigationToggle' => 'show navigation',
+
'sumaev.1' => 'MetaGer is developed and run by ',
'sumaev.2' => 'SUMA-EV - Association for Free Access to Knowledge.'
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/team.php b/resources/lang/en/team.php
index 159ce1ca610f908c8af259d3cee5dfb3e328b755..c09cd29cc2d0a6a6b45c33207feeb946cc828260 100644
--- a/resources/lang/en/team.php
+++ b/resources/lang/en/team.php
@@ -16,6 +16,6 @@ return [
'contact.5' => 'MetaGer-forum.',
'contact.6' => 'Due to the amount of requests, we can not always answer promptly - in the',
'contact.7' => 'MetaGer-forum',
- 'contact.8' => 'there are probably other users which can help you aswell, and the questions and answers benefit EVERYONE.',
+ 'contact.8' => 'there are probably other users which can help you aswell, and the questions and answers benefit everyone.',
'contact.9' => '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
+];
diff --git a/resources/lang/en/titles.php b/resources/lang/en/titles.php
index 67c4be275595b3479d5b63c25f494e365404ae0f..36a115e33831e2b89b28569a09eb2bad36cce664 100644
--- a/resources/lang/en/titles.php
+++ b/resources/lang/en/titles.php
@@ -9,5 +9,8 @@ return [
'spende' => 'Donation - MetaGer',
'datenschutz' => 'Privacy - MetaGer',
'hilfe' => 'Help - MetaGer',
- 'widget' => 'MetaGer Widget'
-];
\ No newline at end of file
+ 'widget' => 'MetaGer Widget',
+ 'settings' => 'Settings',
+ 'websearch' => 'Websearch-Widget - MetaGer',
+ 'sitesearch' => 'Sitesearch-Widget - MetaGer',
+];
diff --git a/resources/lang/en/websearch.php b/resources/lang/en/websearch.php
new file mode 100644
index 0000000000000000000000000000000000000000..f705d97afaaa5fdbf562ebf83fb321a1043e07ae
--- /dev/null
+++ b/resources/lang/en/websearch.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+ 'head.1' => 'MetaGer Websearch-Widget',
+ 'head.2' => 'Here you find a Metager-Widget for your website.',
+ 'head.3' => 'Preview',
+ 'head.4' => 'Search & find safely with MetaGer',
+ 'head.5' => 'Search with MetaGer...',
+ 'head.6' => 'en',
+ 'head.7' => 'Code',
+ 'head.8' => 'Search',
+];
\ No newline at end of file
diff --git a/resources/lang/en/widget.php b/resources/lang/en/widget.php
index 32afb2a2a7dc34c974680bce6157a7e934b3a4dd..8f181521e82b2345fb509ab2a087d7bcfb5ff949 100644
--- a/resources/lang/en/widget.php
+++ b/resources/lang/en/widget.php
@@ -4,8 +4,8 @@ return [
'head' => 'MetaGer Widget',
'body.1' => 'MetaGer for usage on your website.
-Therefore choose, where you want to search:',
- 'body.2' => 'Search on whole Web',
- 'body.3' => 'Search on your Domain',
+Please choose the scope of your widget:',
+ 'body.2' => 'Search the Web',
+ 'body.3' => 'Search one Domain',
'body.4' => 'Please note: You must not use this widget, if you want to make the impression that MetaGer was your service or that your page was the real MetaGer page (which already happened). For this reason it is especially forbidden to use our logo.'
-];
\ No newline at end of file
+];
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index e93d6dc965542477e3e52e4ad92ca7b535d786c3..d2bdfad30632ce094b0df5a4109770def71a701f 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -6,12 +6,11 @@
<h1>{{ trans('about.head.1') }}</h1>
<h3>{{ trans('about.head.2') }}</h3>
<ul id="about-list">
- <li>{{ trans('about.list.1') }} <a href="/datenschutz/">{{ trans('about.list.2') }}...</a></li>
- <li>{{ trans('about.list.3') }}
- <a href="/spende/">{{ trans('about.list.4') }}</a> {{ trans('about.list.5') }}</li>
- <li><a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> {{ trans('about.list.6') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">{{ trans('about.list.7') }} </a>{{ trans('about.list.8') }}</li>
- <li>{{ trans('about.list.9') }}
- <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank">{{ trans('about.list.10') }}</a> {{ trans('about.list.11') }}</li>
- <li><a href="http://blog.suma-ev.de/node/207" target="_blank">{{ trans('about.list.12') }}</a>{{ trans('about.list.13') }}</li>
- <li> {{ trans('about.list.14') }} <a href="https://metager.de/kontakt/" target="_blank">{{ trans('about.list.15') }}</a> {{ trans('about.list.16') }} </li></ul>
+ <li>{{ trans('about.list.1') }} <a href="/datenschutz/">{{ trans('about.list.2') }}...</a></li>
+ <li>{{ trans('about.list.3') }} <a href="/spende/">{{ trans('about.list.4') }}</a> {{ trans('about.list.5') }}</li>
+ <li><a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> {{ trans('about.list.6') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">{{ trans('about.list.7') }} </a>{{ trans('about.list.8') }}</li>
+ <li>{{ trans('about.list.9') }} <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank">{{ trans('about.list.10') }}</a> {{ trans('about.list.11') }}</li>
+ <li><a href="http://blog.suma-ev.de/node/207" target="_blank">{{ trans('about.list.12') }}</a>{{ trans('about.list.13') }}</li>
+ <li> {{ trans('about.list.14') }} <a href="https://metager.de/kontakt/" target="_blank">{{ trans('about.list.15') }}</a> {{ trans('about.list.16') }} </li>
+</ul>
@endsection
\ No newline at end of file
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
index 0db0c2a86da48a8d7993400e3bda1e9488d82637..a67c093ad654274f0748678a6a8b64dadd064b64 100644
--- a/resources/views/datenschutz.blade.php
+++ b/resources/views/datenschutz.blade.php
@@ -2,22 +2,23 @@
@section('title', $title )
+@section('navbarFocus.datenschutz', 'class="active"')
+
@section('content')
- <h1>{{ trans('datenschutz.head') }}</h1>
- <p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p>
- <h2>{{ trans('datenschutz.policy.1') }}</h2>
- <ul id="privacyList"><li>{{ trans('datenschutz.policy.2') }} <a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank">{{ trans('datenschutz.policy.3') }}</a> {{ trans('datenschutz.policy.4') }}</li>
- <li>{{ trans('datenschutz.policy.5') }}</li>
- <li>{{ trans('datenschutz.policy.6') }}</li>
- <li>{{ trans('datenschutz.policy.7') }}
- <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank">{{ trans('datenschutz.policy.8') }}</a></li>
- <li>{{ trans('datenschutz.policy.9') }}</li>
- <li>{{ trans('datenschutz.policy.10') }} <a href="/spende/">{{ trans('datenschutz.policy.11') }}</a> {{ trans('datenschutz.policy.12') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a>.</li>
- <li>{{ trans('datenschutz.policy.13') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('datenschutz.policy.14') }} <a href="http://www.uni-hannover.de/" target="_blank">{{ trans('datenschutz.policy.15') }}</a> {{ trans('datenschutz.policy.16') }}</li>
- <li>{{ trans('datenschutz.policy.17') }}</li>
- <li>{{ trans('datenschutz.policy.18') }} <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">{{ trans('datenschutz.policy.19') }}</a> {{ trans('datenschutz.policy.20') }} <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">{{ trans('datenschutz.policy.21') }}</a> {{ trans('datenschutz.policy.22') }}</li></ul>
- <h2>{{ trans('datenschutz.twitter') }}</h2>
- <pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech
+<h1>{{ trans('datenschutz.head') }}</h1>
+<p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p>
+<h2>{{ trans('datenschutz.policy.1') }}</h2>
+<ul id="privacyList"><li>{{ trans('datenschutz.policy.2') }} <a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank">{{ trans('datenschutz.policy.3') }}</a> {{ trans('datenschutz.policy.4') }}</li>
+ <li>{{ trans('datenschutz.policy.5') }}</li>
+ <li>{{ trans('datenschutz.policy.6') }}</li>
+ <li>{{ trans('datenschutz.policy.7') }} <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank">{{ trans('datenschutz.policy.8') }}</a></li>
+ <li>{{ trans('datenschutz.policy.9') }}</li>
+ <li>{{ trans('datenschutz.policy.10') }} <a href="/spende/">{{ trans('datenschutz.policy.11') }}</a> {{ trans('datenschutz.policy.12') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a>.</li>
+ <li>{{ trans('datenschutz.policy.13') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('datenschutz.policy.14') }} <a href="http://www.uni-hannover.de/" target="_blank">{{ trans('datenschutz.policy.15') }}</a> {{ trans('datenschutz.policy.16') }}</li>
+ <li>{{ trans('datenschutz.policy.17') }}</li>
+ <li>{{ trans('datenschutz.policy.18') }} <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">{{ trans('datenschutz.policy.19') }}</a> {{ trans('datenschutz.policy.20') }} <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">{{ trans('datenschutz.policy.21') }}</a> {{ trans('datenschutz.policy.22') }}</li></ul>
+<h2>{{ trans('datenschutz.twitter') }}</h2>
+<pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech
> MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
<p>> 8.4.2014 Stiftung Datenschutz @DS_Stiftung
> Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccfb1914b79f2176aa4485aaca9bcd60401b2993
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.subPages')
+
+@section('title', 'Fehler 404 - Seite nicht gefunden')
+
+@section('content')
+<h1>{{ trans('404.1') }}</h1>
+<p>{{ trans('404.2') }}</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..5c78212eb5131a6141da811ca0cccd1743fc91d5
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.subPages')
+
+@section('title', 'Fehler 500 - Interner Serverfehler')
+
+@section('content')
+<h1>{{ trans('500.1') }}</h1>
+<p>{{ trans('500.2') }}</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 4a4150592d41e7059ff87d200fe3bb9362642537..625330e0841981bcd9efcab75abafe3d55d10b3b 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -1,47 +1,15 @@
<!DOCTYPE html>
<html>
- <head>
- <title>Be right back.</title>
-
- <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
- <style>
- html, body {
- height: 100%;
- }
-
- body {
- margin: 0;
- padding: 0;
- width: 100%;
- color: #B0BEC5;
- display: table;
- font-weight: 100;
- font-family: 'Lato';
- }
-
- .container {
- text-align: center;
- display: table-cell;
- vertical-align: middle;
- }
-
- .content {
- text-align: center;
- display: inline-block;
- }
-
- .title {
- font-size: 72px;
- margin-bottom: 40px;
- }
- </style>
- </head>
- <body>
- <div class="container">
- <div class="content">
- <div class="title">Be right back.</div>
- </div>
- </div>
- </body>
+ <head>
+ <title>Be right back.</title>
+ <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" type="text/css" href="/css/503.css" />
+ </head>
+ <body>
+ <div class="container">
+ <div class="content">
+ <div class="title">Be right back.</div>
+ </div>
+ </div>
+ </body>
</html>
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index c3965921d74396e736bb792a8b5b0234817579f7..fcc857e96d5a74797e700c767fd9b5c65db98a9e 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -7,26 +7,36 @@
<p>{{ trans('hilfe.head.2') }}</p>
<h2>{{ trans('hilfe.help.1') }}</h2>
<h3>{{ trans('hilfe.help.2') }}</h3>
-<ul><li>{{ trans('hilfe.help.3') }}</li>
- <li>{{ trans('hilfe.help.4') }}</li>
- <li>{{ trans('hilfe.help.5') }}</li></ul>
+<ul>
+ <li>{{ trans('hilfe.help.3') }}</li>
+ <li>{{ trans('hilfe.help.4') }}</li>
+ <li>{{ trans('hilfe.help.5') }}</li>
+</ul>
<h2>{{ trans('hilfe.help.6') }}</h2>
<h3>{{ trans('hilfe.help.7') }}</h3>
-<ul><li>{{ trans('hilfe.help.8') }}</li></ul>
+<ul>
+ <li>{{ trans('hilfe.help.8') }}</li>
+</ul>
<h4>{{ trans('hilfe.help.9') }}</h4>
-<ul><li>{{ trans('hilfe.help.10') }}</li>
- <li>{{ trans('hilfe.help.11') }}</li>
- <li>{{ trans('hilfe.help.12') }}</li>
- <li>{{ trans('hilfe.help.13') }}</li></ul>
+<ul>
+ <li>{{ trans('hilfe.help.10') }}</li>
+ <li>{{ trans('hilfe.help.11') }}</li>
+ <li>{{ trans('hilfe.help.12') }}</li>
+ <li>{{ trans('hilfe.help.13') }}</li>
+</ul>
<h3>{{ trans('hilfe.help.14') }}</h3>
<p>{{ trans('hilfe.help.15') }}</p>
<h2>{{ trans('hilfe.help.16') }}</h2>
<h3>{{ trans('hilfe.help.17') }}</h3>
-<ul><li>{{ trans('hilfe.help.18') }}</li>
-<li>{{ trans('hilfe.help.19') }}</li></ul>
+<ul>
+ <li>{{ trans('hilfe.help.18') }}</li>
+ <li>{{ trans('hilfe.help.19') }}</li>
+</ul>
<h3>{{ trans('hilfe.help.20') }}</h3>
<p>{{ trans('hilfe.help.21') }}</p>
-<ul><li>{{ trans('hilfe.help.22') }}</li></ul>
+<ul>
+ <li>{{ trans('hilfe.help.22') }}</li>
+</ul>
<h3>{{ trans('hilfe.help.23') }}</h3>
<p>{{ trans('hilfe.help.24') }}</p>
<h3>{{ trans('hilfe.help.25') }}</h3>
@@ -38,65 +48,77 @@
<p>{{ trans('hilfe.help.35') }}</p>
<p>{{ trans('hilfe.help.36') }} <a class="collapsed" href="#faq">MetaGer FAQ</a> {{ trans('hilfe.help.37') }} <a href="https://metager.de/kontakt/" target="_blank">Mail.</a></p>
<h1 id="faq">{{ trans('hilfe.faq.1') }}</h1>
-<ol><li><p>{{ trans('hilfe.faq.2') }}</p>
- <p>{{ trans('hilfe.faq.3') }}</p></li>
- <li><p>{{ trans('hilfe.faq.4') }}</p>
- <p>{{ trans('hilfe.faq.5') }}</p></li>
- <li><p>{{ trans('hilfe.faq.6') }}</p>
- <p>{{ trans('hilfe.faq.7') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">Wikipedia</a>, {{ trans('hilfe.faq.8') }}</p></li>
- <li>{{ trans('hilfe.faq.9') }}</li>
- <ul><li>{{ trans('hilfe.faq.10') }}</li>
- <li>{{ trans('hilfe.faq.11') }} <a href="http://www.klug-suchen.de/" target="_blank">klug-suchen.de.</a></li></ul>
- <li><p>{{ trans('hilfe.faq.12') }}</p>
- <p>{{ trans('hilfe.faq.13') }}</p></li>
- <li>{{ trans('hilfe.faq.14') }}</li>
- <p>{{ trans('hilfe.faq.15') }}</p>
- <ul><li>{{ trans('hilfe.faq.16') }}</li>
- <li>{{ trans('hilfe.faq.17') }}</li></ul>
- <li><p>{{ trans('hilfe.faq.18') }}</p>
- <p>{{ trans('hilfe.faq.19') }}</p></li>
- <li><p>{{ trans('hilfe.faq.20') }}</p>
- <p>{{ trans('hilfe.faq.21') }}</p></li>
- <li><p>{{ trans('hilfe.faq.22') }}</p>
- <p>{{ trans('hilfe.faq.23') }}</p></li>
- <li>
- <p>{{ trans('hilfe.faq.24') }}</p>
- <p>{{ trans('hilfe.faq.25') }}</p></li>
- <li><p>{{ trans('hilfe.faq.26') }}</p></li>
- <ul><li>{{ trans('hilfe.faq.27') }}</li>
- <li>{{ trans('hilfe.faq.28') }}</li>
- <li>{{ trans('hilfe.faq.29') }}</li></ul>
- <p>{{ trans('hilfe.faq.30') }} <a href="mailto:jugendschutz@metager.de" class="link">{{ trans('hilfe.faq.31') }}</a></p>
- <li><p>{{ trans('hilfe.faq.32') }}</p>
- <p>{{ trans('hilfe.faq.33') }}</p></li>
- <li><p>{{ trans('hilfe.faq.34') }}</p>
- <p>{{ trans('hilfe.faq.35') }}</p></li>
- <li><p>{{ trans('hilfe.faq.36') }}</p>
- <p>{{ trans('hilfe.faq.37') }}</p></li>
- <li><p>{{ trans('hilfe.faq.38') }}</p>
- <p>{{ trans('hilfe.faq.39') }}</p></li>
- <li><p>{{ trans('hilfe.faq.40') }}</p>
- <p>{{ trans('hilfe.faq.41') }}</p></li>
- <li><p>{{ trans('hilfe.faq.42') }}</p>
- <p>{{ trans('hilfe.faq.43') }}</p></li>
- <li><p>{{ trans('hilfe.faq.44') }}</p>
- <p>{{ trans('hilfe.faq.45') }}</p>
- <p>{{ trans('hilfe.faq.46') }}</p>
- <p>{{ trans('hilfe.faq.47') }}</p></li>
- <li><p>{{ trans('hilfe.faq.48') }}</p>
- <p>{{ trans('hilfe.faq.49') }}</p>
- <p>{{ trans('hilfe.faq.50') }}</p>
- <ul><li><p>{{ trans('hilfe.faq.51') }}</p></li>
- <li><p>{{ trans('hilfe.faq.52') }} <a href="https://metager.de/hilfe/#TORanleitung" target="_blank">{{ trans('hilfe.faq.53') }}</a> {{ trans('hilfe.faq.54') }}</p></li>
- <li><p>{{ trans('hilfe.faq.55') }}</p></li>
- <li><p>{{ trans('hilfe.faq.56') }}</p></li></ul></li>
- <li><p>{{ trans('hilfe.faq.57') }}</p>
- <p>{{ trans('hilfe.faq.58') }}</p></li>
- <li><p>{{ trans('hilfe.faq.59') }}</p>
- <p>{{ trans('hilfe.faq.60') }}</p></li>
- <li><p>{{ trans('hilfe.faq.61') }}</p>
- <p>{{ trans('hilfe.faq.62') }}</p></li>
- <li><p>{{ trans('hilfe.faq.63') }}</p>
- <p>{{ trans('hilfe.faq.64') }} <a href="https://metager.de/tor/" target="_blank">https://metager.de/tor/</a></p>
- <p>{{ trans('hilfe.faq.65') }}</p></li></ol>
+<ol>
+ <li><p>{{ trans('hilfe.faq.2') }}</p>
+ <p>{{ trans('hilfe.faq.3') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.4') }}</p>
+ <p>{{ trans('hilfe.faq.5') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.6') }}</p>
+ <p>{{ trans('hilfe.faq.7') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">Wikipedia</a>, {{ trans('hilfe.faq.8') }}</p></li>
+ <li>{{ trans('hilfe.faq.9') }}</li>
+ <ul>
+ <li>{{ trans('hilfe.faq.10') }}</li>
+ <li>{{ trans('hilfe.faq.11') }} <a href="http://www.klug-suchen.de/" target="_blank">klug-suchen.de.</a></li>
+ </ul>
+ <li><p>{{ trans('hilfe.faq.12') }}</p>
+ <p>{{ trans('hilfe.faq.13') }}</p></li>
+ <li>{{ trans('hilfe.faq.14') }}</li>
+ <p>{{ trans('hilfe.faq.15') }}</p>
+ <ul>
+ <li>{{ trans('hilfe.faq.16') }}</li>
+ <li>{{ trans('hilfe.faq.17') }}</li>
+ </ul>
+ <li><p>{{ trans('hilfe.faq.18') }}</p>
+ <p>{{ trans('hilfe.faq.19') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.20') }}</p>
+ <p>{{ trans('hilfe.faq.21') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.22') }}</p>
+ <p>{{ trans('hilfe.faq.23') }}</p></li>
+ <li>
+ <p>{{ trans('hilfe.faq.24') }}</p>
+ <p>{{ trans('hilfe.faq.25') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.26') }}</p></li>
+ <ul>
+ <li>{{ trans('hilfe.faq.27') }}</li>
+ <li>{{ trans('hilfe.faq.28') }}</li>
+ <li>{{ trans('hilfe.faq.29') }}</li>
+ </ul>
+ <p>{{ trans('hilfe.faq.30') }} <a href="mailto:jugendschutz@metager.de" class="link">{{ trans('hilfe.faq.31') }}</a></p>
+ <li><p>{{ trans('hilfe.faq.32') }}</p>
+ <p>{{ trans('hilfe.faq.33') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.34') }}</p>
+ <p>{{ trans('hilfe.faq.35') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.36') }}</p>
+ <p>{{ trans('hilfe.faq.37') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.38') }}</p>
+ <p>{{ trans('hilfe.faq.39') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.40') }}</p>
+ <p>{{ trans('hilfe.faq.41') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.42') }}</p>
+ <p>{{ trans('hilfe.faq.43') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.44') }}</p>
+ <p>{{ trans('hilfe.faq.45') }}</p>
+ <p>{{ trans('hilfe.faq.46') }}</p>
+ <p>{{ trans('hilfe.faq.47') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.48') }}</p>
+ <p>{{ trans('hilfe.faq.49') }}</p>
+ <p>{{ trans('hilfe.faq.50') }}</p>
+ <ul>
+ <li><p>{{ trans('hilfe.faq.51') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.52') }} <a href="https://metager.de/hilfe/#TORanleitung" target="_blank">{{ trans('hilfe.faq.53') }}</a> {{ trans('hilfe.faq.54') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.55') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.56') }}</p></li>
+ </ul>
+ </li>
+ <li><p>{{ trans('hilfe.faq.57') }}</p>
+ <p>{{ trans('hilfe.faq.58') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.59') }}</p>
+ <p>{{ trans('hilfe.faq.60') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.61') }}</p>
+ <p>{{ trans('hilfe.faq.62') }}</p></li>
+ <li><p>{{ trans('hilfe.faq.63') }}</p>
+ <p>{{ trans('hilfe.faq.64') }} <a href="https://metager.de/tor/" target="_blank">https://metager.de/tor/</a></p>
+ <p>{{ trans('hilfe.faq.65') }}</p>
+ </li>
+</ol>
@endsection
\ No newline at end of file
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8edd50073498fbb178f3b64dd0f3f146ac328a3c..a4c64f6ee88a976cfa8d5533a7b0626eb40a0a8c 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -2,6 +2,10 @@
@section('title', $title )
+@section('navbarFocus.search', 'class="active"')
+
+@section('navbarFocus.donate', 'class="dropdown"')
+
@section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
<div class="modal-dialog ">
@@ -75,7 +79,7 @@
</div>
</div>
<h1 id="mglogo">
- <a class="hidden-xs" href="/">MetaGer
+ <a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer
</a>
</h1>
<figure>
@@ -151,7 +155,7 @@
</span>
</button>
</div>
- <input type="text" name="eingabe" required="" autofocus="" class="form-control" placeholder="MetaGer: Sicher suchen & finden, Privatsphäre schützen">
+ <input type="text" name="eingabe" required="" autofocus="" class="form-control" placeholder="{{ trans('index.placeholder') }}">
<input type="hidden" name="encoding" value="utf8">
@if ($focus === 'angepasst') <input type="hidden" name="lang" value={{ $lang }} >
<input type="hidden" name="resultCount" value={{ $resultCount }} >
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 1bbd5c6639344b00fd49f73da06bee8acd50fcc7..6e1e3db689f18dea5f6ee891cad90241230f7b54 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,14 +1,15 @@
<div class="result row">
- <div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
- {{ $result->number }})
- </div>
-
- @if( $result->image !== "" )
- <div class="image col-xs-2 col-sm-1">
- <img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
+ <div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
+ {{ $result->number }})
</div>
+ @if( $result->image !== "" )
+ <div class="image col-xs-2 col-sm-1">
+ <img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
+ </div>
+ <div class="resultInformation col-xs-10 col-sm-10">
+ @else
+ <div class="resultInformation col-xs-12 col-sm-11">
@endif
- <div class="resultInformation col-xs-10 col-sm-10">
<p class="title">
<a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
{{ $result->titel }}
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index eb0d11dee3754e4d1a548a92c46c5d9ede910c34..55511408d59ae30af0d1909ff60fe9a016eebfb0 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -2,63 +2,61 @@
<html>
<head>
- <title>{{ $metager->getQ() }} - MetaGer</title>
- <link href="/css/bootstrap.css" rel="stylesheet" />
- <link href="/css/styleResultPage.css" rel="stylesheet" />
- @if( isset($mobile) && $mobile )
- <link href="/css/styleResultPageMobile.css" rel="stylesheet" />
- @endif
- <link href="/css/theme.css.php" rel="stylesheet" />
- <link href="/favicon.ico" rel="icon" type="image/x-icon" />
- <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
- <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
- <meta content="{{ getmypid() }}" name="p" />
- <meta content="{{ $eingabe }}" name="q" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>{{ $metager->getQ() }} - MetaGer</title>
+ <link href="/css/bootstrap.css" rel="stylesheet" />
+ <link href="/css/styleResultPage.css" rel="stylesheet" />
+ @if( isset($mobile) && $mobile )
+ <link href="/css/styleResultPageMobile.css" rel="stylesheet" />
+ @endif
+ <link href="/css/theme.css.php" rel="stylesheet" />
+ <link href="/favicon.ico" rel="icon" type="image/x-icon" />
+ <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
+ <meta content="{{ getmypid() }}" name="p" />
+ <meta content="{{ $eingabe }}" name="q" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
-
<body id="resultBody">
-
- @if( !isset($suspendheader) )
- @include('layouts.researchandtabs')
- @else
- <div class="tab-content container-fluid">
- @if( sizeof($errors) > 0 )
- <div class="alert alert-danger">
- <ul>
- @foreach($errors as $error)
- <li>{{ $error }}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @if( sizeof($warnings) > 0)
- <div class="alert alert-warning">
- <ul>
- @foreach($warnings as $warning)
- <li>{{ $warning }}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @yield('results')
- </div>
- @endif
-
- <footer>
- <ul class="list-unstyled list-inline footer">
- <li class="left"><a class="btn btn-default" href="/">MetaGer-Startseite</a>
- </li>
- <li class="right"><a class="btn btn-default" href="/impressum/">Impressum</a>
- </li>
- </ul>
- </footer>
- <script src="/js/jquery.js" type="text/javascript"></script>
- <script src="/js/bootstrap.js" type="text/javascript"></script>
- <script src="/js/masonry.js" type="text/javascript"></script>
- <script src="/js/imagesloaded.js" type="text/javascript"></script>
- <script src="/js/scriptResultPage.js" type="text/javascript"></script>
- <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
+ @if( !isset($suspendheader) )
+ @include('layouts.researchandtabs')
+ @else
+ <div class="tab-content container-fluid">
+ @if( sizeof($errors) > 0 )
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
+ <li>{{ $error }}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{{ $warning }}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @yield('results')
+ </div>
+ @endif
+ <footer>
+ <div class="row">
+ <div class="col-xs-6">
+ <a class="btn btn-default" href="/">MetaGer-Startseite</a>
+ </div>
+ <div class="col-xs-6">
+ <a class="btn btn-default" href="/impressum/">Impressum</a>
+ </div>
+ </div>
+ </footer>
+ <script src="/js/jquery.js" type="text/javascript"></script>
+ <script src="/js/bootstrap.js" type="text/javascript"></script>
+ <script src="/js/masonry.js" type="text/javascript"></script>
+ <script src="/js/imagesloaded.js" type="text/javascript"></script>
+ <script src="/js/scriptResultPage.js" type="text/javascript"></script>
+ <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
</body>
-
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 84499f7c13af74f4cbab11fe97b91efd9e2da8b0..f5af5723aed0fac3c7cbd1f83bddb4acf6210b57 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -1,173 +1,122 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>@yield('title')</title>
- <meta charset="utf-8" />
- <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben." />
- <meta name="keywords" content="Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
- <meta name="page-topic" content="Dienstleistung" />
- <meta name="robots" content="index,follow" />
- <meta name="revisit-after" content="7 days" />
- <meta name="audience" content="all" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
- <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
- <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen & finden, Privatsphäre schützen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
- <link href="/css/bootstrap.css" rel="stylesheet" />
- <link href="/css/style.css" rel="stylesheet" />
- @if (isset($css))
- <link href="/css/{{ $css }}" rel="stylesheet" />
- @endif
- <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
- </head>
- <body>
- <header>
- <nav class="navbar navbar-default">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
- <span class="sr-only">{{ trans('staticPages.navigationToggle') }}
- </span>
- <span class="icon-bar">
- </span>
- <span class="icon-bar">
- </span>
- <span class="icon-bar">
- </span>
- </button>
- </div>
- <div>
- @yield('homeIcon')
- </div>
- <div class="collapse navbar-collapse" id="navbar-collapse">
- <ul class="nav navbar-nav navbar-right">
- <li>
- <a href="/" id="navigationSuche">{{ trans('staticPages.nav1') }}
- </a>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
- <span class="caret">
- </span>
- </a>
- <ul class="dropdown-menu">
- <li>
- <a href="/spende/">{{ trans('staticPages.nav2') }}
- </a>
- </li>
- <li>
- <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}
- </a>
- </li>
- </ul>
- </li>
- <li>
- <a href="/datenschutz/" id="navigationPrivacy">{{ trans('staticPages.nav3') }}
- </a>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
- <span class="caret">
- </span>
- </a>
- <ul class="dropdown-menu">
- <li>
- <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}
- </a>
- </li>
- <li>
- <a href="/kontakt/">{{ trans('staticPages.nav5') }}
- </a>
- </li>
- <li>
- <a href="/team/">{{ trans('staticPages.nav6') }}
- </a>
- </li>
- <li>
- <a href="/about/">{{ trans('staticPages.nav7') }}
- </a>
- </li>
- <li>
- <a href="/impressum/">{{ trans('staticPages.nav8') }}
- </a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
- <span class="caret">
- </span>
- </a>
- <ul class="dropdown-menu">
- <li>
- <a href="/hilfe/">{{ trans('staticPages.nav9') }}
- </a>
- </li>
- <li>
- <a href="/widget/">{{ trans('staticPages.nav10') }}
- </a>
- </li>
- <li>
- <a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}
- </a>
- </li>
- <li>
- <a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}
- </a>
- </li>
- <li>
- <a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}
- </a>
- </li>
- <li>
- <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank">{{ trans('staticPages.nav14') }}
- </a>
- </li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </nav>
- </header>
-
- <div class="wrapper">
- <main class="mg-panel container">
- @if (isset($success))
- <div class="alert alert-success" role="alert">{{ $success }}</div>
- @endif
- @if (isset($error))
- <div class="alert alert-danger" role="alert">{{ $error }}</div>
- @endif
- @yield('content')
- </main>
- @yield('optionalContent')
- <footer>
- <ul class="list-inline hidden-xs">
- <li>
- <a href="https://www.suma-ev.de/" target="_blank">
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo">
- </a>
- </li>
- <li id="info">
- <a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a>
- {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a>
- </li>
- <li>
- <a href="https://www.uni-hannover.de/" target="_blank">
- <img src="/img/luh_metager.png" alt="LUH Logo">
- </a>
- </li>
- </ul>
- </footer>
- <script type="text/javascript" src="/js/jquery.js"></script>
- <script type="text/javascript" src="/js/bootstrap.js"></script>
- <script type="text/javascript" src="/js/scriptStartPage.js"></script>
- @if (isset($js))
- @foreach ($js as $script)
- <script type="text/javascript" src="/js/{{ $script }}"></script>
- @endforeach
- @endif
- <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
- </body>
+ <head>
+ <title>@yield('title')</title>
+ <meta charset="utf-8" />
+ <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben." />
+ <meta name="keywords" content="Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
+ <meta name="page-topic" content="Dienstleistung" />
+ <meta name="robots" content="index,follow" />
+ <meta name="revisit-after" content="7 days" />
+ <meta name="audience" content="all" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+ <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
+ <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+ <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen & finden, Privatsphäre schützen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
+ <link href="/css/bootstrap.css" rel="stylesheet" />
+ <link href="/css/style.css" rel="stylesheet" />
+ @if (isset($css))
+ <link href="/css/{{ $css }}" rel="stylesheet" />
+ @endif
+ <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
+ </head>
+ <body>
+ <header>
+ <nav class="navbar navbar-default">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
+ <span class="sr-only">{{ trans('staticPages.navigationToggle') }}</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div>
+ @yield('homeIcon')
+ </div>
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <ul class="nav navbar-nav navbar-right">
+ <li @if ($navbarFocus === 'suche') class="active" @endif >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
+ <li @if ($navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
+ <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a></li>
+ <li><a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}</a></li>
+ </ul>
+ </li>
+ <li @if ($navbarFocus === 'datenschutz') class="active" @endif >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
+ <li @if ($navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
+ <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a></li>
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a></li>
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a></li>
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a></li>
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
+ </ul>
+ </li>
+ <li @if ($navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
+ <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}</a></li>
+ <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a></li>
+ <li><a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}</a></li>
+ <li><a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}</a></li>
+ <li><a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}</a></li>
+ <li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
+ <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
+ @endforeach
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </nav>
+ </header>
+ <div class="wrapper">
+ <main class="mg-panel container">
+ @if (isset($success))
+ <div class="alert alert-success" role="alert">{{ $success }}</div>
+ @endif
+ @if (isset($error))
+ <div class="alert alert-danger" role="alert">{{ $error }}</div>
+ @endif
+ @yield('content')
+ </main>
+ @yield('optionalContent')
+ <footer>
+ <ul class="list-inline hidden-xs">
+ <li><a href="https://www.suma-ev.de/" target="_blank">
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a></li>
+ <li id="info">
+ <a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a>
+ {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a></li>
+ <li><a href="https://www.uni-hannover.de/" target="_blank">
+ <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
+ </ul>
+ </footer>
+ <script type="text/javascript" src="/js/jquery.js"></script>
+ <script type="text/javascript" src="/js/bootstrap.js"></script>
+ <script type="text/javascript" src="/js/scriptStartPage.js"></script>
+ @if (isset($js))
+ @foreach ($js as $script)
+ <script type="text/javascript" src="/js/{{ $script }}"></script>
+ @endforeach
+ @endif
+ <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
+ </div>
+ </body>
</html>
diff --git a/resources/views/layouts/subPages.blade.php b/resources/views/layouts/subPages.blade.php
index 9d5a0236b093f62e69f6c6f810ba2aca89a396a1..26a618702e695d084df9bee7390e3b8cf23a19de 100644
--- a/resources/views/layouts/subPages.blade.php
+++ b/resources/views/layouts/subPages.blade.php
@@ -1,10 +1,9 @@
@extends('layouts.staticPages')
@section('homeIcon')
-<a class="navbar-brand" href="/">
- <div class="logo">
- <h1>MetaGer
- </h1>
- </div>
- </a>
-@endsection
\ No newline at end of file
+ <a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+ <div class="logo">
+ <h1>MetaGer</h1>
+ </div>
+ </a>
+@endsection
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 87aec49caa45c747334d565f109ac100d0b4089f..2c78a240eecf34ed06e9d644c8b03231b15131d6 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,32 +1,29 @@
@extends('layouts.resultPage')
@section('results')
-
-@if( $metager->showQuicktips() )
-<div class="col-xs-12 col-md-8 resultContainer">
-@else
-<div class="col-xs-12 col-md-12 resultContainer">
-@endif
- {{-- 3-Mal Werbung --}}
- @for($i = 0; $i <= 2; $i++)
- @include('layouts.ad', ['ad' => $metager->popAd()])
- @endfor
-
- @foreach($metager->getResults()->items() as $result)
- @if($result->number % 7 === 0)
- @include('layouts.ad', ['ad' => $metager->popAd()])
- @endif
- @include('layouts.result', ['result' => $result])
- @endforeach
- <nav class="pager">
- {!! $metager->getResults()->links() !!}
- </nav>
-</div>
-@if( $metager->showQuicktips() )
-<div class="hidden-xs col-md-4" id="quicktips">
- <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
-</div>
-@endif
-
+ @if( $metager->showQuicktips() )
+ <div class="col-xs-12 col-md-8 resultContainer">
+ @else
+ <div class="col-xs-12 col-md-12 resultContainer">
+ @endif
+ {{-- 3-Mal Werbung --}}
+ @for($i = 0; $i <= 2; $i++)
+ @include('layouts.ad', ['ad' => $metager->popAd()])
+ @endfor
+ @foreach($metager->getResults()->items() as $result)
+ @if($result->number % 7 === 0)
+ @include('layouts.ad', ['ad' => $metager->popAd()])
+ @endif
+ @include('layouts.result', ['result' => $result])
+ @endforeach
+ <nav class="pager">
+ {!! $metager->getResults()->links() !!}
+ </nav>
+ </div>
+ @if( $metager->showQuicktips() )
+ <div class="hidden-xs col-md-4" id="quicktips">
+ <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
+ </div>
+ @endif
@endsection
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index d5f267f77547df5a3b451f4fbcef62fc60795971..13606769d5199525ecf8680ad3f9c666e16351c4 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -1,20 +1,17 @@
@extends('layouts.resultPage')
@section('results')
-
-<div id="container">
-@foreach($metager->getResults()->items() as $result)
- <div class="item">
- <div class="img">
- <a href="{{ $result->link }}" target="{{ $metager->getTab() }}">
- <img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/>
- </a>
+ <div id="container">
+ @foreach($metager->getResults()->items() as $result)
+ <div class="item">
+ <div class="img">
+ <a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/></a>
+ </div>
</div>
+ @endforeach
</div>
-@endforeach
-</div>
-<nav class="pager">
- {!! $metager->getResults()->links() !!}
-</nav>
+ <nav class="pager">
+ {!! $metager->getResults()->links() !!}
+ </nav>
@endsection
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index 249135498207446410e730e0ac7aaa8e0a251423..fde7799d86579f8f2a609963f5a3b902f45d0035 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/resources/views/metager3bilderresults.blade.php
@@ -1,14 +1,12 @@
<div id="container">
-@foreach($metager->getResults()->items() as $result)
- <div class="item">
- <div class="img">
- <a href="{{ $result->link }}" target="{{ $metager->getTab() }}">
- <img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/>
- </a>
+ @foreach($metager->getResults()->items() as $result)
+ <div class="item">
+ <div class="img">
+ <a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/></a>
+ </div>
</div>
- </div>
-@endforeach
+ @endforeach
</div>
<nav class="pager">
- {!! $metager->getResults()->links() !!}
+ {!! $metager->getResults()->links() !!}
</nav>
\ No newline at end of file
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index d5bc429fc226fc2ea769a97210e2c64d5e5672ad..2338ae9d01a1116c1d1bcbf5bd14d6b1428e4218 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -3,16 +3,15 @@
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
-
@foreach($metager->getResults()->items() as $result)
@if($result->number % 7 === 0)
- @include('layouts.ad', ['ad' => $metager->popAd()])
+ @include('layouts.ad', ['ad' => $metager->popAd()])
@endif
@include('layouts.result', ['result' => $result])
@endforeach
<nav class="pager">
- {!! $metager->getResults()->links() !!}
- </nav>
+ {!! $metager->getResults()->links() !!}
+ </nav>
</div>
<div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 6713f695e6fda0ea0f868cc264004b660771690b..ff49d5a056033ca2a837b17a27605ada395ef151 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -2,69 +2,20 @@
<head>
<title>MetaGer Quicktips</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
- <style>
- .quicktip {
- margin-bottom:15px;
- padding: 10px;
- line-height: 1.2 !important;
- font-family: Georgia,"Times New Roman",Palatino,Times,serif;
- color: #000;
- border-left: 3px solid #FB0;
- font-size: 14px;
- }
-
- .wikiqtextract {
- font-family: Georgia,"Times New Roman",Palatino,Times,serif;
- }
-
- .wikiqtextract p {
- margin-bottom:0;
- }
-
- .quicktip a {
- color: #00F;
- }
-
- .qtheader {
- font-family: verdana,arial,helvetica,sans-serif;
- }
-
- .mutelink {
- color:black!important;
- }
-
- #spruch {
- margin-bottom:20px;
- padding: 5px;
- line-height: 1.2 !important;
- color: #070;
- border-left: 3px solid #070;
- font-size: 16px;
- font-family: Georgia,"Times New Roman",Palatino,Times,serif;
- }
-
- .author {
- float: right !important;
- }
- </style>
+ <link rel="stylesheet" type="text/css" href="/css/quicktips.css" />
</head>
<body>
- @if( $spruch !== "" )
- <blockquote id="spruch">{!! $spruch !!}</blockquote>
- @endif
-
- @foreach( $mqs as $mq)
- <div class="quicktip">
- <b class="qtheader">
- <a href="{{ $mq['URL'] }}" target="_blank">{{ $mq['title'] }}</a>
- </b>
- <br />
- <div>{!! $mq['descr'] !!}</div>
- @if( isset($mq['gefVon']) )
- <div class="pull-right">{!! $mq['gefVon'] !!}</div>
- @endif
- </div>
- @endforeach
-
+ @if( $spruch !== "" )
+ <blockquote id="spruch">{!! $spruch !!}</blockquote>
+ @endif
+ @foreach( $mqs as $mq)
+ <div class="quicktip">
+ <b class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank">{{ $mq['title'] }}</a></b><br>
+ <div>{!! $mq['descr'] !!}</div>
+ @if( isset($mq['gefVon']) )
+ <div class="pull-right">{!! $mq['gefVon'] !!}</div>
+ @endif
+ </div>
+ @endforeach
</body>
</html>
\ No newline at end of file
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index b96b1d739c2e456501cd09b371b2e4d8961761db..37ca78a872be4c725d5649fb4e6f7ba598d1ff04 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -3,250 +3,312 @@
@section('title', $title )
@section('content')
-<form action="/" method="get">
- <h1>{{ trans('settings.head.1') }}</h1>
- <p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
- <h2>{{ trans('settings.allgemein.1') }}</h2>
- <input type="hidden" name="focus" value="angepasst">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label></div>
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label></div>
- <label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
- <select class="form-control" name="param_lang">
- <option value="all">{{ trans('settings.allgemein.5') }}</option>
- <option value="de">{{ trans('settings.allgemein.6') }}</option></select>
- <label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
- <select class="form-control" name="param_resultCount">
- <option value="10">10</option>
- <option value="20" selected>20</option>
- <option value="50">50</option>
- <option value="100">100</option>
- <option value="0">{{ trans('settings.allgemein.8') }}</option></select>
- <label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
- <select class="form-control" name="param_time">
- <option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
- <option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
- <option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
- <option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
- <option value="20000">20 {{ trans('settings.allgemein.11') }}</option></select>
- <h2>{{ trans('settings.suchmaschinen.1') }}</h2>
- <div class="headingGroup web">
- <h3>{{ trans('settings.suchmaschinen.2') }}:
- <small><a data-type="web" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
- <div class="row">
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_fastbot">Fastbot</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.fastbot.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_wikipedia">Wikipedia</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.wikipedia.org/wiki/Wikipedia:Hauptseite"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_witch">Witch</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.witch.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_dmoz">Dmoz</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_overture">Yahoo</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.yahoo.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_yacy">YaCy</label><a class="glyphicon glyphicon-link" target="_blank" href="http://yacy.de/de/index.html"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_nebel">Netluchs</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_exalead">Exalead</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.exalead.com/search/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_yandex">Yandex</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.yandex.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_zeitde">Die ZEIT</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.zeit.de/index"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label></div></div></div></div>
- <div class="headingGroup nachrichten">
- <h3>{{ trans('settings.suchmaschinen.6') }}:
- <small><a data-type="nachrichten" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
- <div class="row">
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_nebelfeed">Netluchs Twitter</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a></div></div></div></div>
- <div class="headingGroup wissenschaft">
- <h3>{{ trans('settings.suchmaschinen.7') }}:
- <small><a data-type="wissenschaft" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
- <div class="row">
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_tuhh">TUBdok</label><a class="glyphicon glyphicon-link" target="_blank" href="https://tubdok.tub.tuhh.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_MetaGer-QIP">MetaGer-QIP</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_pubmed">PubMed</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ncbi.nlm.nih.gov/pubmed/"></a></div></div></div></div>
- <div class="headingGroup produktsuche">
- <h3>{{ trans('settings.suchmaschinen.8') }}:
- <small><a data-type="produktsuche" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
- <div class="row">
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_ebay">Ebay</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ebay.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_mg_produkt">MetaGer {{ trans('settings.suchmaschinen.9') }}</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_mg_produkt2">MetaGer {{ trans('settings.suchmaschinen.9') }}</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_ecoshopper">Ecoshopper</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ecoshopper.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_similar_product">Ladenpreis</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ladenpreis.net/"></a></div></div></div></div>
- <div class="headingGroup others">
- <h3>{{ trans('settings.suchmaschinen.10') }}:
- <small><a data-type="others" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
- <div class="row">
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_allesklar">AllesKlar</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.allesklar.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_dmozint">dmoz international</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.org/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_harvest">CampusSearch</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_wikis">Wikis</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_bing">Bing</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.bing.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_fportal">Forschung</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_suchticker">Suchticker</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_tauchen">OpenCrawl ({{ trans('settings.suchmaschinen.11') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=tauchen&query=&hitsPerPage=10&hitsPerSite=1"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_regengergie">OpenCrawl ({{ trans('settings.suchmaschinen.12') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=ernenerg"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_astronomie">OpenCrawl ({{ trans('settings.suchmaschinen.13') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=astronom"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_goyax">{{ trans('settings.suchmaschinen.14') }} (goyax)</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.goyax.de/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_stackexchange">Stackoverflow (Q&A)</label><a class="glyphicon glyphicon-link" target="_blank" href="https://stackoverflow.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_dart">DartEurope</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dart-europe.eu/basic-search.php"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_beammachine">Beam Machine</label></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspageAll">OneNewspage ({{ trans('settings.suchmaschinen.15') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_onenewspagegermanyAll">OneNewspage ({{ trans('settings.suchmaschinen.16') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" name="param_loklak">loklak</label><a class="glyphicon glyphicon-link" target="_blank" href="http://loklak.org/"></a></div></div></div></div>
- <input id="unten" type="submit" class="btn btn-primary" value="Startseite für einmalige Nutzung generieren">
- <input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
- <input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
- <input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zurücksetzen"></form>
+ <form action="/" method="get">
+ <h1>{{ trans('settings.head.1') }}</h1>
+ <p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
+ <h2>{{ trans('settings.allgemein.1') }}</h2>
+ <input type="hidden" name="focus" value="angepasst">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label>
+ </div>
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label>
+ </div>
+ <label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
+ <select class="form-control" name="param_lang">
+ <option value="all">{{ trans('settings.allgemein.5') }}</option>
+ <option value="de">{{ trans('settings.allgemein.6') }}</option>
+ </select>
+ <label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
+ <select class="form-control" name="param_resultCount">
+ <option value="10">10</option>
+ <option value="20" selected>20</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ <option value="0">{{ trans('settings.allgemein.8') }}</option>
+ </select>
+ <label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
+ <select class="form-control" name="param_time">
+ <option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
+ <option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
+ <option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
+ <option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
+ <option value="20000">20 {{ trans('settings.allgemein.11') }}</option>
+ </select>
+ <h2>{{ trans('settings.suchmaschinen.1') }}</h2>
+ <div class="headingGroup web">
+ <h3>{{ trans('settings.suchmaschinen.2') }}:
+ <small><a data-type="web" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_fastbot">Fastbot</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.fastbot.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_wikipedia">Wikipedia</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.wikipedia.org/wiki/Wikipedia:Hauptseite"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_witch">Witch</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.witch.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_dmoz">Dmoz</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_overture">Yahoo</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.yahoo.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_yacy">YaCy</label><a class="glyphicon glyphicon-link" target="_blank" href="http://yacy.de/de/index.html"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_nebel">Netluchs</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_exalead">Exalead</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.exalead.com/search/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_yandex">Yandex</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.yandex.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_zeitde">Die ZEIT</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.zeit.de/index"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="headingGroup nachrichten">
+ <h3>{{ trans('settings.suchmaschinen.6') }}:
+ <small><a data-type="nachrichten" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_nebelfeed">Netluchs Twitter</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="headingGroup wissenschaft">
+ <h3>{{ trans('settings.suchmaschinen.7') }}:
+ <small><a data-type="wissenschaft" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_tuhh">TUBdok</label><a class="glyphicon glyphicon-link" target="_blank" href="https://tubdok.tub.tuhh.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_MetaGer-QIP">MetaGer-QIP</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_pubmed">PubMed</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ncbi.nlm.nih.gov/pubmed/"></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="headingGroup produktsuche">
+ <h3>{{ trans('settings.suchmaschinen.8') }}:
+ <small><a data-type="produktsuche" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_ebay">Ebay</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ebay.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_mg_produkt">MetaGer {{ trans('settings.suchmaschinen.9') }}</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_mg_produkt2">MetaGer {{ trans('settings.suchmaschinen.9') }}</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_ecoshopper">Ecoshopper</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ecoshopper.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_similar_product">Ladenpreis</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ladenpreis.net/"></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="headingGroup others">
+ <h3>{{ trans('settings.suchmaschinen.10') }}:
+ <small><a data-type="others" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_allesklar">AllesKlar</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.allesklar.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_dmozint">dmoz international</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.org/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_harvest">CampusSearch</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_wikis">Wikis</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_bing">Bing</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.bing.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_fportal">Forschung</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_suchticker">Suchticker</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_tauchen">OpenCrawl ({{ trans('settings.suchmaschinen.11') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=tauchen&query=&hitsPerPage=10&hitsPerSite=1"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_regengergie">OpenCrawl ({{ trans('settings.suchmaschinen.12') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=ernenerg"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_astronomie">OpenCrawl ({{ trans('settings.suchmaschinen.13') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=astronom"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_goyax">{{ trans('settings.suchmaschinen.14') }} (goyax)</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.goyax.de/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_stackexchange">Stackoverflow (Q&A)</label><a class="glyphicon glyphicon-link" target="_blank" href="https://stackoverflow.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_dart">DartEurope</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dart-europe.eu/basic-search.php"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_beammachine">Beam Machine</label>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspageAll">OneNewspage ({{ trans('settings.suchmaschinen.15') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_onenewspagegermanyAll">OneNewspage ({{ trans('settings.suchmaschinen.16') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_loklak">loklak</label><a class="glyphicon glyphicon-link" target="_blank" href="http://loklak.org/"></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <input id="unten" type="submit" class="btn btn-primary" value="Startseite für einmalige Nutzung generieren">
+ <input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
+ <input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
+ <input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zurücksetzen">
+ </form>
@endsection
\ No newline at end of file
diff --git a/resources/views/settings1.blade.php b/resources/views/settings1.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe1bf0f74070b714ebe1eb631253aab168111c78
--- /dev/null
+++ b/resources/views/settings1.blade.php
@@ -0,0 +1,63 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('content')
+ <form action="/" method="get">
+ <h1>{{ trans('settings.head.1') }}</h1>
+ <p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
+ <h2>{{ trans('settings.allgemein.1') }}</h2>
+ <input type="hidden" name="focus" value="angepasst">
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label>
+ </div>
+ <div class="checkbox">
+ <label><input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label>
+ </div>
+ <label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
+ <select class="form-control" name="param_lang">
+ <option value="all">{{ trans('settings.allgemein.5') }}</option>
+ <option value="de">{{ trans('settings.allgemein.6') }}</option></select>
+ <label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
+ <select class="form-control" name="param_resultCount">
+ <option value="10">10</option>
+ <option value="20" selected>20</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ <option value="0">{{ trans('settings.allgemein.8') }}</option></select>
+ <label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
+ <select class="form-control" name="param_time">
+ <option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
+ <option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
+ <option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
+ <option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
+ <option value="20000">20 {{ trans('settings.allgemein.11') }}</option></select>
+ <h2>{{ trans('settings.suchmaschinen.1') }}</h2>
+ @foreach( $foki as $fokus => $sumas )
+ <div class="headingGroup {{ $fokus }}">
+ <h3>
+ {{ ucfirst($fokus) }}
+ <small>
+ <a class="checker" data-type="{{ $fokus }}">(alle an-/abwählen)</a>
+ </small>
+ </h3>
+ <div class="row">
+ @foreach( $sumas as $name => $data )
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox">
+ <label>
+ <input name="param_{{ $data['service'] }}" type="checkbox" />{{ $data['displayName'] }}
+ </label>
+ <a class="glyphicon glyphicon-link" target="_blank" href="{{ $data['url'] }}"></a>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ </div>
+ @endforeach
+ <input id="unten" type="submit" class="btn btn-primary" value="Startseite für einmalige Nutzung generieren">
+ <input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
+ <input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
+ <input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zurücksetzen">
+ </form>
+@endsection
\ No newline at end of file
diff --git a/resources/views/spende.blade.php b/resources/views/spende.blade.php
index 2427faa988e02877b7f62f5d1fbf6f23135693db..b9640ce23e339cf1ff8eada8bfdb2e95025f6e58 100644
--- a/resources/views/spende.blade.php
+++ b/resources/views/spende.blade.php
@@ -2,84 +2,82 @@
@section('title', $title )
+@section('navbarFocus.donate', 'class="dropdown active"')
+
@section('content')
<h1>{{ trans('spenden.headline.1') }}</h1>
<h2>{{ trans('spenden.headline.2') }}</h2>
<div class="col">
-<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
-<h2>{{ trans('spenden.bankinfo.1') }}</h2>
-<p>{{ trans('spenden.bankinfo.2') }}</p>
- <p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
- <hr>
- <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
- <h2>{{ trans('spenden.logos.1') }}</h2>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input name="cmd" value="_xclick" type="hidden">
- <input name="business" value="wsb@suma-ev.de" type="hidden">
- <input name="item_name" value="SuMa-eV Spende" type="hidden">
- <input name="buyer_credit_promo_code" value="" type="hidden">
- <input name="buyer_credit_product_category" value="" type="hidden">
- <input name="buyer_credit_shipping_method" value="" type="hidden">
- <input name="buyer_credit_user_address_change" value="" type="hidden">
- <input name="no_shipping" value="0" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="currency_code" value="EUR" type="hidden">
- <input name="tax" value="0" type="hidden">
- <input name="lc" value="DE" type="hidden">
- <input name="bn" value="PP-DonationsBF" type="hidden">
- <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
- </form>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
- <h2>{{ trans('spenden.logos.2') }}</h2>
- <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">
- <img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin">
- </a>
- </div>
- <div class="clearfix">
- </div>
- <hr>
- <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
- <p>{{ trans('spenden.lastschrift.2') }}</p>
- <form role="form" method="POST">
- {{ csrf_field() }}
- <div class="form-group">
- <label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
- <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
- </div>
- <div class="form-group">
- <label for="email">{{ trans('spenden.lastschrift.4') }}</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Email">
- </div>
- <div class="form-group">
- <label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
- <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
- </div>
- <div class="form-group">
- <label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
- <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
- </div>
- <div class="form-group">
- <label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
- <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
- </div>
- <div class="form-group">
- <label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
- <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
- </div>
- <button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
- </form>
- <p>{{ trans('spenden.lastschrift.10') }}</p>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
- <h2>{{ trans('spenden.about.0') }}</h2>
- <p>{{ trans('spenden.about.1.1') }}
- <a href="https://metager.de/klassik/bform1.htm" target="_blank">{{ trans('spenden.about.1.2') }}</a></p>
- <p>{{ trans('spenden.about.2.1') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('spenden.about.2.2') }} <a href="http://suma-ev.de/suma-links/index.html#sponsors" target="_blank">{{ trans('spenden.about.2.3') }}</a> {{ trans('spenden.about.2.4') }} <a href="https://metager.de/klassik/spenden1.html" target="_blank">{{ trans('spenden.about.2.5') }}</a></p>
- <p><a href="http://suma-ev.de/unterstuetzung/index.html" target="_blank">{{ trans('spenden.about.3.1') }}</a> {{ trans('spenden.about.3.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a></p>
- <p>{{ trans('spenden.about.4.1') }} <a href="https://www.boost-project.com/de" target="_blank">www.boost-project.com</a> {{ trans('spenden.about.4.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a> {{ trans('spenden.about.4.3') }} <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank">{{ trans('spenden.about.4.4') }}</a> {{ trans('spenden.about.4.5') }}</p>
- </div>
- <div class="clearfix">
- </div>
- </div>
+ <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
+ <h2>{{ trans('spenden.bankinfo.1') }}</h2>
+ <p>{{ trans('spenden.bankinfo.2') }}</p>
+ <p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
+ <hr>
+ <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
+ <h2>{{ trans('spenden.logos.1') }}</h2>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_xclick" type="hidden">
+ <input name="business" value="wsb@suma-ev.de" type="hidden">
+ <input name="item_name" value="SuMa-eV Spende" type="hidden">
+ <input name="buyer_credit_promo_code" value="" type="hidden">
+ <input name="buyer_credit_product_category" value="" type="hidden">
+ <input name="buyer_credit_shipping_method" value="" type="hidden">
+ <input name="buyer_credit_user_address_change" value="" type="hidden">
+ <input name="no_shipping" value="0" type="hidden">
+ <input name="no_note" value="1" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="tax" value="0" type="hidden">
+ <input name="lc" value="DE" type="hidden">
+ <input name="bn" value="PP-DonationsBF" type="hidden">
+ <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
+ </form>
+ </div>
+ <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
+ <h2>{{ trans('spenden.logos.2') }}</h2>
+ <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V"><img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin"></a>
+ </div>
+ <div class="clearfix"></div>
+ <hr>
+ <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
+ <p>{{ trans('spenden.lastschrift.2') }}</p>
+ <form role="form" method="POST">
+ {{ csrf_field() }}
+ <div class="form-group">
+ <label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
+ <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
+ </div>
+ <div class="form-group">
+ <label for="email">{{ trans('spenden.lastschrift.4') }}</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="Email">
+ </div>
+ <div class="form-group">
+ <label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
+ <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
+ </div>
+ <div class="form-group">
+ <label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
+ <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
+ </div>
+ <div class="form-group">
+ <label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
+ <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
+ </div>
+ <div class="form-group">
+ <label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
+ <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
+ </div>
+ <button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
+ </form>
+ <p>{{ trans('spenden.lastschrift.10') }}</p>
+ </div>
+ <div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
+ <h2>{{ trans('spenden.about.0') }}</h2>
+ <p>{{ trans('spenden.about.1.1') }}
+ <a href="https://metager.de/klassik/bform1.htm" target="_blank">{{ trans('spenden.about.1.2') }}</a></p>
+ <p>{{ trans('spenden.about.2.1') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('spenden.about.2.2') }} <a href="http://suma-ev.de/suma-links/index.html#sponsors" target="_blank">{{ trans('spenden.about.2.3') }}</a> {{ trans('spenden.about.2.4') }} <a href="https://metager.de/klassik/spenden1.html" target="_blank">{{ trans('spenden.about.2.5') }}</a></p>
+ <p><a href="http://suma-ev.de/unterstuetzung/index.html" target="_blank">{{ trans('spenden.about.3.1') }}</a> {{ trans('spenden.about.3.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a></p>
+ <p>{{ trans('spenden.about.4.1') }} <a href="https://www.boost-project.com/de" target="_blank">www.boost-project.com</a> {{ trans('spenden.about.4.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a> {{ trans('spenden.about.4.3') }} <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank">{{ trans('spenden.about.4.4') }}</a> {{ trans('spenden.about.4.5') }}</p>
+ </div>
+ <div class="clearfix"></div>
+</div>
@endsection
\ No newline at end of file
diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php
index 1d7fb5058145e37e215f92cfbadd5d454e76dcf9..edec879953fdad2811eb9162c53de43fb3d00e7f 100644
--- a/resources/views/team/team.blade.php
+++ b/resources/views/team/team.blade.php
@@ -3,44 +3,33 @@
@section('title', $title )
@section('content')
-<h1>Team
-</h1>
-<ul id="teamList">
- <li>
- <a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang
- </a>, Dr.-Ing. - {{ trans('team.role.1') }} -
- <a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de
- </a> -
- <a href="/team/pubkey-wsb">Public Key
- </a>
- </li>
- <li>Becker, Georg - {{ trans('team.role.2') }} -
- <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de
- </a>
- </li>
- <li>Branz, Manuela - {{ trans('team.role.3') }} -
- <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de
- </a>
- </li>
- <li>Pfennig, Dominik - {{ trans('team.role.4') }} -
- <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de
- </a>
- </li>
- <li>Höfer, Phil - {{ trans('team.role.5') }} -
- <a href="mailto:phil@suma-ev.de">phil@suma-ev.de
- </a>
- </li>
- <li>Hasselbring, Karl - {{ trans('team.role.6') }} -
- <a href="mailto:karl@suma-ev.de">karl@suma-ev.de
- </a>
- </li>
- <li>Riel, Carsten - {{ trans('team.role.7') }} -
- <a href="carsten@suma-ev.de">carsten@suma-ev.de
- </a>
- </li>
-</ul>
-<p>{{ trans('team.contact.1') }}
- <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> {{ trans('team.contact.2') }} <a href="/kontakt/">{{ trans('team.contact.3') }}</a>{{ trans('team.contact.4') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.5') }}</a> {{ trans('team.contact.6') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.7') }}</a> {{ trans('team.contact.8') }} </p>
-<p>{{ trans('team.contact.9') }}
-</p>
+ <h1>Team</h1>
+ <ul id="teamList">
+ <li>
+ <a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {{ trans('team.role.1') }} -
+ <a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
+ <a href="/team/pubkey-wsb">Public Key</a>
+ </li>
+ <li>Becker, Georg - {{ trans('team.role.2') }} -
+ <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a>
+ </li>
+ <li>Branz, Manuela - {{ trans('team.role.3') }} -
+ <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a>
+ </li>
+ <li>Pfennig, Dominik - {{ trans('team.role.4') }} -
+ <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a>
+ </li>
+ <li>Höfer, Phil - {{ trans('team.role.5') }} -
+ <a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a>
+ </li>
+ <li>Hasselbring, Karl - {{ trans('team.role.6') }} -
+ <a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a>
+ </li>
+ <li>Riel, Carsten - {{ trans('team.role.7') }} -
+ <a href="carsten@suma-ev.de">carsten@suma-ev.de</a>
+ </li>
+ </ul>
+ <p>{{ trans('team.contact.1') }}
+ <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> {{ trans('team.contact.2') }} <a href="/kontakt/">{{ trans('team.contact.3') }}</a>{{ trans('team.contact.4') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.5') }}</a> {{ trans('team.contact.6') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.7') }}</a> {{ trans('team.contact.8') }} </p>
+ <p>{{ trans('team.contact.9') }}</p>
@endsection
\ No newline at end of file
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 87710acead3f9d3981326d82486a9d109829c86c..a1e35389e3ad307a316494f810b421c2b6ee10af 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,45 +1,15 @@
<!DOCTYPE html>
<html>
- <head>
- <title>Laravel</title>
-
- <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
- <style>
- html, body {
- height: 100%;
- }
-
- body {
- margin: 0;
- padding: 0;
- width: 100%;
- display: table;
- font-weight: 100;
- font-family: 'Lato';
- }
-
- .container {
- text-align: center;
- display: table-cell;
- vertical-align: middle;
- }
-
- .content {
- text-align: center;
- display: inline-block;
- }
-
- .title {
- font-size: 96px;
- }
- </style>
- </head>
- <body>
- <div class="container">
- <div class="content">
- <div class="title">Laravel 5</div>
- </div>
- </div>
- </body>
+ <head>
+ <title>Laravel</title>
+ <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" type="text/css" href="/css/welcome.css" />
+ </head>
+ <body>
+ <div class="container">
+ <div class="content">
+ <div class="title">Laravel 5</div>
+ </div>
+ </div>
+ </body>
</html>
diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php
index c8a558bae64e690f38fc1e6eebdc5897b6e5b179..fa8cdcb2e4e3bff6cd7cba140b4c4abed86fa860 100644
--- a/resources/views/widget.blade.php
+++ b/resources/views/widget.blade.php
@@ -3,8 +3,8 @@
@section('title', $title )
@section('content')
-<h1>{{ trans('widget.head') }}</h1>
-<p>{{ trans('widget.body.1') }}</p>
-<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
-<p>{{ trans('widget.body.4') }}</p>
+ <h1>{{ trans('widget.head') }}</h1>
+ <p>{{ trans('widget.body.1') }}</p>
+ <p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
+ <p>{{ trans('widget.body.4') }}</p>
@endsection
\ No newline at end of file
diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..9cf1756405d24c4cfd740d6035a9e3758f305eb7
--- /dev/null
+++ b/resources/views/widget/sitesearch.blade.php
@@ -0,0 +1,68 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('content')
+<h1>{{ trans('sitesearch.head.1') }}</h1>
+<p>{{ trans('sitesearch.head.2') }}</p>
+<h2>{{ trans('sitesearch.head.3') }}</h2>
+<form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
+ <input class="metager-searchinput" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}"><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.head.5') }}</button>
+</form>
+@if ($site !== '')
+<h2>{{ trans('sitesearch.generated.1') }}</h2>
+<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+ <img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required=""><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button>
+ <input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}">
+ <input type="hidden" name="encoding" value="utf8">
+ <input type="hidden" name="site" value="{{ $site }}">
+</form>
+<h2>{{ trans('sitesearch.generated.5') }}</h2>
+<code><form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
+ <style type="text/css" scoped>
+ .metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+ }
+ .metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+ }
+ .metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+ }
+ </style>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required></input><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button><input type="hidden" name="encoding" value="utf8"></input><input type="hidden" name="site" value="{{ $site }}"></input><input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}"></input><input type="hidden" name="wdgt-version" value="1"></input></form>
+</code>
+@endif
+@endsection
\ No newline at end of file
diff --git a/resources/views/widget/websearch.blade.php b/resources/views/widget/websearch.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..579764de7da7b6275d568aa3a9e8d14c5d5f041c
--- /dev/null
+++ b/resources/views/widget/websearch.blade.php
@@ -0,0 +1,58 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('content')
+<h1>{{ trans('websearch.head.1') }}</h1>
+<p>{{ trans('websearch.head.2') }}</p>
+<h2>{{ trans('websearch.head.3') }}</h2>
+<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+ <img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required=""><input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"><input type="hidden" name="encoding" value="utf8"><button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
+</form>
+<h2>{{ trans('websearch.head.7') }}</h2>
+<code><form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
+ <style type="text/css" scoped>
+ .metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+ }
+ .metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+ }
+ .metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+ }
+ </style>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required></input><input type="hidden" name="encoding" value="utf8"><button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button><input type="hidden" name="wdgt-version" value="1"></input><input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"></form>
+</code>
+@endsection
\ No newline at end of file
diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8a558bae64e690f38fc1e6eebdc5897b6e5b179
--- /dev/null
+++ b/resources/views/widget/widget.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('content')
+<h1>{{ trans('widget.head') }}</h1>
+<p>{{ trans('widget.body.1') }}</p>
+<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
+<p>{{ trans('widget.body.4') }}</p>
+@endsection
\ No newline at end of file