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/include/check.php b/class/osutournament/check.php similarity index 90% rename from include/check.php rename to class/osutournament/check.php index 3b29332..65b2be7 100644 --- a/include/check.php +++ b/class/osutournament/check.php @@ -1,6 +1,6 @@ Parser = new Parser(); + $this->Parser = new WEBParser(); } /** * SelectMode osu! mode @@ -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; 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 96% rename from include/webparser.php rename to class/osutournament/webparser.php index 10258b9..91029bb 100644 --- a/include/webparser.php +++ b/class/osutournament/webparser.php @@ -1,10 +1,10 @@ <?php /** - * @file include/webparser.php + * @file class/osutournament/webparser.php * @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..4fd9ce1 100644 --- a/test.php +++ b/test.php @@ -61,3 +61,9 @@ $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