From 74e44a64ebce165ea1b8ef52ff15e37cda61b450 Mon Sep 17 00:00:00 2001
From: Matteo Gheza
Date: Wed, 20 May 2020 22:49:36 +0200
Subject: [PATCH] Replace Italian names Fixes #5
---
server/config-sample.php | 2 +-
server/core.php | 32 ++++++-------
server/install/install.php | 10 ++---
server/install/installHelper.php | 8 ++--
server/modifica_intervento.php | 2 +-
server/risorse/ajax/ajax_aggiornadispo.php | 2 +-
server/risorse/ajax/ajax_anagrafica.php | 4 +-
server/risorse/ajax/ajax_cache.php | 2 +-
server/risorse/ajax/ajax_dispo.php | 2 +-
server/risorse/ajax/ajax_esercitazioni.php | 2 +-
server/risorse/ajax/ajax_interventi.php | 2 +-
server/risorse/ajax/ajax_lista.php | 2 +-
server/risorse/ajax/ajax_lista_admin.php | 2 +-
server/risorse/ajax/ajax_log.php | 2 +-
server/templates/base.html | 4 +-
server/templates/esercitazioni.html | 2 +-
server/templates/interventi.html | 2 +-
server/templates/lista.html | 2 +-
server/templates/log.html | 2 +-
server/templates/modifica_intervento.html | 52 +++++++++++-----------
server/tests/acceptance/FirstCest.php | 2 +-
server/ui.php | 8 ++--
22 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/server/config-sample.php b/server/config-sample.php
index 41bae46..5ccb0da 100644
--- a/server/config-sample.php
+++ b/server/config-sample.php
@@ -37,7 +37,7 @@ define( 'ENABLE_TECHNICAL_SUPPORT', false );
define( 'TECHNICAL_SUPPORT_KEY', '' );
/* Insert your organization name */
-define( 'DISTACCAMENTO', 'Distaccamento' );
+define( 'owner', 'owner' );
/* Do you want to use a custom error message? (filename: custom-error.mp3) */
define( 'USE_CUSTOM_ERROR_SOUND', false );
diff --git a/server/core.php b/server/core.php
index bf5c8a4..899888d 100644
--- a/server/core.php
+++ b/server/core.php
@@ -144,15 +144,15 @@ class database{
protected $db_dbname = DB_NAME;
protected $db_username = DB_USER;
protected $db_password = DB_PASSWORD;
- public $connessione = null;
+ public $connection = null;
public $query = null;
public $stmt = null;
public function connetti(){
try {
- $this->connessione = new PDO("mysql:host=" . $this->db_host . ";dbname=" . $this->db_dbname, $this->db_username, $this->db_password);
- $this->connessione->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
- $this->connessione->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ $this->connection = new PDO("mysql:host=" . $this->db_host . ";dbname=" . $this->db_dbname, $this->db_username, $this->db_password);
+ $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+ $this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
catch(PDOException $e)
{
@@ -168,27 +168,27 @@ class database{
}
public function close(){
- $this->connessione = null;
+ $this->connection = null;
}
public function esegui($sql, $fetch=false, $param=null){
try{
- $this->connessione->beginTransaction();
- $this->stmt = $this->connessione->prepare(str_replace("%PREFIX%", DB_PREFIX, $sql));
+ $this->connection->beginTransaction();
+ $this->stmt = $this->connection->prepare(str_replace("%PREFIX%", DB_PREFIX, $sql));
if(!is_null($param)){
$this->query = $this->stmt->execute($param);
} else {
$this->query = $this->stmt->execute();
}
bdump($this->query);
- $this->connessione->commit();
+ $this->connection->commit();
if($fetch == true){
return $this->stmt->fetchAll(PDO::FETCH_ASSOC);
}
$this->stmt->closeCursor();
} catch (PDOException $e) {
print "Errore!: " . $e->getMessage() . " ";
- $this->connessione->rollBack();
+ $this->connection->rollBack();
die();
}
}
@@ -229,7 +229,7 @@ class user{
}
}
- public function richiedilogin(){
+ public function requirelogin(){
if(!$this->autenticato()){
if(INTRUSION_SAVE){
if(INTRUSION_SAVE_INFO){
@@ -268,20 +268,20 @@ class user{
}
public function nome_by_id($id){
- $vigile = $this->database->esegui("SELECT nome FROM `%PREFIX%_users` WHERE id = :id;", true, [":id" => $id]);
- if(empty($vigile)){
+ $user = $this->database->esegui("SELECT nome FROM `%PREFIX%_users` WHERE id = :id;", true, [":id" => $id]);
+ if(empty($user)){
return false;
} else {
- return $vigile[0]["nome"];
+ return $user[0]["nome"];
}
}
public function disponibile($nome){
- $vigile = $this->database->esegui("SELECT disponibile FROM `%PREFIX%_users` WHERE nome = :nome;", true, [":nome" => $nome]);
- if(empty($vigile)){
+ $user = $this->database->esegui("SELECT disponibile FROM `%PREFIX%_users` WHERE nome = :nome;", true, [":nome" => $nome]);
+ if(empty($user)){
return false;
} else {
- return $vigile[0]["disponibile"];
+ return $user[0]["disponibile"];
}
}
diff --git a/server/install/install.php b/server/install/install.php
index c6c7ff7..b8c0a1d 100644
--- a/server/install/install.php
+++ b/server/install/install.php
@@ -75,9 +75,9 @@ if(true){
$prefixValue = "allerta01";
}
?>
- Configura la connessione al database
+ Configura la connection al database
Installazione terminata con successo.
Ottimo lavoro, amico! Hai completato l'installazione. Ora Allerta può funzionare correttamente. Adesso è il momento di…
diff --git a/server/install/installHelper.php b/server/install/installHelper.php
index 2903559..39f1dac 100644
--- a/server/install/installHelper.php
+++ b/server/install/installHelper.php
@@ -16,7 +16,7 @@ function checkConnection($host, $user, $password, $database){
} catch (PDOException $e){
$connectionOk = false;
?>
- Errore nello stabilire una connessione al database
+
Errore nello stabilire una connection al database
Questo potrebbe voler dire che nome utente e password nel file config.php
sono sbagliate o che non possiamo contattare il database
. Potrebbe voler dire che il tuo database è irraggiungibile.
Sei sicuro di avere nome utente e password corretti?
@@ -250,7 +250,7 @@ INSERT INTO `".$prefix."_dbversion` (`id`, `version`, `timestamp`) VALUES (NULL,
}
}
-function initOptions($name, $visible, $password, $report_email, $distaccamento){
+function initOptions($name, $visible, $password, $report_email, $owner){
try{
require_once "../config.php";
$connection = new PDO("mysql:host=".DB_HOST.";dbname=".DB_NAME, DB_USER, DB_PASSWORD,[PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
@@ -258,12 +258,12 @@ function initOptions($name, $visible, $password, $report_email, $distaccamento){
$prep = $connection->prepare("
INSERT INTO `".$prefix."_users` (`id`, `role`, `hidden`, `disabled`, `nome`, `disponibile`, `caposquadra`, `autista`, `telefono`, `password`, `password_hash`, `interventi`, `esercitazioni`, `online`, `online_time`, `minuti_dispo`, `immagine`) VALUES ('1', '5', :hidden, '0', :name, '0', '1', '0', NULL, MD5(:password), '', '0', '0', '0', '0', '0', '');
INSERT INTO `".$prefix."_options` (`id`, `name`, `value`, `enabled`, `created_time`, `last_edit`, `user_id`) VALUES ('1', 'report_email', :report_email, '1', current_timestamp(), current_timestamp(), '1');
-INSERT INTO `".$prefix."_options` (`id`, `name`, `value`, `enabled`, `created_time`, `last_edit`, `user_id`) VALUES ('2', 'distaccamento', :distaccamento, '1', current_timestamp(), current_timestamp(), '1');");
+INSERT INTO `".$prefix."_options` (`id`, `name`, `value`, `enabled`, `created_time`, `last_edit`, `user_id`) VALUES ('2', 'owner', :owner, '1', current_timestamp(), current_timestamp(), '1');");
$prep->bindParam(':name', $name, PDO::PARAM_STR);
$prep->bindParam(':hidden', $visible, PDO::PARAM_INT);
$prep->bindParam(':password', $password, PDO::PARAM_STR);
$prep->bindParam(':report_email', $report_email, PDO::PARAM_STR);
- $prep->bindParam(':distaccamento', $distaccamento, PDO::PARAM_STR);
+ $prep->bindParam(':owner', $owner, PDO::PARAM_STR);
$prep->execute();
} catch (Exception $e) {
?>
diff --git a/server/modifica_intervento.php b/server/modifica_intervento.php
index a017363..c07237f 100644
--- a/server/modifica_intervento.php
+++ b/server/modifica_intervento.php
@@ -52,7 +52,7 @@ if($tools->validazione_form('$post-mod', true, "aggiungi")) {
$tools->redirect("nonfareilfurbo.php");
}
}
- loadtemplate('modifica_intervento.html', ['intervento' => array('id' => $id, 'token' => $_SESSION['token'], 'modalità' => $modalità, 'personale' => $personale, 'tipologie' => $tipologie), 'titolo' => ucfirst($modalità) . ' intervento', 'distaccamento' => 'VVF Darfo', 'urlsoftware' => '', 'utente' => $utente->info()]);
+ loadtemplate('modifica_intervento.html', ['intervento' => array('id' => $id, 'token' => $_SESSION['token'], 'modalità' => $modalità, 'personale' => $personale, 'tipologie' => $tipologie), 'titolo' => ucfirst($modalità) . ' intervento', 'owner' => 'VVF Darfo', 'urlsoftware' => '', 'utente' => $utente->info()]);
bdump($_SESSION['token'], "token");
}
?>
\ No newline at end of file
diff --git a/server/risorse/ajax/ajax_aggiornadispo.php b/server/risorse/ajax/ajax_aggiornadispo.php
index 2144165..6a96b5c 100644
--- a/server/risorse/ajax/ajax_aggiornadispo.php
+++ b/server/risorse/ajax/ajax_aggiornadispo.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
if(isset($_POST["nomeutenteattivato"]) && isset($_POST["nomeutenteattivatore"]) && $_POST["dispo"] == 1) {
$risultato = $database->esegui("UPDATE `%PREFIX%_users` SET disponibile = 1 WHERE nome = :nome", false, [":nome" => $_POST["nomeutenteattivato"]]);
$utente->log("Attivazione disponibilita'", $_POST["nomeutenteattivato"], $_POST["nomeutenteattivatore"], date("d/m/Y"), date("H:i.s"));
diff --git a/server/risorse/ajax/ajax_anagrafica.php b/server/risorse/ajax/ajax_anagrafica.php
index 768db8d..4f99a69 100644
--- a/server/risorse/ajax/ajax_anagrafica.php
+++ b/server/risorse/ajax/ajax_anagrafica.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
$risultato = $database->esegui('SELECT * FROM `%PREFIX%_users` WHERE id = :id', true, array(":id" => $_GET['utente'])); // Pesco i dati della tabella
@@ -317,7 +317,7 @@ function vero1($text, $img1 = "", $img2 = ""){
foreach($risultato as $row){
$nome = ($row['online']==1) ? '' . $row['nome'] . " " : $row['nome'];
echo("Dati anagrafici $nome ");
-echo(' ');
+echo(' ');
$disp = vero1($row['disponibile'], " ", " ");
$caposquadra = vero1($row['caposquadra'], " ", " ");
$autista = vero1($row['autista'], " ");
diff --git a/server/risorse/ajax/ajax_cache.php b/server/risorse/ajax/ajax_cache.php
index 8d7b150..2489cfe 100644
--- a/server/risorse/ajax/ajax_cache.php
+++ b/server/risorse/ajax/ajax_cache.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
$users_sql = "SELECT `id`, `nome`, `disponibile`, `caposquadra`, `autista`, `telefono`, `interventi`, `esercitazioni`, `online`, `minuti_dispo`, `immagine` FROM `%PREFIX%_users` LIMIT 0 , 30";
$users = $database->esegui($users_sql, true);
diff --git a/server/risorse/ajax/ajax_dispo.php b/server/risorse/ajax/ajax_dispo.php
index b1cf02a..1fb8ecc 100644
--- a/server/risorse/ajax/ajax_dispo.php
+++ b/server/risorse/ajax/ajax_dispo.php
@@ -3,7 +3,7 @@ $start = true;
$minuti = 5;
include_once "../../core.php";
init_class();
-$utente->richiedilogin();
+$utente->requirelogin();
function arraynum(){
global $database;
diff --git a/server/risorse/ajax/ajax_esercitazioni.php b/server/risorse/ajax/ajax_esercitazioni.php
index 778a976..339f63f 100644
--- a/server/risorse/ajax/ajax_esercitazioni.php
+++ b/server/risorse/ajax/ajax_esercitazioni.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
function ancora($content, $id) {
$content = substr($content,0,$limit);
diff --git a/server/risorse/ajax/ajax_interventi.php b/server/risorse/ajax/ajax_interventi.php
index aee40d8..961ce56 100644
--- a/server/risorse/ajax/ajax_interventi.php
+++ b/server/risorse/ajax/ajax_interventi.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
function ancora($content, $id) {
$content = substr($content,0,$limit);
diff --git a/server/risorse/ajax/ajax_lista.php b/server/risorse/ajax/ajax_lista.php
index 9cb4fc7..d06b71f 100644
--- a/server/risorse/ajax/ajax_lista.php
+++ b/server/risorse/ajax/ajax_lista.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
$risultato = $database->esegui("SELECT * FROM `%PREFIX%_users` ORDER BY disponibile DESC, caposquadra DESC, interventi ASC, minuti_dispo ASC, nome ASC", true);
diff --git a/server/risorse/ajax/ajax_lista_admin.php b/server/risorse/ajax/ajax_lista_admin.php
index 1033dda..886158d 100644
--- a/server/risorse/ajax/ajax_lista_admin.php
+++ b/server/risorse/ajax/ajax_lista_admin.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
$risultato = $database->esegui("SELECT * FROM `%PREFIX%_users` ORDER BY disponibile DESC, caposquadra DESC, interventi ASC, minuti_dispo ASC, nome ASC", true);
diff --git a/server/risorse/ajax/ajax_log.php b/server/risorse/ajax/ajax_log.php
index 92da14b..0f1fb40 100644
--- a/server/risorse/ajax/ajax_log.php
+++ b/server/risorse/ajax/ajax_log.php
@@ -1,7 +1,7 @@
richiedilogin();
+$utente->requirelogin();
$risultato = $database->esegui("SELECT * FROM `%PREFIX%_log`", true);
diff --git a/server/templates/base.html b/server/templates/base.html
index 10a513c..2df0aaa 100644
--- a/server/templates/base.html
+++ b/server/templates/base.html
@@ -2,7 +2,7 @@
{% block head %}
- {{ titolo }} - ALLERTA sistema gestionale {{ distaccamento }}
+ {{ titolo }} - ALLERTA sistema gestionale {{ owner }}