From b64de5300410cc02a42d391db09fb46b0d918884 Mon Sep 17 00:00:00 2001 From: Hakase Date: Mon, 2 Oct 2017 21:14:44 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20Ripple=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 제한 사항 : Ripple 서버의 Frontend 소스(데이터)가 같아야 값을 제대로 가져옵니다. 아직 해당 소스에 대한 검증은 제작하지 않았습니다. --- include/check.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/include/check.php b/include/check.php index 3b29332..c940757 100644 --- a/include/check.php +++ b/include/check.php @@ -41,10 +41,17 @@ * 1 or ripple = Ripple Server * other = return false * - * using data : only use osu or ripple (string) + * using data : use only osu or ripple (string) * @var int, string */ public $server; + /** + * $serverurl osu! ripple server custom URL + * Default URL : https://ripple.moe + * use only $server = 1 (ripple) + * @var string + */ + private $serverurl; /** * Temp data * $data_profile Temp data @@ -98,11 +105,12 @@ } /** * CheckUser Check user data - * @param string $osuid Input osu! ID - * @param int, string $mode Input osu! mode - * @param string $server Input osu! server (osu/ripple) + * @param string $osuid Input osu! ID + * @param int, string $mode Input osu! mode + * @param string $server Input osu! server (osu/ripple) + * @param string $serverurl Input ripple server custom URL */ - public function CheckUser($osuid, $mode, $server='osu') + public function CheckUser($osuid, $mode, $server='osu', $serverurl='https://ripple.moe') { $this->ResetObject(); $this->SelectMode($mode); @@ -118,8 +126,9 @@ break; case 'ripple': case 2: + $this->serverurl = $serverurl; $this->server = 'ripple'; - $this->data_profile = $this->Parser->WEBParsing('https://ripple.moe/u/' . $osuid); + $this->data_profile = $this->Parser->WEBParsing($serverurl.'/u/' . $osuid); $this->OsuID = $this->Parser->splits($this->data_profile, 'window.userID = \'', '\';'); $this->RealID = $this->Parser->splits($this->data_profile, '', ''s profile - Ripple'); break; From 1f6f877c81ef90cdeccf78bd3480051892345db7 Mon Sep 17 00:00:00 2001 From: Hakase <hakase@hakase.kr> Date: Tue, 3 Oct 2017 05:34:55 +0900 Subject: [PATCH 2/5] =?UTF-8?q?include=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 차후를 위해 spl_autoload_register 사용. 물론 사용 할 만한 클래스가 없지만 그래도... --- {include => class/osutournament}/check.php | 2 +- {include => class/osutournament}/index.php | 0 .../osutournament}/webparser.php | 2 +- include.php | 13 ++++------ include/db.php | 26 ------------------- test.php | 1 + 6 files changed, 8 insertions(+), 36 deletions(-) rename {include => class/osutournament}/check.php (99%) rename {include => class/osutournament}/index.php (100%) rename {include => class/osutournament}/webparser.php (98%) delete mode 100644 include/db.php diff --git a/include/check.php b/class/osutournament/check.php similarity index 99% rename from include/check.php rename to class/osutournament/check.php index c940757..79da622 100644 --- a/include/check.php +++ b/class/osutournament/check.php @@ -66,7 +66,7 @@ public function __construct() { - $this->Parser = new Parser(); + $this->Parser = new WEBParser(); } /** * SelectMode osu! mode diff --git a/include/index.php b/class/osutournament/index.php similarity index 100% rename from include/index.php rename to class/osutournament/index.php diff --git a/include/webparser.php b/class/osutournament/webparser.php similarity index 98% rename from include/webparser.php rename to class/osutournament/webparser.php index 10258b9..421dea6 100644 --- a/include/webparser.php +++ b/class/osutournament/webparser.php @@ -4,7 +4,7 @@ * @author Hakase (contact@hakase.kr) */ namespace OsuTournament; - class Parser + class WEBParser { private $httph = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36'; public function splits($data, $first, $end, $num = 1) diff --git a/include.php b/include.php index 60b0384..91174c1 100644 --- a/include.php +++ b/include.php @@ -3,11 +3,8 @@ * @file include.php * @author Hakase (contact@hakase.kr) */ - require_once 'include/db.php'; - require_once 'include/webparser.php'; - require_once 'include/check.php'; - - /** - * In production DB. - */ - // $DB = new OsuTournament\DB('127.0.0.1', 'example', 'example', 'example'); + spl_autoload_register(function($classname) { + $file = __DIR__.'/class/'.strtolower(str_replace("\\", "/", $classname)).'.php'; + if(file_exists($file)) + require_once(__DIR__.'/class/'.strtolower(str_replace("\\", "/", $classname)).'.php'); + }); diff --git a/include/db.php b/include/db.php deleted file mode 100644 index ae5becf..0000000 --- a/include/db.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php -/** - * @file include/db.php - * @author Hakase (contact@hakase.kr) - */ - namespace OsuTournament; - /** - * Osu Tournament for PHP - * In production. - */ - - class DB { - public $mysql; - public function __construct($ip, $dbid, $dbpw, $dbnm) - { - $this->mysql = new mysqli($ip, $dbid, $dbpw, $dbnm); - } - public function Query($query) - { - // ... - } - public function Insert($query) - { - // ... - } - } diff --git a/test.php b/test.php index ab7c79b..d0868ce 100644 --- a/test.php +++ b/test.php @@ -61,3 +61,4 @@ $Check->CheckUser('aergn8i39jf', 1, 1); GetDataTest(); + From 34631caa48c504fc8e3769fff318ff27d1821a23 Mon Sep 17 00:00:00 2001 From: Hakase <hakase@hakase.kr> Date: Tue, 3 Oct 2017 05:42:51 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 차마 수정하지 못 했던 주석(...) 수정. 의미 없음. --- class/osutournament/check.php | 2 +- class/osutournament/webparser.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/class/osutournament/check.php b/class/osutournament/check.php index 79da622..d40c476 100644 --- a/class/osutournament/check.php +++ b/class/osutournament/check.php @@ -1,6 +1,6 @@ <?php /** - * @file include/check.php + * @file class/osutournament/check.php * @author Hakase (contact@hakase.kr) */ namespace OsuTournament; diff --git a/class/osutournament/webparser.php b/class/osutournament/webparser.php index 421dea6..91029bb 100644 --- a/class/osutournament/webparser.php +++ b/class/osutournament/webparser.php @@ -1,6 +1,6 @@ <?php /** - * @file include/webparser.php + * @file class/osutournament/webparser.php * @author Hakase (contact@hakase.kr) */ namespace OsuTournament; From fcf189703a46194bd179f8f7916ccd0c82f37cb9 Mon Sep 17 00:00:00 2001 From: Hoto Cocoa <cocoa@hoto.us> Date: Tue, 3 Oct 2017 11:09:50 +0900 Subject: [PATCH 4/5] Test Update --- test.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test.php b/test.php index d0868ce..4fd9ce1 100644 --- a/test.php +++ b/test.php @@ -62,3 +62,8 @@ $Check->CheckUser('aergn8i39jf', 1, 1); GetDataTest(); + $Check->CheckUser('3318', 0, 2, 'https://test.hoto.us/ripple'); + GetDataTest(); + + $Check->CheckUser('3318', 0, 2); + GetDataTest(); \ No newline at end of file From 62c2822040d99091b6ff3701412a9838b30144db Mon Sep 17 00:00:00 2001 From: Hoto Cocoa <cocoa@hoto.us> Date: Tue, 3 Oct 2017 11:12:35 +0900 Subject: [PATCH 5/5] Comment typo fix --- .gitignore | 1 + class/osutournament/check.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..600d2d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode \ No newline at end of file diff --git a/class/osutournament/check.php b/class/osutournament/check.php index d40c476..65b2be7 100644 --- a/class/osutournament/check.php +++ b/class/osutournament/check.php @@ -48,7 +48,7 @@ /** * $serverurl osu! ripple server custom URL * Default URL : https://ripple.moe - * use only $server = 1 (ripple) + * use only $server = 2 (ripple) * @var string */ private $serverurl;