登録フォームと未設定アイコンの修正
このコミットが含まれているのは:
コミット
1566a4a6de
|
@ -232,14 +232,15 @@ class AuthController extends Controller {
|
||||||
$ip = $_SERVER['REMOTE_ADDR'];
|
$ip = $_SERVER['REMOTE_ADDR'];
|
||||||
|
|
||||||
if (!empty($r)) {
|
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 ($existUser != 0) return array('err' => 'ユーザ名は既に登録しています。');
|
||||||
if (empty($r->username)) return array('err' => 'ユーザ名は空です。');
|
if (empty($r->username)) return array('err' => 'ユーザ名は空です。');
|
||||||
if (preg_match("/^[a-zA-Z0-9]+$/", $r->username) == 0) 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)) return array('err' => 'パスワードは空です。');
|
||||||
if (empty($r->password_check)) 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' => 'パスワードとパスワード(確認)は違います。');
|
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 ($existEmail != 0) return array('err' => 'メールアドレスは既に登録しています。');
|
||||||
if (empty($r->email)) return array('err' => 'メールアドレスは空です。');
|
if (empty($r->email)) return array('err' => 'メールアドレスは空です。');
|
||||||
if (!filter_var($r->email, FILTER_VALIDATE_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' => '',
|
'website_name' => '',
|
||||||
'youtube_link' => '',
|
'youtube_link' => '',
|
||||||
'youtube_name' => '',
|
'youtube_name' => '',
|
||||||
|
'bitchute' => '',
|
||||||
'niconico' => '',
|
'niconico' => '',
|
||||||
'pixiv' => '',
|
'pixiv' => '',
|
||||||
'discord' => '',
|
'discord' => '',
|
||||||
'mastodon' => '',
|
'mastodon' => '',
|
||||||
'twitter' => ''
|
'twitter' => '',
|
||||||
|
'facebook' => '',
|
||||||
|
'instagram' => ''
|
||||||
]);
|
]);
|
||||||
|
|
||||||
DB::table('usr_profile')
|
DB::table('usr_profile')
|
||||||
|
@ -305,11 +309,11 @@ class AuthController extends Controller {
|
||||||
'name_style' => '',
|
'name_style' => '',
|
||||||
'display_name' => '',
|
'display_name' => '',
|
||||||
'yt_channel' => '',
|
'yt_channel' => '',
|
||||||
'country' => ($r->country ? $r->country : 'ASEAN'),
|
'country' => ($r->country ? $r->country : 'Japan'),
|
||||||
'date_format' => '',
|
'date_format' => '',
|
||||||
'isClock24' => 0,
|
'isClock24' => 1,
|
||||||
'isShowSeconds' => 0,
|
'isShowSeconds' => 1,
|
||||||
'isShowTimezone' => 0
|
'isShowTimezone' => 1
|
||||||
]);
|
]);
|
||||||
|
|
||||||
DB::table('usr_perm_id')
|
DB::table('usr_perm_id')
|
||||||
|
@ -327,6 +331,8 @@ class AuthController extends Controller {
|
||||||
'inv_per_id' => 4,
|
'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);
|
setcookie('kero_token', $checkName->kero_token, time()+157788000, '/', $_SERVER['HTTP_HOST'], 0, 1);
|
||||||
return $this->login($r);
|
return $this->login($r);
|
||||||
|
|
||||||
|
@ -338,16 +344,7 @@ class AuthController extends Controller {
|
||||||
|
|
||||||
public function login (Request $r) {
|
public function login (Request $r) {
|
||||||
if (!empty($r)) {
|
if (!empty($r)) {
|
||||||
$checkName = DB::table('users')
|
$checkName = DB::table('users')->where('username', $r->username)->first();
|
||||||
->select('*')
|
|
||||||
->where('username', $r->username)
|
|
||||||
->first(
|
|
||||||
'id',
|
|
||||||
'username',
|
|
||||||
'password',
|
|
||||||
'kero_token',
|
|
||||||
'salt'
|
|
||||||
);
|
|
||||||
|
|
||||||
if ($checkName) {
|
if ($checkName) {
|
||||||
// $checkName = json_decode(json_encode($checkName), true);
|
// $checkName = json_decode(json_encode($checkName), true);
|
||||||
|
@ -360,24 +357,17 @@ class AuthController extends Controller {
|
||||||
if (hash_equals($checkPass, $checkName->password)) {
|
if (hash_equals($checkPass, $checkName->password)) {
|
||||||
if (!$checkName->kero_token) {
|
if (!$checkName->kero_token) {
|
||||||
$checkName->kero_token = $this->makeToken();
|
$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);
|
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() {
|
function makeToken() {
|
||||||
|
|
|
@ -71,9 +71,9 @@ class HomeController extends Controller {
|
||||||
$err = '';
|
$err = '';
|
||||||
|
|
||||||
if (isset($r->username) && isset($r->password) && isset($r->email) && isset($r->password_check)) {
|
if (isset($r->username) && isset($r->password) && isset($r->email) && isset($r->password_check)) {
|
||||||
$res = $this->objAuth->register($r);
|
$reg = $this->objAuth->register($r);
|
||||||
if (isset($res['kero_token'])) return redirect('');
|
if (isset($reg['kero_token'])) return redirect('');
|
||||||
$err = $res['err'];
|
$err = $reg['err'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('pages.site.register', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user, 'err' => $err]);
|
return view('pages.site.register', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user, 'err' => $err]);
|
||||||
|
|
|
@ -58,7 +58,10 @@ class UserController extends Controller {
|
||||||
$get->contacts = DB::table('usr_contacts')->where('user_id', $id)->first();
|
$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_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();
|
$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 = '不明';
|
$get->profile->gender_name = '不明';
|
||||||
if ($get->profile->gender == 1) $get->profile->gender_name = '男性';
|
if ($get->profile->gender == 1) $get->profile->gender_name = '男性';
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="back">
|
<div class="back">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col" style="text-align: center;"><img src="/{{ $res->profile->avatar }}" width="100px" /><br /></div>
|
<div class="col" style="text-align: center;"><img src="{{ $res->profile->avatar }}" width="100px" /><br /></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
|
|
|
@ -5,11 +5,16 @@
|
||||||
<div class="within">
|
<div class="within">
|
||||||
<div class="bar">新規登録</div>
|
<div class="bar">新規登録</div>
|
||||||
<div class="back">
|
<div class="back">
|
||||||
|
@if ($err)
|
||||||
|
<div class="alert alert-danger" role="alert">
|
||||||
|
{{ $err }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
<form method="POST" action="/register">
|
<form method="POST" action="/register">
|
||||||
@csrf
|
@csrf
|
||||||
<div class="row body">
|
<div class="row body">
|
||||||
<div class="col-sm-4"><b>ユーザー名 <span class="badge badge-danger">必須</span></b></div>
|
<div class="col-sm-4"><b>ユーザー名 <span class="badge badge-danger">必須</span></b></div>
|
||||||
<div class="col"><input name="username" id="username-register" type="text" class="form-control" /></div>
|
<div class="col"><input name="username" id="username-register" type="text" class="form-control" value="{{ old('username') }}" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row body">
|
<div class="row body">
|
||||||
<div class="col-sm-4"><b>パスワード <span class="badge badge-danger">必須</span></b></div>
|
<div class="col-sm-4"><b>パスワード <span class="badge badge-danger">必須</span></b></div>
|
||||||
|
@ -21,7 +26,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row body">
|
<div class="row body">
|
||||||
<div class="col-sm-4"><b>電子メール <span class="badge badge-danger">必須</span></b></div>
|
<div class="col-sm-4"><b>電子メール <span class="badge badge-danger">必須</span></b></div>
|
||||||
<div class="col"><input name="email" id="email-register" type="text" class="form-control" /></div>
|
<div class="col"><input name="email" id="email-register" type="text" class="form-control" value="{{ old('email') }}" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row body">
|
<div class="row body">
|
||||||
<div class="col-sm-4"><b>国</b></div>
|
<div class="col-sm-4"><b>国</b></div>
|
||||||
|
|
新しいイシューから参照