daniel/dumbo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: daniel:e5cfb4b5a91e4c9ef7fcf3ed1064f0c13d933912
Branches Tags
daniel:master
...
compare: daniel:e73e44c434adbc406926eaa6aed21e6e23b31481
Branches Tags
daniel:master

10 Commits
e5cfb4b5a9 ... e73e44c434

Author SHA1 Message Date
Daniel
e73e44c434 CSS für popup 2021-03-01 22:21:44 +01:00
daniel
7305e024f5 Merge branch 'sebu' of daniel/dumbo into master 2021-03-01 21:36:31 +01:00
Sebastian Uharek
b03397d1dc Added abgelehnt feature, fixed counting up/downvotes on landing page and movies by date page 2021-02-23 00:55:56 +01:00
Daniel
c58fe40fbe commit 2021-02-15 21:44:32 +01:00
Daniel
c66f7d19a4 Fix reg /vorgeschlagen 2016-05-20 05:47:41 +02:00
Daniel
d0b73e92ec Bugfix: Gesamtsumme der Stimmen auf /beliebt wieder korrekt. Auf Film-Seite, inaktive Nutzer gekennzeichnet. 2016-05-20 05:39:35 +02:00
Daniel
372eadd0d9 Hopefully fixing the avatar bug. 2016-05-20 05:19:58 +02:00
Daniel
b6e46cf0b7 removing useless files 2016-02-04 20:26:36 +01:00
Daniel
e309d62eb8 chchchanges 2016-02-04 17:30:46 +01:00
Daniel
161eabdf00 Bugfix Order 2015-11-11 02:49:59 +01:00
35 changed files with 2687 additions and 3281 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@ composer.phar
composer.lock
.DS_Store
/app/config/app.php
/public/img/avatars/*

410
.idea/workspace.xml generated
View File

@@ -2,8 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/routes.php" afterPath="$PROJECT_DIR$/app/routes.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/Film.php" afterPath="$PROJECT_DIR$/app/models/Film.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/User.php" afterPath="$PROJECT_DIR$/app/models/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/routes.php" afterPath="$PROJECT_DIR$/app/routes.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/index.blade.php" afterPath="$PROJECT_DIR$/app/views/index.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings.blade.php" afterPath="$PROJECT_DIR$/app/views/settings.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/users.blade.php" afterPath="$PROJECT_DIR$/app/views/users.blade.php" />
</list>
<ignored path="dumbo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -28,81 +33,34 @@
<favorites_list name="dumbo" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="hello.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-21.966103">
<caret line="75" column="31" selection-start-line="75" selection-start-column="31" selection-end-line="75" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="film.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-28.296297">
<caret line="78" column="70" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="stats.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/stats.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.666666">
<caret line="37" column="123" selection-start-line="37" selection-start-column="123" selection-end-line="37" selection-end-column="123" />
<folding>
<element signature="e#559#583#0#HTML" expanded="true" />
<element signature="e#908#932#0#HTML" expanded="true" />
<element signature="e#1597#1622#0#HTML" expanded="true" />
<element signature="e#1745#1769#0#HTML" expanded="true" />
<element signature="e#2114#2138#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="seen.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/seen.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.666666">
<caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
<folding>
<marker date="1445430515071" expanded="true" signature="1732:1816" placeholder="..." />
<marker date="1445430515071" expanded="true" signature="1744:1810" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Film.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/models/Film.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.3703704">
<caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
<state vertical-scroll-proportion="-16.0">
<caret line="36" column="45" selection-start-line="36" selection-start-column="45" selection-end-line="36" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="suggest.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
<file leaf-file-name="film.blade.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.0">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
<folding />
<state vertical-scroll-proportion="2.9963813">
<caret line="126" column="0" selection-start-line="126" selection-start-column="0" selection-end-line="126" selection-end-column="0" />
<folding>
<element signature="e#2838#2881#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="routes.php" pinned="false" current-in-tab="true">
<file leaf-file-name="routes.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/routes.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.20093457">
<caret line="511" column="134" selection-start-line="511" selection-start-column="134" selection-end-line="511" selection-end-column="134" />
<state vertical-scroll-proportion="17.016394">
<caret line="398" column="23" selection-start-line="398" selection-start-column="23" selection-end-line="398" selection-end-column="23" />
<folding>
<element signature="e#7#392#0#PHP" expanded="true" />
</folding>
@@ -110,11 +68,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="Comment.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/models/Comment.php">
<file leaf-file-name="users.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/users.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.333333">
<caret line="14" column="60" selection-start-line="14" selection-start-column="60" selection-end-line="14" selection-end-column="60" />
<state vertical-scroll-proportion="-6.084746">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/models/User.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-41.333332">
<caret line="63" column="61" selection-start-line="63" selection-start-column="61" selection-end-line="63" selection-end-column="61" />
<folding />
</state>
</provider>
@@ -143,33 +111,31 @@
<option value="$PROJECT_DIR$/public/css/bootstrap.min.css" />
<option value="$PROJECT_DIR$/public/css/bootstrap-readable.min.css" />
<option value="$PROJECT_DIR$/public/css/bootstrap-sandstone.min.css" />
<option value="$PROJECT_DIR$/app/views/settings.blade.php" />
<option value="$PROJECT_DIR$/app/models/User.php" />
<option value="$PROJECT_DIR$/public/css/boostrap-paper.min.css" />
<option value="$PROJECT_DIR$/public/css/bootstrap-superhero.min.css" />
<option value="$PROJECT_DIR$/app/views/users.blade.php" />
<option value="$PROJECT_DIR$/app/views/suggest.blade.php" />
<option value="$PROJECT_DIR$/app/views/film.blade.php" />
<option value="$PROJECT_DIR$/app/models/Comment.php" />
<option value="$PROJECT_DIR$/app/views/index.blade.php" />
<option value="$PROJECT_DIR$/app/libraries/stats.php" />
<option value="$PROJECT_DIR$/app/config/constants.php" />
<option value="$PROJECT_DIR$/app/models/Film.php" />
<option value="$PROJECT_DIR$/app/views/seen.blade.php" />
<option value="$PROJECT_DIR$/app/models/Vote.php" />
<option value="$PROJECT_DIR$/app/views/stats.blade.php" />
<option value="$PROJECT_DIR$/app/views/hello.blade.php" />
<option value="$PROJECT_DIR$/app/views/settings.blade.php" />
<option value="$PROJECT_DIR$/app/views/index.blade.php" />
<option value="$PROJECT_DIR$/app/models/User.php" />
<option value="$PROJECT_DIR$/app/views/users.blade.php" />
<option value="$PROJECT_DIR$/app/models/Film.php" />
<option value="$PROJECT_DIR$/app/routes.php" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" />
<component name="JsBuildToolPackageJson" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
</component>
<component name="NamedScopeManager">
<order />
</component>
<component name="PhpServers">
<servers />
</component>
@@ -210,10 +176,9 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="138" />
<option name="y" value="27" />
<option name="width" value="1782" />
<option name="height" value="1045" />
<option name="width" value="891" />
<option name="height" value="1053" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -255,8 +220,11 @@
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -363,7 +331,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
@@ -482,55 +449,61 @@
<option name="project" value="LOCAL" />
<updated>1445434194207</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="Bugfix Order">
<created>1445435646344</created>
<option name="number" value="00011" />
<option name="project" value="LOCAL" />
<updated>1445435646344</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="138" y="27" width="1782" height="1045" extended-state="0" />
<frame x="0" y="27" width="891" height="1053" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16974595" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35196194" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25551602" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25551602" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
</layout-to-restore>
</component>
<component name="Vcs.Log.UiProperties">
@@ -552,20 +525,14 @@
<MESSAGE value="Stats" />
<MESSAGE value="Constants..." />
<MESSAGE value="Remove debug..." />
<option name="LAST_COMMIT_MESSAGE" value="Remove debug..." />
<MESSAGE value="Bugfix Order" />
<option name="LAST_COMMIT_MESSAGE" value="Bugfix Order" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/bootstrap.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@@ -646,13 +613,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.2450175">
<caret line="59" column="44" selection-start-line="59" selection-start-column="28" selection-end-line="59" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8862837">
@@ -667,13 +627,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/session.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.925926">
<caret line="106" column="5" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/queue.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.592592">
@@ -688,13 +641,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/view.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-20.666666">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/artisan">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.27198124">
@@ -812,13 +758,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/settings.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="27" column="94" selection-start-line="27" selection-start-column="94" selection-end-line="27" selection-end-column="94" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/bootstrap-readable.min.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="21.155056">
@@ -835,43 +774,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/User.php">
<entry file="file://$PROJECT_DIR$/app/config/constants.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="87" column="46" selection-start-line="87" selection-start-column="46" selection-end-line="87" selection-end-column="46" />
<caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Comment.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="60" selection-start-line="14" selection-start-column="60" selection-end-line="14" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/users.blade.php">
<entry file="file://$PROJECT_DIR$/app/views/settings.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" />
<state vertical-scroll-proportion="-0.3128621">
<caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.8504673">
<caret line="100" column="8" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
<state vertical-scroll-proportion="0.40903825">
<caret line="105" column="18" selection-start-line="105" selection-start-column="18" selection-end-line="105" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/constants.php">
<entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
<folding>
<element signature="e#6#35#0#PHP" expanded="false" />
</folding>
<state vertical-scroll-proportion="0.2908459">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/seen.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.666666">
<state vertical-scroll-proportion="0.123986095">
<caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
<folding>
<marker date="1445430515071" expanded="true" signature="1732:1816" placeholder="..." />
@@ -880,77 +824,105 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Film.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.3703704">
<caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Vote.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.3333333">
<caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.0">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-28.296297">
<caret line="78" column="70" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/stats.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.666666">
<state vertical-scroll-proportion="0.37427577">
<caret line="37" column="123" selection-start-line="37" selection-start-column="123" selection-end-line="37" selection-end-column="123" />
<folding>
<element signature="e#559#583#0#HTML" expanded="true" />
<element signature="e#908#932#0#HTML" expanded="true" />
<element signature="e#1597#1622#0#HTML" expanded="true" />
<element signature="e#1745#1769#0#HTML" expanded="true" />
<element signature="e#2114#2138#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Comment.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.333333">
<caret line="14" column="60" selection-start-line="14" selection-start-column="60" selection-end-line="14" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-21.966103">
<state vertical-scroll-proportion="0.70799536">
<caret line="75" column="31" selection-start-line="75" selection-start-column="31" selection-end-line="75" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/User.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-41.333332">
<caret line="63" column="61" selection-start-line="63" selection-start-column="61" selection-end-line="63" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Vote.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.10428737">
<caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/view.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.77172655">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/session.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.44727695">
<caret line="106" column="5" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.6060255">
<caret line="59" column="44" selection-start-line="59" selection-start-column="28" selection-end-line="59" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Film.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.0">
<caret line="36" column="45" selection-start-line="36" selection-start-column="45" selection-end-line="36" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/users.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.084746">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/routes.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.20093457">
<caret line="511" column="134" selection-start-line="511" selection-start-column="134" selection-end-line="511" selection-end-column="134" />
<state vertical-scroll-proportion="17.016394">
<caret line="398" column="23" selection-start-line="398" selection-start-column="23" selection-end-line="398" selection-end-column="23" />
<folding>
<element signature="e#7#392#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="2.9963813">
<caret line="126" column="0" selection-start-line="126" selection-start-column="0" selection-end-line="126" selection-end-column="0" />
<folding>
<element signature="e#2838#2881#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

3
CONTRIBUTING.md
View File

@@ -1,3 +0,0 @@
# Contribution Guidelines
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!

0
README
View File

12
app/certbot.log Normal file
View File

@@ -0,0 +1,12 @@
Traceback (most recent call last):
File "/usr/bin/certbot", line 9, in <module>
load_entry_point('certbot==0.9.3', 'console_scripts', 'certbot')()
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 749, in main
setup_logging(config)
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 642, in setup_logging
config, logfile=logfile, fmt=file_fmt)
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 604, in setup_log_file_handler
raise errors.Error(_PERM_ERR_FMT.format(error))
Error: The following error was encountered:
[Errno 13] Permission denied: '/var/log/letsencrypt/letsencrypt.log'
If running as non-root, set --config-dir, --logs-dir, and --work-dir to writeable paths.

35
app/database/migrations/2021_02_22_232450_add_abgelehnt_to_film.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddAbgelehntToFilm extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('films', function(Blueprint $table)
{
$table->date('abgelehnt')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('films', function(Blueprint $table)
{
$table->dropColumn('abgelehnt');
//
});
}
}

6
app/libraries/justwatch.php Normal file
View File

@@ -0,0 +1,6 @@
use GuzzleHttp\client;
class JustWatch {
private $path = 'https://apis.justwatch.com/content/%s';
}

4
app/libraries/tmdb.php
View File

@@ -693,7 +693,7 @@ class TMDb
*/
public function getConfiguration()
{
$config = $this->_makeCall('configuration');
$config = $this->_makeCall('configuration');
if( ! empty($config))
{
@@ -717,7 +717,7 @@ class TMDb
if(isset($config['images']))
{
$base_url = $config['images']['base_url'];
$base_url = $config['images']['secure_base_url'];
$available_sizes = $this->getAvailableImageSizes($imagetype);
if(in_array($size, $available_sizes))

29
app/models/Film.php
View File

@@ -16,32 +16,45 @@ class Film extends Eloquent {
}
public function scopeZuletztGesehen($query) {
return $query->whereNotNull('gesehen')->orderBy('gesehen', 'DESC')->take(5);
return $query->whereNull('abgelehnt')->whereNotNull('gesehen')->orderBy('gesehen', 'DESC')->take(5);
}
public function scopeZuletztAbgelehnt($query) {
return $query->whereNull('gesehen')->whereNotNull('abgelehnt')->orderBy('abgelehnt', 'DESC')->take(5);
}
public function scopeNeuesteVorschlage($query) {
return $query->whereNull('gesehen')->orderBy('updated_at', 'DESC')->take(5);
return $query->whereNull('gesehen')->whereNull('abgelehnt')->orderBy('updated_at', 'DESC')->take(5);
}
public function scopeMeistgewunschteVorschlage($query) {
$nextfilm = Dumbo::find(1)->film;
return $query
->addSelect(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes'))
->addSelect(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes, COUNT(*) as votes'))
->leftJoin('votes', 'votes.film', '=', 'films.id')
->leftJoin('users', 'users.id', '=', 'votes.user')
->whereNull('gesehen')
->whereNull('abgelehnt')
->where('films.id', "!=", is_object($nextfilm) ? $nextfilm->id : 0)
->where('users.settings', 'NOT LIKE', '%disabled":true%')
->groupBy('films.id')
->orderBy('upvotes', 'DESC')
->orderBy('vorgeschlagen', 'ASC')
->take(5);
->orderBy('vorgeschlagen', 'ASC');
}
public function getVotes() {
return Vote::where('film', '=', $this->id)->count();
return Vote::where('film', '=', $this->id)
->where('users.settings', 'NOT LIKE', '%disabled":true%')
->leftJoin('users', 'users.id', '=', 'votes.user')
->count();
}
public function getUpvotes() {
return Vote::where('film', '=', $this->id)->whereRaw('stimme IS TRUE')->count();
return Vote::where('film', '=', $this->id)
->whereRaw('stimme IS TRUE')
->where('users.settings', 'NOT LIKE', '%disabled":true%')
->leftJoin('users', 'users.id', '=', 'votes.user')
->count();
}
public function getBewertung() {
@@ -59,4 +72,4 @@ class Film extends Eloquent {
return $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
}
}
}

10
app/models/User.php
View File

@@ -61,7 +61,7 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
public function getSetting($key, $false = false) {
$settings = json_decode($this->settings);
if(!is_null($settings))
if(!is_null($settings) && property_exists($settings, $key))
return $settings->$key;
else
return $false;
@@ -69,10 +69,10 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
public function setSetting($key, $value) {
$settings = json_decode($this->settings);
if(!is_null($settings)) {
$settings = array();
if(is_null($settings)) {
$settings = new stdClass();
}
$settings[$key] = $value;
$settings->$key = $value;
$this->settings = json_encode($settings);
}
@@ -91,4 +91,4 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
public function news() {
return $this->hasMany('News', 'author');
}
}
}

97
app/routes.php
View File

@@ -15,14 +15,17 @@
Route::get('/', function()
{
$gesehen = Film::zuletztGesehen()->get();
$abgelehnt = Film::zuletztAbgelehnt()->get();
$vorgeschlagen = Film::neuesteVorschlage()->get();
$mg = Film::meistgewunschteVorschlage()->get();
$mg = Film::meistgewunschteVorschlage()->take(5)->get();
//$x = DB::getQueryLog();
//dd(end($x));
$news = News::aktuell()->get();
$nextfilm = Dumbo::find(1)->film;
$tmdb = new TMDb(Config::get('constants.tvdb.apikey'), 'de', TRUE);
foreach(array("top" => $mg[0], "neu" => $vorgeschlagen[0], "alt" => $gesehen[0]) as $key => $val) {
$tmdb = new TMDb(Config::get('constants.tvdb.apikey'), 'de', TRUE, TMDb::API_SCHEME_SSL);
foreach(array("top" => $mg[0], "neu" => $vorgeschlagen[0], "alt" => $gesehen[0], "declined" => $abgelehnt[0]) as $key => $val) {
$tmovie = $tmdb->getMovie($val->tvdbid);
$images[$key] = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
}
@@ -40,6 +43,7 @@ Route::get('/', function()
return View::make('index')
->with('gesehen', $gesehen)
->with('abgelehnt', $abgelehnt)
->with('vorgeschlagen', $vorgeschlagen)
->with('meistgw', $mg)
->with('images', $images)
@@ -160,15 +164,7 @@ Route::get('logout', array('as' => 'logout', function() {
Route::get('beliebt', function() {
$filme = DB::table(DB::raw('film_films'))
->select(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes,
COUNT(case when film_votes.stimme IS FALSE then 1 end) as downvotes,
COUNT(case when film_votes.stimme IS TRUE then 1 end) as vcount'))
->leftJoin('votes', 'votes.film', '=', 'films.id')
->whereNull('films.gesehen')
->groupBy('id')
->orderBy('vcount', 'DESC')->orderBy('vorgeschlagen', 'ASC')
->paginate(25);
$filme = Film::meistgewunschteVorschlage()->paginate(25);
return View::make('suggest')
->with('filme', $filme)
@@ -183,7 +179,10 @@ Route::get('vorgeschlagen', function() {
COUNT(case when film_votes.stimme IS FALSE then 1 end) as downvotes,
COUNT(case when film_votes.stimme IS TRUE then 1 end) as vcount'))
->leftJoin('votes', 'votes.film', '=', 'films.id')
->leftJoin('users', 'users.id', '=', 'votes.user')
->whereNull('films.gesehen')
->whereNull('films.abgelehnt')
->where('users.settings', 'NOT LIKE', '%disabled":true%')
->groupBy('id')
->orderBy('vorgeschlagen', 'DESC')
->paginate(25);
@@ -194,6 +193,16 @@ Route::get('vorgeschlagen', function() {
});
Route::get('abgelehnt/{field?}/{order?}', function($field = "abgelehnt", $order = "desc") {
$filme = Film::whereNotNull('abgelehnt')->orderBy($field, $order)->paginate(25);
$labels = array("", "danger", "danger", "warning", "warning", "info", "info", "primary", "primary", "success", "success");
return View::make('abgelehnt')
->with('labels', $labels)
->with('filme', $filme);
})->where(array('field' => '[a-z]+', 'order' => 'asc|desc'));
Route::get('gesehen/{field?}/{order?}', function($field = "gesehen", $order = "desc") {
$filme = Film::whereNotNull('gesehen')->orderBy($field, $order)->paginate(25);
$labels = array("", "danger", "danger", "warning", "warning", "info", "info", "primary", "primary", "success", "success");
@@ -218,7 +227,7 @@ Route::post('neu', array('before' => 'auth', function() {
}));
Route::get('vorschlag/{id}', array('before' => 'auth', function($id) {
$ef = Film::where('tvdbid', '=', $id)->whereNull('gesehen')->first();
$ef = Film::where('tvdbid', '=', $id)->whereNull('gesehen')->whereNull('abgelehnt')->first();
if(is_null($ef)) {
$tmdb = new TMDb('b187f8d9c5e72b1faecb741d5d04239a', 'de', TRUE);
$f = $tmdb->getMovie($id);
@@ -231,11 +240,27 @@ Route::get('vorschlag/{id}', array('before' => 'auth', function($id) {
Session::put('message', 'Film hinzugefügt.');
return Redirect::to('film/' . $film->id);
} else {
Session::put('message', 'Film bereits vorgeschlagen von ' . $ef->besitzer->name . '.');
if(is_null($ef->abgelehnt)) {
Session::put('message', 'Film bereits vorgeschlagen von ' . $ef->besitzer->name . '.');
} else {
Session::put('message', 'Film bereits abgelehmt.');
}
return Redirect::to('film/' . $ef->id);
}
}));
Route::get('mark-declined/{id}', array('before' => 'auth', function($id) {
$film = Film::findOrFail($id);
$film->abgelehnt = \Carbon\Carbon::today();
$film->save();
if(Dumbo::find(1)->nextfilm == $film->id) {
$system = Dumbo::findOrFail(1);
$system->nextfilm = 0;
$system->save();
}
return Redirect::to('film/' . $film->id);
}));
Route::get('mark-read/{id}', array('before' => 'auth', function($id) {
$film = Film::findOrFail($id);
$film->gesehen = \Carbon\Carbon::today();
@@ -343,16 +368,18 @@ Route::post('settings/{mode}', array('before' => 'auth', function($mode) {
$val = Validator::make($vfields, $vrules);
if($val->passes()) {
/* Delete old Avatars */
array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
//array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
/** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */
$file = Input::file('avatar');
$file = $file->move( public_path("img/avatars/"), Auth::user()->id . "-". Str::slug($file->getFilename()) . "." . $file->guessExtension() );
$i = new Imagick();
$i->readImage($file->getRealPath());
$i->cropThumbnailImage(100, 100);
$i->writeImage();
exec('/usr/bin/gm convert -size 100x100 ' . $file->getRealPath() . ' -thumbnail 100x100^ -gravity center -extent 100x100 +profile "*" ' . $file->getRealPath());
//$i = new Imagick();
//$i->readImage($file->getRealPath());
//$i->cropThumbnailImage(100, 100);
//$i->writeImage();
/** @var User $u */
$u = Auth::user();
@@ -377,6 +404,7 @@ Route::get('users', array('before' => 'auth', function() {
Route::get('users/{operation}/{id}', array('before' => 'auth', function($operation, $id) {
if(!Auth::user()->admin) App::abort(401, 'Diese Seite ist nicht für Dich.');
/** @var User $u */
$u = User::findOrFail($id);
switch($operation) {
case 'mkadm':
@@ -393,6 +421,16 @@ Route::get('users/{operation}/{id}', array('before' => 'auth', function($operati
$msg = $u->name . " wurde gelöscht.";
$u->delete();
break;
case 'inact':
$msg = $u->name. " ist inaktiv.";
$u->setSetting("disabled", true);
$u->save();
break;
case 'act':
$msg = $u->name. " ist aktiv.";
$u->setSetting("disabled", false);
$u->save();
break;
}
return Redirect::to('users')->with('message', $msg);
@@ -478,6 +516,14 @@ Route::get('stats', function() {
'prop' => 'besitzer',
'type' => 'User'
),
array(
'name' => 'Meiste abgelehnte Vorschl&auml;ge',
'entr' => array('Vorschlag', 'Vorschl&auml;ge'),
'vals' => Film::addSelect(DB::raw("film_films.*, COUNT(`id`) as count"))
->whereNotNull('abgelehnt')->groupBy('user')->orderBy('count', 'DESC')->take(3)->get(),
'prop' => 'besitzer',
'type' => 'User'
),
array(
'name' => 'Meiste Kommentare',
@@ -500,16 +546,16 @@ Route::get('stats', function() {
array(
'name' => 'Bewertet am besten',
'entr' => array('', ''),
'vals' => Comment::addselect(DB::raw('film_comments.*, ROUND(AVG(`bewertung`),1) as count'))
->where('bewertung', '!=', 0)->groupBy('user')->orderBy('count', 'DESC')->raw('ORDER BY COUNT(*) DESC')->take(3)->get(),
'vals' => Comment::addselect(DB::raw('film_comments.*, ROUND(AVG(`bewertung`),1) as count, COUNT(*) as no'))
->where('bewertung', '!=', 0)->groupBy('user')->orderBy('count', 'DESC')->orderBy('no', 'DESC')->take(3)->get(),
'prop' => 'autor',
'type' => 'User'
),
array(
'name' => 'Bewertet am schlechtesten',
'entr' => array('', ''),
'vals' => Comment::addselect(DB::raw('film_comments.*, ROUND(AVG(`bewertung`),1) as count'))
->where('bewertung', '!=', 0)->groupBy('user')->orderBy('count', 'ASC')->raw('ORDER BY COUNT(*) ASC')->take(3)->get(),
'vals' => Comment::addselect(DB::raw('film_comments.*, ROUND(AVG(`bewertung`),1) as count, COUNT(*) as no'))
->where('bewertung', '!=', 0)->groupBy('user')->orderBy('count', 'ASC')->orderBy('no', 'ASC')->take(3)->get(),
'prop' => 'autor',
'type' => 'User'
),
@@ -555,8 +601,5 @@ Route::get('stats', function() {
),
];
// dd(DB::getQueryLog());
return View::make('stats')->with('stats', $stats);
});
});

56
app/views/abgelehnt.blade.php Normal file
View File

@@ -0,0 +1,56 @@
@extends('hello')
@section('content')
<div class="page-header"><h1>Abgelehnt</h1></div>
{{ $filme->links() }}
<table class="table">
<tr>
<th>Titel</th>
<th></th>
<th>Abgelehnt am</th>
<th>Vorgeschlagen von</th>
</tr>
@foreach($filme as $film)
<?php
$stimme = 2;
if(!is_null(Auth::user()) && Vote::where('film', $film->id)->where('user', Auth::user()->id)->count())
$stimme = Vote::where('film', $film->id)->where('user', Auth::user()->id)->first()->stimme;
?>
<tr>
<td>{{ HTML::link('film/' . $film->id, $film->name) }}</td>
<td>
<span class="glyphicon glyphicon-comment"></span> {{ $film->comments()->count()}}
@if($film->getBewertung() > 0)
&nbsp;<span class="label label-{{$labels[round($film->getBewertung())]}}">{{$film->getBewertung()}}</span>
@endif
@if($stimme == 1)
&nbsp;<span class="label label-success tooltip-enable" data-toggle="tooltip" title="Daf&uuml;r gestimmt."><span class="glyphicon glyphicon-thumbs-up"></span></span>
@elseif($stimme == 0)
&nbsp;<span class="label label-default tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
@endif
</td>
<td>{{ \Carbon\Carbon::parse($film->abgelehnt)->format('d.m.Y')}}</td>
<td><span class="badge">
<img class="img-circle pull-left" src="{{ $film->besitzer->getAvatar() }}" width="20"> {{$film->besitzer->name}}
</span></td>
</tr>
@endforeach
</table>
{{ $filme->links() }}
@stop
@section('title')
Gesehen ~
@stop
@section('script')
<script type="text/javascript">
$(function() {
$('.tooltip-enable').tooltip({ html: true, placement: "bottom" });
});
</script>
@stop

12
app/views/film.blade.php
View File

@@ -9,6 +9,8 @@
<div class="col-md-3">
@if(!is_null($film->gesehen))
<div class="label label-success"><span class="glyphicon glyphicon-check"></span> Gesehen am {{ \Carbon\Carbon::parse($film->gesehen)->format('d.m.Y') }}</div>
@elseif(!is_null($film->abgelehnt))
<div class="label label-warning"><span class="glyphicon glyphicon-remove"></span> Abgelehnt am {{ \Carbon\Carbon::parse($film->abgelehnt)->format('d.m.Y') }}</div>
@else
<div class="label label-danger" <?php if(!is_null(Auth::user()) && Auth::user()->admin) { echo "id='gesehen'"; } ?> style="cursor: pointer;"><span class="glyphicon glyphicon-unchecked"></span> Nicht gesehen</div>
@endif
@@ -98,7 +100,7 @@
<div class="clearfix"></div>
<hr>
@if($votes > 0 || is_null($film->gesehen))
@if($votes > 0 || is_null($film->gesehen) || is_null($film->abgelehnt))
@if($votes > 0)
<h2>Abstimmung</h2>
<p>Insgesamt haben <b>{{$votes}}</b> Personen abgestimmt. <b>{{$vposi}}</b> davon waren <i>daf&uuml;r</i>. @if($uvote[0])
@@ -109,7 +111,7 @@
<dt>Daf&uuml;r</dt>
<dd>
@foreach($pv as $v)
<span class="badge">
<span class="badge" {{ $v->getSetting('disabled') ? 'style="color: #c77; font-style: italic;"' : '' }}>
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
@@ -118,7 +120,7 @@
<dt>Nicht daf&uuml;r</dt>
<dd>
@foreach($nv as $v)
<span class="badge">
<span class="badge" {{ $v->getSetting('disabled') ? 'style="color: #c77; font-style: italic"' : '' }}>
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
@@ -127,7 +129,7 @@
@endif
@if(is_null($film->gesehen) && !is_null(Auth::user()))
@if(is_null($film->gesehen) && is_null($film->abgelehnt) && !is_null(Auth::user()))
<div class="container" style="text-align: center">
<div class="btn-group">
<a class="btn btn-lg btn-success <?php echo $uvote[0] && $uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('yes', Auth::user()->id, $film->id)) }}">
@@ -245,7 +247,7 @@
placement: "right",
trigger: "click",
title: "Als gesehen markieren",
content: "<div class='container'><a href='{{ url('mark-read/' . $film->id) }}' class='btn btn-success'>Gesehen</a><a href='{{ url('view-next/' . $film->id) }}' class='btn btn-warning'>Als n&auml;chstes sehen</a></div>"
content: "<div class='container'><a href='{{ url('mark-read/' . $film->id) }}' class='btn btn-success'>Gesehen</a><a href='{{ url('view-next/' . $film->id) }}' class='btn btn-warning'>Als n&auml;chstes sehen</a><a href='{{ url('mark-declined/' . $film->id) }}' class='btn btn-danger'>Ablehnen</a></div>"
});
});
</script>

9
app/views/hello.blade.php
View File

@@ -22,11 +22,12 @@
<li>{{ HTML::link('beliebt', 'Beliebt (Wertung)') }}</li>
<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen (Datum)') }}</li>
<li>{{ HTML::link('gesehen', 'Gesehen') }}</li>
<li>{{ HTML::link('neu', 'Film vorschlagen')}}
<li>{{ HTML::link('abgelehnt', 'Abgelehnt') }}</li>
<li>{{ HTML::link('neu', 'Film vorschlagen')}}</li>
<li>{{ HTML::link('stats', 'Statistiken') }}</li>
</ul>
<ul class="nav navbar-nav pull-right">
<li><a href="http://git.ascarion.org/daniel/dumbo">Quellcode</a></li>
@if(is_null(Auth::user()))
<li>{{ HTML::link('login', 'Login') }}</li>
@else
@@ -73,7 +74,7 @@
<footer id="footer">
<div class="container">
<hr>
<small>&copy; 2013-2016 &mdash; Daniel M&uuml;llers</small>
<small>&copy; 2013-{{ date("Y") }} &mdash; Daniel M&uuml;llers</small>
</div>
</footer>
@@ -81,4 +82,4 @@
<script type="text/javascript" src="{{ asset('js/bootstrap.min.js') }}"></script>
@yield('script')
</body>
</html>
</html>

49
app/views/index.blade.php
View File

@@ -1,19 +1,25 @@
@extends('hello');
@extends('hello')
@section('content')
<div class="row">
<div class="col-md-6">
@if(is_object($nextfilm))
<div class="panel panel-primary">
<div class="panel-heading">N&auml;chster Film</div>
<div class="panel-body">
<img src="{{$images["next"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name . " <small><i>(" . $nextfilm->besitzer->name . ")</i></small>" : "Steht nicht fest"}}</h4>
@if(is_object($nextfilm)) {{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@endif
@if(is_object($nextfilm) && !is_null(Auth::user()) && Auth::user()->admin) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
<h4>
{{ $nextfilm->name }}
<small><span class="badge">
<img class="img-circle" src="{{ $nextfilm->besitzer->getAvatar() }}" width="20"> {{$nextfilm->besitzer->name}}
</span></small>
</h4>
{{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@if(!is_null(Auth::user()) && Auth::user()->admin) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
@endif
</div>
</div>
@endif
<div class="panel panel-primary">
<div class="panel-heading">Meistgew&uuml;nschter Film</div>
@@ -99,14 +105,37 @@
<i>{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
<div class="panel panel-warning">
<div class="panel-heading">Abgelehnte Filme</div>
<div class="panel-body">
<?php $topfilm = $abgelehnt->shift(); ?>
<img src="{{$images["declined"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{$topfilm->name}}
<small><span class="badge">
<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
</span></small></h4>
<p>Bewertung:
@if($topfilm->getBewertung() > 0)
<span class="label label-{{$labels[round($topfilm->getBewertung())]}}">{{$topfilm->getBewertung()}}</span>
@else
&mdash;
@endif
</p>
<p>{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}</p>
</div>
<div class="list-group">
@foreach ($abgelehnt as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('abgelehnt', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
</div>
<div class="col-md-6">
<div class="jumbotron">
<h1>Dumbo</h1>
<p>Suchst du noch oder guckst du schon?</p>
</div>
<div class="panel panel-default">
<div class="panel-heading">Letzte Kommentare</div>

2
app/views/settings.blade.php
View File

@@ -6,7 +6,7 @@
<div class="col-md-2">
<ul class="nav nav-pills nav-stacked">
<li class="active"><a href="#avatar" data-toggle="pill">Avatar</a></li>
<li><a href="#password" data-toggle="pill">Password</a></li>
<li><a href="#password" data-toggle="pill">Passwort</a></li>
<li><a href="#email" data-toggle="pill">E-Mail</a></li>
</ul>
</div>

15
app/views/stats.blade.php
View File

@@ -9,37 +9,38 @@
<div class="panel panel-default">
<div class="panel-heading">{{$stat["name"]}}</div>
<div class="panel-body">
<?php $top = $stat["vals"]->shift() ?>
<?php $top = $stat["vals"]->shift(); $prop = $stat['prop']; ?>
<div>
@if($stat['type'] === "User")
<div class="pull-left" style="margin-right:5px">
<img class="img-circle media-object" src="{{$top->$stat['prop']->getAvatar()}}" width="47">
<img class="img-circle media-object" src="{{$top->$prop->getAvatar()}}" width="47">
</div>
@endif
@if($stat['type'] === "Film")
<div class="pull-left" style="margin-right:5px">
<img class="media-object" src="{{$top->$stat['prop']->getPoster()}}" height="47">
<img class="media-object" src="{{$top->$prop->getPoster()}}" height="47">
</div>
@endif
<div class="media-body">
<h4 class="media-heading">{{is_object($top->$stat['prop']) ? $top->$stat['prop']->name : dd($top)}}</h4>
<h4 class="media-heading">{{is_object($top->$prop) ? $top->$prop->name : dd($top)}}</h4>
<b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}
</div>
</div>
@foreach($stat['vals'] as $top)
<?php $prop = $stat['prop']; ?>
<div style="margin-top: 10px;">
@if($stat['type'] === "User")
<div class="pull-left" style="margin-right:5px">
<img class="img-circle media-object" src="{{$top->$stat['prop']->getAvatar()}}" width="20">
<img class="img-circle media-object" src="{{$top->$prop->getAvatar()}}" width="20">
</div>
@endif
@if($stat['type'] === "Film")
<div class="pull-left" style="margin-right:5px">
<img class="media-object" src="{{$top->$stat['prop']->getPoster()}}" height="20">
<img class="media-object" src="{{$top->$prop->getPoster()}}" height="20">
</div>
@endif
<div class="media-body">
<h5 class="media-heading">{{$top->$stat['prop']->name}} &mdash; <b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}</h5>
<h5 class="media-heading">{{$top->$prop->name}} &mdash; <b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}</h5>
</div>
</div>
@endforeach

2
app/views/suggest.blade.php
View File

@@ -27,7 +27,7 @@
$vp = $film->upvotes;
$np = $film->downvotes;
?>
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ $vp + $np }}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ !is_null($np) ? $vp + $np : $film->votes }}
</td>
<td>
@if(($vp) > 0) <span class="label label-default">+{{$vp}}</span>

7
app/views/users.blade.php
View File

@@ -25,11 +25,16 @@
@if($user->admin)
@if($user->name != "Daniel")
<button class="btn btn-primary btn-xs" type="button">Admin</button>
<a class="btn btn-warning btn-xs" type="button" href="{{ url('users/rmadm/' . $user->id) }}">Rechte entziehen</a>
<a class="btn btn-default btn-xs" type="button" href="{{ url('users/rmadm/' . $user->id) }}">Rechte entziehen</a>
@else
&mdash;
@endif
@else
@if(!$user->getSetting("disabled"))
<a class="btn btn-default btn-xs" type="button" href="{{ url("users/inact/" . $user->id) }}">Deaktivieren</a>
@else
<a class="btn btn-default btn-xs" type="button" href="{{ url("users/act/" . $user->id) }}">Aktivieren</a>
@endif
<a class="btn btn-default btn-xs" type="button" href="{{ url('users/mkadm/' . $user->id) }}">Zum Admin machen</a>
<a class="btn btn-danger btn-xs" type="button" href="{{ url('users/rmusr/' . $user->id) }}">Löschen</a>
@endif

9
composer.json
View File

@@ -1,9 +1,10 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"name": "ascarion/dumbo",
"description": "Dumbo Film Platform",
"keywords": ["dumbo", "film"],
"require": {
"laravel/framework": "4.0.*"
"laravel/framework": "4.0.*",
"guzzlehttp/guzzle": "^6.3@dev"
},
"autoload": {
"classmap": [

425
composer.lock generated
View File

@@ -1,21 +1,22 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"hash": "5f4fb65cecf43da689abed6fc20358f5",
"content-hash": "0083c6856528368b62681e275ac8466f",
"packages": [
{
"name": "classpreloader/classpreloader",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/ClassPreloader.git",
"url": "https://github.com/ClassPreloader/ClassPreloader.git",
"reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"shasum": ""
},
@@ -50,7 +51,7 @@
"class",
"preload"
],
"time": "2013-06-24 22:58:34"
"time": "2013-06-24T22:58:34+00:00"
},
{
"name": "doctrine/annotations",
@@ -121,7 +122,7 @@
"docblock",
"parser"
],
"time": "2013-06-16 21:33:03"
"time": "2013-06-16T21:33:03+00:00"
},
{
"name": "doctrine/cache",
@@ -190,7 +191,7 @@
"cache",
"caching"
],
"time": "2013-08-07 16:04:25"
"time": "2013-08-07T16:04:25+00:00"
},
{
"name": "doctrine/collections",
@@ -257,7 +258,7 @@
"collections",
"iterator"
],
"time": "2013-08-29 16:56:45"
"time": "2013-08-29T16:56:45+00:00"
},
{
"name": "doctrine/common",
@@ -331,7 +332,7 @@
"persistence",
"spl"
],
"time": "2013-08-20 18:10:31"
"time": "2013-08-20T18:10:31+00:00"
},
{
"name": "doctrine/dbal",
@@ -401,7 +402,7 @@
"persistence",
"queryobject"
],
"time": "2013-09-05 17:30:39"
"time": "2013-09-05T17:30:39+00:00"
},
{
"name": "doctrine/inflector",
@@ -469,7 +470,7 @@
"singularize",
"string"
],
"time": "2013-04-10 16:14:30"
"time": "2013-04-10T16:14:30+00:00"
},
{
"name": "doctrine/lexer",
@@ -526,7 +527,7 @@
"lexer",
"parser"
],
"time": "2013-03-07 12:15:25"
"time": "2013-03-07T12:15:25+00:00"
},
{
"name": "filp/whoops",
@@ -577,7 +578,195 @@
"whoops",
"zf2"
],
"time": "2013-06-10 12:22:13"
"time": "2013-06-10T12:22:13+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "a7010cc9b52ecfa00051bb26e4ae025958fe9851"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a7010cc9b52ecfa00051bb26e4ae025958fe9851",
"reference": "a7010cc9b52ecfa00051bb26e4ae025958fe9851",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.3-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
"rest",
"web service"
],
"time": "2019-08-23T22:16:30+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "17d36ed176c998839582c739ce0753381598edf0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/17d36ed176c998839582c739ce0753381598edf0",
"reference": "17d36ed176c998839582c739ce0753381598edf0",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^7.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle promises library",
"keywords": [
"promise"
],
"time": "2019-07-02T14:54:06+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "2595b33c1c924889b474d324f3d719fa40b6954e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/2595b33c1c924889b474d324f3d719fa40b6954e",
"reference": "2595b33c1c924889b474d324f3d719fa40b6954e",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"psr/http-message": "~1.0",
"ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"ext-zlib": "*",
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"suggest": {
"zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Tobias Schultze",
"homepage": "https://github.com/Tobion"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
"psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
"time": "2019-08-13T16:05:52+00:00"
},
{
"name": "ircmaxell/password-compat",
@@ -616,7 +805,7 @@
"hashing",
"password"
],
"time": "2013-04-30 19:58:08"
"time": "2013-04-30T19:58:08+00:00"
},
{
"name": "laravel/framework",
@@ -728,7 +917,7 @@
"framework",
"laravel"
],
"time": "2013-08-31 21:50:30"
"time": "2013-08-31T21:50:30+00:00"
},
{
"name": "monolog/monolog",
@@ -790,7 +979,7 @@
"logging",
"psr-3"
],
"time": "2013-09-02 10:24:25"
"time": "2013-09-02T10:24:25+00:00"
},
{
"name": "nesbot/carbon",
@@ -833,7 +1022,7 @@
"datetime",
"time"
],
"time": "2013-08-21 04:36:40"
"time": "2013-08-21T04:36:40+00:00"
},
{
"name": "nikic/php-parser",
@@ -877,7 +1066,7 @@
"parser",
"php"
],
"time": "2013-08-25 17:11:40"
"time": "2013-08-25T17:11:40+00:00"
},
{
"name": "patchwork/utf8",
@@ -922,7 +1111,7 @@
"utf-8",
"utf8"
],
"time": "2013-08-19 09:37:02"
"time": "2013-08-19T09:37:02+00:00"
},
{
"name": "predis/predis",
@@ -969,7 +1158,57 @@
"predis",
"redis"
],
"time": "2013-08-31 08:51:10"
"time": "2013-08-31T08:51:10+00:00"
},
{
"name": "psr/http-message",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
"reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
"homepage": "https://github.com/php-fig/http-message",
"keywords": [
"http",
"http-message",
"psr",
"psr-7",
"request",
"response"
],
"time": "2019-08-29T13:16:46+00:00"
},
{
"name": "psr/log",
@@ -1007,7 +1246,47 @@
"psr",
"psr-3"
],
"time": "2012-12-21 11:40:51"
"time": "2012-12-21T11:40:51+00:00"
},
{
"name": "ralouphie/getallheaders",
"version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/ralouphie/getallheaders.git",
"reference": "120b605dfeb996808c31b6477290a714d356e822"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
"reference": "120b605dfeb996808c31b6477290a714d356e822",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^5 || ^6.5"
},
"type": "library",
"autoload": {
"files": [
"src/getallheaders.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ralph Khattar",
"email": "ralph.khattar@gmail.com"
}
],
"description": "A polyfill for getallheaders.",
"time": "2019-03-08T08:55:37+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -1056,7 +1335,7 @@
"mail",
"mailer"
],
"time": "2013-08-30 12:35:21"
"time": "2013-08-30T12:35:21+00:00"
},
{
"name": "symfony/browser-kit",
@@ -1064,12 +1343,12 @@
"target-dir": "Symfony/Component/BrowserKit",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"reference": "11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"shasum": ""
},
@@ -1111,7 +1390,7 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com",
"time": "2013-08-31 06:12:22"
"time": "2013-08-31T06:12:22+00:00"
},
{
"name": "symfony/console",
@@ -1119,12 +1398,12 @@
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
"url": "https://github.com/symfony/console.git",
"reference": "6db369933dae13262c7c8c9a265d51723be1d2e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/6db369933dae13262c7c8c9a265d51723be1d2e3",
"url": "https://api.github.com/repos/symfony/console/zipball/6db369933dae13262c7c8c9a265d51723be1d2e3",
"reference": "6db369933dae13262c7c8c9a265d51723be1d2e3",
"shasum": ""
},
@@ -1164,7 +1443,7 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/css-selector",
@@ -1172,12 +1451,12 @@
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e",
"shasum": ""
},
@@ -1215,7 +1494,7 @@
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/debug",
@@ -1223,12 +1502,12 @@
"target-dir": "Symfony/Component/Debug",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
"url": "https://github.com/symfony/debug.git",
"reference": "729f6d19cfc401c4942e43fcc1059103bd6df130"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
"url": "https://api.github.com/repos/symfony/debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
"reference": "729f6d19cfc401c4942e43fcc1059103bd6df130",
"shasum": ""
},
@@ -1271,7 +1550,7 @@
],
"description": "Symfony Debug Component",
"homepage": "http://symfony.com",
"time": "2013-08-08 14:16:10"
"time": "2013-08-08T14:16:10+00:00"
},
{
"name": "symfony/dom-crawler",
@@ -1279,12 +1558,12 @@
"target-dir": "Symfony/Component/DomCrawler",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"shasum": ""
},
@@ -1324,7 +1603,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -1332,12 +1611,12 @@
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
"reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8",
"shasum": ""
},
@@ -1378,7 +1657,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/filesystem",
@@ -1386,12 +1665,12 @@
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "da0dcf60b7307f68667fecef8ccbb2b070bda7cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"reference": "da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"shasum": ""
},
@@ -1425,7 +1704,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
"time": "2013-08-09 07:26:54"
"time": "2013-08-09T07:26:54+00:00"
},
{
"name": "symfony/finder",
@@ -1433,12 +1712,12 @@
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
"url": "https://github.com/symfony/finder.git",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"url": "https://api.github.com/repos/symfony/finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"shasum": ""
},
@@ -1472,7 +1751,7 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
"time": "2013-08-13 20:18:00"
"time": "2013-08-13T20:18:00+00:00"
},
{
"name": "symfony/http-foundation",
@@ -1480,12 +1759,12 @@
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "cd7b96d5777a742e178fb58059ab70d794b5b351"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/cd7b96d5777a742e178fb58059ab70d794b5b351",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd7b96d5777a742e178fb58059ab70d794b5b351",
"reference": "cd7b96d5777a742e178fb58059ab70d794b5b351",
"shasum": ""
},
@@ -1522,7 +1801,7 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
"time": "2013-08-29 19:32:30"
"time": "2013-08-29T19:32:30+00:00"
},
{
"name": "symfony/http-kernel",
@@ -1530,12 +1809,12 @@
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "0bd6f23256c47d209ed0f30ce54aef0405a750ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"reference": "0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"shasum": ""
},
@@ -1593,7 +1872,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/process",
@@ -1601,12 +1880,12 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
"url": "https://github.com/symfony/process.git",
"reference": "6e3b487a74ce7dcab6af34e14afcb9d438d69327"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"url": "https://api.github.com/repos/symfony/process/zipball/6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"reference": "6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"shasum": ""
},
@@ -1640,7 +1919,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
"time": "2013-08-30 13:10:46"
"time": "2013-08-30T13:10:46+00:00"
},
{
"name": "symfony/routing",
@@ -1648,12 +1927,12 @@
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
"url": "https://github.com/symfony/routing.git",
"reference": "3085975262bc36dc89929a936056dc6e5cb8a100"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/3085975262bc36dc89929a936056dc6e5cb8a100",
"url": "https://api.github.com/repos/symfony/routing/zipball/3085975262bc36dc89929a936056dc6e5cb8a100",
"reference": "3085975262bc36dc89929a936056dc6e5cb8a100",
"shasum": ""
},
@@ -1698,7 +1977,7 @@
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/translation",
@@ -1706,12 +1985,12 @@
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
"url": "https://github.com/symfony/translation.git",
"reference": "65f888291f0896ad492f9abc6dc05c998373aded"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
"url": "https://api.github.com/repos/symfony/translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
"reference": "65f888291f0896ad492f9abc6dc05c998373aded",
"shasum": ""
},
@@ -1753,23 +2032,17 @@
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
"time": "2013-08-26 05:49:51"
"time": "2013-08-26T05:49:51+00:00"
}
],
"packages-dev": [
],
"aliases": [
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": [
],
"platform": [
],
"platform-dev": [
]
"stability-flags": {
"guzzlehttp/guzzle": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
}

2
public/css/bootstrap-superhero.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
public/img/avatars/17-php0hzsl8.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

2
public/index.php
View File

@@ -59,4 +59,4 @@ $app->run();
|
*/
$app->shutdown();
$app->shutdown();

2
public/info.php Normal file
View File

@@ -0,0 +1,2 @@
asdölgfih
<?php phpinfo(); ?>

22
readme.md
View File

@@ -1,21 +1,7 @@
## Laravel PHP Framework
### Dumbo Filmabend Plattform
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework)
Dumbo ist eine Plattform zum Auswählen und Abstimmen von Filmen. Dumbo basiert auf Laravel 5.2 und Twitter Bootstrap 3.3.
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.
### Bugs & Vorschläge
Laravel aims to make the development process a pleasing one for the developer without sacrificing application functionality. Happy developers make the best code. To this end, we've attempted to combine the very best of what we have seen in other web frameworks, including frameworks implemented in other languages, such as Ruby on Rails, ASP.NET MVC, and Sinatra.
Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
## Official Documentation
Documentation for the entire framework can be found on the [Laravel website](http://laravel.com/docs).
### Contributing To Laravel
**All issues and pull requests should be filed on the [laravel/framework](http://github.com/laravel/framework) repository.**
### License
The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
Bugs und Vorschläge können unter "Issues" gemeldet werden.

2
vendor/autoload.php vendored
View File

@@ -2,6 +2,6 @@
// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3::getLoader();

309
vendor/composer/ClassLoader.php vendored
View File

@@ -13,9 +13,7 @@
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0 class loader
*
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
@@ -39,22 +37,48 @@ namespace Composer\Autoload;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
private $prefixes = array();
private $fallbackDirs = array();
// PSR-4
private $prefixLengthsPsr4 = array();
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
return call_user_func_array('array_merge', $this->prefixes);
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirs;
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
@@ -75,23 +99,24 @@ class ClassLoader
}
/**
* Registers a set of classes, merging with any others previously set.
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The classes prefix
* @param array|string $paths The location(s) of the classes
* @param bool $prepend Prepend the location(s)
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirs = array_merge(
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirs
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirs = array_merge(
$this->fallbackDirs,
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
@@ -100,38 +125,109 @@ class ClassLoader
}
$first = $prefix[0];
if (!isset($this->prefixes[$first][$prefix])) {
$this->prefixes[$first][$prefix] = (array) $paths;
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixes[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixes[$first][$prefix]
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixes[$first][$prefix] = array_merge(
$this->prefixes[$first][$prefix],
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of classes, replacing any others previously set.
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The classes prefix
* @param array|string $paths The location(s) of the classes
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirs = (array) $paths;
return;
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
$this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
}
/**
@@ -155,6 +251,47 @@ class ClassLoader
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
@@ -182,7 +319,7 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
include $file;
includeFile($file);
return true;
}
@@ -197,50 +334,112 @@ class ClassLoader
*/
public function findFile($class)
{
// work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
if ('\\' == $class[0]) {
$class = substr($class, 1);
}
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
$classPath = null;
$className = $class;
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixes[$first])) {
foreach ($this->prefixes[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
return $dir . DIRECTORY_SEPARATOR . $classPath;
if (isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
foreach ($this->fallbackDirs as $dir) {
if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
return $dir . DIRECTORY_SEPARATOR . $classPath;
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return $this->classMap[$class] = false;
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}

1543
vendor/composer/autoload_classmap.php vendored
View File

File diff suppressed because it is too large Load Diff

12
vendor/composer/autoload_files.php vendored
View File

@@ -6,7 +6,11 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
$vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
$vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
);
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
);

46
vendor/composer/autoload_real.php vendored
View File

@@ -23,26 +23,48 @@ class ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
$loader->set($namespace, $path);
}
call_user_func(\Composer\Autoload\ComposerStaticInit7389a4d4b2c7fcdb9cbed4794746f4b3::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
$loader->set($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
$map = require __DIR__ . '/autoload_psr4.php';
foreach ($map as $namespace => $path) {
$loader->setPsr4($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->register(true);
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit7389a4d4b2c7fcdb9cbed4794746f4b3::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7389a4d4b2c7fcdb9cbed4794746f4b3($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire7389a4d4b2c7fcdb9cbed4794746f4b3($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
}
}

2820
vendor/composer/installed.json vendored
View File

File diff suppressed because it is too large Load Diff

2
vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php vendored
View File

@@ -13,7 +13,7 @@ class Collection extends BaseCollection {
*/
public function find($key, $default = null)
{
return array_first($this->items, function($key, $model) use ($key)
return array_first($this->items, function($key, $model)
{
return $model->getKey() == $key;

10
vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php vendored
View File

@@ -51,7 +51,7 @@ class Encrypter {
*/
public function encrypt($value)
{
$iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
$iv = @mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
$value = base64_encode($this->padAndMcrypt($value, $iv));
@@ -74,7 +74,7 @@ class Encrypter {
{
$value = $this->addPadding(serialize($value));
return mcrypt_encrypt($this->cipher, $this->key, $value, $this->mode, $iv);
return @mcrypt_encrypt($this->cipher, $this->key, $value, $this->mode, $iv);
}
/**
@@ -106,7 +106,7 @@ class Encrypter {
*/
protected function mcryptDecrypt($value, $iv)
{
return mcrypt_decrypt($this->cipher, $this->key, $value, $this->mode, $iv);
return @mcrypt_decrypt($this->cipher, $this->key, $value, $this->mode, $iv);
}
/**
@@ -216,7 +216,7 @@ class Encrypter {
*/
protected function getIvSize()
{
return mcrypt_get_iv_size($this->cipher, $this->mode);
return @mcrypt_get_iv_size($this->cipher, $this->mode);
}
/**
@@ -268,4 +268,4 @@ class Encrypter {
$this->mode = $mode;
}
}
}

3
vendor/nesbot/carbon/src/Carbon/Carbon.php vendored
View File

@@ -585,8 +585,9 @@ class Carbon extends DateTime
*
* @return self
*/
public function setTime($hour, $minute, $second = 0)
public function setTime($hour, $minute, $second = NULL, $microseconds = NULL)
{
if(is_null($second)) $second = 0;
return $this->hour($hour)->minute($minute)->second($second);
}