' . captcha_img() . '
';
diff --git a/app/Models/About.php b/app/Models/About.php
new file mode 100644
index 0000000..f2f3649
--- /dev/null
+++ b/app/Models/About.php
@@ -0,0 +1,32 @@
+ Rulez::all(), 'uploadrules' => Rulez::where('zuordnung', '=', 'Upload')->get(), 'tagrules' => Rulez::where('zuordnung', '=', 'Tagging')->get(), 'generalrules' => Rulez::where('zuordnung', '=', 'General')->get(), 'commentrules' => Rulez::where('zuordnung', '=', 'Commenting')->get()]);
+ }
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function create()
+ {
+ //
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function store(Request $request)
+ {
+ //
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show($id)
+ {
+ //
+ }
+
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ //
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ //
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($id)
+ {
+ //
+ }
+}
diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css
index 28f3e1e..0f43b63 100644
--- a/public/css/w0bmcustom.css
+++ b/public/css/w0bmcustom.css
@@ -288,7 +288,7 @@ div.tbody {
}
.comments blockquote {
- color: #80FF00;
+ color: #789922;
font-size: 1em;
padding: 0;
margin: 0;
@@ -2218,7 +2218,7 @@ blockquote {
padding: 10px 10px;
margin: 0 0 10px;
border-left: 5px solid #282828;
- color: #80FF00;
+ color: #789922;
word-wrap: break-word;
}
@@ -2895,7 +2895,7 @@ button#toggle:not(:focus) {
}
span.videoinfo {
- background: #21292f;
+ background: #1f1f20;
border-radius: 5px;
padding: 5px;
}
@@ -3077,7 +3077,7 @@ button#infobox:not(:focus) {
}
/*
-Eye candy
+Eye candy
( colors courtesy of https://kuler.adobe.com/try-color-theme-3350110 )
*/
.onclick-menu {
@@ -4041,7 +4041,7 @@ repeating-radial-gradient(black, transparent 100px)
padding-right: 0px;
padding-left: 0px;
font-size: 17px;
- vertical-align: middle;
+ vertical-align: initial;
}
.coronaids {
@@ -4084,4 +4084,53 @@ position: absolute;
i.fa.fa-bitcoin:hover {
color: #1fb2b0;
transition: .5s;
- }
\ No newline at end of file
+ }
+
+#matrix {
+ text-align: center;
+ background: black;
+ color: #17bd17;
+ border: 1px solid;
+}
+
+#matrix a {
+ color: #17bd17;
+}
+
+#bluepill {
+ width: 26px;
+ height: 10px;
+ display: inline-block;
+ color: blue;
+ background: blue;
+ border-radius: 5px;
+}
+
+#redpill {
+ width: 26px;
+ height: 10px;
+ display: inline-block;
+ color: red;
+ background: red;
+ border-radius: 5px;
+}
+
+.thread_closed {
+ color: white;
+ text-align: center;
+ border: 1px solid black;
+ background: #2d2c2c;
+ padding: 5px;
+ margin: 5px;
+}
+
+@media (min-width: 768px) {
+ul.pagination {
+ display: flex;
+ justify-content: left;
+}
+
+.pagination {
+ margin: 0;
+}
+}
diff --git a/public/js/w0bmscript_no_async.js b/public/js/w0bmscript_no_async.js
index 49dfa97..db4936a 100644
--- a/public/js/w0bmscript_no_async.js
+++ b/public/js/w0bmscript_no_async.js
@@ -1143,7 +1143,7 @@ $(function() {
formData.append('file', file);
$('.progress-striped, #upload-stats').css('opacity', 0).slideDown('fast').animate({opacity: 1}, {queue: false, duration: 'fast'});
jqXHR = $.ajax({
- url: '/api/upload',
+ url: '/api/video/upload',
type: 'POST',
data: formData,
processData: false,
diff --git a/public/njum/css/cstms.css b/public/njum/css/cstms.css
index a52d072..67f11f6 100644
--- a/public/njum/css/cstms.css
+++ b/public/njum/css/cstms.css
@@ -148,7 +148,7 @@ overflow: hidden;
.bg-dark {
- background: black!important;
+ background: #000000b3 !important;
}
.search-index {
@@ -627,6 +627,7 @@ textarea.form-control {
textarea#cinput {
height: 80px !important;
+ box-shadow: none;
}
.comment-entry-textarea {
@@ -835,7 +836,7 @@ a.badge.badge-success.isSfw, a.badge.badge-danger.isNsfw {
#videoBox.in { animation: ac 1s; }
-.panel.panel-danger {
+/*.panel.panel-danger {
background: rgba(90, 88, 88, 0.4) none repeat scroll 0 0;
padding: 15px;
margin-bottom: 15px;
@@ -844,7 +845,7 @@ a.badge.badge-success.isSfw, a.badge.badge-danger.isNsfw {
font-style: italic;
color: lightgrey;
background: #00000047;
-}
+}*/
/*.col-sm.scrollable:hover {
background: #00000080;
@@ -1006,7 +1007,7 @@ div#categories {
}
a.badge.video-rating.sfw {
- background: #282828;
+ background: #2828288f;
color: #04da04;
border-top-left-radius: 0;
border-top-right-radius: 0;
@@ -1016,7 +1017,7 @@ a.badge.video-rating.sfw {
}
a.badge.video-rating.nsfw {
- background: #282828;
+ background: #2828288f;
color: #ff1515;
border-top-left-radius: 0;
border-top-right-radius: 0;
@@ -1026,7 +1027,7 @@ a.badge.video-rating.nsfw {
}
a.badge.video-id {
- background: #282828;
+ background: #2828288f;
color: white;
font-family: monospace;
border-bottom-left-radius: 0;
@@ -1296,7 +1297,7 @@ button#togglebg:hover, button.bg-toggle:hover, button#fav:hover, button#webm_edi
.monchichi {
display: inherit;
- background: #1e1c1c;
+ background: #000000b3;
border-radius: 5px;
border: 1px solid black;
margin: 5px;
@@ -1505,4 +1506,36 @@ div.comment_header {
.container-fluid, .container {
padding-left: 0;
padding-right: 0;
-}
\ No newline at end of file
+}
+
+.search-index {
+ position: relative;
+}
+
+.search-btn {
+ position: absolute;
+ right: 0;
+}
+
+.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show > .btn-dark.dropdown-toggle {
+ color: #fff;
+ background-color: #171616;
+ border-color: #101010;
+}
+
+/*blah */
+.stuck {
+ position: fixed !important;
+ top: 0 !important;
+ bottom: 0px !important;
+ right: 0 !important;
+ width: 260px !important;
+ height: 145px !important;
+ transform: translateY(100%);
+ animation: fade-in-up .25s ease forwards;
+ right: 0;
+ width: 200px !important;
+ display: flex;
+ justify-content: left;
+ margin: 0 0 0 auto;
+}
diff --git a/public/njum/js/newscript.js b/public/njum/js/newscript.js
index 4d5ab49..90c6e3d 100644
--- a/public/njum/js/newscript.js
+++ b/public/njum/js/newscript.js
@@ -414,7 +414,7 @@ $(function() {
formData.append('file', file);
$('.progress-striped, #upload-stats').css('opacity', 0).slideDown('fast').animate({opacity: 1}, {queue: false, duration: 'fast'});
jqXHR = $.ajax({
- url: '/api/upload',
+ url: '/api/video/upload',
type: 'POST',
data: formData,
processData: false,
diff --git a/public/njum/js/w0bmscript.js b/public/njum/js/w0bmscript.js
index f638e01..cdce476 100644
--- a/public/njum/js/w0bmscript.js
+++ b/public/njum/js/w0bmscript.js
@@ -1143,7 +1143,7 @@ $(function() {
formData.append('file', file);
$('.progress-striped, #upload-stats').css('opacity', 0).slideDown('fast').animate({opacity: 1}, {queue: false, duration: 'fast'});
jqXHR = $.ajax({
- url: '/api/upload',
+ url: '/api/video/upload',
type: 'POST',
data: formData,
processData: false,
diff --git a/public/robots.txt b/public/robots.txt
index 55e55f1..70aaf6e 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,5 @@
User-agent: *
-Disallow: /register
+Disallow:
+
+User-agent: Google
+Disallow: /
diff --git a/public/z0mb/css/bootstrap-dark.css b/public/z0mb/css/bootstrap-dark.css
index a5ae5fc..6854ff4 100644
--- a/public/z0mb/css/bootstrap-dark.css
+++ b/public/z0mb/css/bootstrap-dark.css
@@ -11,7 +11,6 @@
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic");
:root {
--blue: #375a7f;
--indigo: #6610f2;
diff --git a/public/z0mb/css/z0mb.css b/public/z0mb/css/z0mb.css
index 39f9702..adf824d 100644
--- a/public/z0mb/css/z0mb.css
+++ b/public/z0mb/css/z0mb.css
@@ -238,11 +238,11 @@ ul.dd-menu > li:hover {
.dd-input + .dd-menu {
display: none;
-}
+}
.dd-input:checked + .dd-menu {
display: block;
-}
+}
.dd-menu li {
padding: 10px 20px;
@@ -308,11 +308,19 @@ div#categories {
}
div#collapseComments {
- background: #040a0a;
+ background: #000;
padding: 5px;
}
.card.panel-default {
margin-top: 5px;
margin: 5px;
-}
\ No newline at end of file
+}
+
+#commentForm textarea {
+ background: rgb(33, 34, 34) none repeat scroll 0 0;
+}
+
+.commentButton {
+ background: #000;
+}
diff --git a/public/z0mb/js/newscript.js b/public/z0mb/js/newscript.js
index 844de8e..06c1a4e 100644
--- a/public/z0mb/js/newscript.js
+++ b/public/z0mb/js/newscript.js
@@ -395,7 +395,7 @@ $(function() {
formData.append('file', file);
$('.progress-striped, #upload-stats').css('opacity', 0).slideDown('fast').animate({opacity: 1}, {queue: false, duration: 'fast'});
jqXHR = $.ajax({
- url: '/api/upload',
+ url: '/api/video/upload',
type: 'POST',
data: formData,
processData: false,
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index fe8fa86..dad5e74 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -1,10 +1,14 @@
-
+
+ mmmm #
+ m m m" "m #mmm mmmmm mmm mmm mmmmm
+ "m m m" # m # #" "# # # # #" " #" "# # # #
+ #m#m# # # # # # # # # # # # # #
+ # # #mm# ##m#" # # # # "#mm" "#m#" # # #
+
+
+
+
+ " m
+ mmmmm mmm mmm m mm mm#mm mmm m mm mmm m mm mmm mmm
+ # # # " # # #" # # #" # #" # " # #" # #" " #" #
+ # # # m"""# # # # # #"""" # # m"""# # # # #""""
+ # # # "mm"# mm#mm # # "mm "#mm" # # "mm"# # # "#mm" "#mm"
+
+
+
+ ETA: probably until late evening (European time)
+ I feel asleep during the process xD will take even longer
+ webms are copying over, soon™
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/layout1/about.blade.php b/resources/views/layout1/about.blade.php
index ca6566e..621289c 100644
--- a/resources/views/layout1/about.blade.php
+++ b/resources/views/layout1/about.blade.php
@@ -1,92 +1,6 @@
@extends('profilelayout')
@section('content')
-
-
-
-
Filter settings
-
Filter is now global and not logged in users will only see sfw videos
-
You can also set your own custom filters by clicking on Filter and then inserting the tags you don't want to see while browsing.
-
Example:
-
-anime asians Crayon Pop gay
-
-
You will see that our videos are tagged with either sfw or nsfw these labels mean in nearly 99% of the case at least for uploads tagged with nsfw that they are nsfw, but the sfw tag isn't always sfw and you shouldn't think that we really care about this, there is probably a lot of content which is not tagged as nsfw but still is nsfw.
-
Always take care and when you are not sure if you can browse w0bm at work, don't do it, we don't guarantee that everything is properly tagged and you will encounter something that can get you in trouble.
-
-
-
-
-
- - >mfw w0bm is nice :3 will become: >mfw w0bm is nice :3
- - [reich]Pantsu Pantsu Pantsu[/reich] will become: Pantsu Pantsu Pantsu
- - [krebs]KREBS KREBS KREBS KREBS[/krebs] will become: KREBS KREBS KREBS KREBS
- - [rb]JA GEIL SCHNITZEL MHM JA!!!![/rb] will become: JA GEIL SCHNITZEL MHM JA!!!!
- - [spoiler]f0ck you![/spoiler] will become: f0ck you!
- - *gg* or _gg_ will become: gg
- - **gg** or __gg__ will become: gg
- - ~~nope~~ will become:
nope
- - `code` will become:
code
- - --- will insert a line
to seperate
-
-
This cannot be stacked, don't do it.
-
If you want to answer someone, simply use ^
as often as you need to point to the comment you want to answer to.
-
If you want to ping someone directly in a comment use @$user
-
-
-
-
FAQ
-
Q: w0bm is laggy for me and I don't know why.
-
A: It's mostly because of the background. It's very resource heavy and can cause lag on some computers, if you experience this, you should click the yellow circle on the video page to turn it off
-
Q: I don't know how to create WebMs
-
A: Check out our WebM support page and pick the solution you like the most!
-
Q: Can you allow mp4s to be uploaded?
-
A: Why do you think this website is called w0bm?
-
Q: I want to give you guys some feedback and maybe some suggestions, where should I go?
-
A: The best way to suggest something is by contacting us directly via IRC
-
-
-
Disclaimer:
-
Content on this page must not necessarily reflect the actual views of the administration.
-
Please note this, we try to be very open to any content, also content that is disturbing or otherwise unliked by most people, we do this for the sake of the freedom to shitpost even critical stuff, please check the filter settings if you get upset easily and filter out unwanted videos, thanks!
-
+{!!$blah!!}
@include('footer')
@endsection
diff --git a/resources/views/layout1/apply-down.blade.php b/resources/views/layout1/apply-down.blade.php
new file mode 100644
index 0000000..681884a
--- /dev/null
+++ b/resources/views/layout1/apply-down.blade.php
@@ -0,0 +1,7 @@
+@extends('layout')
+@section('content')
+@include('partials.flash')
+
+user limit reached 6969
+
+@endsection
diff --git a/resources/views/layout1/apply.blade.php b/resources/views/layout1/apply.blade.php
index 835db9b..91686ab 100644
--- a/resources/views/layout1/apply.blade.php
+++ b/resources/views/layout1/apply.blade.php
@@ -1,60 +1 @@
-@extends('layout')
-@section('content')
-@include('partials.flash')
-
-
-
+{{--
@if(auth()->check())
@else
@endif
-
-
+
--}}
+
IRC
irc.n0xy.net +6697 (ssl only) #w0bm
Don't have a desktop client? Why not join our Network via webirc? >>webirc.n0xy.net
More information: n0xy.net
+
[matrix]
+
#w0bm on the [matrix] network
+
#!w0bm:f0ck.it
+
Alternatively you can use the Element web client hosted at f0ck.it to connect to our channel, it has some modifications to make chatting more comfy:
Note: Registrations are disabled, you can still use this client with every homeserver you have an account on!
+
+ - w0bm.com Stylesheet
+ - Greentexting
+ - For the German users: The German translation has been updated to not include genderlanguage bullshit
+ - A better notification sound
+
-
-@if(auth()->check())
-
-
Hello there! Join our Discord and have a nice chat with us!
-
w0bm rules apply on the discord aswell also the server language is english.
-
- @else
- @endif
- @include('footer')
+@include('footer')
@endsection
diff --git a/resources/views/layout1/layout.blade.php b/resources/views/layout1/layout.blade.php
index a123da7..850137e 100644
--- a/resources/views/layout1/layout.blade.php
+++ b/resources/views/layout1/layout.blade.php
@@ -11,16 +11,21 @@
@if(auth()->check())
@endif
+
+
@if(auth()->check())
@endif
@if(isset($video))
@if($video->isSfw())
file)}}.png"@endif/>
- @else
+
file)}}.png"@endif/>
+ @else
file)}}_blurred.png"@endif/>
- @endif
+
file)}}_blurred.png"@endif/>
+ @endif
@endif
+
@if(auth()->check())
@endif
diff --git a/resources/views/layout1/partials/commentform.blade.php b/resources/views/layout1/partials/commentform.blade.php
index e58b4b6..b7240a3 100644
--- a/resources/views/layout1/partials/commentform.blade.php
+++ b/resources/views/layout1/partials/commentform.blade.php
@@ -26,7 +26,7 @@
?>
@foreach ($files as $file)
-
+
@endforeach
diff --git a/resources/views/layout1/partials/comments.blade.php b/resources/views/layout1/partials/comments.blade.php
index b60807a..b0a267d 100644
--- a/resources/views/layout1/partials/comments.blade.php
+++ b/resources/views/layout1/partials/comments.blade.php
@@ -11,13 +11,17 @@
@endif
-->
-
+{{--
- - Chat
+ - IRC
- About
- Contact
- Rules
diff --git a/resources/views/layout1/partials/thread_closed.php b/resources/views/layout1/partials/thread_closed.php
new file mode 100644
index 0000000..03d2e52
--- /dev/null
+++ b/resources/views/layout1/partials/thread_closed.php
@@ -0,0 +1,3 @@
+
+ Thread closed! ;__;
+
diff --git a/resources/views/layout1/rulez.blade.php b/resources/views/layout1/rulez.blade.php
index 2590a0b..2c7f413 100644
--- a/resources/views/layout1/rulez.blade.php
+++ b/resources/views/layout1/rulez.blade.php
@@ -35,4 +35,5 @@
@endforeach
+ @include('footer')
@endsection
diff --git a/resources/views/layout1/settings.blade.php b/resources/views/layout1/settings.blade.php
new file mode 100644
index 0000000..13fbab4
--- /dev/null
+++ b/resources/views/layout1/settings.blade.php
@@ -0,0 +1,17 @@
+ @extends('profilelayout')
+@section('content')
+Layouts
+
+
Change how you experience w0bm.com
+
+ - w0bmThe default look
+ - NjumAlternative approach
+ - z0mbz0r.de layout + theme
+ - nojsThe nojs layout (broken)
+ - MobileThe mobile optimized default layout
+ - MarderchenThis is marders Layout, it has no async js
+ - 2017The layout from 2017
+ - 2015The OG w0bm
+
+
+ @endsection
\ No newline at end of file
diff --git a/resources/views/layout2/about.blade.php b/resources/views/layout2/about.blade.php
index 940c121..46ae990 100644
--- a/resources/views/layout2/about.blade.php
+++ b/resources/views/layout2/about.blade.php
@@ -1,108 +1,5 @@
@extends('profilelayout')
@section('novidcontent')
-
-
-
-
What is w0bm.com?
-
-- w0bm.com is a collaborative, non-profit, modern WebM Archive
-- We collect random videos from the internet.
-- It's also about having fun and sharing nice videos
-
-
-
-
-
Following shortcuts are available:
-
- - Press: R for random
- - Press: →, D or L for next
- - Press: ←, A or H for prev
- - Press: ↑ or W for volume up
- - Press: ↓ or S for volume down
- - Press: F for fav
- - Scroll with your mouse up and down to trigger next or prev
- - Press: C to toggle the comment section
- - Press: SPACE to pause/unpause the video
-
-
-
-
-
Filter settings
-
Filter is now global and not logged in users will only see sfw videos
-
You can also set your own custom filters by clicking on Filter and then inserting the tags you don't want to see while browsing.
-
Example:
-
-anime asians Crayon Pop gay
-
-
You will see that our videos are tagged with either sfw or nsfw these labels mean in nearly 99% of the case at least for uploads tagged with nsfw that they are nsfw, but the sfw tag isn't always sfw and you shouldn't think that we really care about this, there is probably a lot of content which is not tagged as nsfw but still is nsfw.
-
Always take care and when you are not sure if you can browse w0bm at work, don't do it, we don't guarantee that everything is properly tagged and you will encounter something that can get you in trouble.
-
-
-
-
Need one of our professionals?
-
Our Mods work 24/7/365 for free and are basically just here to delete your reposts
-
Contact them if you need them:
-
-
Mods can be contacted either via @$modname
in the comments or via IRC
-
-
-
-
-
- - >mfw w0bm is nice :3 will become: >mfw w0bm is nice :3
- - [reich]Pantsu Pantsu Pantsu[/reich] will become: Pantsu Pantsu Pantsu
- - [krebs]KREBS KREBS KREBS KREBS[/krebs] will become: KREBS KREBS KREBS KREBS
- - [rb]JA GEIL SCHNITZEL MHM JA!!!![/rb] will become: JA GEIL SCHNITZEL MHM JA!!!!
- - [spoiler]f0ck you![/spoiler] will become: f0ck you!
- - *gg* or _gg_ will become: gg
- - **gg** or __gg__ will become: gg
- - ~~nope~~ will become:
nope
- - `code` will become:
code
- - --- will insert a line
to seperate
-
-
This cannot be stacked, don't do it.
-
If you want to answer someone, simply use ^
as often as you need to point to the comment you want to answer to.
-
If you want to ping someone directly in a comment use @$user
-
-
-
-
Allowed sources for image parsing in the comment section
-
Filetypes: {{ join(',', $comment['allowedImageFileExtensions']) }} - only secure https links will work!
-
- @foreach(array_keys($comment['allowedHosters']) as $hoster)
- @if($hoster != '')
- - {{$hoster}}
- @endif
- @endforeach
-
-
-
-
-
FAQ
-
Q: w0bm is laggy for me and I don't know why.
-
A: It's mostly because of the background. It's very resource heavy and can cause lag on some computers, if you experience this, you should click the yellow circle on the video page to turn it off
-
Q: I don't know how to create WebMs
-
A: Check out our WebM support page and pick the solution you like the most!
-
Q: Can you allow mp4s to be uploaded?
-
A: Why do you think this website is called w0bm?
-
Q: I want to give you guys some feedback and maybe some suggestions, where should I go?
-
A: The best way to suggest something is by contacting us directly via IRC
-
-
-
Disclaimer:
-
Content on this page must not necessarily reflect the actual views of the administration.
-
Please note this, we try to be very open to any content, also content that is disturbing or otherwise unliked by most people, we do this for the sake of the freedom to shitpost even critical stuff, please check the filter settings if you get upset easily and filter out unwanted videos, thanks!
-
-
+{!!$blah!!}
@endsection
diff --git a/resources/views/layout2/layout.blade.php b/resources/views/layout2/layout.blade.php
index 563e08d..e158c2f 100644
--- a/resources/views/layout2/layout.blade.php
+++ b/resources/views/layout2/layout.blade.php
@@ -18,7 +18,7 @@
@include('partials.report')
@include('partials.filterselect')
@endif
-
+
@if(auth()->check())
@if(auth()->user()->can('delete_video'))
@include('partials.frontendedit')
@@ -42,7 +42,6 @@
- v.1.{{ filemtime("njum/css/cstms.css") }} WIP