adminer kungfu

netwaretcs · Jul 26, 2022 · aae7410 · aae7410
1 parent 5080a83
commit aae7410
Show file tree

Hide file tree

Showing 20 changed files with 435 additions and 117 deletions.
diff --git a/data/javascript.xml b/data/javascript.xml
diff --git a/data/lang.xml b/data/lang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="toolbox" version="50012">
+ <app key="toolbox" version="50013">
   <word key="__app_toolbox" js="0">Dev Toolbox</word>
   <word key="menutab__devtools" js="0">Dev Toolbox</word>
   <word key="menutab__devtools_icon" js="0">wrench</word>

diff --git a/data/versions.json b/data/versions.json
@@ -18,5 +18,6 @@
     "50009": "5.0.9",
     "50010": "5.0.10",
     "50011": "5.0.11",
-    "50012": "5.0.12"
+    "50012": "5.0.12",
+    "50013": "5.0.13"
 }
diff --git a/dev/html/global/fforms/header.phtml b/dev/html/global/fforms/header.phtml
@@ -1,4 +1,4 @@
 <ips:template parameters="$lang, $id, $class=''" />
 <li class="ipsFieldRow_section {$class}" id="{$id}">
-    <span class="ipsType_bold">{lang="$lang"}</span> 
+    <span class="ipsType_bold">{lang="$lang"}</span>
 </li>
diff --git a/extensions/toolbox/Headerdoc/header.php b/extensions/toolbox/Headerdoc/header.php
@@ -50,13 +50,16 @@ public function indexEnabled()
      **/
     public function filesSkip(&$skip)
     {
+        $skip[] = 'adminer.php';
+        $skip[] = 'bootstrap.inc.php';
     }
 
     /**
      * directories to skip during building of the tar
      **/
     public function dirSkip(&$skip)
     {
+        $skip[] = 'AdminerDb';
 
     }
 
@@ -66,6 +69,8 @@ public function dirSkip(&$skip)
     public function exclude(&$skip)
     {
         $skip[] = 'AdminerDb';
+
         $skip[] = 'adminer.php';
+        $skip[] = 'bootstrap.inc.php';
     }
 }
diff --git a/hooks/Application.php b/hooks/Application.php
@@ -24,7 +24,6 @@ class toolbox_hook_Application extends _HOOK_CLASS_
 {
     public $skip = false;
 
-
     /**
      * @inheritdoc
      */

diff --git a/hooks/BuilderIterator.php b/hooks/BuilderIterator.php
@@ -30,10 +30,13 @@ public function current()
         $file = $this->key();
         $file = \IPS\Application::getRootPath() . '/applications/' . $this->application->directory . '/' . $file;
         $path = new SplFileInfo($this->key());
-        if (is_file($file) && (mb_strpos($file, '3rdparty') === false || mb_strpos(
-                    $file,
-                    '3rd_party'
-                ) === false || mb_strpos($file, 'vendor') === false) && $path->getExtension() === 'php') {
+        if (
+                is_file($file) &&
+                (mb_strpos($file, '3rdparty') === false ||
+                    mb_strpos($file, '3rd_party') === false ||
+                    mb_strpos($file, 'vendor') === false) &&
+                $path->getExtension() === 'php'
+        ) {
             $temporary = tempnam(TEMP_DIRECTORY, 'IPS');
             if (mb_strpos($path->getPath(), 'hooks') !== false) {
                 $contents = Plugin::addExceptionHandlingToHookFile($file);

diff --git a/hooks/Hooks.php b/hooks/Hooks.php
@@ -33,11 +33,9 @@ public static function devTable($url, $appOrPluginId, $hookDir)
         $dtProxyFolder = \IPS\Application::getRootPath() . '/dtProxy/namespace.json';
 
         $parent = parent::devTable($url, $appOrPluginId, $hookDir);
-
         /** @var Form $parent */
         if ($parent instanceof Form && file_exists($dtProxyFolder)) {
             $elements = $parent->elements;
-
             $options = [
                 'placeholder'  => 'Namespace',
                 'autocomplete' => [
@@ -68,4 +66,5 @@ public static function devTable($url, $appOrPluginId, $hookDir)
         return $parent;
     }
 
+
 }
diff --git a/setup/upg_50012/index.html b/setup/upg_50012/index.html
diff --git a/setup/upg_50013/data.json b/setup/upg_50013/data.json
@@ -0,0 +1,24 @@
+{
+    "id": 50013,
+    "name": "5.0.13",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeSettings": false,
+        "javascript": true,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "whatsnew": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}
diff --git a/setup/upg_50013/index.html b/setup/upg_50013/index.html
diff --git a/setup/upg_50013/javascript.json b/setup/upg_50013/javascript.json
@@ -0,0 +1,64 @@
+{
+    "files": {
+        "added": [],
+        "edited": [
+            "toolbox\/admin\/controllers\/click\/ips.ui.adminer.click.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.debug.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.dtprofiler.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.search.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.collapsed.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.hash.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbase.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbitwise.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdates.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdiffs.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxhtml.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboximages.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxlorem.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxnumbers.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxuuid.js",
+            "toolbox\/global\/controllers\/proxy\/ips.ui.toolbox.proxy.js",
+            "toolbox\/admin\/controllers\/query\/ips.query.query.js",
+            "toolbox\/admin\/controllers\/click\/ips.ui.adminer.click.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.debug.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.dtprofiler.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.search.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.collapsed.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.hash.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbase.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbitwise.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdates.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdiffs.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxhtml.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboximages.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxlorem.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxnumbers.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxuuid.js",
+            "toolbox\/global\/controllers\/proxy\/ips.ui.toolbox.proxy.js",
+            "toolbox\/admin\/controllers\/query\/ips.query.query.js",
+            "toolbox\/admin\/controllers\/click\/ips.ui.adminer.click.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.debug.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.dtprofiler.js",
+            "toolbox\/front\/controllers\/profiler\/ips.dtprofiler.search.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.collapsed.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.hash.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbase.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxbitwise.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdates.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxdiffs.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxhtml.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboximages.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxlorem.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxnumbers.js",
+            "toolbox\/front\/controllers\/profiler\/ips.ui.toolbox.toyboxuuid.js",
+            "toolbox\/global\/controllers\/proxy\/ips.ui.toolbox.proxy.js",
+            "toolbox\/admin\/controllers\/query\/ips.query.query.js"
+        ],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}
diff --git a/setup/upg_50013/theme.json b/setup/upg_50013/theme.json
@@ -0,0 +1,124 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/bar\/base",
+            "front\/bar\/dates",
+            "front\/bar\/diffs",
+            "front\/bar\/git",
+            "front\/bar\/hash",
+            "front\/bar\/html",
+            "front\/bar\/images",
+            "front\/bar\/lorem",
+            "front\/bar\/numbers",
+            "front\/bar\/uuid",
+            "front\/bt\/phpinfo",
+            "front\/caching\/caching",
+            "admin\/code\/files",
+            "admin\/code\/final",
+            "admin\/code\/lists",
+            "admin\/code\/results",
+            "admin\/code\/sql",
+            "front\/database\/database",
+            "admin\/devBar\/devBar",
+            "admin\/devBar\/li",
+            "admin\/dtdpmenu\/menu",
+            "front\/dtpsearch\/button",
+            "front\/dtpsearch\/keyvalue",
+            "admin\/error\/error",
+            "front\/generic\/anchor",
+            "front\/generic\/button",
+            "front\/generic\/genericVal",
+            "front\/generic\/keyvalue",
+            "front\/generic\/keyvalueDebug",
+            "front\/generic\/li",
+            "front\/generic\/plain",
+            "front\/generic\/string",
+            "front\/generic\/stringDebug",
+            "admin\/other\/phpinfo",
+            "front\/bar\/base",
+            "front\/bar\/dates",
+            "front\/bar\/diffs",
+            "front\/bar\/git",
+            "front\/bar\/hash",
+            "front\/bar\/html",
+            "front\/bar\/images",
+            "front\/bar\/lorem",
+            "front\/bar\/numbers",
+            "front\/bar\/uuid",
+            "front\/bt\/phpinfo",
+            "front\/caching\/caching",
+            "admin\/code\/files",
+            "admin\/code\/final",
+            "admin\/code\/lists",
+            "admin\/code\/results",
+            "admin\/code\/sql",
+            "front\/database\/database",
+            "admin\/devBar\/devBar",
+            "admin\/devBar\/li",
+            "admin\/dtdpmenu\/menu",
+            "front\/dtpsearch\/button",
+            "front\/dtpsearch\/keyvalue",
+            "admin\/error\/error",
+            "front\/generic\/anchor",
+            "front\/generic\/button",
+            "front\/generic\/genericVal",
+            "front\/generic\/keyvalue",
+            "front\/generic\/keyvalueDebug",
+            "front\/generic\/li",
+            "front\/generic\/plain",
+            "front\/generic\/string",
+            "front\/generic\/stringDebug",
+            "admin\/other\/phpinfo",
+            "front\/bar\/base",
+            "front\/bar\/dates",
+            "front\/bar\/diffs",
+            "front\/bar\/git",
+            "front\/bar\/hash",
+            "front\/bar\/html",
+            "front\/bar\/images",
+            "front\/bar\/lorem",
+            "front\/bar\/numbers",
+            "front\/bar\/uuid",
+            "front\/bt\/phpinfo",
+            "front\/caching\/caching",
+            "admin\/code\/files",
+            "admin\/code\/final",
+            "admin\/code\/lists",
+            "admin\/code\/results",
+            "admin\/code\/sql",
+            "front\/database\/database",
+            "admin\/devBar\/devBar",
+            "admin\/devBar\/li",
+            "admin\/dtdpmenu\/menu",
+            "front\/dtpsearch\/button",
+            "front\/dtpsearch\/keyvalue",
+            "admin\/error\/error",
+            "front\/generic\/anchor",
+            "front\/generic\/button",
+            "front\/generic\/genericVal",
+            "front\/generic\/keyvalue",
+            "front\/generic\/keyvalueDebug",
+            "front\/generic\/li",
+            "front\/generic\/plain",
+            "front\/generic\/string",
+            "front\/generic\/stringDebug",
+            "admin\/other\/phpinfo"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [
+            "admin\/devbar.css",
+            "admin\/devbar.css",
+            "admin\/devbar.css"
+        ],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ class toolbox_hook_Application extends _HOOK_CLASS_ @@
     {
         public $skip = false;
         /**
          * @inheritdoc
          */
@@ Expand Down @@