Setting 클래스 변경. 해당 클래스에서 한국어명 등을 모두 관리.

- 해당 클래스를 참조하는 코드들 수정

i_entrance/j_get_userlist.php

@@ -0,0 +1,41 @@
+<?php
+namespace sammo;
+
+require_once('_common.php');
+
+$session = Session::requireLogin();
+$db = RootDB::db();
+
+$session->setReadOnly();
+
+if($session->userGrade < 6){
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다'
+    ]);
+}
+
+$userList = [];
+foreach($db->query('SELECT * FROM MEMBER order by `no`') as $member){
+    $userID = $member['NO'];
+    $userName = $member['ID'];
+    $email = $member['EMAIL'];
+    $grade = $member['GRADE'];
+    $blockUntil = $member['BLOCK_DATE'];
+
+    $nickname = $member['NAME'];
+    if($member['IMGSVR']){
+        $icon = RootDB::getServerBasepath().'/'.$member['PICTURE'];
+    }
+    else{
+        $icon = IMAGES.'/'.$member['PICTURE'];
+    }
+    
+    $deleteAfter = $member['delete_after'];
+    
+}
+
+$serverList = [];
+foreach(AppConf::getList() as $serverName => $setting){
+    
+}

i_entrance/j_icon_change.php

@@ -90,9 +90,8 @@ if(!is_uploaded_file($image['tmp_name'])) {
 
         $servers = [];
 
-        foreach(AppConf::getList() as $key=>$server){
+        foreach(AppConf::getList() as $key=>$setting){
-            $setting = $server[2];
+            if($setting->isRunning()){
-            if($setting->isExists()){
                 $servers[] = $key;
             }
         }

i_entrance/j_icon_delete.php

@@ -45,9 +45,9 @@ if($dt == $rf) {
     
     $servers = [];
 
-    foreach(AppConf::getList() as $key=>$server){
+    foreach(AppConf::getList() as $key=>$setting){
-        $setting = $server[2];
+
-        if($setting->isExists()){
+        if($setting->isRunning()){
             $servers[] = $key;
         }
     }

i_entrance/j_server_change_status.php

@@ -33,7 +33,7 @@ if($userGrade < 6) {
 
 function doServerModeSet($server, $action, &$response){
     $serverList = AppConf::getList();
-    $settingObj = $serverList[$server][2];
+    $settingObj = $serverList[$server];
 
     $serverDir = $settingObj->getShortName();
     $serverPath = $settingObj->getBasePath();

i_entrance/j_server_get_admin_status.php

@@ -10,8 +10,9 @@ $result = [];
 
 session_write_close();
 
-foreach (AppConf::getList() as $server) {
+foreach (AppConf::getList() as $setting) {
-    list($serverKorName, $serverColor, $setting) = $server;
+    $serverColor = $setting->getColor();
+    $serverKorname = $setting->getKorName();
 
     $serverPath = $setting->getBasePath();
     $serverDir = $setting->getShortName();
@@ -34,7 +35,7 @@ foreach (AppConf::getList() as $server) {
             'run'=>false,
             'reason'=>'설정 파일 없음'
         ];
-    } elseif (file_exists($serverPath.'/.htaccess')) {
+    } elseif (!$setting->isRunning()) {
         // 폐쇄중
         $state = [
             'valid'=>true,

i_entrance/j_server_get_status.php

@@ -6,14 +6,13 @@ require_once('_common.php');
 // 외부 파라미터
 $response['server'] = [];
 
-foreach(AppConf::getList() as $serverInfo){
+foreach(AppConf::getList() as $setting){
-    list($serverKorName, $serverColor, $setting) = $serverInfo;
 
     $serverObj = [
-        'color'=>$serverColor,
+        'color'=>$setting->getColor(),
-        'korName'=>$serverKorName,
+        'korName'=>$setting->getKorName(),
         'name'=>$setting->getShortName(),
-        'enable'=>$setting->isExists()
+        'enable'=>$setting->isRunning()
     ];
 
     $response['server'][] = $serverObj;

src/sammo/AppConf.php

@@ -8,14 +8,19 @@ if(!defined('ROOT')){
 class AppConf{
     private static $serverList = null;
 
+    /**
+     * 서버 설정 반환
+     * 
+     * @return \sammo\Setting[]
+     */
     public static function getList(){
         if(self::$serverList === null){
             self::$serverList = [
-                'che'=>['체', 'white', new Setting(ROOT.'/che')],
+                'che'=>new Setting(ROOT.'/che', '체', 'white'),
-                'kwe'=>['퀘', 'yellow', new Setting(ROOT.'/kwe')],
+                'kwe'=>new Setting(ROOT.'/kwe', '퀘', 'yellow'),
-                'pwe'=>['풰', 'orange', new Setting(ROOT.'/pwe')],
+                'pwe'=>new Setting(ROOT.'/pwe', '풰', 'orange'),
-                'twe'=>['퉤', 'magenta', new Setting(ROOT.'/twe')],
+                'twe'=>new Setting(ROOT.'/twe', '퉤', 'magenta'),
-                'hwe'=>['훼', 'red', new Setting(ROOT.'/hwe')]
+                'hwe'=>new Setting(ROOT.'/hwe', '훼', 'red')
             ];
         }
         return self::$serverList;

src/sammo/Setting.php

@@ -4,23 +4,55 @@ namespace sammo;
 class Setting {
     private $basepath;
     private $settingFile;
+    private $htaccessFile;
     private $exist = false;
+    private $running = false;
 
-    public function __construct($basepath = __DIR__.'/../..') {
+    private $shortName;
+    private $korName;
+    private $color;
+
+    public function __construct(string $basepath, string $korName, string $color, string $name=null) {
         $this->basepath = $basepath;
         $this->settingFile = realpath($basepath.'/d_setting/DB.php');
+        $this->htaccessFile = realpath($basepath.'/.htaccess');
+
+        $this->korName = $korName;
+        $this->color = $color;
+        if($name){
+            $this->shortName = $name;
+        }
+        else{
+            $this->shortName = basename($this->basepath);
+        }
 
         if(file_exists($this->settingFile)) {
             $this->exist = true;
+
+            if(!file_exists($this->htaccessFile)){
+                $this->running = true;
+            }
         }
     }
 
+    public function isRunning(){
+        return $this->running;
+    }
+
     public function isExists() {
         return $this->exist;
     }
 
     public function getShortName(){
-        return basename($this->basepath);
+        return $this->shortName;
+    }
+
+    public function getColor(){
+        return $this->color;
+    }
+
+    public function getKorName(){
+        return $this->korName;
     }
 
     public function getBasePath(){