UB-Mannheim / PalMA

SSVNCDaemon.php

Doc Comments +15 added lines

@@ -46,6 +46,9 @@ 
         return $handle;
     }
 
+    /**
+     * @param resource $handle
+     */
     protected function readLog($handle)
     {
         print("\n[Daemon]: +++ readLog() +++");
@@ -116,6 +119,9 @@ 
 
     }
 
+    /**
+     * @param string $buffer
+     */
     protected function parseIP($buffer)
     {
         $ip = "";
@@ -134,6 +140,9 @@ 
         return $ip;
     }
 
+    /**
+     * @param string $buffer
+     */
     protected function parseHostname($buffer)
     {
         $hostname = "";
@@ -152,6 +161,9 @@ 
         return $hostname;
     }
 
+    /**
+     * @param string $line
+     */
     protected function parseExit($line)
     {
         $exit = 0;
@@ -196,6 +208,9 @@ 
 
     }
 
+    /**
+     * @param integer $id
+     */
     protected function sendVncWindowToNuc($id, $vncclient)
     {
         print("\n[Daemon]: +++sendVncWindowToNuc() +++ ");

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"]);
@@ -102,7 +102,7 @@ 
                 }
             }
 
-            $halt=$this->_CONNECTIONS;
+            $halt = $this->_CONNECTIONS;
 
             if ($halt == -1) {
                 exit(0);
@@ -121,13 +121,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");
         }
 
@@ -139,13 +139,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");
         }
 
@@ -159,7 +159,7 @@ 
             $exit = 1;
         }
 
-        if ($exit!=0) {
+        if ($exit != 0) {
             print("\nCLIENT HAS DISCONNECTED " . $exit . "\n");
         }
 
@@ -175,9 +175,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;
@@ -191,7 +191,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));
 
     }
@@ -303,7 +303,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();

DBConnector.class.php

Indentation +1 added lines, -1 removed lines

@@ -387,7 +387,7 @@
     // {AFTER | BEFORE} {DELETE | INSERT | UPDATE } ON table
     //~ $db->exec("CREATE TRIGGER dbchange AFTER UPDATE ON user
                 //~ BEGIN
-                  //~ dbModifiedCallback();
+                    //~ dbModifiedCallback();
                 //~ END");
     //~ $db = new DBConnector('palma.db');
     echo "Tables=" . $db->querySingle('SELECT count(*) FROM sqlite_master WHERE type="table"') . "\n";

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

Switch Indentation +12 added lines, -12 removed lines

@@ -49,18 +49,18 @@
     $f = fopen($targetFile, 'w');
     if ($f) {
         switch ($error) {
-            case UPLOAD_ERR_INI_SIZE:
-                $message = __("This file is too large.");
-                break;
-            case UPLOAD_ERR_FORM_SIZE:
-                $message = __("Large files are not supported.");
-                break;
-            case UPLOAD_ERR_PARTIAL:
-                $message = __("File was only partially uploaded.");
-                break;
-            default:
-                $message = sprintf(__("Error code %s."), $error);
-                break;
+        case UPLOAD_ERR_INI_SIZE:
+            $message = __("This file is too large.");
+            break;
+        case UPLOAD_ERR_FORM_SIZE:
+            $message = __("Large files are not supported.");
+            break;
+        case UPLOAD_ERR_PARTIAL:
+            $message = __("File was only partially uploaded.");
+            break;
+        default:
+            $message = sprintf(__("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\">");

Indentation +9 added lines, -9 removed lines

@@ -81,17 +81,17 @@
     $targetFile = "file:///$targetFile";
 }
 
-  // Get information of application for uploaded file.
-  require_once ('FileHandler.class.php');
-  list ($returnedHandler, $returnedTargetFile) = FileHandler::getFileHandler($targetFile);
-  $handler = $returnedHandler;
-  $targetFile = $returnedTargetFile;
-  trace("file is now $targetFile, its handler is $handler");
+    // Get information of application for uploaded file.
+    require_once ('FileHandler.class.php');
+    list ($returnedHandler, $returnedTargetFile) = FileHandler::getFileHandler($targetFile);
+    $handler = $returnedHandler;
+    $targetFile = $returnedTargetFile;
+    trace("file is now $targetFile, its handler is $handler");
 
-  // create window object and send to nuc
+    // create window object and send to nuc
 
-  $dt = new DateTime();
-  $date = $dt->format('Y-m-d H:i:s');
+    $dt = new DateTime();
+    $date = $dt->format('Y-m-d H:i:s');
 
     $window = array(
         "id" => "",

examples/screensaver/pictureshow.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     if (is_dir($pictures)) {
         $filelist = scandir($pictures);
         sort($filelist, SORT_NATURAL);
-        foreach($filelist as $file) {
+        foreach ($filelist as $file) {
             $picture = "$pictures/$file";
             if (is_file($picture)) {
                 echo("<li style=\"background-image: url('$picture'); background-repeat: no-repeat\"></li>\n");

FileHandler.class.php

Indentation +3 added lines, -3 removed lines

@@ -62,9 +62,9 @@
     function getControls()
     {
         return FileHandler::CURSOR | FileHandler::ZOOM |
-               FileHandler::HOME | FileHandler::END |
-               FileHandler::PRIOR | FileHandler::NEXT |
-               FileHandler::DOWNLOAD;
+                FileHandler::HOME | FileHandler::END |
+                FileHandler::PRIOR | FileHandler::NEXT |
+                FileHandler::DOWNLOAD;
     }
     function show($path)
     {

Doc Comments +3 added lines

@@ -166,6 +166,9 @@
     }
 }
 
+/**
+ * @param string $office
+ */
 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");

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,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
@@ -120,17 +120,17 @@ 
         // $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') {
-            $fhandler=$avHandler;
+            $fhandler = $avHandler;
 
         } else {
             if ($ftype === 'doc' || $ftype === 'docx' || $ftype === 'odt' || $ftype === 'txt') {
@@ -169,7 +169,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 {

i12n.php

Braces +1 added lines, -2 removed lines

@@ -86,8 +86,7 @@
 
     if (locale_emulation()) {
         print "locale '$locale' is not supported on your system, using custom gettext implementation.\n";
-    }
-    else {
+    } else {
         print "locale '$locale' is supported on your system, using native gettext implementation.\n";
     }
 

selectplace/learningcenter.php

Indentation +12 added lines, -12 removed lines

@@ -60,25 +60,25 @@
 </div>
 
 <?php
-     session_start();
-     session_destroy();
+        session_start();
+        session_destroy();
 
-  # TODO: User sessions should be authorized to one display only.
-  # If they select this page, they must not be allowed to select
-  # a new display without being logged out.
+    # TODO: User sessions should be authorized to one display only.
+    # If they select this page, they must not be allowed to select
+    # a new display without being logged out.
 
-  # Show authorized user name and allow logout.
-  $username = false;
-  if (isset($_SESSION['username'])) {
+    # Show authorized user name and allow logout.
+    $username = false;
+    if (isset($_SESSION['username'])) {
     # PHP session based authorization.
     $username = $_SESSION['username'];
-  } elseif (isset($_SERVER["PHP_AUTH_USER"])) {
+    } elseif (isset($_SERVER["PHP_AUTH_USER"])) {
     # .htaccess basic authorization.
     $username = $_SERVER["PHP_AUTH_USER"];
-  }
-  if ($username) {
+    }
+    if ($username) {
     echo("<p>$username <a href=\"logout.php\">abmelden</a></p>");
-  }
+    }
 ?>
 
 </body>

login.php

Braces +1 added lines, -2 removed lines

@@ -145,8 +145,7 @@
        if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
         if (php_sapi_name() == 'cgi') {
          header('Status: 303 See Other');
-         }
-        else {
+         } else {
          header('HTTP/1.1 303 See Other');
          }
         }

Indentation +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
         return $device;
     }
 
-  function checkCredentials($username, $password) {
+    function checkCredentials($username, $password) {
     // Check username + password against fixed internal value and
     // external proxy with authentisation.
 
@@ -104,7 +104,7 @@ 
         $errtext = _('Invalid credentials!');
     }
     return false;
-  }
+    }
 
     $username = '';
     $pin = '';
@@ -113,7 +113,7 @@ 
         $posted_pin = $_REQUEST['pin'];
     }
 
-  if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     session_start();
     $username = escapeshellcmd($_POST['username']);
     $password = '';
@@ -141,20 +141,20 @@ 
         $_SESSION['monitor'] = CONFIG_STATIONNAME;
         $dbcon->addUser($username, $dbcon->ipAddress(), getDevice());
 
-       // Weiterleitung zur geschützten Startseite
-       if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
+        // Weiterleitung zur geschützten Startseite
+        if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
         if (php_sapi_name() == 'cgi') {
-         header('Status: 303 See Other');
-         }
+            header('Status: 303 See Other');
+            }
         else {
-         header('HTTP/1.1 303 See Other');
-         }
+            header('HTTP/1.1 303 See Other');
+            }
         }
 
         header('Location: ' . CONFIG_START_URL);
         exit;
     }
-  }
+    }
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
        "http://www.w3.org/TR/html4/strict.dtd">

control.php

Indentation +2 added lines, -2 removed lines

@@ -348,7 +348,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)) {
@@ -363,7 +363,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 +4 added lines, -4 removed lines

@@ -191,7 +191,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;
@@ -282,7 +282,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 {
@@ -339,7 +339,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();
@@ -402,7 +402,7 @@ 
                 trace("+++ DELETE VNC Client FROM DAEMON +++");
                 // call via daemon: ?window=vncwin&delete=VNC&vncid=123
                 trace("vnc delete in control");
-                $win_id = $_REQUEST['vncid'];   // = hexWindow in database, but not on screen
+                $win_id = $_REQUEST['vncid']; // = hexWindow in database, but not on screen
                 trace("VNC cia Daemon ... id=$win_id");
 
             } elseif (strstr($delete, "http")) {