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

FileHandler.class.php

Indentation +57 added lines, -57 removed lines

@@ -7,37 +7,37 @@ 
 
 abstract class FileHandler
 {
-  // Constants for allowed controls.
-  public const UP = 1;
-  public const DOWN = 2;
-  public const LEFT = 4;
-  public const RIGHT = 8;
-  public const ZOOMIN = 16;
-  public const ZOOMOUT = 32;
-  public const HOME = 64;
-  public const END = 128;
-  public const PRIOR = 256;
-  public const NEXT = 512;
-  public const DOWNLOAD = 1024;
-  public const COUNTERCLOCKWISE = 2048;
-  public const CLOCKWISE = 4096;
-
-  // Shortcuts for combinations of controls.
-  public const CURSOR = 15; // UP | DOWN | LEFT | RIGHT
-  public const ZOOM = 48;   // ZOOMIN | ZOOMOUT
-  public const ALL = 2047;
-
-  // up down left right zoomin zoomout home end prior next download
-
-  // protected $FILES = array();
-  // protected $UPLOAD_PATH;
-
-  abstract protected function getControls(): void;
-  abstract protected function show(string $path): void;
-
-  /** @return array<int,string> */
-  public static function getFileHandler(string $file): array
-  {
+    // Constants for allowed controls.
+    public const UP = 1;
+    public const DOWN = 2;
+    public const LEFT = 4;
+    public const RIGHT = 8;
+    public const ZOOMIN = 16;
+    public const ZOOMOUT = 32;
+    public const HOME = 64;
+    public const END = 128;
+    public const PRIOR = 256;
+    public const NEXT = 512;
+    public const DOWNLOAD = 1024;
+    public const COUNTERCLOCKWISE = 2048;
+    public const CLOCKWISE = 4096;
+
+    // Shortcuts for combinations of controls.
+    public const CURSOR = 15; // UP | DOWN | LEFT | RIGHT
+    public const ZOOM = 48;   // ZOOMIN | ZOOMOUT
+    public const ALL = 2047;
+
+    // up down left right zoomin zoomout home end prior next download
+
+    // protected $FILES = array();
+    // protected $UPLOAD_PATH;
+
+    abstract protected function getControls(): void;
+    abstract protected function show(string $path): void;
+
+    /** @return array<int,string> */
+    public static function getFileHandler(string $file): array
+    {
 
     // Get get directory, name and file extension
     $pathParts = pathinfo($file);
@@ -51,11 +51,11 @@ 
     $imageHandler = '/usr/bin/feh --scale-down';
     $webHandler = '/usr/bin/x-www-browser';
     foreach (["/usr/lib/palma", "./scripts"] as $dir) {
-      $palmaBrowser = $dir . "/palma-browser";
-      if (file_exists($palmaBrowser)) {
+        $palmaBrowser = $dir . "/palma-browser";
+        if (file_exists($palmaBrowser)) {
         $webHandler = $palmaBrowser;
         break;
-      }
+        }
     }
     $avHandler = '/usr/bin/cvlc --no-audio';
     $officeApp = "writer";
@@ -63,33 +63,33 @@ 
     // $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') {
+        if ($ftype === 'doc' || $ftype === 'docx' || $ftype === 'odt' || $ftype === 'txt') {
         $officeApp = "writer";
-      } elseif ($ftype === 'ppt' || $ftype === 'pptx' || $ftype === 'pps' || $ftype === 'ppsx' || $ftype === 'odp') {
+        } elseif ($ftype === 'ppt' || $ftype === 'pptx' || $ftype === 'pps' || $ftype === 'ppsx' || $ftype === 'odp') {
         $officeApp = "impress";
-      } elseif ($ftype === 'xls' || $ftype === 'xlsx' || $ftype === 'ods') {
+        } elseif ($ftype === 'xls' || $ftype === 'xlsx' || $ftype === 'ods') {
         $officeApp = "calc";
-      } elseif (shell_exec("/usr/bin/file -b '$file'") === "ASCII text") {
+        } elseif (shell_exec("/usr/bin/file -b '$file'") === "ASCII text") {
         $officeApp = "writer";
-      }
-      $convertedFile = convertOffice($file, $officeApp, $fdir, $fname);
-      if ($convertedFile) {
+        }
+        $convertedFile = convertOffice($file, $officeApp, $fdir, $fname);
+        if ($convertedFile) {
         $file = $convertedFile;
         $fhandler = $pdfHandler;
-      } else {
+        } else {
         $fhandler = "/usr/bin/libreoffice --'$officeApp' --nologo --norestore -o";
-      }
+        }
     }
 
     /*
@@ -104,20 +104,20 @@ 
      */
 
     return array($fhandler, $file);
-  }
+    }
 }
 
 function convertOffice(string $inputFile, string $office, string $outputDir, string $fileName): mixed
 {
-  $cmd = "/usr/bin/libreoffice --headless" .
-         " --convert-to pdf:'$office'_pdf_Export" .
-         " --outdir '$outputDir'" .
-         " '$inputFile' >/dev/null 2>&1";
-  shell_exec($cmd);
-  $newFile = $outputDir . '/' . $fileName . '.pdf';
-  if (file_exists($newFile)) {
+    $cmd = "/usr/bin/libreoffice --headless" .
+            " --convert-to pdf:'$office'_pdf_Export" .
+            " --outdir '$outputDir'" .
+            " '$inputFile' >/dev/null 2>&1";
+    shell_exec($cmd);
+    $newFile = $outputDir . '/' . $fileName . '.pdf';
+    if (file_exists($newFile)) {
     return $newFile;
-  } else {
+    } else {
     return false;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
   // Shortcuts for combinations of controls.
   public const CURSOR = 15; // UP | DOWN | LEFT | RIGHT
-  public const ZOOM = 48;   // ZOOMIN | ZOOMOUT
+  public const ZOOM = 48; // ZOOMIN | ZOOMOUT
   public const ALL = 2047;
 
   // up down left right zoomin zoomout home end prior next download

db.php

Indentation +41 added lines, -41 removed lines

@@ -19,73 +19,73 @@
 $oldJSON = '';
 
 if (!empty($_REQUEST['json'])) {
-  $oldJSON = $_REQUEST['json'];
-  $oldJSONarr = json_decode($oldJSON, true);
-  if ($oldJSONarr != null) {
+    $oldJSON = $_REQUEST['json'];
+    $oldJSONarr = json_decode($oldJSON, true);
+    if ($oldJSONarr != null) {
     array_walk_recursive($oldJSONarr, function (&$value, $key) {
-      if (is_string($value) && preg_match('/^http/', $value)) {
+        if (is_string($value) && preg_match('/^http/', $value)) {
         $value = rawurlencode($value);
-      }
+        }
     });
     $oldJSON = json_encode($oldJSONarr);
-  }
-  debug("db.php: old $oldJSON");
+    }
+    debug("db.php: old $oldJSON");
 }
 
 for ($t = 0; $t < 300; $t++) {
-  //~ echo("waiting for db change...<br>");
-  //~ $array = ['username' => 'stweil', 'quux' => 'baz'];
-  //~ $newJSON = json_encode($array);
+    //~ echo("waiting for db change...<br>");
+    //~ $array = ['username' => 'stweil', 'quux' => 'baz'];
+    //~ $newJSON = json_encode($array);
 
-  $database = array();
+    $database = array();
 
-  $table = $dbcon->query('select * from setting');
-  $data = array();
-  while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
+    $table = $dbcon->query('select * from setting');
+    $data = array();
+    while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
     array_push($data, $row);
-  }
-  $database['setting'] = $data;
+    }
+    $database['setting'] = $data;
 
-  $table = $dbcon->query('select * from address');
-  $data = array();
-  while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
+    $table = $dbcon->query('select * from address');
+    $data = array();
+    while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
     array_push($data, $row);
     $isAllowed = $isAllowed || ($row['address'] == $remote);
-  }
-  if (!$isAllowed) {
+    }
+    if (!$isAllowed) {
     // Some unauthorized host tried to read the database.
     // Don't return any data.
     break;
-  }
-  $database['address'] = $data;
+    }
+    $database['address'] = $data;
 
-  $table = $dbcon->query('select * from user');
-  $data = array();
-  while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
+    $table = $dbcon->query('select * from user');
+    $data = array();
+    while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
     array_push($data, $row);
-  }
-  $database['user'] = $data;
+    }
+    $database['user'] = $data;
 
-  $table = $dbcon->query('select * from window');
-  $data = array();
-  while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
+    $table = $dbcon->query('select * from window');
+    $data = array();
+    while ($row = $table->fetchArray(SQLITE3_ASSOC)) {
     array_push($data, $row);
-  }
-  $database['window'] = $data;
+    }
+    $database['window'] = $data;
 
-  //~ $newJSON = json_encode($database, JSON_PRETTY_PRINT);
-  array_walk_recursive($database, function (&$value, $key) {
+    //~ $newJSON = json_encode($database, JSON_PRETTY_PRINT);
+    array_walk_recursive($database, function (&$value, $key) {
     if (is_string($value) && preg_match('/^http/', $value)) {
-      $value = rawurlencode($value);
+        $value = rawurlencode($value);
     }
-  });
-  $newJSON = json_encode($database);
-  if ($oldJSON != $newJSON) {
+    });
+    $newJSON = json_encode($database);
+    if ($oldJSON != $newJSON) {
     debug("db.php: new $newJSON");
     break;
-  }
+    }
 
-  sleep(1);
+    sleep(1);
 }
 
 touch("/var/run/palma/last_activity");

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);
     }

logout.php

Indentation +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 
 session_start();
 if (isset($_SESSION['username'])) {
-  $username = $_SESSION['username'];
-  $dbcon->delUser($username, $dbcon->ipAddress());
+    $username = $_SESSION['username'];
+    $dbcon->delUser($username, $dbcon->ipAddress());
 }
 session_destroy();
 header('Location: index.php');

login.php

Indentation +22 added lines, -22 removed lines

@@ -30,31 +30,31 @@ 
 $pin = '';
 $posted_pin = '';
 if (isset($_REQUEST['pin'])) {
-  $posted_pin = escapeshellcmd($_REQUEST['pin']);
+    $posted_pin = escapeshellcmd($_REQUEST['pin']);
 }
 
 monitor("login.php: page loaded");
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-  session_start();
-  $username = escapeshellcmd($_POST['username']);
-  $password = '';
-  if (CONFIG_PASSWORD) {
+    session_start();
+    $username = escapeshellcmd($_POST['username']);
+    $password = '';
+    if (CONFIG_PASSWORD) {
     // The password must not be escaped.
     $password = $_POST['userpassword'];
-  }
-  if (CONFIG_PIN) {
+    }
+    if (CONFIG_PIN) {
     $posted_pin = escapeshellcmd($_POST['pin']);
     $pin = $dbcon->querySingle("SELECT value FROM setting WHERE key = 'pin'");
-  }
+    }
 
-  if (CONFIG_PASSWORD && !checkCredentials($username, $password)) {
+    if (CONFIG_PASSWORD && !checkCredentials($username, $password)) {
     monitor("login.php: access denied for user '$username'");
     // Invalid username or password.
-  } elseif (CONFIG_PIN && ($pin != $posted_pin)) {
+    } elseif (CONFIG_PIN && ($pin != $posted_pin)) {
     monitor("login.php: access denied for user '$username': invalid pin");
     debug("login.php: access denied for user '$username', wrong pin $posted_pin");
     $errtext = addslashes(__('Invalid PIN.'));
-  } else {
+    } else {
     // Successfully checked username, password and PIN.
     monitor("login.php: access granted for user '$username'");
     debug("login.php: access granted for user '$username'");
@@ -67,16 +67,16 @@ 
 
     // Weiterleitung zur geschützten Startseite
     if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
-      if (php_sapi_name() == 'cgi') {
+        if (php_sapi_name() == 'cgi') {
         header('Status: 303 See Other');
-      } else {
+        } else {
         header('HTTP/1.1 303 See Other');
-      }
+        }
     }
     debug('login.php: ' . CONFIG_START_URL);
     header('Location: ' . CONFIG_START_URL);
     exit;
-  }
+    }
 }
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
@@ -123,7 +123,7 @@ 
             </div>
             <?php
             if (CONFIG_PASSWORD) {
-              ?>
+                ?>
               <div class="pure-control-group">
                 <label for="userpassword"><?=addslashes(__("Password"))?></label>
                 <input id="userpassword" name="userpassword" type="password">
@@ -131,7 +131,7 @@ 
               <?php
             }
             if (CONFIG_PIN) {
-              ?>
+                ?>
               <div class="pure-control-group">
                 <label for="pin"><?=addslashes(__("PIN"))?></label>
                 <input id="pin" name="pin" type="text" value="<?=htmlspecialchars($posted_pin)?>">
@@ -150,13 +150,13 @@ 
       </form>
 
       <?php
-      if ($errtext) {
+        if ($errtext) {
         echo("<p>$errtext</p>");
-      }
-      if (defined('CONFIG_POLICY')) {
+        }
+        if (defined('CONFIG_POLICY')) {
         echo('<div class="policy">' . CONFIG_POLICY . '</div>');
-      }
-      ?>
+        }
+        ?>
 
     </div>
 

DBConnector.class.php

Indentation +108 added lines, -108 removed lines

@@ -9,7 +9,7 @@ 
 
 class DBConnector extends \SQLite3
 {
-  private const SQL_CREATE_TABLES = <<< eod
+    private const SQL_CREATE_TABLES = <<< eod
   BEGIN EXCLUSIVE TRANSACTION;
   PRAGMA foreign_keys = ON;
 
@@ -51,7 +51,7 @@ 
   END TRANSACTION;
   eod;
 
-  private const SQL_RESET_TABLES = <<< eod
+    private const SQL_RESET_TABLES = <<< eod
   DROP TABLE address;
   DROP TABLE setting;
   DROP TABLE IF EXISTS settings;
@@ -59,18 +59,18 @@ 
   DROP TABLE window;
   eod;
 
-  private static ?DBConnector $instance = null;
+    private static ?DBConnector $instance = null;
 
-  public static function getInstance(): DBConnector
-  {
+    public static function getInstance(): DBConnector
+    {
     if (is_null(self::$instance)) {
-      self::$instance = new DBConnector('palma.db');
+        self::$instance = new DBConnector('palma.db');
     }
     return self::$instance;
-  }
+    }
 
-  private function __construct(string $filename)
-  {
+    private function __construct(string $filename)
+    {
     parent::__construct($filename);
 
     // Wait up to 10000 ms when the database is locked.
@@ -78,57 +78,57 @@ 
 
     // Create any missing tables.
     $this->exec(self::SQL_CREATE_TABLES);
-  }
+    }
 
-  public function resetTables(): void
-  {
+    public function resetTables(): void
+    {
     $this->exec(self::SQL_RESET_TABLES . self::SQL_CREATE_TABLES);
-  }
+    }
 
-  public function countWindows(): int
-  {
+    public function countWindows(): int
+    {
     $numRows = $this->querySingle('SELECT count(*) FROM window WHERE state="active"');
     return $numRows;
-  }
+    }
 
-  public function nextID(): int
-  {
+    public function nextID(): int
+    {
     // Find the first unused monitor section and return its number.
     $quadrant_ids = array(1, 2, 3, 4);
     $window_db_ids = array();
 
     $window_keys = @$this->query('SELECT DISTINCT(id) FROM window');
     while ($row = $window_keys->fetchArray()) {
-      array_push($window_db_ids, $row['id']);
+        array_push($window_db_ids, $row['id']);
     }
     $window_keys->finalize();
     $next_ids = array_values(array_diff($quadrant_ids, $window_db_ids));
     if (count($next_ids) > 0) {
-      $next = $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;
-  }
+    }
 
-  public function ipAddress(): string
-  {
+    public function ipAddress(): string
+    {
     $ip = 'unknown';
     if (isset($_SERVER['HTTP_X_FORWARED_FOR'])) {
-      // Server is hidden behind a proxy.
-      // Proxy for loopback ip might indicate spoofing
-      if (!in_array($_SERVER['HTTP_X_FORWARED_FOR'], array('127.0.0.1', '::1'))) {
+        // Server is hidden behind a proxy.
+        // Proxy for loopback ip might indicate spoofing
+        if (!in_array($_SERVER['HTTP_X_FORWARED_FOR'], array('127.0.0.1', '::1'))) {
         $ip = $_SERVER['HTTP_X_FORWARED_FOR'];
-      }
+        }
     } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-      // Client has direct access to the server.
-      $ip = $_SERVER['REMOTE_ADDR'];
+        // Client has direct access to the server.
+        $ip = $_SERVER['REMOTE_ADDR'];
     }
     return $ip;
-  }
+    }
 
-  public function checkPermission(): bool
-  {
+    public function checkPermission(): bool
+    {
     // Check whether the remote IP address is allowed to run commands.
     // Only localhost or hosts of registered users are allowed.
     $ip = $this->ipAddress();
@@ -136,15 +136,15 @@ 
     $ip_list = array('127.0.0.1', '::1');
     $rows = $this->query("SELECT address FROM address");
     while ($row = $rows->fetchArray(SQLITE3_ASSOC)) {
-      array_push($ip_list, $row['address']);
+        array_push($ip_list, $row['address']);
     }
     $rows->finalize();
     $allowed = in_array($ip, $ip_list);
     return $allowed;
-  }
+    }
 
-  public function addUser(string $username, string $address, string $device = 'laptop'): void
-  {
+    public function addUser(string $username, string $address, string $device = 'laptop'): void
+    {
     // Add a new user with his/her address and the device to the database.
     $this->exec("INSERT OR IGNORE INTO user VALUES (NULL, '$username', 1, 0)");
     $usercount = intval($this->querySingle("SELECT COUNT(*) FROM user"));
@@ -153,99 +153,99 @@ 
     require_once 'globals.php';
     debug("DBConnector::addUser: user $username connected with $device, $usercount user(s) now connected");
     if ($usercount == 1) {
-      // First user connected. Always enable this person.
-      $this->enableUser($username);
+        // First user connected. Always enable this person.
+        $this->enableUser($username);
+    }
     }
-  }
 
-  public function delUser(string $username, string $address): void
-  {
+    public function delUser(string $username, string $address): void
+    {
     // Remove an existing user with his/her address from the database.
     $ip = $this->ipAddress();
     $userid = $this->querySingle("SELECT userid from user where name='$username'");
     if (!is_null($userid)) {
-      // Kill VNC connection associated with the user
-      $this->deleteVNCWindow($userid);
-      $this->exec("DELETE FROM user WHERE userid = '$userid'");
+        // Kill VNC connection associated with the user
+        $this->deleteVNCWindow($userid);
+        $this->exec("DELETE FROM user WHERE userid = '$userid'");
     }
     $this->exec("DELETE FROM address WHERE userid = '$userid' AND address = '$ip'");
     $usercount = intval($this->querySingle("SELECT COUNT(*) FROM user"));
     require_once 'globals.php';
     debug("DBConnector::delUser: user $username disconnected, $usercount user(s) now connected");
     if ($usercount == 0) {
-      // Last user disconnected.
-      // Clean some tables, just to be sure that nothing is left.
-      $this->exec("DELETE FROM address; DELETE FROM window;");
+        // Last user disconnected.
+        // Clean some tables, just to be sure that nothing is left.
+        $this->exec("DELETE FROM address; DELETE FROM window;");
+    }
     }
-  }
 
-  public function enableUser(string $username): void
-  {
+    public function enableUser(string $username): void
+    {
     $state = $this->exec("UPDATE user SET enabled=1 WHERE name='$username'");
     if (!$state) {
-      require_once 'globals.php';
-      debug("DBConnector::enableUser: failed for $username");
+        require_once 'globals.php';
+        debug("DBConnector::enableUser: failed for $username");
+    }
     }
-  }
 
-  /** @return array<string> */
-  public function getUsers(): array
-  {
+    /** @return array<string> */
+    public function getUsers(): array
+    {
     $users = array();
     $rows = $this->query("SELECT name FROM user");
     while ($row = $rows->fetchArray(SQLITE3_ASSOC)) {
-      array_push($users, $row['name']);
+        array_push($users, $row['name']);
     }
     $rows->finalize();
     return $users;
-  }
+    }
 
-  public function checkUser(string $username): bool
-  {
+    public function checkUser(string $username): bool
+    {
     $users = $this->getUsers();
     // empty db (e.g. after PalMA restart) or old session
     if (count($users) === 0 || !in_array($username, $users)) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
-  /** @return array<array<string>> */
-  public function getWindows(): array
-  {
+    /** @return array<array<string>> */
+    public function getWindows(): array
+    {
     // Get list of all windows, ordered by their section.
     $window_objs = array();
     $windows = @$this->query('SELECT * FROM window ORDER BY section ASC');
     while ($row = $windows->fetchArray()) {
-      array_push($window_objs, $row);
+        array_push($window_objs, $row);
     }
     $windows->finalize();
 
     return $window_objs;
-  }
+    }
 
-  public function getWindowIDBySection(string $section): ?string
-  {
+    public function getWindowIDBySection(string $section): ?string
+    {
     $id = $this->querySingle("SELECT win_id FROM window WHERE section='$section'");
     return $id;
-  }
+    }
 
-  /** @return array<array<string>> */
-  public function getVNCClientInfo(): array
-  {
+    /** @return array<array<string>> */
+    public function getVNCClientInfo(): array
+    {
 
     $info = array();
 
     $i = @$this->query('SELECT * FROM window WHERE handler="vnc"');
     while ($row = $i->fetchArray()) {
-      array_push($info, $row);
+        array_push($info, $row);
     }
     $i->finalize();
 
     return $info;
-  }
+    }
 
-  /*
+    /*
      public function getVNC_ClientWindowIDs() {
      $ids = array();
      $rows = @$this->query('SELECT win_id FROM window WHERE handler="vnc"');
@@ -257,61 +257,61 @@ 
      }
    */
 
-  public function getWindowState(string $window_id): string
-  {
+    public function getWindowState(string $window_id): string
+    {
     $state = @$this->querySingle('SELECT state FROM window WHERE win_id="' . $window_id . '"');
     return $state;
-  }
+    }
 
-  public function setWindowState(string $window_id, string $state): void
-  {
+    public function setWindowState(string $window_id, string $state): void
+    {
     $this->exec('UPDATE window SET state="' . $state . '" WHERE win_id="' . $window_id . '"');
-  }
+    }
 
-  /**
-   * @param array<string> $window
-   */
-  public function insertWindow(array $window): void
-  {
+    /**
+     * @param array<string> $window
+     */
+    public function insertWindow(array $window): void
+    {
     // transfer ob complete window object/array necessary
     $sql = 'INSERT INTO window (id, win_id, section, state, file, handler, userid, date) ' .
-           'VALUES ' . '("' .
-           $window[0] . '", "' . $window[1] . '", "' .
-           $window[2] . '", "' . $window[3] . '", "' .
-           $window[4] . '", "' . $window[5] . '", "' .
-           $window[6] . '", "' . $window[7] . '")';
+            'VALUES ' . '("' .
+            $window[0] . '", "' . $window[1] . '", "' .
+            $window[2] . '", "' . $window[3] . '", "' .
+            $window[4] . '", "' . $window[5] . '", "' .
+            $window[6] . '", "' . $window[7] . '")';
     $new = $this->exec($sql);
     require_once 'globals.php';
     debug("DBConnector::insertWindow: sql=$sql, result=$new");
-  }
+    }
 
-  public function deleteWindow(string $window_id): void
-  {
+    public function deleteWindow(string $window_id): void
+    {
     $this->exec('DELETE FROM window WHERE win_id="' . $window_id . '"');
-  }
+    }
 
-  public function deleteVNCWindow(string $userid): void
-  {
+    public function deleteVNCWindow(string $userid): void
+    {
     $winid = $this->querySingle('SELECT win_id FROM window WHERE handler="vnc" AND userid="' . $userid . '"');
     if (is_null($winid)) {
-      return;
+        return;
     }
     require_once 'globals.php';
     wmClose($winid);
     $this->deleteWindow($winid);
     //$this->exec('DELETE FROM window WHERE handler="vnc" AND userid="'.$userid.'"');
-  }
+    }
 
-  public function deleteDebug(string $table, string $id, string $gt): void
-  {
+    public function deleteDebug(string $table, string $id, string $gt): void
+    {
     $this->exec('DELETE FROM ' . $table . ' WHERE ' . $id . ' >"' . $gt . '"');
-  }
+    }
 
-  public function updateWindow(?string $window_id, string $field, string $value): void
-  {
+    public function updateWindow(?string $window_id, string $field, string $value): void
+    {
     if (is_null($window_id)) {
-      return;
+        return;
     }
     $this->exec('UPDATE window SET ' . $field . '="' . $value . '" WHERE win_id="' . $window_id . '"');
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,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;
   }

globals.php

Indentation +349 added lines, -349 removed lines

@@ -5,19 +5,19 @@ 
 
 function confValue(string $name): ?string
 {
-  // Try setting constants from a configuration file.
-  static $conf = null;
-  if (is_null($conf)) {
+    // Try setting constants from a configuration file.
+    static $conf = null;
+    if (is_null($conf)) {
     $conf_fn = 'palma.ini';
     if (!file_exists($conf_fn)) {
-      $conf_fn = '/etc/palma.ini';
+        $conf_fn = '/etc/palma.ini';
     }
     $conf = parse_ini_file($conf_fn);
-  }
-  if (array_key_exists($name, $conf)) {
+    }
+    if (array_key_exists($name, $conf)) {
     return $conf[$name];
-  }
-  return null;
+    }
+    return null;
 }
 
 // Entries in group 'display'.
@@ -28,14 +28,14 @@ 
 define('CONFIG_PASSWORD', confValue('password') ?? false);
 define('CONFIG_PIN', confValue('pin') ?? true);
 define('CONFIG_STATIONNAME', confValue('stationname') ??
-       str_replace(array("\r", "\n", " "), '', `hostname -f`));
+        str_replace(array("\r", "\n", " "), '', `hostname -f`));
 define('CONFIG_THEME', confValue('theme') ?? 'demo/simple');
 define('CONFIG_BROWSER', confValue('browser'));
 define('CONFIG_DEBUG', confValue('debug') ?? false);
 
 // Entries in group 'path'.
 define('CONFIG_START_URL', confValue('start_url') ??
-       'http://' . str_replace(array("\r", "\n", " "), '', `hostname -f`) . '/');
+        'http://' . str_replace(array("\r", "\n", " "), '', `hostname -f`) . '/');
 define('CONFIG_POLICY', confValue('policy'));
 define('CONFIG_CONTROL_FILE', confValue('control_file') ?? CONFIG_START_URL . 'control.php');
 define('CONFIG_UPLOAD_DIR', confValue('upload_dir') ?? '/tmp/palma');
@@ -46,87 +46,87 @@ 
 
 function getDevice(): string
 {
-  // Try to determine the user's device type. The device which is
-  // returned is used to select the matching icon for the user list.
-  $agent = $_SERVER["HTTP_USER_AGENT"];
-  if (preg_match('/iPad/', $agent)) {
+    // Try to determine the user's device type. The device which is
+    // returned is used to select the matching icon for the user list.
+    $agent = $_SERVER["HTTP_USER_AGENT"];
+    if (preg_match('/iPad/', $agent)) {
     $device = 'tablet';
-  } elseif (preg_match('/iPhone/', $agent)) {
+    } elseif (preg_match('/iPhone/', $agent)) {
     $device = 'mobile';
-  } elseif (preg_match('/Android/', $agent)) {
+    } elseif (preg_match('/Android/', $agent)) {
     $device = 'android';
-  } elseif (preg_match('/Linux/', $agent)) {
+    } elseif (preg_match('/Linux/', $agent)) {
     $device = 'linux';
-  } elseif (preg_match('/OS X/', $agent)) {
+    } elseif (preg_match('/OS X/', $agent)) {
     $device = 'apple';
-  } elseif (preg_match('/Windows/', $agent)) {
+    } elseif (preg_match('/Windows/', $agent)) {
     $device = 'windows';
-  } else {
+    } else {
     $device = 'laptop';
-  }
-  return $device;
+    }
+    return $device;
 }
 
 function checkCredentials(string $username, string $password): bool
 {
-  // Check username + password against fixed internal value and
-  // external proxy with authentisation.
+    // Check username + password against fixed internal value and
+    // external proxy with authentisation.
 
-  global $errtext;
+    global $errtext;
 
-  $remote = $_SERVER['REMOTE_ADDR'];
-  if ($username == 'chef' && $password == 'chef') {
+    $remote = $_SERVER['REMOTE_ADDR'];
+    if ($username == 'chef' && $password == 'chef') {
     if (
         $remote == '::1' || $remote == '127.0.0.1' ||
         preg_match('/^134[.]155[.]36[.]/', $remote) &&
         $remote != '134.155.36.48'
     ) {
-      // Allow test access for restricted remote hosts (localhost,
-      // UB Mannheim library staff, but not via proxy server).
-      // TODO: PalMA installations which are accessible from
-      // the Internet may want to remove this test access.
-      return true;
+        // Allow test access for restricted remote hosts (localhost,
+        // UB Mannheim library staff, but not via proxy server).
+        // TODO: PalMA installations which are accessible from
+        // the Internet may want to remove this test access.
+        return true;
     } else {
-      trace("checkCredentials: Test access not allowed for IP address $remote");
-      return false;
+        trace("checkCredentials: Test access not allowed for IP address $remote");
+        return false;
+    }
     }
-  }
 
-  if ($username == '' || $password == '') {
+    if ($username == '' || $password == '') {
     // Don't allow empty user name or password.
     // Proxy authentisation can fail with empty values.
     trace("checkCredentials: access denied for user '$username'");
     return false;
-  }
-  // TODO: testurl sollte auf einem lokalen Server liegen.
-  $testurl = 'http://www.weilnetz.de/proxytest';
-  $proxy = 'proxy.bib.uni-mannheim.de:3150';
-  $curl = curl_init($testurl);
-  curl_setopt($curl, CURLOPT_HEADER, true);
-  curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-  curl_setopt($curl, CURLOPT_PROXY, $proxy);
-  curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-  curl_setopt($curl, CURLOPT_PROXYUSERPWD, "$username:$password");
-  //~ trace("checkCredentials: Start curl");
-  $out = curl_exec($curl);
-  curl_close($curl);
-
-  if (!$out) {
+    }
+    // TODO: testurl sollte auf einem lokalen Server liegen.
+    $testurl = 'http://www.weilnetz.de/proxytest';
+    $proxy = 'proxy.bib.uni-mannheim.de:3150';
+    $curl = curl_init($testurl);
+    curl_setopt($curl, CURLOPT_HEADER, true);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($curl, CURLOPT_PROXY, $proxy);
+    curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+    curl_setopt($curl, CURLOPT_PROXYUSERPWD, "$username:$password");
+    //~ trace("checkCredentials: Start curl");
+    $out = curl_exec($curl);
+    curl_close($curl);
+
+    if (!$out) {
     trace("checkCredentials: curl failed for user '$username'");
     $errtext = addslashes(__('Invalid credentials!'));
-  } elseif (preg_match('/404 Not Found/', $out)) {
+    } elseif (preg_match('/404 Not Found/', $out)) {
     return true;
-  } elseif (preg_match('/Could not resolve proxy/', $out)) {
+    } elseif (preg_match('/Could not resolve proxy/', $out)) {
     trace('checkCredentials: proxy authentication was not possible');
     $errtext = addslashes(__('Cannot check credentials, sorry!'));
-  } elseif (preg_match('/Cache Access Denied/', $out)) {
+    } elseif (preg_match('/Cache Access Denied/', $out)) {
     trace("checkCredentials: access denied for user '$username'");
     $errtext = addslashes(__('Invalid credentials!'));
-  } else {
+    } else {
     trace("checkCredentials: access not possible for user '$username'");
     $errtext = addslashes(__('Invalid credentials!'));
-  }
-  return false;
+    }
+    return false;
 }
 
 function showLogin(): void
@@ -136,14 +136,14 @@ 
     //}
     $header = 'Location: login.php';
     $separator = '?';
-  if (isset($_REQUEST['lang'])) {
-      $header = $header . $separator . 'lang=' . $_REQUEST['lang'];
-      $separator = '&';
-  }
-  if (isset($_REQUEST['pin'])) {
-      $header = $header . $separator . 'pin=' . $_REQUEST['pin'];
-      $separator = '&';
-  }
+    if (isset($_REQUEST['lang'])) {
+        $header = $header . $separator . 'lang=' . $_REQUEST['lang'];
+        $separator = '&';
+    }
+    if (isset($_REQUEST['pin'])) {
+        $header = $header . $separator . 'pin=' . $_REQUEST['pin'];
+        $separator = '&';
+    }
     header($header);
 
     exit;
@@ -151,95 +151,95 @@ 
 
 function trace(string $text): void
 {
-  static $firstRun = true;
-  if ($firstRun) {
+    static $firstRun = true;
+    if ($firstRun) {
     $firstRun = false;
     openlog("palma", LOG_PID, LOG_USER);
-  }
-  syslog(LOG_NOTICE, $text);
+    }
+    syslog(LOG_NOTICE, $text);
 }
 
 function debug(string $text): void
 {
-  if (CONFIG_DEBUG) {
+    if (CONFIG_DEBUG) {
     trace($text);
-  }
+    }
 }
 
 function monitor(string $action): void
 {
-  if (is_null(CONFIG_MONITOR_URL)) {
+    if (is_null(CONFIG_MONITOR_URL)) {
     return;
-  }
-
-  debug("monitor $action");
-
-  $ch = curl_init();
-  $url = CONFIG_MONITOR_URL;
-
-  curl_setopt_array(
-      $ch,
-      array(
-      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);
+    }
+
+    debug("monitor $action");
+
+    $ch = curl_init();
+    $url = CONFIG_MONITOR_URL;
+
+    curl_setopt_array(
+        $ch,
+        array(
+        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);
 }
 
 function displayCommand(string $cmd): ?string
 {
-  if (is_null(CONFIG_SSH)) {
+    if (is_null(CONFIG_SSH)) {
     $cmd = "DISPLAY=" . CONFIG_DISPLAY . " HOME=/var/www $cmd";
-  } else {
+    } else {
     $cmd = CONFIG_SSH . " 'DISPLAY=" . CONFIG_DISPLAY . " $cmd'";
-  }
+    }
 
-  monitor("control.php: displayCommand $cmd");
+    monitor("control.php: displayCommand $cmd");
 
-  // add directories with palma-browser to PATH
-  $result = shell_exec('PATH=/usr/lib/palma:./scripts:$PATH ' . $cmd);
-  trace("displayCommand: $cmd, result=$result");
-  return $result;
+    // add directories with palma-browser to PATH
+    $result = shell_exec('PATH=/usr/lib/palma:./scripts:$PATH ' . $cmd);
+    trace("displayCommand: $cmd, result=$result");
+    return $result;
 }
 
 function wmClose(string $id): void
 {
-  monitor("control.php: wmClose");
-  // Close window gracefully.
-  displayCommand("wmctrl -i -c $id");
+    monitor("control.php: wmClose");
+    // Close window gracefully.
+    displayCommand("wmctrl -i -c $id");
 }
 
 function wmHide(string $id): void
 {
-  monitor("control.php: wmHide");
-  // Hide window. This is done by moving it to desktop 1.
-  displayCommand("wmctrl -i -r $id -t 1");
+    monitor("control.php: wmHide");
+    // Hide window. This is done by moving it to desktop 1.
+    displayCommand("wmctrl -i -r $id -t 1");
 }
 
 function wmShow(string $id): void
 {
-  monitor("control.php: wmShow");
-  // Show window on current desktop.
-  displayCommand("wmctrl -i -R $id");
+    monitor("control.php: wmShow");
+    // Show window on current desktop.
+    displayCommand("wmctrl -i -R $id");
 }
 
 /** @return array<string> */
 function windowListOnScreen(): array
 {
-  monitor("control.php: windowListOnScreen");
-  $list = array();
-  $windows = explode("\n", displayCommand('wmctrl -l'));
-  foreach ($windows as $w) {
+    monitor("control.php: windowListOnScreen");
+    $list = array();
+    $windows = explode("\n", displayCommand('wmctrl -l'));
+    foreach ($windows as $w) {
     $field = explode(' ', $w);
     $id = $field[0];
     if ($id != '') {
-      array_push($list, $id);
+        array_push($list, $id);
+    }
     }
-  }
-  return $list;
+    return $list;
 }
 
 // simple list with content from database
@@ -247,116 +247,116 @@ 
 /** @return array<string> */
 function windowList(): array
 {
-  monitor("control.php: windowList");
+    monitor("control.php: windowList");
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $list = array();
+    $list = array();
 
-  // Get ordered list of all windows from the database.
-  $windows = $db->getWindows();
-  foreach ($windows as $w) {
+    // Get ordered list of all windows from the database.
+    $windows = $db->getWindows();
+    foreach ($windows as $w) {
     $id = $w['win_id'];
     if ($id != '') {
-      array_push($list, $id);
+        array_push($list, $id);
     }
-  }
-  return $list;
+    }
+    return $list;
 }
 
 function closeAll(): void
 {
-  monitor("control.php: closeAll");
+    monitor("control.php: closeAll");
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $windows_on_screen = windowListOnScreen();
+    $windows_on_screen = windowListOnScreen();
 
-  foreach ($windows_on_screen as $id) {
+    foreach ($windows_on_screen as $id) {
     wmClose($id);
     if ($db->getWindowState($id) != null) {
-      $db->deleteWindow($id);
+        $db->deleteWindow($id);
+    }
     }
-  }
 
-  // Remove any remaining window entries in database.
-  $db->exec('DELETE FROM window');
+    // Remove any remaining window entries in database.
+    $db->exec('DELETE FROM window');
 
-  // Remove any remaining files in the upload directory.
-  clearUploadDir();
+    // Remove any remaining files in the upload directory.
+    clearUploadDir();
 }
 
 function doLogout(string $username): void
 {
-  monitor("control.php: doLogout");
+    monitor("control.php: doLogout");
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  if ($username == 'ALL') {
+    if ($username == 'ALL') {
     // Terminate all user connections and reset system.
     closeAll();
     $db->resetTables();
-  }
+    }
 }
 
 function clearUploadDir(): void
 {
-  monitor("control.php: clearUploadDir");
-  # Remove all files in the upload directory.
-  if (is_dir(CONFIG_UPLOAD_DIR)) {
+    monitor("control.php: clearUploadDir");
+    # Remove all files in the upload directory.
+    if (is_dir(CONFIG_UPLOAD_DIR)) {
     if ($dh = opendir(CONFIG_UPLOAD_DIR)) {
-      while (($file = readdir($dh)) !== false) {
+        while (($file = readdir($dh)) !== false) {
         if ($file != "." and $file != "..") {
-          unlink(CONFIG_UPLOAD_DIR . "/$file");
+            unlink(CONFIG_UPLOAD_DIR . "/$file");
+        }
         }
-      }
-      closedir($dh);
+        closedir($dh);
+    }
     }
-  }
 }
 
 function setLayout(?string $layout = null): void
 {
-  monitor("control.php: setLayout $layout");
-  // Set layout of team display. Layouts are specified by their name.
-  // We use names like g1x1, g2x1, g1x2, ...
-  // Restore the last layout if the function is called with a null argument.
+    monitor("control.php: setLayout $layout");
+    // Set layout of team display. Layouts are specified by their name.
+    // We use names like g1x1, g2x1, g1x2, ...
+    // Restore the last layout if the function is called with a null argument.
 
-  trace("setLayout: $layout");
+    trace("setLayout: $layout");
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $geom = array();
-  $geom['g1x1'] = array(
+    $geom = array();
+    $geom['g1x1'] = array(
     array(0, 0, 1, 1)
-  );
-  $geom['g2x1'] = array(
+    );
+    $geom['g2x1'] = array(
     array(0, 0, 2, 1), array(1, 0, 2, 1)
-  );
-  $geom['g1x2'] = array(
+    );
+    $geom['g1x2'] = array(
     array(0, 0, 1, 2), array(0, 1, 1, 2)
-  );
-  $geom['g1a2'] = array(
+    );
+    $geom['g1a2'] = array(
     array(0, 0, 2, 1), array(1, 0, 2, 2),
     array(1, 1, 2, 2)
-  );
-  $geom['g2x2'] = array(
+    );
+    $geom['g2x2'] = array(
     array(0, 0, 2, 2), array(1, 0, 2, 2),
     array(0, 1, 2, 2), array(1, 1, 2, 2)
-  );
+    );
 
-  if ($layout == null) {
+    if ($layout == null) {
     $layout = $db->querySingle("SELECT value FROM setting WHERE key='layout'");
-  }
+    }
 
-  // Make sure $layout is valid
-  if (!array_key_exists($layout, $geom)) {
+    // Make sure $layout is valid
+    if (!array_key_exists($layout, $geom)) {
     trace("setLayout: layout invalid!");
-  } else {
+    } else {
     $db->exec("UPDATE setting SET value='$layout' WHERE key='layout'");
     $dim = $geom[$layout];
 
@@ -378,10 +378,10 @@ 
     // Get ordered list of all windows from the database.
     $windows = $db->getWindows();
     foreach ($windows as $w) {
-      $id = $w['win_id'];
-      $enabled = $w['state'] == 'active';
-      $section = intval($w['section']);
-      if ($section >= 1 && $section <= $maxSection && $enabled) {
+        $id = $w['win_id'];
+        $enabled = $w['state'] == 'active';
+        $section = intval($w['section']);
+        if ($section >= 1 && $section <= $maxSection && $enabled) {
         // Show window, set size and position.
         $wi = $section - 1;
         $dx = $screenWidth / $dim[$wi][2];
@@ -390,22 +390,22 @@ 
         $y = $dim[$wi][1] * $dy;
         wmShow($id);
         displayCommand("wmctrl -i -r $id -e 0,$x,$y,$dx,$dy");
-      } else {
+        } else {
         // Hide window.
         wmHide($id);
-      }
+        }
+    }
     }
-  }
 }
 
 function activateControls(string $windowhex): void
 {
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $fhandler = $db->querySingle("SELECT handler FROM window WHERE win_id='$windowhex'");
-  trace("activateControls: handler $fhandler");
-  monitor("control.php: activateControls $fhandler");
+    $fhandler = $db->querySingle("SELECT handler FROM window WHERE win_id='$windowhex'");
+    trace("activateControls: handler $fhandler");
+    monitor("control.php: activateControls $fhandler");
 }
 
 /**
@@ -413,22 +413,22 @@ 
  */
 function addNewWindow(array $new): void
 {
-  // Add a new window to the monitor. This window either uses the first
-  // unused section or it will be hidden.
+    // Add a new window to the monitor. This window either uses the first
+    // unused section or it will be hidden.
 
-  monitor('control.php: addNewWindow ' . serialize($new));
-  trace('addNewWindow: ' . serialize($new));
+    monitor('control.php: addNewWindow ' . serialize($new));
+    trace('addNewWindow: ' . serialize($new));
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  // '$new' already contains 'file', 'handler' and 'date', as well as the
-  // username for VNC connections only.
-  // 'win_id', 'section' have to be defined afterwards.
+    // '$new' already contains 'file', 'handler' and 'date', as well as the
+    // username for VNC connections only.
+    // 'win_id', 'section' have to be defined afterwards.
 
-  // Get new window. Wait up to 10 s for it.
-  $t_total = 0;
-  do {
+    // Get new window. Wait up to 10 s for it.
+    $t_total = 0;
+    do {
     $window_ids_on_screen = windowListOnScreen();
     $windows_in_db = $db->getWindows();
 
@@ -436,64 +436,64 @@ 
     $new_window_id = '';
 
     if (count($windows_in_db) > 0) {
-      // Add db windows to existing_ids.
-      foreach ($windows_in_db as $win) {
+        // Add db windows to existing_ids.
+        foreach ($windows_in_db as $win) {
         $existing_ids[] = $win['win_id'];
-      }
+        }
 
-      $new_window = array_diff($window_ids_on_screen, $existing_ids);
-      foreach ($new_window as $win_id) {
+        $new_window = array_diff($window_ids_on_screen, $existing_ids);
+        foreach ($new_window as $win_id) {
         if ($win_id != "") {
-          $new_window_id = $win_id;
+            $new_window_id = $win_id;
+        }
         }
-      }
     } elseif (!empty($window_ids_on_screen)) {
-      $new_window_id = $window_ids_on_screen[0];
+        $new_window_id = $window_ids_on_screen[0];
     }
-  } while (!$new_window_id && $t_total++ <= 10 && !sleep(1));
+    } while (!$new_window_id && $t_total++ <= 10 && !sleep(1));
 
-  if (!$new_window_id) {
+    if (!$new_window_id) {
     trace('addNewWindow: warning: no new window found');
     return;
-  }
+    }
 
-  trace("addNewWindow: new window $new_window_id");
+    trace("addNewWindow: new window $new_window_id");
 
-  // Determine last assigned monitor section.
-  //~ $max_section = $db->querySingle('SELECT MAX(section) FROM window');
+    // Determine last assigned monitor section.
+    //~ $max_section = $db->querySingle('SELECT MAX(section) FROM window');
 
-  // Get first unused monitor section.
-  $section = $db->nextID();
+    // Get first unused monitor section.
+    $section = $db->nextID();
 
-  // If all information is available, create window object.
+    // If all information is available, create window object.
 
-  $new['id'] = $section;
-  $new['section'] = $section;
+    $new['id'] = $section;
+    $new['section'] = $section;
 
-  if ($section <= 4) {
+    if ($section <= 4) {
     $new['state'] = "active";
-  } else {
+    } else {
     // All sections are used, so there is no free one for the new window.
     $new['state'] = "inactive";
     // We could hide the new window immediately, but don't do it here:
     // Each new window will be shown in the middle of the screen.
     //~ wmHide($new_window_id);
     //~ trace("addNewWindow: hide new window $new_window_id");
-  }
+    }
 
-  // $new['file'] = $active_window; (?)
+    // $new['file'] = $active_window; (?)
 
-  // 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'] . '"');
-  if (!empty($queryid)) {
+    // 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'] . '"');
+    if (!empty($queryid)) {
     $userid = $queryid;
-  } else {
+    } else {
     $userid = "all";
-  }
+    }
 
-  $myWindow = array(
+    $myWindow = array(
     $new['id'],
     $new_window_id,
     $new['section'],
@@ -502,12 +502,12 @@ 
     $new['handler'],
     $userid,
     $new['date']
-  );
+    );
 
-  // Save window in database.
-  $db->insertWindow($myWindow);
+    // Save window in database.
+    $db->insertWindow($myWindow);
 
-  setLayout();
+    setLayout();
 }
 
 /**
@@ -515,21 +515,21 @@ 
  */
 function createNewWindowSafe(array $w): void
 {
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $inFile = $w['file'];
-  if (!file_exists($inFile)) {
+    $inFile = $w['file'];
+    if (!file_exists($inFile)) {
     trace("createNewWindowSafe: " . escapeshellarg($inFile) . " is not a file, aborting display");
     return;
-  }
+    }
 
-  require_once 'FileHandler.class.php';
-  list ($handler, $targetFile) =
+    require_once 'FileHandler.class.php';
+    list ($handler, $targetFile) =
     palma\FileHandler::getFileHandler($inFile);
-  trace("createNewWindowSafe: file is now $targetFile, its handler is $handler");
+    trace("createNewWindowSafe: file is now $targetFile, its handler is $handler");
 
-  $window = array(
+    $window = array(
     "id" => "",
     "win_id" => "",
     "name" => "",
@@ -539,7 +539,7 @@ 
     "userid" => "",
     "date" => $w['date']);
 
-  createNewWindow($window);
+    createNewWindow($window);
 }
 
 /**
@@ -547,31 +547,31 @@ 
  */
 function createNewWindow($w): void
 {
-  // '$w' already contains 'file', 'handler' and 'date'.
-  // 'win_id', 'section' have to be defined afterwards.
+    // '$w' already contains 'file', 'handler' and 'date'.
+    // 'win_id', 'section' have to be defined afterwards.
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  $handler = $w['handler'];
-  // TODO: use escapeshellarg() for filename.
-  $filename = $w['file'];
+    $handler = $w['handler'];
+    // TODO: use escapeshellarg() for filename.
+    $filename = $w['file'];
 
-  $cmd = "$handler " . escapeshellarg($filename);
-  displayCommand("/usr/bin/nohup $cmd >/dev/null 2>&1 &");
+    $cmd = "$handler " . escapeshellarg($filename);
+    displayCommand("/usr/bin/nohup $cmd >/dev/null 2>&1 &");
 
-  addNewWindow($w);
-  monitor("control.php: createNewWindow");
+    addNewWindow($w);
+    monitor("control.php: createNewWindow");
 }
 
 function processRequests(): void
 {
-  monitor("control.php: processRequests");
+    monitor("control.php: processRequests");
 
-  require_once 'DBConnector.class.php';
-  $db = palma\DBConnector::getInstance();
+    require_once 'DBConnector.class.php';
+    $db = palma\DBConnector::getInstance();
 
-  if (array_key_exists('window', $_REQUEST)) {
+    if (array_key_exists('window', $_REQUEST)) {
     // All windows related commands must start with window=.
 
     $windownumber = escapeshellcmd($_REQUEST['window']);
@@ -581,79 +581,79 @@ 
     $win_id = 0;
 
     if ($windownumber != 'vncwin') {
-      // This is the normal case.
-      // Special handling is needed when called with window=vncwin, see below.
-      $window = intval($windownumber) - 1;
+        // This is the normal case.
+        // Special handling is needed when called with window=vncwin, see below.
+        $window = intval($windownumber) - 1;
 
-      $win_id = $db->getWindowIDBySection($windownumber);
-      $windowlist = windowList();
+        $win_id = $db->getWindowIDBySection($windownumber);
+        $windowlist = windowList();
 
-      if (count($windowlist) == 0) {
+        if (count($windowlist) == 0) {
         trace("processRequests: no window found for command");
-      } elseif (is_numeric($window) && count($windowlist) <= $window) {
+        } elseif (is_numeric($window) && count($windowlist) <= $window) {
         trace("processRequests: window $window is out of bounds");
-      } elseif (!is_numeric($window)) {
+        } elseif (!is_numeric($window)) {
         trace("processRequests: unhandled window $window");
-      } else {
+        } else {
         trace("processRequests: command window");
         $windowname = $windowlist[$window];
         $windowhex = hexdec($windowname);
-      }
+        }
     }
 
     if ($windowname && array_key_exists('key', $_REQUEST)) {
-      $key = escapeshellcmd($_REQUEST['key']);
-      trace("processRequests: key '$key' in window '$windownumber'");
-      wmShow($windowname);
-      // activateControls($windowhex);
-      // displayCommand("xdotool windowfocus $windowhex key $key");
-
-      // trying mousemove and click for better vnc control
-      displayCommand("xdotool mousemove --window $windowhex 100 100 " .
-                     "key $key");
+        $key = escapeshellcmd($_REQUEST['key']);
+        trace("processRequests: key '$key' in window '$windownumber'");
+        wmShow($windowname);
+        // activateControls($windowhex);
+        // displayCommand("xdotool windowfocus $windowhex key $key");
+
+        // trying mousemove and click for better vnc control
+        displayCommand("xdotool mousemove --window $windowhex 100 100 " .
+                        "key $key");
     }
 
     if ($windowname && array_key_exists('keydown', $_REQUEST)) {
-      // TODO: keydown is currently mapped to key because we had problems
-      // with sticking keys (no keyup seen). This should be fixed by a
-      // better event handling.
-      $key = escapeshellcmd($_REQUEST['keydown']);
-      trace("processRequests: keydown '$key' in window '$windownumber'");
-      wmShow($windowname);
-      // activateControls($windowhex);
-      // displayCommand("xdotool windowfocus $windowhex key $key");
-
-      // trying mousemove and click for better vnc control
-      displayCommand("xdotool mousemove --window $windowhex 100 100 " .
-                     "key $key");
-      //~ displayCommand("xdotool windowfocus $windowhex keydown $key");
+        // TODO: keydown is currently mapped to key because we had problems
+        // with sticking keys (no keyup seen). This should be fixed by a
+        // better event handling.
+        $key = escapeshellcmd($_REQUEST['keydown']);
+        trace("processRequests: keydown '$key' in window '$windownumber'");
+        wmShow($windowname);
+        // activateControls($windowhex);
+        // displayCommand("xdotool windowfocus $windowhex key $key");
+
+        // trying mousemove and click for better vnc control
+        displayCommand("xdotool mousemove --window $windowhex 100 100 " .
+                        "key $key");
+        //~ displayCommand("xdotool windowfocus $windowhex keydown $key");
     }
 
     if ($windowname && array_key_exists('keyup', $_REQUEST)) {
-      // TODO: keyup is currently ignored, see comment above.
-      $key = escapeshellcmd($_REQUEST['keyup']);
-      trace("processRequests: keyup '$key' in window '$windownumber'");
-      // activateControls($windowhex);
-      //~ wmShow($windowname);
-      //~ displayCommand("xdotool windowfocus $windowhex keyup $key");
+        // TODO: keyup is currently ignored, see comment above.
+        $key = escapeshellcmd($_REQUEST['keyup']);
+        trace("processRequests: keyup '$key' in window '$windownumber'");
+        // activateControls($windowhex);
+        //~ wmShow($windowname);
+        //~ displayCommand("xdotool windowfocus $windowhex keyup $key");
     }
 
     if (array_key_exists('delete', $_REQUEST)) {
-      $delete = addslashes($_REQUEST['delete']);
-      trace("processRequests: delete='$delete', close window $windownumber");
+        $delete = addslashes($_REQUEST['delete']);
+        trace("processRequests: delete='$delete', close window $windownumber");
 
-      if ($delete == "VNC") {
+        if ($delete == "VNC") {
         trace("processRequests: delete vnc window");
         // call via daemon: ?window=vncwin&delete=VNC&vncid=123
         $win_id = escapeshellcmd($_REQUEST['vncid']);   // = hexWindow in database, but not on screen
         trace("VNC via Daemon ... id=$win_id");
-      } elseif (strstr($delete, "http")) {
+        } elseif (strstr($delete, "http")) {
         trace("processRequests: delete browser window");
-      } elseif (preg_match('/(^\w{3,}@\w{1,})/', $delete)) {
+        } elseif (preg_match('/(^\w{3,}@\w{1,})/', $delete)) {
         trace("processRequests: delete vnc client from webinterface");
         // call via webinterface
         $win_id = $db->querySingle("SELECT win_id FROM window WHERE file='$delete' AND handler='vnc'");
-      } else {
+        } else {
         // Restrict deletion to files known in the db.
         // TODO: check if given file and section match the values in the DB,
         // but currently, both those values can be ambiguous
@@ -661,67 +661,67 @@ 
         $delete = str_replace(" ", "\ ", $delete);
         trace("processRequests: file in db: $file_in_db");
         if ($file_in_db) {
-          if(file_exists($delete)) {
+            if(file_exists($delete)) {
             trace("processRequests: delete file $delete");
             unlink($delete);
-          }
+            }
         } else {
-          trace("processRequests: given file not present in database!");
+            trace("processRequests: given file not present in database!");
+        }
         }
-      }
-      wmClose($win_id);
-      $db->deleteWindow($win_id);
+        wmClose($win_id);
+        $db->deleteWindow($win_id);
     }
 
     if (array_key_exists('closeOrphans', $_REQUEST)) {
-      // win_ids in db
-      $windows_in_db = $db->getWindows();
-      $db_ids = array();
+        // win_ids in db
+        $windows_in_db = $db->getWindows();
+        $db_ids = array();
 
-      if (count($windows_in_db) > 0) {
+        if (count($windows_in_db) > 0) {
         foreach ($windows_in_db as $win) {
-          array_push($db_ids, $win['win_id']);
+            array_push($db_ids, $win['win_id']);
+        }
         }
-      }
 
-      // win_ids on screen
-      $screen_ids = windowListOnScreen();
+        // win_ids on screen
+        $screen_ids = windowListOnScreen();
 
-      // orphaned windows
-      $orphan_ids = array_diff($screen_ids, $db_ids);
+        // orphaned windows
+        $orphan_ids = array_diff($screen_ids, $db_ids);
 
-      if (count($orphan_ids) > 0) {
+        if (count($orphan_ids) > 0) {
         // close windows on screen not existing in database
         foreach ($orphan_ids as $id) {
-          wmClose($id);
+            wmClose($id);
+        }
         }
-      }
     }
 
     if (array_key_exists('toggle', $_REQUEST)) {
-      // Change window state from visible to invisible and vice versa.
-      $state = $db->getWindowState($win_id);
-      trace("processRequests: toggle window $windownumber, id=$win_id, state=$state");
-      if ($state == "active") {
+        // Change window state from visible to invisible and vice versa.
+        $state = $db->getWindowState($win_id);
+        trace("processRequests: toggle window $windownumber, id=$win_id, state=$state");
+        if ($state == "active") {
         wmHide($win_id);
         $db->setWindowState($win_id, "inactive");
-      } else {
+        } else {
         wmShow($win_id);
         $db->setWindowState($win_id, "active");
-      }
+        }
     }
-  } elseif (array_key_exists('layout', $_REQUEST)) {
+    } elseif (array_key_exists('layout', $_REQUEST)) {
     setLayout(escapeshellcmd($_REQUEST['layout']));
-  } elseif (array_key_exists('logout', $_REQUEST)) {
+    } elseif (array_key_exists('logout', $_REQUEST)) {
     doLogout($_REQUEST['logout']);
-  } elseif (array_key_exists('newVncWindow', $_REQUEST)) {
+    } elseif (array_key_exists('newVncWindow', $_REQUEST)) {
     // TODO: Better write new code for VNC window.
     addNewWindow(unserialize(urldecode($_REQUEST['newVncWindow'])));
-  } elseif (array_key_exists('newWindow', $_REQUEST)) {
+    } elseif (array_key_exists('newWindow', $_REQUEST)) {
     createNewWindowSafe(unserialize(urldecode($_REQUEST['newWindow'])));
-  }
+    }
 
-  if (array_key_exists('switchWindows', $_REQUEST)) {
+    if (array_key_exists('switchWindows', $_REQUEST)) {
     $before = escapeshellcmd($_REQUEST['before']);
     $after = escapeshellcmd($_REQUEST['after']);
     trace("processRequests: switchWindows $before -> $after");
@@ -738,35 +738,35 @@ 
 
     // Update display (no layout change).
     setLayout();
-  }
+    }
 
-  if (array_key_exists('openURL', $_REQUEST)) {
+    if (array_key_exists('openURL', $_REQUEST)) {
     $openURL = escapeshellcmd($_REQUEST['openURL']);
     trace("processRequests: openURL $openURL");
 
     // If URL leads to pdf file, download it and treat as upload
     $headers = get_headers($openURL, PHP_MAJOR_VERSION < 8 ? 1 : true);
     if ($headers["Content-Type"] == "application/pdf") {
-      debug("processRequests: 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");
-      debug("processRequests: mimetype is $mimetype");
-      if ($mimetype == "application/pdf") {
+        debug("processRequests: 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");
+        debug("processRequests: mimetype is $mimetype");
+        if ($mimetype == "application/pdf") {
         $_FILES['file']['name'] = "$temp_name";
         $_FILES['file']['tmp_name'] = "$temp_dir/$temp_name";
         $_FILES['file']['error'] = "downloaded_from_url";
         debug("processRequests: handing over to upload.php");
         include 'upload.php';
-      } else {
+        } else {
         debug("processRequests: deleting file");
         unlink("$temp_dir/$temp_name");
-      }
+        }
     } else {
-      $dt = new DateTime();
-      $date = $dt->format('Y-m-d H:i:s');
-      $window = array(
+        $dt = new DateTime();
+        $date = $dt->format('Y-m-d H:i:s');
+        $window = array(
         "id" => "",
         "win_id" => "",
         "section" => "",
@@ -775,15 +775,15 @@ 
         "handler" => "palma-browser",
         "userid" => "",
         "date" => $date
-      );
-      createNewWindow($window);
+        );
+        createNewWindow($window);
+    }
     }
-  }
 
-  // TODO: check if query redundant?
-  if (array_key_exists('closeAll', $_REQUEST)) {
+    // TODO: check if query redundant?
+    if (array_key_exists('closeAll', $_REQUEST)) {
     $close = $_REQUEST['closeAll'];
     trace("processRequests: closeAll $close");
     closeAll();
-  }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -383,7 +383,7 @@ 
       $section = intval($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;
@@ -583,7 +583,7 @@ 
     if ($windownumber != 'vncwin') {
       // This is the normal case.
       // Special handling is needed when called with window=vncwin, see below.
-      $window = intval($windownumber) - 1;
+      $window = intval($windownumber)-1;
 
       $win_id = $db->getWindowIDBySection($windownumber);
       $windowlist = windowList();
@@ -645,7 +645,7 @@ 
       if ($delete == "VNC") {
         trace("processRequests: delete vnc window");
         // call via daemon: ?window=vncwin&delete=VNC&vncid=123
-        $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("processRequests: delete browser window");
@@ -661,7 +661,7 @@ 
         $delete = str_replace(" ", "\ ", $delete);
         trace("processRequests: file in db: $file_in_db");
         if ($file_in_db) {
-          if(file_exists($delete)) {
+          if (file_exists($delete)) {
             trace("processRequests: delete file $delete");
             unlink($delete);
           }

upload.php

Indentation +46 added lines, -46 removed lines

@@ -7,64 +7,64 @@ 
 require_once 'auth.php';
 
 if (empty($_FILES)) {
-  $error = 99;
-  $filename = 'unknown';
+    $error = 99;
+    $filename = 'unknown';
 } else {
-  $error = $_FILES['file']['error'];
-  $filename = $_FILES['file']['name'];
+    $error = $_FILES['file']['error'];
+    $filename = $_FILES['file']['name'];
 }
 
 if (!is_dir(CONFIG_UPLOAD_DIR)) {
-  /* Target directory is missing, so create it now. */
-  mkdir(CONFIG_UPLOAD_DIR, 0755, true);
+    /* Target directory is missing, so create it now. */
+    mkdir(CONFIG_UPLOAD_DIR, 0755, true);
 }
 
 if ($error == UPLOAD_ERR_OK || $error == "downloaded_from_url") {
-  # All uploaded files are collected in the upload directory.
-  # If necessary, an index is added to get a unique filename.
-  $tempFile = $_FILES['file']['tmp_name'];
-  $targetFile = CONFIG_UPLOAD_DIR . "/$filename";
-  $index = 0;
-  $fparts = pathinfo($filename);
-  $fname = $fparts['filename'];
-  $ftype = null;
-  if (isset($fparts['extension'])) {
+    # All uploaded files are collected in the upload directory.
+    # If necessary, an index is added to get a unique filename.
+    $tempFile = $_FILES['file']['tmp_name'];
+    $targetFile = CONFIG_UPLOAD_DIR . "/$filename";
+    $index = 0;
+    $fparts = pathinfo($filename);
+    $fname = $fparts['filename'];
+    $ftype = null;
+    if (isset($fparts['extension'])) {
     $ftype = $fparts['extension'];
-  }
-  while (file_exists($targetFile)) {
+    }
+    while (file_exists($targetFile)) {
     $index++;
     if ($ftype) {
-      $targetFile = CONFIG_UPLOAD_DIR . "/$fname-$index.$ftype";
+        $targetFile = CONFIG_UPLOAD_DIR . "/$fname-$index.$ftype";
     } else {
-      $targetFile = CONFIG_UPLOAD_DIR . "/$fname-$index";
+        $targetFile = CONFIG_UPLOAD_DIR . "/$fname-$index";
+    }
     }
-  }
-  debug("upload.php: '$tempFile' to '$targetFile'");
-  if (is_uploaded_file($tempFile)) {
+    debug("upload.php: '$tempFile' to '$targetFile'");
+    if (is_uploaded_file($tempFile)) {
     move_uploaded_file($tempFile, $targetFile);
-  } elseif ($error == "downloaded_from_url") {
+    } elseif ($error == "downloaded_from_url") {
     rename($tempFile, $targetFile);
-  } else {
+    } else {
     trace("upload.php: upload failed!");
-  }
+    }
 } else {
-  // Support localisation.
-  require_once 'i12n.php';
+    // Support localisation.
+    require_once 'i12n.php';
 
-  $targetFile = CONFIG_UPLOAD_DIR . "/error.html";
-  $f = fopen($targetFile, 'w');
-  if ($f) {
+    $targetFile = CONFIG_UPLOAD_DIR . "/error.html";
+    $f = fopen($targetFile, 'w');
+    if ($f) {
     switch ($error) {
-      case UPLOAD_ERR_INI_SIZE:
+        case UPLOAD_ERR_INI_SIZE:
         $message = addslashes(__("This file is too large."));
         break;
-      case UPLOAD_ERR_FORM_SIZE:
+        case UPLOAD_ERR_FORM_SIZE:
         $message = addslashes(__("Large files are not supported."));
         break;
-      case UPLOAD_ERR_PARTIAL:
+        case UPLOAD_ERR_PARTIAL:
         $message = addslashes(__("File was only partially uploaded."));
         break;
-      default:
+        default:
         $message = sprintf(addslashes(__("Error code %s.")), $error);
         break;
     }
@@ -87,8 +87,8 @@ 
     fprintf($f, "</body>\n");
     fprintf($f, "</html>\n");
     fclose($f);
-  }
-  $targetFile = "file:///$targetFile";
+    }
+    $targetFile = "file:///$targetFile";
 }
 
 // create window object and send to nuc
@@ -97,13 +97,13 @@ 
 $date = $dt->format('Y-m-d H:i:s');
 
 $window = array(
-  "id" => "",
-  "win_id" => "",
-  "name" => "",
-  "state" => "",
-  "file" => $targetFile,
-  "userid" => "",
-  "date" => $date);
+    "id" => "",
+    "win_id" => "",
+    "name" => "",
+    "state" => "",
+    "file" => $targetFile,
+    "userid" => "",
+    "date" => $date);
 
 //echo "<body onLoad=\"sendToNuc('newWindow=".serialize($window)."')\" /></body>";
 
@@ -114,9 +114,9 @@ 
 $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);

Switch Indentation +12 added lines, -12 removed lines

@@ -55,18 +55,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\">");

examples/screensaver/pictureshow.php

Indentation +3 added lines, -3 removed lines

@@ -92,13 +92,13 @@
 if (is_dir($pictures)) {
     $filelist = scandir($pictures);
     sort($filelist, SORT_NATURAL);
-  foreach ($filelist as $file) {
-      $picture = "$pictures/$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");
         //~ echo("<li><img src=\"$picture\"></li>\n");
     }
-  }
+    }
 } else {
     echo <<<EOD
         <li style="background-image: url('http://www.bib.uni-mannheim.de/typo3temp/pics/b1ad582e53.jpg');"></li>