@@ -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 |
@@ -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'); |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | function monitor($action) |
14 | 14 | { |
15 | 15 | if (!defined('CONFIG_MONITOR_URL')) { |
16 | - //trace('CONFIG_MONITOR_URL is undefined'); |
|
16 | + //trace('CONFIG_MONITOR_URL is undefined'); |
|
17 | 17 | return; |
18 | 18 | } |
19 | - //trace("monitor $action"); |
|
19 | + //trace("monitor $action"); |
|
20 | 20 | $ch = curl_init(); |
21 | 21 | $url = CONFIG_MONITOR_URL; |
22 | 22 | |
@@ -24,7 +24,7 @@ discard block |
||
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 | - )); |
|
27 | + )); |
|
28 | 28 | $resp = curl_exec($ch); |
29 | 29 | curl_close($ch); |
30 | 30 | } |
@@ -1391,11 +1391,11 @@ |
||
1391 | 1391 | |
1392 | 1392 | <div id="footer"> |
1393 | 1393 | <?php |
1394 | - # Show authorized user name (and address) and allow logout. |
|
1394 | + # Show authorized user name (and address) and allow logout. |
|
1395 | 1395 | if ($user) { |
1396 | 1396 | echo("<a href=\"logout.php\" title=\"" . |
1397 | - addslashes(__('Disconnect the current user')) . |
|
1398 | - "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>"); |
|
1397 | + addslashes(__('Disconnect the current user')) . |
|
1398 | + "\">" . addslashes(__('Log out')) . "<i class=\"fa fa-sign-out\"></i></a>"); |
|
1399 | 1399 | } |
1400 | 1400 | ?> |
1401 | 1401 | </div> <!-- Footer --> |