UB-Mannheim / PalMA

control.php

Indentation +12 added lines, -12 removed lines

@@ -331,18 +331,18 @@ 
   
     require_once('FileHandler.class.php');
     list ($handler, $targetFile) =
-      palma\FileHandler::getFileHandler($inFile);
+        palma\FileHandler::getFileHandler($inFile);
     trace("file is now $targetFile, its handler is $handler");
 
     $window = array(
-      "id" => "",
-      "win_id" => "",
-      "name" => "",
-      "state" => "",
-      "file" => $targetFile,
-      "handler" => $handler,
-      "userid" => "",
-      "date" => $w['date']);
+        "id" => "",
+        "win_id" => "",
+        "name" => "",
+        "state" => "",
+        "file" => $targetFile,
+        "handler" => $handler,
+        "userid" => "",
+        "date" => $w['date']);
   
     createNewWindow($db, $window);
 }
@@ -401,7 +401,7 @@ 
 
             // trying mousemove and click for better vnc control
             displayCommand("xdotool mousemove --window $windowhex 100 100 " .
-                       "key $key");
+                        "key $key");
         }
 
         if ($windowname && array_key_exists('keydown', $_REQUEST)) {
@@ -416,7 +416,7 @@ 
 
             // trying mousemove and click for better vnc control
             displayCommand("xdotool mousemove --window $windowhex 100 100 " .
-                       "key $key");
+                        "key $key");
             //~ displayCommand("xdotool windowfocus $windowhex keydown $key");
         }
 
@@ -566,7 +566,7 @@ 
                 "section" => "",
                 "state" => "",
                 "file" => $openURL,
-		"handler" => "palma-browser",
+        "handler" => "palma-browser",
                 "userid" => "",
                 "date" => $date
             );

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
     monitor("control.php: displayCommand $cmd");
 
     // add directories with palma-browser to PATH
-    $result = shell_exec('PATH=/usr/lib/palma:./scripts:$PATH '.$cmd);
+    $result = shell_exec('PATH=/usr/lib/palma:./scripts:$PATH ' . $cmd);
     trace("displayCommand $cmd, result=$result");
     return $result;
 }
@@ -176,7 +176,7 @@ 
     }
 
     // Make sure $layout is valid
-    if (!array_key_exists($layout, $geom)){
+    if (!array_key_exists($layout, $geom)) {
         trace("layout invalid!");
     } else {
         $db->exec("UPDATE setting SET value='$layout' WHERE key='layout'");
@@ -205,7 +205,7 @@ 
             $section = $w['section'];
             if ($section >= 1 && $section <= $maxSection && $enabled) {
                 // Show window, set size and position.
-                $wi = $section - 1;
+                $wi = $section-1;
                 $dx = $screenWidth / $dim[$wi][2];
                 $dy = $screenHeight / $dim[$wi][3];
                 $x = $dim[$wi][0] * $dx;
@@ -299,7 +299,7 @@ 
     // TODO: check how to insert the userid for all content, not just vnc.
     // Perhaps better add to array in upload.php ?
     $userid = "";
-    $queryid = $db->querySingle('SELECT user.userid FROM user WHERE user.name="' . $new['userid'] .'"');
+    $queryid = $db->querySingle('SELECT user.userid FROM user WHERE user.name="' . $new['userid'] . '"');
     if (!empty($queryid)) {
         $userid = $queryid;
     } else {
@@ -325,7 +325,7 @@ 
 {
     $inFile = $w['file'];
     if (!file_exists($inFile)) {
-        trace("".escapeshellarg($inFile)." is not a file, aborting display");
+        trace("" . escapeshellarg($inFile) . " is not a file, aborting display");
         return;
     }
   
@@ -356,7 +356,7 @@ 
     // TODO: use escapeshellarg() for filename.
     $filename = $w['file'];
 
-    $cmd = "$handler ".escapeshellarg($filename);
+    $cmd = "$handler " . escapeshellarg($filename);
     displayCommand("/usr/bin/nohup $cmd >/dev/null 2>&1 &");
 
     addNewWindow($db, $w);
@@ -378,7 +378,7 @@ 
         if ($windownumber != 'vncwin') {
             // This is the normal case.
             // Special handling is needed when called with window=vncwin, see below.
-            $window = $windownumber - 1;
+            $window = $windownumber-1;
 
             $win_id = $db->getWindowIDBySection($windownumber);
             $windowlist = windowList();
@@ -439,7 +439,7 @@ 
             $file_in_db = $db->querySingle("SELECT id FROM window WHERE file='$delete'");
             $delete = str_replace(" ", "\ ", $delete);
             trace("file in db: $file_in_db");
-            if ($file_in_db){
+            if ($file_in_db) {
                 if (file_exists($delete)) {
                     trace("+++ DELETE FILE FROM WEBINTERFACE +++");
                     unlink($delete);
@@ -447,7 +447,7 @@ 
                     trace("+++ DELETE VNC Client FROM DAEMON +++");
                     // call via daemon: ?window=vncwin&delete=VNC&vncid=123
                     trace("vnc delete in control");
-                    $win_id = escapeshellcmd($_REQUEST['vncid']);   // = hexWindow in database, but not on screen
+                    $win_id = escapeshellcmd($_REQUEST['vncid']); // = hexWindow in database, but not on screen
                     trace("VNC via Daemon ... id=$win_id");
                 } elseif (strstr($delete, "http")) {
                     trace("+++ DELETE Browserwindow +++");
@@ -540,14 +540,14 @@ 
 
         // If URL leads to pdf file, download it and treat as upload
         $headers = get_headers($openURL, 1);
-        if ($headers["Content-Type"] == "application/pdf"){
+        if ($headers["Content-Type"] == "application/pdf") {
             trace("url seems to lead to a pdf file, so downloading it...");
             $temp_name = basename($openURL);
             $temp_dir = "/tmp";
             file_put_contents("$temp_dir/$temp_name", file_get_contents($openURL));
             $mimetype = mime_content_type("$temp_dir/$temp_name");
             trace("mimetype is $mimetype");
-            if ($mimetype == "application/pdf"){
+            if ($mimetype == "application/pdf") {
                 $_FILES['file']['name'] = "$temp_name";
                 $_FILES['file']['tmp_name'] = "$temp_dir/$temp_name";
                 $_FILES['file']['error'] = "downloaded_from_url";

FileHandler.class.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 
     // Shortcuts for combinations of controls.
     const CURSOR = 15; // UP | DOWN | LEFT | RIGHT
-    const ZOOM = 48;   // ZOOMIN | ZOOMOUT
+    const ZOOM = 48; // ZOOMIN | ZOOMOUT
     const ALL = 2047;
 
     // up down left right zoomin zoomout home end prior next download
@@ -62,14 +62,14 @@ 
         // $params;
         // echo $ftype;
         if ($ftype === 'pdf') {
-            $fhandler=$pdfHandler;
+            $fhandler = $pdfHandler;
         } elseif ($ftype === 'gif' || $ftype === 'jpg' || $ftype === 'png') {
-            $fhandler=$imageHandler;
+            $fhandler = $imageHandler;
         } elseif ($ftype === 'html' || $ftype === 'url') {
-            $fhandler=$webHandler;
+            $fhandler = $webHandler;
         } elseif ($ftype === 'mpg' || $ftype === 'mpeg' || $ftype === 'avi' ||
                   $ftype === 'mp3' || $ftype === 'mp4' || $ftype === 'wmv') {
-            $fhandler=$avHandler;
+            $fhandler = $avHandler;
         } else {
             if ($ftype === 'doc' || $ftype === 'docx' || $ftype === 'odt' || $ftype === 'txt') {
                 $officeApp = "writer";
@@ -105,7 +105,7 @@ 
 function convertOffice($inputFile, $office, $outputDir, $fileName)
 {
     shell_exec("/usr/bin/libreoffice --headless --convert-to pdf:'$office'_pdf_Export --outdir '$outputDir' '$inputFile' >/dev/null 2>&1");
-    $newFile=$outputDir . '/' . $fileName . '.pdf';
+    $newFile = $outputDir . '/' . $fileName . '.pdf';
     if (file_exists($newFile)) {
         return $newFile;
     } else {