diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php index c3f229ca0..683a0685d 100644 --- a/modules/comment/comment.admin.view.php +++ b/modules/comment/comment.admin.view.php @@ -29,13 +29,12 @@ class CommentAdminView extends Comment { // option to get a list $args = new stdClass(); - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // / the number of postings to appear on a single page - $args->page_count = 5; // / the number of pages to appear on the page navigation - + $args->list_count = intval(Context::get('list_count')) ?: 20; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); $args->sort_index = 'list_order'; // /< Sorting values - $args->module_srl = Context::get('module_srl'); + /* $search_target = Context::get('search_target'); $search_keyword = Context::get('search_keyword'); @@ -118,10 +117,10 @@ class CommentAdminView extends Comment { // option to get a blacklist $args = new stdClass(); - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< the number of comment postings to appear on a single page - $args->page_count = 10; // /< the number of pages to appear on the page navigation - $args->order_type = 'desc'; // /< sorted value + $args->list_count = intval(Context::get('list_count')) ?: 20; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); + $args->order_type = 'desc'; // select sort method $sort_index = Context::get('sort_index'); @@ -214,11 +213,10 @@ class CommentAdminView extends Comment { // option for a list $args = new stdClass; - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< the number of posts to display on a single page - $args->page_count = 10; // /< the number of pages that appear in the page navigation $args->comment_srl = intval(Context::get('target_srl')); - + $args->list_count = intval(Context::get('list_count')) ?: 20; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); // get Status name list $oCommentModel = getModel('comment'); diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 5db78c216..b21214243 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -37,10 +37,15 @@ class DocumentAdminView extends Document { // option to get a list $args = new stdClass(); - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< the number of posts to display on a single page - $args->page_count = 5; // /< the number of pages that appear in the page navigation + $args->list_count = intval(Context::get('list_count')) ?: 30; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); + $args->sort_index = 'list_order'; + $args->module_srl = Context::get('module_srl'); + $args->statusList = []; + $args->use_division = false; + // search options $args->search_target = Context::get('search_target'); // /< search (title, contents ...) $args->search_keyword = Context::get('search_keyword'); // /< keyword to search if ($args->search_target === 'member_srl') @@ -53,11 +58,6 @@ class DocumentAdminView extends Document } } - $args->sort_index = 'list_order'; // /< sorting value - $args->module_srl = Context::get('module_srl'); - $args->statusList = []; - $args->use_division = false; - // get a list $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); $output = DocumentModel::getDocumentList($args, false, true, $columnList); @@ -160,9 +160,9 @@ class DocumentAdminView extends Document // option for a list $args = new stdClass(); - $args->page = intval(Context::get('page')) ?: 1; // /< Page - $args->list_count = 20; // /< the number of posts to display on a single page - $args->page_count = 10; // /< the number of pages that appear in the page navigation + $args->list_count = intval(Context::get('list_count')) ?: 20; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); $args->order_type = strtolower(Context::get('order_type')) === 'asc' ? 'asc' : 'desc'; // select sort method @@ -254,11 +254,10 @@ class DocumentAdminView extends Document { // option for a list $args = new stdClass; - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< the number of posts to display on a single page - $args->page_count = 10; // /< the number of pages that appear in the page navigation $args->document_srl = intval(Context::get('target_srl')); - + $args->list_count = intval(Context::get('list_count')) ?: 20; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); // get Status name list $oDocumentModel = getModel('document'); @@ -330,12 +329,11 @@ class DocumentAdminView extends Document { // options for a list $args = new stdClass(); - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< the number of posts to display on a single page - $args->page_count = 10; // /< the number of pages that appear in the page navigation - - $args->sort_index = 'list_order'; // /< sorting values - $args->order_type = 'desc'; // /< sorting values by order + $args->list_count = intval(Context::get('list_count')) ?: 30; + $args->page_count = 5; + $args->page = max(1, intval(Context::get('page'))); + $args->sort_index = 'list_order'; + $args->order_type = 'desc'; $args->module_srl = Context::get('module_srl'); diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index d19fc4e8f..43dba652c 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -15,14 +15,14 @@ class FileAdminView extends File { // Options to get a list $args = new stdClass(); - $args->page = Context::get('page'); // /< Page - $args->list_count = 30; // /< Number of documents that appear on a single page - $args->page_count = 10; // /< Number of pages that appear in the page navigation - - $args->sort_index = Context::get('sort_index') ?? 'file_srl'; // /< Sorting values - $args->order_type = Context::get('order_type') ?? null; + $args->list_count = intval(Context::get('list_count')) ?: 30; + $args->page_count = 10; + $args->page = max(1, intval(Context::get('page'))); + $args->sort_index = Context::get('sort_index') ?: 'file_srl'; + $args->order_type = strtolower(Context::get('order_type')) === 'asc' ? 'asc' : 'desc'; $args->isvalid = Context::get('isvalid'); $args->module_srl = Context::get('module_srl'); + // Get a list $oFileAdminModel = getAdminModel('file'); $output = $oFileAdminModel->getFileList($args); diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index 3f4a6f192..423e0630b 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -44,7 +44,7 @@ class MemberAdminModel extends Member $args = new stdClass(); $args->is_admin = Context::get('is_admin') === 'Y' ? 'Y' : null; $args->status = Context::get('is_denied') === 'Y' ? 'DENIED' : null; - $args->selected_group_srl = Context::get('selected_group_srl'); + $args->selected_group_srl = intval(Context::get('selected_group_srl')) ?: null; $filter = Context::get('filter_type'); switch($filter) @@ -128,21 +128,11 @@ class MemberAdminModel extends Member } // Change the query id if selected_group_srl exists (for table join) - $sort_order = Context::get('sort_order'); + $sort_order = Context::get('sort_order') === 'desc' ? 'desc' : 'asc'; $sort_index = Context::get('sort_index'); if(!$sort_index || !in_array($sort_index, ['user_id', 'email_address', 'phone_number', 'user_name', 'nick_name', 'regdate', 'last_login'])) { - $sort_index = "list_order"; - } - - if(!$sort_order) - { - $sort_order = 'asc'; - } - - if($sort_order != 'asc') - { - $sort_order = 'desc'; + $sort_index = 'list_order'; } if($args->selected_group_srl) @@ -158,13 +148,13 @@ class MemberAdminModel extends Member $args->sort_order = $sort_order; Context::set('sort_order', $sort_order); - // Other variables - $args->page = Context::get('page'); - $args->list_count = 40; - $args->page_count = 10; - $output = executeQuery($query_id, $args); - return $output; + // Other variables + $args->list_count = intval(Context::get('list_count')) ?: 30; + $args->page_count = 10; + $args->page = max(1, intval(Context::get('page'))); + + return executeQueryArray($query_id, $args); } /**