diff --git a/www/enhanched_webend/MySQL-Import/login.sql b/www/enhanched_webend/MySQL-Import/login.sql new file mode 100644 index 0000000..b7b4bc5 --- /dev/null +++ b/www/enhanched_webend/MySQL-Import/login.sql @@ -0,0 +1,51 @@ +-- MySQL dump 10.13 Distrib 5.5.43, for debian-linux-gnu (armv7l) +-- +-- Host: localhost Database: login +-- ------------------------------------------------------ +-- Server version 5.5.43-0+deb7u1 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `login` +-- + +DROP TABLE IF EXISTS `login`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `login` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `username` varchar(150) DEFAULT NULL, + `passwort` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `login` +-- + +LOCK TABLES `login` WRITE; +/*!40000 ALTER TABLE `login` DISABLE KEYS */; +INSERT INTO `login` VALUES ,(1,'Test','098f6bcd4621d373cade4e832627b4f6'); +/*!40000 ALTER TABLE `login` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + diff --git a/www/enhanched_webend/config.php b/www/enhanched_webend/config.php index d8f84c1..3d9fb88 100644 --- a/www/enhanched_webend/config.php +++ b/www/enhanched_webend/config.php @@ -8,5 +8,6 @@ $database = "boswatch"; $tableFMS = "bos_fms"; $tableZVEI = "bos_zvei"; $tablePOC = "bos_pocsag"; +$tableLOG = "login"; ?> diff --git a/www/enhanched_webend/gfx/logo.png b/www/enhanched_webend/gfx/logo.png deleted file mode 100644 index d02a7cd..0000000 Binary files a/www/enhanched_webend/gfx/logo.png and /dev/null differ diff --git a/www/enhanched_webend/login.php b/www/enhanched_webend/login.php index e5c6e2f..f12c4dd 100644 --- a/www/enhanched_webend/login.php +++ b/www/enhanched_webend/login.php @@ -6,12 +6,12 @@ session_start(); require_once ("config.php"); $verbindung = mysql_connect($dbhost, $dbuser , $dbpassword) or die("Verbindung zur Datenbank konnte nicht hergestellt werden"); -mysql_select_db("login") or die ("Datenbank konnte nicht ausgewählt werden"); +mysql_select_db($tableLOG) or die ("Datenbank konnte nicht ausgewählt werden"); $username = $_POST["username"]; $passwort = md5($_POST["password"]); -$abfrage = "SELECT username, passwort FROM login WHERE username LIKE '$username' LIMIT 1"; +$abfrage = "SELECT username, passwort FROM" $tableLOG "WHERE username LIKE '$username' LIMIT 1"; $ergebnis = mysql_query($abfrage); $row = mysql_fetch_object($ergebnis); diff --git a/www/enhanched_webend/prefs.php b/www/enhanched_webend/prefs.php index 46633a8..29a2a35 100644 --- a/www/enhanched_webend/prefs.php +++ b/www/enhanched_webend/prefs.php @@ -11,7 +11,7 @@ session_start(); ?> - +$db = new Database($dbhost, $dbuser, $dbpassword, $database, 1); //Show Error = 1! - - - -
-
FMS
-
- +
+
FMS
+
+ - - - \ No newline at end of file + include("tpl/a_footer.php"); +?> diff --git a/www/enhanched_webend/show_pocsag.php b/www/enhanched_webend/show_pocsag.php index fd075b8..a3765e7 100644 --- a/www/enhanched_webend/show_pocsag.php +++ b/www/enhanched_webend/show_pocsag.php @@ -1,9 +1,4 @@ - - - - - -
-
POCSAG
-
- +
POCSAG
+
+ - - - \ No newline at end of file + include("tpl/a_footer.php"); +?> \ No newline at end of file diff --git a/www/enhanched_webend/show_zvei.php b/www/enhanched_webend/show_zvei.php index 489bc57..e9939e7 100644 --- a/www/enhanched_webend/show_zvei.php +++ b/www/enhanched_webend/show_zvei.php @@ -1,9 +1,5 @@ - + - - -
ZVEI
-
- +
+ \ No newline at end of file diff --git a/www/enhanched_webend/tpl/content.overview.php b/www/enhanched_webend/tpl/content.overview.php deleted file mode 100644 index 8f4f7f6..0000000 --- a/www/enhanched_webend/tpl/content.overview.php +++ /dev/null @@ -1,27 +0,0 @@ -query("SELECT id, time, fms, status, direction, tsi FROM ".$tableFMS." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['fms'] = $Rows; - - //read ZVEI - $db->query("SELECT id, time, zvei FROM ".$tableZVEI." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['zvei'] = $Rows; - //read POCSAG - $db->query("SELECT id, time, ric, funktion, text FROM ".$tablePOC." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['poc'] = $Rows; -?> diff --git a/www/enhanched_webend/tpl/content.parser.php b/www/enhanched_webend/tpl/content.parser.php deleted file mode 100644 index 15c5adc..0000000 --- a/www/enhanched_webend/tpl/content.parser.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/www/enhanched_webend/tpl/mysql.class.php b/www/enhanched_webend/tpl/mysql.class.php index 9343fdd..69d5fbd 100644 --- a/www/enhanched_webend/tpl/mysql.class.php +++ b/www/enhanched_webend/tpl/mysql.class.php @@ -10,9 +10,9 @@ Simple Database Class (C) by Bastian Schroll /** * Database::__construct() - * + * * Stellt eine Verbung mit der MySQL Datenbank fest - * + * * @param mixed $host Hostname des Datenbank Server * @param mixed $user Username des Datenbank Nutzers * @param mixed $password Passwort des Datenbank Nutzers @@ -40,10 +40,10 @@ Simple Database Class (C) by Bastian Schroll /** * Database::query() - * - * Führt einen MySQL Query aus - * - * @param mixed $query Auszuführender Query + * + * F�hrt einen MySQL Query aus + * + * @param mixed $query Auszuf�hrender Query * @return Result-Handler/FALSE */ function query($query) @@ -59,11 +59,11 @@ Simple Database Class (C) by Bastian Schroll /** * Database::fetchAssoc() - * - * Liefert alle gefundnen Datensätze als Assoc - * + * + * Liefert alle gefundnen Datens�tze als Assoc + * * @param mixed $result Externer Result-Handler - * @return gefundene Datensätze als Assoc + * @return gefundene Datens�tze als Assoc */ function fetchAssoc($result = null) { @@ -78,11 +78,11 @@ Simple Database Class (C) by Bastian Schroll /** * Database::count() - * - * Zählt alle gefundenen Datensätze - * + * + * Z�hlt alle gefundenen Datens�tze + * * @param mixed $result Externer Result-Handler - * @return Anzahl gefundener Datensätze + * @return Anzahl gefundener Datens�tze */ function count($result = null) { @@ -97,9 +97,9 @@ Simple Database Class (C) by Bastian Schroll /** * Database::closeConnection() - * - * Schließt die bestehende MySQL Verbindung - * + * + * Schlie�t die bestehende MySQL Verbindung + * * @return TRUE/FALSE */ function closeConnection() @@ -114,9 +114,9 @@ Simple Database Class (C) by Bastian Schroll /** * Database::error() - * + * * Gibt eine Interne Fehlermeldung aus - * + * * @param mixed $error_msg Text der Fehlermeldung * @param mixed $sql_err MySQL Fehlermeldung per mysql_error() * @return NULL @@ -131,4 +131,4 @@ Simple Database Class (C) by Bastian Schroll } } -} ?> \ No newline at end of file +} ?> diff --git a/www/enhanched_webend/tpl/template.overview.php b/www/enhanched_webend/tpl/template.overview.php deleted file mode 100644 index 6fd6e2a..0000000 --- a/www/enhanched_webend/tpl/template.overview.php +++ /dev/null @@ -1,84 +0,0 @@ -Last alarms for FMS and ZVEI (max. 50)

- -
- Last FMS alarms - - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitFMSStat.Richt.TKI
". $fms['id'] . "". $time . "". $fms['fms'] . "". $fms['status'] . "". $fms['direction'] . "". $fms['tsi'] . "
-
- Last POCSAG alarms - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitRICFunktionText
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['funktion'] . "". $poc['text'] . "
-
- -
- Last ZVEI alarms - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitSchleife
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "
-
diff --git a/www/enhanched_webend/tpl/template.parser.php b/www/enhanched_webend/tpl/template.parser.php deleted file mode 100644 index e69de29..0000000 diff --git a/www/enhanched_webend/tpl_old/content.overview.php b/www/enhanched_webend/tpl_old/content.overview.php deleted file mode 100644 index e69de29..0000000 diff --git a/www/enhanched_webend/tpl_old/content.parser.php b/www/enhanched_webend/tpl_old/content.parser.php deleted file mode 100644 index 15c5adc..0000000 --- a/www/enhanched_webend/tpl_old/content.parser.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/www/enhanched_webend/tpl_old/template.overview.php b/www/enhanched_webend/tpl_old/template.overview.php deleted file mode 100644 index c3feb55..0000000 --- a/www/enhanched_webend/tpl_old/template.overview.php +++ /dev/null @@ -1,72 +0,0 @@ - - query("SELECT id, time, ric, funktion, text, description FROM ".$tablePOC." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['poc'] = $Rows; -?> - - - - - - - - - - - - - - "; - echo ""; - - if ($poc['funktion'] == 1) - echo ""; - if ($poc['funktion'] == 2) - echo ""; - if ($poc['funktion'] == 3) - echo ""; - if ($poc['funktion'] == 4) - echo ""; - - - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
Datum - UhrzeitFunktionEinheitAlarmtextRIC
". $time . "A. hö. Drg.AlarmEinsatzEinsatz abbrechen". $poc['description'] . "". $poc['text'] . "". $poc['ric'] . $poc['funktion'] . "". $poc['funktion'] . "
- - diff --git a/www/enhanched_webend/tpl_old/template.overview.php+ b/www/enhanched_webend/tpl_old/template.overview.php+ deleted file mode 100644 index 9bc330b..0000000 --- a/www/enhanched_webend/tpl_old/template.overview.php+ +++ /dev/null @@ -1,37 +0,0 @@ -
Alamierungen Feuerwehr Hamm
- - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitRICFunktionText
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['funktion'] . "". $poc['text'] . "
- diff --git a/www/enhanched_webend/tpl_old/template.overview.php.temp b/www/enhanched_webend/tpl_old/template.overview.php.temp deleted file mode 100644 index 6fd6e2a..0000000 --- a/www/enhanched_webend/tpl_old/template.overview.php.temp +++ /dev/null @@ -1,84 +0,0 @@ -Last alarms for FMS and ZVEI (max. 50)

- -
- Last FMS alarms - - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitFMSStat.Richt.TKI
". $fms['id'] . "". $time . "". $fms['fms'] . "". $fms['status'] . "". $fms['direction'] . "". $fms['tsi'] . "
-
- Last POCSAG alarms - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitRICFunktionText
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['funktion'] . "". $poc['text'] . "
-
- -
- Last ZVEI alarms - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitSchleife
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "
-
diff --git a/www/enhanched_webend/tpl_old/template.parser.php b/www/enhanched_webend/tpl_old/template.parser.php deleted file mode 100644 index e69de29..0000000