Merged Upstream master

This commit is contained in:
thnilsen
2020-06-16 20:20:51 +02:00
44 changed files with 4222 additions and 714 deletions
+3 -3
View File
@@ -88,8 +88,8 @@ class Incident implements JsonSerializable
$user_id = $_SESSION['user'];
$type = $_POST['type'];
$title = $_POST['title'];
$text = $_POST['text'];
$title = strip_tags($_POST['title']);
$text = strip_tags($_POST['text'], '<br>');
if (strlen($title)==0)
{
@@ -234,4 +234,4 @@ class Incident implements JsonSerializable
"username" => $this->username
];
}
}
}
+1 -1
View File
@@ -163,7 +163,7 @@ class Service implements JsonSerializable
?>
<div class="item clearfix">
<div class="service"><?php echo $this->name; ?></div>
<?php if ($this->status!=-1){?><div class="status <?php echo $classes[$this->status];?>"><?php echo $statuses[$this->status];?></div><?php }?>
<?php if ($this->status!=-1){?><div class="status <?php echo $classes[$this->status];?>"><?php echo _($statuses[$this->status]);?></div><?php }?>
</div>
<?php
}