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

Some fixes

This commit is contained in:
Matteo Gheza 2020-07-02 18:15:59 +02:00
parent 8eb0854ba2
commit a082447acf
3 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/install/installHelper.php
View File

@ -73,11 +73,11 @@ function checkConnection($host, $user, $password, $database, $return=false){
if($connectionOk){
try{
try{
$connection->exec("CREATE DATABASE IF NOT EXISTS " . preg_replace('/[^a-zA-Z0-9]/', '', trim($database)));
$connection->exec("CREATE DATABASE IF NOT EXISTS " . /*preg_replace('/[^a-zA-Z0-9]/', '', */trim($database)/*)*/);
} catch(Exception $e) {
//nothing
}
$connection->exec("use " . preg_replace('/[^a-zA-Z0-9]/', '', trim($database)));
$connection->exec("use " . /*preg_replace('/[^a-zA-Z0-9]/', '', */trim($database)/*)*/);
} catch (PDOException $e){
if($return){
return false;

73
server/risorse/ajax/ajax_lista_admin.php
View File

@ -46,35 +46,56 @@ th, td {
<th>Interventi</th>
<th>Minuti Disponibilità</th>
<th>Altro</th>
<?php
foreach($risultato as $row){
if(!in_array($row['name'], $hidden) OR in_array($user->name(), $hidden)){
echo "<tr>
<td>";
$name = $user->nameById($row["id"]);
$callFunction = ($row['avaible'] == 1) ? "NonAttivo" : "Attivo";
$avaible = $row["avaible"];
if ($row['caposquadra'] == 1) {echo "<a onclick='$callFunction(".$row["id"].");'><img src='./risorse/images/cascoRosso.png' width='20px'> ";} else{echo "<a onclick='Attivo(".$row["id"].");'><img src='./risorse/images/cascoNero.png' width='20px'> ";}
if($row['online'] == 1){
<?php
foreach($risultato as $row){
if(!in_array($row['name'], $hidden) OR in_array($user->name(), $hidden)){
echo "<tr>
<td>";
$name = $user->nameById($row["id"]);
$callFunction = ($row['avaible'] == 1) ? "NonAttivo" : "Attivo";
$avaible = $row["avaible"];
if ($row['caposquadra'] == 1) {
echo "<a onclick='$callFunction(".$row["id"].");'><img src='./risorse/images/cascoRosso.png' width='20px'> ";
} else {
echo "<a onclick='Attivo(".$row["id"].");'><img src='./risorse/images/cascoNero.png' width='20px'> ";
}
if($row['online'] == 1){
echo "<u>".$name."</u></a></td><td><a onclick='$callFunction(".$row["id"].");'>";
} else {
} else {
echo $name."</a></td><td><a onclick='$callFunction(".$row["id"].");'>";
}
if ($row['avaible'] == 1) {
echo "<i class='fa fa-check' style='color:green'></i>";
} else {
echo "<i class='fa fa-times' style='color:red'></i>";
};
echo "</a></td>
<td>";
if ($row['autista'] == 1) {
echo "<img src='./risorse/images/volante.png' width='20px'>";
} else {
echo "";
};
echo "</td>
<td><a href='tel:+" . $row['telefono'] . "'><i class='fa fa-phone'></i></a></td><td>";
//if ($row['avaible'] == 1) {
$nome_url = urlencode($row['name']);
echo " <a href='https://api.whatsapp.com/send?phone=" . $row['telefono'] . "&text=ALLERTA IN CORSO.%20Mettiti%20in%20contatto%20con%20$nome_url'><i class='fa fa-whatsapp' style='color:green'></i></td>";
/*} else{
echo "";
};*/
$interventi = $row['interventi'];
$minuti = $row['minuti_dispo'];
$u = 'anagrafica.php?user=' . str_replace(' ', '_', urldecode(strtolower($row["id"])));
echo "<td>$interventi</td><td>$minuti</td><td><a href='$u'><p>Altri dettagli</p></a></td></tr>";
}
}
if ($row['avaible'] == 1) {echo "<i class='fa fa-check' style='color:green'></i>";} else{echo "<i class='fa fa-times' style='color:red'></i>";};
echo "</a></td>
<td>";
if ($row['autista'] == 1) {echo "<img src='./risorse/images/volante.png' width='20px'>";} else{echo "";};
echo "</td>
<td><a href='tel:+" . $row['telefono'] . "'><i class='fa fa-phone'></i></a></td><td>";
if ($row['avaible'] == 1) {echo " <a href='https://api.whatsapp.com/send?phone=" . $row['telefono'] . "&text=ALLERTA IN CORSO.%20Mettiti%20in%20contatto%20con%20Fulvio'><i class='fa fa-whatsapp' style='color:green'></i></td>";} else{echo "";};
$interventi = $row['interventi'];
$minuti = $row['minuti_dispo'];
$u = 'anagrafica.php?user=' . str_replace(' ', '_', urldecode(strtolower($row["id"])));
echo "<td>$interventi</td><td>$minuti</td><td><a href='$u'><p>Altri dettagli</p></a></td></tr>";
}
}
?>
</table>
<br>
<p style="text-align: center;">
<a id='add' href="modifica_user.php?add">add user</a>
</p>
</div>

3
server/templates/lista.html
View File

@ -88,9 +88,6 @@ $(document).ready(function() {
background: #0095cd;
}
</style>
<p style="text-align: center;">
<a id='add' href="modifica_user.php?add">add user</a>
</p>
{% endif %}
<script defer type="text/javascript" src="risorse/js/cache.js"></script>
<br>