From 57614eb8db1ba34edae11dbc41d244cdb8e7adbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Thu, 2 Dec 2021 01:24:28 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 21 ++++++++++- app/Http/Controllers/BashController.php | 10 ++--- app/Http/Controllers/Home/Comment.php | 2 +- resources/views/pages/site/index.blade.php | 8 ++-- resources/views/pages/site/login.blade.php | 6 +-- .../theme/techsuwa/component/navbar.blade.php | 2 +- routes/view/site.php | 37 ++++++++++--------- 7 files changed, 54 insertions(+), 32 deletions(-) diff --git a/.env.example b/.env.example index d382bdf..51348d7 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ APP_NAME=076Server APP_ENV=local APP_KEY= APP_DEBUG=false +APP_LOG_LEVEL=debug APP_URL=http://localhost ONION_HOST=jkdasfhfdhndsfnklhjfdsknjfdgsjk.onion SESSION_SECURE_COOKIE=false @@ -10,7 +11,15 @@ THEME="techsuwa" CSSENGINE="lolita" CSSMINIFY=true +ENABLE_REGISTER=false +HAS_ADMIN=false +OWNER_NAME="" +OWNER_PASS="" +ADMIN_NAME="" +ADMIN_PASS="" + LOG_CHANNEL=stack +LOG_LEVEL=debug DB_CONNECTION=mysql DB_HOST=127.0.0.1 @@ -25,6 +34,8 @@ QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 +MEMCACHED_HOST=127.0.0.1 + REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 @@ -35,6 +46,8 @@ MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +MAIL_OWNER_ADDRESS=null +MAIL_OWNER_NAME="${APP_NAME}" MAIL_FROM_ADDRESS=null MAIL_FROM_NAME="${APP_NAME}" @@ -44,4 +57,10 @@ GMO_SECRET="" CONOHA_DENANT_ID="" CONOHA_DENANT_NAME="" CONOHA_USER_NAME="" -CONOHA_USER_PASS="" \ No newline at end of file +CONOHA_USER_PASS="" + +YOUTUBE_API="" +LBRY_URI="" +PEER_URI="" +PEER_USER="" +PEER_PASS="" \ No newline at end of file diff --git a/app/Http/Controllers/BashController.php b/app/Http/Controllers/BashController.php index 09ff50d..5356ae8 100644 --- a/app/Http/Controllers/BashController.php +++ b/app/Http/Controllers/BashController.php @@ -28,11 +28,11 @@ class BashController extends Controller { if (mb_substr($args[$i], 0, 1, 'utf-8')) $opt = $args[$i]; } - if (strpos($opt, 'l') !== false) { + if (str_contains($opt, 'l')) { $ps = null; $pg = null; - if (strpos($opt, 't') !== false) { + if (str_contains($opt, 't')) { $pg = DB::table('blg_content')->select('publish_date')->where('isPost', 0)->orderBy('title', 'asc')->first(); $ps = DB::table('blg_content')->select('publish_date')->where('isPost', 1)->orderBy('title', 'asc')->first(); } @@ -42,8 +42,8 @@ class BashController extends Controller { } return "合計 2
-drwxr-xr-x 2 suwako suwako ".(strpos($opt, 'h') !== false ? '4.0K' : '4096')." ".date('m', $ps->publish_date)."月 ".date('d', $ps->publish_date)." ".date('H:i', $ps->publish_date)." post
-drwxr-xr-x 2 suwako suwako ".(strpos($opt, 'h') !== false ? '4.0K' : '4096')." ".date('m', $pg->publish_date)."月 ".date('d', $pg->publish_date)." ".date('H:i', $pg->publish_date)." page"; +drwxr-xr-x 2 suwako suwako ".(str_contains($opt, 'h') ? '4.0K' : '4096')." ".date('m', $ps->publish_date)."月 ".date('d', $ps->publish_date)." ".date('H:i', $ps->publish_date)." post
+drwxr-xr-x 2 suwako suwako ".(str_contains($opt, 'h') ? '4.0K' : '4096')." ".date('m', $pg->publish_date)."月 ".date('d', $pg->publish_date)." ".date('H:i', $pg->publish_date)." page"; } return 'post page'; @@ -57,7 +57,7 @@ drwxr-xr-x 2 suwako suwako ".(strpos($opt, 'h') !== false ? '4.0K' : '4096')." $slug = ''; for ($i = 1; $i < count($cat); $i++) { - if (strpos($cat[$i], 'post') !== false) $mode = 1; + if (str_contains($cat[$i], 'post')) $mode = 1; $slug = $cat[$i]; } diff --git a/app/Http/Controllers/Home/Comment.php b/app/Http/Controllers/Home/Comment.php index a4af3dc..bdd970b 100644 --- a/app/Http/Controllers/Home/Comment.php +++ b/app/Http/Controllers/Home/Comment.php @@ -13,7 +13,7 @@ class Comment { $user = null; if (isset($_COOKIE['kero_token'])) $user = DB::table('users')->select('id')->where('kero_token', $_COOKIE['kero_token'])->first()->id; - if ($user == 0 && (strpos($r->newmessage, 'http://') !== false || strpos($r->newmessage, 'https://') !== false)) return redirect('/'); + if ($user == 0 && (str_contains($r->newmessage, 'http://') || str_contains($r->newmessage, 'https://'))) return redirect('/'); $add = DB::table('blg_comments')->insertGetId([ 'user_id' => $user, diff --git a/resources/views/pages/site/index.blade.php b/resources/views/pages/site/index.blade.php index 822d41e..d86df4c 100644 --- a/resources/views/pages/site/index.blade.php +++ b/resources/views/pages/site/index.blade.php @@ -4,11 +4,11 @@
@foreach ($res as $k => $r) -
-
- {{ $r->title }} +
+
+ {{ $r->title }} +
-
@endforeach
diff --git a/resources/views/pages/site/login.blade.php b/resources/views/pages/site/login.blade.php index 2a6b2ba..84ac59b 100644 --- a/resources/views/pages/site/login.blade.php +++ b/resources/views/pages/site/login.blade.php @@ -6,9 +6,9 @@
{{ __('site.signin') }}
@if ($err) - + @endif
@csrf diff --git a/resources/views/theme/techsuwa/component/navbar.blade.php b/resources/views/theme/techsuwa/component/navbar.blade.php index f73eee2..17e4fae 100644 --- a/resources/views/theme/techsuwa/component/navbar.blade.php +++ b/resources/views/theme/techsuwa/component/navbar.blade.php @@ -2,7 +2,7 @@
favicon
    diff --git a/routes/view/site.php b/routes/view/site.php index 8a2c9a3..271c480 100644 --- a/routes/view/site.php +++ b/routes/view/site.php @@ -3,29 +3,32 @@ Route::get('/', 'Home\Index@index'); Route::get('/blog/{slug}', 'Home\Index@post'); -Route::get('/changelang/{lang}', function ($lang) { - setcookie('language', $lang, time()+157788000, '/', $_SERVER['HTTP_HOST'], 0, 1); - return redirect('/'); +Route::group(['prefix' => 'content'], function () { + Route::any('/add', 'Home\Content@add'); + Route::any('/{slug}/edit', 'Home\Content@edit'); }); -Route::any('/content/add', 'Home\Content@add'); -Route::any('/content/{slug}/edit', 'Home\Content@edit'); - Route::any('/login', 'User\Login@index'); Route::any('/register', 'User\Register@index'); -Route::any('/profile/{id}/edit', 'User\Profile@edit'); -Route::get('/profile/{id}', 'User\Profile@index'); +Route::group(['prefix' => 'profile'], function () { + Route::any('/{id}/edit', 'User\Profile@edit'); + Route::get('/{id}', 'User\Profile@index'); +}); -Route::any('/video/game/add', 'Video\Game@add'); -Route::any('/video/game/{slug}/edit', 'Video\Game@edit'); - -Route::any('/video/add', 'Video\VideoTable@add'); -Route::any('/video/{vid}/edit', 'Video\VideoTable@edit'); - -Route::get('/video', 'Video\Game@index'); -Route::get('/video/{slug}', 'Video\VideoTable@index'); -Route::get('/video/play/{vid}', 'Video\Prayer@index'); +Route::group(['prefix' => 'video'], function () { + Route::group(['prefix' => 'game'], function () { + Route::any('/add', 'Video\Game@add'); + Route::any('/{slug}/edit', 'Video\Game@edit'); + }); + + Route::any('/add', 'Video\VideoTable@add'); + Route::any('/{vid}/edit', 'Video\VideoTable@edit'); + + Route::get('/', 'Video\Game@index'); + Route::get('/{slug}', 'Video\VideoTable@index'); + Route::get('/play/{vid}', 'Video\Prayer@index'); +}); Route::get('/memberlist', 'User\MemberList@index'); Route::get('/commentlist', 'Home\CommentList@index');