leo
/
kabano
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix blog view page

This commit is contained in:
Léo Serre 2018-11-05 22:05:42 +01:00
parent 9aa7498db7
commit 7a29f0825f
3 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controllers/d.blog.php
View File

@ -120,14 +120,6 @@ switch ($controller->splitted_url[1]) {
if($user->rankIsHigher("premium")) { if($user->rankIsHigher("premium")) {
$blogArticles_history = new Kabano\BlogArticles(); $blogArticles_history = new Kabano\BlogArticles();
$blogArticles_history->getHistory($controller->splitted_url[1]); $blogArticles_history->getHistory($controller->splitted_url[1]);
$i = 0;
foreach ($blogArticles_history->ids as $row) {
$blogArticles_history_list[$i] = new Kabano\BlogArticle();
$blogArticles_history_list[$i]->id = $row;
$blogArticles_history_list[$i]->populate();
$i++;
}
} }
if (isset($controller->splitted_url[2]) && is_numeric($controller->splitted_url[2])) 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]); $blogArticle->checkPermalink($controller->splitted_url[1],$user->rankIsHigher("premium"),$controller->splitted_url[2]);
@ -166,11 +158,10 @@ switch ($controller->splitted_url[1]) {
} }
} }
$blogArticle->populate();
$blogArticle->md2html(); $blogArticle->md2html();
// Manage comments // Manage comments
if ($blogArticle->comments == "t") { if ($blogArticle->is_commentable == "t") {
$blogArticles_comments = new Kabano\BlogComments(); $blogArticles_comments = new Kabano\BlogComments();
$blogArticles_comments->listComments($blogArticle->id, ($user->rankIsHigher("premium"))); $blogArticles_comments->listComments($blogArticle->id, ($user->rankIsHigher("premium")));
@ -189,12 +180,11 @@ switch ($controller->splitted_url[1]) {
$tempUser = new Kabano\User(); $tempUser = new Kabano\User();
$tempUser->id = $blogArticle->author; $tempUser->checkId($blogArticle->author);
$tempUser->populate();
$blogArticle->author_name = $tempUser->name; $blogArticle->author_name = $tempUser->name;
unset($tempUser); unset($tempUser);
$head['title'] = $blogArticle->title; $head['title'] = $blogArticle->name;
include ($config['views_folder']."d.blog.view.html"); include ($config['views_folder']."d.blog.view.html");
} }
} }

10
models/d.blog.php
View File

@ -271,13 +271,13 @@ class BlogArticles
/***** /*****
** Return the list of archived version of a blog article ** Return the list of archived version of a blog article
*****/ *****/
/* public function getHistory($url) { public function getHistory($url) {
global $config; global $config;
$con = pg_connect("host=".$config['SQL_host']." dbname=".$config['SQL_db']." user=".$config['SQL_user']." password=".$config['SQL_pass']) $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"); or die ("Could not connect to server\n");
$query = "SELECT id FROM blog_articles WHERE url=$1 ORDER BY lastedit DESC"; $query = "SELECT * FROM contents WHERE permalink=$1 AND type='blog' ORDER BY update_date DESC";
pg_prepare($con, "prepare1", $query) pg_prepare($con, "prepare1", $query)
or die ("Cannot prepare statement\n"); or die ("Cannot prepare statement\n");
@ -290,12 +290,12 @@ class BlogArticles
for($i = 0; $i < $this->number; $i++) { for($i = 0; $i < $this->number; $i++) {
$row = pg_fetch_assoc($result, $i); $row = pg_fetch_assoc($result, $i);
$this->ids[$i] = $row['id']; $this->objs[$i] = new BlogArticle;
$this->objs[$i]->populate($row);
} }
}*/ }
} }
/********************************************************** /**********************************************************
*********************************************************** ***********************************************************
** **

49
views/d.blog.view.html
View File

@ -7,9 +7,9 @@
<? include('blocks/d.nav.html'); ?> <? include('blocks/d.nav.html'); ?>
<section id="blog_article" <?=$blogArticle->archive=="t"?'class="archive"':''?>> <section id="blog_article" <?=$blogArticle->is_archive=="t"||$blogArticle->is_public=="f"?'class="archive"':''?>>
<h1><?=$blogArticle->title?>.</h1> <h1><?=$blogArticle->name?>.</h1>
<? if($user->role >= 600) { ?> <? if($user->rankIsHigher("premium")) { ?>
<span class="subtitle"> <span class="subtitle">
<? if(isset($blogArticles_history_list)) { ?> <? if(isset($blogArticles_history_list)) { ?>
<select id="bloghistory"> <select id="bloghistory">
@ -20,14 +20,15 @@
} ?> } ?>
</select> </select>
<? } <? }
if ($user->role >= 800 && isset($blogArticles_history_list)) { ?> if ($user->rankIsHigher("moderator") && isset($blogArticles_history_list)) { ?>
&mdash; &mdash;
<? } <? }
if ($user->role >= 800) { ?> if ($user->rankIsHigher("moderator")) { ?>
<a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/edit"><i class="fa fa-pencil"></i> Éditer l'article</a> <a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/edit"><i class="fas fa-pencil-alt"></i> Éditer l'article</a> &mdash;
<? if ($blogArticle->archive == 'f') { ?> <? if ($blogArticle->is_public == 't') { ?>
&mdash; <a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/delete"><i class="fas fa-trash"></i> Effacer l'article</a>
<a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/delete"><i class="fa fa-trash"></i> Effacer l'article</a> <? } else { ?>
<a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/restore"><i class="fas fa-eye"></i> Restaurer l'article</a>
<? } ?> <? } ?>
<? } ?> <? } ?>
</span> </span>
@ -38,21 +39,21 @@
</div> </div>
<p id="blogTimestamp">Article écrit par <p id="blogTimestamp">Article écrit par
<? if ($user->role > 0) { ?> <? if ($user->rankIsHigher("blocked")) { ?>
<a href="<?=$config['rel_root_folder']?>user/p/<?=$blogArticle->author?>"><?=$blogArticle->author_name?></a> <a href="<?=$config['rel_root_folder']?>user/p/<?=$blogArticle->author?>"><?=$blogArticle->author_name?></a>
<? } <? }
else { ?> else { ?>
<?=$blogArticle->author_name?> <?=$blogArticle->author_name?>
<? } ?> <? } ?>
le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($blogArticle->lastedit)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p> le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($blogArticle->creation_date)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
<!-- COMMENTS --> <!-- COMMENTS -->
<? if ($blogArticle->comments == "t" && $blogArticle->archive == "f") { ?> <? if ($blogArticle->is_commentable == "t" && $blogArticle->is_archive == "f" && $blogArticle->is_public == "t") { ?>
<div id="new_comment"> <div id="new_comment">
<form class="form" action="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/new_comment" method="post"> <form class="form" action="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/new_comment" method="post">
<div id="new_comment_label" <?=$user->role==0?"class='sent' ":""?>> <div id="new_comment_label" <?=$user->rank=="visitor"?"class='sent' ":""?>>
<? if ($user->role > 0) { ?> <? if ($user->rankIsHigher("registered")) { ?>
<input name="submit" type="submit" value="Envoyer"> <input name="submit" type="submit" value="Envoyer">
<p>Ajouter un nouveau commentaire</p> <p>Ajouter un nouveau commentaire</p>
<? } else { ?> <? } else { ?>
@ -73,19 +74,19 @@
<? if ($row->author_obj->avatar=='t') { ?> <? if ($row->author_obj->avatar=='t') { ?>
<img alt="Avatar" class="icon avatar" src="<?=$config['rel_root_folder']?>medias/avatars/<?=$row->author_obj->id?>_s.jpg"> <img alt="Avatar" class="icon avatar" src="<?=$config['rel_root_folder']?>medias/avatars/<?=$row->author_obj->id?>_s.jpg">
<? } else { ?> <? } else { ?>
<i class="icon fa fa-user-secret"></i> <i class="icon fas fa-user-secret"></i>
<? } ?> <? } ?>
<? if ($user->role > 0) { ?> <? if ($user->rankIsHigher("blocked")) { ?>
<a class="username" href="<?=$config['rel_root_folder']?>user/p/<?=$row->author_obj->id?>"><?=$row->author_obj->name?></a> <a class="username" href="<?=$config['rel_root_folder']?>user/p/<?=$row->author_obj->id?>"><?=$row->author_obj->name?></a>
<? } else { ?> <? } else { ?>
<?=$row->author_obj->name?> <?=$row->author_obj->name?>
<? } ?> <? } ?>
le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($row->lastedit)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small> le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($row->lastedit)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small>
<? if (($user->role >= 800 || $user->id == $row->author) && $row->archive == 'f') { ?> <? if (($user->rankIsHigher("moderator") || $user->id == $row->author) && $row->archive == 'f') { ?>
<span class="delete_link"><a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/delete_comment/<?=$row->id?>"><i class="fa fa-trash"></i> Effacer le commentaire</a></span> <span class="delete_link"><a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/delete_comment/<?=$row->id?>"><i class="fas fa-trash"></i> Effacer le commentaire</a></span>
<? } ?> <? } ?>
<? if (($user->role >= 800 || $user->id == $row->author) && $row->archive == 't') { ?> <? if (($user->rankIsHigher("moderator") || $user->id == $row->author) && $row->archive == 't') { ?>
<span class="delete_link"><a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/undelete_comment/<?=$row->id?>"><i class="fa fa-eye"></i> Réafficher le commentaire</a></span> <span class="delete_link"><a href="<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/undelete_comment/<?=$row->id?>"><i class="fas fa-eye"></i> Réafficher le commentaire</a></span>
<? } ?> <? } ?>
</div> </div>
<div class="comment_content"> <div class="comment_content">
@ -102,14 +103,14 @@
<div style="clear: both;"> </div> <div style="clear: both;"> </div>
</section> </section>
<? if($user->role >= 600) { ?> <? if($user->rankIsHigher("premium")) { ?>
<script type="text/javascript"> <script type="text/javascript">
$( "#bloghistory" ).change(function() { $( "#bloghistory" ).change(function() {
window.location.href = "<?=$config['rel_root_folder']?>blog/<?=$blogArticle->url?>/"+$( this ).val(); window.location.href = "<?=$config['rel_root_folder']?>blog/<?=$blogArticle->permalink?>/"+$( this ).val();
}); });
</script> </script>
<? } ?> <? } ?>
<? if($user->role > 0) { ?> <? if($user->rankIsHigher("registered")) { ?>
<script type="text/javascript"> <script type="text/javascript">
$( "#new_comment_label" ).click(function() { $( "#new_comment_label" ).click(function() {
$( "#new_comment_form" ).show(400); $( "#new_comment_form" ).show(400);