@@ -23,7 +23,7 @@ |
||
| 23 | 23 | // file exists: return file for download |
| 24 | 24 | header('Content-Type: application/octet-stream'); |
| 25 | 25 | header('Content-Disposition: attachment; filename="' . |
| 26 | - addslashes($filename) . '"'); |
|
| 26 | + addslashes($filename) . '"'); |
|
| 27 | 27 | readfile($filepath); |
| 28 | 28 | } else { |
| 29 | 29 | // file does not exist: 404 Not Found |
@@ -111,10 +111,10 @@ |
||
| 111 | 111 | $curl = curl_init(); |
| 112 | 112 | // Set some options - we are passing in a useragent too here |
| 113 | 113 | curl_setopt_array($curl, array( |
| 114 | - CURLOPT_RETURNTRANSFER => 1, |
|
| 115 | - CURLOPT_URL => CONFIG_CONTROL_FILE . '?newWindow=' . $sw, |
|
| 116 | - CURLOPT_USERAGENT => 'PalMA cURL Request' |
|
| 117 | - )); |
|
| 114 | + CURLOPT_RETURNTRANSFER => 1, |
|
| 115 | + CURLOPT_URL => CONFIG_CONTROL_FILE . '?newWindow=' . $sw, |
|
| 116 | + CURLOPT_USERAGENT => 'PalMA cURL Request' |
|
| 117 | + )); |
|
| 118 | 118 | // Send the request & save response to $resp |
| 119 | 119 | $resp = curl_exec($curl); |
| 120 | 120 | // Close request to clear up some resources |
@@ -1392,11 +1392,11 @@ |
||
| 1392 | 1392 | |
| 1393 | 1393 | <div id="footer"> |
| 1394 | 1394 | <?php |
| 1395 | - # Show authorized user name (and address) and allow logout. |
|
| 1395 | + # Show authorized user name (and address) and allow logout. |
|
| 1396 | 1396 | if ($user) { |
| 1397 | 1397 | echo("<a href=\"logout.php\" title=\"" . |
| 1398 | - __('Disconnect the current user') . |
|
| 1399 | - "\">" . __('Log out') . "<i class=\"fa fa-sign-out\"></i></a>"); |
|
| 1398 | + __('Disconnect the current user') . |
|
| 1399 | + "\">" . __('Log out') . "<i class=\"fa fa-sign-out\"></i></a>"); |
|
| 1400 | 1400 | } |
| 1401 | 1401 | ?> |
| 1402 | 1402 | </div> <!-- Footer --> |
@@ -12,21 +12,21 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | function monitor($action) |
| 14 | 14 | { |
| 15 | - if (!defined('CONFIG_MONITOR_URL')) { |
|
| 15 | + if (!defined('CONFIG_MONITOR_URL')) { |
|
| 16 | 16 | //trace('CONFIG_MONITOR_URL is undefined'); |
| 17 | 17 | return; |
| 18 | - } |
|
| 19 | - //trace("monitor $action"); |
|
| 20 | - $ch = curl_init(); |
|
| 21 | - $url = CONFIG_MONITOR_URL; |
|
| 18 | + } |
|
| 19 | + //trace("monitor $action"); |
|
| 20 | + $ch = curl_init(); |
|
| 21 | + $url = CONFIG_MONITOR_URL; |
|
| 22 | 22 | |
| 23 | - curl_setopt_array($ch, array( |
|
| 23 | + curl_setopt_array($ch, array( |
|
| 24 | 24 | CURLOPT_RETURNTRANSFER => 1, |
| 25 | 25 | CURLOPT_URL => CONFIG_MONITOR_URL . '/' . CONFIG_STATIONNAME . '/' . base64_encode($action), |
| 26 | 26 | CURLOPT_USERAGENT => 'PalMA cURL Request' |
| 27 | - )); |
|
| 28 | - $resp = curl_exec($ch); |
|
| 29 | - curl_close($ch); |
|
| 27 | + )); |
|
| 28 | + $resp = curl_exec($ch); |
|
| 29 | + curl_close($ch); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | function set_constants() |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | define('CONFIG_STATIONNAME', $conf['stationname']); |
| 66 | 66 | } else { |
| 67 | 67 | define('CONFIG_STATIONNAME', |
| 68 | - str_replace(array("\r", "\n", " "), '', `hostname -f`)); |
|
| 68 | + str_replace(array("\r", "\n", " "), '', `hostname -f`)); |
|
| 69 | 69 | } |
| 70 | 70 | if (array_key_exists('theme', $conf)) { |
| 71 | 71 | define('CONFIG_THEME', $conf['theme']); |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | define('CONFIG_START_URL', $conf['start_url']); |
| 79 | 79 | } else { |
| 80 | 80 | // By default we use the FQDN of the host |
| 81 | - define('CONFIG_START_URL', |
|
| 82 | - 'http://' . str_replace(array("\r", "\n", " "), '', `hostname -f`) . '/'); |
|
| 81 | + define('CONFIG_START_URL', |
|
| 82 | + 'http://' . str_replace(array("\r", "\n", " "), '', `hostname -f`) . '/'); |
|
| 83 | 83 | } |
| 84 | 84 | if (array_key_exists('control_file', $conf)) { |
| 85 | 85 | define('CONFIG_CONTROL_FILE', $conf['control_file']); |
@@ -329,18 +329,18 @@ discard block |
||
| 329 | 329 | |
| 330 | 330 | require_once('FileHandler.class.php'); |
| 331 | 331 | list ($handler, $targetFile) = |
| 332 | - palma\FileHandler::getFileHandler($inFile); |
|
| 332 | + palma\FileHandler::getFileHandler($inFile); |
|
| 333 | 333 | trace("file is now $targetFile, its handler is $handler"); |
| 334 | 334 | |
| 335 | 335 | $window = array( |
| 336 | - "id" => "", |
|
| 337 | - "win_id" => "", |
|
| 338 | - "name" => "", |
|
| 339 | - "state" => "", |
|
| 340 | - "file" => $targetFile, |
|
| 341 | - "handler" => $handler, |
|
| 342 | - "userid" => "", |
|
| 343 | - "date" => $w['date']); |
|
| 336 | + "id" => "", |
|
| 337 | + "win_id" => "", |
|
| 338 | + "name" => "", |
|
| 339 | + "state" => "", |
|
| 340 | + "file" => $targetFile, |
|
| 341 | + "handler" => $handler, |
|
| 342 | + "userid" => "", |
|
| 343 | + "date" => $w['date']); |
|
| 344 | 344 | |
| 345 | 345 | createNewWindow($db, $window); |
| 346 | 346 | } |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | |
| 401 | 401 | // trying mousemove and click for better vnc control |
| 402 | 402 | displayCommand("xdotool mousemove --window $windowhex 100 100 " . |
| 403 | - "key $key"); |
|
| 403 | + "key $key"); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | if ($windowname && array_key_exists('keydown', $_REQUEST)) { |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | |
| 416 | 416 | // trying mousemove and click for better vnc control |
| 417 | 417 | displayCommand("xdotool mousemove --window $windowhex 100 100 " . |
| 418 | - "key $key"); |
|
| 418 | + "key $key"); |
|
| 419 | 419 | //~ displayCommand("xdotool windowfocus $windowhex keydown $key"); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | $_SESSION['monitor'] = CONFIG_STATIONNAME; |
| 149 | 149 | $dbcon->addUser($username, $dbcon->ipAddress(), getDevice()); |
| 150 | 150 | |
| 151 | - // Weiterleitung zur geschützten Startseite |
|
| 151 | + // Weiterleitung zur geschützten Startseite |
|
| 152 | 152 | if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') { |
| 153 | 153 | if (php_sapi_name() == 'cgi') { |
| 154 | 154 | header('Status: 303 See Other'); |