env: support insight plugin by default

iTXTech · Sep 27, 2022 · b5dea77 · b5dea77
1 parent 3147f3c
commit b5dea77
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/FDWebServer/CGI/env.php b/FDWebServer/CGI/env.php
@@ -22,11 +22,11 @@
 
 //Runtime Environment Initializer
 ob_start();
-foreach(["sf.phar", "SimpleFramework.phar", "sfloader.php", "sf/sfloader.php"] as $loader){
- if(file_exists($loader)){
- if(explode(".", $loader)[1] == "phar"){
+foreach(["sf.phar", "SimpleFramework.phar", "sfloader.php", "sf/sfloader.php"] as $loader) {
+ if(file_exists($loader)) {
+ if(explode(".", $loader)[1] == "phar") {
  require_once "phar:https://" . $loader . "/sfloader.php";
- }else{
+ } else {
  require_once "$loader";
  }
  break;
@@ -40,21 +40,27 @@
 
 Logger::$logLevel = 4;//disable logger
 
+$modules = ["FlashDetector", "Insight"];
+
 global $classLoader;
-try{
+try {
  $moduleManager = new ModuleManager($classLoader,
  __DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, "");
- loadModule($moduleManager, "FlashDetector");
-}catch(Throwable $e){
+ foreach($modules as $m) {
+ loadModule($moduleManager, $m);
+ }
+} catch(Throwable $e) {
  Logger::logException($e);
 }
 
-function loadModule(ModuleManager $manager, string $name){
+function loadModule(ModuleManager $manager, string $name) {
  $name = $manager->getModulePath() . $name;
- $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
+ if(file_exists($name . ".phar") || file_exists($name)) {
+ $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
+ }
 }
 
-if($moduleManager->getModule("FlashDetector") === null){
+if($moduleManager->getModule("FlashDetector") === null) {
  Logger::error("Module not loaded.");
  exit(1);
 }
@@ -64,17 +70,17 @@ function loadModule(ModuleManager $manager, string $name){
 header("Access-Control-Allow-Headers: *");
 header("Content-Type: application/json");
 
-function getQuery() : string{
+function getQuery(): string {
  return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . ":https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 }
 
-function getRemote() : string{
- if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
- return str_replace(" ", "", explode(",", $_SERVER["HTTP_X_FORWARDED_FOR"])[0]);
- }
- return $_SERVER["HTTP_X_REAL_IP"] ?? $_SERVER["REMOTE_ADDR"];
+function getRemote(): string {
+ if(isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
+ return str_replace(" ", "", explode(",", $_SERVER["HTTP_X_FORWARDED_FOR"])[0]);
+ }
+ return $_SERVER["HTTP_X_REAL_IP"] ?? $_SERVER["REMOTE_ADDR"];
 }
 
-function getUserAgent() : string{
+function getUserAgent(): string {
  return $_SERVER["HTTP_USER_AGENT"] ?? "Undefined";
 }
diff --git a/Scripts/env.php b/Scripts/env.php
@@ -31,31 +31,33 @@
 
 Initializer::initTerminal();
 
-Logger::$logLevel = 2;//disable logger
+Logger::$logLevel = 0;//disable logger
 
 Logger::info("Loading iTXTech FlashDetector");
 
-$modules = ["FlashDetector"];
+$modules = ["FlashDetector", "Insight"];
 
 global $classLoader;
-try{
+try {
  $moduleManager = new ModuleManager($classLoader,
  __DIR__ . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR, __DIR__ . DIRECTORY_SEPARATOR);
  $moduleManager->registerModuleDependencyResolver(new WraithSpireMDR($moduleManager,
  "https://raw.githubusercontent.com/iTXTech/WraithSpireDatabase/master/", []));
- foreach($modules as $m){
+ foreach($modules as $m) {
  loadModule($moduleManager, $m);
  }
-}catch(Throwable $e){
+} catch(Throwable $e) {
  Logger::logException($e);
 }
 
-function loadModule(ModuleManager $manager, string $name){
+function loadModule(ModuleManager $manager, string $name) {
  $name = $manager->getModulePath() . $name;
- $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
+ if(file_exists($name . ".phar") || file_exists($name)) {
+ $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
+ }
 }
 
-if($moduleManager->getModule("FlashDetector") === null){
+if($moduleManager->getModule("FlashDetector") === null) {
  Logger::error("Module not loaded.");
  exit(1);
 }