SchultesDev/pi-control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vorbereitungen SSH Login

Browse Source
This commit is contained in:
Gregor Schulte
2023-09-23 16:17:39 +02:00
parent 69e2ee972c
commit 37e155a9b1
6 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/v1/ssh.php
View File

@@ -111,4 +111,3 @@ if (isset($_POST['logout']))
}
$api->display();
?>

1
api/versions.php
View File

@@ -7,4 +7,3 @@ $apiVersions[0] = array('versioncode' => 1,
'date' => 1443909600);
echo json_encode(array('versions' => $apiVersions, 'latest' => $apiLatest));
?>

11
public_html/templates/ssh_login.tpl.php
View File

@@ -5,7 +5,7 @@
<div class="inner-header">
<span><?php _e('SSH-Login'); ?></span>
</div>
<?php if ($data['logged_in'] === false) { ?>
<?php if ($data['logged_in'] === false) { ?>
<form action="?s=ssh_login" method="post">
<div class="inner">
<strong class="red"><?php _e('Du bist noch nicht angemeldet. Dadurch kannst du einige Funktionen nicht nutzen.'); ?></strong>
@@ -38,7 +38,10 @@
</div>
</label>
<div class="inner">
<div class="divider"><div></div><div><?php _e('ODER'); ?></div></div>
<div class="divider">
<div></div>
<div><?php _e('ODER'); ?></div>
</div>
</div>
<input type="radio" id="ssh-login-pubkey" name="ssh-login" value="publickey" />
<label for="ssh-login-pubkey">
@@ -75,14 +78,14 @@
<input type="submit" name="submit" value="<?php _e('Anmelden'); ?>" />
</div>
</form>
<?php } else { ?>
<?php } else { ?>
<div class="inner">
<strong class="green"><?php _e('Du bist bereits angemeldet mit dem Benutzer %s.', $data['ssh_info']['username']); ?></strong>
</div>
<div class="inner-end">
<a href="?s=ssh_login&amp;logout"><button><?php _e('Abmelden'); ?></button></a>
</div>
<?php } ?>
<?php } ?>
</div>
</div>
<div class="clear_both"></div>

32
public_html/templates/terminal.tpl.php
View File

@@ -1,14 +1,26 @@
<?php if (!defined('PICONTROL')) exit(); ?>
<style>
.system_msg{color: #01a7db; font-style: italic;}
.user_name{font-weight:bold;}
.user_message{color: #FFFFFF;}
pre { margin: 0; }
.system_msg {
color: #01a7db;
font-style: italic;
}
.user_name {
font-weight: bold;
}
.user_message {
color: #FFFFFF;
}
pre {
margin: 0;
}
</style>
<script language="javascript" type="text/javascript">
var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>';
var port = <?php echo $data['port']; ?>;
var cookie = '<?php echo $data['cookie']; ?>';
var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>';
var port = <?php echo $data['port']; ?>;
var cookie = '<?php echo $data['cookie']; ?>';
</script>
<script language="javascript" type="text/javascript" src="public_html/js/terminal.websocket.js"></script>
<div class="sidebar">
@@ -19,9 +31,9 @@ var cookie = '<?php echo $data['cookie']; ?>';
<div class="inner">
<strong id="status"><?php _e('Lade...'); ?></strong><br /><br />
<select name="terminal">
<?php foreach ($data['ports'] as $index => $port) { ?>
<option style="background: <?php echo ($port['active'] === true) ? '#73CA3C' : '#E9492E'; ?>;" value="<?php echo $port['port']; ?>"<?php if ($data['port'] == $port['port']) echo ' selected="selected"'; ?>><?php _e('Terminal %d (%s)', $index+1, ($port['active'] === true) ? _t('Online') : _t('Offline')); ?></option>
<?php } ?>
<?php foreach ($data['ports'] as $index => $port) { ?>
<option style="background: <?php echo ($port['active'] === true) ? '#73CA3C' : '#E9492E'; ?>;" value="<?php echo $port['port']; ?>" <?php if ($data['port'] == $port['port']) echo ' selected="selected"'; ?>><?php _e('Terminal %d (%s)', $index + 1, ($port['active'] === true) ? _t('Online') : _t('Offline')); ?></option>
<?php } ?>
</select>
<div id="frame"></div>
</div>

1
resources/init.php
View File

@@ -81,4 +81,3 @@ if (isset($_COOKIE['debug'], $_GET['s']) && $_COOKIE['debug'] == 'debug_mode')
if (!isset($doNotCheckForAuthentification))
(include LIBRARY_PATH.'main/authentification.php') or die('Nicht gefunden!');
?>

3
resources/library/main/tpl.class.php
View File

@@ -827,8 +827,7 @@ class PiTpl
if ($this->tplSSH === NULL)
if (self::loadSSH() !== true) {
if ($cancelIfError !== 0)
self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, diese Funktion steht aktuell nicht zur Verfügung!'), ($cancelIfError === 1) ? true : false);
#self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);
self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);
return false;
}