From 5a69f51e8628271b5faa4f5e7b26c7826823f8f5 Mon Sep 17 00:00:00 2001
From: Arcturus <github@drk.st>
Date: Mon, 24 Feb 2025 11:20:39 +0900
Subject: [PATCH] update

---
 AvocadoAmber/adm/_gnb.001.member.menu.php     | 28 +++++++++----------
 AvocadoAmber/adm/modules/action/_common.php   | 12 ++++++++
 .../{ => modules/action}/action_delete.php    |  3 +-
 .../action}/action_list_update.php            |  3 +-
 .../action}/action_manner_search.php          |  0
 .../adm/{ => modules/action}/action_reply.php |  8 +++---
 .../action/index.php}                         | 19 ++++++-------
 AvocadoAmber/adm/modules/browscap/_common.php | 12 ++++++++
 .../browscap/convert.php}                     |  8 ++----
 .../browscap/converter.php}                   |  0
 .../browscap/index.php}                       |  8 ++----
 .../browscap/update.php}                      |  0
 AvocadoAmber/adm/modules/visitor/_common.php  |  9 ++++++
 .../adm/{ => modules/visitor}/visit.sub.php   |  0
 .../{ => modules/visitor}/visit_browser.php   |  2 +-
 .../adm/{ => modules/visitor}/visit_date.php  |  2 +-
 .../{ => modules/visitor}/visit_delete.php    |  2 +-
 .../visitor}/visit_delete_update.php          |  0
 .../{ => modules/visitor}/visit_device.php    |  2 +-
 .../{ => modules/visitor}/visit_domain.php    |  3 +-
 .../adm/{ => modules/visitor}/visit_hour.php  |  2 +-
 .../adm/{ => modules/visitor}/visit_list.php  |  2 +-
 .../adm/{ => modules/visitor}/visit_month.php |  2 +-
 .../adm/{ => modules/visitor}/visit_os.php    |  2 +-
 .../{ => modules/visitor}/visit_search.php    |  2 +-
 .../adm/{ => modules/visitor}/visit_week.php  |  2 +-
 .../adm/{ => modules/visitor}/visit_year.php  |  2 +-
 27 files changed, 80 insertions(+), 55 deletions(-)
 create mode 100644 AvocadoAmber/adm/modules/action/_common.php
 rename AvocadoAmber/adm/{ => modules/action}/action_delete.php (94%)
 rename AvocadoAmber/adm/{ => modules/action}/action_list_update.php (93%)
 rename AvocadoAmber/adm/{ => modules/action}/action_manner_search.php (100%)
 rename AvocadoAmber/adm/{ => modules/action}/action_reply.php (97%)
 rename AvocadoAmber/adm/{action_list.php => modules/action/index.php} (97%)
 create mode 100644 AvocadoAmber/adm/modules/browscap/_common.php
 rename AvocadoAmber/adm/{browscap_convert.php => modules/browscap/convert.php} (89%)
 rename AvocadoAmber/adm/{browscap_converter.php => modules/browscap/converter.php} (100%)
 rename AvocadoAmber/adm/{browscap.php => modules/browscap/index.php} (89%)
 rename AvocadoAmber/adm/{browscap_update.php => modules/browscap/update.php} (100%)
 create mode 100644 AvocadoAmber/adm/modules/visitor/_common.php
 rename AvocadoAmber/adm/{ => modules/visitor}/visit.sub.php (100%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_browser.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_date.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_delete.php (98%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_delete_update.php (100%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_device.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_domain.php (98%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_hour.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_list.php (98%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_month.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_os.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_search.php (99%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_week.php (97%)
 rename AvocadoAmber/adm/{ => modules/visitor}/visit_year.php (97%)

diff --git a/AvocadoAmber/adm/_gnb.001.member.menu.php b/AvocadoAmber/adm/_gnb.001.member.menu.php
index 7ac431e..7999f89 100644
--- a/AvocadoAmber/adm/_gnb.001.member.menu.php
+++ b/AvocadoAmber/adm/_gnb.001.member.menu.php
@@ -29,27 +29,27 @@ $menu["member"]->getLastAddedMenu()->addSubFile("/member_delete.php");
 $menu["member"]->getLastAddedMenu()->addSubFile("/member_list_update.php");
 $menu["member"]->getLastAddedMenu()->addSubFile("/member_list_delete.php");
 
-$menu["member"]->addChildMenu("member", "접속자집계", G5_ADMIN_URL . "/visit_list.php", true, 200, "\F3F2", 0);
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_domain.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_browser.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_os.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_device.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_hour.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_date.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_week.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_month.php");
-$menu["member"]->getLastAddedMenu()->addSubFile("/visit_year.php");
+$menu["member"]->addChildMenu("member", "접속자집계", G5_ADMIN_URL . "/modules/visitor/visit_list.php", true, 200, "\F3F2", 0);
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_domain.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_browser.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_os.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_device.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_hour.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_date.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_week.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_month.php");
+$menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_year.php");
 
 $menu["member"]->addChildMenu("member", "투표관리", G5_ADMIN_URL . "/poll_list.php",  true, 500, "\F5F9", 0);
 $menu["member"]->getLastAddedMenu()->addSubFile("/poll_form.php");
 
 if ($config["cf_community"] && Community::isInitCommunity()) {
-  $menu["member"]->addChildMenu("member", "접속자검색", G5_ADMIN_URL . "/visit_search.php", true, 300, "\F52A", 0);
-  $menu["member"]->getLastAddedMenu()->addSubFile("/visit_delete_update.php");
+  $menu["member"]->addChildMenu("member", "접속자검색", G5_ADMIN_URL . "/modules/visitor/visit_search.php", true, 300, "\F52A", 0);
+  $menu["member"]->getLastAddedMenu()->addSubFile("/modules/visitor/visit_delete_update.php");
 
   $menu["member"]->addChildMenu("member", "캐릭터 미등록 회원관리", G5_ADMIN_URL . "/member_nocharacter_list.php", true, 400, "\F35E", 0);
   $menu["member"]->getLastAddedMenu()->addSubFile("/member_nocharacter_list_update.php");
 
-  $menu["member"]->addChildMenu("member", "활동량 관리", G5_ADMIN_URL . "/action_list.php", true, 410, "\F809", 0);
-  $menu["member"]->getLastAddedMenu()->addSubFile("/action_reply.php");
+  $menu["member"]->addChildMenu("member", "활동량 관리", G5_ADMIN_URL . "/modules/action/index.php", true, 410, "\F809", 0);
+  $menu["member"]->getLastAddedMenu()->addSubFile("/modules/action/action_reply.php");
 }
diff --git a/AvocadoAmber/adm/modules/action/_common.php b/AvocadoAmber/adm/modules/action/_common.php
new file mode 100644
index 0000000..e0f1faf
--- /dev/null
+++ b/AvocadoAmber/adm/modules/action/_common.php
@@ -0,0 +1,12 @@
+<?php
+define('G5_IS_ADMIN', true);
+
+include_once "../../../common.php";
+
+include_once G5_ADMIN_PATH . '/admin.lib.php';
+
+if (isset($token)) {
+  $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
+}
+
+EventHandler::triggerEvent("gnuboard.admin.load_common");
diff --git a/AvocadoAmber/adm/action_delete.php b/AvocadoAmber/adm/modules/action/action_delete.php
similarity index 94%
rename from AvocadoAmber/adm/action_delete.php
rename to AvocadoAmber/adm/modules/action/action_delete.php
index b0bef63..9205aa7 100644
--- a/AvocadoAmber/adm/action_delete.php
+++ b/AvocadoAmber/adm/modules/action/action_delete.php
@@ -24,5 +24,4 @@ member_delete($mb['mb_id']);
 if ($url)
   goto_url("{$url}?{$qstr}&amp;w=u&amp;mb_id=$mb_id");
 else
-  goto_url("./action_list.php?{$qstr}");
-?>
+  goto_url("./index.php?{$qstr}");
diff --git a/AvocadoAmber/adm/action_list_update.php b/AvocadoAmber/adm/modules/action/action_list_update.php
similarity index 93%
rename from AvocadoAmber/adm/action_list_update.php
rename to AvocadoAmber/adm/modules/action/action_list_update.php
index 02082f7..f5ff2c5 100644
--- a/AvocadoAmber/adm/action_list_update.php
+++ b/AvocadoAmber/adm/modules/action/action_list_update.php
@@ -24,5 +24,4 @@ for ($i = 0; $i < count($_POST['chk']); $i++) {
 if ($msg)
   alert($msg);
 
-goto_url('./action_list.php?' . $qstr);
-?>
+goto_url('./index.php?' . $qstr);
diff --git a/AvocadoAmber/adm/action_manner_search.php b/AvocadoAmber/adm/modules/action/action_manner_search.php
similarity index 100%
rename from AvocadoAmber/adm/action_manner_search.php
rename to AvocadoAmber/adm/modules/action/action_manner_search.php
diff --git a/AvocadoAmber/adm/action_reply.php b/AvocadoAmber/adm/modules/action/action_reply.php
similarity index 97%
rename from AvocadoAmber/adm/action_reply.php
rename to AvocadoAmber/adm/modules/action/action_reply.php
index 5e8ab10..cb77555 100644
--- a/AvocadoAmber/adm/action_reply.php
+++ b/AvocadoAmber/adm/modules/action/action_reply.php
@@ -1,5 +1,6 @@
 <?php
 include_once './_common.php';
+
 auth_check($auth[$sub_menu], 'r');
 
 if (!$s_year)
@@ -76,8 +77,7 @@ for ($j = 0; $row = sql_fetch_array($log); $j++) {
       </a>
     </p>
   <?php }
-} ?>
+}
+
+include_once G5_PATH . "/tail.sub.php";
 
-<?php
-include_once '../tail.sub.php';
-?>
diff --git a/AvocadoAmber/adm/action_list.php b/AvocadoAmber/adm/modules/action/index.php
similarity index 97%
rename from AvocadoAmber/adm/action_list.php
rename to AvocadoAmber/adm/modules/action/index.php
index ec57030..788a6ca 100644
--- a/AvocadoAmber/adm/action_list.php
+++ b/AvocadoAmber/adm/modules/action/index.php
@@ -3,7 +3,8 @@
  * @var string|int $cf_reply_cnt
  * @var string|int $s_mbid
  */
-include_once './_common.php';
+include_once "./_common.php";
+
 auth_check($auth[$sub_menu], 'r');
 
 $check_member = sql_fetch("select * from {$g5['member_table']} limit 0, 1");
@@ -116,7 +117,7 @@ $total_page = ceil($total_count / $page_rows);  // 전체 페이지 계산
 $from_record = ($page - 1) * $page_rows; // 시작 열을 구함
 
 $g5['title'] = '활동량 관리';
-include_once './admin.head.php';
+include_once G5_ADMIN_PATH . "/admin.head.php";
 include_once G5_PLUGIN_PATH . '/jquery-ui/datepicker.php';
 
 
@@ -296,7 +297,8 @@ if ($check_manner || $check_manner2) {
           <th>
             <?php echo subject_sort_link('wr_logs', 's_board=' . $s_board . '&s_date=' . $s_date . '&e_date=' . $e_date) ?>로그</a>
           </th>
-          <th><?php echo subject_sort_link('wr_cms', 's_board=' . $s_board . '&s_date=' . $s_date . '&e_date=' . $e_date) ?>덧글</a>
+          <th>
+            <?php echo subject_sort_link('wr_cms', 's_board=' . $s_board . '&s_date=' . $s_date . '&e_date=' . $e_date) ?>덧글</a>
           </th>
           <?php if ($check_manner || $check_manner2) { ?>
             <th>리플매너</th>
@@ -305,7 +307,8 @@ if ($check_manner || $check_manner2) {
 
           <th scope="col">
             <?php echo subject_sort_link('mb.mb_today_login', 's_board=' . $s_board . '&s_date=' . $s_date . '&e_date=' . $e_date) ?>최종
-            접속</a></th>
+            접속</a>
+          </th>
           <th scope="col">
             <?php echo subject_sort_link('mb.mb_error_cnt', 's_board=' . $s_board . '&s_date=' . $s_date . '&e_date=' . $e_date) ?>누적경고</a>
           </th>
@@ -391,7 +394,7 @@ if ($check_manner || $check_manner2) {
     var mb_id = $(obj).attr('data-mbid');
 
     var sendData = { s_date: s_date, e_date: e_date, s_board: s_board, mb_id: mb_id };
-    var url = g5_url + "/adm/action_manner_search.php";
+    var url = g5_url + "/adm/modules/action/action_manner_search.php";
 
     $.ajax({
       type: 'post'
@@ -404,10 +407,6 @@ if ($check_manner || $check_manner2) {
       }
     });
   }
-
-
 </script>
-
 <?php
-include_once './admin.tail.php';
-?>
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/modules/browscap/_common.php b/AvocadoAmber/adm/modules/browscap/_common.php
new file mode 100644
index 0000000..e0f1faf
--- /dev/null
+++ b/AvocadoAmber/adm/modules/browscap/_common.php
@@ -0,0 +1,12 @@
+<?php
+define('G5_IS_ADMIN', true);
+
+include_once "../../../common.php";
+
+include_once G5_ADMIN_PATH . '/admin.lib.php';
+
+if (isset($token)) {
+  $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
+}
+
+EventHandler::triggerEvent("gnuboard.admin.load_common");
diff --git a/AvocadoAmber/adm/browscap_convert.php b/AvocadoAmber/adm/modules/browscap/convert.php
similarity index 89%
rename from AvocadoAmber/adm/browscap_convert.php
rename to AvocadoAmber/adm/modules/browscap/convert.php
index 438bbf0..51293f1 100644
--- a/AvocadoAmber/adm/browscap_convert.php
+++ b/AvocadoAmber/adm/modules/browscap/convert.php
@@ -12,7 +12,7 @@ if (!$rows)
   $rows = 100;
 
 $g5['title'] = '접속로그 변환';
-include_once "./admin.head.php";
+include_once G5_ADMIN_PATH . "/admin.head.php";
 ?>
 
 <div id="processing">
@@ -27,7 +27,7 @@ include_once "./admin.head.php";
 
       $.ajax({
         method: "GET",
-        url: "./browscap_converter.php",
+        url: "./converter.php",
         data: { rows: "<?php echo $rows; ?>" },
         async: true,
         cache: false,
@@ -39,7 +39,5 @@ include_once "./admin.head.php";
     });
   });
 </script>
-
 <?php
-include_once "./admin.tail.php";
-?>
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/browscap_converter.php b/AvocadoAmber/adm/modules/browscap/converter.php
similarity index 100%
rename from AvocadoAmber/adm/browscap_converter.php
rename to AvocadoAmber/adm/modules/browscap/converter.php
diff --git a/AvocadoAmber/adm/browscap.php b/AvocadoAmber/adm/modules/browscap/index.php
similarity index 89%
rename from AvocadoAmber/adm/browscap.php
rename to AvocadoAmber/adm/modules/browscap/index.php
index dafce10..e190b6c 100644
--- a/AvocadoAmber/adm/browscap.php
+++ b/AvocadoAmber/adm/modules/browscap/index.php
@@ -8,7 +8,7 @@ if ($is_admin != 'super')
   alert('최고관리자만 접근 가능합니다.');
 
 $g5['title'] = 'Browscap 업데이트';
-include_once "./admin.head.php";
+include_once G5_ADMIN_PATH . "/admin.head.php";
 ?>
 
 <div id="processing">
@@ -22,7 +22,7 @@ include_once "./admin.head.php";
       $("#processing").html('<div class="update_processing"></div><p>Browscap 정보를 업데이트 중입니다.</p>');
 
       $.ajax({
-        url: "./browscap_update.php",
+        url: "./update.php",
         async: true,
         cache: false,
         dataType: "html",
@@ -38,7 +38,5 @@ include_once "./admin.head.php";
     });
   });
 </script>
-
 <?php
-include_once "./admin.tail.php";
-?>
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/browscap_update.php b/AvocadoAmber/adm/modules/browscap/update.php
similarity index 100%
rename from AvocadoAmber/adm/browscap_update.php
rename to AvocadoAmber/adm/modules/browscap/update.php
diff --git a/AvocadoAmber/adm/modules/visitor/_common.php b/AvocadoAmber/adm/modules/visitor/_common.php
new file mode 100644
index 0000000..3abae14
--- /dev/null
+++ b/AvocadoAmber/adm/modules/visitor/_common.php
@@ -0,0 +1,9 @@
+<?php
+define('G5_IS_ADMIN', true);
+include_once "../../../common.php";
+require_once G5_ADMIN_PATH . '/admin.lib.php';
+include_once G5_ADMIN_PATH . "/admin.head.php";
+if (isset($token)) {
+  $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
+}
+EventHandler::triggerEvent("gnuboard.admin.load_common");
diff --git a/AvocadoAmber/adm/visit.sub.php b/AvocadoAmber/adm/modules/visitor/visit.sub.php
similarity index 100%
rename from AvocadoAmber/adm/visit.sub.php
rename to AvocadoAmber/adm/modules/visitor/visit.sub.php
diff --git a/AvocadoAmber/adm/visit_browser.php b/AvocadoAmber/adm/modules/visitor/visit_browser.php
similarity index 97%
rename from AvocadoAmber/adm/visit_browser.php
rename to AvocadoAmber/adm/modules/visitor/visit_browser.php
index 518ffa3..88dbeca 100644
--- a/AvocadoAmber/adm/visit_browser.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_browser.php
@@ -91,4 +91,4 @@ while ($row = sql_fetch_array($result)) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_date.php b/AvocadoAmber/adm/modules/visitor/visit_date.php
similarity index 97%
rename from AvocadoAmber/adm/visit_date.php
rename to AvocadoAmber/adm/modules/visitor/visit_date.php
index 1d2d3a8..e88ca6c 100644
--- a/AvocadoAmber/adm/visit_date.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_date.php
@@ -86,4 +86,4 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_delete.php b/AvocadoAmber/adm/modules/visitor/visit_delete.php
similarity index 98%
rename from AvocadoAmber/adm/visit_delete.php
rename to AvocadoAmber/adm/modules/visitor/visit_delete.php
index 57452b6..59dd5e8 100644
--- a/AvocadoAmber/adm/visit_delete.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_delete.php
@@ -110,4 +110,4 @@ $now_year = (int) substr(G5_TIME_YMD, 0, 4);
   }
 </script>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_delete_update.php b/AvocadoAmber/adm/modules/visitor/visit_delete_update.php
similarity index 100%
rename from AvocadoAmber/adm/visit_delete_update.php
rename to AvocadoAmber/adm/modules/visitor/visit_delete_update.php
diff --git a/AvocadoAmber/adm/visit_device.php b/AvocadoAmber/adm/modules/visitor/visit_device.php
similarity index 97%
rename from AvocadoAmber/adm/visit_device.php
rename to AvocadoAmber/adm/modules/visitor/visit_device.php
index 3786bba..a98a55f 100644
--- a/AvocadoAmber/adm/visit_device.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_device.php
@@ -95,4 +95,4 @@ while ($row = sql_fetch_array($result)) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_domain.php b/AvocadoAmber/adm/modules/visitor/visit_domain.php
similarity index 98%
rename from AvocadoAmber/adm/visit_domain.php
rename to AvocadoAmber/adm/modules/visitor/visit_domain.php
index a1ccf29..bbb8045 100644
--- a/AvocadoAmber/adm/visit_domain.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_domain.php
@@ -98,5 +98,4 @@ while ($row = sql_fetch_array($result)) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
-
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_hour.php b/AvocadoAmber/adm/modules/visitor/visit_hour.php
similarity index 97%
rename from AvocadoAmber/adm/visit_hour.php
rename to AvocadoAmber/adm/modules/visitor/visit_hour.php
index e899f86..6073dd9 100644
--- a/AvocadoAmber/adm/visit_hour.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_hour.php
@@ -76,4 +76,4 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_list.php b/AvocadoAmber/adm/modules/visitor/visit_list.php
similarity index 98%
rename from AvocadoAmber/adm/visit_list.php
rename to AvocadoAmber/adm/modules/visitor/visit_list.php
index fb935ad..e60df0d 100644
--- a/AvocadoAmber/adm/visit_list.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_list.php
@@ -117,5 +117,5 @@ $qstr .= "&amp;page=";
 $pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr");
 echo $pagelist;
 
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
 
diff --git a/AvocadoAmber/adm/visit_month.php b/AvocadoAmber/adm/modules/visitor/visit_month.php
similarity index 97%
rename from AvocadoAmber/adm/visit_month.php
rename to AvocadoAmber/adm/modules/visitor/visit_month.php
index 1b6a6f2..7d2505e 100644
--- a/AvocadoAmber/adm/visit_month.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_month.php
@@ -86,4 +86,4 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_os.php b/AvocadoAmber/adm/modules/visitor/visit_os.php
similarity index 97%
rename from AvocadoAmber/adm/visit_os.php
rename to AvocadoAmber/adm/modules/visitor/visit_os.php
index cfe317b..a94ad67 100644
--- a/AvocadoAmber/adm/visit_os.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_os.php
@@ -96,4 +96,4 @@ while ($row = sql_fetch_array($result)) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_search.php b/AvocadoAmber/adm/modules/visitor/visit_search.php
similarity index 99%
rename from AvocadoAmber/adm/visit_search.php
rename to AvocadoAmber/adm/modules/visitor/visit_search.php
index df2bc8b..dc43728 100644
--- a/AvocadoAmber/adm/visit_search.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_search.php
@@ -146,4 +146,4 @@ if ($pagelist) {
   }
 </script>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_week.php b/AvocadoAmber/adm/modules/visitor/visit_week.php
similarity index 97%
rename from AvocadoAmber/adm/visit_week.php
rename to AvocadoAmber/adm/modules/visitor/visit_week.php
index 41784ec..91f0689 100644
--- a/AvocadoAmber/adm/visit_week.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_week.php
@@ -74,4 +74,4 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";
diff --git a/AvocadoAmber/adm/visit_year.php b/AvocadoAmber/adm/modules/visitor/visit_year.php
similarity index 97%
rename from AvocadoAmber/adm/visit_year.php
rename to AvocadoAmber/adm/modules/visitor/visit_year.php
index 8cedd4c..b69dbba 100644
--- a/AvocadoAmber/adm/visit_year.php
+++ b/AvocadoAmber/adm/modules/visitor/visit_year.php
@@ -86,5 +86,5 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) {
   </table>
 </div>
 <?php
-include_once "./admin.tail.php";
+include_once G5_ADMIN_PATH . "/admin.tail.php";