La mise à jour affichera les erreurs

Reviewed-on: https://git.lstronic.com/gogs/leo/kabano/pulls/1

.gitignore

@@ -1,5 +1,8 @@
 /includes/config.php
 /medias/*
+/_maps
+_ressources/dump.sql
 *.sublime-project
 *.sublime-workspace
 *.log
+/tmp/*

_ressources/db_model.dbm

@@ -0,0 +1,882 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+CAUTION: Do not modify this file unless you know what you are doing.
+         Unexpected results may occur if the code is changed deliberately.
+-->
+<dbmodel pgmodeler-ver="0.9.2-alpha1" last-position="0,998" last-zoom="0.9" max-obj-count="24"
+	 default-owner="postgres">
+<role name="kabano"
+      inherit="true"
+      login="true"
+      encrypted="true"
+      password="********">
+</role>
+
+<database name="kabano" encoding="UTF8" lc-collate="fr_FR.UTF-8" lc-ctype="fr_FR.UTF-8" is-template="false" allow-conns="true">
+	<role name="kabano"/>
+	<tablespace name="pg_default"/>
+</database>
+
+<schema name="public" layer="0" rect-visible="true" fill-color="#e1e1e1" sql-disabled="true">
+</schema>
+
+<schema name="topology" layer="0" rect-visible="true" fill-color="#c8e6ff">
+	<role name="kabano"/>
+	<comment><![CDATA[PostGIS Topology schema]]></comment>
+</schema>
+
+<extension name="postgis" cur-version="2.5.1">
+	<schema name="public"/>
+	<comment><![CDATA[PostGIS geometry, geography, and raster spatial types and functions]]></comment>
+</extension>
+
+<extension name="postgis_topology" cur-version="2.5.1">
+	<schema name="topology"/>
+	<comment><![CDATA[PostGIS topology spatial types and functions]]></comment>
+</extension>
+
+<usertype name="content_type_enum" configuration="enumeration">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<enumeration values="wiki,blog,forum"/>
+</usertype>
+
+<usertype name="poi_type_enum" configuration="enumeration">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<enumeration values="basic_hut,wilderness_hut,alpine_hut,halt,bivouac,campsite"/>
+</usertype>
+
+<usertype name="user_rank_enum" configuration="enumeration">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<enumeration values="blocked,registered,premium,moderator,administrator,visitor"/>
+</usertype>
+
+<sequence name="content_comments_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="content_comments" layer="0" collapse-mode="2" max-obj-count="12">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="540" y="340"/>
+	<column name="id" not-null="true" sequence="public.content_comments_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="version">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="creation_date">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="update_date">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="author">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="is_public">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="is_archive">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="content">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="comment">
+		<type name="text" length="0"/>
+	</column>
+	<column name="locale">
+		<type name="character varying" length="32"/>
+	</column>
+	<constraint name="content_comments_pkey" type="pk-constr" table="public.content_comments">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="content_contributors_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="content_contributors" layer="0" collapse-mode="2" max-obj-count="4">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1460" y="300"/>
+	<column name="id" not-null="true" sequence="public.content_contributors_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="content">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="contributor">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="content_contributors_pkey" type="pk-constr" table="public.content_contributors">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="content_contributors_unique" type="uq-constr" table="public.content_contributors">
+		<columns names="content,contributor" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="contents_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="contents" layer="0" collapse-mode="2" max-obj-count="7">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="540" y="60"/>
+	<column name="id" not-null="true" sequence="public.contents_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="permalink" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="creation_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="is_public" not-null="true" default-value="true">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="is_commentable" not-null="true" default-value="true">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="type" not-null="true">
+		<type name="public.content_type_enum" length="0"/>
+	</column>
+	<constraint name="contents_pkey" type="pk-constr" table="public.contents">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="contents_permalink_type_key" type="uq-constr" table="public.contents">
+		<columns names="permalink,type" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="locales" layer="0" collapse-mode="2" max-obj-count="3">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="700" y="800"/>
+	<column name="name" not-null="true">
+		<type name="character varying" length="32"/>
+	</column>
+	<column name="display_name" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="flag_name">
+		<type name="character varying" length="32"/>
+	</column>
+	<constraint name="locales_display_name_unique" type="uq-constr" table="public.locales">
+		<columns names="display_name" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="locales_flag_name_unique" type="uq-constr" table="public.locales">
+		<columns names="flag_name" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="locales_pkey" type="pk-constr" table="public.locales">
+		<columns names="name" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="poi_comments_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="poi_comments" layer="0" collapse-mode="2" max-obj-count="13">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1100" y="980"/>
+	<column name="id" not-null="true" sequence="public.poi_comments_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="permalink">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="version">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="creation_date">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="update_date">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="author">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="is_public">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="is_archive">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="poi">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="comment">
+		<type name="text" length="0"/>
+	</column>
+	<column name="locale">
+		<type name="character varying" length="32"/>
+	</column>
+	<constraint name="poi_comments_permalink_version_key" type="uq-constr" table="public.poi_comments">
+		<columns names="permalink,version" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_comments_pkey" type="pk-constr" table="public.poi_comments">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="poi_contributors_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="poi_contributors" layer="0" collapse-mode="2" max-obj-count="4">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1560" y="820"/>
+	<column name="id" not-null="true" sequence="public.poi_contributors_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="poi">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="contributor">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="poi_contributors_pkey" type="pk-constr" table="public.poi_contributors">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_contributors_unique" type="uq-constr" table="public.poi_contributors">
+		<columns names="poi,contributor" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="poi_locales_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="poi_locales" layer="0" collapse-mode="2" max-obj-count="4">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="720" y="1340"/>
+	<column name="id" not-null="true" default-value="nextval('poi_locales_sequence'::regclass)">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="locale" not-null="true">
+		<type name="character varying" length="32"/>
+	</column>
+	<column name="poi_id" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="poi_localised_pkey" type="pk-constr" table="public.poi_locales">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_localised_unique" type="uq-constr" table="public.poi_locales">
+		<columns names="locale,poi_id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="sources" layer="0" collapse-mode="2" max-obj-count="7">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1160" y="1660"/>
+	<column name="id" not-null="true">
+		<type name="character varying" length="3"/>
+	</column>
+	<column name="display_name" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="icon_name">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="website">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="license_name">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="license_url">
+		<type name="character varying" length="255"/>
+	</column>
+	<constraint name="sources_display_name_unique" type="uq-constr" table="public.sources">
+		<columns names="display_name" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="sources_pkey" type="pk-constr" table="public.sources">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<sequence name="poi_versions_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<sequence name="pois_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<sequence name="users_id_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="users" layer="0" collapse-mode="2" max-obj-count="15">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1140" y="540"/>
+	<column name="id" not-null="true" sequence="public.users_id_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="name" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="version" not-null="true" default-value="0">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="email" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="password" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="website">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="is_avatar_present" not-null="true">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="is_archive" not-null="true">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="rank" not-null="true">
+		<type name="public.user_rank_enum" length="0"/>
+	</column>
+	<column name="locale" not-null="true">
+		<type name="character varying" length="32"/>
+	</column>
+	<column name="timezone" not-null="true">
+		<type name="character varying" length="8"/>
+	</column>
+	<column name="visit_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="register_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<constraint name="users_email_unique" type="uq-constr" table="public.users">
+		<columns names="email" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="users_name_unique" type="uq-constr" table="public.users">
+		<columns names="name,version" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="users_pkey" type="pk-constr" table="public.users">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<index name="content_comments_is_archive_index" table="public.content_comments"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_archive"/>
+		</idxelement>
+</index>
+
+<index name="content_comments_is_public_index" table="public.content_comments"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_public"/>
+		</idxelement>
+</index>
+
+<index name="contents_is_public_index" table="public.contents"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_public"/>
+		</idxelement>
+</index>
+
+<index name="poi_comments_is_archive_index" table="public.poi_comments"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_archive"/>
+		</idxelement>
+</index>
+
+<index name="poi_comments_is_public_index" table="public.poi_comments"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_public"/>
+		</idxelement>
+</index>
+
+<index name="users_is_archive_index" table="public.users"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_archive"/>
+		</idxelement>
+</index>
+
+<index name="users_register_date_index" table="public.users"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="register_date"/>
+		</idxelement>
+</index>
+
+<sequence name="content_locales_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<sequence name="content_versions_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<index name="fki_content_contributors_contributor_fkey" table="public.content_contributors"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="contributor"/>
+		</idxelement>
+</index>
+
+<index name="fki_content_contributors_content_fkey" table="public.content_contributors"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="content"/>
+		</idxelement>
+</index>
+
+<table name="content_locales" layer="0" collapse-mode="2" max-obj-count="6">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1020" y="60"/>
+	<column name="id" not-null="true" sequence="public.content_locales_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="content_id" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="locale" not-null="true">
+		<type name="character varying" length="32"/>
+	</column>
+	<column name="author" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="content_locales_pkey" type="pk-constr" table="public.content_locales">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="content_locales_unique" type="uq-constr" table="public.content_locales">
+		<columns names="content_id,locale" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="content_versions" layer="0" collapse-mode="2" max-obj-count="8">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1500" y="40"/>
+	<column name="id" not-null="true" sequence="public.content_versions_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="version" not-null="true" default-value="0">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="update_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="is_archive" not-null="true" default-value="false">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="name">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="content">
+		<type name="text" length="0"/>
+	</column>
+	<column name="locale_id" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="content_versions_pkey" type="pk-constr" table="public.content_versions">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="content_versions_version_locale_key" type="uq-constr" table="public.content_versions">
+		<columns names="version,locale_id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="pois" layer="0" collapse-mode="2" max-obj-count="8">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="300" y="1340"/>
+	<column name="id" not-null="true" sequence="public.poi_versions_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="is_public" not-null="true" default-value="true">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="permalink" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="creation_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="name" not-null="true">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="position" not-null="true">
+		<type name="geometry" length="0"/>
+	</column>
+	<column name="type" not-null="true">
+		<type name="public.poi_type_enum" length="0"/>
+	</column>
+	<constraint name="pois_pkey" type="pk-constr" table="public.pois">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="pois_permalink_key" type="uq-constr" table="public.pois">
+		<columns names="permalink" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="pois_position_type_key" type="uq-constr" table="public.pois">
+		<columns names="position,type" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="poi_versions" layer="0" collapse-mode="2" max-obj-count="12">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1620" y="1260"/>
+	<column name="id" not-null="true" sequence="public.pois_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="version" not-null="true" default-value="0">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="update_date" not-null="true">
+		<type name="timestamp" length="0"/>
+	</column>
+	<column name="is_archive" not-null="true" default-value="false">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="alt_type" not-null="true">
+		<type name="public.poi_type_enum" length="0"/>
+	</column>
+	<column name="is_destroyed" not-null="true" default-value="false">
+		<type name="boolean" length="0"/>
+	</column>
+	<column name="alt_name">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="alt_position" not-null="true">
+		<type name="geometry" length="0"/>
+	</column>
+	<column name="parameters">
+		<type name="jsonb" length="0"/>
+	</column>
+	<column name="source_id" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="poi_versions_pkey" type="pk-constr" table="public.poi_versions">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_versions_version_source_key" type="uq-constr" table="public.poi_versions">
+		<columns names="version,source_id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<index name="poi_versions_is_archive_index" table="public.poi_versions"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_archive"/>
+		</idxelement>
+</index>
+
+<index name="poi_versions_is_destroyed_index" table="public.poi_versions"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="is_destroyed"/>
+		</idxelement>
+</index>
+
+<index name="poi_versions_type_index" table="public.poi_versions"
+	 concurrent="false" unique="false" fast-update="false" buffering="false"
+	 index-type="btree" factor="90">
+		<idxelement use-sorting="false">
+			<column name="alt_type"/>
+		</idxelement>
+</index>
+
+<sequence name="poi_sources_sequence" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
+	<schema name="public"/>
+	<role name="kabano"/>
+</sequence>
+
+<table name="poi_sources" layer="0" collapse-mode="2" max-obj-count="6">
+	<schema name="public"/>
+	<role name="kabano"/>
+	<position x="1160" y="1400"/>
+	<column name="id" not-null="true" sequence="public.poi_sources_sequence">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="source">
+		<type name="character varying" length="3"/>
+	</column>
+	<column name="remote_source_id">
+		<type name="character varying" length="255"/>
+	</column>
+	<column name="author" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<column name="locale_id" not-null="true">
+		<type name="integer" length="0"/>
+	</column>
+	<constraint name="poi_sources_pkey" type="pk-constr" table="public.poi_sources">
+		<columns names="id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_sources_source_key" type="uq-constr" table="public.poi_sources">
+		<columns names="source,remote_source_id" ref-type="src-columns"/>
+	</constraint>
+	<constraint name="poi_sources_locale_key" type="uq-constr" table="public.poi_sources">
+		<columns names="locale_id,source" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<constraint name="content_comments_author_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.users" table="public.content_comments">
+	<columns names="author" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_comments_content_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.contents" table="public.content_comments">
+	<columns names="content" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_comments_locale_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.locales" table="public.content_comments">
+	<columns names="locale" ref-type="src-columns"/>
+	<columns names="name" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_contributors_contributor_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.users" table="public.content_contributors">
+	<columns names="contributor" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_contributors_content_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.content_locales" table="public.content_contributors">
+	<columns names="content" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_comments_author_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.users" table="public.poi_comments">
+	<columns names="author" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_comments_locale_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.locales" table="public.poi_comments">
+	<columns names="locale" ref-type="src-columns"/>
+	<columns names="name" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_comments_poi_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.poi_sources" table="public.poi_comments">
+	<columns names="poi" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_contributors_contributor_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.users" table="public.poi_contributors">
+	<columns names="contributor" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_contributors_poi_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.poi_sources" table="public.poi_contributors">
+	<columns names="poi" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_localised_locale_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.locales" table="public.poi_locales">
+	<columns names="locale" ref-type="src-columns"/>
+	<columns names="name" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_locales_poi_fkey" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.pois" table="public.poi_locales">
+	<columns names="poi_id" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="users_locale_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.locales" table="public.users">
+	<columns names="locale" ref-type="src-columns"/>
+	<columns names="name" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_locales_locale" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.locales" table="public.content_locales">
+	<columns names="locale" ref-type="src-columns"/>
+	<columns names="name" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_locales_content" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.contents" table="public.content_locales">
+	<columns names="content_id" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_locales_author" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.users" table="public.content_locales">
+	<columns names="author" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="content_versions_locale" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.content_locales" table="public.content_versions">
+	<columns names="locale_id" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_versions_source_fkey" type="fk-constr" comparison-type="MATCH SIMPLE"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.poi_sources" table="public.poi_versions">
+	<columns names="source_id" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_sources_locale_fkey" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.sources" table="public.poi_sources">
+	<columns names="source" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="poi_sources_poi_locale_fkey" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="public.poi_locales" table="public.poi_sources">
+	<columns names="locale_id" ref-type="src-columns"/>
+	<columns names="id" ref-type="dst-columns"/>
+</constraint>
+
+<relationship name="rel_content_comments_users" type="relfk" layer="0"
+	 src-table="public.content_comments"
+	 dst-table="public.users" reference-fk="content_comments_author_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_comments_contents" type="relfk" layer="0"
+	 src-table="public.content_comments"
+	 dst-table="public.contents" reference-fk="content_comments_content_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_comments_locales" type="relfk" layer="0"
+	 src-table="public.content_comments"
+	 dst-table="public.locales" reference-fk="content_comments_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_contributors_users" type="relfk" layer="0"
+	 src-table="public.content_contributors"
+	 dst-table="public.users" reference-fk="content_contributors_contributor_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_contributors_content_locales" type="relfk" layer="0"
+	 src-table="public.content_contributors"
+	 dst-table="public.content_locales" reference-fk="content_contributors_content_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_comments_users" type="relfk" layer="0"
+	 src-table="public.poi_comments"
+	 dst-table="public.users" reference-fk="poi_comments_author_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_comments_locales" type="relfk" layer="0"
+	 src-table="public.poi_comments"
+	 dst-table="public.locales" reference-fk="poi_comments_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_comments_poi_sources" type="relfk" layer="0"
+	 src-table="public.poi_comments"
+	 dst-table="public.poi_sources" reference-fk="poi_comments_poi_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_contributors_users" type="relfk" layer="0"
+	 src-table="public.poi_contributors"
+	 dst-table="public.users" reference-fk="poi_contributors_contributor_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_contributors_poi_sources" type="relfk" layer="0"
+	 src-table="public.poi_contributors"
+	 dst-table="public.poi_sources" reference-fk="poi_contributors_poi_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_locales_locales" type="relfk" layer="0"
+	 src-table="public.poi_locales"
+	 dst-table="public.locales" reference-fk="poi_localised_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_users_locales" type="relfk" layer="0"
+	 src-table="public.users"
+	 dst-table="public.locales" reference-fk="users_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_locales_locales" type="relfk" layer="0"
+	 src-table="public.content_locales"
+	 dst-table="public.locales" reference-fk="content_locales_locale"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_locales_contents" type="relfk" layer="0"
+	 src-table="public.content_locales"
+	 dst-table="public.contents" reference-fk="content_locales_content"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_locales_users" type="relfk" layer="0"
+	 src-table="public.content_locales"
+	 dst-table="public.users" reference-fk="content_locales_author"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_content_versions_content_locales" type="relfk" layer="0"
+	 src-table="public.content_versions"
+	 dst-table="public.content_locales" reference-fk="content_versions_locale"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_versions_poi_sources" type="relfk" layer="0"
+	 src-table="public.poi_versions"
+	 dst-table="public.poi_sources" reference-fk="poi_versions_source_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_sources_sources" type="relfk" layer="0"
+	 src-table="public.poi_sources"
+	 dst-table="public.sources" reference-fk="poi_sources_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_sources_poi_locales" type="relfk" layer="0"
+	 src-table="public.poi_sources"
+	 dst-table="public.poi_locales" reference-fk="poi_sources_poi_locale_fkey"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_poi_locales_pois" type="relfk" layer="0"
+	 src-table="public.poi_locales"
+	 dst-table="public.pois" reference-fk="poi_locales_poi_fkey"
+	 src-required="false" dst-required="false"/>
+
+</dbmodel>

_ressources/logo_carre.svg

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="44"
+   height="44"
+   viewBox="0 0 44 44"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   sodipodi:docname="logo_carre.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="17.172593"
+     inkscape:cy="21.465742"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(2.2888184e-7,-1008.3622)">
+    <g
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4136"
+       transform="matrix(1.1379801,0,0,1.1379801,3.1581138e-8,-151.20504)" />
+    <g
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4136-1"
+       transform="matrix(1.1379801,0,0,1.1379801,-348.56109,665.85293)">
+      <path
+         d="m 327.11423,334.16668 -10.09786,-27.23536 -10.34214,27.23536 z m -18.81955,-1.26818 5.88391,-15.54965 4.87414,-1.40926 6.40569,16.95891 z"
+         style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans Ultra-Light';fill:#000000;fill-opacity:1"
+         id="path4159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         d="m 344.58688,334.12116 -0.008,-1.22266 h -1.36672 l -8.73903,-23.79476 0.83839,-1.55306 -0.73436,-0.62958 -0.82296,1.22506 -0.69448,-1.17371 -0.71601,0.66008 0.84437,1.49829 -9.42882,23.76768 h -1.23813 l 0.0188,1.26818 z m -17.50259,-1.22266 6.57828,-15.42426 6.1435,15.42426 z"
+         style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:40px;line-height:125%;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans Ultra-Light';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path4159-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
+  </g>
+</svg>

_ressources/sql_skeleton.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 11.1
--- Dumped by pg_dump version 11.1
+-- Dumped from database version 13.4
+-- Dumped by pg_dump version 13.4
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -12,6 +12,7 @@ SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
+SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
@@ -31,34 +32,6 @@ ALTER SCHEMA topology OWNER TO kabano;
 COMMENT ON SCHEMA topology IS 'PostGIS Topology schema';
 
 
---
--- Name: postgis; Type: EXTENSION; Schema: -; Owner: 
---
-
-CREATE EXTENSION IF NOT EXISTS postgis WITH SCHEMA public;
-
-
---
--- Name: EXTENSION postgis; Type: COMMENT; Schema: -; Owner: 
---
-
-COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
-
-
---
--- Name: postgis_topology; Type: EXTENSION; Schema: -; Owner: 
---
-
-CREATE EXTENSION IF NOT EXISTS postgis_topology WITH SCHEMA topology;
-
-
---
--- Name: EXTENSION postgis_topology; Type: COMMENT; Schema: -; Owner: 
---
-
-COMMENT ON EXTENSION postgis_topology IS 'PostGIS topology spatial types and functions';
-
-
 --
 -- Name: content_type_enum; Type: TYPE; Schema: public; Owner: kabano
 --
@@ -72,18 +45,6 @@ CREATE TYPE public.content_type_enum AS ENUM (
 
 ALTER TYPE public.content_type_enum OWNER TO kabano;
 
---
--- Name: poi_key_enum; Type: TYPE; Schema: public; Owner: kabano
---
-
-CREATE TYPE public.poi_key_enum AS ENUM (
-    'description',
-    'access'
-);
-
-
-ALTER TYPE public.poi_key_enum OWNER TO kabano;
-
 --
 -- Name: poi_type_enum; Type: TYPE; Schema: public; Owner: kabano
 --
@@ -132,7 +93,7 @@ ALTER TABLE public.content_comments_sequence OWNER TO kabano;
 
 SET default_tablespace = '';
 
-SET default_with_oids = false;
+SET default_table_access_method = heap;
 
 --
 -- Name: content_comments; Type: TABLE; Schema: public; Owner: kabano
@@ -181,20 +142,6 @@ CREATE TABLE public.content_contributors (
 
 ALTER TABLE public.content_contributors OWNER TO kabano;
 
---
--- Name: content_locales; Type: TABLE; Schema: public; Owner: kabano
---
-
-CREATE TABLE public.content_locales (
-    id integer NOT NULL,
-    content integer NOT NULL,
-    locale character varying(32) NOT NULL,
-    author integer NOT NULL
-);
-
-
-ALTER TABLE public.content_locales OWNER TO kabano;
-
 --
 -- Name: content_locales_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
 --
@@ -210,21 +157,18 @@ CREATE SEQUENCE public.content_locales_sequence
 ALTER TABLE public.content_locales_sequence OWNER TO kabano;
 
 --
--- Name: content_versions; Type: TABLE; Schema: public; Owner: kabano
+-- Name: content_locales; Type: TABLE; Schema: public; Owner: kabano
 --
 
-CREATE TABLE public.content_versions (
-    id integer NOT NULL,
-    version integer DEFAULT 0 NOT NULL,
-    update_date timestamp without time zone NOT NULL,
-    is_archive boolean DEFAULT false NOT NULL,
-    name character varying(255),
-    content text,
-    locale integer NOT NULL
+CREATE TABLE public.content_locales (
+    id integer DEFAULT nextval('public.content_locales_sequence'::regclass) NOT NULL,
+    content_id integer NOT NULL,
+    locale character varying(32) NOT NULL,
+    author integer NOT NULL
 );
 
 
-ALTER TABLE public.content_versions OWNER TO kabano;
+ALTER TABLE public.content_locales OWNER TO kabano;
 
 --
 -- Name: content_versions_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
@@ -240,6 +184,23 @@ CREATE SEQUENCE public.content_versions_sequence
 
 ALTER TABLE public.content_versions_sequence OWNER TO kabano;
 
+--
+-- Name: content_versions; Type: TABLE; Schema: public; Owner: kabano
+--
+
+CREATE TABLE public.content_versions (
+    id integer DEFAULT nextval('public.content_versions_sequence'::regclass) NOT NULL,
+    version integer DEFAULT 0 NOT NULL,
+    update_date timestamp without time zone NOT NULL,
+    is_archive boolean DEFAULT false NOT NULL,
+    name character varying(255),
+    content text,
+    locale_id integer NOT NULL
+);
+
+
+ALTER TABLE public.content_versions OWNER TO kabano;
+
 --
 -- Name: contents_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
 --
@@ -346,10 +307,10 @@ CREATE TABLE public.poi_contributors (
 ALTER TABLE public.poi_contributors OWNER TO kabano;
 
 --
--- Name: poi_localised_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
+-- Name: poi_locales_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
 --
 
-CREATE SEQUENCE public.poi_localised_sequence
+CREATE SEQUENCE public.poi_locales_sequence
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -357,39 +318,64 @@ CREATE SEQUENCE public.poi_localised_sequence
     CACHE 1;
 
 
-ALTER TABLE public.poi_localised_sequence OWNER TO kabano;
+ALTER TABLE public.poi_locales_sequence OWNER TO kabano;
 
 --
--- Name: poi_localised; Type: TABLE; Schema: public; Owner: kabano
+-- Name: poi_locales; Type: TABLE; Schema: public; Owner: kabano
 --
 
-CREATE TABLE public.poi_localised (
-    id integer DEFAULT nextval('public.poi_localised_sequence'::regclass) NOT NULL,
-    poi integer NOT NULL,
+CREATE TABLE public.poi_locales (
+    id integer DEFAULT nextval('public.poi_locales_sequence'::regclass) NOT NULL,
     locale character varying(32) NOT NULL,
-    key public.poi_key_enum NOT NULL,
-    value text NOT NULL
+    poi_id integer NOT NULL
 );
 
 
-ALTER TABLE public.poi_localised OWNER TO kabano;
+ALTER TABLE public.poi_locales OWNER TO kabano;
+
+--
+-- Name: poi_sources_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
+--
+
+CREATE SEQUENCE public.poi_sources_sequence
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.poi_sources_sequence OWNER TO kabano;
 
 --
 -- Name: poi_sources; Type: TABLE; Schema: public; Owner: kabano
 --
 
 CREATE TABLE public.poi_sources (
-    id character varying(3) NOT NULL,
-    display_name character varying(255) NOT NULL,
-    icon_name character varying(255),
-    website character varying(255),
-    license_name character varying(255),
-    license_url character varying(255)
+    id integer DEFAULT nextval('public.poi_sources_sequence'::regclass) NOT NULL,
+    source character varying(3),
+    remote_source_id character varying(255),
+    author integer NOT NULL,
+    locale_id integer NOT NULL
 );
 
 
 ALTER TABLE public.poi_sources OWNER TO kabano;
 
+--
+-- Name: poi_versions_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
+--
+
+CREATE SEQUENCE public.poi_versions_sequence
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.poi_versions_sequence OWNER TO kabano;
+
 --
 -- Name: pois_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
 --
@@ -405,30 +391,20 @@ CREATE SEQUENCE public.pois_sequence
 ALTER TABLE public.pois_sequence OWNER TO kabano;
 
 --
--- Name: pois; Type: TABLE; Schema: public; Owner: kabano
+-- Name: sources; Type: TABLE; Schema: public; Owner: kabano
 --
 
-CREATE TABLE public.pois (
-    id integer DEFAULT nextval('public.pois_sequence'::regclass) NOT NULL,
-    permalink character varying(255) NOT NULL,
-    version integer DEFAULT 0 NOT NULL,
-    creation_date timestamp without time zone NOT NULL,
-    update_date timestamp without time zone NOT NULL,
-    author integer NOT NULL,
-    is_public boolean DEFAULT true NOT NULL,
-    is_archive boolean DEFAULT false NOT NULL,
-    type public.poi_type_enum NOT NULL,
-    is_detroyed boolean DEFAULT false NOT NULL,
-    name character varying(255) NOT NULL,
-    alt_names character varying(255),
-    source character varying(3),
-    source_id character varying(255),
-    "position" public.geometry NOT NULL,
-    parameters jsonb
+CREATE TABLE public.sources (
+    id character varying(3) NOT NULL,
+    display_name character varying(255) NOT NULL,
+    icon_name character varying(255),
+    website character varying(255),
+    license_name character varying(255),
+    license_url character varying(255)
 );
 
 
-ALTER TABLE public.pois OWNER TO kabano;
+ALTER TABLE public.sources OWNER TO kabano;
 
 --
 -- Name: users_id_sequence; Type: SEQUENCE; Schema: public; Owner: kabano
@@ -459,7 +435,7 @@ CREATE TABLE public.users (
     is_archive boolean NOT NULL,
     rank public.user_rank_enum NOT NULL,
     locale character varying(32) NOT NULL,
-    timezone character varying(8) NOT NULL,
+    timezone character varying(32) NOT NULL,
     visit_date timestamp without time zone NOT NULL,
     register_date timestamp without time zone NOT NULL
 );
@@ -467,199 +443,6 @@ CREATE TABLE public.users (
 
 ALTER TABLE public.users OWNER TO kabano;
 
---
--- Data for Name: content_comments; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.content_comments (id, version, creation_date, update_date, author, is_public, is_archive, content, comment, locale) FROM stdin;
-\.
-
-
---
--- Data for Name: content_contributors; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.content_contributors (id, content, contributor) FROM stdin;
-\.
-
-
---
--- Data for Name: content_locales; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.content_locales (id, content, locale, author) FROM stdin;
-\.
-
-
---
--- Data for Name: content_versions; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.content_versions (id, version, update_date, is_archive, name, content, locale) FROM stdin;
-\.
-
-
---
--- Data for Name: contents; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.contents (id, permalink, creation_date, is_public, is_commentable, type) FROM stdin;
-\.
-
-
---
--- Data for Name: locales; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.locales (name, display_name, flag_name) FROM stdin;
-fr_FR	Français	fr
-\.
-
-
---
--- Data for Name: poi_comments; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.poi_comments (id, permalink, version, creation_date, update_date, author, is_public, is_archive, poi, comment, locale) FROM stdin;
-\.
-
-
---
--- Data for Name: poi_contributors; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.poi_contributors (id, poi, contributor) FROM stdin;
-\.
-
-
---
--- Data for Name: poi_localised; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.poi_localised (id, poi, locale, key, value) FROM stdin;
-\.
-
-
---
--- Data for Name: poi_sources; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.poi_sources (id, display_name, icon_name, website, license_name, license_url) FROM stdin;
-\.
-
-
---
--- Data for Name: pois; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.pois (id, permalink, version, creation_date, update_date, author, is_public, is_archive, type, is_detroyed, name, alt_names, source, source_id, "position", parameters) FROM stdin;
-\.
-
-
---
--- Data for Name: spatial_ref_sys; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.spatial_ref_sys (srid, auth_name, auth_srid, srtext, proj4text) FROM stdin;
-\.
-
-
---
--- Data for Name: users; Type: TABLE DATA; Schema: public; Owner: kabano
---
-
-COPY public.users (id, name, version, email, password, website, is_avatar_present, is_archive, rank, locale, timezone, visit_date, register_date) FROM stdin;
-4	leosw2	0	leo@leo.fr	b36982d19ecde5eabbd83f964c6fe560050fe4bd		f	f	moderator	fr_FR	CEST	2018-11-04 07:12:11	2018-10-17 18:14:11
-1	leosw	1	leo@lstronic.com	b36982d19ecde5eabbd83f964c6fe560050fe4bd	https://lstronic.com	t	f	administrator	fr_FR	CEST	2019-01-29 18:23:39	2018-09-03 21:27:13
-\.
-
-
---
--- Data for Name: topology; Type: TABLE DATA; Schema: topology; Owner: kabano
---
-
-COPY topology.topology (id, name, srid, "precision", hasz) FROM stdin;
-\.
-
-
---
--- Data for Name: layer; Type: TABLE DATA; Schema: topology; Owner: kabano
---
-
-COPY topology.layer (topology_id, layer_id, schema_name, table_name, feature_column, feature_type, level, child_id) FROM stdin;
-\.
-
-
---
--- Name: content_comments_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.content_comments_sequence', 3, true);
-
-
---
--- Name: content_contributors_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.content_contributors_sequence', 30, true);
-
-
---
--- Name: content_locales_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.content_locales_sequence', 1, false);
-
-
---
--- Name: content_versions_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.content_versions_sequence', 1, false);
-
-
---
--- Name: contents_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.contents_sequence', 26, true);
-
-
---
--- Name: poi_comments_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.poi_comments_sequence', 1, false);
-
-
---
--- Name: poi_contributors_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.poi_contributors_sequence', 1, false);
-
-
---
--- Name: poi_localised_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.poi_localised_sequence', 1, false);
-
-
---
--- Name: pois_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.pois_sequence', 1, false);
-
-
---
--- Name: users_id_sequence; Type: SEQUENCE SET; Schema: public; Owner: kabano
---
-
-SELECT pg_catalog.setval('public.users_id_sequence', 4, true);
-
-
 --
 -- Name: content_comments content_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
@@ -697,7 +480,7 @@ ALTER TABLE ONLY public.content_locales
 --
 
 ALTER TABLE ONLY public.content_locales
-    ADD CONSTRAINT content_locales_unique UNIQUE (content, locale);
+    ADD CONSTRAINT content_locales_unique UNIQUE (content_id, locale);
 
 
 --
@@ -713,7 +496,7 @@ ALTER TABLE ONLY public.content_versions
 --
 
 ALTER TABLE ONLY public.content_versions
-    ADD CONSTRAINT content_versions_version_locale_key UNIQUE (version, locale);
+    ADD CONSTRAINT content_versions_version_locale_key UNIQUE (version, locale_id);
 
 
 --
@@ -789,27 +572,27 @@ ALTER TABLE ONLY public.poi_contributors
 
 
 --
--- Name: poi_localised poi_localised_pkey; Type: CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_locales poi_localised_pkey; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.poi_localised
+ALTER TABLE ONLY public.poi_locales
     ADD CONSTRAINT poi_localised_pkey PRIMARY KEY (id);
 
 
 --
--- Name: poi_localised poi_localised_unique; Type: CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_locales poi_localised_unique; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.poi_localised
-    ADD CONSTRAINT poi_localised_unique UNIQUE (poi, locale, key);
+ALTER TABLE ONLY public.poi_locales
+    ADD CONSTRAINT poi_localised_unique UNIQUE (locale, poi_id);
 
 
 --
--- Name: poi_sources poi_sources_display_name_unique; Type: CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_sources poi_sources_locale_key; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
 
 ALTER TABLE ONLY public.poi_sources
-    ADD CONSTRAINT poi_sources_display_name_unique UNIQUE (display_name);
+    ADD CONSTRAINT poi_sources_locale_key UNIQUE (locale_id, source);
 
 
 --
@@ -821,19 +604,27 @@ ALTER TABLE ONLY public.poi_sources
 
 
 --
--- Name: pois pois_permalink_unique; Type: CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_sources poi_sources_source_key; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.pois
-    ADD CONSTRAINT pois_permalink_unique UNIQUE (permalink, version);
+ALTER TABLE ONLY public.poi_sources
+    ADD CONSTRAINT poi_sources_source_key UNIQUE (source, remote_source_id);
 
 
 --
--- Name: pois pois_pkey; Type: CONSTRAINT; Schema: public; Owner: kabano
+-- Name: sources sources_display_name_unique; Type: CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.pois
-    ADD CONSTRAINT pois_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.sources
+    ADD CONSTRAINT sources_display_name_unique UNIQUE (display_name);
+
+
+--
+-- Name: sources sources_pkey; Type: CONSTRAINT; Schema: public; Owner: kabano
+--
+
+ALTER TABLE ONLY public.sources
+    ADD CONSTRAINT sources_pkey PRIMARY KEY (id);
 
 
 --
@@ -909,34 +700,6 @@ CREATE INDEX poi_comments_is_archive_index ON public.poi_comments USING btree (i
 CREATE INDEX poi_comments_is_public_index ON public.poi_comments USING btree (is_public);
 
 
---
--- Name: pois_is_archive_index; Type: INDEX; Schema: public; Owner: kabano
---
-
-CREATE INDEX pois_is_archive_index ON public.pois USING btree (is_archive);
-
-
---
--- Name: pois_is_destroyed_index; Type: INDEX; Schema: public; Owner: kabano
---
-
-CREATE INDEX pois_is_destroyed_index ON public.pois USING btree (is_detroyed);
-
-
---
--- Name: pois_is_public_index; Type: INDEX; Schema: public; Owner: kabano
---
-
-CREATE INDEX pois_is_public_index ON public.pois USING btree (is_public);
-
-
---
--- Name: pois_type_index; Type: INDEX; Schema: public; Owner: kabano
---
-
-CREATE INDEX pois_type_index ON public.pois USING btree (type);
-
-
 --
 -- Name: users_is_archive_index; Type: INDEX; Schema: public; Owner: kabano
 --
@@ -1004,7 +767,7 @@ ALTER TABLE ONLY public.content_locales
 --
 
 ALTER TABLE ONLY public.content_locales
-    ADD CONSTRAINT content_locales_content FOREIGN KEY (content) REFERENCES public.contents(id);
+    ADD CONSTRAINT content_locales_content FOREIGN KEY (content_id) REFERENCES public.contents(id);
 
 
 --
@@ -1020,7 +783,7 @@ ALTER TABLE ONLY public.content_locales
 --
 
 ALTER TABLE ONLY public.content_versions
-    ADD CONSTRAINT content_versions_locale FOREIGN KEY (locale) REFERENCES public.content_locales(id);
+    ADD CONSTRAINT content_versions_locale FOREIGN KEY (locale_id) REFERENCES public.content_locales(id);
 
 
 --
@@ -1044,7 +807,7 @@ ALTER TABLE ONLY public.poi_comments
 --
 
 ALTER TABLE ONLY public.poi_comments
-    ADD CONSTRAINT poi_comments_poi_fkey FOREIGN KEY (poi) REFERENCES public.pois(id);
+    ADD CONSTRAINT poi_comments_poi_fkey FOREIGN KEY (poi) REFERENCES public.poi_sources(id);
 
 
 --
@@ -1060,39 +823,31 @@ ALTER TABLE ONLY public.poi_contributors
 --
 
 ALTER TABLE ONLY public.poi_contributors
-    ADD CONSTRAINT poi_contributors_poi_fkey FOREIGN KEY (poi) REFERENCES public.pois(id);
+    ADD CONSTRAINT poi_contributors_poi_fkey FOREIGN KEY (poi) REFERENCES public.poi_sources(id);
 
 
 --
--- Name: poi_localised poi_localised_locale_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_locales poi_localised_locale_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.poi_localised
+ALTER TABLE ONLY public.poi_locales
     ADD CONSTRAINT poi_localised_locale_fkey FOREIGN KEY (locale) REFERENCES public.locales(name);
 
 
 --
--- Name: poi_localised poi_localised_poi_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_sources poi_sources_locale_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.poi_localised
-    ADD CONSTRAINT poi_localised_poi_fkey FOREIGN KEY (poi) REFERENCES public.pois(id);
+ALTER TABLE ONLY public.poi_sources
+    ADD CONSTRAINT poi_sources_locale_fkey FOREIGN KEY (source) REFERENCES public.sources(id) MATCH FULL;
 
 
 --
--- Name: pois pois_author_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
+-- Name: poi_sources poi_sources_poi_locale_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
 --
 
-ALTER TABLE ONLY public.pois
-    ADD CONSTRAINT pois_author_fkey FOREIGN KEY (author) REFERENCES public.users(id);
-
-
---
--- Name: pois pois_source_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kabano
---
-
-ALTER TABLE ONLY public.pois
-    ADD CONSTRAINT pois_source_fkey FOREIGN KEY (source) REFERENCES public.poi_sources(id);
+ALTER TABLE ONLY public.poi_sources
+    ADD CONSTRAINT poi_sources_poi_locale_fkey FOREIGN KEY (locale_id) REFERENCES public.poi_locales(id) MATCH FULL;
 
 
 --
@@ -1104,25 +859,13 @@ ALTER TABLE ONLY public.users
 
 
 --
--- Name: SCHEMA public; Type: ACL; Schema: -; Owner: kabano
+-- Name: SCHEMA public; Type: ACL; Schema: -; Owner: postgres
 --
 
 REVOKE ALL ON SCHEMA public FROM postgres;
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-GRANT ALL ON SCHEMA public TO PUBLIC;
 GRANT ALL ON SCHEMA public TO kabano;
 
 
---
--- Name: TABLE spatial_ref_sys; Type: ACL; Schema: public; Owner: kabano
---
-
-REVOKE ALL ON TABLE public.spatial_ref_sys FROM postgres;
-REVOKE SELECT ON TABLE public.spatial_ref_sys FROM PUBLIC;
-GRANT ALL ON TABLE public.spatial_ref_sys TO kabano;
-GRANT SELECT ON TABLE public.spatial_ref_sys TO PUBLIC;
-
-
 --
 -- PostgreSQL database dump complete
 --

controllers/d.admin.php

@@ -12,7 +12,7 @@ if(isset($controller->splitted_url[1]) && $user->rankIsHigher("moderator")) {
 
 				$output = array();
 				chdir($config['abs_root_folder']);
-				exec("git pull", $output);
+				exec("git pull 2>&1", $output);
 
 				include ($config['views_folder']."d.admin.git-pull.html");
 			}
@@ -42,9 +42,201 @@ if(isset($controller->splitted_url[1]) && $user->rankIsHigher("moderator")) {
 				$notfound = 1;
 			}
 			break;
+		case 'wiki-files':
+			if ($user->rankIsHigher("moderator")) {
+				$head['css'] = "d.index.css;d.admin.css";
+				$head['title'] = "Fichiers attachés au wiki";
+				$rows_per_pages = 50;
+				$files_folder = $config['medias_folder']."wiki/";
+
+					// Delete a file
+				if ($user->rankIsHigher("administrator")) {
+					if(isset($controller->splitted_url[2]) && $controller->splitted_url[2]=='delete' && isset($controller->splitted_url[3])) {
+						$filename=$files_folder.$controller->splitted_url[3];
+						if (file_exists($filename)) {
+							unlink($filename);
+							error_log(date('r')." \t".$user->name." (".$user->id.") \tDELETE \tDelete wiki file '".$controller->splitted_url[3]."'\r\n",3,$config['logs_folder'].'wiki-files.log');
+						}
+					}
+				}
+
+					// Add a file
+				if(isset($controller->splitted_url[2]) && $controller->splitted_url[2]=='upload' && isset($_FILES['file'])) {
+					$filename=$config['medias_folder']."wiki/".$_FILES['file']['name'];
+					if(move_uploaded_file($_FILES['file']['tmp_name'], $filename)) {
+						error_log(date('r')." \t".$user->name." (".$user->id.") \tUPLOAD Upload wiki file '".$_FILES['file']['name']."'\r\n",3,$config['logs_folder'].'wiki-files.log');
+					}
+
+				}
+
+					// Get the file list
+				$files_list = scandir($files_folder);
+					// Populate table
+				foreach ($files_list as $file) {
+					$file_path = $files_folder.$file;
+
+					if (is_file($file_path)) {
+						$file_info = [
+							'name' => $file,
+							'type' => mime_content_type($file_path),
+							'creation_date' => date("Y-m-d H:i:s", filectime($file_path)),
+							'size' => filesize($file_path),
+						];
+
+						$files[] = $file_info;
+					}
+				}
+				$filenb = count($files);
+
+					// Manage sorting
+				if(isset($_GET['orderby']))
+					$orderby = $_GET['orderby'];
+				else
+					$orderby = 'name';
+				if(isset($_GET['order']) && $_GET['order']=='ASC') {
+					$order = 'ASC';
+					usort($files, function ($a, $b) use ($orderby) { return $a[$orderby] <=> $b[$orderby]; });
+				}
+				else {
+					$order = 'DESC';
+					usort($files, function ($a, $b) use ($orderby) { return $b[$orderby] <=> $a[$orderby]; });
+				}
+
+					// Get the correct page number
+				if (!isset($controller->splitted_url[2]) OR $controller->splitted_url[2]=="" OR $controller->splitted_url[2]=="0" OR !is_numeric($controller->splitted_url[2])) {
+					$page = 0;
+				} else {
+					$page = $controller->splitted_url[2] - 1;
+				}
+					// In case the wanted page is too big
+				if($rows_per_pages * $page >= $filenb)
+					$page = 0;
+
+				$first = $page*$rows_per_pages+1;
+				$last = (($page+1)*$rows_per_pages > $filenb ? $filenb : ($page+1)*$rows_per_pages);
+				include ($config['views_folder']."d.admin.wiki-files.html");
+			}
+			else {
+				$notfound = 1;
+			}
+		break;
+		case 'stats':
+			if ($user->rankIsHigher("moderator")) {
+				$head['title'] = "Statistiques";
+
+				$report = $config['abs_root_folder'].'tmp/report.html';
+
+				$files = glob('/var/log/nginx/kabano.org-access.log*.gz');
+
+				$parts = [];
+
+				if (!empty($files)) {
+				    $parts[] = 'zcat ' . implode(' ', array_map('escapeshellarg', $files));
+				}
+
+				if (file_exists('/var/log/nginx/kabano.org-access.log.1')) {
+				    $parts[] = 'cat /var/log/nginx/kabano.org-access.log.1';
+				}
+
+				$parts[] = 'cat /var/log/nginx/kabano.org-access.log';
+
+				$command = '/bin/bash -c \'(' . implode(' && ', $parts) . ')'
+				         . ' | goaccess --log-format=COMBINED --no-progress -o '
+				         . escapeshellarg($report)
+				         . ' -\' 2>&1';
+
+				$output = shell_exec($command);
+
+				include ($config['views_folder']."d.admin.stats.html");
+			}
+			else {
+				$notfound = 1;
+			}
+			break;
+		case 'sql-backup':
+			if ($user->rankIsHigher("administrator")) {
+				$head['title'] = "Export SQL";
+
+				if(isset($controller->splitted_url[2]) && $controller->splitted_url[2]=='delete' && isset($controller->splitted_url[3])) {
+					unlink($config['abs_root_folder'].'tmp/'.$controller->splitted_url[3]);
+					$output = Array();
+					$backup_file = Array();
+				}
+				else {
+					// Nom du fichier de sauvegarde
+					$timestamp = date('Ymd_His');
+					$backup_filename[0] = $timestamp.'_backup.sql';
+					$backup_file[0] = $config['abs_root_folder'].'tmp/'.$backup_filename[0];
+
+					// Construction de la commande pg_dump
+					$cmd = 'PGPASSWORD="'.$config['SQL_pass'].'" pg_dump -h '.$config['SQL_host'].' -U '.$config['SQL_user'].' -F c -b -v -f "'.$backup_file[0].'" '.$config['SQL_db'].' 2>&1';
+
+					$output = [];
+					$return_var = 0;
+					exec($cmd, $output, $return_var);
+				}
+
+				$backup_files = glob($config['abs_root_folder'].'tmp/*.sql');
+
+				include ($config['views_folder']."d.admin.backup.html");
+			}
+			else {
+				$notfound = 1;
+			}
+			break;
+		case 'files-backup':
+			if ($user->rankIsHigher("administrator")) {
+				$head['title'] = "Export des fichiers";
+				$output = Array();
+				$backup_file = Array();
+
+				if(isset($controller->splitted_url[2]) && $controller->splitted_url[2]=='delete' && isset($controller->splitted_url[3])) {
+					unlink($config['abs_root_folder'].'tmp/'.$controller->splitted_url[3]);
+				}
+				else {
+					// Nom du fichier de sauvegarde
+					$timestamp = date('Ymd_His');
+					$backup_source[0] = $config['abs_root_folder'].'medias/avatars';
+					$backup_source[1] = $config['abs_root_folder'].'medias/wiki';
+					$backup_filename[0] = $timestamp.'_avatar_files.zip';
+					$backup_filename[1] = $timestamp.'_wiki_files.zip';
+
+					for($i=0;$i<2;$i++) {
+						$backup_file[$i] = $config['abs_root_folder'].'tmp/'.$backup_filename[$i];
+
+						$backup[$i] = new ZipArchive();
+						if ($backup[$i]->open($backup_file[$i], ZipArchive::CREATE | ZipArchive::OVERWRITE) === TRUE) {
+						    $files = new RecursiveIteratorIterator(
+						        new RecursiveDirectoryIterator($backup_source[$i]),
+						        RecursiveIteratorIterator::LEAVES_ONLY
+						    );
+
+						    foreach ($files as $name => $file) {
+						        if (!$file->isDir()) {
+						            $filePath = $file->getRealPath();
+						            $relativePath = substr($filePath, strlen(realpath($backup_source[$i])) + 1);
+						            $backup[$i]->addFile($filePath, $relativePath);
+						        }
+						    }
+
+						    $backup[$i]->close();
+						} else {
+							$output[0] = "Erreur lors de la création de l'archive $backup_filename[$i] avec les avatars de $backup_source[$i]";
+						}
+					}
+				}
+
+				$backup_files = glob($config['abs_root_folder'].'tmp/*.zip');
+
+				include ($config['views_folder']."d.admin.backup.html");
+			}
+			else {
+				$notfound = 1;
+			}
+			break;
 		default:
 			$notfound = 1;
-			break;
+		break;
 	}
 }
 else if($user->rankIsHigher("moderator")) {
@@ -55,4 +247,41 @@ else {
 	$notfound = 1;
 }
 
+// Fonctions de mise en forme
+
+function getFontAwesomeIcon($mimeType) {
+	$icons = [
+		'application/pdf' => 'fa-file-pdf',
+		'image/jpeg' => 'fa-file-image',
+		'image/png' => 'fa-file-image',
+		'application/zip' => 'fa-file-archive',
+		'text/plain' => 'fa-file-alt',
+		'application/vnd.ms-excel' => 'fa-file-excel',
+		'application/msword' => 'fa-file-word',
+		'video/mp4' => 'fa-file-video',
+		'audio/mpeg' => 'fa-file-audio',
+	];
+
+    return $icons[$mimeType] ?? 'fa-file'; // Default
+}
+
+function formatBytes($bytes, $locale = 'en', $precision = 2) {
+	$unitMap = [
+		'en' => ['B', 'KB', 'MB', 'GB', 'TB', 'PB'],
+		'fr' => ['o', 'Ko', 'Mo', 'Go', 'To', 'Po']
+	];
+
+	$locale = explode('_', $locale)[0];
+	$units = $unitMap[$locale] ?? $unitMap['en'];
+
+	if ($bytes == 0) {
+		return '0 ' . $units[0];
+	}
+
+	$power = floor(log($bytes, 1024));
+	$formatted = round($bytes / pow(1024, $power), $precision);
+
+	return $formatted . ' ' . $units[$power];
+}
+
 ?>

controllers/d.blog.php

@@ -132,7 +132,7 @@ switch ($controller->splitted_url[1]) {
 						$blogComment = new Kabano\BlogComment();
 						$blogComment->locale = $user->locale;
 						$blogComment->author = $user->id;
-						$blogComment->content = $blogArticle->id;
+						$blogComment->content = $blogArticle->content_id;
 						$blogComment->comment = $_POST['comment'];
 						$blogComment->insert();
 					}
@@ -163,7 +163,7 @@ switch ($controller->splitted_url[1]) {
 				// Manage comments
 				if ($blogArticle->is_commentable == "t") {
 					$blogArticles_comments = new Kabano\BlogComments();
-					$blogArticles_comments->listComments($blogArticle->id, ($user->rankIsHigher("premium")));
+					$blogArticles_comments->listComments($blogArticle->content_id, ($user->rankIsHigher("premium")));
 
 					$i = 0;
 					foreach ($blogArticles_comments->objs as $comment) {

controllers/d.map.php

@@ -14,6 +14,8 @@ else {
 	$head['third'] = "leaflet/leaflet.js;leaflet-fullscreen/Leaflet.fullscreen.min.js;leaflet-easybutton/easy-button.js";
 	$head['css'] .= ";d.map.css;../third/leaflet/leaflet.css;../third/leaflet-fullscreen/leaflet.fullscreen.css;../third/leaflet-easybutton/easy-button.css";
 	$head['js'] = "d.map.js";
+
+	require_once($config['includes_folder']."poi_types.struct.php");
 	include ($config['views_folder']."d.map.html");
 }
 

controllers/d.poi.php

@@ -0,0 +1,162 @@
+<?
+
+require_once($config['models_folder']."d.poi.php");
+require_once($config['models_folder']."d.users.php");
+
+$head['css'] = "d.index.css;d.poi.css";
+
+$poi = new Kabano\Poi();
+
+switch ($controller->splitted_url[1]) {
+	case "new":
+		if($user->rankIsHigher("registered")) {
+			if(isset($_POST['submit'])) {
+				$poi->name = $_POST['name'];
+				$poi->locale = $_POST['locale'];
+				$poi->poi_type = $_POST['poi_type'];
+				$poi->lat = $_POST['lat'];
+				$poi->lon = $_POST['lon'];
+				$poi->ele = $_POST['ele'];
+				$poi->author = $user->id;
+				$poi->source = "k";
+				if(!$poi->checkPermalink($_POST['permalink'],1)) {
+					$poi->permalink = $_POST['permalink'];
+					$poi->insert();
+					header('Location: '.$config['rel_root_folder']."blog/".$poi->permalink);
+				}
+				else {
+					$head['title'] = $poi->name;
+					$error = "permalink";
+				}
+			}
+			else {
+				$head['title'] = "Nouvel hébergement";
+			}
+
+			$locales = new Kabano\Locales();
+			$locales->getAll();
+
+			$head['third'] = "leaflet/leaflet.js;leaflet-fullscreen/Leaflet.fullscreen.min.js;leaflet-easybutton/easy-button.js";
+			$head['css'] .= ";../third/leaflet/leaflet.css;../third/leaflet-fullscreen/leaflet.fullscreen.css;../third/leaflet-easybutton/easy-button.css";
+			$head['js'] = "d.poi_map.js";
+
+			$poi->lat = ""; $poi->lon = ""; $poi->ele = "";
+
+			$new = 1;
+			include ($config['views_folder']."d.poi.edit.html");
+			break;
+		}
+		else {
+			$notfound = 1;	
+		}
+	case "elevation_proxy":
+		if(isset($_GET['location'])) {
+			header("Content-Type: application/json;charset=utf-8");
+			echo(file_get_contents("https://api.opentopodata.org/v1/mapzen?locations=".$_GET['location']));
+			break;
+		}
+		else {
+			$notfound = 1;	
+		}
+	default:
+		// // If the page exists
+		// if ($blogArticle->checkPermalink($controller->splitted_url[1],$user->rankIsHigher("premium"))) {
+		// 	if (isset($controller->splitted_url[2]) && $controller->splitted_url[2] == "delete" && $user->rankIsHigher("moderator")) {
+		// 		$blogArticle->delete();
+		// 		header('Location: '.$config['rel_root_folder']."blog/".$blogArticle->permalink);
+		// 	}
+		// 	else if (isset($controller->splitted_url[2]) && $controller->splitted_url[2] == "restore" && $user->rankIsHigher("moderator")) {
+		// 		$blogArticle->restore();
+		// 		header('Location: '.$config['rel_root_folder']."blog/".$blogArticle->permalink);
+		// 	}
+		// 	else if (isset($controller->splitted_url[2]) && $controller->splitted_url[2] == "edit" && $user->rankIsHigher("moderator")) {
+		// 		if(isset($_POST['submit'])) {
+		// 			$blogArticle->content = $_POST['content'];
+		// 			$blogArticle->locale = $_POST['locale'];
+		// 			$blogArticle->name = $_POST['name'];
+		// 			$blogArticle->is_commentable = isset($_POST['is_commentable'])?'t':'f';
+		// 			$blogArticle->author = $user->id;
+		// 			$blogArticle->update();
+		// 			header('Location: '.$config['rel_root_folder']."blog/".$blogArticle->permalink);
+		// 		}
+		// 		else {
+		// 			$locales = new Kabano\Locales();
+		// 			$locales->getAll();
+
+		// 			$head['title'] = $blogArticle->name;
+		// 			include ($config['views_folder']."d.blog.edit.html");
+		// 		}
+		// 	}
+		// 	else {
+		// 		// Manage history of an article
+		// 		if($user->rankIsHigher("premium")) {
+		// 			$blogHistory = new Kabano\BlogArticles();
+		// 			$blogHistory->getHistory($controller->splitted_url[1]);
+		// 		}
+		// 		if (isset($controller->splitted_url[2]) && is_numeric($controller->splitted_url[2]))
+		// 			$blogArticle->checkPermalink($controller->splitted_url[1],$user->rankIsHigher("premium"),$controller->splitted_url[2]);
+
+		// 		// Manage comment creation
+		// 		if (isset($controller->splitted_url[2]) && $controller->splitted_url[2]=="new_comment") {
+		// 			if (isset($_POST['submit']) && $user->rankIsHigher("registered")) {
+		// 				$blogComment = new Kabano\BlogComment();
+		// 				$blogComment->locale = $user->locale;
+		// 				$blogComment->author = $user->id;
+		// 				$blogComment->content = $blogArticle->content_id;
+		// 				$blogComment->comment = $_POST['comment'];
+		// 				$blogComment->insert();
+		// 			}
+		// 		}
+
+		// 		// Manage comment deletion
+		// 		if (isset($controller->splitted_url[2]) && $controller->splitted_url[2]=="delete_comment") {
+		// 			if (isset($controller->splitted_url[3]) && is_numeric($controller->splitted_url[3])) {
+		// 				$blogComment = new Kabano\BlogComment();
+		// 				if($blogComment->checkId($controller->splitted_url[3]))
+		// 					if ($user->rankIsHigher("moderator") || $user->id == $blogComment->author)
+		// 						$blogComment->delete();
+		// 			}
+		// 		}
+
+		// 		// Manage comment restoration
+		// 		if (isset($controller->splitted_url[2]) && $controller->splitted_url[2]=="restore_comment") {
+		// 			if (isset($controller->splitted_url[3]) && is_numeric($controller->splitted_url[3])) {
+		// 				$blogComment = new Kabano\BlogComment();
+		// 				if($blogComment->checkId($controller->splitted_url[3]))
+		// 					if ($user->rankIsHigher("moderator") || $user->id == $blogComment->author)
+		// 						$blogComment->restore();
+		// 			}
+		// 		}
+
+		// 		$blogArticle->md2html();
+
+		// 		// Manage comments
+		// 		if ($blogArticle->is_commentable == "t") {
+		// 			$blogArticles_comments = new Kabano\BlogComments();
+		// 			$blogArticles_comments->listComments($blogArticle->content_id, ($user->rankIsHigher("premium")));
+
+		// 			$i = 0;
+		// 			foreach ($blogArticles_comments->objs as $comment) {
+		// 				$comment->md2html();
+		// 				$comment->author_obj = new Kabano\User();
+		// 				$comment->author_obj->checkId($comment->author);
+		// 			}
+		// 		}
+
+
+		// 		$tempUser = new Kabano\User();
+		// 		$tempUser->checkId($blogArticle->author);
+		// 		$blogArticle->author_name = $tempUser->name;
+		// 		unset($tempUser);
+
+		// 		$head['title'] = $blogArticle->name;
+		// 		include ($config['views_folder']."d.blog.view.html");
+		// 	}
+		// }
+		// else {
+		// 	$notfound = 1;	
+		// }
+		// break;
+}
+
+?>

controllers/d.users.php

@@ -126,6 +126,7 @@ if(isset($controller->splitted_url[1])) {
 						if($_POST['password']!='')
 							$userProfile->password=sha1($_POST['password']);
 						$userProfile->locale=$_POST['locale'];
+						$userProfile->timezone=$_POST['timezone'];
 						if($user->rankIsHigher("administrator"))
 							$userProfile->rank = $_POST['rank'];
 						$userProfile->website=$_POST['website'];

controllers/d.wiki.php

@@ -69,6 +69,8 @@ else if(isset($controller->splitted_url[1]) && $wikiPage->checkPermalink($contro
 
 		$wikiPage->md2html();
 		$head['title'] = $wikiPage->name;
+		$head['css'] .= ";../third/simplelightbox/simple-lightbox.min.css";
+		$head['third'] = "simplelightbox/simple-lightbox.min.js";
 		include ($config['views_folder']."d.wiki.view.html");
 	}
 }

includes/config.example.php

@@ -3,6 +3,8 @@
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 error_reporting(E_ALL);
+locale_set_default("fr_FR");
+date_default_timezone_set("UTC"); // Default tz for date manipulation is UTC. Display tz is in session.php
 
 
 /*****
@@ -15,7 +17,7 @@ $config['include_folder']=basename(__DIR__);
 $config['abs_root_folder']=str_replace($config['include_folder'],"",__DIR__);
 // This is the relative folder to the root of the website from the DocumentRoot (can also be called subfolder)
 $config['rel_root_folder']=str_replace($_SERVER['DOCUMENT_ROOT'],"",$config['abs_root_folder']);
-$config['web_root_folder']="kabano.test/";
+$config['web_root_folder']="https://kabano.test/";
 if($config['rel_root_folder']=="") $config['rel_root_folder']="/";
 
 // Here all the absolute paths to specific folders

includes/images.php

@@ -25,10 +25,10 @@ function generate_image_thumbnail($source_image_path, $thumbnail_image_path, $wi
 	// If the limitation is on the height (cuts on the width)
 	if($height*$source_image_width/$source_image_height > $width) {
 		$src_x = (int)(($source_image_width - $source_image_height * $width / $height) / 2);
-		$source_image_width = $source_image_height * $width / $height;
+		$source_image_width = (int)($source_image_height * $width / $height);
 	} else {
 		$src_y = (int)(($source_image_height - $source_image_width * $height / $width) / 2);
-		$source_image_height = $source_image_width * $height / $width;
+		$source_image_height = (int)($source_image_width * $height / $width);
 	}
 
 	$thumbnail_gd_image = imagecreatetruecolor($thumbnail_image_width, $thumbnail_image_height);

includes/poi_types.struct.php

@@ -0,0 +1,65 @@
+<?
+
+// This array is related to the defined SQL enum, do not touch.
+// Types : t_: text ; b_: boolean ; n_: number ; l_: link
+
+$poi_types = array(
+	"basic_hut"			=> array("Abri sommaire", "Abri", "#ef2929", "basic_hut", "Un abri sommaire est un bâtiment qui ne permet pas l'hébergement, comme un kiosque.", array(
+							't_owner'		=> "Informations sur le⋅la propriétaire et moyens de contacts",
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description sur l'abri et remarques (mobilier, dates de disponibilité...)",
+							'b_usable'		=> "Abri condamné, détruit ou fermé ?",
+							'b_water'		=> "Eau à proximité ?",
+							'b_wood'		=> "Bois à proximité ?")),
+	"wilderness_hut" 	=> array("Cabane non gardée", "Cabane", "#ef2929", "wilderness_hut", "Une cabane non gardée est un bâtiment qui permet l'hébergement, même sommaire, sans gardien.", array(
+							't_owner'		=> "Informations sur le⋅la propriétaire et moyens de contacts",
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description sur la cabane et remarques (mobilier, isolation, dates de disponibilité...)",
+							'b_key'			=> "Nécessite une clé ?",
+							'b_usable'		=> "Cabane condamnée, détruite ou fermée ?",
+							'n_bed'			=> "Nombre de places prévues pour dormir :",
+							'n_mattress'	=> "Nombre de matelas disponibles :",
+							'b_cover'		=> "Couvertures ?",
+							'b_water'		=> "Eau à proximité ?",
+							'b_wood'		=> "Bois à proximité ?",
+							'b_fireplace'	=> "Cheminée ou poêle à bois ?",
+							'b_toilet'		=> "Latrines ou toilettes ?")),
+	"alpine_hut" 		=> array("Refuge gardé", "Refuge", "#ef2929", "alpine_hut", "Un refuge gardé est un bâtiment qui permet l'hébergement toute l'année, gardé tout ou partie de l'année.", array(
+							't_owner'		=> "Informations sur le⋅la propriétaire, le⋅la gardien⋅ne et moyens de contacts",
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description sur le refuge et remarques (mobilier, isolation, dates de gardiennage, tarifs, prestations, réservations...)",
+							'b_usable'		=> "Refuge condamné, détruit ou fermé ?",
+							'n_bed'			=> "Nombre de places prévues pour dormir en période gardée :",
+							'n_bed_winter'	=> "Nombre de places prévues pour dormir en période non gardée :",
+							'n_mattress'	=> "Nombre de matelas en période non gardée :",
+							'b_cover'		=> "Couvertures disponibles en période non gardée ?",
+							'b_water'		=> "Possibilité de se ravitailler en eau ?",
+							'b_wood'		=> "Bois à proximité ?",
+							'b_fireplace'	=> "Cheminée ou poêle à bois en période non gardée ?",
+							'b_toilet'		=> "Latrines ou toilettes en période non gardée ?",
+							'l_water'		=> "URL du site web :")),
+	"halt"				=> array("Gîte d'étape", "Gîte", "#4e9a06", "halt", "Un gîte d'étape est un bâtiment qui permet l'hébergement uniquement sur ses périodes d'ouvertures.", array(
+							't_owner'		=> "Informations sur le⋅la propriétaire, le⋅la gardien⋅ne et moyens de contacts",
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description sur le gîte et remarques (période d'ouverture, tarifs, prestations, réservations...)",
+							'b_usable'		=> "Gîte condamné, détruit ou fermé ?",
+							'n_bed'			=> "Nombre de places prévues pour dormir :",
+							'b_water'		=> "Possibilité de se ravitailler en eau ?",
+							'l_water'		=> "URL du site web :")),
+	"bivouac"			=> array("Zone de bivouac", "Bivouac", "#ef2929", "bivouac", "Une zone de bivouac est un espace aménagé permettant de planter la tente.", array(
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description sur la zone de bivouac et remarques (réglementation spécifique...)",
+							'n_bed'			=> "Nombre d'emplacements :",
+							'b_water'		=> "Eau à proximité ?",
+							'b_wood'		=> "Bois à proximité ?",
+							'b_fireplace'	=> "Emplacement pour faire un feu ?")),
+	"campsite"			=> array("Camping", "Camping", "#4e9a06", "campsite", "Un camping est un espace aménagé permettant de planter la tente plusieurs jours, avec gardien.", array(
+							't_owner'		=> "Informations sur le⋅la propriétaire, le⋅la gardien⋅ne et moyens de contacts",
+							't_access'		=> "Description de l'accès, des transports en commun, et d'éventuels passages délicats",
+							't_description'	=> "Description du camping et remarques (période d'ouverture, tarifs, prestations...)",
+							'n_bed'			=> "Nombre d'emplacements :",
+							'b_water'		=> "Possibilité de se ravitailler en eau ?",
+							'l_water'		=> "URL du site web :"))
+);
+
+?>

includes/routes.php

@@ -20,12 +20,15 @@ $controller->prefix = "d.";
 $notfound = 0;
 $session = 1;
 
+if($controller->splitted_url[0]=="") $controller->splitted_url[0]="index";
+
 // Routing to the correct page from the correct link
 switch ($controller->splitted_url[0])
 {
-    case "index": case "" :
+    case "index":
+    case "community" :
         $controller->name="";
-        $view->name="index";
+        $view->name=$controller->splitted_url[0];
         break;
     case "user" :
         $controller->name="users";
@@ -35,6 +38,7 @@ switch ($controller->splitted_url[0])
     case "wiki" :
     case "blog" :
     case "map" :
+    case "poi" :
     case "admin" :
         $controller->name=$controller->splitted_url[0];
         $view->name="";

includes/session.php

@@ -6,17 +6,33 @@ ini_set("session.cookie_lifetime",60*60*24*30);
 session_start();
 
 $user = new Kabano\User();
-$user->rank = "visitor"; // All users are visitors
 
 if(isset($_SESSION['userid'])) {
-	$user->checkID($_SESSION['userid']);
 	if ($user->checkID($_SESSION['userid'])) {
 		$user->updateLoginDate();
-		//setlocale(LC_ALL, $config['locales'][$user->locale][4]);
+		$config['locale'] = $user->locale;
+		$config['timezone'] = $user->timezone;
 	}
 	else {
 		session_destroy();
+		$config['locale'] = "fr_FR";
+		$config['timezone'] = "Europe/Paris";
+		$user->rank = "visitor"; // All users are visitors
 	}
 }
+else {
+	$config['locale'] = "fr_FR";
+	$config['timezone'] = "Europe/Paris";
+	$user->rank = "visitor"; // All users are visitors
+}
+
+if (PHP_VERSION_ID < 80000) {
+	$user->date_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::LONG, IntlDateFormatter::NONE, $config['timezone']);
+} else {
+	$user->date_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::RELATIVE_LONG, IntlDateFormatter::NONE, $config['timezone']);
+}
+$user->datetime_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::LONG, IntlDateFormatter::SHORT, $config['timezone']);
+$user->datetimeshort_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, $config['timezone']);
+
 
 ?>

models/d.blog.php

@@ -14,7 +14,9 @@ require_once($config['third_folder']."Md/MarkdownExtra.inc.php");
 
 class BlogArticle
 {
-	public $id = NULL;
+	public $content_id = NULL;
+	public $locale_id = NULL;
+	public $version_id = NULL;
 	public $permalink = NULL;
 	public $version = 0;
 	public $locale = NULL;
@@ -37,7 +39,7 @@ class BlogArticle
 		$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 * FROM contents WHERE permalink=$1 AND type='blog'";
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE permalink=$1 AND type='blog'";
 		if($withArchive==0) {
 			$query .= " AND is_archive=FALSE AND is_public=TRUE";
 		}
@@ -64,7 +66,9 @@ class BlogArticle
 	** Populate the object using its ID
 	*****/
 	public function populate($row) {
-		$this->id = $row['id'];
+		$this->content_id = $row['content_id'];
+		$this->locale_id = $row['locale_id'];
+		$this->version_id = $row['version_id'];
 		$this->permalink = $row['permalink'];
 		$this->version = $row['version'];
 		$this->locale = $row['locale'];
@@ -86,46 +90,37 @@ class BlogArticle
 		global $config;
 		global $user;
 
-		if($this->id == 0)
+		if($this->content_id == 0 || $this->locale_id == 0 || $this->version_id == 0)
 			die("Cannot update entry without giving ID");
 		
-		$oldId = $this->id;
-		
 		$this->version++;
 
 		$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 contents SET is_archive = TRUE WHERE permalink = $1 AND type='blog'";
+		$query = "UPDATE content_versions SET is_archive = TRUE WHERE locale_id = $1";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare1", array($this->permalink))
+		$result = pg_execute($con, "prepare1", array($this->locale_id))
 			or die ("Cannot execute statement\n");
 
-		$query = "INSERT INTO contents (permalink, version, locale, creation_date, update_date, author, is_public, is_archive, is_commentable, type, name, content) VALUES
-			($1, $2, $3, $4, $5, $6, TRUE, FALSE, $7, 'blog', $8, $9) RETURNING id";
+		$query = "INSERT INTO content_versions (version, update_date, is_archive, name, content, locale_id) VALUES
+			($1, $2, FALSE, $3, $4, $5) RETURNING id";
 
 		pg_prepare($con, "prepare2", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare2", array($this->permalink, $this->version, $this->locale, $this->creation_date, date('r'), $this->author, $this->is_commentable, $this->name, $this->content))
+		$result = pg_execute($con, "prepare2", array($this->version, date('r'), $this->name, $this->content, $this->locale_id))
 			or die ("Cannot execute statement\n");
 
-		$this->id = pg_fetch_assoc($result)['id'];
-
-		$query = "INSERT INTO content_contributors (content, contributor) SELECT $1, contributor FROM content_contributors AS old WHERE old.content = $2";
-
-		pg_prepare($con, "prepare3", $query) 
-			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare3", array($this->id, $oldId))
-			or die ("Cannot execute statement\n");
+		$this->version_id = pg_fetch_assoc($result)['id'];
 
 		$query = "INSERT INTO content_contributors (content, contributor) VALUES
 			($1, $2) ON CONFLICT (content, contributor) DO NOTHING";
 
-		pg_prepare($con, "prepare4", $query) 
+		pg_prepare($con, "prepare3", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare4", array($this->id, $user->id))
+		$result = pg_execute($con, "prepare3", array($this->locale_id, $user->id))
 			or die ("Cannot execute statement\n");
 
 		pg_close($con);
@@ -196,22 +191,42 @@ class BlogArticle
 		$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 = "INSERT INTO contents (permalink, version, locale, creation_date, update_date, author, is_public, is_archive, is_commentable, type, name, content) VALUES
-			($1, '0', $2, $3, $4, $5, TRUE, FALSE, $6, 'blog', $7, $8) RETURNING id";
+		$query = "INSERT INTO contents (permalink, creation_date, is_public, is_commentable, type) VALUES
+			($1, $2, TRUE, $3, 'blog') RETURNING id";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare1", array($this->permalink, $this->locale, date('r'), date('r'), $user->id, $this->is_commentable, $this->name, $this->content))
+		$result = pg_execute($con, "prepare1", array($this->permalink, date('r'), $this->is_commentable))
 			or die ("Cannot execute statement\n");
 
-		$this->id = pg_fetch_assoc($result)['id'];
+		$this->content_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO content_locales (content_id, locale, author) VALUES
+			($1, $2, $3) RETURNING id";
+
+		pg_prepare($con, "prepare2", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare2", array($this->content_id, $this->locale, $user->id))
+			or die ("Cannot execute statement\n");
+
+		$this->locale_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO content_versions (version, update_date, is_archive, name, content, locale_id) VALUES
+			('0', $1, FALSE, $2, $3, $4) RETURNING id";
+
+		pg_prepare($con, "prepare3", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare3", array(date('r'), $this->name, $this->content, $this->locale_id))
+			or die ("Cannot execute statement\n");
+
+		$this->version_id = pg_fetch_assoc($result)['id'];
 
 		$query = "INSERT INTO content_contributors (content, contributor) VALUES
 			($1, $2)";
 
-		pg_prepare($con, "prepare2", $query) 
+		pg_prepare($con, "prepare4", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare2", array($this->id, $user->id))
+		$result = pg_execute($con, "prepare4", array($this->id, $user->id))
 			or die ("Cannot execute statement\n");
 
 		pg_close($con);
@@ -261,13 +276,10 @@ class BlogArticles
 		$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");
 
-		if ($archive == 1) {
-			// You just want one per url and the criteria is ORDER BY archives = true, time DES=C
-			$query = "SELECT * FROM (SELECT *, ROW_NUMBER() OVER (PARTITION BY a.permalink ORDER BY CASE WHEN a.is_archive IS TRUE THEN 1 ELSE 0 END, a.update_date DESC) AS r FROM contents AS a WHERE type='blog') AS b WHERE r = 1 ORDER BY update_date DESC";
-		}
-		else {
-			$query = "SELECT * FROM contents WHERE is_archive IS NOT TRUE AND is_public IS TRUE AND type='blog' ORDER BY update_date DESC";
-		}
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE is_archive=FALSE ";
+		if ($archive != 1)
+			$query .= "AND is_public=TRUE ";
+		$query .= "AND type='blog' ORDER BY update_date DESC";
 		$query .= " LIMIT $1 OFFSET $2";
 
 		pg_prepare($con, "prepare1", $query) 
@@ -293,13 +305,10 @@ class BlogArticles
 		$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");
 
-		if ($archive == 1) {
-			// You just want one per url and the criteria is ORDER BY archives = true, time DES=C
-			$query = "SELECT * FROM (SELECT a.update_date, ROW_NUMBER() OVER (PARTITION BY a.permalink ORDER BY CASE WHEN a.is_archive IS TRUE THEN 1 ELSE 0 END, a.update_date DESC) AS r FROM contents AS a WHERE type='blog') AS b WHERE r = 1 ORDER BY update_date DESC";
-		}
-		else {
-			$query = "SELECT update_date FROM contents WHERE is_archive IS NOT TRUE AND is_public IS TRUE AND type='blog' ORDER BY update_date DESC";
-		}
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE is_archive=FALSE ";
+		if ($archive == 1)
+			$query .= "AND is_public=TRUE ";
+		$query .= "AND type='blog' ORDER BY update_date DESC";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");
@@ -320,7 +329,7 @@ class BlogArticles
 		$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 * FROM contents WHERE permalink=$1 AND type='blog' ORDER BY update_date DESC";
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE permalink=$1 AND type='blog' ORDER BY update_date DESC";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");

models/d.poi.php

@@ -0,0 +1,179 @@
+<?
+
+namespace Kabano;
+
+/**********************************************************
+***********************************************************
+**  
+**  This class is to manage a poi object
+**  
+***********************************************************
+**********************************************************/
+
+require_once($config['third_folder']."Md/MarkdownExtra.inc.php");
+require_once($config['includes_folder']."poi_types.struct.php");
+
+
+class Poi
+{
+	public $poi_id = NULL;
+	public $locale_id = NULL;
+	public $source_id = NULL;
+	public $version_id = NULL;
+	public $is_public = NULL;
+	public $permalink = NULL;
+	public $creation_date = NULL;
+	public $name = NULL;
+	public $position = NULL;
+	public $type = NULL;
+	public $locale = NULL;
+	public $source = NULL;
+	public $remote_source_id = NULL;
+	public $author = NULL;
+	public $version = NULL;
+	public $update_date = NULL;
+	public $is_archive = NULL;
+	public $alt_type = NULL;
+	public $is_destroyed = NULL;
+	public $alt_name = NULL;
+	public $alt_position = NULL;
+	public $parameters = NULL;
+
+	public $lat;
+	public $lon;
+	public $ele;
+
+	/*****
+	** Checks if a page at this URL exists and return the ID
+	*****/
+	public function checkPermalink($permalink, $withArchive=0, $elementNb=0) {
+		global $config;
+		
+		$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 poi_versions.id AS version_id, * FROM pois INNER JOIN poi_locales ON pois.id = poi_locales.poi_id INNER JOIN poi_sources ON poi_locales.id = poi_sources.locale_id INNER JOIN poi_versions ON poi_sources.id = poi_versions.source_id WHERE permalink=$1";
+		if($withArchive==0) {
+			$query .= " AND is_archive=FALSE AND is_public=TRUE";
+		}
+		$query .= " ORDER BY update_date DESC LIMIT 1 OFFSET $2";
+
+		pg_prepare($con, "prepare1", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare1", array($permalink, $elementNb))
+			or die ("Cannot execute statement\n");
+
+		pg_close($con);
+
+		if(pg_num_rows($result) == 1) {
+			$row = pg_fetch_assoc($result);
+			$this->populate($row);
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+
+	/*****
+	** Populate the object using its ID
+	*****/
+	public function populate($row) {
+		$this->$poi_id = $row['poi_id'];
+		$this->$locale_id = $row['locale_id'];
+		$this->$source_id = $row['source_id'];
+		$this->$version_id = $row['version_id'];
+		$this->$is_public = $row['is_public'];
+		$this->$permalink = $row['permalink'];
+		$this->$creation_date = $row['creation_date'];
+		$this->$name = $row['name'];
+		$this->$position = $row['position'];
+		$this->$type = $row['type'];
+		$this->$locale = $row['locale'];
+		$this->$source = $row['source'];
+		$this->$remote_source_id = $row['remote_source_id'];
+		$this->$author = $row['author'];
+		$this->$version = $row['version'];
+		$this->$update_date = $row['update_date'];
+		$this->$is_archive = $row['is_archive'];
+		$this->$alt_type = $row['alt_type'];
+		$this->$is_destroyed = $row['is_destroyed'];
+		$this->$alt_name = $row['alt_name'];
+		$this->$alt_position = $row['alt_position'];
+		$this->$parameters = $row['parameters'];
+	}
+
+	/*****
+	** Create a new poi, all field required except alt_*, *_id
+	*****/
+	public function insert() {
+		global $config;
+		global $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");
+
+		// Because it is the first insert.
+		$this->alt_type = $this->type;
+		$this->alt_name = $this->name;
+		$this->alt_position = $this->position;
+
+		$query = "INSERT INTO pois (is_public, permalink, creation_date, name, position, type) VALUES
+			(TRUE, $1, $2, $3, $4, $5) RETURNING id";
+
+		pg_prepare($con, "prepare1", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare1", array($this->permalink, date('r'), $this->name, $this->position, $this->type))
+			or die ("Cannot execute statement\n");
+
+		$this->poi_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO poi_locales (locale, poi_id) VALUES
+			($1, $2) RETURNING id";
+
+		pg_prepare($con, "prepare2", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare2", array($this->locale, $this->poi_id))
+			or die ("Cannot execute statement\n");
+
+		$this->locale_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO poi_sources (source, remote_source_id, author, locale_id) VALUES
+			($1, $2, $3, $4) RETURNING id";
+
+		pg_prepare($con, "prepare3", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare3", array($this->source, $this->remote_source_id, $this->author, $this->locale_id))
+			or die ("Cannot execute statement\n");
+
+		$this->source_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO poi_versions (version, update_date, is_archive, alt_type, is_destroyed, alt_name, alt_position, parameters, source_id) VALUES
+			('0', $1, FALSE, $2, $3, $4, $5, $6, $7) RETURNING id";
+
+		pg_prepare($con, "prepare4", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare4", array(date('r'), $this->alt_type, $this->is_destroyed, $this->alt_name, $this->alt_position, $this->parameters, $this->source_id))
+			or die ("Cannot execute statement\n");
+
+		$this->version_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO poi_contributors (poi, contributor) VALUES
+			($1, $2)";
+
+		pg_prepare($con, "prepare5", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare5", array($this->source_id, $user->id))
+			or die ("Cannot execute statement\n");
+
+		pg_close($con);
+
+		error_log(
+			date('r')." \t".$user->name." (".$user->id.") \tINSERT \tCreate new poi '".$this->permalink."'\r\n",
+			3,
+			$config['logs_folder'].'wiki.log');
+	}
+
+}
+
+?>

models/d.users.php

@@ -12,6 +12,7 @@ namespace Kabano;
 
 require_once($config['models_folder']."d.locales.php");
 
+// This array is related to the defined SQL enum, do not touch.
 $ranks = array(
 	"administrator"	=> array(1000,"Administrateur", "red", "administrator"),
 	"moderator" 	=> array(800,"Modérateur", "orangered", "moderator"),
@@ -37,6 +38,13 @@ class User
     public $visit_date = NULL;
     public $register_date = NULL;
 
+    public $date_format;
+    public $datetime_format;
+    public $datetimeshort_format;
+    public $locale_obj;
+    public $locale_loaded = false;
+
+
 	/*****
 	** Connect to correct account using ID and stores its ID
 	*****/
@@ -118,7 +126,7 @@ class User
 		return '<span class="userrole" style="color: '.$ranks[$this->rank][2].';">'.$ranks[$this->rank][1].'</span>';
 	}
 	public function get_locale() {
-		if( isset($this->locale_loaded) ) {
+		if( $this->locale_loaded) {
 			return $this->locale_obj->display_name;
 		}
 		else {
@@ -212,7 +220,7 @@ class User
 		$this->visit_date = date('r');
 		$this->register_date = date('r');
 		$this->locale = "fr_FR";
-		$this->timezone = "CEST";
+		$this->timezone = "Europe/Paris";
 		
 		$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");
@@ -244,17 +252,17 @@ class User
 			or die ("Could not connect to server\n");
 
 		if($this->password=='') {
-			$query = "UPDATE users SET version = $1, name = $2, is_avatar_present = $3, locale = $4, rank = $5, email = $6, website = $7 WHERE id = $8";
+			$query = "UPDATE users SET version = $1, name = $2, is_avatar_present = $3, locale = $4, rank = $5, email = $6, website = $7, timezone = $8 WHERE id = $9";
 			pg_prepare($con, "prepare1", $query) 
 				or die ("Cannot prepare statement\n");
-			pg_execute($con, "prepare1", array($this->version, $this->name, $this->is_avatar_present, $this->locale, $this->rank, $this->email, $this->website, $this->id))
+			pg_execute($con, "prepare1", array($this->version, $this->name, $this->is_avatar_present, $this->locale, $this->rank, $this->email, $this->website, $this->timezone, $this->id))
 				or die ("Cannot execute statement\n");
 		}
 		else {
-			$query = "UPDATE users SET name = $1, is_avatar_present = $2, locale = $3, rank = $4, email = $5, website = $6, password = $7 WHERE id = $8";
+			$query = "UPDATE users SET name = $1, is_avatar_present = $2, locale = $3, rank = $4, email = $5, website = $6, password = $7, timezone = $8, version = $9 WHERE id = $10";
 			pg_prepare($con, "prepare1", $query) 
 				or die ("Cannot prepare statement\n");
-			pg_execute($con, "prepare1", array($this->name, $this->is_avatar_present, $this->locale, $this->rank, $this->email, $this->website, $this->password, $this->id))
+			pg_execute($con, "prepare1", array($this->name, $this->is_avatar_present, $this->locale, $this->rank, $this->email, $this->website, $this->password, $this->timezone, $this->version, $this->id))
 				or die ("Cannot execute statement\n");
 		}
 
@@ -298,7 +306,7 @@ class User
 		$message .= "Cordialement,<br>\r\n";
 		$message .= "<br>\r\n";
 		$message .= "L'équipe Kabano.<br>\r\n";
-		$message .= "<small style='color:#777;'><i>Fait avec ♥ depuis Toulouse.</i></small><br>\r\n";
+		$message .= "<small style='color:#777;'><i>Fait avec ♥ en Ariège.</i></small><br>\r\n";
 
 		$headers = 'From: '. $config['bot_mail'] . "\r\n" .
 		'Reply-To: '. $config['bot_mail'] . "\r\n" .

models/d.wiki.php

@@ -14,7 +14,9 @@ require_once($config['third_folder']."Md/MarkdownExtra.inc.php");
 
 class WikiPage
 {
-	public $id = NULL;
+	public $content_id = NULL;
+	public $locale_id = NULL;
+	public $version_id = NULL;
 	public $permalink = NULL;
 	public $version = 0;
 	public $locale = NULL;
@@ -28,6 +30,8 @@ class WikiPage
 	public $name = NULL;
 	public $content = NULL;
 
+	public $content_html;
+
 	/*****
 	** Checks if a page at this ermalink exists and return the populated element
 	*****/
@@ -37,7 +41,7 @@ class WikiPage
 		$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 * FROM contents WHERE permalink=$1 AND type='wiki'";
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE permalink=$1 AND type='wiki'";
 		if($withArchive==0) {
 			$query .= " AND is_archive=FALSE AND is_public=TRUE";
 		}
@@ -64,7 +68,9 @@ class WikiPage
 	** Populate the object using raw data from SQL
 	*****/
 	public function populate($row) {
-		$this->id = $row['id'];
+		$this->content_id = $row['content_id'];
+		$this->locale_id = $row['locale_id'];
+		$this->version_id = $row['version_id'];
 		$this->permalink = $row['permalink'];
 		$this->version = $row['version'];
 		$this->locale = $row['locale'];
@@ -86,46 +92,37 @@ class WikiPage
 		global $config;
 		global $user;
 
-		if($this->id == 0)
+		if($this->content_id == 0 || $this->locale_id == 0 || $this->version_id == 0)
 			die("Cannot update entry without giving ID");
 
-		$oldId = $this->id;
-		
 		$this->version++;
 
 		$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 contents SET is_archive = TRUE WHERE permalink = $1 AND type='wiki'";
+		$query = "UPDATE content_versions SET is_archive = TRUE WHERE locale_id = $1";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare1", array($this->permalink))
+		$result = pg_execute($con, "prepare1", array($this->locale_id))
 			or die ("Cannot execute statement\n");
 
-		$query = "INSERT INTO contents (permalink, version, locale, creation_date, update_date, author, is_public, is_archive, is_commentable, type, name, content) VALUES
-			($1, $2, $3, $4, $5, $6, TRUE, FALSE, FALSE, 'wiki', $7, $8) RETURNING id";
+		$query = "INSERT INTO content_versions (version, update_date, is_archive, name, content, locale_id) VALUES
+			($1, $2, FALSE, $3, $4, $5) RETURNING id";
 
 		pg_prepare($con, "prepare2", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare2", array($this->permalink, $this->version, $this->locale, $this->creation_date, date('r'), $this->author, $this->name, $this->content))
+		$result = pg_execute($con, "prepare2", array($this->version, date('r'), $this->name, $this->content, $this->locale_id))
 			or die ("Cannot execute statement\n");
 
-		$this->id = pg_fetch_assoc($result)['id'];
-
-		$query = "INSERT INTO content_contributors (content, contributor) SELECT $1, contributor FROM content_contributors AS old WHERE old.content = $2";
-
-		pg_prepare($con, "prepare3", $query) 
-			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare3", array($this->id, $oldId))
-			or die ("Cannot execute statement\n");
+		$this->version_id = pg_fetch_assoc($result)['id'];
 
 		$query = "INSERT INTO content_contributors (content, contributor) VALUES
 			($1, $2) ON CONFLICT (content, contributor) DO NOTHING";
 
-		pg_prepare($con, "prepare4", $query) 
+		pg_prepare($con, "prepare3", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare4", array($this->id, $user->id))
+		$result = pg_execute($con, "prepare3", array($this->locale_id, $user->id))
 			or die ("Cannot execute statement\n");
 
 		pg_close($con);
@@ -187,7 +184,7 @@ class WikiPage
 	}
 
 	/*****
-	** Create a page by archiving the current one and inserting a new one ID
+	** Create a new page, fails if permalink already exists
 	*****/
 	public function insert() {
 		global $config;
@@ -196,22 +193,42 @@ class WikiPage
 		$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 = "INSERT INTO contents (permalink, version, locale, creation_date, update_date, author, is_public, is_archive, is_commentable, type, name, content) VALUES
-			($1, '0', $2, $3, $4, $5, TRUE, FALSE, FALSE, 'wiki', $6, $7) RETURNING id";
+		$query = "INSERT INTO contents (permalink, creation_date, is_public, is_commentable, type) VALUES
+			($1, $2, TRUE, FALSE, 'wiki') RETURNING id";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare1", array($this->permalink, $this->locale, date('r'), date('r'), $user->id, $this->name, $this->content))
+		$result = pg_execute($con, "prepare1", array($this->permalink, date('r')))
 			or die ("Cannot execute statement\n");
 
-		$this->id = pg_fetch_assoc($result)['id'];
+		$this->content_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO content_locales (content_id, locale, author) VALUES
+			($1, $2, $3) RETURNING id";
+
+		pg_prepare($con, "prepare2", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare2", array($this->content_id, $this->locale, $user->id))
+			or die ("Cannot execute statement\n");
+
+		$this->locale_id = pg_fetch_assoc($result)['id'];
+
+		$query = "INSERT INTO content_versions (version, update_date, is_archive, name, content, locale_id) VALUES
+			('0', $1, FALSE, $2, $3, $4) RETURNING id";
+
+		pg_prepare($con, "prepare3", $query) 
+			or die ("Cannot prepare statement\n");
+		$result = pg_execute($con, "prepare3", array(date('r'), $this->name, $this->content, $this->locale_id))
+			or die ("Cannot execute statement\n");
+
+		$this->version_id = pg_fetch_assoc($result)['id'];
 
 		$query = "INSERT INTO content_contributors (content, contributor) VALUES
 			($1, $2)";
 
-		pg_prepare($con, "prepare2", $query) 
+		pg_prepare($con, "prepare4", $query) 
 			or die ("Cannot prepare statement\n");
-		$result = pg_execute($con, "prepare2", array($this->id, $user->id))
+		$result = pg_execute($con, "prepare4", array($this->locale_id, $user->id))
 			or die ("Cannot execute statement\n");
 
 		pg_close($con);
@@ -252,7 +269,7 @@ class WikiPages
 		$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 * FROM contents WHERE permalink=$1 AND type='wiki' ORDER BY update_date DESC";
+		$query = "SELECT content_versions.id AS version_id, * FROM contents INNER JOIN content_locales ON contents.id = content_locales.content_id INNER JOIN content_versions ON content_locales.id = content_versions.locale_id WHERE permalink=$1 AND type='wiki' ORDER BY update_date DESC";
 
 		pg_prepare($con, "prepare1", $query) 
 			or die ("Cannot prepare statement\n");

third/Md/Markdown.inc.php

@@ -1,10 +1,10 @@
 <?php
 
-# Use this file if you cannot use class autoloading. It will include all the
-# files needed for the Markdown parser.
-#
-# Take a look at the PSR-0-compatible class autoloading implementation
-# in the Readme.php file if you want a simple autoloader setup.
+// Use this file if you cannot use class autoloading. It will include all the
+// files needed for the Markdown parser.
+//
+// Take a look at the PSR-0-compatible class autoloading implementation
+// in the Readme.php file if you want a simple autoloader setup.
 
 require_once dirname(__FILE__) . '/MarkdownInterface.php';
 require_once dirname(__FILE__) . '/Markdown.php';

third/Md/MarkdownExtra.inc.php

@@ -1,10 +1,10 @@
 <?php
 
-# Use this file if you cannot use class autoloading. It will include all the
-# files needed for the MarkdownExtra parser.
-#
-# Take a look at the PSR-0-compatible class autoloading implementation
-# in the Readme.php file if you want a simple autoloader setup.
+// Use this file if you cannot use class autoloading. It will include all the
+// files needed for the MarkdownExtra parser.
+//
+// Take a look at the PSR-0-compatible class autoloading implementation
+// in the Readme.php file if you want a simple autoloader setup.
 
 require_once dirname(__FILE__) . '/MarkdownInterface.php';
 require_once dirname(__FILE__) . '/Markdown.php';

third/Md/MarkdownInterface.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-# Use this file if you cannot use class autoloading. It will include all the
-# files needed for the MarkdownInterface interface.
-#
-# Take a look at the PSR-0-compatible class autoloading implementation
-# in the Readme.php file if you want a simple autoloader setup.
+// Use this file if you cannot use class autoloading. It will include all the
+// files needed for the MarkdownInterface interface.
+//
+// Take a look at the PSR-0-compatible class autoloading implementation
+// in the Readme.php file if you want a simple autoloader setup.
 
 require_once dirname(__FILE__) . '/MarkdownInterface.php';

third/Md/MarkdownInterface.php

@@ -1,34 +1,38 @@
 <?php
-#
-# Markdown  -  A text-to-HTML conversion tool for web writers
-#
-# PHP Markdown
-# Copyright (c) 2004-2015 Michel Fortin
-# <https://michelf.ca/projects/php-markdown/>
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber
-# <https://daringfireball.net/projects/markdown/>
-#
+/**
+ * Markdown  -  A text-to-HTML conversion tool for web writers
+ *
+ * @package   php-markdown
+ * @author    Michel Fortin <michel.fortin@michelf.com>
+ * @copyright 2004-2019 Michel Fortin <https://michelf.com/projects/php-markdown/>
+ * @copyright (Original Markdown) 2004-2006 John Gruber <https://daringfireball.net/projects/markdown/>
+ */
+
 namespace Michelf;
 
-
-#
-# Markdown Parser Interface
-#
-
+/**
+ * Markdown Parser Interface
+ */
 interface MarkdownInterface {
+	/**
+	 * Initialize the parser and return the result of its transform method.
+	 * This will work fine for derived classes too.
+	 *
+	 * @api
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public static function defaultTransform($text);
 
-  #
-  # Initialize the parser and return the result of its transform method.
-  # This will work fine for derived classes too.
-  #
-  public static function defaultTransform($text);
-
-  #
-  # Main function. Performs some preprocessing on the input text
-  # and pass it through the document gamut.
-  #
-  public function transform($text);
-
+	/**
+	 * Main function. Performs some preprocessing on the input text
+	 * and pass it through the document gamut.
+	 *
+	 * @api
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public function transform($text);
 }

views/blocks/d.footer.html

@@ -1,7 +1,10 @@
 		<footer>
-			<div id="footernav">
-				<a href="<?=$config['rel_root_folder']?>wiki/legal">Mentions Légales</a> &mdash; 
-				<a href="<?=$config['rel_root_folder']?>contact">Contact</a>
+			<div class="flex">
+				<p class="flex-element"><a target="_blank" href="https://www.facebook.com/kabano09"><i class="fab fa-facebook-square"></i></a> Léo Serre &mdash; <script>document.write("06 " + "1" + "8 6" + "2 3" + "2 ");</script>&#48;&#53;</p>
+				<div id="footernav" class="flex-element">
+					<a href="<?=$config['rel_root_folder']?>wiki/cgv">CGV</a> &mdash; 
+					<a href="<?=$config['rel_root_folder']?>wiki/legal">Mentions Légales</a> &mdash; 
+					<a href="<?=$config['rel_root_folder']?>contact">Contact</a>
+				</div>
 			</div>
-			<p><i>Applications mobiles bientôt disponibles.</i></p>
 		</footer>

views/blocks/d.head.html

@@ -1,6 +1,6 @@
 	<head>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, height=device-height">
+		<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0">
 		<link rel="shortcut icon" href="<?=$config['views_url']?>img/favicon.png">
 <?	if (isset($head['css'])) { 
 		foreach(explode(";",$head['css']) as $css) { ?>
@@ -29,18 +29,18 @@
 		<title><?=$head['title']?> &mdash; Kabano</title>
 <?	}
 	else { ?>
-		<title>Cabanes et bivouac en montagne</title>
+		<title>Refuges de montagne et métallerie agricole</title>
 <?	} ?>
 <?	if (isset($head['description'])) { ?>
 		<meta name="description" content="<?=$head['description']?>">
 ?	}
 	else { ?>
-		<meta name="description" content="Annuaire collaboratif des hébergements pour les activitées de plein air : cabanes, refuges, campings...">
+		<meta name="description" content="Entreprise de services dans la fabrication, la réparation, et l'entretien de bâtiments et machines agricoles">
 <?	} ?>
 <?	if (isset($head['keywords'])) { ?>
 		<meta name="keywords" content="<?=$head['keywords']?>">
 <?	}
 	else { ?>
-		<meta name="keywords" content="kabano, huts, mountain, hiking, cabanes, refuges, bivouac, montagne, randonnée">
+		<meta name="keywords" content="kabano, cabanes, refuges, bivouac, montagne, randonnée, métallerie, agricole">
 <?	} ?>
 	</head>

views/blocks/d.nav.html

@@ -4,12 +4,26 @@
 					<img alt="Kabano logo" src="<?=$config['views_url'].'img/'?>header.svg">
 				</a>
 				<nav>
-					<ul>
-						<li class="on-bar"><a class="on-bar" href="<?=$config['rel_root_folder']?>map">Carte</a></li>
-						<li class="on-bar"><a class="on-bar" href="<?=$config['rel_root_folder']?>search">Recherche</a></li>
-						<li class="on-bar"><a class="on-bar" href="<?=$config['rel_root_folder']?>news">Nouveautés</a></li>
-						<li class="on-bar"><a class="on-bar" href="<?=$config['rel_root_folder']?>community">Contribuer</a></li>
-						<li class="on-bar has-sub">
+					<input type="checkbox" id="togglemenu"><label for="togglemenu" class="hamburger on-bar"><i class="icon fas fa-bars"></i></label>
+					<ul id="menu">
+ 						<li class="on-bar has-sub with-subtitle"><a class="on-bar" href="#">Restauration<br>
+ 							<span class="subtitle">de refuges pastoraux</span></a>
+ 							<ul>
+								<li><a href="<?=$config['rel_root_folder']?>wiki/restauration-de-refuges">Activités</a></li>
+								<li><a href="<?=$config['rel_root_folder']?>wiki/portfolio-restauration">Réalisations</a></li>
+							</ul>
+						</li>
+						<li class="on-bar with-subtitle"><a class="on-bar" href="<?=$config['rel_root_folder']?>wiki/metallerie">Métallerie<br>
+							<span class="subtitle">agricole</span></a></li>
+						<li class="on-bar has-sub with-subtitle">
+							<a class="on-bar" href="#">Inventaire<br>
+								<span class="subtitle">des cabanes de montagne</span></a>
+							<ul>
+								<li><a href="<?=$config['rel_root_folder']?>map">Carte</a></li>
+								<li><a href="<?=$config['rel_root_folder']?>community">Contribuer</a></li>
+							</ul>
+						</li>
+						<li class="on-bar has-sub menu-icon">
 							<? if ($user->id == 0) { ?>
 							<a class="on-bar" href="#"><i class="icon fas fa-user"></i></a>
 							<? } elseif ($user->is_avatar_present == 't') { ?>
@@ -37,12 +51,12 @@
 								<? } ?>
 							</ul>
 						</li>
-						<li class="on-bar has-sub"><a class="on-bar" href="#"><i class="icon fas fa-question"></i></a>
+						<li class="on-bar has-sub menu-icon"><a class="on-bar" href="#"><i class="icon fas fa-question"></i></a>
 							<ul>
-								<li><a href="<?=$config['rel_root_folder']?>wiki/help">Aide</a></li>
+								<!--<li><a href="<?=$config['rel_root_folder']?>wiki/help">Aide</a></li>-->
 								<li><a href="<?=$config['rel_root_folder']?>blog">Blog</a></li>
 								<li><a href="<?=$config['rel_root_folder']?>contact">Contact</a></li>
-								<li><a href="<?=$config['rel_root_folder']?>wiki/api">API Développeurs</a></li>
+								<!--<li><a href="<?=$config['rel_root_folder']?>wiki/api">API Développeurs</a></li>-->
 								<li><a href="<?=$config['rel_root_folder']?>wiki/about">À propos</a></li>
 							</ul>
 						</li>

views/css/d.admin.css

@@ -0,0 +1,82 @@
+/*********************************/
+/** Wiki files page             **/ 
+/*********************************/
+
+#wiki_files table {
+	width: 100%;
+	margin: 10px auto 30px;
+}
+
+#wiki_files table, #wiki_files td {
+    border: 1px solid #ccc;
+    border-collapse: collapse;
+}
+#wiki_files th {
+    border: 1px solid #aaa;
+    border-collapse: collapse;
+}
+#wiki_files th a {
+    color: inherit !important;
+}
+#wiki_files th i {
+    float: right;
+}
+
+#wiki_files td, #wiki_files th {
+	padding: 5px;
+}
+
+#wiki_files tr:nth-child(even) {
+	background: #efefef;
+}
+#wiki_files tr:nth-child(odd) {
+	background: #e1e1e1;
+}
+#wiki_files tr.first {
+	background: #ccc;
+}
+#wiki_files tr:hover {
+	background: #f5f5f5;
+}
+#wiki_files tr.first:hover {
+	background: #ccc;
+}
+
+#wiki_files .pagebuttons {
+	text-align: center;
+}
+#wiki_files .pagebuttons a {
+	background: #efefef;
+    border: 1px solid #ccc;
+    padding: 5px;
+    font-size: 1.5em;
+}
+#wiki_files .pagebuttons .previous {
+    margin-right: -1px;
+}
+
+#wiki_files td a {
+	display: block;
+}
+#wiki_files .center {
+	text-align: center;
+}
+
+#send_file {
+	display: flex;
+}
+#send_file div {
+	padding: 10px;
+	margin: 10px;
+}
+#send_file div {
+	flex: 2
+}
+#send_file input[type="submit"] {
+	text-align: center;
+	width: 150px;
+	flex: 1;
+	margin: 10px;
+	padding: 10px;
+	border-bottom: 2px solid blue;
+}

views/css/d.blog.css

@@ -89,6 +89,31 @@
 	border: 1px inset;
 }
 
+#blogContent img { 
+	max-width: 100%;
+	border: 1px solid #bbb;
+}
+
+#blogContent .imglegend {
+	position: relative;
+}
+#blogContent .imglegend img {
+	display: block;
+}
+#blogContent .imglegend p {
+	display: block;
+	background: rgba(0,0,0,0.5);
+	color: white;
+	font-size: 14px;
+	font-variant: small-caps;
+	line-height: 20px;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	margin: 0;
+	padding: 2px 5px;
+}
+
 #new_comment {
 	clear: both;
 	margin: 100px auto 0 auto;
@@ -230,9 +255,20 @@ form.form label {
 	float: right;
 	font-size: 17px;
 }
-#permalink {
-	width: calc(100% - 20px);
+#permalink_container {
+	position: relative;
 }
+#permalink {
+	width: calc(100% - 225px);
+	padding-left: 215px;
+}
+#permalink_label {
+	position: absolute;
+	top: 10px;
+	left: 10px;
+	opacity: 0.8;
+}
+
 
 form.form input[type=submit] {
 	width: auto;

views/css/d.index.css

@@ -25,7 +25,8 @@ a:hover {
 	text-decoration: none;
 }
 
-input {
+input, textarea {
+	font-family: "Fira Sans", "Open Sans",Helvetica,Arial,sans-serif;
 	border-bottom-left-radius: 3px;
 	border-bottom-right-radius: 3px;
 }
@@ -38,6 +39,10 @@ small {
 	font-weight: 500;
 }
 
+pre {
+	overflow: auto;
+}
+
 .button {
 	padding: 5px 10px;
 	margin: 5px 10px;
@@ -100,7 +105,7 @@ header {
 	z-index: 1000;
 }
 
-header ul {
+#menu {
 	float: right;
 	position: relative;
 }
@@ -111,18 +116,28 @@ header li {
 	vertical-align: middle;
 }
 
-header li a {
+header li a, .hamburger {
 	color: white;
 	padding: 25px 15px 15px;
 	height: 20px;
 	display: block;
 	vertical-align: middle;
 }
-header li a:hover {
+header li a:hover, header li a:focus-within {
 	color: white;
 }
+header li.with-subtitle a {
+	padding: 15px 15px 25px;
+}
 
-header li:hover a {
+header li .subtitle {
+	font-size: 80%;
+	font-style: italic;
+	white-space: nowrap;
+	padding-left: 5px;
+}
+
+header li:hover a, header li:focus-within a {
 	border-bottom: 6px solid blue;
 	background: #212121;
 }
@@ -138,15 +153,18 @@ header .icon {
 }
 
 header .icon.avatar {
+	margin: -4px 0;
 	padding: 0;
 	height: 28px;
 }
 
-header li.has-sub:hover a {
+header li.has-sub:hover a, header li.has-sub:focus-within a {
 	border-bottom: 6px solid #212121;
 }
-
-header li.has-sub:hover > ul {
+header li.has-sub:hover > a {
+	cursor: default;
+}
+header li.has-sub:hover > ul, header li.has-sub:focus-within > ul {
 	display: block;
 }
 
@@ -158,6 +176,12 @@ header li.has-sub ul {
 	background: #212121;
 }
 
+header li.with-subtitle ul {
+	right: unset;
+	position: relative;
+	min-width: 100%;
+}
+
 header li.has-sub ul li {
 	display: block;
 	height: 46px;
@@ -175,7 +199,7 @@ header li.has-sub ul li a {
 	border-bottom: none;
 }
 
-header li.has-sub ul li:hover {
+header li.has-sub ul li:hover, header li.has-sub ul li:focus-within {
 	border-left: 6px solid blue;
 	border-bottom: none;
 }
@@ -206,13 +230,63 @@ header input[type=submit] {
 	border-bottom: 1px solid #777;
 }
 
-header input:hover {
+header input:hover, header input:focus-within {
 	background: #DDD;
 	color: #222;
 }
 
+.hamburger {
+	display: none;
+	float: right;
+}
+#togglemenu {
+	display: none;
+}
+
+@media (max-width: 800px) {
+	#menu {
+		display: none;
+		background: black;
+		float: inherit;
+		position: static;
+	}
+	.hamburger {
+		display: block;
+	}
+	#togglemenu:checked ~ #menu {
+		display: block;
+	}
+	header li {
+		width: 100%;
+		height: inherit;
+	}
+	header li.menu-icon {
+		width: unset;
+	}
+	header li.menu-icon a {
+		padding: 20px 15px;
+	}
+	header li .subtitle {
+		padding-left: 0px;
+	}
+	header li.has-sub ul {
+		width: 100%;
+	}
+	header li.has-sub:hover ul, header li.has-sub:focus-within ul, header li.has-sub:hover ul li, header li.has-sub:focus-within ul li, header li.has-sub:hover ul a, header li.has-sub:focus-within ul a {
+		background-color: #212121;
+		border: 0;
+	}
+	header li.has-sub:hover a, header li.has-sub:focus-within a {
+		border-left: 6px solid blue;
+		border-bottom: 0;
+	}
+	header form {
+		width: unset;
+	}
+}
+
 #Hcontent {
-	width: 850px;
+	max-width: 850px;
 	margin: 0 auto;
 }
 
@@ -237,12 +311,15 @@ section {
 	position: relative;
 	background: white;
 	margin: auto;
-	width: 820px;
-	min-height: calc(100% - 97px);
+	max-width: 820px;
+	min-height: calc(100% - 94px);
 	z-index: 10;
 	padding: 15px;
 	text-align: justify;
 }
+section#index {
+	min-height: calc(100% - 95px - 320px);
+}
 
 section h1 {
 	font-weight: 300;
@@ -250,12 +327,15 @@ section h1 {
 	margin-top: 20px;
 	border-bottom: 1px solid #bbb;
 }
+section#index h1{
+	font-size: 40px;
+}
 
 section .subtitle {
 	font-variant: small-caps;
 	font-weight: 500;
 	background: #ddd;
-	margin: 0 20px 20px 0;
+	margin: 0 20px 5px 0;
 	display: inline-block;
 	padding: 3px 5px;
 	float: right;
@@ -265,21 +345,30 @@ section p {
 	margin: 20px 0;
 }
 
+@media (max-width: 800px) {
+	section h1 {
+		font-size: 1.8rem;
+		text-align: left;
+	}
+	section#index h1 {
+		font-size: 1.7rem;
+	}
+}
+
 /***************************************/
 
 footer {
 	background: #212121;
-	width: 820px;
+	max-width: 820px;
 	padding: 15px;
 	margin: 15px auto 0 auto;
 	color: #c1c1c1;
-	text-align: left;
 }
 
 footer #footernav {
-	float: right;
 	padding: 0;
 	margin: 0;
+	margin-left: auto;
 }
 
 footer a {
@@ -290,13 +379,19 @@ footer a:hover {
 	color: white;
 }
 
+footer .flex {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 1rem;
+}
+
 /*********************************/
 /** Index page                  **/ 
 /*********************************/
 
 #indexFullW {
 	position: relative;
-	background: url('../img/aside.jpg') center center no-repeat #070707;
+	background: url('../img/aside.jpg') left center no-repeat #070707;
 	width: 100%;
 	height: 320px;
 	z-index: 100;
@@ -305,42 +400,69 @@ footer a:hover {
 
 #AScontent {
 	height: 320px;
-	width: 850px;
+	max-width: 850px;
 	margin: auto;
+	position: relative;
 }
 
-#spacebeforesponsors {
-	height: 238px;
-}
-
-#sponsors {
-	height: 70px;
+#imglegend {
+	text-align: right;
 	background: rgba(0,0,0,0.5);
-	padding: 5px 30px;
-}
-
-#sponsors a {
-	float: right;
-	display: block;
-	padding-top: 5px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-#sponsors a img {
-	height: 60px;
-	display: inline;
-}
-
-#sponsors p {
-	float: left;
 	color: white;
-	font-size: 20px;
+	font-size: 14px;
 	font-variant: small-caps;
-	line-height: 70px;
+	line-height: 20px;
+	position: absolute;
+	width: 100%;
+	bottom: 0px;
+}
+#imglegend p {
+	padding: 5px;
+	height: 20px;
 }
 
-section .thumb {
-	margin: 0 10px;
-	border: 1px solid #aaa;
+/*********************************/
+/** Community portal page       **/ 
+/*********************************/
+
+.action {
+	clear: both;
+	margin: 50px auto 0 auto;
+	width: 90%;
+	background: #efefef;
+}
+.action p {
+	margin: 0;
+}
+
+.action .title {
+	background: #ccc;
+	cursor: pointer;
+	font-weight: 500;
+	font-size: 1.1em;
+	line-height: 56px;
+}
+.action .title a, .action .title p {
+	padding: 0 10px 0 71px;
+	margin: 0;
+	color: inherit;
+	display: block;
+}
+.action .title i {
+	float: left;
+	width: 56px;
+	line-height: 56px;
+	text-align: center;
+	font-size: 30px;
+	background: #333;
+	color: #ccc;
+}
+
+.action .description {
+	display: none;
+	border: solid #ccc;
+	border-width: 0px 1px 3px 1px;
+}
+.action .description p {
+	padding: 10px 20px;
 }

views/css/d.map.css

@@ -9,10 +9,54 @@ body {
 footer {
 	position: absolute;
 	bottom: 0;
-	left: calc(50% - 425px);
+	right: 50%;
+	transform: translateX(50%);
+  	width: 100%;
+	max-width: 820px;
 	z-index: 10000;
 }
 
+#advert {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	z-index: 9999;
+	background: rgba(50,50,50,0.8);
+	color: #ddd;
+	padding: 20px;
+	border-bottom: 6px solid blue;
+	text-align: center;
+}
+#advert a{
+	color: white;
+}
+#advert .dots span {
+	opacity: 0;
+	animation: appear 1.5s infinite;
+}
+
+#advert .dots span:nth-child(1) {
+	animation-delay: 0s;
+}
+
+#advert .dots span:nth-child(2) {
+	animation-delay: 0.3s;
+}
+
+#advert .dots span:nth-child(3) {
+	animation-delay: 0.6s;
+}
+
+@keyframes appear {
+	0%, 80%, 100% {
+		opacity: 0;
+	}
+	40% {
+		opacity: 1;
+	}
+}
+
 /*****************************************
  Controls of the map
 *****************************************/
@@ -33,7 +77,7 @@ footer {
 }
 
 .leaflet-bottom.leaflet-left {
-	margin-bottom: 60px !important;
+	margin-bottom: 60px;
 }
 .leaflet-fullscreen-on .leaflet-bottom.leaflet-left {
 	margin-bottom: 15px !important;
@@ -41,7 +85,7 @@ footer {
 }
 
 .leaflet-bottom.leaflet-right {
-	margin-bottom: 60px !important;
+	margin-bottom: 60px;
 }
 .leaflet-fullscreen-on .leaflet-bottom.leaflet-right {
 	margin-bottom: 15px !important;
@@ -121,47 +165,12 @@ footer {
 .leaflet-control-layers-expanded a {
 	display: none !important;
 }
+
 .leaflet-control-layers-list {
 	padding: 3px 8px !important;
 	color: white !important;
 	background: #212121 !important;
-}
-
-/* Credit / Legend */
-
-.leaflet-control button {
-	font-size: 12px !important;
-}
-
-#footer-credits, #footer-legend {
-	background: #212121;
-	width: 820px;
-	padding: 15px;
-	margin: 15px auto 0 auto;
-	color: #c1c1c1;
-	text-align: left;
-	position: absolute;
-	bottom: 0;
-	left: calc(50% - 425px);
-	z-index: 10000;
-}
-
-#footer-credits .close-link, #footer-legend .close-link {
-	float: right;
-	color: white;
-	padding: 0 8px;
-	cursor: pointer;
-}
-
-#footer-credits a, #footer-legend a {
-	color: white;
-}
-#footer-credits a:hover, #footer-legend a:hover {
-	color: white;
-}
-
-.leaflet-fullscreen-on .easy-button-container {
-	display: none;
+	width: inherit !important;
 }
 
 /* Scale */
@@ -180,3 +189,52 @@ footer {
 .leaflet-control-scale {
 	opacity: 0.8 !important;
 }
+
+/* Credit / Legend */
+
+.leaflet-control button {
+	font-size: 12px !important;
+}
+
+#footer-credits, #footer-legend {
+	background: #212121;
+	padding: 15px;
+	margin: 15px auto 0 auto;
+	color: #c1c1c1;
+	text-align: left;
+	position: absolute;
+	bottom: 0;
+	right: 50%;
+	transform: translateX(50%);
+  	width: 100%;
+ 	max-width: 820px;
+	z-index: 10000;
+	display: flex;
+}
+
+#footer-credits .close-link, #footer-legend .close-link {
+	position: absolute;
+	right: 10px;
+	color: white;
+	padding: 0 8px;
+	cursor: pointer;
+}
+
+#footer-credits a, #footer-legend a {
+	color: white;
+}
+#footer-credits a:hover, #footer-legend a:hover {
+	color: white;
+}
+
+.legend_item {
+	flex: 1;
+	text-align: center;
+}
+.poi_icon {
+	height: 15px;
+}
+
+.leaflet-fullscreen-on .easy-button-container {
+	display: none;
+}

views/css/d.poi.css

@@ -0,0 +1,327 @@
+/*********************************/
+/** Common                      **/
+/*********************************/
+
+html, body {
+	height: 100%;
+}
+
+#sticky {
+	position: relative;
+	min-height: 0;
+	top: 65%;
+	z-index: 10;
+}
+
+@keyframes fadeinfadeout {
+	0% {color: #444;}
+	50% {color: #999;}
+	100% {color: #444;}
+}
+#slide-icon {
+	position: absolute;
+	left: 400px;
+	top: -35px;
+	color: #000;
+	font-size: 60px;
+	color: #555;
+	animation-name: fadeinfadeout;
+	animation-duration: 2s;
+	animation-iteration-count: infinite;
+	cursor: pointer;
+}
+
+#mapid {
+	position: fixed;
+	height: 100%;
+	width: 100%;
+	top: 0;
+}
+
+/*********************************/
+/** Editor page                 **/
+/*********************************/
+
+form.form input, form.form textarea, #locale {
+	font-size: 16px;
+	padding: 10px;
+}
+form.form input, form.form textarea, form.form input[type=radio]:checked+label, #locale {
+	background: #ddd;
+	border-bottom: 2px solid #ccc;
+}
+
+form.form h1 input {
+	flex: 2 !important;
+	font-size: 18px;
+}
+form.form h1 {
+	padding: 10px 0;
+	margin: 0 0 10px 0;
+}
+#locale {
+	flex: 1;
+	margin: 10px 5px 0 5px;
+	font-size: 17px;
+}
+
+.flex_line {
+	display: flex;
+	flex-direction: row;
+	position: relative;
+}
+
+.flex_line > :first-child {
+	margin-left: 0 !important;
+}
+.flex_line > :last-child, .last-child {
+	margin-right: 0 !important;
+}
+
+.flex_line input[type=number], .flex_line input[type=text] {
+	flex: 1;
+	margin: 10px 5px 0 5px;
+}
+.noarrow::-webkit-inner-spin-button, 
+.noarrow::-webkit-outer-spin-button,
+.noarrow { 
+    -webkit-appearance: none;
+    -moz-appearance: textfield;
+    appearance: textfield;
+    margin: 0; 
+}
+
+form.form input[type=submit] {
+	width: auto;
+	display: block;
+	margin: 10px auto;
+	border-bottom: 2px solid blue;
+}
+
+form.form input[type=radio] {
+	position: absolute;
+	float: left;
+	opacity: 0%;
+	top: 50%;
+	left: 50%;
+}
+form.form input[type=radio]+label {
+	margin-top: 10px;
+	font-size: 13px;
+	flex: 1;
+	text-align: center;
+	padding: 10px;
+	vertical-align: middle;
+	border-bottom: 2px solid transparent;
+}
+form.form input[type=radio]+label img {
+	width: 32px;
+	height: 32px;
+}
+
+#specific_form .threecb:after {
+	font-family: "Font Awesome 5 Free";
+	font-weight: 400;
+	vertical-align: middle;
+	padding: 3px 8px 2px 4px;
+	margin: 2px 10px;
+	display: inline-block;
+	width: 21px;
+	background: #ddd;
+	font-size: 25px;
+	border-radius: 100px;
+}
+#specific_form .threecb.check:after {
+	content: "\f058"; /* check */
+}
+#specific_form .threecb.uncheck:after {
+	content: "\f057"; /* cross */
+}
+#specific_form .threecb.intermediate:after {
+	content: "\f059"; /* question */
+}
+#specific_form input {
+	margin: 2px 10px;
+}
+#specific_form textarea {
+	margin: 5px 0;
+	display: block;
+	width: calc(100% - 20px);
+	height: 100px;
+}
+#specific_form .flex_line {
+	align-items: center;
+}
+#specific_form .flex_line input {
+	flex: 1;
+}
+
+#abstract {
+	text-align: center;
+	color: #555;
+	font-style: italic;
+}
+
+#permalink_container {
+	position: relative;
+	margin: 2px 0;
+}
+#permalink {
+	width: calc(100% - 194px);
+	padding-left: 184px;
+}
+#permalink_label {
+	position: absolute;
+	top: 10px;
+	left: 10px;
+	opacity: 0.8;
+	font-size: 16px;
+}
+
+/*****************************************
+ Controls of the map
+*****************************************/
+
+/* General */
+
+.leaflet-control-container {
+	position: absolute !important;
+	width: 850px !important;
+	height: 100%;
+	left: calc(50% - 425px) !important;
+	font-family: "Fira Sans", "Open Sans",Helvetica,Arial,sans-serif !important;
+}
+.leaflet-fullscreen-on .leaflet-control-container {
+	position: absolute !important;
+	width: 100% !important;
+	left: 0 !important;
+}
+
+.leaflet-bottom.leaflet-left {
+	bottom: 35% !important;
+	margin-bottom: -50px !important;
+}
+.leaflet-fullscreen-on .leaflet-bottom.leaflet-left {
+	margin-bottom: 15px !important;
+	margin-left: 15px !important;
+	bottom: 0 !important;
+}
+
+.leaflet-bottom.leaflet-right {
+	bottom: 35% !important;
+	margin-bottom: -50px !important;
+}
+.leaflet-fullscreen-on .leaflet-bottom.leaflet-right {
+	margin-bottom: 15px !important;
+	margin-right: 15px !important;
+	bottom: 0 !important;
+}
+
+.leaflet-control {
+	clear: none !important;
+	padding: 0 !important;
+	border-radius: 0 !important;
+	box-shadow: none !important;
+	color: #c1c1c1 !important;
+}
+.leaflet-right .leaflet-control {
+	margin: 0 0 0 15px !important;
+}
+.leaflet-left .leaflet-control {
+	margin: 0 15px 0 0 !important;
+}
+
+.leaflet-control a, .leaflet-control button {
+	display: inline-block !important;
+	float: none !important;
+	border: none !important;
+	background-color: #212121 !important;
+	border-radius: 0 !important;
+	color: #c1c1c1 !important;
+	border-right: 1px #3e3e3e solid !important;
+}
+.leaflet-control a:last-child, .leaflet-control button:last-child {
+	border-right: none !important;
+}
+
+/* Zoom */
+
+.leaflet-control-zoom-in, .leaflet-control-zoom-out {
+	font-size: 10px !important;
+}
+.leaflet-disabled {
+	background-color: rgba(33, 33, 33, 0.8) !important;
+	opacity: 0.8 !important;
+}
+
+/* Fullscreen */
+
+.leaflet-control-fullscreen a {
+	background: #212121 !important;
+}
+.leaflet-control-fullscreen a:before {
+	content: "\f065";
+	font-family: "Font Awesome 5 Free";
+	font-weight: 900;
+	background: none !important;
+}
+.leaflet-fullscreen-on .leaflet-control-fullscreen a:before {
+	content: "\f066";
+	font-family: "Font Awesome 5 Free";
+	font-weight: 900;
+}
+
+/* Baselayers */
+
+.leaflet-control-layers a {
+	background: #212121 !important;
+	width: 26px !important;
+	height: 26px !important;
+	line-height: 26px !important;
+	text-align: center !important;
+	border-right: none !important;
+}
+.leaflet-control-layers a:before {
+	content: "\f5fd";
+	font-family: "Font Awesome 5 Free";
+	font-weight: 900;
+	background: none !important;
+}
+.leaflet-control-layers-expanded a {
+	display: none !important;
+}
+.leaflet-control-layers-list {
+	padding: 3px 8px !important;
+	color: white !important;
+	background: #212121 !important;
+	width: inherit !important;
+}
+
+/* Scale */
+
+.leaflet-control-scale-line {
+	height: 30px !important;
+	top: 2px !important;
+	position: relative !important;
+	background: #212121 !important;
+	color: #c1c1c1 !important;
+	text-align: center !important;
+	border: none !important;
+	font-size: 12px !important;
+	line-height: 30px !important;
+}
+.leaflet-control-scale {
+	opacity: 0.8 !important;
+}
+
+#elevation_icon {
+	font-size: 20px;
+	cursor: pointer;
+	position: relative;
+	top: 18px;
+	right: 34px;
+}
+
+#elevation_icon i {
+	position: absolute;
+}

views/css/d.user.css

@@ -3,7 +3,7 @@
 /*********************************/
 
 form.form {
-	width: 50%;
+	width: 80%;
 	margin: 25px auto;
 	text-align: center;
 }

views/css/d.wiki.css

@@ -50,6 +50,7 @@ form.form input[type=submit] {
 #wikiContent blockquote { margin-left: 40px; margin-right: 40px }
 #wikiContent ol, #wikiContent ul, #wikiContent dd { margin-left: 40px }
 #wikiContent ol ul, #wikiContent ul ol, #wikiContent ul ul, #wikiContent ol ol { margin-top: 0; margin-bottom: 0 }
+#wikiContent hr { border: 1px solid #bbb }
 
 #wikiContent .footnotes {
 	font-size: 0.8em;
@@ -57,10 +58,31 @@ form.form input[type=submit] {
 #wikiContent .footnotes p {
 	margin: 0.4em 0;
 }
-#wikiContent hr {
-	border: 1px inset;
-}
 
 #wiki_page.archive {
 	opacity: 0.5;
 }
+#wikiContent img { 
+	max-width: 100%;
+	border: 1px solid #bbb;
+}
+
+#wikiContent .imglegend {
+	position: relative;
+}
+#wikiContent .imglegend img {
+	display: block;
+}
+#wikiContent .imglegend p {
+	display: block;
+	background: rgba(0,0,0,0.5);
+	color: white;
+	font-size: 14px;
+	font-variant: small-caps;
+	line-height: 20px;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	margin: 0;
+	padding: 2px 5px;
+}

views/d.admin.backup.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+	<? include('blocks/d.head.html'); ?>
+
+	<body>
+
+		<? include('blocks/d.nav.html'); ?>
+
+		<section>
+			<h1><?=$head['title']?></h1>
+			<br>
+			<pre><?
+				foreach($output as $line) {
+					echo $line."<br>";
+				}
+			?></pre>
+			<br>
+
+			<? $i=0;
+			foreach($backup_file as $file) {
+			if (file_exists($file ?? '')) { ?>
+				<a href='<?=$config['rel_root_folder']?>tmp/<?=$backup_filename[$i]?>' target='_blank'><i class="fas fa-file-export"></i> Télécharger le fichier "<i><?=$backup_filename[$i]?></i>"</a><br>
+			<? 		} else { ?>
+				Fichier <?=$file?> non généré
+			<? 	} 
+				$i++;
+			}?>
+
+			<br>
+			<h4>Archives des anciennes sauvegardes</h4>
+			<ul style="padding: 1em 0 1em 40px;">
+			<?	foreach($backup_files as $file) { ?>
+					<li style="padding: 0 0 0.2em 0;"><?=basename($file)?> - <a href='<?=$config['rel_root_folder']?>tmp/<?=basename($file)?>' target='_blank'><i class="fas fa-download"></i> Télécharger</a> - <a href='<?=$config['rel_root_folder']?>admin/<?=$controller->splitted_url[1]?>/delete/<?=basename($file)?>'><i class="fas fa-trash"></i> Effacer</a></li>
+			<?	} ?>
+			</ul>
+		</section>
+
+		<? include('blocks/d.footer.html'); ?>
+
+	</body>
+</html>

views/d.admin.git-pull.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Mise à jour.</h1>
+			<h1><?=$head['title']?></h1>
 			<br>
 			<pre><?
 			foreach($output as $line) {

views/d.admin.html

@@ -8,13 +8,16 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Administration.</h1>
+			<h1>Administration</h1>
 			<br>
 			<? if($user->rankIsHigher("administrator")) { ?>
 				<a href="<?=$config['rel_root_folder']?>admin/git-pull" class="button"><i class="fas fa-sync-alt"></i> Mettre à jour</a> <small>Met à jour le logiciel depuis le dépôt GIT.</small><br><br>
+				<a href="<?=$config['rel_root_folder']?>admin/sql-backup" class="button"><i class="fas fa-file-export"></i> Sauvegarde SQL</a><a href="<?=$config['rel_root_folder']?>admin/files-backup" class="button"><i class="fas fa-file-export"></i> Archive des médias</a><small>Génère un dump SQL et une archive de fichiers téléchargeable.</small><br><br>
 			<? } ?>
 			<? if($user->rankIsHigher("moderator")) { ?>
 				<a href="<?=$config['rel_root_folder']?>admin/logs" class="button"><i class="fas fa-history"></i> Voir les logs</a> <small>Permet d'accéder aux 200 dernières lignes des logs bruts des actions sur la base de données.</small><br><br>
+				<a href="<?=$config['rel_root_folder']?>admin/wiki-files" class="button"><i class="fas fa-paperclip"></i> Fichiers attachés</a><small>Gérer les fichiers attachés pour le wiki : liste, ajout, suppression...</small><br><br>
+				<a href="<?=$config['rel_root_folder']?>admin/stats" class="button"><i class="fas fa-chart-line"></i> Statistiques</a><small>Analyser les logs et afficher les statistiques.</small><br><br>
 			<? } ?>
 		</section>
 

views/d.admin.logs.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Logs.</h1>
+			<h1><?=$head['title']?></h1>
 				<span class="subtitle">
 					<select id="logfile">
 						<? $i = 0;

views/d.admin.stats.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+	<? include('blocks/d.head.html'); ?>
+
+	<body>
+
+		<? include('blocks/d.nav.html'); ?>
+
+		<section>
+			<h1><?=$head['title']?></h1>
+			<br>
+			<pre><?
+			print_r($output);
+			?></pre>
+			<br>
+			<? if (file_exists($report)) { ?>
+				<a href='<?=$config['rel_root_folder']?>tmp/report.html' target='_blank'><i class="fas fa-chart-line"></i> Voir le rapport</a>
+			<? } else { ?>
+				Echec de la commande
+			<? } ?>
+		</section>
+
+		<? include('blocks/d.footer.html'); ?>
+
+	</body>
+</html>

views/d.admin.wiki-files.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+	<? include('blocks/d.head.html'); ?>
+
+	<body>
+
+		<? include('blocks/d.nav.html'); ?>
+
+		<section id="wiki_files">
+			<h1><?=$head['title']?></h1>
+
+			<p class="subtitle">Fichiers attachés <?=$first?> à <?=$last?> sur les <?=$filenb?> présents</p>
+
+			<br>
+			<br>
+
+			<form action="<?=$config['rel_root_folder']?>admin/wiki-files/upload/" method="post" enctype="multipart/form-data" id="send_file">
+				<div>
+					<label for="file">Envoyer un fichier :</label>
+					<input type="file" id="file" name="file">
+				</div>
+				<input type="submit" value="Envoyer">
+			</form>
+
+
+			<table>
+				<tr class="first">
+					<th>
+						<a href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page+1?>?orderby=name&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Nom</a>
+						<?=$orderby=='name'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
+					</th>
+					<th>
+						<a href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page+1?>?orderby=type&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Type</a>
+						<?=$orderby=='type'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
+					</th>
+					<th>
+						<a href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page+1?>?orderby=size&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Taille</a>
+						<?=$orderby=='size'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
+					</th>
+					<th>
+						<a href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page+1?>?orderby=creation_date&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Date de création</a>
+						<?=$orderby=='creation_date'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
+					</th>
+					<? if ($user->rankIsHigher("administrator")) { ?>
+						<th>Suppression</th>
+					<? } ?>
+				</tr>
+			<? foreach (array_slice($files, $first-1, $rows_per_pages, true) as $file) { ?>
+				<tr>
+					<td>
+						<a href="<?=$config['rel_root_folder']?>medias/wiki/<?=$file['name']?>"><?=$file['name']?></a>
+					</td>
+					<td><i class='fas <?=getFontAwesomeIcon($file['type'])?>'></i> <?=$file['type']?></td>
+					<td><?=formatBytes($file['size'], $user->locale)?></td>
+					<td><? echo datefmt_format($user->date_format,date_create($file['creation_date'], new DateTimeZone("UTC"))) ?></td>
+					<? if ($user->rankIsHigher("administrator")) { ?>
+						<td class="center">
+							<a href="<?=$config['rel_root_folder']?>admin/wiki-files/delete/<?=$file['name']?>?orderby=<?=$orderby?>&amp;order=<?=$order?>" onclick="return confirm('Es-tu sûr de vouloir supprimer ?');"><span class="external-link"><i class="fas fa-trash"></i></span></a>
+						</td>
+					<? } ?>
+				</tr>
+			<? } ?>
+			</table> 
+			<div class="pagebuttons">
+				<? if ($page != 0) { ?><a class="previous" href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fas fa-chevron-left fa-fw"></i></a><? }
+				if (($page+1)*$rows_per_pages < $filenb) { ?><a class="next" href="<?=$config['rel_root_folder']?>admin/wiki-files/<?=$page+2?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fas fa-chevron-right fa-fw"></i></a><? } ?>
+			</div>
+
+		</section>
+
+		<? include('blocks/d.footer.html'); ?>
+
+	</body>
+</html>

views/d.blog.edit.html

@@ -31,7 +31,10 @@
 				<textarea rows="30" name="content" id="content" placeholder="Contenu de l'article"><?=$blogArticle->content?></textarea>
 
 				<? if(isset($new) AND $new==1) { ?>
-					<input type="text" value="<?=$blogArticle->permalink?>" name="permalink" id="permalink" placeholder="URL">
+					<div id="permalink_container">
+						<label id="permalink_label" for="permalink"><?=$config['web_root_folder']?>blog/</label>
+						<input type="text" name="permalink" id="permalink" placeholder="URL">
+					</div>
 				<? } ?>
 
 				<label for="is_commentable">

views/d.blog.list.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section id="blog_list">
-			<h1>Blog.</h1>
+			<h1>Blog</h1>
 			<p class="subtitle">
 				<? if ($user->rankIsHigher("moderator")) { ?>
 					<a href="<?=$config['rel_root_folder']?>blog/new"><i class="fas fa-plus"></i> Nouvel article</a> &mdash; 
@@ -21,13 +21,13 @@
 
 				<? foreach ($blogArticles->objs as $row) { ?>
 
-					<article <? if($row->is_archive == 't') echo 'class="article_archive" '; ?>>
-						<h2 class="article_title"><?=$row->name?>.</h2>
+					<article<? if($row->is_public == 'f') echo ' class="article_archive" '; ?>>
+						<h2 class="article_title"><?=$row->name?></h2>
 						<div class="article_content"><?=mb_substr($row->content_txt,0,200)?>...</div>
 						<p class="article_legend">
 							<a class="article_link" href="<?=$config['rel_root_folder']?>blog/<?=$row->permalink?>">Lire la suite...</a>
 							<span class="article_infos">
-								Le <? echo strftime('%e %B %G',strtotime($row->update_date)) ?> par 
+								<? echo datefmt_format($user->date_format,date_create($row->update_date, new DateTimeZone("UTC"))) ?> par 
 								<? if ($user->rankIsHigher("registered")) { ?>
 									<a href="<?=$config['rel_root_folder']?>user/p/<?=$row->author?>"><?=$row->author_name?></a>
 								<? } 

views/d.blog.list.rss

@@ -32,7 +32,7 @@ echo ('<?xml version="1.0" encoding="UTF-8"?>'); ?>
 			<title><?=$row->name?></title>
 			<link><?=$config['web_root_folder']?>blog/<?=$row->permalink?></link>
 			<guid><?=$config['web_root_folder']?>blog/<?=$row->permalink?></guid>
-			<pubDate><?=gmdate(DATE_RFC822, strtotime($row->update_date))?></pubDate>
+			<pubDate><?=gmdate(DATE_RSS, strtotime($row->update_date))?></pubDate>
 			<description><![CDATA[
 				<?=$row->content_html?>
 				]]></description>

views/d.blog.view.html

@@ -15,7 +15,7 @@
 						<select id="bloghistory">
 							<? $i = 0;
 							foreach ($blogHistory->objs as $row) { ?>
-								<option <?=$row->id==$blogArticle->id?'selected':''?> value="<?=$i?>"><?=$row->is_archive=="f"?'&bull; ':''?><? echo strftime('%d/%m/%Y %H:%M:%S',strtotime($row->update_date)) ?></option>
+								<option <?=$row->version_id==$blogArticle->version_id?'selected':''?> value="<?=$i?>"><?=$row->is_archive=="f"?'&bull; ':''?><? echo datefmt_format($user->datetimeshort_format,date_create($row->update_date, new DateTimeZone("UTC"))) ?></option>
 							<? $i++;
 							} ?>
 						</select>
@@ -45,15 +45,17 @@
 			else { ?>
 				<?=$blogArticle->author_name?> 
 			<? } ?>
-			le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($blogArticle->creation_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
+			le <? echo datefmt_format($user->datetime_format,date_create($blogArticle->creation_date, new DateTimeZone("UTC"))) ?></p>
 
 			<!-- COMMENTS -->
 
-			<? if ($blogArticle->is_commentable == "t" && $blogArticle->is_archive == "f" && $blogArticle->is_public == "t") { ?>
+			<? if ($blogArticle->is_commentable == "t") { ?>
 				<div id="new_comment">
 					<form class="form" action="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/new_comment" method="post">
 						<div id="new_comment_label" <?=$user->rank=="visitor"?"class='sent' ":""?>>
-							<? if ($user->rankIsHigher("registered")) { ?>
+							<? if ($blogArticle->is_archive == "t" || $blogArticle->is_public == "f") { ?>
+								<p>Impossible de commenter un article non publié</p>
+							<? } else if ($user->rankIsHigher("registered")) { ?>
 								<input name="submit" type="submit" value="Envoyer">
 								<p>Ajouter un nouveau commentaire</p>
 							<? } else { ?>
@@ -81,7 +83,7 @@
 								<? } else { ?>
 									<?=$comment->author_obj->name?>
 								<? } ?>
-								le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($comment->update_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small>
+								le <? echo datefmt_format($user->datetime_format,date_create($comment->update_date, new DateTimeZone("UTC"))) ?>
 								<? if (($user->rankIsHigher("moderator") || $user->id == $comment->author) && $comment->is_public == 't') { ?>
 									<span class="delete_link"><a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/delete_comment/<?=$comment->id?>"><i class="fas fa-trash"></i> Effacer le commentaire</a></span>
 								<? } ?>
@@ -110,7 +112,7 @@ $( "#bloghistory" ).change(function() {
 });
 		</script>
 <? } ?>
-<? if($user->rankIsHigher("registered")) { ?>
+<? if($user->rankIsHigher("registered") && $blogArticle->is_archive == "f" && $blogArticle->is_public == "t") { ?>
 		<script type="text/javascript">
 $( "#new_comment_label" ).click(function() {
   $( "#new_comment_form" ).show(400);

views/d.community.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+	<? include('blocks/d.head.html'); ?>
+	
+	<body>
+
+		<? include('blocks/d.nav.html'); ?>
+
+		<section>
+			<h1>Contribuer au projet Kabano</h1>
+			<p>&Eacute;tant un projet collaboratif, Kabano se repose sur vos contributions pour diffuser des informations au plus proche de la réalité. En participant au projet Kabano, vous acceptez de placer vos collaborations sous <a href="<?=$config['rel_root_folder']?>wiki/licences">nos licences libres</a>.</p>
+			<br>
+
+			<div class="action">
+				<? if($user->rankIsHigher("registered")) { ?>
+				<div class="title"><i class="fas fa-home"></i>
+					<a href="<?=$config['rel_root_folder']?>poi/new">Ajouter un hébergement de montagne</a>
+				</div>
+				<? } else { ?>
+				<div class="title" id="js_open_1"><i class="fas fa-home"></i>
+					<p>Ajouter un hébergement de montagne</p>
+				</div>
+				<div class="description" id="js_openned_1">
+					<p>Vous devez être connecté pour pouvoir ajouter un hébergement. &Ccedil;a nous permet de laisser les robots à la porte.</p>
+				</div>
+				<? } ?>
+			</div>
+
+			<div class="action">
+				<div class="title" id="js_open_2"><i class="fas fa-comment"></i>
+					<p>Ajouter un commentaire sur un hébergement</p>
+				</div>
+				<div class="description" id="js_openned_2">
+					<p>Rendez-vous sur la page hébergement où vous souhaitez laisser un commentaire, puis ajoutez un commentaire en bas de page.</p>
+				</div>
+			</div>
+
+			<div class="action">
+				<div class="title" id="js_open_3"><i class="fas fa-wrench"></i>
+					<p>Faire une demande de travaux</p>
+				</div>
+				<div class="description" id="js_openned_3">
+					<p>Cette fonctionnalité n'est pas encore disponible, mais n'hésitez pas à laisser un commentaire pour faire savoir le besoin d'entretien.</p>
+				</div>
+			</div>
+
+		</section>
+
+		<script type="text/javascript">
+$( "#js_open_1" ).click(function() {
+  $( "#js_openned_1" ).show(400);
+});
+$( "#js_open_2" ).click(function() {
+  $( "#js_openned_2" ).show(400);
+});
+$( "#js_open_3" ).click(function() {
+  $( "#js_openned_3" ).show(400);
+});
+		</script>
+
+		<? include('blocks/d.footer.html'); ?>
+
+	</body>
+</html>

views/d.contact.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Nous contacter.</h1>
+			<h1>Me contacter</h1>
 			<form class="form" action="<?=$config['rel_root_folder']?>contact" method="post">
 				<? if($error=="name") { ?>
 					<p style="color: red;">Veuillez renseigner votre nom.</p>
@@ -33,7 +33,7 @@
 					<p style="color: green;">Message bien envoyé.</p>
 				<? } ?>
 				<input type="text" name="name" id="name" placeholder="Nom" value="<?=$contact['name']?>">
-				<input type="text" name="email" id="email" placeholder="Adresse mail" value="<?=$contact['email']?>">
+				<input type="email" name="email" id="email" placeholder="Adresse mail" value="<?=$contact['email']?>">
 				<input type="text" name="subject" id="subject" placeholder="Sujet" value="<?=$contact['subject']?>">
 				<textarea name="message" id="message" rows="12" placeholder="Contenu de votre message"><?=$contact['message']?></textarea>
 				<? if($user->rankIsHigher("registered")) { ?>
@@ -43,8 +43,8 @@
 				else { ?>
 				<p id="captcha">
 					<input type="hidden" id="captchahidden" name="captcha" value="10">
-					<span id="captchatext">Merci d'attendre <b id="captchasec">10 s</b> avant de pouvoir nous contacter.<br>
-					<small>Ceci nous permet de laisser les robots à la porte.</small></span>
+					<span id="captchatext">Merci d'attendre <b id="captchasec">10 s</b> avant de pouvoir me contacter.<br>
+					<small>Ceci me permet de laisser les robots à la porte.</small></span>
 					<input disabled id="captchasubmit" style="display:none;" type="submit" name="submit" value="Envoyer">
 				</p>
 				<? } ?>

views/d.index.html

@@ -8,23 +8,32 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<aside id="indexFullW">
-			<!-- <div id="AScontent">
-				<div id="spacebeforesponsors"></div>
-				<div id="sponsors">
-					<p style="font-size: 1.3em;">Aidez Kabano en partagant sa <a style="font-weight: 6b00; color: orange; float: none; padding: 0; display: inline;" href="http://fr.ulule.com/kabano/" target="_blank">campagne de financement Ulule</a> !</p>
+			<div id="AScontent">
+				<div id="imglegend">
+					<p>Refuge de Pointe Basse</p>
 				</div>
-			</div> -->
+			</div>
 		</aside>
 
-		<section>
-			<h1>Cabanes et bivouac en montagne.</h1>
-			<p><abbr title="Cabane en espéranto">Kabano</abbr> est une plateforme collaborative sur laquelle vous pouvez récupérer toutes les informations nécessaires relatives aux hébergements en montagne. Ces informations ont été ajoutées par vous, pour vous, c'est pourquoi il est primordial de ne pas cesser d'ajouter des commentaires, cabanes, refuges ou emplacements de bivouac. Attention toutefois, ces données ne sont en aucun cas garanties et des précautions dues à l'environnement montagnard sont à prendre.</p>
-			<br>
-			<p style="text-align: center;">
-				<img alt="Illustration hut" src="<?=$config['views_url']?>img/thumb1.jpg" class="thumb" title="© ptit tapou - Forums Pyrénées Team">
-				<img alt="Illustration tent" src="<?=$config['views_url']?>img/thumb2.jpg" class="thumb">
-				<img alt="Illustration hut" src="<?=$config['views_url']?>img/thumb3.jpg" class="thumb" title="CC BY-SA - EricM - refuges.info">
-			</p>
+<?
+	require_once($config['models_folder']."d.wiki.php");
+	$wikiPage = new Kabano\WikiPage();
+	$wikiPage->checkPermalink('index');
+	$wikiPage->md2html();
+?>
+
+		<section id="index">
+			<h1><?=$wikiPage->name?></h1>
+
+			<? if($user->rankIsHigher('moderator')) { ?>
+				<span class="subtitle">
+					<a href="<?=$config['rel_root_folder']?>wiki/index/edit"><i class="fas fa-pencil-alt"></i> Éditer la page</a>
+				</span>
+			<? } ?>
+
+			<br><br>
+
+			<?=$wikiPage->content_html?>
 		</section>
 
 		<? include('blocks/d.footer.html'); ?>

views/d.map.html

@@ -7,6 +7,8 @@
 
 		<? include('blocks/d.nav.html'); ?>
 
+		<div id="advert">En cours de création<span class="dots"><span>.</span><span>.</span><span>.</span></span><br>En attendant je vous recommande <a href="https://www.refuges.info/" target="_blank">refuges.info</a></div>
+
 		<div id="mapid" style="height: 100%;"></div>
 
 		<div id="footer-credits" style="display: none;">
@@ -16,7 +18,9 @@
 
 		<div id="footer-legend" style="display: none;">
 			<i class="fa fa-times close-link" aria-hidden="true"></i>
-			<p><i id="map-legend">Légende.</i></p>
+			<? foreach($poi_types as $type) { ?>
+				<span class="legend_item"><img src="<?=$config['views_url']?>img/<?=$type[3]?>.svg" class="poi_icon"> <?=$type[1]?></span>
+			<? } ?>
 		</div>
 
 		<? include('blocks/d.footer.html'); ?>

views/d.poi.edit.html

@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+	<? include('blocks/d.head.html'); ?>
+
+	<body>
+
+		<? include('blocks/d.nav.html'); ?>
+
+		<div id="mapid"></div>
+
+		<div id="sticky">
+			<section>
+				<i id="slide-icon" class="fas fa-chevron-up"></i>
+				<? if(isset($new) AND $new==1) { ?>
+					<form class="form" action="<?=$config['rel_root_folder']?>poi/new" method="post">
+				<? } 
+				else { ?>
+					<form class="form" action="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/edit" method="post">
+				<? } ?>
+					<h1 class="flex_line">
+						<input type="text" value="<?=$poi->name?>" name="name" id="name" placeholder="Nom de l'hébergement" required>
+						<select name="locale" id="locale">
+							<? foreach($locales->objs as $locale) { ?>
+								<option <?=$poi->locale==$locale->name?'selected':''?> value="<?=$locale->name?>"><?=$locale->display_name?></option>
+							<? } ?>
+						</select>
+					</h1>
+
+					<div class="flex_line">
+						<input type="number" class="noarrow" step="any" value="<?=$poi->lat?>" name="lat" id="lat" placeholder="Latitude" required>
+						<input type="number" class="noarrow" step="any" value="<?=$poi->lon?>" name="lon" id="lon" placeholder="Longitude" required>
+						<input type="number" class="noarrow last-child" step="any" value="<?=$poi->ele?>" name="ele" id="ele" placeholder="Altitude">
+						<div id="elevation_icon" style="display:none;" title="Calculer l'altitude"><i class="fas fa-search-location"></i></div>
+					</div>
+
+					<div class="flex_line" id="type_selector">
+						<? foreach($poi_types as $type) { ?>
+							<input type="radio" name="poi_type" value="<?=$type[3]?>" id="<?=$type[3]?>" required>
+							<label for="<?=$type[3]?>"><img src="<?=$config['views_url']?>img/<?=$type[3]?>.svg"><br><?=$type[0]?></label>
+						<? } ?>
+					</div>
+
+					<script type="text/javascript">
+						var unsaved = false;
+
+						// Used to store all the forms skeleton and abstracts
+						<? foreach($poi_types as $type) { ?>
+							<?=$type[3]?>_abstract="<?=$type[4]?>";
+							<?=$type[3]?>_jsonform=<?=json_encode($type[5])?>;
+						<? } ?>
+
+						// Manages the three state checkbox feature
+						function update3State(id) {
+							var input=$("input[name="+id+"]");
+							var label=$("label[for="+id+"]");
+							switch(+input.val()) {
+								case 0:
+									input.val(1);
+									label.toggleClass('uncheck intermediate')
+									break;
+								case 1:
+									input.val(2);
+									label.toggleClass('intermediate check')
+									break;
+								default:
+									input.val(0);
+									label.toggleClass('check uncheck')
+
+							}
+							unsaved = true; // The form values changed
+						}
+
+						// Updates the specific form section when changing poi type
+						function updateForm(type) {
+							$("#abstract").html(this[type+'_abstract']); // Changes the abstract legend
+							var html_form="";
+							// Generates HTML for the sub-form
+							$.each(this[type+'_jsonform'],function(index, value){
+									switch(index.charAt(0)) {
+										case 'b':
+											html_form+='<label class="threecb intermediate" for="'+index+'" onclick="update3State(\''+index+'\')">'+value+'</label><input value="1" type="hidden" name="'+index+'" id="'+index+'"><br>'
+											break;
+										case 'n':
+											html_form+='<div class="flex_line"><label for="'+index+'">'+value+'</label><input min="0" type="number" name="'+index+'" id="'+index+'"></div>'
+											break;
+										case 't':
+											html_form+='<textarea name="'+index+'"  id="'+index+'" placeholder="'+value+'"></textarea>'
+											break;
+										case 'l':
+											html_form+='<div class="flex_line"><label for="'+index+'">'+value+'</label><input placeholder="https://" type="url" name="'+index+'" id="'+index+'"></div>'
+											break;
+										default:
+											console.log("ERROR: "+index+"'s type is not known");
+									}
+							});
+							$("#specific_form").html(html_form); // Updates HTML
+
+							// Display an alert if the poi type is changed before reseting the form
+							unsaved = false;
+							$("#specific_form :input").change(function(){
+								unsaved = true;
+							});
+						}
+
+						// Handle click on type selector
+						$(document).ready(function(){
+							// First check if there is changes in the sub-form and if the user is OK to reset the form
+							$('#type_selector label').click(function(){
+								if(unsaved == true) {
+									if(confirm("Des changements ont été apportés et vont être supprimés, voulez-vous continuer ?")) {}
+									else {
+										return false; // Cancel radio switch action
+									}
+								}
+
+								// Updates the sub-form
+								updateForm($(this).prev().val());
+							});
+						});
+					</script>
+
+					<p id="abstract"></p>
+					<div id="specific_form"></div>
+
+					<? if(isset($new) AND $new==1) { ?>
+					<div id="permalink_container">
+						<label id="permalink_label" for="permalink"><?=$config['web_root_folder']?>poi/</label>
+						<input type="text" name="permalink" id="permalink" placeholder="URL">
+					</div>
+					<? } ?>
+
+					<script type="text/javascript">
+$( "#name" ).keyup(function() {
+  permalink = $( "#name" ).val();
+  permalink = permalink.replace(/ /g,'_');
+  permalink = permalink.toLowerCase();
+  permalink = permalink.replace(/[^a-z0-9_]/g,'-');
+  permalink = permalink.replace(/[_-]+$/g,'');
+  $( "#permalink" ).val(permalink);
+});
+$( "#name" ).change(function() {
+  permalink = $( "#name" ).val();
+  permalink = permalink.replace(/ /g,'_');
+  permalink = permalink.toLowerCase();
+  permalink = permalink.replace(/[^a-z0-9_]/g,'-');
+  permalink = permalink.replace(/[_-]+$/g,'');
+  $( "#permalink" ).val(permalink);
+});
+					</script>
+
+					<input name="submit" id="submit" type="submit" value="Ajouter l'hébergement">
+				</form>
+			</section>
+
+		<script type="text/javascript">
+$( "#slide-icon" ).click(function() {
+  $( "html, body" ).animate({scrollTop: "300px"});
+});
+		</script>
+
+			<? include('blocks/d.footer.html'); ?>
+		</div>
+	</body>
+</html>

views/d.user.login.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Connexion.</h1>
+			<h1>Connexion</h1>
 			<form class="form" action="<?=$config['rel_root_folder']?>user/login" method="post" id="login">
 				<? if(isset($_GET['error']) AND $_GET['error']==1) { ?>
 					<p style="color: red;">Erreur lors de la connexion, merci de réessayer.</p>

views/d.user.member_list.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section id="member_list">
-			<h1>Liste des membres.</h1>
+			<h1>Liste des membres</h1>
 			<p class="subtitle">Membres <?=$first?> à <?=$last?> sur les <?=$users->number?> inscrits</p>
 
 			<table>
@@ -45,8 +45,8 @@
 						<a class="username" href="<?=$config['rel_root_folder']?>user/p/<?=$row->id?>"><?=$row->name?></a>
 					</td>
 					<td><?=$row->get_rank()?></td>
-					<td><? echo strftime('%e %B %G',strtotime($row->register_date)) ?></td>
-					<td><? echo strftime('%e %B %G',strtotime($row->visit_date)) ?></td>
+					<td><? echo datefmt_format($user->date_format,date_create($row->register_date, new DateTimeZone("UTC"))) ?></td>
+					<td><? echo datefmt_format($user->date_format,date_create($row->visit_date, new DateTimeZone("UTC"))) ?></td>
 					<td>
 						<? if ($row->website != "") { ?>
 						<a target="_blank" href="<?=$row->website?>">Site internet <span class="external-link"><i class="fas fa-external-link-alt"></i></span></a>

views/d.user.password_lost.html

@@ -8,12 +8,12 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Envoi d'un mot de passe.</h1>
+			<h1>Envoi d'un mot de passe</h1>
 			<form class="form" action="<?=$config['rel_root_folder']?>user/password_lost" method="post" id="password_lodt">
 				<? if(isset($_GET['error']) AND $_GET['error']==1) { ?>
 					<p style="color: red;">Cette adresse mail n'existe pas.</p>
 				<? } ?>
-				<input type="text" name="email" id="email" placeholder="Adresse mail">
+				<input type="email" name="email" id="email" placeholder="Adresse mail">
 				<input type="submit" name="submit" value="Envoyer un nouveau mot de passe">
 			</form>
 		</section>

views/d.user.profile.edit.html

@@ -39,7 +39,7 @@
 						<div id="description">
 							<ul>
 								<li><label for="name">Nom d'utilisateur :</label><input name="name" id="name" type="text" value="<?=$userProfile->name?>" placeholder="Charlie"></li>
-								<li><label for="email">Adresse mail :</label><input name="email" id="email" type="text" value="<?=$userProfile->email?>" placeholder="charlie@mountain.org"></li>
+								<li><label for="email">Adresse mail :</label><input name="email" id="email" type="email" value="<?=$userProfile->email?>" placeholder="charlie@mountain.org"></li>
 								<li><label for="password">Mot de passe :</label><input name="password" id="password" type="password" placeholder="Nouveau mot de passe"></li>
 								<li><label for="locale">Langue :</label>
 									<select name="locale" id="locale">
@@ -47,6 +47,13 @@
 											<option <?=$userProfile->get_locale()==$locale->display_name?'selected':''?> value="<?=$locale->name?>"><?=$locale->display_name?></option>
 										<? } ?>
 									</select></li>
+								<li><label for="timezone">Fuseau horaire :</label>
+									<select name="timezone" id="timezone">
+										<? $timezones = timezone_identifiers_list();
+											foreach($timezones as $timezone) { ?>
+											<option <?=$userProfile->timezone==$timezone?'selected':''?> value="<?=$timezone?>"><?=$timezone?></option>
+										<? } ?>
+									</select></li>
 								<? if($user->rankIsHigher("administrator")) { ?>
 								<li><label for="rank">Rang : </label>
 									<select name="rank" id="rank">
@@ -55,7 +62,7 @@
 										<? } ?>
 									</select></li>
 								<? } ?>
-								<li><label for="website">Site internet :</label><input name="website" id="website" type="text" value="<?=$userProfile->website?>" placeholder="mountain.org"></li>
+								<li><label for="website">Site internet :</label><input name="website" id="website" type="url" value="<?=$userProfile->website?>" placeholder="https://mountain.org"></li>
 
 								<input name="submit" id="submit" type="submit" value="Envoyer">
 							</ul>

views/d.user.profile.html

@@ -24,8 +24,8 @@
 						</aside>
 							<div id="description">
 								<p>Langue : <?=$userProfile->get_locale()?></p>
-								<p>Inscrit le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($userProfile->register_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
-								<p>Dernière connexion le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($userProfile->visit_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
+								<p>Inscrit le <? echo datefmt_format($user->datetime_format,date_create($userProfile->register_date, new DateTimeZone("UTC"))) ?></p>
+								<p>Dernière connexion le <? echo datefmt_format($user->datetime_format,date_create($userProfile->visit_date, new DateTimeZone("UTC"))) ?></p>
 								<p><?=$userProfile->get_rank()?></p>
 								<p>
 									<? if ($userProfile->website != "") { ?>

views/d.user.signin.html

@@ -8,7 +8,7 @@
 		<? include('blocks/d.nav.html'); ?>
 
 		<section>
-			<h1>Inscription.</h1>
+			<h1>Inscription</h1>
 			<form class="form" action="<?=$config['rel_root_folder']?>user/signin" method="post" id="signin">
 				<? if(isset($_GET['error']) AND $_GET['error']=="name") { ?>
 					<p style="color: red;">Veuillez choisir un autre nom d'utilisateur.</p>
@@ -25,7 +25,7 @@
 				<? } ?>
 				<input type="text" name="login" id="login" placeholder="Nom d'utilisateur">
 				<input type="password" name="password" id="password" placeholder="Mot de passe">
-				<input type="text" name="email" id="email" placeholder="Adresse mail">
+				<input type="email" name="email" id="email" placeholder="Adresse mail">
 				<p id="captcha">
 					<input type="hidden" id="captchahidden" name="captcha" value="10">
 					<span id="captchatext">Merci d'attendre <b id="captchasec">10 s</b> avant de pouvoir vous inscrire.<br>

views/d.wiki.view.html

@@ -15,7 +15,7 @@
 						<select id="wikihistory">
 							<? $i = 0;
 							foreach ($wikiHistory->objs as $row) { ?>
-								<option <?=$row->id==$wikiPage->id?'selected':''?> value="<?=$i?>"><?=$row->is_archive=="f"?'&bull; ':''?><? echo strftime('%d/%m/%Y %H:%M:%S',strtotime($row->update_date)) ?></option>
+								<option <?=$row->version_id==$wikiPage->version_id?'selected':''?> value="<?=$i?>"><?=$row->is_archive=="f"?'&bull; ':''?><? echo datefmt_format($user->datetimeshort_format,date_create($row->update_date, new DateTimeZone("UTC"))) ?></option>
 							<? $i++;
 							} ?>
 						</select>
@@ -38,7 +38,7 @@
 				<?=$wikiPage->content_html?>
 			</div>
 
-			<p id="wikiTimestamp">Page mise à jour le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($wikiPage->update_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
+			<p id="wikiTimestamp">Page mise à jour le <? echo datefmt_format($user->datetime_format,date_create($wikiPage->update_date, new DateTimeZone("UTC"))) ?></p>
 
 			<div style="clear: both;"> </div>
 		</section>

views/img/alpine_hut.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" viewBox="0 0 31.999999 31.999998" id="svg4371" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="refuge-garde.svg">
+  <defs id="defs4373"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="15.839192" inkscape:cx="20.352187" inkscape:cy="10.481553" inkscape:document-units="px" inkscape:current-layer="g4689" showgrid="false" inkscape:window-width="1366" inkscape:window-height="745" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" units="px"/>
+  <metadata id="metadata4376">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)">
+    <g transform="translate(-41.001273,2.4589125)" id="g4668" style="fill:#ef2929;fill-opacity:1">
+      <g transform="translate(-22.998727,-2.4589163)" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4689-8">
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 66,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" id="path4462-1-2" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 80,1050.3622 -10,0 0,-18 10,-7 10,7 0,18 z" id="path4460-7-7" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 71,1029.3622 0,-6 4,0 0,3 z" id="path4464-3-6" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      </g>
+      <g transform="translate(-22.998727,-2.4589163)" id="g4689" style="fill:#ef2929;fill-opacity:1">
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" id="path4462-1" d="m 66,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path4460-7" d="m 80,1050.3622 -10,0 0,-18 10,-7 10,7 0,18 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4464-3" d="m 71,1029.3622 0,-6 4,0 0,3 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      </g>
+    </g>
+  </g>
+</svg>

views/img/basic_hut.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" viewBox="0 0 31.999999 31.999998" id="svg4371" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="abri.svg">
+  <defs id="defs4373"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.9195959" inkscape:cx="33.591252" inkscape:cy="15.994383" inkscape:document-units="px" inkscape:current-layer="g4668" showgrid="false" inkscape:window-width="1366" inkscape:window-height="745" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" units="px"/>
+  <metadata id="metadata4376">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)">
+    <g transform="translate(-32,-3.8146968e-6)" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4668-0">
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 34,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" id="path4462-3-8" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 38,1050.3622 0,-18 4,0 0,18 z" id="path4489-64" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 54,1050.3622 0,-18 4,0 0,18 z" id="path4489-6-3" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+    </g>
+    <g transform="translate(-32,-3.8146968e-6)" id="g4668" style="fill:#ef2929;fill-opacity:1">
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" id="path4462-3" d="m 34,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4489" d="m 38,1050.3622 0,-18 4,0 0,18 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4489-6" d="m 54,1050.3622 0,-18 4,0 0,18 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    </g>
+  </g>
+</svg>

views/img/bivouac.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" viewBox="0 0 31.999999 31.999998" id="svg4371" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="bivouac.svg">
+  <defs id="defs4373"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.5625" inkscape:cx="19.992835" inkscape:cy="5.4636994" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1366" inkscape:window-height="745" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" units="px"/>
+  <metadata id="metadata4376">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)">
+    <g transform="translate(-128,-3.814697e-6)" inkscape:export-ydpi="44.365292" inkscape:export-xdpi="44.365292" inkscape:export-filename="/home/leo/Projets/WRI/images/icones/bivouac.png" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4682-8">
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 130,1050.3622 4,0 17,-28 -5,0 -16,26 z" id="path4554-2" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 158,1050.3622 -4,0 -17,-28 5,0 16,26 z" id="path4554-6-4" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 134,1050.3622 0,-4 7,0 3,-5 3,5 7,0 0,4 z" id="path4571-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+    </g>
+    <g transform="translate(-128,-3.814697e-6)" id="g4682" style="fill:#ef2929;fill-opacity:1" inkscape:export-filename="/home/leo/Projets/WRI/images/icones/bivouac.png" inkscape:export-xdpi="44.365292" inkscape:export-ydpi="44.365292">
+      <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path4554" d="m 130,1050.3622 4,0 17,-28 -5,0 -16,26 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path4554-6" d="m 158,1050.3622 -4,0 -17,-28 5,0 16,26 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path4571" d="m 134,1050.3622 0,-4 7,0 3,-5 3,5 7,0 0,4 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    </g>
+  </g>
+</svg>

views/img/campsite.svg

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg4371"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="camping.svg">
+  <defs
+     id="defs4373" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.5625"
+     inkscape:cx="5.7838798"
+     inkscape:cy="11.195043"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="998"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata4376">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       transform="translate(-128,-3.814697e-6)"
+       inkscape:export-ydpi="44.365292"
+       inkscape:export-xdpi="44.365292"
+       inkscape:export-filename="/home/leo/Projets/WRI/images/icones/bivouac.png"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="g4682-8">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 130,1050.3622 h 4 l 17,-28 h -5 l -16,26 z"
+         id="path4554-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 158,1050.3622 h -4 l -17,-28 h 5 l 16,26 z"
+         id="path4554-6-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 134,1050.3622 v -4 h 7 l 3,-5 3,5 h 7 v 4 z"
+         id="path4571-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       transform="translate(-128,-3.814697e-6)"
+       id="g4682"
+       style="fill:#4e9a06;fill-opacity:1"
+       inkscape:export-filename="/home/leo/Projets/WRI/images/icones/bivouac.png"
+       inkscape:export-xdpi="44.365292"
+       inkscape:export-ydpi="44.365292">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path4554"
+         d="m 130,1050.3622 h 4 l 17,-28 h -5 l -16,26 z"
+         style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path4554-6"
+         d="m 158,1050.3622 h -4 l -17,-28 h 5 l 16,26 z"
+         style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4571"
+         d="m 134,1050.3622 v -4 h 7 l 3,-5 3,5 h 7 v 4 z"
+         style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

views/img/halt.svg

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" viewBox="0 0 31.999999 31.999998" id="svg4371" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="gite-d-etape.svg">
+  <defs id="defs4373"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" inkscape:cx="19.601284" inkscape:cy="15.042108" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1366" inkscape:window-height="745" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" units="px"/>
+  <metadata id="metadata4376">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)">
+    <g transform="translate(-41.001273,2.4589125)" id="g4668" style="fill:#ef2929;fill-opacity:1">
+      <g transform="translate(-22.998727,-2.4589163)" id="g4689" style="fill:#ef2929;fill-opacity:1"/>
+      <g transform="translate(-54.998727,-2.4589163)" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4677-7">
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 112,1050.3622 -10,0 0,-18 10,-7 9.99999,7 0,18 z" id="path4460-7-1-2" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 98,1034.3622 6,0 8,-6 7.99999,6 6,0 0,-2 -13.99999,-10 -14,10 z" id="path4462-1-5-9" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 103,1029.3622 0,-6 4,0 0,3 z" id="path4464-3-1-9" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      </g>
+      <g transform="translate(-54.998727,-2.4589163)" id="g4677" style="fill:#4e9a06;fill-opacity:1">
+        <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path4460-7-1" d="m 112,1050.3622 -10,0 0,-18 10,-7 9.99999,7 0,18 z" style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" id="path4462-1-5" d="m 98,1034.3622 6,0 8,-6 7.99999,6 6,0 0,-2 -13.99999,-10 -14,10 z" style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4464-3-1" d="m 103,1029.3622 0,-6 4,0 0,3 z" style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      </g>
+    </g>
+  </g>
+</svg>

views/img/wilderness_hut.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" viewBox="0 0 31.999999 31.999998" id="svg4371" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="cabane-non-gardee.svg">
+  <defs id="defs4373"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8" inkscape:cx="65.143784" inkscape:cy="39.340085" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1366" inkscape:window-height="745" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" units="px"/>
+  <metadata id="metadata4376">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)">
+    <g transform="translate(0,-3.8146968e-6)" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4663-6">
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 16,1050.3622 -10,0 0,-18 4,0 0,14 12,0 0,-14 4,0 0,18 z" id="path4460-73" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 2,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" id="path4462-4" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 7,1029.3622 0,-6 4,0 0,3 z" id="path4464-1" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <rect y="1028.9393" x="8.5736694" height="17.766058" width="15.467961" id="rect4328" style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    </g>
+    <g transform="translate(0,-3.8146968e-6)" id="g4663" style="fill:#ef2929;fill-opacity:1">
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" id="path4460" d="m 16,1050.3622 -10,0 0,-18 4,0 0,14 12,0 0,-14 4,0 0,18 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" id="path4462" d="m 2,1034.3622 6,0 8,-6 8,6 6,0 0,-2 -14,-10 -14,10 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4464" d="m 7,1029.3622 0,-6 4,0 0,3 z" style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    </g>
+  </g>
+</svg>

views/js/d.header.js

@@ -21,12 +21,18 @@ function reduce() {
 		}, 100, function() {
 			// Animation complete.
 	});
-	$( "header a.on-bar" ).animate({
+	$( "header li:not(.with-subtitle) a.on-bar" ).animate({
 		paddingTop: "15px",
 		paddingBottom: "5px"
 		}, 100, function() {
 			// Animation complete.
 	});
+	$( "header li.with-subtitle a.on-bar" ).animate({
+		paddingTop: "5px",
+		paddingBottom: "15px"
+		}, 100, function() {
+			// Animation complete.
+	});
 }
 
 function enlarge() {
@@ -50,21 +56,27 @@ function enlarge() {
 		}, 100, function() {
 			// Animation complete.
 	});
-	$( "header a.on-bar" ).animate({
+	$( "header li:not(.with-subtitle) a.on-bar" ).animate({
 		paddingTop: "25px",
 		paddingBottom: "15px"
 		}, 100, function() {
 			// Animation complete.
 	});
+	$( "header li.with-subtitle a.on-bar" ).animate({
+		paddingTop: "15px",
+		paddingBottom: "25px"
+		}, 100, function() {
+			// Animation complete.
+	});
 }
 
 $(window).scroll(function() {
 	var position = $(window).scrollTop();
-	if (position>80 && small!=1) {
+	if (position>80 && small!=1 && $('body').width() > 800) {
 		small = 1;
 		reduce();
 	}
-	else if (position<=80 && small!=0) {
+	else if (position<=80 && small!=0 && $('body').width() > 800) {
 		small = 0;
 		enlarge();
 	}

views/js/d.map.js

@@ -2,20 +2,20 @@ 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 © <a href="http://www.openstreetmap.fr">OpenSreetMap France</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
-	var	wikimedia  = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {maxZoom: 18, attribution: 'Maps © <a href="http://wikimedia.org">Wikimedia</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
+	var	topo_maptiler = L.tileLayer('https://api.maptiler.com/maps/topographique/{z}/{x}/{y}.png?key=Sm8M7mJ53GtYdl773rpi', {tms: false, attribution: 'Carte © <a href="https://www.maptiler.com/copyright/" target="_blank">MapTiler</a>, Données © <a href="http://www.openstreetmap.org/copyright" target="_blank">Contributeurs OpenStreetMap</a>', tileSize: 512, zoomOffset: -1, minZoom: 1});
+	var	ign = L.tileLayer('https://data.geopf.fr/private/wmts?&REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/jpeg&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&apikey=ign_scan_ws', {attribution: 'Carte & Connées © <a href="http://ign.fr/" target="_blank">IGN-F/Géoportail</a>'});
 
 	// Base layers
 	var baseLayers = {
-		"OSM France": osmfr,
-		"OSM Wikimedia": wikimedia,
+		"OpenStreetMap": topo_maptiler,
+		"IGN France": ign
 	};
 
 	mymap = L.map('mapid', {
 		zoomControl: false,
-		layers: [wikimedia],
-	}).setView([47.018, 3.142], 6);
-	$("#map-credits").html(wikimedia.getAttribution());
+		layers: [topo_maptiler]
+	}).setView([47, 3], 6);
+	$("#map-credits").html(topo_maptiler.getAttribution());
 
 	L.control.scale({
 		position: "bottomleft",

views/js/d.poi_map.js

@@ -0,0 +1,82 @@
+var mymap;
+var poi_layer;
+
+$( document ).ready(function() {
+	// Differents layers for the map
+	var	topo_maptiler = L.tileLayer('https://api.maptiler.com/maps/topographique/{z}/{x}/{y}.png?key=Sm8M7mJ53GtYdl773rpi', {tms: false, attribution: 'Carte © <a href="https://www.maptiler.com/copyright/" target="_blank">MapTiler</a>, Données © <a href="http://www.openstreetmap.org/copyright" target="_blank">Contributeurs OpenStreetMap</a>', tileSize: 512, zoomOffset: -1, minZoom: 1});
+	var	ign = L.tileLayer('https://data.geopf.fr/private/wmts?&REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/jpeg&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&apikey=ign_scan_ws', {attribution: 'Carte & Connées © <a href="http://ign.fr/" target="_blank">IGN-F/Géoportail</a>'});
+	// Base layers
+	var baseLayers = {
+		"OpenStreetMap": topo_maptiler,
+		"IGN France": ign
+	};
+
+	mymap = L.map('mapid', {
+		zoomControl: false,
+		layers: [topo_maptiler]
+	}).setView([47, 3], 6);
+	$("#map-credits").html(topo_maptiler.getAttribution());
+
+	L.control.scale({
+		position: "bottomleft",
+		imperial: false
+	}).addTo(mymap);
+
+	L.control.fullscreen({
+		position: "bottomleft"
+	}).addTo(mymap);
+
+	L.control.zoom({
+		zoomOutText: "<i class=\"fa fa-minus\" aria-hidden=\"true\"></i>",
+		zoomInText: "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i>",
+		position: "bottomleft"
+	}).addTo(mymap);
+
+	L.control.layers(baseLayers,null,{
+		position: "bottomright"
+	}).addTo(mymap);
+
+	mymap.removeControl(mymap.attributionControl);
+
+	mymap.on('baselayerchange', function(e) {
+		$("#map-credits").html(e.layer.getAttribution());
+	});
+
+	poi_layer = L.marker([47, 3], {draggable: true}).addTo(mymap);
+	poi_layer.bindTooltip("Glissez moi au bon endroit.", {permanent: true, direction: 'auto'}).openTooltip();
+
+	mymap.on('click', function(e){
+		poi_layer.setLatLng(e.latlng);
+	})
+	poi_layer.on('move', function(e){
+		poi_layer.unbindTooltip();
+		$("#lat").val(+e.latlng.lat.toFixed(6));
+		$("#lon").val(+e.latlng.lng.toFixed(6));
+		$("#elevation_icon").show();
+	})
+	$("#lat,#lon").change(function() { // If the user changes the lat/lon input values manualy
+		if(isNaN($("#lat").val()) || isNaN($("#lon").val()) || $("#lat").val().length==0 || $("#lon").val()==null)
+			$("#elevation_icon").hide();
+		else {
+			$("#elevation_icon").show();
+			poi_layer.setLatLng([$("#lat").val(),$("#lon").val()]);
+		}
+	});
+
+	var poiicon = L.icon({
+		iconSize: [24, 24],
+		iconAnchor: [12, 12]
+	});
+	$("#type_selector label").click(function(e) {
+		poi_layer.unbindTooltip();
+		poiicon.options.iconUrl = e.currentTarget.firstChild.currentSrc;
+		poi_layer.setIcon(poiicon);
+	})
+	$("#elevation_icon").click(function(e) {
+		$(this).find($(".fas")).removeClass('fa-search-location').addClass('fa-spinner').addClass('fa-spin');
+		$.get("./elevation_proxy", {location:$("#lat").val()+","+$("#lon").val()}, function(result){
+			$("#ele").val(result.results[0].elevation);
+			$("#elevation_icon").find($(".fas")).removeClass('fa-spinner').removeClass('fa-spin').addClass('fa-search-location');
+		});
+	})
+});

views/third/leaflet-easybutton/easy-button.js

@@ -218,6 +218,11 @@ L.Control.EasyButton = L.Control.extend({
 
   state: function(newState){
 
+    // when called with no args, it's a getter
+    if (arguments.length === 0) {
+      return this._currentState.stateName;
+    }
+
     // activate by name
     if(typeof newState == 'string'){
 

views/third/leaflet-fullscreen/Leaflet.fullscreen.js

@@ -1,152 +1,168 @@
-L.Control.Fullscreen = L.Control.extend({
-    options: {
-        position: 'topleft',
-        title: {
-            'false': 'View Fullscreen',
-            'true': 'Exit Fullscreen'
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['leaflet'], factory);
+    } else if (typeof module !== 'undefined') {
+        // Node/CommonJS
+        module.exports = factory(require('leaflet'));
+    } else {
+        // Browser globals
+        if (typeof window.L === 'undefined') {
+            throw new Error('Leaflet must be loaded first');
         }
-    },
-
-    onAdd: function (map) {
-        var container = L.DomUtil.create('div', 'leaflet-control-fullscreen leaflet-bar leaflet-control');
-
-        this.link = L.DomUtil.create('a', 'leaflet-control-fullscreen-button leaflet-bar-part', container);
-        this.link.href = '#';
-
-        this._map = map;
-        this._map.on('fullscreenchange', this._toggleTitle, this);
-        this._toggleTitle();
-
-        L.DomEvent.on(this.link, 'click', this._click, this);
-
-        return container;
-    },
-
-    _click: function (e) {
-        L.DomEvent.stopPropagation(e);
-        L.DomEvent.preventDefault(e);
-        this._map.toggleFullscreen(this.options);
-    },
-
-    _toggleTitle: function() {
-        this.link.title = this.options.title[this._map.isFullscreen()];
+        factory(window.L);
     }
-});
-
-L.Map.include({
-    isFullscreen: function () {
-        return this._isFullscreen || false;
-    },
-
-    toggleFullscreen: function (options) {
-        var container = this.getContainer();
-        if (this.isFullscreen()) {
-            if (options && options.pseudoFullscreen) {
-                this._disablePseudoFullscreen(container);
-            } else if (document.exitFullscreen) {
-                document.exitFullscreen();
-            } else if (document.mozCancelFullScreen) {
-                document.mozCancelFullScreen();
-            } else if (document.webkitCancelFullScreen) {
-                document.webkitCancelFullScreen();
-            } else if (document.msExitFullscreen) {
-                document.msExitFullscreen();
-            } else {
-                this._disablePseudoFullscreen(container);
+}(function (L) {
+    L.Control.Fullscreen = L.Control.extend({
+        options: {
+            position: 'topleft',
+            title: {
+                'false': 'View Fullscreen',
+                'true': 'Exit Fullscreen'
             }
-        } else {
-            if (options && options.pseudoFullscreen) {
-                this._enablePseudoFullscreen(container);
-            } else if (container.requestFullscreen) {
-                container.requestFullscreen();
-            } else if (container.mozRequestFullScreen) {
-                container.mozRequestFullScreen();
-            } else if (container.webkitRequestFullscreen) {
-                container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
-            } else if (container.msRequestFullscreen) {
-                container.msRequestFullscreen();
+        },
+
+        onAdd: function (map) {
+            var container = L.DomUtil.create('div', 'leaflet-control-fullscreen leaflet-bar leaflet-control');
+
+            this.link = L.DomUtil.create('a', 'leaflet-control-fullscreen-button leaflet-bar-part', container);
+            this.link.href = '#';
+
+            this._map = map;
+            this._map.on('fullscreenchange', this._toggleTitle, this);
+            this._toggleTitle();
+
+            L.DomEvent.on(this.link, 'click', this._click, this);
+
+            return container;
+        },
+
+        _click: function (e) {
+            L.DomEvent.stopPropagation(e);
+            L.DomEvent.preventDefault(e);
+            this._map.toggleFullscreen(this.options);
+        },
+
+        _toggleTitle: function() {
+            this.link.title = this.options.title[this._map.isFullscreen()];
+        }
+    });
+
+    L.Map.include({
+        isFullscreen: function () {
+            return this._isFullscreen || false;
+        },
+
+        toggleFullscreen: function (options) {
+            var container = this.getContainer();
+            if (this.isFullscreen()) {
+                if (options && options.pseudoFullscreen) {
+                    this._disablePseudoFullscreen(container);
+                } else if (document.exitFullscreen) {
+                    document.exitFullscreen();
+                } else if (document.mozCancelFullScreen) {
+                    document.mozCancelFullScreen();
+                } else if (document.webkitCancelFullScreen) {
+                    document.webkitCancelFullScreen();
+                } else if (document.msExitFullscreen) {
+                    document.msExitFullscreen();
+                } else {
+                    this._disablePseudoFullscreen(container);
+                }
             } else {
-                this._enablePseudoFullscreen(container);
+                if (options && options.pseudoFullscreen) {
+                    this._enablePseudoFullscreen(container);
+                } else if (container.requestFullscreen) {
+                    container.requestFullscreen();
+                } else if (container.mozRequestFullScreen) {
+                    container.mozRequestFullScreen();
+                } else if (container.webkitRequestFullscreen) {
+                    container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
+                } else if (container.msRequestFullscreen) {
+                    container.msRequestFullscreen();
+                } else {
+                    this._enablePseudoFullscreen(container);
+                }
             }
-        }
 
-    },
+        },
 
-    _enablePseudoFullscreen: function (container) {
-        L.DomUtil.addClass(container, 'leaflet-pseudo-fullscreen');
-        this._setFullscreen(true);
-        this.fire('fullscreenchange');
-    },
-
-    _disablePseudoFullscreen: function (container) {
-        L.DomUtil.removeClass(container, 'leaflet-pseudo-fullscreen');
-        this._setFullscreen(false);
-        this.fire('fullscreenchange');
-    },
-
-    _setFullscreen: function(fullscreen) {
-        this._isFullscreen = fullscreen;
-        var container = this.getContainer();
-        if (fullscreen) {
-            L.DomUtil.addClass(container, 'leaflet-fullscreen-on');
-        } else {
-            L.DomUtil.removeClass(container, 'leaflet-fullscreen-on');
-        }
-        this.invalidateSize();
-    },
-
-    _onFullscreenChange: function (e) {
-        var fullscreenElement =
-            document.fullscreenElement ||
-            document.mozFullScreenElement ||
-            document.webkitFullscreenElement ||
-            document.msFullscreenElement;
-
-        if (fullscreenElement === this.getContainer() && !this._isFullscreen) {
+        _enablePseudoFullscreen: function (container) {
+            L.DomUtil.addClass(container, 'leaflet-pseudo-fullscreen');
             this._setFullscreen(true);
             this.fire('fullscreenchange');
-        } else if (fullscreenElement !== this.getContainer() && this._isFullscreen) {
+        },
+
+        _disablePseudoFullscreen: function (container) {
+            L.DomUtil.removeClass(container, 'leaflet-pseudo-fullscreen');
             this._setFullscreen(false);
             this.fire('fullscreenchange');
+        },
+
+        _setFullscreen: function(fullscreen) {
+            this._isFullscreen = fullscreen;
+            var container = this.getContainer();
+            if (fullscreen) {
+                L.DomUtil.addClass(container, 'leaflet-fullscreen-on');
+            } else {
+                L.DomUtil.removeClass(container, 'leaflet-fullscreen-on');
+            }
+            this.invalidateSize();
+        },
+
+        _onFullscreenChange: function (e) {
+            var fullscreenElement =
+                document.fullscreenElement ||
+                document.mozFullScreenElement ||
+                document.webkitFullscreenElement ||
+                document.msFullscreenElement;
+
+            if (fullscreenElement === this.getContainer() && !this._isFullscreen) {
+                this._setFullscreen(true);
+                this.fire('fullscreenchange');
+            } else if (fullscreenElement !== this.getContainer() && this._isFullscreen) {
+                this._setFullscreen(false);
+                this.fire('fullscreenchange');
+            }
         }
-    }
-});
+    });
 
-L.Map.mergeOptions({
-    fullscreenControl: false
-});
+    L.Map.mergeOptions({
+        fullscreenControl: false
+    });
 
-L.Map.addInitHook(function () {
-    if (this.options.fullscreenControl) {
-        this.fullscreenControl = new L.Control.Fullscreen(this.options.fullscreenControl);
-        this.addControl(this.fullscreenControl);
-    }
+    L.Map.addInitHook(function () {
+        if (this.options.fullscreenControl) {
+            this.fullscreenControl = new L.Control.Fullscreen(this.options.fullscreenControl);
+            this.addControl(this.fullscreenControl);
+        }
 
-    var fullscreenchange;
+        var fullscreenchange;
 
-    if ('onfullscreenchange' in document) {
-        fullscreenchange = 'fullscreenchange';
-    } else if ('onmozfullscreenchange' in document) {
-        fullscreenchange = 'mozfullscreenchange';
-    } else if ('onwebkitfullscreenchange' in document) {
-        fullscreenchange = 'webkitfullscreenchange';
-    } else if ('onmsfullscreenchange' in document) {
-        fullscreenchange = 'MSFullscreenChange';
-    }
+        if ('onfullscreenchange' in document) {
+            fullscreenchange = 'fullscreenchange';
+        } else if ('onmozfullscreenchange' in document) {
+            fullscreenchange = 'mozfullscreenchange';
+        } else if ('onwebkitfullscreenchange' in document) {
+            fullscreenchange = 'webkitfullscreenchange';
+        } else if ('onmsfullscreenchange' in document) {
+            fullscreenchange = 'MSFullscreenChange';
+        }
 
-    if (fullscreenchange) {
-        var onFullscreenChange = L.bind(this._onFullscreenChange, this);
+        if (fullscreenchange) {
+            var onFullscreenChange = L.bind(this._onFullscreenChange, this);
 
-        this.whenReady(function () {
-            L.DomEvent.on(document, fullscreenchange, onFullscreenChange);
-        });
+            this.whenReady(function () {
+                L.DomEvent.on(document, fullscreenchange, onFullscreenChange);
+            });
 
-        this.on('unload', function () {
-            L.DomEvent.off(document, fullscreenchange, onFullscreenChange);
-        });
-    }
-});
+            this.on('unload', function () {
+                L.DomEvent.off(document, fullscreenchange, onFullscreenChange);
+            });
+        }
+    });
 
-L.control.fullscreen = function (options) {
-    return new L.Control.Fullscreen(options);
-};
+    L.control.fullscreen = function (options) {
+        return new L.Control.Fullscreen(options);
+    };
+}));

views/third/leaflet-fullscreen/Leaflet.fullscreen.min.js

@@ -1 +1 @@
-L.Control.Fullscreen=L.Control.extend({options:{position:"topleft",title:{"false":"View Fullscreen","true":"Exit Fullscreen"}},onAdd:function(map){var container=L.DomUtil.create("div","leaflet-control-fullscreen leaflet-bar leaflet-control");this.link=L.DomUtil.create("a","leaflet-control-fullscreen-button leaflet-bar-part",container);this.link.href="#";this._map=map;this._map.on("fullscreenchange",this._toggleTitle,this);this._toggleTitle();L.DomEvent.on(this.link,"click",this._click,this);return container},_click:function(e){L.DomEvent.stopPropagation(e);L.DomEvent.preventDefault(e);this._map.toggleFullscreen(this.options)},_toggleTitle:function(){this.link.title=this.options.title[this._map.isFullscreen()]}});L.Map.include({isFullscreen:function(){return this._isFullscreen||false},toggleFullscreen:function(options){var container=this.getContainer();if(this.isFullscreen()){if(options&&options.pseudoFullscreen){this._disablePseudoFullscreen(container)}else if(document.exitFullscreen){document.exitFullscreen()}else if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}else if(document.msExitFullscreen){document.msExitFullscreen()}else{this._disablePseudoFullscreen(container)}}else{if(options&&options.pseudoFullscreen){this._enablePseudoFullscreen(container)}else if(container.requestFullscreen){container.requestFullscreen()}else if(container.mozRequestFullScreen){container.mozRequestFullScreen()}else if(container.webkitRequestFullscreen){container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}else if(container.msRequestFullscreen){container.msRequestFullscreen()}else{this._enablePseudoFullscreen(container)}}},_enablePseudoFullscreen:function(container){L.DomUtil.addClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(true);this.fire("fullscreenchange")},_disablePseudoFullscreen:function(container){L.DomUtil.removeClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(false);this.fire("fullscreenchange")},_setFullscreen:function(fullscreen){this._isFullscreen=fullscreen;var container=this.getContainer();if(fullscreen){L.DomUtil.addClass(container,"leaflet-fullscreen-on")}else{L.DomUtil.removeClass(container,"leaflet-fullscreen-on")}this.invalidateSize()},_onFullscreenChange:function(e){var fullscreenElement=document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement;if(fullscreenElement===this.getContainer()&&!this._isFullscreen){this._setFullscreen(true);this.fire("fullscreenchange")}else if(fullscreenElement!==this.getContainer()&&this._isFullscreen){this._setFullscreen(false);this.fire("fullscreenchange")}}});L.Map.mergeOptions({fullscreenControl:false});L.Map.addInitHook(function(){if(this.options.fullscreenControl){this.fullscreenControl=new L.Control.Fullscreen(this.options.fullscreenControl);this.addControl(this.fullscreenControl)}var fullscreenchange;if("onfullscreenchange"in document){fullscreenchange="fullscreenchange"}else if("onmozfullscreenchange"in document){fullscreenchange="mozfullscreenchange"}else if("onwebkitfullscreenchange"in document){fullscreenchange="webkitfullscreenchange"}else if("onmsfullscreenchange"in document){fullscreenchange="MSFullscreenChange"}if(fullscreenchange){var onFullscreenChange=L.bind(this._onFullscreenChange,this);this.whenReady(function(){L.DomEvent.on(document,fullscreenchange,onFullscreenChange)});this.on("unload",function(){L.DomEvent.off(document,fullscreenchange,onFullscreenChange)})}});L.control.fullscreen=function(options){return new L.Control.Fullscreen(options)};
+(function(factory){var L;if(typeof define==="function"&&define.amd){define(["leaflet"],factory)}else if(typeof module!=="undefined"){L=require("leaflet");module.exports=factory(L)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}factory(window.L)}})(function(L){L.Control.Fullscreen=L.Control.extend({options:{position:"topleft",title:{"false":"View Fullscreen","true":"Exit Fullscreen"}},onAdd:function(map){var container=L.DomUtil.create("div","leaflet-control-fullscreen leaflet-bar leaflet-control");this.link=L.DomUtil.create("a","leaflet-control-fullscreen-button leaflet-bar-part",container);this.link.href="#";this._map=map;this._map.on("fullscreenchange",this._toggleTitle,this);this._toggleTitle();L.DomEvent.on(this.link,"click",this._click,this);return container},_click:function(e){L.DomEvent.stopPropagation(e);L.DomEvent.preventDefault(e);this._map.toggleFullscreen(this.options)},_toggleTitle:function(){this.link.title=this.options.title[this._map.isFullscreen()]}});L.Map.include({isFullscreen:function(){return this._isFullscreen||false},toggleFullscreen:function(options){var container=this.getContainer();if(this.isFullscreen()){if(options&&options.pseudoFullscreen){this._disablePseudoFullscreen(container)}else if(document.exitFullscreen){document.exitFullscreen()}else if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}else if(document.msExitFullscreen){document.msExitFullscreen()}else{this._disablePseudoFullscreen(container)}}else{if(options&&options.pseudoFullscreen){this._enablePseudoFullscreen(container)}else if(container.requestFullscreen){container.requestFullscreen()}else if(container.mozRequestFullScreen){container.mozRequestFullScreen()}else if(container.webkitRequestFullscreen){container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}else if(container.msRequestFullscreen){container.msRequestFullscreen()}else{this._enablePseudoFullscreen(container)}}},_enablePseudoFullscreen:function(container){L.DomUtil.addClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(true);this.fire("fullscreenchange")},_disablePseudoFullscreen:function(container){L.DomUtil.removeClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(false);this.fire("fullscreenchange")},_setFullscreen:function(fullscreen){this._isFullscreen=fullscreen;var container=this.getContainer();if(fullscreen){L.DomUtil.addClass(container,"leaflet-fullscreen-on")}else{L.DomUtil.removeClass(container,"leaflet-fullscreen-on")}this.invalidateSize()},_onFullscreenChange:function(e){var fullscreenElement=document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement;if(fullscreenElement===this.getContainer()&&!this._isFullscreen){this._setFullscreen(true);this.fire("fullscreenchange")}else if(fullscreenElement!==this.getContainer()&&this._isFullscreen){this._setFullscreen(false);this.fire("fullscreenchange")}}});L.Map.mergeOptions({fullscreenControl:false});L.Map.addInitHook(function(){if(this.options.fullscreenControl){this.fullscreenControl=new L.Control.Fullscreen(this.options.fullscreenControl);this.addControl(this.fullscreenControl)}var fullscreenchange;if("onfullscreenchange"in document){fullscreenchange="fullscreenchange"}else if("onmozfullscreenchange"in document){fullscreenchange="mozfullscreenchange"}else if("onwebkitfullscreenchange"in document){fullscreenchange="webkitfullscreenchange"}else if("onmsfullscreenchange"in document){fullscreenchange="MSFullscreenChange"}if(fullscreenchange){var onFullscreenChange=L.bind(this._onFullscreenChange,this);this.whenReady(function(){L.DomEvent.on(document,fullscreenchange,onFullscreenChange)});this.on("unload",function(){L.DomEvent.off(document,fullscreenchange,onFullscreenChange)})}});L.control.fullscreen=function(options){return new L.Control.Fullscreen(options)}});

views/third/leaflet/leaflet.css

@@ -25,6 +25,10 @@
 	        user-select: none;
 	  -webkit-user-drag: none;
 	}
+/* Prevents IE11 from highlighting tiles in blue */
+.leaflet-tile::selection {
+	background: transparent;
+}
 /* Safari renders non-retina tile on retina better with this, but Chrome is worse */
 .leaflet-safari .leaflet-tile {
 	image-rendering: -webkit-optimize-contrast;
@@ -237,7 +241,8 @@
 
 .leaflet-marker-icon.leaflet-interactive,
 .leaflet-image-layer.leaflet-interactive,
-.leaflet-pane > svg path.leaflet-interactive {
+.leaflet-pane > svg path.leaflet-interactive,
+svg.leaflet-image-layer.leaflet-interactive path {
 	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
 	pointer-events: auto;
 	}
@@ -527,7 +532,7 @@
 	}
 
 .leaflet-oldie .leaflet-popup-content-wrapper {
-	zoom: 1;
+	-ms-zoom: 1;
 	}
 .leaflet-oldie .leaflet-popup-tip {
 	width: 24px;