_incl_data/class/DarksLight2/Training/Steps/SecondStep.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace DarksLight2\Training\Steps;
-
-use DarksLight2\Training\StepFactory;
-
-class SecondStep extends StepFactory
-{
-
-    public function getTitle(): string
-    {
-        return 'Тест';
-    }
-
-    public function getMessage(): string
-    {
-        return 'Тест';
-    }
-
-    public function getShortName(): string
-    {
-        return 'second_step';
-    }
-
-    public function getRewards(): array
-    {
-        return [];
-    }
-
-}

_incl_data/class/DarksLight2/Training/TrainingManager.php

@@ -20,7 +20,7 @@ class TrainingManager
     public function __construct(int $user_id)
     {
         $this->user_id = $user_id;
-        $this->generateToken();
+
     }
 
     /**
@@ -71,7 +71,6 @@ class TrainingManager
 
                     public function render()
                     {
-                        if(!$this->isComplete) {
                         $path = $_SERVER['DOCUMENT_ROOT'] . '/modules_data/steps/' . $this->short_name . '.php';
 
                         if(file_exists($path)) {
@@ -81,7 +80,6 @@ class TrainingManager
 
                         throw TrainingException::noRenderingFile();
                     }
-                    }
                 };
             }
         }
@@ -89,61 +87,19 @@ class TrainingManager
 
     private function stepData(string $short_name): object
     {
-        $data = $this->getDatabaseRecords()->data;
+        return json_decode($this->getDatabaseRecords()->data)->$short_name;
-
-        if(!isset($data->$short_name)) {
-            $this->updateDatabaseRecord($short_name);
-            $data = $this->getDatabaseRecords()->data;
     }
 
-        return $data->$short_name;
+    private function getDatabaseRecords()
-    }
-
-    private function generateToken($length = 16)
-    {
-        $letters = 'abcdefgmikiHGJKLjkGASysj7603456';
-
-        $token = '';
-
-        for ($i = 0; $i <= $length; $i++) {
-            $token .= $letters[rand(0, strlen($letters))];
-        }
-
-        Db::run('UPDATE user_training SET api_token = ? WHERE user_id = ?', [
-            $token,
-            $this->user_id
-        ]);
-    }
-
-    public function getDatabaseRecords(): stdClass
     {
         if(!$this->database_records) {
-            $data = Db::run('SELECT * FROM user_training WHERE user_id = ?', [$this->user_id])
+            $this->database_records = Db::run('SELECT * FROM user_training WHERE user_id = ?', [$this->user_id])
                 ->fetch(PDO::FETCH_OBJ);
-
-            $this->database_records = new stdClass();
-
-            $this->database_records->user_id = $data->user_id;
-            $this->database_records->api_token = $data->api_token;
-            $this->database_records->data = json_decode($data->data);
         }
 
         return $this->database_records;
     }
 
-    public function updateDatabaseRecord(string $short_name)
-    {
-        if($this->getDatabaseRecords()) {
-
-            $this->database_records->data->$short_name = $this->firstRecordData()->$short_name;
-
-            Db::run('UPDATE user_training SET data = ? WHERE user_id = ?', [
-                json_encode($this->database_records->data),
-                $this->user_id
-            ]);
-        }
-    }
-
     public function createDatabaseRecord()
     {
         if(!$this->getDatabaseRecords()) {
@@ -154,22 +110,19 @@ class TrainingManager
         }
     }
 
-    private function firstRecordData(): stdClass
+    private function firstRecordData(): array
     {
-        $data = new stdClass();
+        return [
-        $short_names = [
+            'first_step' => [
-            'first_step',
+                'complete' => 0,
-            'second_step'
+                    'progress' => [
+                        'current' => 0,
+                        'need' => 0,
+                    ]
+            ]
         ];
-
-        foreach ($short_names as $name) {
-            $data->$name->complete = false;
-            $data->$name->progress->current = 0;
-            $data->$name->progress->need = 1;
     }
 
-        return $data;
-    }
     public function __get(string $name)
     {
         return $this->steps[$name];
@@ -177,25 +130,11 @@ class TrainingManager
 
     public function addPoint(string $short_name)
     {
-        $this->database_records->data->$short_name->progress->current++;
+        $this->$short_name->progress++;
-    }
-
-    public function nextStep()
-    {
-        foreach ($this->database_records->data as $step) {
-            if($step->complete === false && $step->progress->current >= $step->progress->need) {
-                $step->complete = true;
-            }
-        }
     }
 
     public function store()
     {
-        $this->nextStep();
 
-        Db::run('UPDATE user_training SET data = ? WHERE user_id = ?', [
-            json_encode($this->database_records->data),
-            $this->user_id
-        ]);
     }
 }

api/.htaccess

@@ -1,4 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteRule ^training/complete/?$ index.php?get=complete [L]
-</IfModule>

api/index.php

@@ -1,47 +0,0 @@
-<?php
-
-use DarksLight2\Training\TrainingManager;
-
-header('Content-type: application/json');
-
-if (!defined('GAME_VERSION')) {
-    require_once '../_incl_data/autoload.php';
-}
-
-$user = User::start();
-
-if($input = file_get_contents("php://input")) {
-    $data = json_decode($input);
-}
-
-if(!empty($user->info)) {
-
-    $training = TrainingManager::getInstance($user->info['id']);
-
-    if (!isset($data->token) || !password_verify(
-            $training->getDatabaseRecords()->api_token . $data->time . $user->info['id'],
-            $data->token
-        )) {
-        http_response_code(401);
-        die;
-    }
-
-    if (isset($_GET['get'])) {
-        switch ($_GET['get']) {
-            default:
-                http_response_code(400);
-                die;
-            case 'complete':
-                if ($training->{$data->short_name}->isComplete) {
-                    http_response_code(400);
-                    die;
-                }
-
-                $training->addPoint($data->short_name);
-                $training->nextStep();
-                $training->store();
-
-                die(json_encode(['status' => 'ok']));
-        }
-    }
-}

css/training/modal.css

@@ -4,7 +4,7 @@
     right: 0;
     bottom: 0;
     left: 0;
-    /*background: rgba(0, 0, 0, 0.5);*/
+    background: rgba(0, 0, 0, 0.5);
     opacity: 0;
     z-index: -1;
     pointer-events: none;

js/training/modal.js

@@ -1,24 +1,3 @@
-const request = new XMLHttpRequest();
-
-const training_handler = () => {
-    request.open('POST', '/api/training/complete')
-    request.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-    request.onreadystatechange = function() {//Call a function when the state changes.
-        if(request.readyState === 4 && request.status === 200) {
-            parent.frames['main'].location.reload();
-        }
-    }
-
-    request.send(JSON.stringify({
-        time: training_data().time,
-        token: training_data().token,
-        short_name: training_data().short_name
-    }))
-
-}
-
-let active_training = null;
-
 (function () {
     if (typeof window.CustomEvent === "function") return false;
     function CustomEvent(event, params) {

main.php

@@ -29,14 +29,11 @@
 <div class="se-pre-con" id="se-pre-con"></div>
 
 <?php
-
-
 if (!defined('GAME_VERSION')) {
     require_once '_incl_data/autoload.php';
 }
 
 use Core\{Config, Database, Db};
-use DarksLight2\Training\TrainingManager;
 
 function var_info($vars, $d = false)
 {
@@ -559,12 +556,6 @@ $spl = $spl['exp'];
 echo '<script>top.myexpLineTop27(' . $u->info['exp'] . ',' . $spl . ');' . $tjs . 'top.ctest("' . $u->info['city'] . '");top.sd4key="' . $u->info['nextAct'] . '"; var battle = ' . (0 + $u->info['battle']) . '; top.hic();</script></body>
 </html>';
 
-$training_manager = TrainingManager::getInstance();
-
-if($u->room['file']=='cp1') {
-    $training_manager->first_step->render();
-    $training_manager->second_step->render();
-}
 ?>
 <!--<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.2/modernizr.js"></script>-->
 <script>

modules_data/location/cp1.php

@@ -1,5 +1,7 @@
 <?
 
+use DarksLight2\Training\TrainingManager;
+
 if(!defined('GAME'))
 {
 	die();
@@ -9,6 +11,9 @@ require_once('/home/newcom1/public_html/_incl_data/class/__db_connect.php');
 
 if($u->room['file']=='cp1') {
 
+    $training_manager = TrainingManager::getInstance();
+    $training_manager->first_step->render();
+
 	if(date("H")>=8 && date("H")<=23) {
 		$now = 'day';
 		$tattack = '<a style="color:#D8D8D8" style="cursor:pointer" onclick="top.useMagic(\'Нападение на персонажа\',\'night_atack\',\'pal_button8.gif\',1,\'main.php?nightatack=1\');">Напасть на игрока</a> &nbsp; ';

modules_data/steps/first_step.php

@@ -1,26 +1,23 @@
 <?php
 
-/**
+use DarksLight2\Training\TrainingManager;
- * @var string $token
- * @var int $time
- * @var string $button_text
- * @var object $step
- */
 
 $short_name = 'first_step';
 
-require 'step.php';
+$manager = TrainingManager::getInstance();
-
+$step = $manager->$short_name;
+$button_text = 'Продолжить';
+if(!$manager) {
+    $button_text = '';
+}
 ?>
+
 <script>
     const training_data = () => {
         return {
             content: `<?=$step->message?>`,
             title: `<?=$step->title?>`,
-            button_text: `<?=$button_text?>`,
+            button_text: `<?=$button_text?>`
-            time: <?=$time?>,
-            token: '<?=$token?>',
-            short_name: '<?=$short_name?>',
         }
     }
 </script>

modules_data/steps/second_step.php

@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @var string $token
- * @var int $time
- * @var string $button_text
- * @var object $step
- */
-
-$short_name = 'second_step';
-
-require 'step.php';
-
-?>
-<script>
-    const training_data = () => {
-        return {
-            content: `<?=$step->message?>`,
-            title: `<?=$step->title?>`,
-            button_text: `<?=$button_text?>`,
-            time: <?=$time?>,
-            token: '<?=$token?>',
-            short_name: '<?=$short_name?>',
-        }
-    }
-</script>
-<script src="/js/training/modal.js"></script>
-
-<script>
-    modal.show()
-</script>

modules_data/steps/step.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @var string $short_name
- */
-
-$user = User::start();
-
-use DarksLight2\Training\TrainingManager;
-
-$manager = TrainingManager::getInstance();
-$step = $manager->$short_name;
-$button_text = 'Продолжить';
-$time = time();
-
-$token = password_hash($manager->getDatabaseRecords()->api_token . $time . $user->info['id'], PASSWORD_DEFAULT);