suwako
/
076server
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

Merge branch 'editprofile' into 'master' 

Editprofile

See merge request 076/community/076Server!9
このコミットが含まれているのは:
テクニカル諏訪子 2018-04-18 00:29:55 +09:00
親 d33b981a58 f135ed9a40
コミット 64c3c78f9f
3個のファイルの変更、111行の追加、19行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

14
app/Http/Controllers/AuthController.php
ファイルの表示

@ -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,

110
app/Http/Controllers/UserController.php
ファイルの表示

@ -91,40 +91,49 @@ class UserController extends Controller {
public function getUser($id, Request $request) { // /api/rpc/user/user/getuser/id/uid
$getting = array(
'users.id',
'username',
'perm_id',
'member_title',
'reg_date',
'website_address',
'website_name',
'gender',
'location',
'birthday',
'bio',
'avatar',
'name_style',
'display_name',
'yt_channel',
'country'
'users.username',
'usr_perm_id.perm_id',
'usr_profile.member_title',
'usr_details.reg_date',
'usr_contacts.website_link',
'usr_contacts.website_name',
'usr_profile.gender',
'usr_profile.location',
'usr_profile.birthday',
'usr_profile.bio',
'usr_profile.avatar',
'usr_profile.name_style',
'usr_profile.display_name',
'usr_profile.country',
'usr_contacts.website_link',
'usr_contacts.website_name',
'usr_contacts.youtube_link',
'usr_contacts.youtube_name',
'usr_contacts.niconico',
'usr_contacts.pixiv',
'usr_contacts.discord',
'usr_contacts.mastodon',
'usr_contacts.twitter'
);
$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')
->join('usr_details', 'usr_details.user_id', '=', 'users.id')
->join('usr_profile', 'usr_profile.user_id', '=', 'users.id')
->join('usr_contacts', 'usr_contacts.user_id', '=', 'users.id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id')
->where('id', $id)
->get($getting);
@ -147,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')
@ -328,4 +343,63 @@ class UserController extends Controller {
]);
}
}
public function editUser(Request $request) { // /api/rpc/user/user/edit
$check = $this->objAuth->checkLegit($request->username, $request->password);
if ($check == 0) {
return 'Err!';
}
else {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['usr_editprofile'] == 1) {
DB::table('users')
->where('id', $request->id)
->update([
'email' => $request->email,
'password' => $request->password
]);
DB::table('usr_contacts')
->where('user_id', $request->id)
->update([
'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('user_id', $request->id)
->update([
'perm_id' => $request->group
]);
DB::table('usr_profile')
->where('user_id', $request->id)
->update([
'gender' => $request->gender,
'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
]);
return 'Success!';
}
else {
return 'Permission denied.';
}
}
}
}

6
routes/class/user.php
ファイルの表示

@ -15,19 +15,23 @@ Route::get('/api/rpc/user/owner/getownersofentry/{id}', 'UserController@getOwner
Route::get('/api/rpc/user/owner/countentriesofowner/{id}', 'UserController@countEntriesOfOwner');
Route::get('/api/rpc/user/owner/getentriesofowner/{id}', 'UserController@getEntriesOfOwner');
Route::get('/api/rpc/user/owner/getownerlist', 'UserController@getOwnerList');
Route::post('/api/rpc/user/owner/addowner', 'UserController@addOwner');
// User
Route::get('/api/rpc/user/user/getusersonline', 'UserController@getUsersOnline');
Route::post('/api/rpc/user/user/updateuseronline', 'UserController@updateUserOnline');
Route::get('/api/rpc/user/user/getusers', 'UserController@getUsers');
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');
Route::get('/api/rpc/user/user/gettotaltopiccount/{id}', 'UserController@getTotalTopicCount');
Route::post('/api/rpc/user/user/updateuseronline', 'UserController@updateUserOnline');
Route::post('/api/rpc/user/user/updatetotalpostcount', 'UserController@updateTotalPostCount');
Route::post('/api/rpc/user/user/updatetotaltopiccount', 'UserController@updateTotalTopicCount');
Route::post('/api/rpc/user/user/edit', 'UserController@editUser');