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(); $api->display();
?>

1
api/versions.php
View File

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

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

@@ -38,7 +38,10 @@
</div> </div>
</label> </label>
<div class="inner"> <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> </div>
<input type="radio" id="ssh-login-pubkey" name="ssh-login" value="publickey" /> <input type="radio" id="ssh-login-pubkey" name="ssh-login" value="publickey" />
<label for="ssh-login-pubkey"> <label for="ssh-login-pubkey">

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

@@ -1,9 +1,21 @@
<?php if (!defined('PICONTROL')) exit(); ?> <?php if (!defined('PICONTROL')) exit(); ?>
<style> <style>
.system_msg{color: #01a7db; font-style: italic;} .system_msg {
.user_name{font-weight:bold;} color: #01a7db;
.user_message{color: #FFFFFF;} font-style: italic;
pre { margin: 0; } }
.user_name {
font-weight: bold;
}
.user_message {
color: #FFFFFF;
}
pre {
margin: 0;
}
</style> </style>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>'; var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>';

1
resources/init.php
View File

@@ -81,4 +81,3 @@ if (isset($_COOKIE['debug'], $_GET['s']) && $_COOKIE['debug'] == 'debug_mode')
if (!isset($doNotCheckForAuthentification)) if (!isset($doNotCheckForAuthentification))
(include LIBRARY_PATH.'main/authentification.php') or die('Nicht gefunden!'); (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 ($this->tplSSH === NULL)
if (self::loadSSH() !== true) { if (self::loadSSH() !== true) {
if ($cancelIfError !== 0) 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; return false;
} }