Merge pull request #2 from hakasenyang/master

Check

.gitignore

@@ -0,0 +1 @@
+.vscode

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;
@@ -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 = 2 (ripple)
+         * @var string
+         */
+        private $serverurl;
         /**
          * Temp data
          * $data_profile  Temp data
@@ -59,7 +66,7 @@
 
         public function __construct()
         {
-            $this->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 string      $osuid     Input osu! ID
-         * @param int, string $mode   Input osu! mode
+         * @param int, string $mode      Input osu! mode
-         * @param string      $server Input osu! server (osu/ripple)
+         * @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, '<title>', '&#39;s profile - Ripple');
                     break;

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)

include.php

@@ -3,11 +3,8 @@
  * @file include.php
  * @author Hakase (contact@hakase.kr)
  */
-    require_once 'include/db.php';
+    spl_autoload_register(function($classname) {
-    require_once 'include/webparser.php';
+    	$file = __DIR__.'/class/'.strtolower(str_replace("\\", "/", $classname)).'.php';
-    require_once 'include/check.php';
+    	if(file_exists($file))
-
+        	require_once(__DIR__.'/class/'.strtolower(str_replace("\\", "/", $classname)).'.php');
-    /**
+    });
-     * In production DB.
-     */
-    // $DB = new OsuTournament\DB('127.0.0.1', 'example', 'example', 'example');

include/db.php

@@ -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)
-        {
-            // ...
-        }
-    }

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();