From 1566a4a6dece08372975f052386fa3c5e835789c 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, 5 Mar 2020 08:35:04 +0900 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0=E3=81=A8=E6=9C=AA=E8=A8=AD=E5=AE=9A=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AuthController.php | 46 ++++++++----------- app/Http/Controllers/HomeController.php | 6 +-- app/Http/Controllers/UserController.php | 5 +- resources/views/pages/site/profile.blade.php | 2 +- resources/views/pages/site/register.blade.php | 9 +++- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index f4de4ab..563fd69 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -232,14 +232,15 @@ class AuthController extends Controller { $ip = $_SERVER['REMOTE_ADDR']; if (!empty($r)) { - $existUser = DB::table('users')->select('id')->where('username', $r->username)->first(); + $existUser = DB::table('users')->select('id')->where('username', $r->username)->count(); if ($existUser != 0) return array('err' => 'ユーザ名は既に登録しています。'); if (empty($r->username)) return array('err' => 'ユーザ名は空です。'); if (preg_match("/^[a-zA-Z0-9]+$/", $r->username) == 0) return array('err' => '英文字ばかりご入力下さい。'); if (empty($r->password)) return array('err' => 'パスワードは空です。'); if (empty($r->password_check)) return array('err' => 'パスワード（確認）は空です。'); + if ($r->password < 8) return array('err' => 'パスワードは8文以上をご入力下さい。'); if ($r->password != $r->password_check) return array('err' => 'パスワードとパスワード（確認）は違います。'); - $existEmail = DB::table('users')->select('id')->where('email', $r->email)->first(); + $existEmail = DB::table('users')->select('id')->where('email', $r->email)->count(); if ($existEmail != 0) return array('err' => 'メールアドレスは既に登録しています。'); if (empty($r->email)) return array('err' => 'メールアドレスは空です。'); if (!filter_var($r->email, FILTER_VALIDATE_EMAIL)) return array('err' => 'メールアドレスを正しくご入力下さい。'); @@ -278,11 +279,14 @@ class AuthController extends Controller { 'website_name' => '', 'youtube_link' => '', 'youtube_name' => '', + 'bitchute' => '', 'niconico' => '', 'pixiv' => '', 'discord' => '', 'mastodon' => '', - 'twitter' => '' + 'twitter' => '', + 'facebook' => '', + 'instagram' => '' ]); DB::table('usr_profile') @@ -305,11 +309,11 @@ class AuthController extends Controller { 'name_style' => '', 'display_name' => '', 'yt_channel' => '', - 'country' => ($r->country ? $r->country : 'ASEAN'), + 'country' => ($r->country ? $r->country : 'Japan'), 'date_format' => '', - 'isClock24' => 0, - 'isShowSeconds' => 0, - 'isShowTimezone' => 0 + 'isClock24' => 1, + 'isShowSeconds' => 1, + 'isShowTimezone' => 1 ]); DB::table('usr_perm_id') @@ -327,6 +331,8 @@ class AuthController extends Controller { 'inv_per_id' => 4, ]); + $checkName = DB::table('users')->select('kero_token')->where('id', $addUser)->first(); + setcookie('kero_token', $checkName->kero_token, time()+157788000, '/', $_SERVER['HTTP_HOST'], 0, 1); return $this->login($r); @@ -338,16 +344,7 @@ class AuthController extends Controller { public function login (Request $r) { if (!empty($r)) { - $checkName = DB::table('users') - ->select('*') - ->where('username', $r->username) - ->first( - 'id', - 'username', - 'password', - 'kero_token', - 'salt' - ); + $checkName = DB::table('users')->where('username', $r->username)->first(); if ($checkName) { // $checkName = json_decode(json_encode($checkName), true); @@ -360,24 +357,17 @@ class AuthController extends Controller { if (hash_equals($checkPass, $checkName->password)) { if (!$checkName->kero_token) { $checkName->kero_token = $this->makeToken(); - - DB::table('users') - ->where('id', $checkName->id) - ->update(['kero_token' => $checkName->kero_token]); + DB::table('users')->where('id', $checkName->id)->update(['kero_token' => $checkName->kero_token]); } setcookie('kero_token', $checkName->kero_token, time()+157788000, '/', $_SERVER['HTTP_HOST'], 0, 1); - - return array( - 'uid' => $checkName->id, - 'kero_token' => $checkName->kero_token - ); + return array('uid' => $checkName->id, 'kero_token' => $checkName->kero_token); } } - return array('err' => 'パスワードが違う'); + return array('err' => 'ユーザ名又はパスワードを間違いました。'); } - return array('err' => 'フォームは空いた'); + return array('err' => 'フォームは空です。'); } function makeToken() { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 461f64f..7814526 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -71,9 +71,9 @@ class HomeController extends Controller { $err = ''; if (isset($r->username) && isset($r->password) && isset($r->email) && isset($r->password_check)) { - $res = $this->objAuth->register($r); - if (isset($res['kero_token'])) return redirect(''); - $err = $res['err']; + $reg = $this->objAuth->register($r); + if (isset($reg['kero_token'])) return redirect(''); + $err = $reg['err']; } return view('pages.site.register', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user, 'err' => $err]); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 363d4da..d062a56 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -58,7 +58,10 @@ class UserController extends Controller { $get->contacts = DB::table('usr_contacts')->where('user_id', $id)->first(); $get->perm_id = DB::table('usr_perm_id')->where('user_id', $id)->first(); $get->perm_module = DB::table('usr_perm_module')->where('usr_perm_id', $get->perm_id->usr_per_id)->first(); - if (empty($get->avatar) || $get->avatar == '') $get->avatar = '/storage/assets/avatars/haznoavaz.png'; + if (is_null($get->profile->avatar) || empty($get->profile->avatar) || $get->profile->avatar == '') { + $get->profile->avatar = 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/assets/avatars/haznoavaz.png'; + } + else $get->profile->avatar = '/'.$get->profile->avatar; $get->profile->gender_name = '不明'; if ($get->profile->gender == 1) $get->profile->gender_name = '男性'; diff --git a/resources/views/pages/site/profile.blade.php b/resources/views/pages/site/profile.blade.php index bf37cf7..24a9909 100644 --- a/resources/views/pages/site/profile.blade.php +++ b/resources/views/pages/site/profile.blade.php @@ -10,7 +10,7 @@
-

+

diff --git a/resources/views/pages/site/register.blade.php b/resources/views/pages/site/register.blade.php index 54913fd..249b78a 100644 --- a/resources/views/pages/site/register.blade.php +++ b/resources/views/pages/site/register.blade.php @@ -5,11 +5,16 @@
新規登録
+ @if ($err) + + @endif
@csrf
ユーザー名 必須
-
+
パスワード 必須
@@ -21,7 +26,7 @@
電子メール 必須
-
+
国