Add config option to enable/disable scrolling

gmazoyer · Jan 28, 2024 · a6b8c0d · a6b8c0d
1 parent dda367f
commit a6b8c0d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/css/style.css b/css/style.css
@@ -39,6 +39,10 @@ pre {
   padding-left:     1%;
   padding-right:    1%;
 }
+.pre-scrollable {
+  max-height:       480px;
+  overflow-y:       scroll;
+}
 a {
   color:            #000000;
   text-decoration:  none;

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -246,6 +246,12 @@ $config['output']['show_command'] = true;
 ```
 Defines if the command used to get the output should be displayed or not.
 
+```php
+$config['output']['scroll'] = true;
+```
+Defines if the result should be displayed as a scrollable element or a an
+unscrollable element.
+
 ### Logs
 
 ```php

diff --git a/includes/config.defaults.php b/includes/config.defaults.php
@@ -102,7 +102,9 @@ function set_defaults_for_routers(&$parsed_config) {
   // Output control
   'output' => array(
     // Show or hide command in output
-    'show_command' => true
+    'show_command' => true,
+    // Enable or disable scrolling when displaying result
+    'scroll' => true
   ),
 
   // Filters

diff --git a/routers/router.php b/routers/router.php
@@ -52,7 +52,7 @@ public function __construct($global_config, $config, $id, $requester) {
 
     // Set defaults if not present
     if (!isset($this->config['timeout'])) {
-      $this->config['timeout'] = 30;
+      $this->config['timeout'] = 180;
     }
     if (!isset($this->config['disable_ipv6'])) {
       $this->config['disable_ipv6'] = false;
@@ -103,7 +103,12 @@ protected function format_output($command, $output) {
     if ($this->global_config['output']['show_command']) {
       $displayable .= '<p><kbd>Command: '.$command.'</kdb></p>';
     }
-    $displayable .= '<pre class="pre-scrollable">'.$output.'</pre>';
+    if ($this->global_config['output']['scroll']) {
+      $displayable .= '<pre class="pre-scrollable">';
+    } else {
+      $displayable .= '<pre>';
+    }
+    $displayable .= $output.'</pre>';
 
     return $displayable;
   }