UB-Mannheim / PalMA

control.php

Spacing +10 added lines, -10 removed lines

@@ -175,7 +175,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'");
@@ -204,7 +204,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;
@@ -298,7 +298,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 {
@@ -324,7 +324,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;
     }
   
@@ -355,7 +355,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);
@@ -377,7 +377,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();
@@ -437,7 +437,7 @@ 
             // but currently, both those values can be ambiguos
             $file_in_db = $db->querySingle("SELECT id FROM window WHERE file='$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);
@@ -445,7 +445,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 +++");
@@ -538,14 +538,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";