From 7d78787b6c7389378cf5f776ae9f66a3692e9bc9 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 18 Mar 2016 17:38:49 +0100
Subject: [PATCH 1/3] Reboot-Button bei Infoscreen

---
 config/vilesci.config-default.inc.php        |  4 ++++
 vilesci/stammdaten/infoscreen_uebersicht.php | 24 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index 129c9c4fe..f9416b6ce 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -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');
diff --git a/vilesci/stammdaten/infoscreen_uebersicht.php b/vilesci/stammdaten/infoscreen_uebersicht.php
index fcce55738..59407463f 100755
--- a/vilesci/stammdaten/infoscreen_uebersicht.php
+++ b/vilesci/stammdaten/infoscreen_uebersicht.php
@@ -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>';

From ab1e082de97569bd9cd571a42eb999a7812e8bd4 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Tue, 22 Mar 2016 12:12:11 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Submodule=20f=C3=BCr=20Tablesorter=20entfer?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d2bd62ca4..41511b610 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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

From 7ed057b2625fa013b0b37732c2a3d9d41816b3ef Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Tue, 22 Mar 2016 12:12:37 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Tablesorter=20von=20Submodules=20entfernt?=
 =?UTF-8?q?=20und=20auf=20Meta=20Includes=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 submodules/tablesorter                | 1 -
 vilesci/statistik/filter_overview.php | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 160000 submodules/tablesorter

diff --git a/submodules/tablesorter b/submodules/tablesorter
deleted file mode 160000
index b70ba2498..000000000
--- a/submodules/tablesorter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b70ba2498dd23d9d97605ff386cdd67ff6bd9140
diff --git a/vilesci/statistik/filter_overview.php b/vilesci/statistik/filter_overview.php
index 5cc37de8a..eda34f67c 100644
--- a/vilesci/statistik/filter_overview.php
+++ b/vilesci/statistik/filter_overview.php
@@ -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">