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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
Stefan Puraner
2016-03-23 16:24:24 +01:00
parent 21272960c9 7ed057b262
commit ff39c6ea31
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-3
View File
@@ -1,6 +1,3 @@
[submodule "submodules/tablesorter"]
path = submodules/tablesorter
url = https://github.com/christianbach/tablesorter.git
[submodule "submodules/bootstrap"]
path = submodules/bootstrap
url = https://github.com/twbs/bootstrap.git
config/vilesci.config-default.inc.php
+4
View File
@@ -25,6 +25,10 @@ define("DB_USER","bla");
define("DB_PASSWORD","bla");
define("DB_CONNECT_PERSISTENT",TRUE);
define('CONN_CLIENT_ENCODING','UTF-8' );
//Connection String Infoscreen
define("INFOSCREEN_USER","");
define("INFOSCREEN_PASSWORD","");
// Name des Servers (benoetigt fuer Cronjobs
define('SERVER_NAME','vilesci.technikum-wien.at');
submodules/tablesorter
-1
Submodule submodules/tablesorter deleted from b70ba2498d
vilesci/stammdaten/infoscreen_uebersicht.php
+23 -1
View File
@@ -28,7 +28,7 @@ $rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if(!$rechte->isBerechtigt('basis/infoscreen'))
die('Sie haben keine Berechtigung fuer diese Seite');
die($rechte->errormsg);
$datum_obj = new datum();
@@ -127,6 +127,26 @@ if($action=='new' || $action=='update')
</table>
</form>';
}
if($action=='reboot')
{
if(!$rechte->isBerechtigt('admin'))
die($rechte->errormsg);
set_include_path ("../../vendor/FHC-vendor/phpseclib");
require_once("Net/SSH2.php");
if(isset($_GET["ip"]) && $_GET["ip"])
{
$ssh = new Net_SSH2($_GET["ip"]);
if (!$ssh->login(INFOSCREEN_USER, INFOSCREEN_PASSWORD))
{
exit('Login Failed');
}
echo $ssh->exec('reboot') . "<br>";
}
echo '<script>window.location.href = "infoscreen_uebersicht.php";</script>';
}
$infoscreen = new infoscreen();
if(!$infoscreen->getAll())
@@ -151,6 +171,8 @@ foreach($infoscreen->result as $row)
echo '<td>',$basis->convert_html_chars($row->bezeichnung),'</td>';
echo '<td>',$basis->convert_html_chars($row->beschreibung),'</td>';
echo '<td>',$basis->convert_html_chars($row->ipadresse),'</td>';
if($rechte->isBerechtigt('admin'))
echo '<td><a href="infoscreen_uebersicht.php?action=reboot&ip='.$row->ipadresse.' " target="uebersicht_infoscreen">Reboot</a></td>';
echo '<td><a href="infoscreen_details.php?action=show&infoscreen_id=',$basis->convert_html_chars($row->infoscreen_id),' " target="detail_infoscreen">details</a></td>';
echo '<td><a href="infoscreen_uebersicht.php?action=update&infoscreen_id=',$basis->convert_html_chars($row->infoscreen_id),' " target="uebersicht_infoscreen">bearbeiten</a></td>';
echo '</tr>';
vilesci/statistik/filter_overview.php
+4 -2
View File
@@ -38,7 +38,7 @@ if(isset($_POST['action']) && $_POST['action']=='delete' && isset($_POST['filter
{
$filter = new filter();
$filter->delete($_POST['filter_id']);
}
$filter = new filter();
if (!$filter->loadAll())
@@ -50,7 +50,9 @@ if (!$filter->loadAll())
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<script type="text/javascript" src="../../include/js/jquery.min.1.11.1.js"></script>
<script type="text/javascript" src="../../submodules/tablesorter/jquery.tablesorter.min.js"></script>
<?php
include("../../include/meta/jquery-tablesorter.php");
?>
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
<script language="JavaScript" type="text/javascript">