diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 2b8e676..2da7cf5 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -99,6 +99,7 @@ define('LAYOUTS', [ 'stylesheets' => [ '', '', + '', ], 'javascripts' => [ '', @@ -113,6 +114,7 @@ define('LAYOUTS', [ '', '', '', + '', ], 'javascripts' => [ '', @@ -131,6 +133,7 @@ define('LAYOUTS', [ '', '', '', + '', ], 'javascripts' => [ '', diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 0eb81de..adaae89 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -32,7 +32,7 @@ class Filters extends BaseConfig public array $globals = [ 'before' => [ // 'honeypot', - // 'csrf', + 'csrf', // 'invalidchars', ], 'after' => [ diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php index 052a00f..96a0c2f 100644 --- a/app/Controllers/Admin/AdminController.php +++ b/app/Controllers/Admin/AdminController.php @@ -7,7 +7,7 @@ use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; -class AdminController extends BASEController +abstract class AdminController extends BASEController { public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php index 2486c5b..469c4e1 100644 --- a/app/Controllers/AuthController.php +++ b/app/Controllers/AuthController.php @@ -6,6 +6,7 @@ use App\Libraries\Adapter\Auth\Adapter; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; +use App\Models\UserModel; class AuthController extends BaseController { @@ -14,10 +15,6 @@ class AuthController extends BaseController { parent::initController($request, $response, $logger); helper('Common'); - $this->_viewDatas = [ - 'layout' => LAYOUTS['empty'], - 'title' => '로그인', - ]; $this->initAdapters(); } @@ -39,15 +36,11 @@ class AuthController extends BaseController public function login() { - helper(['form']); - $this->_viewDatas['forms'] = [ - 'attributes' => ['method' => "post",], - 'hiddens' => [], - ]; - $this->_viewDatas['login_buttons'] = array(); foreach ($this->_adapters as $key => $adapter) { $this->_viewDatas['login_buttons'][$key] = $adapter->getAuthButton(); } + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => []]; + helper(['form']); $this->_session->keepFlashdata(SESSION_NAMES['RETURN_URL']); return view('auth/login', $this->_viewDatas); } diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index a012b02..8f8c975 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -2,7 +2,7 @@ namespace App\Controllers; -use App\Models\UserModel; + use CodeIgniter\Controller; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Files\UploadedFile; @@ -10,6 +10,8 @@ use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; +use App\Models\UserModel; +use App\Entities\BaseEntity; /** * Class BaseController @@ -186,7 +188,7 @@ abstract class BaseController extends Controller // echo var_export($this->_viewDatas['fieldRules'], true); // exit; } - protected function insert_process() + protected function insert_process(): BaseEntity { return $this->_model->create($this->_viewDatas['fieldDatas']); } @@ -198,8 +200,8 @@ abstract class BaseController extends Controller $this->_viewDatas['fieldRules'] = $this->_model->getFieldRules($this->_viewDatas['fields'], 'insert'); $this->_viewDatas['fieldFilters'] = $this->_model->getFieldFilters(); $this->insert_validate(); - $this->insert_process(); - $msg = "{$this->_viewDatas['title']}에서 " . __FUNCTION__ . " 완료하였습니다."; + $entity = $this->insert_process(); + $msg = "{$this->_viewDatas['title']}에서 {$entity->getTitle()}의 " . __FUNCTION__ . " 완료하였습니다."; return redirect()->to($this->_session->getFlashdata(SESSION_NAMES['RETURN_URL'])); } catch (\Exception $e) { $msg = "{$this->_viewDatas['title']}에서 " . __FUNCTION__ . " 실패하였습니다.\n" . $e->getMessage(); @@ -407,6 +409,8 @@ abstract class BaseController extends Controller public function view($uid) { try { + // echo "TEST" . $this->_session->getFlashdata(SESSION_NAMES['RETURN_URL']); + // exit; $entity = $this->_model->getEntity([$this->_model->getPrimaryKey() => $uid]); $this->_viewDatas['fields'] = $this->_model->getFields('view'); $this->_viewDatas['fieldRules'] = $this->_model->getFieldRules($this->_viewDatas['fields'], 'view'); @@ -415,6 +419,7 @@ abstract class BaseController extends Controller $this->_viewDatas['fieldFormOptions'] = $this->getFieldFormOptions($this->_viewDatas['fieldFilters']); $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => []]; $this->_viewDatas['entity'] = $this->view_process($entity); + $this->_session->keepFlashdata(SESSION_NAMES['RETURN_URL']); return view($this->_viewPath . '/view', $this->_viewDatas); } catch (\Exception $e) { return redirect()->to($this->_session->getFlashdata(SESSION_NAMES['RETURN_URL']))->with('return_message', $e->getMessage()); @@ -510,6 +515,10 @@ abstract class BaseController extends Controller $this->index_process(); //setting return_url to session flashdata $this->_session->setFlashdata(SESSION_NAMES['RETURN_URL'], current_url() . '?' . $this->request->getUri()->getQuery() ?: ""); + // echo "TEST" . var_export($this->_session->get()); + // echo "
"; + // echo $this->_session->getFlashdata(SESSION_NAMES['RETURN_URL']); + // exit; return view($this->_viewPath . '/index', $this->_viewDatas); } catch (\Exception $e) { return redirect()->back()->with('return_message', $e->getMessage()); diff --git a/app/Helpers/BoardConfig_helper.php b/app/Helpers/BoardConfig_helper.php index 4d8de49..d1353bd 100644 --- a/app/Helpers/BoardConfig_helper.php +++ b/app/Helpers/BoardConfig_helper.php @@ -30,8 +30,8 @@ function getFieldForm_BoardConfigHelper($field, $value, array $fieldFormOptions, // return implode(" ", $checkboxs); // return form_multiselect($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], [...$attributes]); break; - case 'status': - $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Board.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; + case "status": + $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Order.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; return form_dropdown($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], $attributes); break; case 'updated_at': diff --git a/app/Helpers/Board_helper.php b/app/Helpers/Board_helper.php index 793ea13..3288273 100644 --- a/app/Helpers/Board_helper.php +++ b/app/Helpers/Board_helper.php @@ -25,8 +25,8 @@ function getFieldForm_BoardHelper($field, $value, array $fieldFormOptions, array // return implode(" ", $checkboxs); // return form_multiselect($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], [...$attributes]); break; - case 'status': - $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Board.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; + case "status": + $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Order.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; return form_dropdown($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], $attributes); break; case 'updated_at': diff --git a/app/Helpers/Common_helper.php b/app/Helpers/Common_helper.php index 3ec2d80..7d9e746 100644 --- a/app/Helpers/Common_helper.php +++ b/app/Helpers/Common_helper.php @@ -141,3 +141,14 @@ function alert_CommonHelper(string $msg, $url = null) } return ""; } // + +function imageSubmit_CommonHelper(string $src, array $attributes = []) +{ + return form_input([ + 'type' => 'image', + 'src' => base_url() . $src, + 'name' => array_key_exists('name', $attributes) ? $attributes['name'] : "", + 'value' => array_key_exists('value', $attributes) ? $attributes['value'] : "", + ...$attributes, + ]); +} diff --git a/app/Helpers/HPILO_helper.php b/app/Helpers/HPILO_helper.php index 03e709f..b287589 100644 --- a/app/Helpers/HPILO_helper.php +++ b/app/Helpers/HPILO_helper.php @@ -102,9 +102,9 @@ function getFieldIndex_Row_HPILOHelper($field, $entity, array $fieldFilters, $fi default: if (in_array($field, $fieldFilters)) { $attributes["onChange"] = sprintf('location.href="%s/toggle/%s/%s?%s="+this.options[this.selectedIndex].value', current_url(), $entity->getPrimaryKey(), $field, $field); - return getFieldFilter_UserHelper($field, $entity->$field, $fieldFormOptions, $attributes); + return getFieldFilter_HPILOHelper($field, $entity->$field, $fieldFormOptions, $attributes); } - return getFieldView_UserHelper($field, $entity, $fieldFormOptions, $attributes); + return getFieldView_HPILOHelper($field, $entity, $fieldFormOptions, $attributes); break; } } // \ No newline at end of file diff --git a/app/Helpers/UserSNS_helper.php b/app/Helpers/UserSNS_helper.php index a803ab2..d6dd55c 100644 --- a/app/Helpers/UserSNS_helper.php +++ b/app/Helpers/UserSNS_helper.php @@ -25,8 +25,8 @@ function getFieldForm_UserSNSHelper($field, $value, array $fieldFormOptions, arr // return implode(" ", $checkboxs); // return form_multiselect($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], [...$attributes]); break; - case 'status': - $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Board.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; + case "status": + $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Order.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; return form_dropdown($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], $attributes); break; case 'updated_at': diff --git a/app/Helpers/User_helper.php b/app/Helpers/User_helper.php index 6b39811..6cc3525 100644 --- a/app/Helpers/User_helper.php +++ b/app/Helpers/User_helper.php @@ -25,8 +25,8 @@ function getFieldForm_UserHelper($field, $value, array $fieldFormOptions, array // return implode(" ", $checkboxs); // return form_multiselect($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], [...$attributes]); break; - case 'status': - $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Board.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; + case "status": + $fieldFormOptions[$field] = [DEFAULTS['EMPTY'] => lang("Order.label.{$field}") . " 선택", ...$fieldFormOptions[$field]]; return form_dropdown($field, $fieldFormOptions[$field], is_array($value) ? [...$value] : [$value], $attributes); break; case 'updated_at': diff --git a/app/Language/ko/Validation.php b/app/Language/ko/Validation.php new file mode 100644 index 0000000..54d1e7a --- /dev/null +++ b/app/Language/ko/Validation.php @@ -0,0 +1,4 @@ +primaryKey: @@ -152,10 +152,10 @@ abstract class BaseModel extends Model $entity->$pk = $this->getUUID(); } break; - case "user_uid": + case "user_uid": //입력데이터로 있을시 추가, 없을시는 입력의 경우에만 자동으로 추가 if (array_key_exists($field, $formDatas) && $formDatas[$field]) { $entity->$field = $formDatas[$field]; - } elseif ($this->_session->get(SESSION_NAMES["ISLOGIN"])) { + } elseif ($action == 'create' && $this->_session->get(SESSION_NAMES["ISLOGIN"])) { $auth = $this->_session->get(SESSION_NAMES["AUTH"]); $entity->$field = $auth[AUTH_FIELDS["ID"]]; } @@ -204,7 +204,7 @@ abstract class BaseModel extends Model // echo var_export($entity); // exit; foreach ($this->allowedFields as $field) { - $entity = $this->changeFormData($field, $formDatas, $entity); + $entity = $this->changeFormData('create', $field, $formDatas, $entity); } // echo var_export($this->allowedFields); // exit @@ -214,7 +214,7 @@ abstract class BaseModel extends Model { foreach ($this->allowedFields as $field) { if ($field != $this->primaryKey) { - $entity = $this->changeFormData($field, $formDatas, $entity); + $entity = $this->changeFormData('modify', $field, $formDatas, $entity); } } $entity->updated_at = time(); diff --git a/app/Models/BoardConfigModel.php b/app/Models/BoardConfigModel.php index 71702ad..d216b94 100644 --- a/app/Models/BoardConfigModel.php +++ b/app/Models/BoardConfigModel.php @@ -79,7 +79,7 @@ class BoardConfigModel extends BaseModel return $this->where($conditions)->first() ?: throw new \Exception("해당 데이터가 없습니다.\n" . var_export($conditions, true)); } - protected function changeFormData(string $field, array $formDatas, $entity) + protected function changeFormData(string $action, string $field, array $formDatas, $entity) { switch ($field) { case "isaccess": @@ -100,7 +100,7 @@ class BoardConfigModel extends BaseModel } break; default: - $entity = parent::changeFormData($field, $formDatas, $entity); + $entity = parent::changeFormData($action, $field, $formDatas, $entity); break; } return $entity; diff --git a/app/Models/HPILOModel.php b/app/Models/HPILOModel.php index 5ea1db0..259746c 100644 --- a/app/Models/HPILOModel.php +++ b/app/Models/HPILOModel.php @@ -76,7 +76,7 @@ class HPILOModel extends BaseModel { return $this->where($conditions)->first() ?: throw new \Exception("해당 데이터가 없습니다.\n" . var_export($conditions, true)); } - protected function changeFormData(string $field, array $formDatas, $entity) + protected function changeFormData(string $action, string $field, array $formDatas, $entity) { switch ($field) { case "passwd": //API에서 사용하므로 암호를 바꾸면 않됨 @@ -85,7 +85,7 @@ class HPILOModel extends BaseModel } break; default: - return parent::changeFormData($field, $formDatas, $entity); + return parent::changeFormData($action, $field, $formDatas, $entity); break; } return $entity; diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php index 8bd9d8d..65f7a95 100644 --- a/app/Models/UserModel.php +++ b/app/Models/UserModel.php @@ -77,7 +77,7 @@ class UserModel extends BaseModel return $this->where($conditions)->first() ?: throw new \Exception("해당 데이터가 없습니다.\n" . var_export($conditions, true)); } - protected function changeFormData(string $field, array $formDatas, $entity) + protected function changeFormData(string $action, string $field, array $formDatas, $entity) { switch ($field) { case "role": @@ -86,7 +86,7 @@ class UserModel extends BaseModel } break; default: - $entity = parent::changeFormData($field, $formDatas, $entity); + $entity = parent::changeFormData($action, $field, $formDatas, $entity); break; } return $entity; diff --git a/app/Views/admin/board/index.php b/app/Views/admin/board/index.php index 4172d7b..ddb8991 100644 --- a/app/Views/admin/board/index.php +++ b/app/Views/admin/board/index.php @@ -1,8 +1,7 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> -
-
+
+
"get")) ?>
-
- - - - - - + +
번호작업
+ + + + + + + + getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> + + + + + - - - getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - - - - - - - - -
번호작업
+ "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
+ + + +
- -
-
+
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/board/insert.php b/app/Views/admin/board/insert.php index b8ac742..4f58b75 100644 --- a/app/Views/admin/board/insert.php +++ b/app/Views/admin/board/insert.php @@ -1,24 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - +
+ +
+ + + + + + - - + - - - - -
+ + +
- - - - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/board/reply.php b/app/Views/admin/board/reply.php index e97f9ba..9fca401 100644 --- a/app/Views/admin/board/reply.php +++ b/app/Views/admin/board/reply.php @@ -1,23 +1,22 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + + - - + - - - - -
+ $field), $fieldFormOptions) ?> + +
- - - $field), $fieldFormOptions) ?> - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/board/update.php b/app/Views/admin/board/update.php index e97f9ba..05d8b11 100644 --- a/app/Views/admin/board/update.php +++ b/app/Views/admin/board/update.php @@ -1,23 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ $field), $fieldFormOptions) ?> + +
- - - $field), $fieldFormOptions) ?> - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/board/view.php b/app/Views/admin/board/view.php index 2e2d8f7..c8a261a 100644 --- a/app/Views/admin/board/view.php +++ b/app/Views/admin/board/view.php @@ -1,15 +1,16 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - - - - -
- -
-include('templates/admin/footer'); ?> +
+ + + + + + + +
+ + +
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/boardconfig/index.php b/app/Views/admin/boardconfig/index.php index fd3d24c..2b57d5e 100644 --- a/app/Views/admin/boardconfig/index.php +++ b/app/Views/admin/boardconfig/index.php @@ -1,8 +1,7 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> -
-
+
+
"get")) ?>
-
- - - - - - + +
번호작업
+ + + + + + + + getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> + + + + + - - - getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - - - - - - - - -
번호작업
+ "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
+ + + +
- -
-
+
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/boardconfig/insert.php b/app/Views/admin/boardconfig/insert.php index b56a644..3d99cd5 100644 --- a/app/Views/admin/boardconfig/insert.php +++ b/app/Views/admin/boardconfig/insert.php @@ -1,23 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ + +
- - - - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/boardconfig/update.php b/app/Views/admin/boardconfig/update.php index 1b2227f..2f1385a 100644 --- a/app/Views/admin/boardconfig/update.php +++ b/app/Views/admin/boardconfig/update.php @@ -1,23 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ $field), $fieldFormOptions) ?> + +
- - - $field), $fieldFormOptions) ?> - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/boardconfig/view.php b/app/Views/admin/boardconfig/view.php index f479e12..32f07b4 100644 --- a/app/Views/admin/boardconfig/view.php +++ b/app/Views/admin/boardconfig/view.php @@ -1,15 +1,16 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - - - - -
- -
-include('templates/admin/footer'); ?> +
+ + + + + + + +
+ + +
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/hpilo/index.php b/app/Views/admin/hpilo/index.php index 56f7a88..d53647a 100644 --- a/app/Views/admin/hpilo/index.php +++ b/app/Views/admin/hpilo/index.php @@ -1,8 +1,7 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> -
-
+
+
"get")) ?>
-
- - - - - - + +
번호작업
+ + + + + + + + getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> + + + + + - - - getStatus() != 'use' ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - - - - - - - - -
번호작업
+ "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
+ + + +
- -
-
+
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/hpilo/insert.php b/app/Views/admin/hpilo/insert.php index 2458705..ca4a70c 100644 --- a/app/Views/admin/hpilo/insert.php +++ b/app/Views/admin/hpilo/insert.php @@ -1,24 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ + +
- - - - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-getFlashdata('error')) : ?>getFlashdata('error') ?> -include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/hpilo/update.php b/app/Views/admin/hpilo/update.php index 878dc55..635a8a5 100644 --- a/app/Views/admin/hpilo/update.php +++ b/app/Views/admin/hpilo/update.php @@ -1,24 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ $field), $fieldFormOptions) ?> + +
- - - $field, $fieldFormOptions) ?> - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-getFlashdata('error')) : ?>getFlashdata('error') ?> -include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/hpilo/view.php b/app/Views/admin/hpilo/view.php index 3084165..efaf13f 100644 --- a/app/Views/admin/hpilo/view.php +++ b/app/Views/admin/hpilo/view.php @@ -1,15 +1,16 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - - - - -
- -
-include('templates/admin/footer'); ?> +
+ + + + + + + +
+ + +
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/index.php b/app/Views/admin/user/index.php index 8b5e04a..5c010e4 100644 --- a/app/Views/admin/user/index.php +++ b/app/Views/admin/user/index.php @@ -1,8 +1,7 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> -
-
+
+
"get")) ?>
-
- - - - - - + +
번호작업
+ + + + + + + + getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> + + + + + - - - getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - - - - - - - - -
번호작업
+ "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
+ + + +
- -
-
+
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/insert.php b/app/Views/admin/user/insert.php index a3032ff..2687319 100644 --- a/app/Views/admin/user/insert.php +++ b/app/Views/admin/user/insert.php @@ -1,23 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ + +
- - - - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/update.php b/app/Views/admin/user/update.php index cd2160c..f83e3b3 100644 --- a/app/Views/admin/user/update.php +++ b/app/Views/admin/user/update.php @@ -1,23 +1,21 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - +
+ +
+ + + + + + - - + - - - - -
+ $field), $fieldFormOptions) ?> + +
- - - $field), $fieldFormOptions) ?> - - "btn btn-outline btn-primary")); ?>
"btn btn-outline btn-primary")); ?>
+ +
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/view.php b/app/Views/admin/user/view.php index 42f6d8d..a812e5d 100644 --- a/app/Views/admin/user/view.php +++ b/app/Views/admin/user/view.php @@ -1,15 +1,16 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - - - - -
- -
-include('templates/admin/footer'); ?> +
+ + + + + + + +
+ + +
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/usersns/index.php b/app/Views/admin/usersns/index.php index 23f9fb1..c8b232b 100644 --- a/app/Views/admin/usersns/index.php +++ b/app/Views/admin/usersns/index.php @@ -1,8 +1,7 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> -
-
+
+
"get")) ?>
-
- - - - - - + +
번호작업
+ + + + + + + + getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> + + + + + - - - - - - - - - - - -
번호작업
+ "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
+ + + +
- -
-
+
-include('templates/admin/footer'); ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/usersns/view.php b/app/Views/admin/usersns/view.php index b5b1832..261ec14 100644 --- a/app/Views/admin/usersns/view.php +++ b/app/Views/admin/usersns/view.php @@ -1,15 +1,16 @@ extend('layouts/admin') ?> section('content') ?> -include('templates/admin/header'); ?> - - - - - - - -
- -
-include('templates/admin/footer'); ?> +
+ + + + + + + +
+ + +
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/auth/login.php b/app/Views/auth/login.php index de1ab20..580cee3 100644 --- a/app/Views/auth/login.php +++ b/app/Views/auth/login.php @@ -1,33 +1,28 @@ extend('layouts/empty') ?> section('content') ?> - -
+ + - endSection() ?> \ No newline at end of file diff --git a/app/Views/layouts/admin.php b/app/Views/layouts/admin.php index 71f0ddf..4fcd268 100644 --- a/app/Views/layouts/admin.php +++ b/app/Views/layouts/admin.php @@ -24,28 +24,25 @@ - - include($layout['path'] . '/top_menu'); ?> - - + +
- - -
- + include($layout['path'] . '/left_menu'); ?> - - + + include('templates/admin/header'); ?> renderSection('content') ?> - + include('templates/admin/footer'); ?> - +
+
\ No newline at end of file diff --git a/app/Views/layouts/empty.php b/app/Views/layouts/empty.php index 07900f7..3aae6c1 100644 --- a/app/Views/layouts/empty.php +++ b/app/Views/layouts/empty.php @@ -24,13 +24,11 @@ - -
- +
+ include('templates/empty/header'); ?> renderSection('content') ?> - + include('templates/empty/footer'); ?>
- \ No newline at end of file diff --git a/app/Views/templates/admin/footer.php b/app/Views/templates/admin/footer.php index 174ff08..f22e7ef 100644 --- a/app/Views/templates/admin/footer.php +++ b/app/Views/templates/admin/footer.php @@ -1,4 +1,4 @@ - + getFlashdata('return_message') ? alert_CommonHelper($session->getFlashdata('return_message')) : "" ?>