diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index d6744e557..c0b608502 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -83,7 +83,7 @@
$db_info = Context::getDBInfo();
Context::set('selected_lang', $db_info->lang_type);
- Context::set('current_version', __ZBXE_VERSION__);
+ Conㄴtext::set('current_version', __ZBXE_VERSION__);
Context::set('installed_path', realpath('./'));
$oModuleModel = &getModel('module');
@@ -95,36 +95,106 @@
Context::set('addon_list', $addon_list);
$args->date = date("Ymd000000", time()-60*60*24);
+ $today = date("Ymd");
+ // 회원
$output = executeQueryArray("admin.getMemberStatus", $args);
- $status->member->yesterday = number_format($output->data[0]->count);
- $status->member->today = number_format($output->data[1]->count);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->member->today = $var->count;
+ } else {
+ $status->member->yesterday = $var->count;
+ }
+ }
+ }
$output = executeQuery("admin.getMemberCount", $args);
- $status->member->total = number_format($output->data->count);
+ $status->member->total = $output->data->count;
+ // 문서
$output = executeQueryArray("admin.getDocumentStatus", $args);
- $status->document->yesterday = number_format($output->data[0]->count);
- $status->document->today = number_format($output->data[1]->count);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->document->today = $var->count;
+ } else {
+ $status->document->yesterday = $var->count;
+ }
+ }
+ }
$output = executeQuery("admin.getDocumentCount", $args);
- $status->document->total = number_format($output->data->count);
+ $status->document->total = $output->data->count;
+ // 댓글
$output = executeQueryArray("admin.getCommentStatus", $args);
- $status->comment->yesterday = number_format($output->data[0]->count);
- $status->comment->today = number_format($output->data[1]->count);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->comment->today = $var->count;
+ } else {
+ $status->comment->yesterday = $var->count;
+ }
+ }
+ }
$output = executeQuery("admin.getCommentCount", $args);
- $status->comment->total = number_format($output->data->count);
+ $status->comment->total = $output->data->count;
+ // 엮인글
$output = executeQueryArray("admin.getTrackbackStatus", $args);
- $status->trackback->yesterday = number_format($output->data[0]->count);
- $status->trackback->today = number_format($output->data[1]->count);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->trackback->today = $var->count;
+ } else {
+ $status->trackback->yesterday = $var->count;
+ }
+ }
+ }
$output = executeQuery("admin.getTrackbackCount", $args);
- $status->trackback->total = number_format($output->data->count);
+ $status->trackback->total = $output->data->count;
+ // 첨부파일
$output = executeQueryArray("admin.getFileStatus", $args);
- $status->file->yesterday = number_format($output->data[0]->count);
- $status->file->today = number_format($output->data[1]->count);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->file->today = $var->count;
+ } else {
+ $status->file->yesterday = $var->count;
+ }
+ }
+ }
$output = executeQuery("admin.getFileCount", $args);
- $status->file->total = number_format($output->data->count);
+ $status->file->total = $output->data->count;
+
+ // 게시물 신고
+ $output = executeQueryArray("admin.getDocumentDeclaredStatus", $args);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->documentDeclared->today = $var->count;
+ } else {
+ $status->documentDeclared->yesterday = $var->count;
+ }
+ }
+ }
+ $output = executeQuery("admin.getDocumentDeclaredCount", $args);
+ $status->documentDeclared->total = $output->data->count;
+
+ // 댓글 신고
+ $output = executeQueryArray("admin.getCommentDeclaredStatus", $args);
+ if($output->data) {
+ foreach($output->data as $var) {
+ if($var->date == $today) {
+ $status->commentDeclared->today = $var->count;
+ } else {
+ $status->commentDeclared->yesterday = $var->count;
+ }
+ }
+ }
+ $output = executeQuery("admin.getCommentDeclaredCount", $args);
+ $status->commentDeclared->total = $output->data->count;
+
Context::set('status', $status);
$this->setTemplateFile('index');
diff --git a/modules/admin/queries/getCommentDeclaredCount.xml b/modules/admin/queries/getCommentDeclaredCount.xml
new file mode 100644
index 000000000..b2f867ecf
--- /dev/null
+++ b/modules/admin/queries/getCommentDeclaredCount.xml
@@ -0,0 +1,8 @@
+
diff --git a/modules/admin/queries/getCommentDeclaredStatus.xml b/modules/admin/queries/getCommentDeclaredStatus.xml
new file mode 100644
index 000000000..2e78b65ae
--- /dev/null
+++ b/modules/admin/queries/getCommentDeclaredStatus.xml
@@ -0,0 +1,19 @@
+
diff --git a/modules/admin/queries/getDocumentDeclaredCount.xml b/modules/admin/queries/getDocumentDeclaredCount.xml
new file mode 100644
index 000000000..864136c35
--- /dev/null
+++ b/modules/admin/queries/getDocumentDeclaredCount.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/modules/admin/queries/getDocumentDeclaredStatus.xml b/modules/admin/queries/getDocumentDeclaredStatus.xml
new file mode 100644
index 000000000..2edc1f822
--- /dev/null
+++ b/modules/admin/queries/getDocumentDeclaredStatus.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 42681e9f8..fcbeed1e3 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -125,34 +125,46 @@
- | {$lang->member} |
- {$status->member->yesterday} |
- {$status->member->today} |
- {$status->member->total} |
+ {$lang->member} |
+ {number_format($status->member->yesterday)} |
+ {number_format($status->member->today)} |
+ {number_format($status->member->total)} |
- | {$lang->document} |
- {$status->document->yesterday} |
- {$status->document->today} |
- {$status->document->total} |
+ {$lang->document} |
+ {number_format($status->document->yesterday)} |
+ {number_format($status->document->today)} |
+ {number_format($status->document->total)} |
- | {$lang->comment} |
- {$status->comment->yesterday} |
- {$status->comment->today} |
- {$status->comment->total} |
+ {$lang->comment} |
+ {number_format($status->comment->yesterday)} |
+ {number_format($status->comment->today)} |
+ {number_format($status->comment->total)} |
- | {$lang->trackback} |
- {$status->trackback->yesterday} |
- {$status->trackback->today} |
- {$status->trackback->total} |
+ {$lang->trackback} |
+ {number_format($status->trackback->yesterday)} |
+ {number_format($status->trackback->today)} |
+ {number_format($status->trackback->total)} |
- | {$lang->file} |
- {$status->file->yesterday} |
- {$status->file->today} |
- {$status->file->total} |
+ {$lang->file} |
+ {number_format($status->file->yesterday)} |
+ {number_format($status->file->today)} |
+ {number_format($status->file->total)} |
+
+
+ | {$lang->document.' '.$lang->cmd_declare} |
+ {number_format($status->documentDeclared->yesterday)} |
+ {number_format($status->documentDeclared->today)} |
+ {number_format($status->documentDeclared->total)} |
+
+
+ | {$lang->comment.' '.$lang->cmd_declare} |
+ {number_format($status->commentDeclared->yesterday)} |
+ {number_format($status->commentDeclared->today)} |
+ {number_format($status->commentDeclared->total)} |