blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Missing Library for Screen-rebooting to Composer

Browse Source
This commit is contained in:
Andreas Österreicher
2018-07-25 14:46:00 +02:00
parent 75fcc170b8
commit d47b844773
3 changed files with 111 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+2 -1
View File
@@ -284,7 +284,8 @@
"zetacomponents/workflow": "1.*",
"zetacomponents/document": "1.*",
"zetacomponents/workflow-database-tiein": "1.*",
"zetacomponents/workflow-event-log-tiein": "1.*"
"zetacomponents/workflow-event-log-tiein": "1.*",
"phpseclib/phpseclib": "^2.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "2.*"
composer.lock
Generated
+92 -18
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "db46edf729b6e4d5f0508eba65d3d201",
"content-hash": "201f046d574ccb1447f8d9b820b6b9e2",
"hash": "0a7b99cf08f40f15cad6397a2097d834",
"content-hash": "4065f6ebe38d16462908ebbdac8adf7d",
"packages": [
{
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -952,12 +952,6 @@
{
"name": "ludo/jquery-treetable",
"version": "3.2.0",
"dist": {
"type": "zip",
"url": "https://github.com/ludo/jquery-treetable/archive/3.2.0.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
@@ -1215,13 +1209,99 @@
{
"name": "nicolaskruchten/pivottable",
"version": "2.15.0",
"type": "library"
},
{
"name": "phpseclib/phpseclib",
"version": "2.0.11",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "7053f06f91b3de78e143d430e55a8f7889efc08b"
},
"dist": {
"type": "zip",
"url": "https://github.com/nicolaskruchten/pivottable/archive/v2.15.0.zip",
"reference": null,
"shasum": null
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b",
"reference": "7053f06f91b3de78e143d430e55a8f7889efc08b",
"shasum": ""
},
"type": "library"
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "^4.8.35|^5.7|^6.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
},
"type": "library",
"autoload": {
"files": [
"phpseclib/bootstrap.php"
],
"psr-4": {
"phpseclib\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
},
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"role": "Developer"
}
],
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
"homepage": "http://phpseclib.sourceforge.net",
"keywords": [
"BigInteger",
"aes",
"asn.1",
"asn1",
"blowfish",
"crypto",
"cryptography",
"encryption",
"rsa",
"security",
"sftp",
"signature",
"signing",
"ssh",
"twofish",
"x.509",
"x509"
],
"time": "2018-04-15 16:55:05"
},
{
"name": "psr/log",
@@ -1334,12 +1414,6 @@
{
"name": "rmariuzzo/jquery-checkboxes",
"version": "1.0.7",
"dist": {
"type": "zip",
"url": "https://github.com/rmariuzzo/checkboxes.js/archive/v1.0.7.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
vilesci/stammdaten/infoscreen_uebersicht.php
+17 -18
View File
@@ -26,7 +26,7 @@ $user = get_uid();
$basis = new basis();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if(!$rechte->isBerechtigt('basis/infoscreen'))
die($rechte->errormsg);
@@ -40,7 +40,7 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<head>
<title>Infoscreen</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
@@ -49,17 +49,17 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<script type="text/javascript">
$(document).ready(function()
{
$(document).ready(function()
{
$("#myTable").tablesorter(
{
sortList: [[2,0]],
widgets: [\'zebra\']
});
}
});
}
);
</script>
</head>
@@ -85,15 +85,15 @@ if($action=='save')
}
else
$infoscreen->new = true;
$infoscreen->bezeichnung = $bezeichnung;
$infoscreen->beschreibung = $beschreibung;
$infoscreen->ipadresse = $ipadresse;
if(!$infoscreen->save())
echo '<span class="error">',$basis->convert_html_chars($infoscreen->errormsg),'</span>';
else
echo '<span class="ok">Daten erfolgreich gespeichert</span>';
echo '<span class="ok">Daten erfolgreich gespeichert</span>';
}
if($action=='new' || $action=='update')
@@ -107,7 +107,7 @@ if($action=='new' || $action=='update')
{
echo '<h3>Bearbeiten von ID ',$basis->convert_html_chars($infoscreen_id),'</h3>';
if(!$infoscreen->load($infoscreen_id))
die('Fehler: '.$infoscreen->errormsg);
die('Fehler: '.$infoscreen->errormsg);
}
echo '
<form action="',$_SERVER['PHP_SELF'],'?action=save" method="POST">
@@ -136,13 +136,12 @@ if($action=='reboot')
{
if(!$rechte->isBerechtigt('admin'))
die($rechte->errormsg);
set_include_path ("../../vendor/FHC-vendor/phpseclib");
require_once("Net/SSH2.php");
require_once("../../vendor/autoload.php");
if(isset($_GET["ip"]) && $_GET["ip"])
{
$ssh = new Net_SSH2($_GET["ip"]);
$ssh = new \phpseclib\Net\SSH2($_GET["ip"]);
if (!$ssh->login(INFOSCREEN_USER, INFOSCREEN_PASSWORD))
{
exit('Login Failed');
@@ -186,4 +185,4 @@ echo '</tbody>
</table>
</body>
</html>';
?>
?>