DTux/dtux__avion-poeme
Archived
1
0
Fork 0
Code Activity

Compare commits

base: DTux/dtux__avion-poeme:anim-plane-reverse
Branches Tags
DTux/dtux__avion-poeme:master DTux/dtux__avion-poeme:fix-bug-button-header DTux/dtux__avion-poeme:add-htaccess DTux/dtux__avion-poeme:fix-bug-picto-lang-apropos DTux/dtux__avion-poeme:anim-plane-reverse DTux/dtux__avion-poeme:add-attachment DTux/dtux__avion-poeme:donation-button DTux/dtux__avion-poeme:add-two-pages DTux/dtux__avion-poeme:synchro-with-prod
...
compare: DTux/dtux__avion-poeme:0a87a3a0cbec519d6901d24b580bee616f77619e
Branches Tags
DTux/dtux__avion-poeme:master DTux/dtux__avion-poeme:fix-bug-button-header DTux/dtux__avion-poeme:add-htaccess DTux/dtux__avion-poeme:fix-bug-picto-lang-apropos DTux/dtux__avion-poeme:anim-plane-reverse DTux/dtux__avion-poeme:add-attachment DTux/dtux__avion-poeme:donation-button DTux/dtux__avion-poeme:add-two-pages DTux/dtux__avion-poeme:synchro-with-prod

13 Commits
anim-plane-reverse ... 0a87a3a0cb

Author SHA1 Message Date
mathieu_berard 0a87a3a0cb Merge branch 'add-htaccess' of DTux/avion-poeme into master 2021-11-24 21:58:21 +00:00
mberard a5a934a108 feat: add htacces to redirect php file 2021-11-24 22:57:51 +01:00
mathieu_berard 876a925f79 Merge branch 'fix-bug-picto-lang-apropos' of DTux/avion-poeme into master 2021-11-24 21:51:56 +00:00
mberard 5b06af2026 fix: îcto bulgare donation elt apropos 2021-11-24 22:48:28 +01:00
mberard d8070b6260 fix: attachment and gitignore 2021-11-11 15:18:01 +01:00
mberard ca9d3b2d98 fix: update repo directy master branch 2021-11-11 14:37:27 +01:00
Daniel Tartavel 92c26dab45 replacing end of line 2021-11-03 10:33:04 +01:00
DTux 4da327413c Merge branch 'anim-plane-reverse' of DTux/avion-poeme into master 2021-11-03 08:22:58 +00:00
DTux 8d8ea7adf3 Merge branch 'add-attachment' of DTux/avion-poeme into master 2021-11-03 08:22:07 +00:00
mberard de54555d77 add-attachment-in-form 2021-11-01 13:48:35 +01:00
Daniel Tartavel 8f7e94e482 comparison of lat and long made on 3 decimals only 2021-10-30 12:43:54 +02:00
Daniel Tartavel 952121b1d2 correction of some regressions 2021-10-30 12:37:27 +02:00
Daniel Tartavel 5cb0055bee corrected bug same coordinates 2021-10-30 12:15:02 +02:00
25 changed files with 550 additions and 460 deletions
Expand all files Collapse all files
.gitignore
+2
View File
@@ -0,0 +1,2 @@
.DS_Store
.history/
.htaccess
+9
View File
@@ -0,0 +1,9 @@
RewriteEngine On
# browser requests PHP
RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /([^\ ]+)\.php
RewriteRule ^/?(.*)\.php$ /$1 [L,R=301]
# check to see if the request is for a PHP file:
RewriteCond %{REQUEST_FILENAME}\.php -f
RewriteRule ^/?(.*)$ /$1.php [L]
avionpoeme.php
+5 -11
View File
@@ -10,28 +10,22 @@
$db = new db(); $db = new db();
//$db->open(); //$db->open();
foreach ($table as $var) foreach ($table as $var) {
{ if (getpost($var) != null) {
if ( getpost( $var ) != null )
{
$r = getpost($var); $r = getpost($var);
/*if ( $r == "true") /*if ( $r == "true")
{ {
$r = 1; $r = 1;
}elseif( $r ="false")*/ }elseif( $r ="false")*/
$db->$var = trim($r, ' \"'); $db->$var = trim($r, ' \"');
}else } else {
{
$erreur[] = $var; $erreur[] = $var;
} }
} }
if (!empty ($erreur)) if (!empty($erreur)) {
{
echo json_encode($erreur); echo json_encode($erreur);
log_error("erreur lors de l'acquisition des données:" . EOLH . print_r($erreur, true)); log_error("erreur lors de l'acquisition des données:" . EOLH . print_r($erreur, true));
}else } else {
{
$db->newPlane(); $db->newPlane();
} }
$db->close(); $db->close();
?>
cron.php
+17 -2
View File
@@ -16,7 +16,9 @@
peripeties(); peripeties();
print "Envoi des arrivées" . EOLH; print "Envoi des arrivées" . EOLH;
arrivee(); arrivee();
anonymisation();
################################### FONCTIONS #################################""
function peripetieDatee() function peripetieDatee()
{ {
global $db; global $db;
@@ -130,7 +132,7 @@
$query = "SELECT * FROM avionpoeme WHERE atteri = 0 AND TIMEDIFF(CONCAT_WS(' ',CURDATE(),CURTIME()),deliveryTimeServer) > '00:00'"; $query = "SELECT * FROM avionpoeme WHERE atteri = 0 AND TIMEDIFF(CONCAT_WS(' ',CURDATE(),CURTIME()),deliveryTimeServer) > '00:00'";
$db->query($query); $db->query($query);
$avionArrive = $db->result->fetch_all(MYSQLI_ASSOC); $avionArrive = $db->result->fetch_all(MYSQLI_ASSOC);
var_dump($avionArrive); //var_dump($avionArrive);
foreach ($avionArrive as $avion) foreach ($avionArrive as $avion)
{ {
print "avion poème n° " . $avion['idAvion'] . "a atterri" . EOLH; print "avion poème n° " . $avion['idAvion'] . "a atterri" . EOLH;
@@ -196,5 +198,18 @@
print json_last_error_msg() .EOLH; print json_last_error_msg() .EOLH;
} }
} }
function anonymisation()
{
global $db;
$query = "SELECT idAvion FROM avionpoeme WHERE atteri = 1 AND public = 0 AND DATEDIFF(CONCAT_WS(' ',CURDATE(),CURTIME()),deliveryTimeServer) > '7'";
$db->query($query);
$avionArrive = $db->result->fetch_all(MYSQLI_ASSOC);
//print_r($avionArrive);
foreach($avionArrive as $avion)
{
$query = "UPDATE avionpoeme SET message='', expeMail='', destMail='' WHERE idAvion='" . $avion['idAvion'] ."'";
$db->query($query);
}
}
$db->close(); $db->close();
?>
gestion/gestionDB.php
+9 -2
View File
@@ -67,15 +67,22 @@ function verifPeripetieAvion()
$db->query($query); $db->query($query);
$avions = $db->result->fetch_all(MYSQLI_ASSOC); $avions = $db->result->fetch_all(MYSQLI_ASSOC);
$avionsId = array_column($avions, 'expeMail', 'idAvion'); $avionsId = array_column($avions, 'expeMail', 'idAvion');
print_r($avionsId); //print_r($avionsId);
$flag = false;
foreach($peripeties as $peripetie) foreach($peripeties as $peripetie)
{ {
print "Péripétie " . $peripetie["idAP"] . EOLH; //print "Péripétie " . $peripetie["idAP"] . EOLH;
$idAvion = $peripetie["idAvion"]; $idAvion = $peripetie["idAvion"];
if ( empty($avionsId[$idAvion]) ) if ( empty($avionsId[$idAvion]) )
{ {
print "Péripétie " . $peripetie["idAP"] . " n'a pas d'avion poème idAvion=>" . $idAvion . EOLH; print "Péripétie " . $peripetie["idAP"] . " n'a pas d'avion poème idAvion=>" . $idAvion . EOLH;
$flag = true;
} }
}
if ( ! $flag )
{
print "Aucune erreur détectée";
} }
$db->close(); $db->close();
} }
gestion/index.php
+1
View File
@@ -30,6 +30,7 @@
</head> </head>
<body> <body>
<a href="stats.php">Statistiques</a><br>
<a href="lang.php">Générer les fichiers de langue</a><br> <a href="lang.php">Générer les fichiers de langue</a><br>
<a href="logs.php">Lire les logs</a><br> <a href="logs.php">Lire les logs</a><br>
<a href="gestionDB.php">Vérifier la base de données</a><br> <a href="gestionDB.php">Vérifier la base de données</a><br>
gestion/stats.php
+29 -9
View File
@@ -14,6 +14,7 @@
$result = $db->result->fetch_assoc(); $result = $db->result->fetch_assoc();
return $result['Auto_increment']-1; return $result['Auto_increment']-1;
} }
function total() //nombre d'avions poèmes présents dans la base function total() //nombre d'avions poèmes présents dans la base
{ {
global $db; global $db;
@@ -27,26 +28,42 @@
function totalenvol() //nombre d'avions poèmes en vol function totalenvol() //nombre d'avions poèmes en vol
{ {
global $db; global $db;
$query = "SELECT COUNT(*) as n FROM avionpoeme WHERE public!=2"; $query = "SELECT COUNT(*) as n FROM avionpoeme WHERE atteri!=1";
$db->query($query); $db->query($query);
$result = $db->result->fetch_assoc(); $result = $db->result->fetch_assoc();
return $result["n"]; return $result["n"];
} }
function alea() function alea($nAvionEnvoye)
{ {
global $db; global $db;
$query = "SELECT COUNT(*) as nAvion FROM avionpoeme WHERE "; $query = "SELECT DISTINCT deliveryMethod FROM avionpoeme";
$db->query($query);
$result = $db->result->fetch_all(MYSQLI_ASSOC);
//var_dump($result);
foreach ( $result as $method )
{
$query = "SELECT COUNT(*) as nAvion FROM avionpoeme WHERE deliveryMethod='" . $method["deliveryMethod"] . "'";
$db->query($query); $db->query($query);
$result = $db->result->fetch_assoc(); $result = $db->result->fetch_assoc();
return $result["n"]; echo "Méthode => " . $method["deliveryMethod"] . " nombre d'avion poèmes => " . $result["nAvion"] . " => " . round($result["nAvion"]/$nAvionEnvoye*100,2) . "%" . EOLH;
}
} }
function anonymous() //nombre d'avions poèmes envoyés anonymement function anonymous() //nombre d'avions poèmes envoyés anonymement
{ {
global $db; global $db;
$query = "SELECT COUNT(*) as n FROM avionpoeme WHERE expemail=''"; $query = "SELECT COUNT(*) as n FROM avionpoeme WHERE expeknown='0'";
$db->query($query);
$result = $db->result->fetch_assoc();
return $result["n"];
}
function deleted()
{
global $db;
$query = "SELECT COUNT(*) as n FROM avionpoeme WHERE public='2'";
$db->query($query); $db->query($query);
$result = $db->result->fetch_assoc(); $result = $db->result->fetch_assoc();
return $result["n"]; return $result["n"];
@@ -63,11 +80,14 @@
echo "Nombre total d'avions-poème : " . $nAvionEnvoye . EOLH; echo "Nombre total d'avions-poème : " . $nAvionEnvoye . EOLH;
$total = total(); $total = total();
$avionSupp = $nAvionEnvoye-$total; $avionSupp = $nAvionEnvoye-$total;
echo "Nombre d'avion supprimés : " . $avionSupp . " => " . round($avionSupp/$nAvionEnvoye*100,3) . "%" . EOLH; echo "Nombre d'avion supprimés : " . $avionSupp . " => " . round($avionSupp/$nAvionEnvoye*100,2) . "%" . EOLH;
$nAvionenvol = totalenvol(); $nAvionenvol = totalenvol();
echo "Nombre d'avions-poème en vol : " . $nAvionenvol . " => " . round($nAvionenvol/$nAvionEnvoye*100) . "%" . EOLH; echo "Nombre d'avions-poème en vol : " . $nAvionenvol . " => " . round($nAvionenvol/$nAvionEnvoye*100,2) . "%" . EOLH;
$anonymous = anonymous(); $anonymous = anonymous();
echo "Nombre d'envois anonymes : " . $anonymous . " => " . round($anonymous/$nAvionEnvoye*100) . "%" . EOLH; echo "Nombre d'envois anonymes : " . $anonymous . " => " . round($anonymous/$nAvionEnvoye*100,2) . "%" . EOLH;
$deleted = deleted();
echo "Nombre d'avions anonymisés(effacés) : " . $deleted . " => " . round($deleted/$nAvionEnvoye*100,2) . "%" . EOLH;
alea($nAvionEnvoye);
} }
include/config.inc.php
+2 -4
View File
@@ -20,12 +20,10 @@ $site = "Avion Poème";
$dossier = "/www"; $dossier = "/www";
$basedir = dirname($_SERVER['DOCUMENT_ROOT']) . $dossier; $basedir = dirname($_SERVER['DOCUMENT_ROOT']) . $dossier;
$base_url = "http://avion-poe.me"; $base_url = "https://avion-poe.me";
$base_path = "/flex/storage/avion-poe.me/site/www/"; $base_path = "/flex/storage/avion-poe.me/site/www/";
$url_admin = $base_url . "/gestion"; $url_admin = $base_url . "/gestion";
$accueil = $base_url . "/index.html"; $accueil = $base_url . "/index.html";
if (empty( $_SERVER["PHP_AUTH_USER"])) if (empty($_SERVER["PHP_AUTH_USER"])) {
{
$_SERVER["PHP_AUTH_USER"] = 'script'; $_SERVER["PHP_AUTH_USER"] = 'script';
} }
?>
include/db.class.php
+5
View File
@@ -98,6 +98,11 @@ class db
function newPlane() //return 0 on error function newPlane() //return 0 on error
{ {
global $base_url; global $base_url;
if (round($this->startLat,3,PHP_ROUND_HALF_DOWN)==round($this->destLat,3,PHP_ROUND_HALF_DOWN) && round($this->startLon,3,PHP_ROUND_HALF_DOWN)==round($this->destLon,3,PHP_ROUND_HALF_DOWN))
{
$this->destLon+=0.001;
$this->destLat+=0.001;
}
$query = "INSERT INTO avionpoeme VALUES ('0','"; $query = "INSERT INTO avionpoeme VALUES ('0','";
$query .= $this->protect($this->message) . "', '"; $query .= $this->protect($this->message) . "', '";
$query .= $this->protect($this->expeMail) . "', "; $query .= $this->protect($this->expeMail) . "', ";
index.php
+7
View File
@@ -81,6 +81,13 @@
<br> <br>
<div class="form-control rounded-0" id="messageTextArea"></div> <div class="form-control rounded-0" id="messageTextArea"></div>
</div> </div>
<div class="form-group">
<label class="bold" id="labelAttachment"></label>
<div class="custom-file">
<input type="file" class="custom-file-input" id="attachmentPlane" aria-describedby="inputGroupFileAddon01">
<label class="custom-file-label" for="attachmentPlane" id="attachmentPlaneLabel"></label>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="bold" for="selectTime" id="flightTime">Temps de vol</label> <label class="bold" for="selectTime" id="flightTime">Temps de vol</label>
<select class="form-control" id="selectTime"> <select class="form-control" id="selectTime">
lang/9mfo-traduction.csv
+2
View File
@@ -74,3 +74,5 @@ AvionPoeme_epuise|100 avions-poèmes ont déjà été lancés aujourd'hui, veuil
NB_AvionPoeme_restant|$NB_avion_poeme avions-poèmes peuvent encore être lancés aujourd'hui! A votre plume!|$NB_avion_poeme flight-poems can still be launched today! Get out your pens!|$NB_avion_poeme Gedichte-Flieger können noch heute losgeschickt werden! An Ihrem Stift!|$NB_avion_poeme самолет–поеми могат да стартират днес! Хващайте писалката!|$NB_avion_poeme 詩作紙飞机今天仍然可发送 。拿起笔來吧！|$NB_avion_poeme 今日も飛行機の詩を飛ばしていただくことができます！あなたが書いたものを！|$NB_avion_poeme aviones-poemas todavía se pueden lanzar hoy. ¡En tu pluma!|$NB_avion_poeme aviões-poemas ainda podem ser lançados hoje! Na sua caneta!|لا يزال من الممكن إطلاق $NB_avion_poeme الطائرات-القصائد اليوم! أحضروا أقلامكم NB_AvionPoeme_restant|$NB_avion_poeme avions-poèmes peuvent encore être lancés aujourd'hui! A votre plume!|$NB_avion_poeme flight-poems can still be launched today! Get out your pens!|$NB_avion_poeme Gedichte-Flieger können noch heute losgeschickt werden! An Ihrem Stift!|$NB_avion_poeme самолет–поеми могат да стартират днес! Хващайте писалката!|$NB_avion_poeme 詩作紙飞机今天仍然可发送 。拿起笔來吧！|$NB_avion_poeme 今日も飛行機の詩を飛ばしていただくことができます！あなたが書いたものを！|$NB_avion_poeme aviones-poemas todavía se pueden lanzar hoy. ¡En tu pluma!|$NB_avion_poeme aviões-poemas ainda podem ser lançados hoje! Na sua caneta!|لا يزال من الممكن إطلاق $NB_avion_poeme الطائرات-القصائد اليوم! أحضروا أقلامكم
Soutenez_avionpoeme|Offrez-nous un verre de vin  |Offer us a beer |Schenken Sie uns ein Bier!|Почерпете ни с ракия!|请给我们倒茶|お酒をください|¡Ofrécenos una cerveza! |Ofereça-nos uma cerveja|من فضلك اعطنا الشاي Soutenez_avionpoeme|Offrez-nous un verre de vin  |Offer us a beer |Schenken Sie uns ein Bier!|Почерпете ни с ракия!|请给我们倒茶|お酒をください|¡Ofrécenos una cerveza! |Ofereça-nos uma cerveja|من فضلك اعطنا الشاي
AvionPoeme_free_independent|Avion-poe.me est gratuit, libre (open source) et indépendant|Avion-poe.me is free (as in freedom), free (as in free beer) and independent|Avion-poe.me ist kostenlos, frei (open source) und unabhängig |Avion-poe.me е безплатен, свободен (с отворен код) и независим |Avion-poe.me 是免费、开源和独立的 |Avion-poe.me は無料で、オープンソースで独立しています |Avion-poe.me es gratuito, libre (de código abierto) e independiente |Avion-poe.me é gratuito, libre (de código aberto) e independente |عملنا مجاني وحر (مفتوح المصدر) ومستقل AvionPoeme_free_independent|Avion-poe.me est gratuit, libre (open source) et indépendant|Avion-poe.me is free (as in freedom), free (as in free beer) and independent|Avion-poe.me ist kostenlos, frei (open source) und unabhängig |Avion-poe.me е безплатен, свободен (с отворен код) и независим |Avion-poe.me 是免费、开源和独立的 |Avion-poe.me は無料で、オープンソースで独立しています |Avion-poe.me es gratuito, libre (de código abierto) e independiente |Avion-poe.me é gratuito, libre (de código aberto) e independente |عملنا مجاني وحر (مفتوح المصدر) ومستقل
PJ_Parcourir|Parcourir|Browse|Durchsuchen|Прегледаване|浏览|ブラウズ |Navegar|Navegar|تصفح
PJ_Ajouter|Ajouter un pièce jointe (max. 2 Mo)|Attach file (2 MB max.)|Datei anhängen (2 MB max.)|Прикачване на файл (2 MB макс.)|附加文件 (最大 2 MB )|ファイルを添付する (最大2MB)|Adjuntar archivo (2 MB máx. )|Anexar arquivo (2 MB máx.)|إرفق ملف (2MB max)
Can't render this file because it contains an unexpected character in line 37 and column 114.
lang/ar
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/bg
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/de
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/en
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/es
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/fr
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/ja
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/pt
+1 -1
View File
File diff suppressed because one or more lines are too long
lang/zh
+1 -1
View File
File diff suppressed because one or more lines are too long
src/app.css
+7 -3
View File
@@ -299,13 +299,13 @@ a#navbarDropdownLang.nav-link.dropdown-toggle::after {
content: "\f0fc"; content: "\f0fc";
} }
#donationElt #donationButton .btn.ar:before, #donationElt #donationButton .btn.ar:before {
#donationElt #donationButton .btn.bg:before {
content: "\f875"; content: "\f875";
} }
#donationElt #donationButton .btn.zh:before, #donationElt #donationButton .btn.zh:before,
#donationElt #donationButton .btn.ja:before { #donationElt #donationButton .btn.ja:before,
#donationElt #donationButton .btn.bg:before {
content: "\f7a0"; content: "\f7a0";
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
@@ -336,3 +336,7 @@ a#navbarDropdownLang.nav-link.dropdown-toggle::after {
text-align: center; text-align: center;
} }
} }
.custom-file-label::after {
content: attr(data-after);
}
src/formValidation.js
+31 -13
View File
@@ -1,25 +1,43 @@
var validExpeMail = false var validExpeMail = false;
var validExpeLoc = false //turned to true in geocoder.js var validExpeLoc = false; //turned to true in geocoder.js
var validDestMail = false var validDestMail = false;
var validDestLoc = false //turned to true in geocoder.js var validDestLoc = false; //turned to true in geocoder.js
function validateEmail(email) { //from https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript function validateEmail(email) {
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; //from https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript
const re =
/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(String(email).toLowerCase()); return re.test(String(email).toLowerCase());
} }
$("#expeMail").change(function () { $("#expeMail").change(function () {
validExpeMail = validateEmail($("#expeMail").val()) validExpeMail = validateEmail($("#expeMail").val());
checkFormValid() checkFormValid();
}) });
$("#destMail").change(function () { $("#destMail").change(function () {
validDestMail = validateEmail($("#destMail").val()) validDestMail = validateEmail($("#destMail").val());
checkFormValid() checkFormValid();
}) });
document
.querySelector(".custom-file-input")
.addEventListener("change", function (e) {
const file = e.target.files[0];
const fileName = file.name;
var nextSibling = e.target.nextElementSibling;
nextSibling.innerText = fileName;
const filesize = (file.size / 1024 / 1024).toFixed(4); // MB
if (filesize >= 2.2) {
e.target.classList.add("is-invalid");
} else {
e.target.classList.remove("is-invalid");
}
});
function checkFormValid() { function checkFormValid() {
if (validExpeMail && validExpeLoc && validDestMail && validDestLoc) { if (validExpeMail && validExpeLoc && validDestMail && validDestLoc) {
$('#sendNewPlane').prop("disabled", false) $("#sendNewPlane").prop("disabled", false);
} }
} }
src/map.js
-3
View File
@@ -303,8 +303,6 @@ loader.load(function(loader, resources) {
var queryString = window.location.search; var queryString = window.location.search;
queryString = queryString.split('=')[1] queryString = queryString.split('=')[1]
if(Number(queryString)==data.uid){ if(Number(queryString)==data.uid){
/*
Activate anim place reverse
$("#back").attr("src","src/img/back-"+data.color+".jpg"); $("#back").attr("src","src/img/back-"+data.color+".jpg");
html = data.message; html = data.message;
var canvas1 = document.getElementById("blankCanvas1"); var canvas1 = document.getElementById("blankCanvas1");
@@ -319,7 +317,6 @@ loader.load(function(loader, resources) {
$("#canvas3d").css('display','block') $("#canvas3d").css('display','block')
animePlane(); animePlane();
}) })
*/
} }
} }
src/newPlane.js
+36 -34
View File
@@ -109,7 +109,29 @@ $("#sendNewPlane").on('click',function(){
var randomColor = getRandomColor() var randomColor = getRandomColor()
console.log(message) var formData = new FormData()
var attachment = $("#attachmentPlane").prop('files')[0];
formData.append('file', attachment);
formData.append('message', encodeURIComponent(message));
formData.append('expeMail', $("#expeMail").val());
formData.append('expeKnown', expeKnown);
formData.append('expeLang', lang);
formData.append('destLang', $("#selectDestLang").val());
formData.append('startLat', expeLoc.center[1]);
formData.append('startLon', expeLoc.center[0]);
formData.append('startName', expeLoc.name);
formData.append('startTime', sentDate);
formData.append('startTZ', expeTimezone);
formData.append('destMail', $("#destMail").val());
formData.append('destLat', destLoc.center[1]);
formData.append('destLon', destLoc.center[0]);
formData.append('destName', destLoc.name);
formData.append('public', publicMessage, );
formData.append('color', randomColor);
formData.append('deliveryTime', deliveryDate);
formData.append('deliveryTZ', destTimezone);
formData.append('deliveryTimeServer', deliverySecondsServer);
formData.append('deliveryMethod', $("#selectTime").val());
var data = { var data = {
'message':encodeURIComponent(message), 'message':encodeURIComponent(message),
@@ -131,39 +153,22 @@ $("#sendNewPlane").on('click',function(){
'deliveryTime':deliveryDate, 'deliveryTime':deliveryDate,
'deliveryTZ':destTimezone, 'deliveryTZ':destTimezone,
'deliveryTimeServer':deliverySecondsServer, 'deliveryTimeServer':deliverySecondsServer,
'deliveryMethod':$("#selectTime").val() 'deliveryMethod':$("#selectTime").val(),
} }
$.ajax({
var query = 'avionpoeme.php?'+ url: 'avionpoeme.php',
'message='+data.message+'&'+ data: formData,
'expeMail='+data.expeMail+'&'+ processData: false,
'expeKnown='+data.expeKnown+'&'+ contentType: false,
'expeLang='+data.expeLang+'&'+ cache : false,
'destLang='+data.destLang+'&'+ type: 'POST',
'startLat='+data.startLat+'&'+ success: function(result){
'startLon='+data.startLon+'&'+
'startName='+data.startName+'&'+
'startTime='+data.startTime+'&'+
'startTZ='+data.startTZ+'&'+
'destMail='+data.destMail+'&'+
'destLat='+data.destLat+'&'+
'destLon='+data.destLon+'&'+
'destName='+data.destName+'&'+
'public='+data.public+'&'+
'color='+data.color+'&'+
'deliveryTime='+data.deliveryTime+'&'+
'deliveryTZ='+data.deliveryTZ+'&'+
'deliveryTimeServer='+data.deliveryTimeServer+'&'+
'deliveryMethod='+data.deliveryMethod+'';
$.post(query, function(result) {
result = result.replace(/'/g, '"'); result = result.replace(/'/g, '"');
console.log(result)
result = $.parseJSON(result) result = $.parseJSON(result)
var planeId = Number(result.uid); var planeId = Number(result.uid);
//selecting proper color for back //selecting proper color for back
$("#back").attr("src","src/img/back-"+data.color+".jpg"); $("#back").attr("src","src/img/back-"+randomColor+".jpg");
// creating image for plane, need to link it to the inputs tog et entered values. // creating image for plane, need to link it to the inputs tog et entered values.
var message = quill.root.innerHTML var message = quill.root.innerHTML
@@ -193,14 +198,11 @@ $("#sendNewPlane").on('click',function(){
},4400); },4400);
//reloading page (to change) //reloading page (to change)
setInterval(function(){ setInterval(function(){
window.location.href ='https://avion-poe.me?avion='+planeId+''; window.location.href ='https://www.avion-poe.me/?avion='+planeId+'';
},5500); },5500);
}) })
}) }
});
}) })
}); });
src/translation.js
+113 -104
View File
@@ -1,174 +1,185 @@
// Default lang // Default lang
var lang = 'en' var lang = "en";
// Lang by session // Lang by session
var langSession = sessionStorage.getItem('lang'); var langSession = sessionStorage.getItem("lang");
// Lang by navigator config // Lang by navigator config
var userLang = navigator.userLanguage || navigator.language; var userLang = navigator.userLanguage || navigator.language;
if (langSession) { if (langSession) {
lang = langSession.substring(0,2) lang = langSession.substring(0, 2);
} else if (userLang) { } else if (userLang) {
lang = userLang.substring(0,2) lang = userLang.substring(0, 2);
} }
//loading the lang.json file //loading the lang.json file
$(document).ready(function () { $(document).ready(function () {
translateUI(lang) translateUI(lang);
$.getJSON("lang/lang.json", function (data) { $.getJSON("lang/lang.json", function (data) {
//creating dropdown list of languages in navbar //creating dropdown list of languages in navbar
for (var key in data) { for (var key in data) {
$("#langChoices").append( '<a class="dropdown-item langSelect" value="'+key+'" href="#">'+data[key]+'</a>' ) $("#langChoices").append(
$("#selectDestLang").append( '<option value="'+key+'" href="#">'+data[key]+'</option>' ) '<a class="dropdown-item langSelect" value="' +
key +
'" href="#">' +
data[key] +
"</a>"
);
$("#selectDestLang").append(
'<option value="' + key + '" href="#">' + data[key] + "</option>"
);
} }
//setting the user lang //setting the user lang
if (data[lang]) { if (data[lang]) {
//$("#navbarDropdownLang").html(data[lang]) //$("#navbarDropdownLang").html(data[lang])
translateUI(lang) translateUI(lang);
} }
//or english if not in list //or english if not in list
else { else {
//$("#navbarDropdownLang").html("English") //$("#navbarDropdownLang").html("English")
translateUI('en') translateUI("en");
} }
$(".langSelect").on('click',function(e){ $(".langSelect").on("click", function (e) {
lang = e.currentTarget.attributes[1].value lang = e.currentTarget.attributes[1].value;
sessionStorage.setItem('lang', lang); sessionStorage.setItem("lang", lang);
translateUI(lang) translateUI(lang);
//$("#navbarDropdownLang").html($(this).html()) //$("#navbarDropdownLang").html($(this).html())
}) });
}).fail(function (error) { }).fail(function (error) {
console.log(error); console.log(error);
}); });
}); });
var dictionnary = [] var dictionnary = [];
function translateUI(l) { function translateUI(l) {
$.getJSON("lang/" + l + "", function (s) { $.getJSON("lang/" + l + "", function (s) {
console.log(s) dictionnary = s;
dictionnary = s
//if arabic : display left to right (ltr) + troubleshooting a lot of individual elements //if arabic : display left to right (ltr) + troubleshooting a lot of individual elements
if (lang == "ar") { if (lang == "ar") {
//navbar //navbar
$("nav").css('direction','rtl') $("nav").css("direction", "rtl");
$(".nav-menus").removeClass('mr-auto') $(".nav-menus").removeClass("mr-auto");
$(".nav-button").addClass('mr-auto') $(".nav-button").addClass("mr-auto");
//form //form
// $(".ql-container").css('direction','rtl') // $(".ql-container").css('direction','rtl')
// $(".ql-container").css('float','right') // $(".ql-container").css('float','right')
// $(".ql-editor").css('float','right') // $(".ql-editor").css('float','right')
// $(".ql-editor p").css('float','right') // $(".ql-editor p").css('float','right')
$(".modal-content").css('direction','rtl') $(".modal-content").css("direction", "rtl");
$(".bold").css('float','right') $(".bold").css("float", "right");
$("#public").css('margin-left','5px') $("#public").css("margin-left", "5px");
$("#prive").css('margin-left','5px') $("#prive").css("margin-left", "5px");
$("#newPlaneModalAnonyme").css('margin-right','25px') $("#newPlaneModalAnonyme").css("margin-right", "25px");
$("#newPlaneModalCancel").css('margin-left','8px') $("#newPlaneModalCancel").css("margin-left", "8px");
$("#closeModal").css('margin-left','0px') $("#closeModal").css("margin-left", "0px");
$("#closeModal").css('padding-left','0px') $("#closeModal").css("padding-left", "0px");
//anthology //anthology
$("#anthology").css('direction','rtl') $("#anthology").css("direction", "rtl");
$("#anthologyDisclaimer").css('float','right') $("#anthologyDisclaimer").css("float", "right");
} else {
}
else{
//navbar //navbar
$("nav").css('direction','ltr') $("nav").css("direction", "ltr");
$(".nav-menus").addClass('mr-auto') $(".nav-menus").addClass("mr-auto");
$(".nav-button").removeClass('mr-auto') $(".nav-button").removeClass("mr-auto");
//form //form
// $(".ql-container").css('direction','ltr') // $(".ql-container").css('direction','ltr')
// $(".ql-container").css('float','left') // $(".ql-container").css('float','left')
// $(".ql-editor").css('float','left') // $(".ql-editor").css('float','left')
// $(".ql-editor p").css('float','none') // $(".ql-editor p").css('float','none')
$(".modal-content").css('direction','ltr') $(".modal-content").css("direction", "ltr");
$(".bold").css('float','left') $(".bold").css("float", "left");
$("#public").css('margin-left','0px') $("#public").css("margin-left", "0px");
$("#prive").css('margin-left','0px') $("#prive").css("margin-left", "0px");
$("#newPlaneModalAnonyme").css('margin-right','0px') $("#newPlaneModalAnonyme").css("margin-right", "0px");
$("#newPlaneModalCancel").css('margin-left','0px') $("#newPlaneModalCancel").css("margin-left", "0px");
//anthology //anthology
$("#anthology").css('direction','ltr') $("#anthology").css("direction", "ltr");
$("#anthologyDisclaimer").css('float','left') $("#anthologyDisclaimer").css("float", "left");
} }
//changing all strings //changing all strings
//main page //main page
$('head title', window.parent.document).text(s.avionpoeme); $("head title", window.parent.document).text(s.avionpoeme);
$("#navTitle").html(s.avionpoeme) $("#navTitle").html(s.avionpoeme);
$("#buttonAnthology").html(s.anthologie) $("#buttonAnthology").html(s.anthologie);
$("#buttonAbout").html(s.apropos) $("#buttonAbout").html(s.apropos);
if (typeof nbPlane !== 'undefined') { if (typeof nbPlane !== "undefined") {
$("#buttonNewPlane").val(s.lancer_avion+" "+nbPlane+"/100") $("#buttonNewPlane").val(s.lancer_avion + " " + nbPlane + "/100");
} else { } else {
$("#buttonNewPlane").on('click', () => { $("#buttonNewPlane").on("click", () => {
window.location.replace("/"); window.location.replace("/");
}) });
} }
//new plane form //new plane form
$("#newPlaneModalTitle").html(s.lancer_avion) $("#newPlaneModalTitle").html(s.lancer_avion);
$("#newPlaneModalMessage").html(s.message) $("#newPlaneModalMessage").html(s.message);
$("#newPlaneModalPrive").html(s.prive) $("#newPlaneModalPrive").html(s.prive);
$("#newPlaneModalPublic").html(s.public) $("#newPlaneModalPublic").html(s.public);
$("#flightTime").html(s.temps_de_vol) $("#labelAttachment").html(s.PJ_Ajouter);
$("#newPlaneModalRandom").html(s.aléatoire) console.log(s);
$("#newPlaneModal3j").html(s.trois_jours) $("#attachmentPlaneLabel").attr("data-after", s.PJ_Parcourir);
$("#newPlaneModal7j").html(s.sept_jours) $("#flightTime").html(s.temps_de_vol);
$("#newPlaneModal30j").html(s.trente_jours) $("#newPlaneModalRandom").html(s.aléatoire);
$("#newPlaneModal365j").html(s.unan_jours) $("#newPlaneModal3j").html(s.trois_jours);
$("#newPlaneModalExpediteur").html(s.expediteur) $("#newPlaneModal7j").html(s.sept_jours);
$("#newPlaneModalDestinataire").html(s.destinataire) $("#newPlaneModal30j").html(s.trente_jours);
$("#newPlaneModalAnonyme").html(s.anonyme) $("#newPlaneModal365j").html(s.unan_jours);
$("#newPlaneModalCancel").html(s.annuler) $("#newPlaneModalExpediteur").html(s.expediteur);
$("#sendNewPlane").html(s.lancer) $("#newPlaneModalDestinataire").html(s.destinataire);
$("#destLang").html(s.langue_destinataire) $("#newPlaneModalAnonyme").html(s.anonyme);
$("#expeMail").attr("placeholder", s.expeMail_placeholder) $("#newPlaneModalCancel").html(s.annuler);
$("#expeGeocoderPhoton").attr("placeholder", s.expeLoc_placeholder) $("#sendNewPlane").html(s.lancer);
$("#destMail").attr("placeholder", s.destMail_placeholder) $("#destLang").html(s.langue_destinataire);
$("#destGeocoderPhoton").attr("placeholder", s.destLoc_placeholder) $("#expeMail").attr("placeholder", s.expeMail_placeholder);
$('#anonymeTooltip').attr("title", s.anonyme_tooltip).tooltip("_fixTitle"); $("#expeGeocoderPhoton").attr("placeholder", s.expeLoc_placeholder);
$('#publicTooltip').attr("title", s.public_tooltip).tooltip("_fixTitle"); $("#destMail").attr("placeholder", s.destMail_placeholder);
$("#destGeocoderPhoton").attr("placeholder", s.destLoc_placeholder);
$("#anonymeTooltip").attr("title", s.anonyme_tooltip).tooltip("_fixTitle");
$("#publicTooltip").attr("title", s.public_tooltip).tooltip("_fixTitle");
$('#selectDestLang option[value="'+lang+'"]').prop('selected', true); //selecting by default recipient language same as interface $('#selectDestLang option[value="' + lang + '"]').prop("selected", true); //selecting by default recipient language same as interface
//Anthology //Anthology
displayAnthology() displayAnthology();
$("#anthologyTitle").html(s.anthologie) $("#anthologyTitle").html(s.anthologie);
$("#anthologyDisclaimer").html(s.suppr_message_public) $("#anthologyDisclaimer").html(s.suppr_message_public);
$("#closeAnthologyAbout").html(s.retour_carte) $("#closeAnthologyAbout").html(s.retour_carte);
//About //About
$("#aboutTitle").html(s.apropos) $("#aboutTitle").html(s.apropos);
$("#librairies").html(s.librairies) $("#librairies").html(s.librairies);
$("#mapSources").html(s.source_carte) $("#mapSources").html(s.source_carte);
$("#mapBackground").html(s.map_background) $("#mapBackground").html(s.map_background);
$("#clouds").html(s.clouds) $("#clouds").html(s.clouds);
$.getJSON("lang/about.json", function (e) { $.getJSON("lang/about.json", function (e) {
if(lang !== 'en' && lang !== 'fr' && lang !== 'de'){ if (lang !== "en" && lang !== "fr" && lang !== "de") {
$("#aboutText").html(e[0].en) $("#aboutText").html(e[0].en);
} else {
$("#aboutText").html(e[0][lang]);
} }
else{ $("#donationText").html(s.AvionPoeme_free_independent);
$("#aboutText").html(e[0][lang]) $("#donationButtonText").html(s.Soutenez_avionpoeme);
} $("#donationButtonText").addClass(lang);
$("#donationText").html(s.AvionPoeme_free_independent) });
$("#donationButtonText").html(s.Soutenez_avionpoeme)
$("#donationButtonText").addClass(lang)
})
//plane limit tooltip //plane limit tooltip
if (typeof nbPlane !== 'undefined') { if (typeof nbPlane !== "undefined") {
if (nbPlane > 99) { if (nbPlane > 99) {
$("#planeLimitTooltip").attr("title", s.AvionPoeme_epuise).tooltip("_fixTitle"); $("#planeLimitTooltip")
} .attr("title", s.AvionPoeme_epuise)
else{ .tooltip("_fixTitle");
} else {
var remainingPlanes = 100 - nbPlane; var remainingPlanes = 100 - nbPlane;
s.NB_AvionPoeme_restant = s.NB_AvionPoeme_restant.replace('$NB_avion_poeme',remainingPlanes) s.NB_AvionPoeme_restant = s.NB_AvionPoeme_restant.replace(
$("#planeLimitTooltip").attr("title", s.NB_AvionPoeme_restant).tooltip("_fixTitle"); "$NB_avion_poeme",
remainingPlanes
);
$("#planeLimitTooltip")
.attr("title", s.NB_AvionPoeme_restant)
.tooltip("_fixTitle");
} }
} }
}).always(function (callback) {
})
.always(function(callback) {
//console.log( callback ); //console.log( callback );
}); });
} }
@@ -180,5 +191,3 @@ $( "#navbarDropdownLang" ).mouseenter(function() {
$("#navbarDropdownLang").mouseleave(function () { $("#navbarDropdownLang").mouseleave(function () {
$("#langIcon").attr("src", "src/img/lang.png"); $("#langIcon").attr("src", "src/img/lang.png");
}); });