Fire-Devils/monitor-frontend
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

update config

Browse Source
This commit is contained in:
Manuel Weiser
2018-10-01 12:12:24 +02:00
parent 0f09a883f4
commit b0a6f832aa
26 changed files with 1148 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
functions.inc.php
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
// Status pr<70>fen, berichtigen, ersetzen
// Status pr<70>fen, berichtigen, ersetzen
function repair_status($kennung, $zeit_neu, $status_alt, $zeit_alt) {
global $korr_status_zeit, $status_kfz;
@ -140,7 +140,7 @@ function get_day($time) {
// Filter Zeit errechnen
function filter_zeit($filter) {
$filter = date("YmdHis", mktime(date("G")-$filter,date("i"),date("s"), date("m"),date("d"),date("Y")));
//$filter = date("Y-m-d H:i:s", mktime(date("G")-$filter,date("i"),date("s"), date("m"),date("d"),date("Y")));
return $filter;
}
@ -171,7 +171,16 @@ function get_hour($time) {
}
function ip2str($ip) {
$ip = preg_replace("/(\d{1,3})\.?/e", 'sprintf("%03d", \1)', $ip);
//$ip = preg_replace("/(\d{1,3})\.?/e", 'sprintf("%03d", \1)', $ip);
$ip = preg_replace_callback(
"/(\d{1,3})\.?/",
function($matches){
foreach($matches as $match){
return sprintf("%03d", $match);
}
},
$ip
);
return (string)$ip;
}
@ -326,8 +335,8 @@ function split_kfz($kfz) {
}
function count_total($tocount) {
$result = mysql_query("SELECT Count(*) as $tocount FROM $tocount");
$result = mysql_fetch_array($result);
$result = mysqli_query($dbconn, "SELECT Count(*) as $tocount FROM $tocount");
$result = mysqli_fetch_array($result);
return $result[$tocount];
}
@ -397,7 +406,8 @@ function time_format($settime) {
}
function pass_erstellen ($wert) {
$i = 0;
if (!isset($pass)) $pass="";
$i = 0;
while($i < $wert) {
mt_srand((double)microtime()*1000000);
$zahl = mt_rand(1,20);
@ -508,7 +518,7 @@ function mail_pass($email,$pass) {
$xtra .= "MIME-Version: 1.0\n";
$xtra .= "Content-Transfer-Encoding: 8bit\n";
$xtra .= "X-Mailer: PHP ". phpversion();
mail("$email", "Monitor Loginanfrage", utf8_decode($body), $xtra);
mail("$email", "Monitor Loginanfrage", $body, $xtra);
}
function mail_alarm($datum,$zeit,$email,$org,$org_name,$bezeichnung,$text) {
@ -528,7 +538,7 @@ function mail_alarm($datum,$zeit,$email,$org,$org_name,$bezeichnung,$text) {
$xtra .= "MIME-Version: 1.0\n";
$xtra .= "Content-Transfer-Encoding: 8bit\n";
$xtra .= "X-Mailer: PHP ". phpversion();
mail("$email", "Monitor Alarm: $org ".mail_message_header($org_name), utf8_decode($body), $xtra);
mail("$email", "Monitor Alarm: $org ".mail_message_header($org_name), $body, $xtra);
}
function mail_alarm_sms($datum,$zeit,$email,$org,$org_name,$text) {
@ -540,7 +550,7 @@ function mail_alarm_sms($datum,$zeit,$email,$org,$org_name,$text) {
$xtra .= "MIME-Version: 1.0\n";
$xtra .= "Content-Transfer-Encoding: 8bit\n";
$xtra .= "X-Mailer: PHP ". phpversion();
mail("$email", "$org ".mail_message_header($org_name).": ".mail_message_body($text), utf8_decode($body), $xtra);
mail("$email", "$org ".mail_message_header($org_name).": ".mail_message_body($text), $body, $xtra);
}
$timestampnow = date("YmdHis");