UB-Mannheim / PalMA

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 . '"');
     }
 }
 

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 {

control.php

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 +++");

SSVNCDaemon.php

Spacing +20 added lines, -20 removed lines

@@ -72,18 +72,18 @@ 
             $hostname = $this->parseHostname($buffer);
             $exit = $this->parseExit($buffer);
 
-            if ($ip!="") {
+            if ($ip != "") {
                 $client["ip"] = $ip;
             }
-            if ($hostname!="") {
+            if ($hostname != "") {
                 $client["hostname"] = $hostname;
             }
-            if ($exit!=0) {
+            if ($exit != 0) {
                 $client["exit"] = $exit;
             }
 
             if (strstr($buffer, 'create_image') && $client["ip"] != "" &&
-            $client["hostname"]!="") {
+            $client["hostname"] != "") {
                 // add client
                 $this->addClient($client["ip"], $client["hostname"]);
 
@@ -100,7 +100,7 @@ 
                 }
             }
 
-            $halt=$this->CONNECTIONS;
+            $halt = $this->CONNECTIONS;
 
             if ($halt == -1) {
                 exit(0);
@@ -117,13 +117,13 @@ 
         $ip = "";
         $line = $buffer;
         if (strpos($line, "Reverse VNC connection from IP")) {
-            $line=trim($line);
-            $item=explode(":", $line);
-            $ip=trim($item[1]);
-            $ip=preg_replace('/\W\W\d{4}\/\d{2}\/\d{2} \d{2}/', '', $ip);
+            $line = trim($line);
+            $item = explode(":", $line);
+            $ip = trim($item[1]);
+            $ip = preg_replace('/\W\W\d{4}\/\d{2}\/\d{2} \d{2}/', '', $ip);
         }
 
-        if ($ip!="") {
+        if ($ip != "") {
             print("\nFOUND IP: " . $ip . "\n");
         }
 
@@ -135,13 +135,13 @@ 
         $hostname = "";
         $line = $buffer;
         if (strpos($line, "Hostname")) {
-            $line=trim($line);
-            $item=explode(":", $line);
-            $hostname=trim($item[1]);
-            $hostname=preg_replace('/\.uni\-mannheim\.de/', '', $hostname);
+            $line = trim($line);
+            $item = explode(":", $line);
+            $hostname = trim($item[1]);
+            $hostname = preg_replace('/\.uni\-mannheim\.de/', '', $hostname);
         }
 
-        if ($hostname!="") {
+        if ($hostname != "") {
             print("\nFOUND HOSTNAME: " . $hostname . "\n");
         }
 
@@ -155,7 +155,7 @@ 
             $exit = 1;
         }
 
-        if ($exit!=0) {
+        if ($exit != 0) {
             print("\nCLIENT HAS DISCONNECTED " . $exit . "\n");
         }
 
@@ -171,9 +171,9 @@ 
                         "exit" => 0
                         );
         if (count($this->VNC_CLIENTS) == 0) {
-            $id=1;
+            $id = 1;
         } else {
-            $id=count($this->VNC_CLIENTS) + 1;
+            $id = count($this->VNC_CLIENTS)+1;
         }
 
         $this->VNC_CLIENTS[$id] = $vncclient;
@@ -187,7 +187,7 @@ 
 
         $this->CONNECTIONS++;
 
-        print("\n active connections: ".$this->CONNECTIONS+1);
+        print("\n active connections: " . $this->CONNECTIONS+1);
         print("\n all saved clients: " . serialize($this->VNC_CLIENTS));
     }
 
@@ -295,7 +295,7 @@ 
 
         foreach ($inactive_vnc_window_ids as $inactive_win_id) {
             // define vnc-id
-            $inactive_vnc_id = $db->querySingle("SELECT file FROM window WHERE win_id='".$inactive_win_id."'");
+            $inactive_vnc_id = $db->querySingle("SELECT file FROM window WHERE win_id='" . $inactive_win_id . "'");
 
             // delete from database (send to control.php)
             $curl = curl_init();