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

- 해당 클래스를 참조하는 코드들 수정
This commit is contained in:
2018-03-25 17:56:07 +09:00
parent b7c03e5554
commit 7a34cc4089
8 changed files with 99 additions and 22 deletions
+41
View File
@@ -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){
}
+2 -3
View File
@@ -90,9 +90,8 @@ if(!is_uploaded_file($image['tmp_name'])) {
$servers = [];
foreach(AppConf::getList() as $key=>$server){
$setting = $server[2];
if($setting->isExists()){
foreach(AppConf::getList() as $key=>$setting){
if($setting->isRunning()){
$servers[] = $key;
}
}
+3 -3
View File
@@ -45,9 +45,9 @@ if($dt == $rf) {
$servers = [];
foreach(AppConf::getList() as $key=>$server){
$setting = $server[2];
if($setting->isExists()){
foreach(AppConf::getList() as $key=>$setting){
if($setting->isRunning()){
$servers[] = $key;
}
}
+1 -1
View File
@@ -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();
+4 -3
View File
@@ -10,8 +10,9 @@ $result = [];
session_write_close();
foreach (AppConf::getList() as $server) {
list($serverKorName, $serverColor, $setting) = $server;
foreach (AppConf::getList() as $setting) {
$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,
+4 -5
View File
@@ -6,14 +6,13 @@ require_once('_common.php');
// 외부 파라미터
$response['server'] = [];
foreach(AppConf::getList() as $serverInfo){
list($serverKorName, $serverColor, $setting) = $serverInfo;
foreach(AppConf::getList() as $setting){
$serverObj = [
'color'=>$serverColor,
'korName'=>$serverKorName,
'color'=>$setting->getColor(),
'korName'=>$setting->getKorName(),
'name'=>$setting->getShortName(),
'enable'=>$setting->isExists()
'enable'=>$setting->isRunning()
];
$response['server'][] = $serverObj;