Исправления совместимости

manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.0.7.2",
+	"version": "2.0.8",
 	"status": "dev",
 	"dle": [
 		"15.x"

upload/engine/ajax/maharder.php

@@ -34,7 +34,7 @@
 
 include_once(DLEPlugins::Check(ENGINE_DIR . '/inc/maharder/_includes/extras/paths.php'));
 
-$mh_admin = new Ajax();
+$mh_admin = new MhAjax();
 
 if (file_exists(DLEPlugins::Check(ENGINE_DIR . '/ajax/maharder/' . $module . '/' . $mod_file . '.php'))) {
 

upload/engine/inc/maharder.php

@@ -5,7 +5,7 @@
 
 $modInfo = [
 	'module_name' => 'MaHarder Assets',
-	'module_version' => '2.0.7.2',
+	'module_version' => '2.0.7',
 	'module_description' => 'Административная панель для моих разработок',
 	'module_code' => 'maharder',
 	'module_id' => 4,

upload/engine/inc/maharder/_includes/classes/Ajax.php → upload/engine/inc/maharder/_includes/classes/MhAjax.php

@@ -3,7 +3,7 @@
 
 require_once DLEPlugins::Check(ENGINE_DIR . '/inc/maharder/_includes/extras/paths.php');
 
-class Ajax {
+class MhAjax {
 	use DataLoader;
 	use AssetsChecker;
 	use UpdatesChecker;

upload/engine/inc/maharder/_includes/extras/loader.php → upload/engine/inc/maharder/_includes/extras/mhLoader.php

@@ -4,17 +4,18 @@
 	@ini_set('pcre.backtrack_limit', 10000000 );
 	@ini_set('pcre.jit', false);
 
-
-
 	if (!function_exists('dirToArray')) {
-		function dirToArray($dir) {
+		function dirToArray($dir, ...$except) {
 			$result = [];
 
 			$xcpt = [
 				'.',
 				'..',
 				'.htaccess',
 			];
+			if ($except) {
+				foreach ($except as $ex) $xcpt = array_merge_recursive($xcpt, $ex);
+			}
 
 			foreach (scandir($dir, SCANDIR_SORT_NONE) as $key => $value) {
 				if ( ! in_array($value, $xcpt, true)) {
@@ -31,11 +32,11 @@ function dirToArray($dir) {
 	}
 
 	spl_autoload_register(function ($class_name) {
-		global $loader_paths;
+		global $mh_loader_paths;
 
 		$found = false;
 
-		foreach ($loader_paths as $path) {
+		foreach ($mh_loader_paths as $path) {
 			$dir_data = dirToArray($path);
 			foreach ($dir_data as $data) {
 				if ($class_name ===  str_replace('.php', '', $data)) {
@@ -47,4 +48,4 @@ function dirToArray($dir) {
 			if ($found) break;
 		}
 
-	});
+	});

upload/engine/inc/maharder/_includes/extras/paths.php

@@ -1,21 +1,31 @@
 <?php
 
-if (!defined('DATALIFEENGINE')) {
-	header('HTTP/1.1 403 Forbidden');
-	header('Location: ../../../../../');
+	if ( ! defined('DATALIFEENGINE')) {
+		header('HTTP/1.1 403 Forbidden');
+		header('Location: ../../../../../');
 
-	exit('Hacking attempt!');
-}
+		exit('Hacking attempt!');
+	}
 
-if(!defined('MH_ROOT')) define("MH_ROOT", ENGINE_DIR . '/inc/maharder');
-if(!defined('MH_ADMIN')) define("MH_ADMIN", MH_ROOT . '/admin');
-if(!defined('ROOT')) define("ROOT", ROOT_DIR);
+	$current_dir = __DIR__;
+	if (preg_grep('/(cache)/', explode("\n", $current_dir))) $current_dir = dirname(__FILE__, 5);
+	else $current_dir = dirname(__FILE__, 6);
 
-$loader_paths = [
-	MH_ROOT.'/_includes/classes',
-	MH_ROOT.'/_includes/traits',
-	// Custom paths //
-];
+	if ( ! defined('ROOT')) {
+		define("ROOT", $current_dir);
+	}
+	if ( ! defined('MH_ROOT')) {
+		define("MH_ROOT", ROOT.'/engine/inc/maharder');
+	}
+	if ( ! defined('MH_ADMIN')) {
+		define("MH_ADMIN", MH_ROOT.'/admin');
+	}
 
-include_once ENGINE_DIR . '/inc/maharder/_includes/vendor/autoload.php';
-require_once DLEPlugins::Check(MH_ROOT.'/_includes/extras/loader.php');
+	$mh_loader_paths = [
+		MH_ROOT.'/_includes/classes',
+		MH_ROOT.'/_includes/traits',
+		// Custom paths //
+	];
+
+	include_once MH_ROOT.'/_includes/extras/mhLoader.php';
+	include_once ENGINE_DIR.'/inc/maharder/_includes/vendor/autoload.php';

upload/engine/inc/maharder/_includes/traits/DataLoader.php

@@ -257,12 +257,16 @@ public static function dirToArray($dir, ...$except) {
 				$xcpt = array_merge_recursive($xcpt, self::nameArgs($except));
 			}
 
-			foreach (scandir($dir, SCANDIR_SORT_NONE) as $key => $value) {
-				if ( ! in_array($value, $xcpt, true)) {
-					if (is_dir($dir.DIRECTORY_SEPARATOR.$value)) {
-						$result[$value] = self::dirToArray($dir.DIRECTORY_SEPARATOR.$value);
-					} else {
-						$result[] = $value;
+			$dir = str_replace(ENGINE_DIR, ROOT . DIRECTORY_SEPARATOR . 'engine', $dir);
+
+			if (is_dir($dir)) {
+				foreach (scandir($dir, SCANDIR_SORT_NONE) as $key => $value) {
+					if ( ! in_array($value, $xcpt, true)) {
+						if (is_dir($dir.DIRECTORY_SEPARATOR.$value)) {
+							$result[$value] = self::dirToArray($dir.DIRECTORY_SEPARATOR.$value);
+						} else {
+							$result[] = $value;
+						}
 					}
 				}
 			}

upload/engine/inc/maharder/admin/modules/admin/changelog.php

@@ -2,12 +2,6 @@
 
 $logs = [
 
-	'2.0.7.2' => [
-		'[FIX] Исправлен установщик v2',
-	],
-	'2.0.7.1' => [
-		'[FIX] Исправлен установщик',
-	],
 	'2.0.7' => [
 		'[NEW] Добавлен функционал проверки обновления плагина',
 		'[UPDATE] Изменён подход к некоторым классам',