Eine EMail mit deinem Zugang wurde an '.$row["a_mail"].' versand.';
exit;
}
@@ -232,7 +233,7 @@ else
}
}
- elseif (!$_SESSION["name"] && $_GET["mode"] == 'register')
+ elseif (!isset($_SESSION["name"]) && isset($_GET["mode"]) && $_GET["mode"] == 'register')
{
echo '
@@ -272,10 +273,10 @@ else
exit;
}
- if( !empty($_GET["login"]) )
+ if( isset($_GET["login"]) )
{
- $result = mysql_query("SELECT id, a_name, a_admin, a_mail, real_name, login_count, pm_allow, DATE_FORMAT(last_seen, '%Y%m%d%H%i%s') AS last_seen FROM admin_users WHERE login_pass = '$_GET[login]'") or die (mysql_error());
- $row = mysql_fetch_array($result);
+ $result = mysqli_query($dbconn, "SELECT id, a_name, a_admin, a_mail, real_name, login_count, pm_allow, DATE_FORMAT(last_seen, '%Y%m%d%H%i%s') AS last_seen FROM admin_users WHERE login_pass = '$_GET[login]'") or die (mysqli_error($dbconn));
+ $row = mysqli_fetch_array($result);
if( !empty($row["a_name"]) )
{
@@ -290,11 +291,11 @@ exit;
$datnow = date("Y-m-d", mktime(0,0,0, date("m"),date("d"),date("Y")));
$timenow = date("G:i");
$ip = $_SERVER["REMOTE_ADDR"];
- $agent = $HTTP_USER_AGENT;
- $result = mysql_query("INSERT INTO pocsag_logins (name, zeit, datum, ip, agent) VALUES ('$row[real_name]', '$timenow', '$datnow', '$ip', '$agent')");
+ $agent = $_SERVER["HTTP_USER_AGENT"];
+ $result = mysqli_query($dbconn, "INSERT INTO pocsag_logins (name, zeit, datum, ip, agent) VALUES ('$row[real_name]', '$timenow', '$datnow', '$ip', '$agent')");
$row["login_count"]++;
- $result = mysql_query("UPDATE admin_users SET login_pass='', login_count='$row[login_count]' WHERE id='$row[id]'") or die(mysql_error());
+ $result = mysqli_query($dbconn, "UPDATE admin_users SET login_pass='', login_count='$row[login_count]' WHERE id='$row[id]'") or die(mysqli_error($dbconn));
echo gohome("index.php");
}
diff --git a/pmfunctions.inc.php b/pmfunctions.inc.php
index 2ccfa38..d264431 100755
--- a/pmfunctions.inc.php
+++ b/pmfunctions.inc.php
@@ -22,34 +22,34 @@
require_once("config.inc.php");
-if( $_GET["pmdo"] == "reply" )
+if( isset($_GET["pmdo"]) && $_GET["pmdo"] == "reply" )
{
- $result = mysql_query("SELECT real_name FROM admin_users WHERE id = '$_GET[to]'") or die (mysql_error());
- $row = mysql_fetch_array($result);
+ $result = mysqli_query($dbconn, "SELECT real_name FROM admin_users WHERE id = '$_GET[to]'") or die (mysqli_error($dbconn));
+ $row = mysqli_fetch_array($result);
eval ("\$message_field .= \"".gettemplate($template_dir."body_message_reply")."\";");
echo $message_field;
}
-elseif( $_GET["pmdo"] == "doreply" )
+elseif( isset($_GET["pmdo"]) && $_GET["pmdo"] == "doreply" )
{
- $result = mysql_query("INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$_REQUEST[userid_to]', '$_REQUEST[msg_text]')");
- $result = mysql_query("DELETE FROM messages WHERE id = '$_REQUEST[msg_id]'")or die(mysql_error());
+ $result = mysqli_query($dbconn, "INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$_REQUEST[userid_to]', '$_REQUEST[msg_text]')");
+ $result = mysqli_query($dbconn, "DELETE FROM messages WHERE id = '$_REQUEST[msg_id]'")or die(mysqli_error($dbconn));
echo gohome($_SERVER["PHP_SELF"]);
}
-elseif( $_GET["pmdo"] == "write" )
+elseif( isset($_GET["pmdo"]) && $_GET["pmdo"] == "write" )
{
$select_msg_to = '
';
- if( $_GET["msg_to"] && empty($can_pm) )
+ if( (!isset($can_pm) || $can_pm!=1) && isset($_GET["msg_to"]) )
{
// pm_allow ist auf 0
+ if (!isset($message_field)) $message_field="";
$message_field .= "
Der User darf keine PM Empfangen/Senden
";
}
else
{
//pm_allow ist auf 1
+ if (!isset($message_field)) $message_field = "";
eval ("\$message_field .= \"".gettemplate($template_dir."body_message_write")."\";");
}
echo $message_field;
}
-elseif( $_GET["pmdo"] == "dowrite" )
+elseif( isset($_GET["pmdo"]) && $_GET["pmdo"] == "dowrite" )
{
if( $_REQUEST["userid_to"] != '0' )
{
// an einen bestimmten User
- $result = mysql_query("INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$_REQUEST[userid_to]', '$_REQUEST[msg_text]')");
+ $result = mysqli_query($dbconn, "INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$_REQUEST[userid_to]', '$_REQUEST[msg_text]')");
}
else
{
- // an alle User die PM dürfen
- $result = mysql_query("SELECT id FROM admin_users WHERE pm_allow = '1'") or die (mysql_error());
- while($row = mysql_fetch_array($result))
+ // an alle User die PM d�rfen
+ $result = mysqli_query($dbconn, "SELECT id FROM admin_users WHERE pm_allow = '1'") or die (mysqli_error($dbconn));
+ while($row = mysqli_fetch_array($result))
{
- $result_msg = mysql_query("INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$row[id]', '$_REQUEST[msg_text]')");
+ $result_msg = mysqli_query($dbconn, "INSERT INTO messages (userid_from, userid_to, message) VALUES ('$_SESSION[userid]', '$row[id]', '$_REQUEST[msg_text]')");
}
}
echo gohome($_SERVER["PHP_SELF"]);
}
-elseif( $_GET["pmdo"] == "deletepm" )
+elseif( isset($_GET["pmdo"]) && $_GET["pmdo"] == "deletepm" )
{
- $result = mysql_query("DELETE FROM messages WHERE id = '$_GET[msg_id]'")or die(mysql_error());
+ $result = mysqli_query($dbconn, "DELETE FROM messages WHERE id = '$_GET[msg_id]'")or die(mysqli_error($dbconn));
}
?>
\ No newline at end of file
diff --git a/profile.php b/profile.php
index df436b9..9cdf7e2 100755
--- a/profile.php
+++ b/profile.php
@@ -30,17 +30,21 @@ $_SESSION["online_users"] = "";
// Seite zusammenstellen
//
+if (!isset($select_time_filter)) $select_time_filter="";
+if (!isset($i)) $i=0;
+if (!isset($select_ric)) $select_ric="";
+
//
// Startseite
-if( !$_GET["do"] )
+if( !isset($_GET["do"]) )
{
- $result = mysql_query("SELECT a_alarmmail, a_alarmmail2sms, wap_pass, wap_show, wap_rows, wap_def_orgfilter, wap_def_statfilter FROM admin_users WHERE id = '$_SESSION[userid]'") or die (mysql_error());
- $row = mysql_fetch_array($result);
+ $result = mysqli_query($dbconn, "SELECT a_alarmmail, a_alarmmail2sms, wap_pass, wap_show, wap_rows, wap_def_orgfilter, wap_def_statfilter FROM admin_users WHERE id = '$_SESSION[userid]'") or die (mysqli_error($dbconn));
+ $row = mysqli_fetch_array($result);
$wap_pass = $row["wap_pass"];
- if( $row["a_alarmmail2sms"] == 1 ) $checked = 'checked';
+ ( $row["a_alarmmail2sms"] == 1 ) ? $checked = 'checked' : $checked="";
$mailform_checkbox = '';
$mailform_mail = '';
@@ -86,8 +90,8 @@ if( !$_GET["do"] )
';
- $result = mysql_query("SELECT a.*,
+ $result = mysqli_query($dbconn, "SELECT a.*,
b.adresse, b.formatierung_id, b.bezeichnung, b.rec_typ,
c.bg_farbe, c.text_farbe, c.text_format, c.text_groesse, c.text_groesse_text,
d.org_name, d.org
@@ -106,8 +110,8 @@ if( !$_GET["do"] )
LEFT JOIN ric_zvei b ON b.adresse = a.adresse
LEFT JOIN formatierung c ON c.id = b.formatierung_id
LEFT JOIN organisation d ON d.id = b.org_id
- WHERE a.userid = '$_SESSION[userid]' ORDER BY org ASC, org_name ASC, rec_typ ASC") or die (mysql_error());
- while($row = mysql_fetch_array($result))
+ WHERE a.userid = '$_SESSION[userid]' ORDER BY org ASC, org_name ASC, rec_typ ASC") or die (mysqli_error($dbconn));
+ while($row = mysqli_fetch_array($result))
{
// Zeitfunktion
if( $row["time_from"] == '0' && $row["time_to"] == '0' )
@@ -121,6 +125,7 @@ if( !$_GET["do"] )
if( !empty($row["stiwo"]) ) { $stiwo = "Stiwo"; } else { $stiwo = ""; }
+ if (!isset($abos)) $abos="";
$abos .= '
| '.$row["org"].' '.$row["org_name"].' '.$row["bezeichnung"].' - '.$row["rec_typ"].' |
'.$stiwo.' |
@@ -131,11 +136,13 @@ if( !$_GET["do"] )
}
// Seiteninhalt ausgeben
+ $page_middle="";
+ if (!isset($abos)) $abos="";
eval ("\$page_middle .= \"".gettemplate($template_dir."body_profil_alarmmail")."\";");
}
-// Ric zum Abo wählen
+// Ric zum Abo w�hlen
elseif( $_GET["do"] == 'abodet' )
{
@@ -146,15 +153,15 @@ elseif( $_GET["do"] == 'abodet' )
';
}
- $result = mysql_query("SELECT id, org_name, org FROM organisation WHERE id = '$_REQUEST[search_ric]'") or die (mysql_error());
- $row = mysql_fetch_array($result);
+ $result = mysqli_query($dbconn, "SELECT id, org_name, org FROM organisation WHERE id = '$_REQUEST[search_ric]'") or die (mysqli_error($dbconn));
+ $row = mysqli_fetch_array($result);
$org_id = $row["id"];
$org = $row["org"];
$org_name = $row["org_name"];
- $result = mysql_query("SELECT id, adresse, bezeichnung, rec_typ FROM ric_zvei WHERE org_id = '$org_id'") or die (mysql_error());
- while($row = mysql_fetch_array($result))
+ $result = mysqli_query($dbconn, "SELECT id, adresse, bezeichnung, rec_typ FROM ric_zvei WHERE org_id = '$org_id'") or die (mysqli_error($dbconn));
+ while($row = mysqli_fetch_array($result))
{
$select_ric .= ' '.$org.' '.$org_name.' '.$row["bezeichnung"].' - '.$row["rec_typ"].'
';
}
@@ -170,13 +177,13 @@ elseif( $_GET["do"] == 'aboins' )
foreach( $_REQUEST["abo_ric"] AS $v )
{
- // prüfen ob der User diese Ric bereits Abonniert hat
- $result = mysql_query("SELECT id FROM alarm2mail WHERE userid = '$_SESSION[userid]' AND adresse = '$v'") or die (mysql_error());
- $row = mysql_fetch_array($result);
+ // pr�fen ob der User diese Ric bereits Abonniert hat
+ $result = mysqli_query($dbconn, "SELECT id FROM alarm2mail WHERE userid = '$_SESSION[userid]' AND adresse = '$v'") or die (mysqli_error($dbconn));
+ $row = mysqli_fetch_array($result);
if( empty($row["id"]) )
{
- $result = mysql_query("INSERT INTO alarm2mail (adresse, userid, time_from, time_to, stiwo) VALUES ('$v', '$_SESSION[userid]', '$_REQUEST[alarm_time_filter_from]', '$_REQUEST[alarm_time_filter_to]', '$_REQUEST[alarm_stiwo]')") or die(mysql_error());
+ $result = mysqli_query($dbconn, "INSERT INTO alarm2mail (adresse, userid, time_from, time_to, stiwo) VALUES ('$v', '$_SESSION[userid]', '$_REQUEST[alarm_time_filter_from]', '$_REQUEST[alarm_time_filter_to]', '$_REQUEST[alarm_stiwo]')") or die(mysqli_error($dbconn));
}
}
@@ -184,11 +191,11 @@ elseif( $_GET["do"] == 'aboins' )
}
-// Abo löschen
+// Abo l�schen
elseif( $_GET["do"] == 'abodel' )
{
- $result = mysql_query("DELETE FROM alarm2mail WHERE id = '$_GET[id]' AND userid = '$_SESSION[userid]'") or die(mysql_error());
+ $result = mysqli_query($dbconn, "DELETE FROM alarm2mail WHERE id = '$_GET[id]' AND userid = '$_SESSION[userid]'") or die(mysqli_error($dbconn));
echo gohome($_SERVER["PHP_SELF"]);
@@ -199,7 +206,7 @@ elseif( $_GET["do"] == 'setmailform' )
{
if( $_REQUEST["mail2sms"] == 1 ) { $setto = 1; } else { $setto = 0; }
- $result = mysql_query("UPDATE admin_users SET a_alarmmail2sms='$setto', a_alarmmail='$_REQUEST[alarmmail]' WHERE id = '$_SESSION[userid]'") or die(mysql_error());
+ $result = mysqli_query($dbconn, "UPDATE admin_users SET a_alarmmail2sms='$setto', a_alarmmail='$_REQUEST[alarmmail]' WHERE id = '$_SESSION[userid]'") or die(mysqli_error($dbconn));
echo gohome($_SERVER["PHP_SELF"]);
@@ -208,7 +215,7 @@ elseif( $_GET["do"] == 'setmailform' )
// Wap Einstellungen speichern
elseif( $_GET["do"] == 'setwap' )
{
- $result = mysql_query("UPDATE admin_users SET wap_show='$_REQUEST[wap_show]', wap_rows='$_REQUEST[wap_rows]', wap_pass='$_REQUEST[wap_pass]', wap_def_orgfilter='$_REQUEST[wap_orgfilter]', wap_def_statfilter='$_REQUEST[wap_statfilter]' WHERE id = '$_SESSION[userid]'") or die(mysql_error());
+ $result = mysqli_query($dbconn, "UPDATE admin_users SET wap_show='$_REQUEST[wap_show]', wap_rows='$_REQUEST[wap_rows]', wap_pass='$_REQUEST[wap_pass]', wap_def_orgfilter='$_REQUEST[wap_orgfilter]', wap_def_statfilter='$_REQUEST[wap_statfilter]' WHERE id = '$_SESSION[userid]'") or die(mysqli_error($dbconn));
echo gohome($_SERVER["PHP_SELF"]);
}
@@ -216,10 +223,13 @@ elseif( $_GET["do"] == 'setwap' )
/**************************/
// Ausgabe Rahmen
//
+if( !isset($java_script)) $java_script="";
+if( !isset($nav_org_filter)) $nav_org_filter="";
+if( !isset($nav_filter)) $nav_filter="";
eval ("dooutput(\"".gettemplate($template_dir."rahmen")."\");");
/**************************/
// Datenbank schliessen
//
-mysql_close($dbconn);
+mysqli_close($dbconn);
?>
diff --git a/stats.php b/stats.php
new file mode 100755
index 0000000..c7c66eb
--- /dev/null
+++ b/stats.php
@@ -0,0 +1,126 @@
+
+ '.$row["org"].' '.$row["org_name"].' |
+ '.$row["alarm_count"].' |
+ '.get_date($row["last_alarm"]).' |
+
';
+ }
+
+ $result = mysqli_query($dbconn, "SELECT org_name, alarm_count, DATE_FORMAT(last_alarm, '%Y%m%d%H%i%s') AS last_alarm FROM organisation WHERE org = 'RD' AND alarm_count != 0 ORDER BY alarm_count DESC, last_alarm DESC, org ASC, org_name ASC") or die (mysql_error());
+ while($row = mysqli_fetch_array($result))
+ {
+ if( !isset($row["org"])) $row["org"]="";
+ $stats_rd .= '
+
+ | '.$row["org"].' '.$row["org_name"].' |
+ '.$row["alarm_count"].' |
+ '.get_date($row["last_alarm"]).' |
+
';
+ }
+
+ $result = mysqli_query($dbconn, "SELECT org_name, alarm_count, DATE_FORMAT(last_alarm, '%Y%m%d%H%i%s') AS last_alarm FROM organisation WHERE org = 'THW' AND alarm_count != 0 ORDER BY alarm_count DESC, last_alarm DESC, org ASC, org_name ASC") or die (mysql_error());
+ while($row = mysqli_fetch_array($result))
+ {
+ if( !isset($row["org"])) $row["org"]="";
+ $stats_thw .= '
+
+ | '.$row["org"].' '.$row["org_name"].' |
+ '.$row["alarm_count"].' |
+ '.get_date($row["last_alarm"]).' |
+
';
+ }
+
+ $result = mysqli_query($dbconn, "SELECT org_name, alarm_count, DATE_FORMAT(last_alarm, '%Y%m%d%H%i%s') AS last_alarm FROM organisation WHERE org = 'KAT' AND alarm_count != 0 ORDER BY alarm_count DESC, last_alarm DESC, org ASC, org_name ASC") or die (mysql_error());
+ while($row = mysqli_fetch_array($result))
+ {
+ $stats_kat .= '
+
+ | '.$row["org"].' '.$row["org_name"].' |
+ '.$row["alarm_count"].' |
+ '.get_date($row["last_alarm"]).' |
+
';
+ }
+
+ // Seiteninhalt ausgeben
+ eval ("\$page_middle .= \"".gettemplate($template_dir."body_stats")."\";");
+
+/**************************/
+// Ausgabe Rahmen
+//
+eval ("dooutput(\"".gettemplate($template_dir."rahmen")."\");");
+
+/**************************/
+// Datenbank schliessen
+//
+mysqli_close($dbconn);
+?>
diff --git a/suche.php b/suche.php
index 9cdda2e..943ef8c 100755
--- a/suche.php
+++ b/suche.php
@@ -22,6 +22,22 @@
require('config.inc.php');
+if (!isset($_REQUEST["search_what"])) $_REQUEST["search_what"]="";
+if (!isset($search_word)) $search_word="";
+if (!isset($search_word_org)) $search_word_org="";
+if (!isset($_REQUEST["search_org"])) $_REQUEST["search_org"]="";
+if (!isset($_REQUEST["search_ric"])) $_REQUEST["search_ric"]="";
+if (!isset($_REQUEST["search_max_results"])) $_REQUEST["search_max_results"]="";
+if (!isset($_REQUEST["search_time"])) $_REQUEST["search_time"]="";
+if (!isset($_REQUEST["search_time_from"])) $_REQUEST["search_time_from"]="";
+if (!isset($_REQUEST["search_time_to"])) $_REQUEST["search_time_to"]="";
+if (!isset($_REQUEST["Submit"])) $_REQUEST["Submit"]="";
+if (!isset($_REQUEST["select_tag_from"])) $_REQUEST["select_tag_from"]="";
+if (!isset($_REQUEST["select_monat_from"])) $_REQUEST["select_monat_from"]="";
+if (!isset($_REQUEST["select_tag_to"])) $_REQUEST["select_tag_to"]="";
+if (!isset($_REQUEST["select_monat_to"])) $_REQUEST["select_monat_to"]="";
+if (!isset($show)) $show="";
+
/**************************/
// Seite zusammenstellen
//
@@ -44,8 +60,8 @@ require('config.inc.php');
$select_search_ric = '