diff --git a/css/login.css b/css/login.css index c98cfd6e..14439c99 100644 --- a/css/login.css +++ b/css/login.css @@ -65,3 +65,11 @@ input::-webkit-input-placeholder { .terms{ max-height: 200px; overflow: auto; } + +.vertical-center { + min-height: 100%; /* Fallback for browsers do NOT support vh unit */ + min-height: 100vh; /* These two lines are counted as one :-) */ + + display: flex; + align-items: center; +} \ No newline at end of file diff --git a/f_config/config.css b/f_config/config.css index caa069d9..acd37cf5 100644 --- a/f_config/config.css +++ b/f_config/config.css @@ -105,4 +105,4 @@ button { .font2 { font-size: 15px; } .font3 { font-size: 20px; } .font4 { font-size: 30px; } -.font5 { font-size: 50px; } +.font5 { font-size: 50px; } \ No newline at end of file diff --git a/f_config/config.php b/f_config/config.php index 02cf1216..f401fcd7 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -3,41 +3,7 @@ require(__dir__.'/../vendor/autoload.php'); define('__LINE__',__FILE__." ".__FUNCTION__." ".__LINE__." : "); ob_start(); -// 주요 환경변수들 -define('W', '/'); - define('IMAGE', '../../image'); define('IMAGES', '../../images'); //define('IMAGE', 'http://115.68.28.99/image'); //define('IMAGES', 'http://115.68.28.99/images'); - -define('JQUERY', 'jquery-3.2.1.min.js'); -define('MD5', 'md5-min.js'); - -define('D', 'd_'); -define('E', 'e_'); -define('F', 'f_'); -define('I', 'i_'); - -define('D_SESSION', 'd_session'); -define('D_SETTING', 'd_setting'); -define('D_CHAT', 'd_chat'); -define('D_LOG', 'd_log'); -define('E_LIB', 'e_lib'); -define('F_CONFIG', 'f_config'); -define('F_FUNC', 'f_func'); - -define('JS', '.js'); -define('CSS', '.css'); - -define('APP', 'app'); -define('FUNC', 'func'); -define('DB', 'DB'); -define('SESSION', 'SESSION'); -define('CONFIG', 'config'); -define('SETTING', 'SETTING'); -define('INSTALL', 'install'); - -define('SLEEP', 'sleep'); - -define('BLOCKBODY', ''); diff --git a/i_entrance/adminPost.php b/i_entrance/adminPost.php index 8f76991c..e5b27968 100644 --- a/i_entrance/adminPost.php +++ b/i_entrance/adminPost.php @@ -34,7 +34,7 @@ function doServerModeSet($server, $action, &$response){ $serverDir = $settingObj->getShortName(); $serverPath = $settingObj->getBasePath(); - $realServerPath = realpath(dirname(__FILE__)).W.$serverPath; + $realServerPath = realpath(dirname(__FILE__)).'/'.$serverPath; if($action == 'close') { //폐쇄 $templates = new League\Plates\Engine('templates'); @@ -59,7 +59,7 @@ function doServerModeSet($server, $action, &$response){ @unlink($serverPath.'/d_setting/conf.php'); } - $response['installURL'] = $serverDir.W."install.php"; + $response['installURL'] = $serverDir."/install.php"; } elseif($action == 'open') {//오픈 if(file_exists($serverPath.'/.htaccess')){ @unlink($serverPath.'/.htaccess'); diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php index a4a6a79b..f626854e 100644 --- a/i_entrance/j_get_user_info.php +++ b/i_entrance/j_get_user_info.php @@ -18,7 +18,7 @@ $db = getRootDB(); $member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $SESSION->NoMember()); if(!$member['picture']){ - $picture = IMAGE.W.'default.jpg'; + $picture = IMAGE.'/default.jpg'; } else{ $picture = $member['picture']; @@ -27,7 +27,7 @@ else{ } $picture = '../d_pic/'.$picture; if(!file_exists($picture)){ - $picture = IMAGE.W.$picture; + $picture = IMAGE.'/'.$picture; } } diff --git a/index.php b/index.php index 28a0fa71..37b70ff1 100644 --- a/index.php +++ b/index.php @@ -20,12 +20,7 @@ if($SESSION->isLoggedIn()){ die(); } -$access_token = $SESSION->get('access_token'); - - ?> - -
@@ -113,10 +108,11 @@ function postOAuthResult(result){ +