allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

quick fix2

This commit is contained in:
Matteo Gheza 2020-05-20 23:22:08 +02:00
parent 682f12c00a
commit bdfe7ec91d
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/core.php
View File

@ -276,21 +276,12 @@ class user{
}
}
<<<<<<< HEAD
public function avaible($nome){
$vigile = $this->database->esegui("SELECT avaible FROM `%PREFIX%_users` WHERE nome = :nome;", true, [":nome" => $nome]);
if(empty($vigile)){
return false;
} else {
return $vigile[0]["avaible"];
=======
public function avaible($nome){
$user = $this->database->esegui("SELECT avaible FROM `%PREFIX%_users` WHERE nome = :nome;", true, [":nome" => $nome]);
if(empty($user)){
return false;
} else {
return $user[0]["avaible"];
>>>>>>> e2b9cf2f49f0254dc8318c9c0021a23c464dd106
}
}

5
server/risorse/ajax/ajax_anagrafica.php
View File

@ -317,13 +317,8 @@ function vero1($text, $img1 = "", $img2 = ""){
foreach($risultato as $row){
$nome = ($row['online']==1) ? '<u>' . $row['nome'] . "</u>" : $row['nome'];
echo("<h1>Dati anagrafici <b>$nome</b></h1><br><br>");
<<<<<<< HEAD
echo('<img alt="VVF" src="./risorse/images/distaccamento.png" width="150" class="img-resposive"><br><br><br>');
$disp = vero1($row['avaible'], "<i class='fa fa-check' style='color:green' width='22px'></i>", "<i class='fa fa-times' style='color:red' width='22px'></i>");
=======
echo('<img alt="VVF" src="./risorse/images/owner.png" width="150" class="img-resposive"><br><br><br>');
$disp = vero1($row['avaible'], "<i class='fa fa-check' style='color:green' width='22px'></i>", "<i class='fa fa-times' style='color:red' width='22px'></i>");
>>>>>>> e2b9cf2f49f0254dc8318c9c0021a23c464dd106
$caposquadra = vero1($row['caposquadra'], "<img src='./risorse/images/cascoRosso.png' width='22px'>", "<img src='./risorse/images/cascoNero.png' width='22px'>");
$autista = vero1($row['autista'], "<img src='./risorse/images/volante.png' width='22px'>");
echo("<p>Nome: <b>$nome</b></p><br>");