diff --git a/controllers/d.admin.php b/controllers/d.admin.php index b04ec96..06e3afd 100755 --- a/controllers/d.admin.php +++ b/controllers/d.admin.php @@ -1,4 +1,4 @@ - +splitted_url[1]) && $user->rankIsHigher("moderator")) { switch ($controller->splitted_url[1]) { @@ -283,5 +283,3 @@ function formatBytes($bytes, $locale = 'en', $precision = 2) { return $formatted . ' ' . $units[$power]; } - -?> \ No newline at end of file diff --git a/controllers/d.blog.php b/controllers/d.blog.php index 5c78098..e6dd3ce 100755 --- a/controllers/d.blog.php +++ b/controllers/d.blog.php @@ -1,4 +1,4 @@ - +splitted_url[1]) { } break; } - -?> \ No newline at end of file diff --git a/controllers/d.contact.php b/controllers/d.contact.php index fdaaae8..f4a250e 100755 --- a/controllers/d.contact.php +++ b/controllers/d.contact.php @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/controllers/d.map.php b/controllers/d.map.php index 4a25c67..91badf5 100755 --- a/controllers/d.map.php +++ b/controllers/d.map.php @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/controllers/d.poi.php b/controllers/d.poi.php index a85cb5d..245cd17 100755 --- a/controllers/d.poi.php +++ b/controllers/d.poi.php @@ -274,5 +274,3 @@ switch ($controller->splitted_url[1]) { } break; } - -?> diff --git a/controllers/d.users.php b/controllers/d.users.php index bb67720..4d3a69b 100755 --- a/controllers/d.users.php +++ b/controllers/d.users.php @@ -1,4 +1,4 @@ - +splitted_url[1])) { else { $notfound = 1; } - -?> \ No newline at end of file diff --git a/controllers/d.wiki.php b/controllers/d.wiki.php index 2537e82..dc9d230 100755 --- a/controllers/d.wiki.php +++ b/controllers/d.wiki.php @@ -1,4 +1,4 @@ - +splitted_url[1]) && $wikiPage->checkPermalink($contro else { $notfound = 1; } - -?> \ No newline at end of file diff --git a/includes/config.example.php b/includes/config.example.php index 6c65602..9d801c2 100755 --- a/includes/config.example.php +++ b/includes/config.example.php @@ -48,5 +48,3 @@ $config['SQL_db'] = "postgres"; $config['admin_mail'] = "leo@lstronic.com"; $config['bot_mail'] = "robot@kabano.com"; - -?> \ No newline at end of file diff --git a/includes/images.php b/includes/images.php index ff8e653..d428bad 100755 --- a/includes/images.php +++ b/includes/images.php @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/includes/poi_types.struct.php b/includes/poi_types.struct.php index 4dcc279..5da6b52 100644 --- a/includes/poi_types.struct.php +++ b/includes/poi_types.struct.php @@ -89,5 +89,3 @@ $poi_types = array( ) ); - -?> diff --git a/includes/routes.php b/includes/routes.php index 65a325b..c289e4f 100755 --- a/includes/routes.php +++ b/includes/routes.php @@ -1,4 +1,4 @@ - +name; include ($config['views_folder']."d.wiki.view.html"); } - -?> diff --git a/includes/session.php b/includes/session.php index 32572b3..8286fe2 100755 --- a/includes/session.php +++ b/includes/session.php @@ -1,4 +1,4 @@ - +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']); - - -?> \ No newline at end of file diff --git a/index.php b/index.php index 5ed4125..4a3ac59 100755 --- a/index.php +++ b/index.php @@ -1,6 +1,4 @@ - + \ No newline at end of file +require_once __DIR__ . '/includes/config.php'; +require_once __DIR__ . '/includes/routes.php'; diff --git a/models/d.blog.php b/models/d.blog.php index 8cd852f..a0c559c 100755 --- a/models/d.blog.php +++ b/models/d.blog.php @@ -1,4 +1,4 @@ - + diff --git a/models/d.comments.php b/models/d.comments.php index 6d78292..c04711b 100644 --- a/models/d.comments.php +++ b/models/d.comments.php @@ -200,5 +200,3 @@ class Comments } } } - -?> diff --git a/models/d.locales.php b/models/d.locales.php index 546d635..c052583 100755 --- a/models/d.locales.php +++ b/models/d.locales.php @@ -1,5 +1,5 @@ diff --git a/models/d.poi.php b/models/d.poi.php index 4888b66..da4b536 100755 --- a/models/d.poi.php +++ b/models/d.poi.php @@ -1,4 +1,4 @@ - + diff --git a/models/d.users.php b/models/d.users.php index 8a1361e..d3ceb40 100755 --- a/models/d.users.php +++ b/models/d.users.php @@ -1,4 +1,4 @@ - + diff --git a/models/d.wiki.php b/models/d.wiki.php index e86c048..1f85de0 100755 --- a/models/d.wiki.php +++ b/models/d.wiki.php @@ -1,4 +1,4 @@ - + diff --git a/third/Md/Markdown.php b/third/Md/Markdown.php index 43b3c79..7cbd2f9 100755 --- a/third/Md/Markdown.php +++ b/third/Md/Markdown.php @@ -456,7 +456,7 @@ class Markdown implements MarkdownInterface { [ ]* (?=\n{2,}|\Z) # followed by a blank line or end of document - | # PHP and ASP-style processor instructions ( and <%) + | # PHP and ASP-style processor instructions ( - if (isset($head['css'])) { + - } + - } ?> + - if (isset($head['third'])) { + - } + - if (isset($head['js'])) { + - } + - if (isset($head['title'])) { ?> +
+"; } ?>
- $i=0; + tmp/=$backup_filename[$i]?>' target='_blank'> Télécharger le fichier "=$backup_filename[$i]?>"
- } else { ?> + Fichier =$file?> non généré - } +
Archives des anciennes sauvegardes
+"; } ?>
+ ";
}
@@ -35,7 +35,7 @@ $( "#logfile" ).change(function() {
});
- include('blocks/d.footer.html'); ?>
+
\ No newline at end of file
diff --git a/views/d.admin.stats.html b/views/d.admin.stats.html
index 9467309..47c860c 100644
--- a/views/d.admin.stats.html
+++ b/views/d.admin.stats.html
@@ -1,27 +1,27 @@
- include('blocks/d.head.html'); ?>
+
- include('blocks/d.nav.html'); ?>
+
=$head['title']?>
-
+
- if (file_exists($report)) { ?>
+
tmp/report.html' target='_blank'> Voir le rapport
- } else { ?>
+
Echec de la commande
- } ?>
+
- include('blocks/d.footer.html'); ?>
+
\ No newline at end of file
diff --git a/views/d.admin.wiki-files.html b/views/d.admin.wiki-files.html
index 5f85cee..eb8f419 100755
--- a/views/d.admin.wiki-files.html
+++ b/views/d.admin.wiki-files.html
@@ -1,11 +1,11 @@
- include('blocks/d.head.html'); ?>
+
- include('blocks/d.nav.html'); ?>
+
=$head['title']?>
@@ -42,34 +42,34 @@
Date de création
=$orderby=='creation_date'?$order=='ASC'?'':'':''?>
- if ($user->rankIsHigher("administrator")) { ?>
+ rankIsHigher("administrator")) { ?>
Suppression
- } ?>
+
- foreach (array_slice($files, $first-1, $rows_per_pages, true) as $file) { ?>
+
=$file['name']?>
'> =$file['type']?>
=formatBytes($file['size'], $user->locale)?>
- echo datefmt_format($user->date_format,date_create($file['creation_date'], new DateTimeZone("UTC"))) ?>
- if ($user->rankIsHigher("administrator")) { ?>
+ date_format,date_create($file['creation_date'], new DateTimeZone("UTC"))) ?>
+ rankIsHigher("administrator")) { ?>
- } ?>
+
- } ?>
+
- include('blocks/d.footer.html'); ?>
+
\ No newline at end of file
diff --git a/views/d.blog.edit.html b/views/d.blog.edit.html
index 98c5882..d69f197 100755
--- a/views/d.blog.edit.html
+++ b/views/d.blog.edit.html
@@ -1,47 +1,47 @@
- include('blocks/d.head.html'); ?>
+
- include('blocks/d.nav.html'); ?>
+
- if(isset($new) AND $new==1) { ?>
+