diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index e9815b0..49c715f
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/includes/config.php
/medias/*
+/_maps
*.sublime-project
*.sublime-workspace
*.log
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/_ressources/database_drawing b/_ressources/database_drawing
old mode 100644
new mode 100755
diff --git a/_ressources/db_model.dbm b/_ressources/db_model.dbm
old mode 100644
new mode 100755
diff --git a/_ressources/logo.svg b/_ressources/logo.svg
old mode 100644
new mode 100755
diff --git a/_ressources/sql_skeleton.sql b/_ressources/sql_skeleton.sql
old mode 100644
new mode 100755
index 17262c7..628654c
--- a/_ressources/sql_skeleton.sql
+++ b/_ressources/sql_skeleton.sql
@@ -6,10 +6,7 @@
-- object: kabano | type: ROLE --
-- DROP ROLE IF EXISTS kabano;
-CREATE ROLE kabano WITH
- INHERIT
- LOGIN
- ENCRYPTED PASSWORD '********';
+
-- ddl-end --
@@ -42,7 +39,7 @@ SET search_path TO pg_catalog,public,topology;
-- DROP EXTENSION IF EXISTS postgis CASCADE;
CREATE EXTENSION postgis
WITH SCHEMA public
- VERSION '2.5.1';
+ VERSION '3.0.1';
-- ddl-end --
COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
-- ddl-end --
@@ -51,7 +48,7 @@ COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial
-- DROP EXTENSION IF EXISTS postgis_topology CASCADE;
CREATE EXTENSION postgis_topology
WITH SCHEMA topology
- VERSION '2.5.1';
+ VERSION '3.0.1';
-- ddl-end --
COMMENT ON EXTENSION postgis_topology IS 'PostGIS topology spatial types and functions';
-- ddl-end --
diff --git a/controllers/d.admin.php b/controllers/d.admin.php
old mode 100644
new mode 100755
index eb5df90..6a6ebce
--- a/controllers/d.admin.php
+++ b/controllers/d.admin.php
@@ -34,7 +34,7 @@ if(isset($controller->splitted_url[1]) && $user->rankIsHigher("moderator")) {
}
chdir($config['logs_folder']);
- exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
+ //exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
include ($config['views_folder']."d.admin.logs.html");
}
diff --git a/controllers/d.blog.php b/controllers/d.blog.php
old mode 100644
new mode 100755
diff --git a/controllers/d.contact.php b/controllers/d.contact.php
old mode 100644
new mode 100755
diff --git a/controllers/d.map.php b/controllers/d.map.php
old mode 100644
new mode 100755
diff --git a/controllers/d.users.php b/controllers/d.users.php
old mode 100644
new mode 100755
diff --git a/controllers/d.wiki.php b/controllers/d.wiki.php
old mode 100644
new mode 100755
diff --git a/includes/config.example.php b/includes/config.example.php
old mode 100644
new mode 100755
diff --git a/includes/images.php b/includes/images.php
old mode 100644
new mode 100755
diff --git a/includes/routes.php b/includes/routes.php
old mode 100644
new mode 100755
diff --git a/includes/session.php b/includes/session.php
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
diff --git a/models/d.blog.php b/models/d.blog.php
old mode 100644
new mode 100755
diff --git a/models/d.locales.php b/models/d.locales.php
old mode 100644
new mode 100755
diff --git a/models/d.poi.php b/models/d.poi.php
old mode 100644
new mode 100755
diff --git a/models/d.users.php b/models/d.users.php
old mode 100644
new mode 100755
diff --git a/models/d.wiki.php b/models/d.wiki.php
old mode 100644
new mode 100755
diff --git a/third/Md/Markdown.inc.php b/third/Md/Markdown.inc.php
old mode 100644
new mode 100755
diff --git a/third/Md/Markdown.php b/third/Md/Markdown.php
old mode 100644
new mode 100755
diff --git a/third/Md/MarkdownExtra.inc.php b/third/Md/MarkdownExtra.inc.php
old mode 100644
new mode 100755
diff --git a/third/Md/MarkdownExtra.php b/third/Md/MarkdownExtra.php
old mode 100644
new mode 100755
diff --git a/third/Md/MarkdownInterface.inc.php b/third/Md/MarkdownInterface.inc.php
old mode 100644
new mode 100755
diff --git a/third/Md/MarkdownInterface.php b/third/Md/MarkdownInterface.php
old mode 100644
new mode 100755
diff --git a/views/blocks/d.footer.html b/views/blocks/d.footer.html
old mode 100644
new mode 100755
diff --git a/views/blocks/d.head.html b/views/blocks/d.head.html
old mode 100644
new mode 100755
diff --git a/views/blocks/d.nav.html b/views/blocks/d.nav.html
old mode 100644
new mode 100755
diff --git a/views/css/d.blog.css b/views/css/d.blog.css
old mode 100644
new mode 100755
diff --git a/views/css/d.index.css b/views/css/d.index.css
old mode 100644
new mode 100755
diff --git a/views/css/d.map.css b/views/css/d.map.css
old mode 100644
new mode 100755
diff --git a/views/css/d.user.css b/views/css/d.user.css
old mode 100644
new mode 100755
diff --git a/views/css/d.wiki.css b/views/css/d.wiki.css
old mode 100644
new mode 100755
diff --git a/views/d.admin.git-pull.html b/views/d.admin.git-pull.html
old mode 100644
new mode 100755
diff --git a/views/d.admin.html b/views/d.admin.html
old mode 100644
new mode 100755
diff --git a/views/d.admin.logs.html b/views/d.admin.logs.html
old mode 100644
new mode 100755
diff --git a/views/d.blog.edit.html b/views/d.blog.edit.html
old mode 100644
new mode 100755
diff --git a/views/d.blog.list.html b/views/d.blog.list.html
old mode 100644
new mode 100755
diff --git a/views/d.blog.list.rss b/views/d.blog.list.rss
old mode 100644
new mode 100755
diff --git a/views/d.blog.view.html b/views/d.blog.view.html
old mode 100644
new mode 100755
diff --git a/views/d.contact.html b/views/d.contact.html
old mode 100644
new mode 100755
diff --git a/views/d.index.html b/views/d.index.html
old mode 100644
new mode 100755
diff --git a/views/d.map.html b/views/d.map.html
old mode 100644
new mode 100755
diff --git a/views/d.user.login.html b/views/d.user.login.html
old mode 100644
new mode 100755
diff --git a/views/d.user.member_list.html b/views/d.user.member_list.html
old mode 100644
new mode 100755
diff --git a/views/d.user.password_lost.html b/views/d.user.password_lost.html
old mode 100644
new mode 100755
diff --git a/views/d.user.profile.edit.html b/views/d.user.profile.edit.html
old mode 100644
new mode 100755
diff --git a/views/d.user.profile.html b/views/d.user.profile.html
old mode 100644
new mode 100755
diff --git a/views/d.user.signin.html b/views/d.user.signin.html
old mode 100644
new mode 100755
diff --git a/views/d.wiki.edit.html b/views/d.wiki.edit.html
old mode 100644
new mode 100755
diff --git a/views/d.wiki.view.html b/views/d.wiki.view.html
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraMono-Bold.eot b/views/fonts/FiraMono-Bold.eot
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraMono-Bold.otf b/views/fonts/FiraMono-Bold.otf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Bold.ttf b/views/fonts/FiraSans-Bold.ttf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-ExtraLight.eot b/views/fonts/FiraSans-ExtraLight.eot
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-ExtraLight.otf b/views/fonts/FiraSans-ExtraLight.otf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-ExtraLight.ttf b/views/fonts/FiraSans-ExtraLight.ttf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Light.eot b/views/fonts/FiraSans-Light.eot
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Light.otf b/views/fonts/FiraSans-Light.otf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Light.ttf b/views/fonts/FiraSans-Light.ttf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Medium.eot b/views/fonts/FiraSans-Medium.eot
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Medium.otf b/views/fonts/FiraSans-Medium.otf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Medium.ttf b/views/fonts/FiraSans-Medium.ttf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Regular.eot b/views/fonts/FiraSans-Regular.eot
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Regular.otf b/views/fonts/FiraSans-Regular.otf
old mode 100644
new mode 100755
diff --git a/views/fonts/FiraSans-Regular.ttf b/views/fonts/FiraSans-Regular.ttf
old mode 100644
new mode 100755
diff --git a/views/img/aside.jpg b/views/img/aside.jpg
old mode 100644
new mode 100755
diff --git a/views/img/favicon.png b/views/img/favicon.png
old mode 100644
new mode 100755
diff --git a/views/img/header.svg b/views/img/header.svg
old mode 100644
new mode 100755
diff --git a/views/img/header_rss.svg b/views/img/header_rss.svg
old mode 100644
new mode 100755
diff --git a/views/img/thumb1.jpg b/views/img/thumb1.jpg
old mode 100644
new mode 100755
diff --git a/views/img/thumb2.jpg b/views/img/thumb2.jpg
old mode 100644
new mode 100755
diff --git a/views/img/thumb3.jpg b/views/img/thumb3.jpg
old mode 100644
new mode 100755
diff --git a/views/js/d.avatar.js b/views/js/d.avatar.js
old mode 100644
new mode 100755
diff --git a/views/js/d.captcha.js b/views/js/d.captcha.js
old mode 100644
new mode 100755
diff --git a/views/js/d.header.js b/views/js/d.header.js
old mode 100644
new mode 100755
diff --git a/views/js/d.map.js b/views/js/d.map.js
old mode 100644
new mode 100755
index 01d0b31..9c96ae3
--- a/views/js/d.map.js
+++ b/views/js/d.map.js
@@ -2,20 +2,22 @@ var mymap;
$( document ).ready(function() {
// Differents layers for the map
- var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {maxZoom: 20, attribution: 'Maps © OpenSreetMap France, Data © OpenStreetMap contributors'});
- var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {maxZoom: 18, attribution: 'Maps © Wikimedia, Data © OpenStreetMap contributors'});
+ var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {tms: true, maxZoom: 20, attribution: 'Maps © OpenSreetMap France, Data © OpenStreetMap contributors'});
+ var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'Maps © Wikimedia, Data © OpenStreetMap contributors'});
+ var crozet = L.tileLayer('/_maps/osm_cro/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'For dev purpose only'});
// Base layers
var baseLayers = {
"OSM France": osmfr,
"OSM Wikimedia": wikimedia,
+ "Crozet": crozet,
};
mymap = L.map('mapid', {
zoomControl: false,
- layers: [wikimedia],
- }).setView([47.018, 3.142], 6);
- $("#map-credits").html(wikimedia.getAttribution());
+ layers: [crozet],
+ }).setView([-46.407, 51.766], 12);
+ $("#map-credits").html(crozet.getAttribution());
L.control.scale({
position: "bottomleft",
diff --git a/views/third/fontawesome-free-5.4.1-web/css/all.css b/views/third/fontawesome-free-5.4.1-web/css/all.css
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/css/all.min.css b/views/third/fontawesome-free-5.4.1-web/css/all.min.css
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.eot b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.eot
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.svg b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.svg
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.ttf b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.ttf
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff2 b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff2
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.eot b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.eot
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.svg b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.svg
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.ttf b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.ttf
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2 b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.eot b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.eot
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.svg b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.svg
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.ttf b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.ttf
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff
old mode 100644
new mode 100755
diff --git a/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff2 b/views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff2
old mode 100644
new mode 100755
diff --git a/views/third/jquery-3.3.1.min.js b/views/third/jquery-3.3.1.min.js
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-easybutton/easy-button.css b/views/third/leaflet-easybutton/easy-button.css
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-easybutton/easy-button.js b/views/third/leaflet-easybutton/easy-button.js
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-fullscreen/Leaflet.fullscreen.js b/views/third/leaflet-fullscreen/Leaflet.fullscreen.js
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-fullscreen/Leaflet.fullscreen.min.js b/views/third/leaflet-fullscreen/Leaflet.fullscreen.min.js
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-fullscreen/fullscreen.png b/views/third/leaflet-fullscreen/fullscreen.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-fullscreen/fullscreen@2x.png b/views/third/leaflet-fullscreen/fullscreen@2x.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet-fullscreen/leaflet.fullscreen.css b/views/third/leaflet-fullscreen/leaflet.fullscreen.css
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/images/layers-2x.png b/views/third/leaflet/images/layers-2x.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/images/layers.png b/views/third/leaflet/images/layers.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/images/marker-icon-2x.png b/views/third/leaflet/images/marker-icon-2x.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/images/marker-icon.png b/views/third/leaflet/images/marker-icon.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/images/marker-shadow.png b/views/third/leaflet/images/marker-shadow.png
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/leaflet.css b/views/third/leaflet/leaflet.css
old mode 100644
new mode 100755
diff --git a/views/third/leaflet/leaflet.js b/views/third/leaflet/leaflet.js
old mode 100644
new mode 100755