From 8e64350ed3a72cc03982b5123d87997fe8a1a256 Mon Sep 17 00:00:00 2001 From: leosw Date: Wed, 17 Oct 2018 21:30:21 +0200 Subject: [PATCH] update third libs --- controllers/d.users.php | 5 +- models/d.users.php | 29 +- views/blocks/d.head.html | 4 +- views/d.user.profile.html | 10 +- .../font-awesome-4.7.0/css/font-awesome.css | 2337 --- .../css/font-awesome.min.css | 4 - .../font-awesome-4.7.0/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes .../fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../fonts/fontawesome-webfont.svg | 2671 ---- .../fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../fontawesome-free-5.4.1-web/css/all.css | 3950 +++++ .../css/all.min.css | 5 + .../webfonts/fa-brands-400.eot | Bin 0 -> 123540 bytes .../webfonts/fa-brands-400.svg | 1175 ++ .../webfonts/fa-brands-400.ttf | Bin 0 -> 123304 bytes .../webfonts/fa-brands-400.woff | Bin 0 -> 79752 bytes .../webfonts/fa-brands-400.woff2 | Bin 0 -> 68240 bytes .../webfonts/fa-regular-400.eot | Bin 0 -> 40576 bytes .../webfonts/fa-regular-400.svg | 467 + .../webfonts/fa-regular-400.ttf | Bin 0 -> 40348 bytes .../webfonts/fa-regular-400.woff | Bin 0 -> 18168 bytes .../webfonts/fa-regular-400.woff2 | Bin 0 -> 14880 bytes .../webfonts/fa-solid-900.eot | Bin 0 -> 191332 bytes .../webfonts/fa-solid-900.svg | 2564 +++ .../webfonts/fa-solid-900.ttf | Bin 0 -> 191112 bytes .../webfonts/fa-solid-900.woff | Bin 0 -> 92696 bytes .../webfonts/fa-solid-900.woff2 | Bin 0 -> 72000 bytes views/third/jquery-3.3.1.min.js | 2 + .../third/leaflet-easybutton/easy-button.css | 0 views/third/leaflet-easybutton/easy-button.js | 40 +- .../leaflet-fullscreen/Leaflet.fullscreen.js | 0 .../Leaflet.fullscreen.min.js | 0 views/third/leaflet-fullscreen/fullscreen.png | Bin .../leaflet-fullscreen/fullscreen@2x.png | Bin .../leaflet-fullscreen/leaflet.fullscreen.css | 0 views/third/leaflet/images/layers-2x.png | Bin views/third/leaflet/images/layers.png | Bin views/third/leaflet/images/marker-icon-2x.png | Bin 2586 -> 2464 bytes views/third/leaflet/images/marker-icon.png | Bin views/third/leaflet/images/marker-shadow.png | Bin views/third/leaflet/leaflet-src.js | 13251 ---------------- views/third/leaflet/leaflet-src.map | 1 - views/third/leaflet/leaflet.css | 39 +- views/third/leaflet/leaflet.js | 14 +- 46 files changed, 8235 insertions(+), 18333 deletions(-) delete mode 100755 views/third/font-awesome-4.7.0/css/font-awesome.css delete mode 100755 views/third/font-awesome-4.7.0/css/font-awesome.min.css delete mode 100755 views/third/font-awesome-4.7.0/fonts/FontAwesome.otf delete mode 100755 views/third/font-awesome-4.7.0/fonts/fontawesome-webfont.eot delete mode 100755 views/third/font-awesome-4.7.0/fonts/fontawesome-webfont.svg delete mode 100755 views/third/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf delete mode 100755 views/third/font-awesome-4.7.0/fonts/fontawesome-webfont.woff delete mode 100755 views/third/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 create mode 100644 views/third/fontawesome-free-5.4.1-web/css/all.css create mode 100644 views/third/fontawesome-free-5.4.1-web/css/all.min.css create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.eot create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.svg create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.ttf create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff2 create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.eot create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.svg create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.ttf create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2 create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.eot create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.svg create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.ttf create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff create mode 100644 views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff2 create mode 100644 views/third/jquery-3.3.1.min.js mode change 100755 => 100644 views/third/leaflet-easybutton/easy-button.css mode change 100755 => 100644 views/third/leaflet-easybutton/easy-button.js mode change 100755 => 100644 views/third/leaflet-fullscreen/Leaflet.fullscreen.js mode change 100755 => 100644 views/third/leaflet-fullscreen/Leaflet.fullscreen.min.js mode change 100755 => 100644 views/third/leaflet-fullscreen/fullscreen.png mode change 100755 => 100644 views/third/leaflet-fullscreen/fullscreen@2x.png mode change 100755 => 100644 views/third/leaflet-fullscreen/leaflet.fullscreen.css mode change 100755 => 100644 views/third/leaflet/images/layers-2x.png mode change 100755 => 100644 views/third/leaflet/images/layers.png mode change 100755 => 100644 views/third/leaflet/images/marker-icon-2x.png mode change 100755 => 100644 views/third/leaflet/images/marker-icon.png mode change 100755 => 100644 views/third/leaflet/images/marker-shadow.png delete mode 100755 views/third/leaflet/leaflet-src.js delete mode 100755 views/third/leaflet/leaflet-src.map mode change 100755 => 100644 views/third/leaflet/leaflet.css mode change 100755 => 100644 views/third/leaflet/leaflet.js diff --git a/controllers/d.users.php b/controllers/d.users.php index f178c53..4b9b055 100755 --- a/controllers/d.users.php +++ b/controllers/d.users.php @@ -76,7 +76,7 @@ if(isset($controller->splitted_url[1])) { if (isset($_POST['submit'])) { // PROCESS DATA FROM FORM $user = new User(); - $user->mail = strtolower($_POST['mail']); + $user->email = strtolower($_POST['mail']); if($user->availableMail()) { header('Location: '.$config['rel_root_folder'].'user/password_lost?error=1'); @@ -102,8 +102,7 @@ if(isset($controller->splitted_url[1])) { $userProfile->checkID(intval($controller->splitted_url[2])); } $head['title'] = "Profil inexistant"; - if($userProfile->id != 0) { - $userProfile->populate(); + if($userProfile->get_id() != 0) { $head['title'] = "Profil de ".$userProfile->name; } diff --git a/models/d.users.php b/models/d.users.php index ead7c37..52e4147 100755 --- a/models/d.users.php +++ b/models/d.users.php @@ -97,11 +97,17 @@ class User } /***** - ** Populate the object using raw data from SQL + ** Simple return only functions *****/ public function get_id() { return $this->id; } + public function get_avatar() { + if( $this->is_avatar_present ) + return $this->id; + else + return NULL; + } /***** ** Returns true if user permissions are higher than $rank @@ -151,7 +157,7 @@ class User $con = pg_connect("host=".$config['SQL_host']." dbname=".$config['SQL_db']." user=".$config['SQL_user']." password=".$config['SQL_pass']) or die ("Could not connect to server\n"); - $query = "SELECT id FROM users WHERE lower(name)=$1"; + $query = "SELECT * FROM users WHERE lower(name)=$1"; pg_prepare($con, "prepare1", $query) or die ("Cannot prepare statement\n"); @@ -165,8 +171,8 @@ class User } else { if(pg_num_rows($result)==1) { - $user = pg_fetch_assoc($result); - $this->id = $user['id']; + $row = pg_fetch_assoc($result); + $this->populate($row); } return 0; } @@ -181,7 +187,7 @@ class User $con = pg_connect("host=".$config['SQL_host']." dbname=".$config['SQL_db']." user=".$config['SQL_user']." password=".$config['SQL_pass']) or die ("Could not connect to server\n"); - $query = "SELECT id FROM users WHERE lower(email)=$1"; + $query = "SELECT * FROM users WHERE lower(email)=$1"; pg_prepare($con, "prepare1", $query) or die ("Cannot prepare statement\n"); @@ -195,8 +201,8 @@ class User } else { if(pg_num_rows($result)==1) { - $user = pg_fetch_assoc($result); - $this->id = $user['id']; + $row = pg_fetch_assoc($result); + $this->populate($row); } return 0; } @@ -279,17 +285,16 @@ class User $con = pg_connect("host=".$config['SQL_host']." dbname=".$config['SQL_db']." user=".$config['SQL_user']." password=".$config['SQL_pass']) or die ("Could not connect to server\n"); - $query = "UPDATE users SET password = $1 WHERE mail = $2"; + $query = "UPDATE users SET password = $1 WHERE email = $2"; pg_prepare($con, "prepare1", $query) or die ("Cannot prepare statement\n"); - pg_execute($con, "prepare1", array($this->password, $this->mail)) + pg_execute($con, "prepare1", array($this->password, $this->email)) or die ("Cannot execute statement\n"); pg_close($con); - $this->availableMail(); - $this->populate(); + $this->availableMail(); // Retreive user data from email $url = "http://".$_SERVER['SERVER_NAME'].$config['rel_root_folder']; @@ -308,7 +313,7 @@ class User 'MIME-Version: 1.0' . "\r\n" . 'Content-type: text/html; charset=UTF-8' . "\r\n"; - mail($this->mail, 'Kabano - Nouveau mot de passe', $message, $headers); + mail($this->email, 'Kabano - Nouveau mot de passe', $message, $headers); } /***** diff --git a/views/blocks/d.head.html b/views/blocks/d.head.html index 6c923b9..fad594e 100755 --- a/views/blocks/d.head.html +++ b/views/blocks/d.head.html @@ -10,9 +10,9 @@ else { ?> - + - + diff --git a/views/d.user.profile.html b/views/d.user.profile.html index 87936c5..3485261 100755 --- a/views/d.user.profile.html +++ b/views/d.user.profile.html @@ -8,18 +8,18 @@
- id != 0) { ?> + get_id() != 0) { ?>

name?>

- role >= 800 || $user->id == $userProfile->id) { ?> - Éditer les paramètres du compte + rank_is_higher("moderator") || $user->get_id() == $userProfile->get_id()) { ?> + Éditer les paramètres du compte

Le message a bien été envoyé.

-