UB-Mannheim / PalMA

index.php

Indentation +43 added lines, -43 removed lines

@@ -5,10 +5,10 @@ 
 
 session_start();
 if (isset($_REQUEST['monitor'])) {
-  $monitor = $_REQUEST['monitor'];
-  $_SESSION['monitor'] = $monitor;
+    $monitor = $_REQUEST['monitor'];
+    $_SESSION['monitor'] = $monitor;
 } elseif (!isset($_SESSION['monitor'])) {
-  $_SESSION['monitor'] = '???';
+    $_SESSION['monitor'] = '???';
 }
 $_SESSION['referer'] = 'index.php';
 require_once 'auth.php';
@@ -25,13 +25,13 @@ 
 $username = '';
 $address = '';
 if (isset($_SESSION['username'])) {
-  # PHP session based authorization.
-  $username = $_SESSION['username'];
-  $address = $_SESSION['address'];
-  $user = "$username@$address";
+    # PHP session based authorization.
+    $username = $_SESSION['username'];
+    $address = $_SESSION['address'];
+    $user = "$username@$address";
 } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-  # .htaccess basic authorization.
-  $user = $_SERVER['PHP_AUTH_USER'];
+    # .htaccess basic authorization.
+    $user = $_SERVER['PHP_AUTH_USER'];
 }
 
 require_once 'globals.php';
@@ -501,13 +501,13 @@ 
          }
        } else {
          <?php
-          if ($user) {
+            if ($user) {
             ?>
          // All users were disconnected.
          alert("<?=addslashes(__('You were disconnected!'))?>");
          window.location = 'logout.php';
             <?php
-          } else {
+            } else {
             ?>
          // If there is no user, we display an empty entry.
          var tr = document.createElement('tr');
@@ -516,8 +516,8 @@ 
          tr.appendChild(td);
          list.appendChild(tr);
             <?php
-          }
-          ?>
+            }
+            ?>
        }
      }
 
@@ -1190,8 +1190,8 @@ 
           </div>
           <div class="description">
             <?=addslashes(__('Download your screensharing tool'
-                           . ' (Windows, Mac and Linux only).'
-                           . ' Visit the help section for further information.'))?>
+                            . ' (Windows, Mac and Linux only).'
+                            . ' Visit the help section for further information.'))?>
           </div>
         </div>
       </div>
@@ -1285,20 +1285,20 @@ 
         <div id="Help" class="subtabcontent">
           <p>
             <?=addslashes(__('With PalMA, you can share documents, websites'
-                           . ' and your desktop with your learning group.'))?>
+                            . ' and your desktop with your learning group.'))?>
             <?=addslashes(__('The PalMA team monitor shows up to four'
-                           . ' contributions simultaneously.'))?>
+                            . ' contributions simultaneously.'))?>
           </p>
           <?php
-          if (CONFIG_INSTITUTION_URL) { ?>
+            if (CONFIG_INSTITUTION_URL) { ?>
             <p>
               <?=addslashes(__('For further information about PalMA in this'
-                             . ' institution'))?>
+                                . ' institution'))?>
               <a href=<?=CONFIG_INSTITUTION_URL?> target="_blank"><?=__('see here.')?></a>
             </p>
             <?php
-          }
-          ?>
+            }
+            ?>
           <h4><?=addslashes(__('Connect'))?><i class="fa fa-wifi"></i></h4>
           <p>
             <?=addslashes(__('Team members can join the session at any time with this URL or QR-Code:'))?>
@@ -1307,8 +1307,8 @@ 
             <?=$starturl?><br />
             <?php
             if (!empty($pin)) {
-              echo addslashes(__('PIN: '));
-              echo $pin;
+                echo addslashes(__('PIN: '));
+                echo $pin;
             }
             ?>
           </p>
@@ -1360,7 +1360,7 @@ 
           </ul>
           <h4><?=addslashes(__('Control'))?><i class="fa fa-arrows"></i></h4>
           <p><?=addslashes(__('With the grey monitor buttons at the top you'
-             . ' can choose how the shared content should be arranged on the PalMA monitor.'))?></p>
+                . ' can choose how the shared content should be arranged on the PalMA monitor.'))?></p>
           <p><?=addslashes(__('Below that you find the controls for each item:'))?></p>
           <ul>
             <li><?=addslashes(__('In the top bar you can'))?></li>
@@ -1503,8 +1503,8 @@ 
             <div>
               <p>
                 <?=addslashes(__('Please let us know about problems or ideas'
-                               . ' to improve PalMA. Help us directly by'
-                               . ' sending crash reports or contributing on'))?>
+                                . ' to improve PalMA. Help us directly by'
+                                . ' sending crash reports or contributing on'))?>
                 <a href="https://github.com/UB-Mannheim/PalMA" target="_blank">GitHub</a>.
                 <br />
                 <?=__('Thank you!')?>
@@ -1520,17 +1520,17 @@ 
               <i class="fa fa-caret-down"></i></button>
             <div id="languageSelection" class="dropdown-content">
               <?php
-              $dirs = array_slice(scandir('locale'), 2);
-              $langs = [];
-              for ($n = 0; $n < count($dirs); $n++) {
+                $dirs = array_slice(scandir('locale'), 2);
+                $langs = [];
+                for ($n = 0; $n < count($dirs); $n++) {
                 if (is_dir("locale/$dirs[$n]")) {
-                  array_push($langs, substr($dirs[$n], 0, 2));
+                    array_push($langs, substr($dirs[$n], 0, 2));
+                }
                 }
-              }
-              for ($i = 0; $i < count($langs); $i++) {
+                for ($i = 0; $i < count($langs); $i++) {
                 echo "<a href=$_SERVER[PHP_SELF]?lang=$langs[$i]>$langs[$i]</a>";
-              }
-              ?>
+                }
+                ?>
             </div>
           </div>
           <div class="list_container">
@@ -1544,11 +1544,11 @@ 
             <div class="description">
               <?=addslashes(__('New users can join at'))?><br /><?=$starturl?><br />
               <?php
-              if (!empty($pin)) {
+                if (!empty($pin)) {
                 echo addslashes(__('PIN: '));
                 echo $pin;
-              }
-              ?>
+                }
+                ?>
               <img class="qr-code" src="qrcode/php/qr_img.php?d=<?=$starturl?>?pin=<?=$pin?>" alt="QR Code">
             </div>
             <button class="pure-button pure-button-primary pure-input-rounded"
@@ -1563,13 +1563,13 @@ 
 
     <div id="footer">
       <?php
-      # Show authorized user name (and address) and allow logout.
-      if ($user) {
+        # Show authorized user name (and address) and allow logout.
+        if ($user) {
         echo("<a href=\"logout.php\" title=\"" .
-             addslashes(__('Disconnect the current user')) .
-             "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>");
-      }
-      ?>
+                addslashes(__('Disconnect the current user')) .
+                "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>");
+        }
+        ?>
     </div> <!-- Footer -->
 
   </body>

i12n.php

Indentation +39 added lines, -39 removed lines

@@ -8,80 +8,80 @@
 // The default translations are in locale/en_US.UTF-8/LC_MESSAGES/palma.mo.
 $locale = '';
 if (isset($_REQUEST['lang'])) {
-  // User requested language by URL parameter.
-  $locale = $_REQUEST['lang'];
-  $_SESSION['lang'] = $locale;
+    // User requested language by URL parameter.
+    $locale = $_REQUEST['lang'];
+    $_SESSION['lang'] = $locale;
 } elseif (isset($_SESSION['lang'])) {
-  // Get language from session data.
-  $locale = $_SESSION['lang'];
+    // Get language from session data.
+    $locale = $_SESSION['lang'];
 } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-  // Get language from browser settings.
-  $locale = Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+    // Get language from browser settings.
+    $locale = Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
 }
 switch (substr($locale, 0, 2)) {
-  case 'al':
+    case 'al':
       // Albanian.
       $locale = 'sq_AL.UTF-8';
-      break;
-  case 'ar':
+        break;
+    case 'ar':
       // Arabic.
       $locale = 'ar.UTF-8';
-      break;
-  case 'de':
+        break;
+    case 'de':
       // German.
       $locale = 'de_DE.UTF-8';
-      break;
-  case 'el':
+        break;
+    case 'el':
       // Greek.
       $locale = 'el_GR.UTF-8';
-      break;
-  case 'en':
+        break;
+    case 'en':
       // English.
       $locale = 'en_US.UTF-8';
-      break;
-  case 'es':
+        break;
+    case 'es':
       // Spanish.
       $locale = 'es_ES.UTF-8';
-      break;
-  case 'fr':
+        break;
+    case 'fr':
       // French.
       $locale = 'fr_FR.UTF-8';
-      break;
-  case 'hi':
+        break;
+    case 'hi':
       // Hindi.
       $locale = 'hi_IN.UTF-8';
-      break;
-  case 'it':
+        break;
+    case 'it':
       // Italian.
       $locale = 'it_IT.UTF-8';
-      break;
-  case 'ja':
+        break;
+    case 'ja':
       // Japanese.
       $locale = 'ja.UTF-8';
-      break;
-  case 'kg':
+        break;
+    case 'kg':
       // Kyrgyz.
       $locale = 'kg_KG.UTF-8';
-      break;
-  case 'lv':
+        break;
+    case 'lv':
       // Latvian.
       $locale = 'lv_LV.UTF-8';
-      break;
-  case 'ru':
+        break;
+    case 'ru':
       // Russian.
       $locale = 'ru_RU.UTF-8';
-      break;
-  case 'ur':
+        break;
+    case 'ur':
       // Urdu.
       $locale = 'ur_PK.UTF-8';
-      break;
-  case 'zh':
+        break;
+    case 'zh':
       // Chinese.
       $locale = 'zh_CN.UTF-8';
-      break;
-  default:
+        break;
+    default:
       $locale = 'en_US.UTF-8';
-      break;
+        break;
 }
 
 //~ error_log("setlocale $locale");

SSVNCDaemon.class.php

Indentation +124 added lines, -124 removed lines

@@ -7,25 +7,25 @@ 
 
 class SSVNCDaemon
 {
-  // all during session connected VNC Clients
-  /** @var array<array<string>> */
-  private array $VNC_CLIENTS = array();
+    // all during session connected VNC Clients
+    /** @var array<array<string>> */
+    private array $VNC_CLIENTS = array();
 
-  // count of all connected clients
-  // private $_VNC_CLIENT_COUNT;
+    // count of all connected clients
+    // private $_VNC_CLIENT_COUNT;
 
-  // active client count
-  private int $CONNECTIONS = 0;
+    // active client count
+    private int $CONNECTIONS = 0;
 
-  // ignored VNC Clients
-  // TODO: check if no more longer helpful, has to be cleaned
-  ///** @var array<string> */
-  //private array $IGNORE_LIST = array();
+    // ignored VNC Clients
+    // TODO: check if no more longer helpful, has to be cleaned
+    ///** @var array<string> */
+    //private array $IGNORE_LIST = array();
 
-  public DBConnector $db;
+    public DBConnector $db;
 
-  public function __construct()
-  {
+    public function __construct()
+    {
     require_once 'DBConnector.class.php';
     $this->db = DBConnector::getInstance();
 
@@ -34,156 +34,156 @@ 
 
     // Read log in loop
     $this->readLog($handle);
-  }
+    }
 
-  protected function start(): mixed
-  {
+    protected function start(): mixed
+    {
     // Startup ssvncviewer in multilisten mode
     require_once 'globals.php';
     $cmd = "export DISPLAY=" . CONFIG_DISPLAY .
-           "; killall -q ssvncviewer; ssvncviewer -viewonly -multilisten 0 2>&1";
+            "; killall -q ssvncviewer; ssvncviewer -viewonly -multilisten 0 2>&1";
     $handle = popen($cmd, 'r');
     trace("SSVNCDaemon::start: vnc_viewer started");
 
     return $handle;
-  }
+    }
 
-  protected function readLog(mixed $handle): void
-  {
+    protected function readLog(mixed $handle): void
+    {
     require_once 'globals.php';
     trace("SSVNCDaemon::readLog()");
 
     // local SSVNC client info
     $client = array(
-      "ip" => "",
-      "hostname" => "",
-      "active" => 1,
-      "exit" => 0
+        "ip" => "",
+        "hostname" => "",
+        "active" => 1,
+        "exit" => 0
     );
 
     // Read File continuously
     while (!feof($handle)) {
-      $buffer = fgets($handle);
+        $buffer = fgets($handle);
 
-      if ($this->CONNECTIONS == 0) {
+        if ($this->CONNECTIONS == 0) {
         //debug("SSVNCDaemon::readLog: WAITING FOR NEW CONNECTIONS");
-      }
+        }
 
-      $ip = $this->parseIP($buffer);
-      $hostname = $this->parseHostname($buffer);
-      $exit = $this->parseExit($buffer);
+        $ip = $this->parseIP($buffer);
+        $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"] != "" &&
+        if (
+            strstr($buffer, 'create_image') && $client["ip"] != "" &&
           $client["hostname"] != ""
-      ) {
+        ) {
         // add client
         if ($client["hostname"] == "unknown") {
-          $client["hostname"] = $client["ip"];
+            $client["hostname"] = $client["ip"];
         }
         $this->addClient($client["ip"], $client["hostname"]);
 
         // reset local Client information after adding it
         $client["ip"] = "";
         $client["hostname"] = "";
-      }
+        }
 
-      if ($exit == 1) {
+        if ($exit == 1) {
         // decrease active client count
         if ($this->CONNECTIONS > 0) {
-          $this->CONNECTIONS--;
-          $this->deleteInactiveVncWindow();
+            $this->CONNECTIONS--;
+            $this->deleteInactiveVncWindow();
+        }
         }
-      }
 
-      $halt = $this->CONNECTIONS;
+        $halt = $this->CONNECTIONS;
 
-      if ($halt == -1) {
+        if ($halt == -1) {
         exit(0);
-      }
+        }
 
-      flush();
+        flush();
     }
 
     pclose($handle);
-  }
+    }
 
-  protected function parseIP(string $buffer): string
-  {
+    protected function parseIP(string $buffer): string
+    {
     require_once 'globals.php';
     $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 != "") {
-      debug("SSVNCDaemon::parseIP(): " . $ip);
+        debug("SSVNCDaemon::parseIP(): " . $ip);
     }
 
     return $ip;
-  }
+    }
 
-  protected function parseHostname(string $buffer): string
-  {
+    protected function parseHostname(string $buffer): string
+    {
     require_once 'globals.php';
     $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 != "") {
-      debug("SSVNCDaemon::parseHostname(): " . $hostname);
+        debug("SSVNCDaemon::parseHostname(): " . $hostname);
     }
 
     return $hostname;
-  }
+    }
 
-  protected function parseExit(string $line): int
-  {
+    protected function parseExit(string $line): int
+    {
     require_once 'globals.php';
     $exit = 0;
     if (strpos($line, "VNC Viewer exiting")) {
-      $exit = 1;
+        $exit = 1;
     }
 
     if ($exit != 0) {
-      debug("SSVNCDaemon::parseExit: exit code " . $exit);
+        debug("SSVNCDaemon::parseExit: exit code " . $exit);
     }
 
     return $exit;
-  }
+    }
 
-  protected function addClient(string $ip, string $hostname): void
-  {
+    protected function addClient(string $ip, string $hostname): void
+    {
     require_once 'globals.php';
     $vncclient = array(
-      "ip" => $ip,
-      "hostname" => $hostname,
-      "active" => 1,
-      "exit" => 0
+        "ip" => $ip,
+        "hostname" => $hostname,
+        "active" => 1,
+        "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;
@@ -196,13 +196,13 @@ 
     $this->sendVncWindowToNuc($id, $vncclient);
 
     $this->CONNECTIONS++;
-  }
+    }
 
-  /**
-   * @param array<string,string> $vncclient
-   */
-  protected function sendVncWindowToNuc(int $id, array $vncclient): void
-  {
+    /**
+     * @param array<string,string> $vncclient
+     */
+    protected function sendVncWindowToNuc(int $id, array $vncclient): void
+    {
     require_once 'globals.php';
     debug("SSVNCDaemon::sendVncWindowToNuc()");
 
@@ -213,7 +213,7 @@ 
     $client_info = $this->db->getVNCClientInfo();
 
     foreach ($client_info as $info) {
-      $clients_in_db[] = $info["file"];
+        $clients_in_db[] = $info["file"];
     }
 
     $ip = $vncclient["ip"];
@@ -234,12 +234,12 @@ 
 
     // if vnc_id not in database create window and send to nuc
     if (!(in_array($vnc_id, $clients_in_db))) {
-      // print("\n[Daemon]: insert $vnc_id into db");
+        // print("\n[Daemon]: insert $vnc_id into db");
 
-      $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(
+        $window = array(
         "id" => "",
         "win_id" => "",
         "name" => "",
@@ -248,33 +248,33 @@ 
         "handler" => "vnc",
         "userid" => $name,
         "date" => $date
-      );
+        );
 
-      $serializedWindow = serialize($window);
+        $serializedWindow = serialize($window);
 
-      require_once 'globals.php';
+        require_once 'globals.php';
 
-      $sw = urlencode($serializedWindow);
-      // Get cURL resource
-      $curl = curl_init();
-      // Set some options - we are passing in a useragent too here
-      curl_setopt_array($curl, array(
+        $sw = urlencode($serializedWindow);
+        // Get cURL resource
+        $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 . '?newVncWindow=' . $sw,
         CURLOPT_USERAGENT => 'PalMA cURL Request'
-      ));
-      // Send the request
-      curl_exec($curl);
-      // Close request to clear up some resources
-      curl_close($curl);
+        ));
+        // Send the request
+        curl_exec($curl);
+        // Close request to clear up some resources
+        curl_close($curl);
     }
 
     // add unique id to ignore list after sending to nuc
     //array_push($this->IGNORE_LIST, $vnc_id);
-  }
+    }
 
-  protected function deleteInactiveVncWindow(): void
-  {
+    protected function deleteInactiveVncWindow(): void
+    {
     require_once 'globals.php';
     debug('SSVNCDaemon::deleteInactiveVncWindow()');
 
@@ -282,7 +282,7 @@ 
     $vnc_windows_in_db = array();
     $client_info = $this->db->getVNCClientInfo();
     foreach ($client_info as $info) {
-      $vnc_windows_in_db[] = $info["win_id"];
+        $vnc_windows_in_db[] = $info["win_id"];
     }
 
     // window_ids on screen
@@ -290,11 +290,11 @@ 
     $windows = explode("\n", shell_exec('wmctrl -l'));
 
     foreach ($windows as $w) {
-      $field = explode(' ', $w);
-      $id = $field[0];
-      if ($id != '') {
+        $field = explode(' ', $w);
+        $id = $field[0];
+        if ($id != '') {
         $windows_on_screen[] = $id;
-      }
+        }
     }
 
     debug("  clients in db = " . serialize($vnc_windows_in_db));
@@ -304,24 +304,24 @@ 
     $inactive_vnc_window_ids = array_diff($vnc_windows_in_db, $windows_on_screen);
 
     foreach ($inactive_vnc_window_ids as $inactive_win_id) {
-      // define vnc-id
-      $inactive_vnc_id = $this->db->querySingle("SELECT file FROM window WHERE win_id='" . $inactive_win_id . "'");
+        // define vnc-id
+        $inactive_vnc_id = $this->db->querySingle("SELECT file FROM window WHERE win_id='" . $inactive_win_id . "'");
 
-      // delete from database (send to control.php)
-      $curl = curl_init();
+        // delete from database (send to control.php)
+        $curl = curl_init();
 
-      require_once 'globals.php';
-      curl_setopt_array($curl, array(
+        require_once 'globals.php';
+        curl_setopt_array($curl, array(
         CURLOPT_RETURNTRANSFER => 1,
         CURLOPT_URL => CONFIG_CONTROL_FILE .
-                     '?window=vncwin&delete=VNC&vncid=' . $inactive_win_id,
+                        '?window=vncwin&delete=VNC&vncid=' . $inactive_win_id,
         CURLOPT_USERAGENT => 'PalMA cURL Request'
-      ));
+        ));
 
-      curl_exec($curl);
-      curl_close($curl);
+        curl_exec($curl);
+        curl_close($curl);
 
-      // debug(" inactive vnc_id = $inactive_vnc_id >> add to list: " .serialize($this->IGNORE_LIST));
+        // debug(" inactive vnc_id = $inactive_vnc_id >> add to list: " .serialize($this->IGNORE_LIST));
+    }
     }
-  }
 }

Spacing +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
     if (count($this->VNC_CLIENTS) == 0) {
       $id = 1;
     } else {
-      $id = count($this->VNC_CLIENTS) + 1;
+      $id = count($this->VNC_CLIENTS)+1;
     }
 
     $this->VNC_CLIENTS[$id] = $vncclient;
@@ -191,7 +191,7 @@ 
     debug("SSVNCDaemon::addClient: CLIENT OBJECT with ID " . $id . " CREATED : "
         . $vncclient["ip"] . " | " . $vncclient["hostname"] . " | "
         . $vncclient["active"] . " | " . $vncclient["exit"]);
-    debug("SSVNCDaemon::addClient: " . ($this->CONNECTIONS + 1) . " CLIENT(S) CONNECTED ...");
+    debug("SSVNCDaemon::addClient: " . ($this->CONNECTIONS+1) . " CLIENT(S) CONNECTED ...");
 
     $this->sendVncWindowToNuc($id, $vncclient);