ごめんケロ
このコミットが含まれているのは:
コミット
d12ebf2785
|
@ -49,7 +49,9 @@ class Index {
|
||||||
|
|
||||||
$get->showName = '';
|
$get->showName = '';
|
||||||
$get->showCol = '';
|
$get->showCol = '';
|
||||||
$get->comments = DB::table('blg_comments')->where('post_id', $get->id)->orderBy('id', 'asc')->get();
|
$get->comments = array();
|
||||||
|
$get->comments['come'] = DB::table('blg_comments')->where('post_id', $get->id)->orderBy('id', 'asc')->get()->toArray();
|
||||||
|
$get->comments['total'] = count($get->comments['come']);
|
||||||
$get->username = DB::table('users')->select('username')->where('id', $get->user_id)->first()->username;
|
$get->username = DB::table('users')->select('username')->where('id', $get->user_id)->first()->username;
|
||||||
$get->perm_id = DB::table('usr_perm_id')->select('perm_id')->where('user_id', $get->user_id)->first()->perm_id;
|
$get->perm_id = DB::table('usr_perm_id')->select('perm_id')->where('user_id', $get->user_id)->first()->perm_id;
|
||||||
|
|
||||||
|
@ -59,7 +61,7 @@ class Index {
|
||||||
$get->name_style = $p->name_style;
|
$get->name_style = $p->name_style;
|
||||||
$get->display_name = $p->display_name;
|
$get->display_name = $p->display_name;
|
||||||
|
|
||||||
foreach ($get->comments as $k => $c) {
|
foreach ($get->comments['come'] as $k => $c) {
|
||||||
if (count(userDetail($c->user_id)) > 0) {
|
if (count(userDetail($c->user_id)) > 0) {
|
||||||
$det = userDetail($c->user_id);
|
$det = userDetail($c->user_id);
|
||||||
$c->user_id = $det['user_id'];
|
$c->user_id = $det['user_id'];
|
||||||
|
@ -69,7 +71,7 @@ class Index {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($c->isShadow == 0) {
|
if ($c->isShadow == 0) {
|
||||||
if (getIp() != $c->ipaddress) unset($get->comments[$k]);
|
if (getIp() != $c->ipaddress) unset($get->comments['come'][$k]);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
unset($c->email);
|
unset($c->email);
|
||||||
|
|
|
@ -24,12 +24,18 @@
|
||||||
</div>
|
</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>パスワード</b></div>
|
||||||
<div class="col"><input name="password" id="password" type="password" class="form-control" /></div>
|
<div class="col">
|
||||||
|
<input name="password" id="password" type="password" class="form-control" />
|
||||||
|
パスワードを変更しなければ、そのまま入力しないで下さい。
|
||||||
|
</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>パスワード確認</b></div>
|
||||||
<div class="col"><input name="password_check" id="confirm" type="password" class="form-control" /></div>
|
<div class="col">
|
||||||
|
<input name="password_check" id="confirm" type="password" class="form-control" />
|
||||||
|
パスワードを変更しなければ、そのまま入力しないで下さい。
|
||||||
|
</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>
|
||||||
|
|
新しいイシューから参照