Remove old code for netsurf browser

Commit 973b810 replaced netsurf by
dwb, but html uploads were still shown using netsurf.

Now all remaining netsurf code is removed.

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

FileHandler.class.php

@@ -29,7 +29,7 @@ function show($path) {
     }
 }
 
-class NetsurfHandler extends FileHandler {
+class DwbHandler extends FileHandler {
     function getControls() {
         return FileHandler::CURSOR | FileHandler::ZOOM;
     }
@@ -107,7 +107,7 @@ public static function getFileHandler($file) {
             $fhandler='/usr/bin/libreoffice --calc -o -n --nologo --norestore --view';
 
         } else if ($ftype==='html' || $ftype==='url') {
-            $fhandler='/usr/bin/netsurf';
+            $fhandler='/usr/bin/dwb --override-restore';
 
         } else if ($ftype==='mpg' || $ftype==='mpeg' || $ftype==='avi' ||
                    $ftype==='mp3' || $ftype=="mp4") {
@@ -132,11 +132,11 @@ public static function getFileHandler($file) {
 
 if ($unittest[__FILE__]) {
     // Run unit test.
-    $netsurfHandler = new NetsurfHandler;
+    $dwbHandler = new DwbHandler;
     $zathuraHandler = new ZathuraHandler;
     echo("DOWNLOAD   =" . FileHandler::DOWNLOAD . "\n");
     echo("filehandler=" . FileHandler::getFileHandler("test.txt") . "\n");
-    $handler = ${'netsurf' . 'Handler'};
+    $handler = ${'dwb' . 'Handler'};
     echo("controls   =" . $handler->getControls() . "\n");
 }
 

control.php

@@ -468,7 +468,6 @@ function processRequests($db) {
         "state" => "",
         "file" => $openURL,
         // "handler" => "iceweasel --new-window",
-        //~ "handler" => "/usr/bin/nohup /usr/bin/netsurf",
         "handler" => "/usr/bin/nohup /usr/bin/dwb",
         "userid" => "",
         "date" => $date

index.php

@@ -578,20 +578,6 @@ function getHandlerCommand(handle, task) {
     handler["eog"]["zoomout"] = "ctrl+minus";
     handler["eog"]["download"] = "download";
 
-    // Alternate handler for web pages (not used by default).
-    handler["netsurf"] = new Object();
-    handler["netsurf"]["up"] = " Tab+Up";
-    handler["netsurf"]["down"] = "Tab+Down";
-    handler["netsurf"]["left"] = "Tab+Left";
-    handler["netsurf"]["right"] = "Tab+Right";
-    handler["netsurf"]["next"] = "Tab+Next";
-    handler["netsurf"]["prior"] = "Tab+Prior";
-    handler["netsurf"]["home"] = "Tab+Home";
-    handler["netsurf"]["end"] = "Tab+End";
-    handler["netsurf"]["zoomin"] = "Tab+ctrl+plus";
-    handler["netsurf"]["zoomout"] = "Tab+ctrl+minus";
-    handler["netsurf"]["download"] = "download";
-
     // Controls in LibreOffice: no zoom in calc and writer, has to be activated first
     // by pressing <Ctrl+Shift+o> (switch view mode on/off) not implemented yet
     handler["libreoffice"] = new Object();
@@ -961,8 +947,6 @@ function updateControlsBySection(window) {
                 }
         } else if (handler.indexOf("dwb") > -1) {
             control = new Array("dwb", true, true, true, true, true, true, true, true, true, true, true);
-        } else if (handler.indexOf("netsurf") > -1) {
-            control = new Array("netsurf", true, true, true, true, true, true, false, false, false, false, true);
         } else if (handler.indexOf("vlc") > -1) {
             control = new Array("vlc", false, false, false, true, false, false, false, false, false, false, false);
         } else if (handler.indexOf("vnc") > -1) {