diff --git a/composer.json b/composer.json index c8b0e570..ea4ebc53 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "firephp/firephp-core": "^0.4.0", "vlucas/valitron": "^1.4", "php-extended/php-tail": "^2.1", - "pguardiario/phpuri": "^1.0" + "pguardiario/phpuri": "^1.0", + "symfony/lock": "^3.4" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 43411eaf..5ce4f436 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1753c2c2ad9fe40ecc5c6ae541dd2e78", + "content-hash": "a329d39be5161c87438d41f9adf4417b", "packages": [ { "name": "brandonwamboldt/utilphp", @@ -454,6 +454,54 @@ ], "time": "2017-06-19T01:22:40+00:00" }, + { + "name": "paragonie/random_compat", + "version": "v2.0.12", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb", + "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "pseudorandom", + "random" + ], + "time": "2018-04-04T21:24:14+00:00" + }, { "name": "pguardiario/phpuri", "version": "1.0", @@ -702,6 +750,127 @@ ], "time": "2014-06-16T22:40:22+00:00" }, + { + "name": "symfony/lock", + "version": "v3.4.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/lock.git", + "reference": "3a707193326d31603824706e34a95af899a59788" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/lock/zipball/3a707193326d31603824706e34a95af899a59788", + "reference": "3a707193326d31603824706e34a95af899a59788", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/log": "~1.0", + "symfony/polyfill-php70": "~1.0" + }, + "require-dev": { + "predis/predis": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Lock\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Jérémy Derussé", + "email": "jeremy@derusse.com" + } + ], + "description": "Symfony Lock Component", + "homepage": "https://symfony.com", + "keywords": [ + "cas", + "flock", + "locking", + "mutex", + "redlock", + "semaphore" + ], + "time": "2018-04-29T14:44:26+00:00" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-04-26T10:06:28+00:00" + }, { "name": "vlucas/valitron", "version": "v1.4.2", diff --git a/css/config.css b/css/config.css index d09bdb69..53b22574 100644 --- a/css/config.css +++ b/css/config.css @@ -1,8 +1,10 @@ @charset "utf-8"; -* { margin: 0px; padding: 0px; } -body { color:white; background-color:black; border-width:1px; border-color:gray; } -table { +body { + color:white; background-color:black; font-family: '맑은 고딕'; +} + +table { border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black; padding: 0px; font-size: 13px; @@ -23,14 +25,8 @@ a.just_link { text-decoration: none; } -div { - margin:0px; - padding: 0px; - word-break: break-all; - font-family: '맑은 고딕'; -} - .with_border{ + margin:0; border: solid 1px; border-spacing: 0px; border-collapse: separate; @@ -58,8 +54,6 @@ div { font-family: '맑은 고딕';; } -font { font-family: '맑은 고딕';} - .obj_fill{ display:block; width:100%; @@ -72,24 +66,18 @@ button.with_skin { font-size: 13px; } +button.with_skin:disabled { + background-color:#333333; +} + input.with_skin { background-color: black; color: white; font-family: '맑은 고딕'; font-size: 13px; } -select { - width: 100px; height: 18px; - background-color: black; color: white; - font-family: '맑은 고딕'; - font-size: 13px; -} -button { - width: 100px; height: 20px; - background-color: black; color: white; - font-family: '맑은 고딕'; - font-size: 13px; - line-height:1.3; +input.with_skin:disabled { + background-color: #333333; } .font0 { font-size: 10px; } diff --git a/css/user_info.css b/css/user_info.css index 92665087..3b9ed297 100644 --- a/css/user_info.css +++ b/css/user_info.css @@ -21,6 +21,7 @@ right: 6px; margin:6px; height:40px; + line-height:40px; } #btn_delete_me{ @@ -37,15 +38,15 @@ #image_upload_filename{ position:absolute; - height:16px; + height:20px; left:10px; width:130px; - top:16px; + top:12px; } #image_upload_fake_btn{ - top:16px; - height:20px; + top:12px; + height:22px; right:10px; position:absolute; } @@ -53,8 +54,7 @@ #image_upload{ opacity: 0; position:absolute; - top:16px; - height:22px; + top:12px; left:0; height:20px; width:100%; @@ -70,7 +70,6 @@ bottom:0; left:0; width:50%; - height:20px; } #btn_remove_icon{ @@ -78,7 +77,6 @@ bottom:0; right:0; width:50%; - height:20px; } #third_use_disallow{ diff --git a/f_config/config.php b/f_config/config.php index 217c995b..04a18445 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -82,6 +82,7 @@ function logExceptionByCustomHandler(\Throwable $e){ ], Json::PRETTY); file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND); + echo $e->getTraceAsString(); throw $e; } set_exception_handler('\\sammo\\logExceptionByCustomHandler'); \ No newline at end of file diff --git a/f_install/install.php b/f_install/install.php index 1a926341..ddaa5bcf 100644 --- a/f_install/install.php +++ b/f_install/install.php @@ -10,13 +10,13 @@ require(__dir__.'/../vendor/autoload.php');
| 게 임 관 리 =backButton()?> |