UB-Mannheim / PalMA

download.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     // file exists: return file for download
     header('Content-Type: application/octet-stream');
     header('Content-Disposition: attachment; filename="' .
-           addslashes($filename) . '"');
+            addslashes($filename) . '"');
     readfile($filepath);
 } else {
     // file does not exist: 404 Not Found

DBConnector.class.php

Spacing +8 added lines, -8 removed lines

@@ -116,7 +116,7 @@ 
         if (count($next_ids) > 0) {
             $next = $next_ids[0];
         } else {
-            $next = $this->querySingle('SELECT MAX(id) FROM window') + 1;
+            $next = $this->querySingle('SELECT MAX(id) FROM window')+1;
         }
         return $next;
     }
@@ -140,7 +140,7 @@ 
         // TODO: Support more than one address for a given username.
         $this->exec("INSERT OR IGNORE INTO user VALUES (NULL, '$username', 1, 0)");
         $usercount = $this->querySingle("SELECT COUNT(*) FROM user");
-        $userid = $this->querySingle("SELECT userid from user where name='".$username."'");
+        $userid = $this->querySingle("SELECT userid from user where name='" . $username . "'");
         $this->exec("INSERT INTO address VALUES ('$userid', '$address', '$device')");
         trace("user $username connected with $device, $usercount user(s) now connected");
         if ($usercount == 1) {
@@ -235,13 +235,13 @@ 
 
     public function getWindowState($window_id)
     {
-        $state = @$this->querySingle('SELECT state FROM window WHERE win_id="'.$window_id.'"');
+        $state = @$this->querySingle('SELECT state FROM window WHERE win_id="' . $window_id . '"');
         return $state;
     }
 
     public function setWindowState($window_id, $state)
     {
-        $this->exec('UPDATE window SET state="'.$state.'" WHERE win_id="'.$window_id.'"');
+        $this->exec('UPDATE window SET state="' . $state . '" WHERE win_id="' . $window_id . '"');
     }
 
     public function insertWindow($window)
@@ -259,12 +259,12 @@ 
 
     public function deleteWindow($window_id)
     {
-        $this->exec('DELETE FROM window WHERE win_id="'.$window_id.'"');
+        $this->exec('DELETE FROM window WHERE win_id="' . $window_id . '"');
     }
 
     public function deleteVNCWindow($userid)
     {
-        $winid = $this->querySingle('SELECT win_id FROM window WHERE handler="vnc" AND userid="'.$userid.'"');
+        $winid = $this->querySingle('SELECT win_id FROM window WHERE handler="vnc" AND userid="' . $userid . '"');
         require_once('control.php');
         wmClose($winid);
         $this->deleteWindow($winid);
@@ -273,12 +273,12 @@ 
 
     public function deleteDebug($table, $id, $gt)
     {
-        $this->exec('DELETE FROM '.$table.' WHERE '.$id.' >"'.$gt.'"');
+        $this->exec('DELETE FROM ' . $table . ' WHERE ' . $id . ' >"' . $gt . '"');
     }
 
     public function updateWindow($window_id, $field, $value)
     {
-        $this->exec('UPDATE window SET '.$field.'="'.$value.'" WHERE win_id="'.$window_id.'"');
+        $this->exec('UPDATE window SET ' . $field . '="' . $value . '" WHERE win_id="' . $window_id . '"');
     }
 }
 

upload.php

Indentation +4 added lines, -4 removed lines

@@ -111,10 +111,10 @@
 $curl = curl_init();
 // Set some options - we are passing in a useragent too here
 curl_setopt_array($curl, array(
-                      CURLOPT_RETURNTRANSFER => 1,
-                      CURLOPT_URL => CONFIG_CONTROL_FILE . '?newWindow=' . $sw,
-                      CURLOPT_USERAGENT => 'PalMA cURL Request'
-                               ));
+                        CURLOPT_RETURNTRANSFER => 1,
+                        CURLOPT_URL => CONFIG_CONTROL_FILE . '?newWindow=' . $sw,
+                        CURLOPT_USERAGENT => 'PalMA cURL Request'
+                                ));
 // Send the request & save response to $resp
 $resp = curl_exec($curl);
 // Close request to clear up some resources

Switch Indentation +12 added lines, -12 removed lines

@@ -54,18 +54,18 @@
     $f = fopen($targetFile, 'w');
     if ($f) {
         switch ($error) {
-            case UPLOAD_ERR_INI_SIZE:
-                $message = addslashes(__("This file is too large."));
-                break;
-            case UPLOAD_ERR_FORM_SIZE:
-                $message = addslashes(__("Large files are not supported."));
-                break;
-            case UPLOAD_ERR_PARTIAL:
-                $message = addslashes(__("File was only partially uploaded."));
-                break;
-            default:
-                $message = sprintf(addslashes(__("Error code %s.")), $error);
-                break;
+        case UPLOAD_ERR_INI_SIZE:
+            $message = addslashes(__("This file is too large."));
+            break;
+        case UPLOAD_ERR_FORM_SIZE:
+            $message = addslashes(__("Large files are not supported."));
+            break;
+        case UPLOAD_ERR_PARTIAL:
+            $message = addslashes(__("File was only partially uploaded."));
+            break;
+        default:
+            $message = sprintf(addslashes(__("Error code %s.")), $error);
+            break;
         }
         fprintf($f, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"");
         fprintf($f, "\"http://www.w3.org/TR/html4/strict.dtd\">");

control.php

Indentation +11 added lines, -11 removed lines

@@ -329,18 +329,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);
 }
@@ -400,7 +400,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)) {
@@ -415,7 +415,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");
         }
 

Spacing +7 added lines, -7 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;
 }
@@ -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();
@@ -450,7 +450,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 +++");

login.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
         $_SESSION['monitor'] = CONFIG_STATIONNAME;
         $dbcon->addUser($username, $dbcon->ipAddress(), getDevice());
 
-       // Weiterleitung zur geschützten Startseite
+        // Weiterleitung zur geschützten Startseite
         if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
             if (php_sapi_name() == 'cgi') {
                 header('Status: 303 See Other');

globals.php

Indentation +3 added lines, -3 removed lines

@@ -13,10 +13,10 @@ 
 function monitor($action)
 {
     if (!defined('CONFIG_MONITOR_URL')) {
-      //trace('CONFIG_MONITOR_URL is undefined');
+        //trace('CONFIG_MONITOR_URL is undefined');
         return;
     }
-  //trace("monitor $action");
+    //trace("monitor $action");
     $ch = curl_init();
     $url = CONFIG_MONITOR_URL;
   
@@ -24,7 +24,7 @@ 
                         CURLOPT_RETURNTRANSFER => 1,
                         CURLOPT_URL => CONFIG_MONITOR_URL . '/' . CONFIG_STATIONNAME . '/' . base64_encode($action),
                         CURLOPT_USERAGENT => 'PalMA cURL Request'
-                               ));
+                                ));
     $resp = curl_exec($ch);
     curl_close($ch);
 }

index.php

Indentation +3 added lines, -3 removed lines

@@ -1391,11 +1391,11 @@
 
 <div id="footer">
     <?php
-      # Show authorized user name (and address) and allow logout.
+        # Show authorized user name (and address) and allow logout.
     if ($user) {
         echo("<a href=\"logout.php\" title=\"" .
-          addslashes(__('Disconnect the current user')) .
-          "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>");
+            addslashes(__('Disconnect the current user')) .
+            "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>");
     }
     ?>
 </div> <!-- Footer -->

db.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     $oldJSON = $_REQUEST['json'];
     $oldJSONarr = json_decode($oldJSON, true);
     if ($oldJSONarr != null) {
-        array_walk_recursive($oldJSONarr, function (&$value, $key) {
+        array_walk_recursive($oldJSONarr, function(&$value, $key) {
             if (is_string($value) && preg_match('/^http/', $value)) {
                 $value = rawurlencode($value);
             }
@@ -74,7 +74,7 @@ 
     $database['window'] = $data;
 
     //~ $newJSON = json_encode($database, JSON_PRETTY_PRINT);
-    array_walk_recursive($database, function (&$value, $key) {
+    array_walk_recursive($database, function(&$value, $key) {
         if (is_string($value) && preg_match('/^http/', $value)) {
             $value = rawurlencode($value);
         }

FileHandler.class.php

Spacing +7 added lines, -7 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
@@ -57,7 +57,7 @@ 
         $imageHandler = '/usr/bin/feh --scale-down';
         $webHandler = '/usr/bin/x-www-browser';
         foreach (["/usr/lib/palma", "./scripts"] as $dir) {
-            $palmaBrowser = $dir."/palma-browser";
+            $palmaBrowser = $dir . "/palma-browser";
             if (file_exists($palmaBrowser)) {
                 $webHandler = $palmaBrowser;
                 break;
@@ -69,14 +69,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";
@@ -114,7 +114,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 {