Editprofile #9

マージ済み
TechnicalSuwako が 1 個のコミットを editprofile から master へマージ 2018-04-18 00:29:55 +09:00
3個のファイルの変更43行の追加22行の削除

ファイルの表示

@ -278,6 +278,20 @@ class AuthController extends Controller {
'strikes' => 0
]);
DB::table('usr_contacts')
->insert([
'user_id' => $addUser,
'website_link' => '',
'website_name' => '',
'youtube_link' => '',
'youtube_name' => '',
'niconico' => '',
'pixiv' => '',
'discord' => '',
'mastodon' => '',
'twitter' => ''
]);
DB::table('usr_profile')
->insert([
'user_id' => $addUser,

ファイルの表示

@ -119,15 +119,15 @@ class UserController extends Controller {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['usr_emailshow'] == 1) {
array_push($getting, 'email');
array_push($getting, 'users.email');
}
if ($valid['usr_ipshow'] == 1) {
array_push($getting, 'ip_address');
array_push($getting, 'usr_profile.ip_address');
}
if ($valid['usr_canwarn'] == 1) {
array_push($getting, 'strikes');
array_push($getting, 'usr_details.strikes');
}
return DB::table('users')
@ -156,6 +156,12 @@ class UserController extends Controller {
->get();
}
public function getGroups() { // /api/rpc/user/user/getgroups
return DB::table('usr_perm_module')
->select('id', 'name', 'colour_m', 'colour_f', 'colour_u')
->get();
}
public function getGroupName($id) { // /api/rpc/user/user/getgroupname/id
return DB::table('usr_perm_module')
->join('usr_perm_id', 'usr_perm_id.perm_id', '=', 'usr_perm_module.id')
@ -356,36 +362,36 @@ class UserController extends Controller {
]);
DB::table('usr_contacts')
->where('id', $request->id)
->where('user_id', $request->id)
->update([
'website_link' => $request->website_link,
'website_name' => $request->website_name,
'youtube_link' => $request->youtube_link,
'youtube_name' => $request->youtube_name,
'niconico' => $request->niconico,
'pixiv' => $request->pixiv,
'discord' => $request->discord,
'mastodon' => $request->mastodon,
'twitter' => $request->twitter
'website_link' => ($request->website_link != '' ? $request->website_link : ''),
'website_name' => ($request->website_name != '' ? $request->website_name : ''),
'youtube_link' => ($request->youtube_link != '' ? $request->youtube_link : ''),
'youtube_name' => ($request->youtube_name != '' ? $request->youtube_name : ''),
'niconico' => ($request->niconico != '' ? $request->niconico : ''),
'pixiv' => ($request->pixiv != '' ? $request->pixiv : ''),
'discord' => ($request->discord != '' ? $request->discord : ''),
'mastodon' => ($request->mastodon != '' ? $request->mastodon : ''),
'twitter' => ($request->twitter != '' ? $request->twitter : '')
]);
DB::table('usr_perm_id')
->where('id', $request->id)
->where('user_id', $request->id)
->update([
'perm_id' => $request->group
]);
DB::table('usr_profile')
->where('id', $request->id)
->where('user_id', $request->id)
->update([
'gender' => $request->gender,
'bio' => $request->aboutSelf,
'signature' => $request->signature,
'avatar' => $request->avatar,
'name_style' => $request->nameStyle,
'display_name' => $request->displayName,
'member_title' => $request->memberTitle,
'birthday' => $request->birthDay,
'bio' => ($request->aboutSelf != '' ? $request->aboutSelf : ''),
'signature' => ($request->signature != '' ? $request->signature : ''),
'avatar' => ($request->avatar != '' ? $request->avatar : ''),
'name_style' => ($request->nameStyle != '' ? $request->nameStyle : ''),
'display_name' => ($request->displayName != '' ? $request->displayName : ''),
'member_title' => ($request->memberTitle != '' ? $request->memberTitle : ''),
'birthday' => ($request->birthDay != 0 ? $request->birthDay : 0),
'country' => $request->country
]);

ファイルの表示

@ -25,6 +25,7 @@ Route::get('/api/rpc/user/user/getuser/{id}/{uid}', 'UserController@getUser');
Route::get('/api/rpc/user/user/getuser/{id}', 'UserController@getUser');
Route::get('/api/rpc/user/user/getexist/{username}/{email}', 'UserController@getExist');
Route::get('/api/rpc/user/user/getpoststyle/{id}', 'UserController@getPostStyle');
Route::get('/api/rpc/user/user/getgroups', 'UserController@getGroups');
Route::get('/api/rpc/user/user/getgroupname/{id}', 'UserController@getGroupName');
Route::get('/api/rpc/user/user/getgroupcolours', 'UserController@getGroupColours');
Route::get('/api/rpc/user/user/gettotalpostcount/{id}', 'UserController@getTotalPostCount');