idcjp/servermgrv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

servermgrv2 init...

Browse Source
This commit is contained in:
최준흠 2023-07-19 17:20:02 +09:00
parent e901dfdeb7
commit 8593daf8eb
6 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Config/Routes.php
View File

@ -40,7 +40,6 @@ $routes->post('/signin', 'Common\AuthController::signin/local');
$routes->get('/signin/(:alpha)', 'Common\AuthController::signin/$1');
$routes->get('/logout', 'Common\AuthController::logout');
$routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) {
$routes->cli('hpilo/hpilo4', 'HPILO\HPILO4::execute');
});
$routes->group('front', ['namespace' => 'App\Controllers\Front'], function ($routes) {
$routes->get('/', 'FrontController::index');
@ -74,20 +73,6 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au
$routes->get('toggle/(:num)/(:hash)', 'LoggerController::toggle/$1/$2', ['filter' => 'authFilter:master,director']);
$routes->post('batchjob', 'LoggerController::batchjob', ['filter' => 'authFilter:master']);
});
$routes->group('hpilo', static function ($routes) {
$routes->get('', 'HPILOController::index');
$routes->get('excel', 'HPILOController::excel');
$routes->get('insert', 'HPILOController::insert_form', ['filter' => 'authFilter:master,director']);
$routes->post('insert', 'HPILOController::insert', ['filter' => 'authFilter:master,director']);
$routes->get('update/(:num)', 'HPILOController::update_form/$1');
$routes->post('update/(:num)', 'HPILOController::update/$1');
$routes->get('view/(:num)', 'HPILOController::view/$1');
$routes->get('delete/(:num)', 'HPILOController::delete/$1', ['filter' => 'authFilter:master,director']);
$routes->get('toggle/(:num)/(:hash)', 'HPILOController::toggle/$1/$2', ['filter' => 'authFilter:master,director']);
$routes->get('console/(:num)', 'HPILOController::console/$1');
$routes->get('reset/(:num)/(:alpha)', 'HPILOController::reset/$1/$2');
$routes->get('reload/(:num)', 'HPILOController::reload/$1');
});
});
/*
* --------------------------------------------------------------------

8
app/Controllers/Admin/UserSNSController.php
View File

@ -63,22 +63,22 @@ class UserSNSController extends \App\Controllers\Admin\AdminController
//Insert관련
// final public function insert()
// {
// // return $this->insert_procedure();
// return $this->insert_procedure();
// }
// //Update관련
// final public function update($uid)
// {
// // return $this->update_procedure($uid);
// return $this->update_procedure($uid);
// }
// //Toggle관련
// final public function toggle($uid, string $field)
// {
// // return $this->toggle_procedure($uid, $field);
// return $this->toggle_procedure($uid, $field);
// }
// //Batchjob 관련
// final public function batchjob()
// {
// // return $this->batchjob_procedure();
// return $this->batchjob_procedure();
// }
//Delete 관련
final public function delete($uid)

4
app/Entities/UserEntity.php
View File

@ -22,4 +22,8 @@ class UserEntity extends CommonEntity
{
return $this->attributes['passwd'];
}
public function getEncryptedPassword(string $password)
{
return password_hash($password, PASSWORD_DEFAULT);
}
}

4
app/Libraries/Adapter/Auth/Adapter.php
View File

@ -49,8 +49,8 @@ abstract class Adapter
$authrizedDatas[LOGINS['ISLOGIN']] = true;
$authrizedDatas['uid'] = $entity->getPrimaryKey();
$authrizedDatas['name'] = $entity->getTitle();
$authrizedDatas['email'] = $entity->getEmail();
$authrizedDatas['role'] = $entity->getRole();
$authrizedDatas['email'] = $entity->email;
$authrizedDatas['role'] = $entity->role;
session()->set($authrizedDatas);
}
public function getSessionInfo(array $authrizedDatas = array()): array

2
app/Libraries/Adapter/Auth/GoogleAdapter.php
View File

@ -105,7 +105,7 @@ class GoogleAdapter extends Adapter
if (is_null($snsEntity)) {
$snsEntity = $this->getUserSNSModel()->create($this->getSiteName(), $result);
}
if (!$snsEntity->user_id) {
if (!$snsEntity->getUserUID()) {
throw new \Exception($this->getSiteName() . "의{$result['email']}:{$result['name']}님은 아직 사용자 지정이 되지 않았습니다.");
}
if ($snsEntity->getStatus() !== DEFAULTS['STATUS']) {

3
app/Views/layouts/admin/left_menu.php
View File

@ -13,9 +13,6 @@
<div class="accordion-item">
<h2><a href="/admin/usersns"><i class="fa fa-users"></i>SNS 계정 관리</a></h2>
</div>
<div class="accordion-item">
<h2><a href="/admin/hpilo"><i class="fa fa-recycle"></i>HP Server 관리</a></h2>
</div>
<div class="accordion-item">
<h2><a href="/admin/logger"><i class="fa fa-recycle"></i>Log 관리</a></h2>
</div>