From 0c64087c0f5ffc5b96f399767b2fc26a99acd2d7 Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 3 Apr 2018 21:15:12 +0900 Subject: [PATCH] =?UTF-8?q?=5Fcommon.php=20=EB=8C=80=EC=8B=A0=20composer?= =?UTF-8?q?=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _common.php | 9 ----- composer.json | 11 +++++- composer.lock | 10 +++--- d_setting/_common.php | 9 ----- f_config/_common.php | 10 ------ f_config/config.php | 35 +++++++++++++++---- f_config/func.php | 28 --------------- f_install/_common.php | 10 ------ f_install/install.php | 2 +- f_install/j_create_admin.php | 3 +- f_install/j_install_status.php | 3 +- f_install/j_setup_db.php | 2 +- hwe/d_setting/_common.php | 10 ------ hwe/lib.php | 1 - i_entrance/_common.php | 11 ------ i_entrance/entrance.php | 2 +- i_entrance/j_change_password.php | 2 +- i_entrance/j_delete_me.php | 2 +- i_entrance/j_get_user_info.php | 2 +- i_entrance/j_get_userlist.php | 2 +- i_entrance/j_icon_change.php | 2 +- i_entrance/j_icon_delete.php | 2 +- i_entrance/j_logout.php | 2 +- i_entrance/j_server_change_status.php | 2 +- i_entrance/j_server_get_admin_status.php | 2 +- i_entrance/j_server_get_status.php | 2 +- i_entrance/j_set_userlist.php | 2 +- i_entrance/templates/_common.php | 11 ------ i_other/_common.php | 10 ------ i_other/help.php | 2 +- i_other/screenshot.php | 2 +- index.php | 2 +- install.php | 2 -- j_login.php | 2 +- j_updateServer.php | 2 +- oauth_kakao/_common.php | 10 ------ oauth_kakao/j_change_pw.php | 2 +- oauth_kakao/j_check_dup.php | 2 +- oauth_kakao/j_join_process.php | 2 +- oauth_kakao/j_login_oauth.php | 2 +- oauth_kakao/join.php | 6 ++-- oauth_kakao/lib.join.php | 2 -- oauth_kakao/oauth.php | 2 +- vendor/composer/autoload_classmap.php | 2 ++ vendor/composer/autoload_files.php | 1 + vendor/composer/autoload_static.php | 3 ++ vendor/composer/installed.json | 12 +++---- vendor/guzzlehttp/guzzle/CHANGELOG.md | 5 +++ .../guzzlehttp/guzzle/src/ClientInterface.php | 2 +- 49 files changed, 90 insertions(+), 174 deletions(-) delete mode 100644 _common.php delete mode 100644 d_setting/_common.php delete mode 100644 f_config/_common.php delete mode 100644 f_config/func.php delete mode 100644 f_install/_common.php delete mode 100644 hwe/d_setting/_common.php delete mode 100644 i_entrance/_common.php delete mode 100644 i_entrance/templates/_common.php delete mode 100644 i_other/_common.php delete mode 100644 oauth_kakao/_common.php diff --git a/_common.php b/_common.php deleted file mode 100644 index 8995fdb1..00000000 --- a/_common.php +++ /dev/null @@ -1,9 +0,0 @@ -setReadOnly(); diff --git a/i_entrance/j_change_password.php b/i_entrance/j_change_password.php index bcfd7029..192d5d25 100644 --- a/i_entrance/j_change_password.php +++ b/i_entrance/j_change_password.php @@ -1,7 +1,7 @@ isLoggedIn()){ diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php index 5416121d..ca9b1dec 100644 --- a/i_entrance/j_server_change_status.php +++ b/i_entrance/j_server_change_status.php @@ -1,7 +1,7 @@ setReadOnly(); diff --git a/i_entrance/j_server_get_status.php b/i_entrance/j_server_get_status.php index a2f347f2..1110f3f2 100644 --- a/i_entrance/j_server_get_status.php +++ b/i_entrance/j_server_get_status.php @@ -1,7 +1,7 @@ setReadOnly(); if($session->userGrade < 6){ diff --git a/i_entrance/templates/_common.php b/i_entrance/templates/_common.php deleted file mode 100644 index be0bb3e7..00000000 --- a/i_entrance/templates/_common.php +++ /dev/null @@ -1,11 +0,0 @@ -setReadOnly(); -$access_token = Util::array_get($_SESSION['access_token']); +$access_token = $session->access_token; if(!$access_token){ header('Location:oauth_fail.html'); } diff --git a/oauth_kakao/lib.join.php b/oauth_kakao/lib.join.php index e464e762..d40e8621 100644 --- a/oauth_kakao/lib.join.php +++ b/oauth_kakao/lib.join.php @@ -1,8 +1,6 @@ $vendorDir . '/sergeytsalkov/meekrodb/db.class.php', 'MeekroDBException' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php', 'WhereClause' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php', + 'kakao\\KakaoKey' => $baseDir . '/d_setting/KakaoKey.php', + 'sammo\\RootDB' => $baseDir . '/d_setting/RootDB.php', ); diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index dd37d858..20b15c94 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -9,4 +9,5 @@ return array( 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', + '870dc64919afa8b0f700701bb2c6a783' => $baseDir . '/f_config/config.php', ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 0be97ecf..1c625599 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -10,6 +10,7 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', + '870dc64919afa8b0f700701bb2c6a783' => __DIR__ . '/../..' . '/f_config/config.php', ); public static $prefixLengthsPsr4 = array ( @@ -125,6 +126,8 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a 'MeekroDBEval' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php', 'MeekroDBException' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php', 'WhereClause' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php', + 'kakao\\KakaoKey' => __DIR__ . '/../..' . '/d_setting/KakaoKey.php', + 'sammo\\RootDB' => __DIR__ . '/../..' . '/d_setting/RootDB.php', ); public static function getInitializer(ClassLoader $loader) diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 425ca3e6..4e27ebce 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -87,17 +87,17 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.3.1", - "version_normalized": "6.3.1.0", + "version": "6.3.2", + "version_normalized": "6.3.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "49e42e6539f775e80c74086a710a882e1d5a8111" + "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/49e42e6539f775e80c74086a710a882e1d5a8111", - "reference": "49e42e6539f775e80c74086a710a882e1d5a8111", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90", + "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90", "shasum": "" }, "require": { @@ -113,7 +113,7 @@ "suggest": { "psr/log": "Required for using the Log middleware" }, - "time": "2018-03-26T12:06:26+00:00", + "time": "2018-03-26T16:33:04+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md index 2d438fe0..25fcbb3e 100644 --- a/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 6.3.2 - 2018-03-26 + +* Fix: Release process + + ## 6.3.1 - 2018-03-26 * Bug fix: Parsing 0 epoch expiry times in cookies [#2014](https://github.com/guzzle/guzzle/pull/2014) diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php index 8fa6d42c..8de39166 100644 --- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -12,7 +12,7 @@ use Psr\Http\Message\UriInterface; */ interface ClientInterface { - const VERSION = '6.3.1'; + const VERSION = '6.3.2'; /** * Send an HTTP request.