From ede83cec7314b8458ac7fc78a61a8989f2821948 Mon Sep 17 00:00:00 2001 From: leosw Date: Tue, 30 Oct 2018 21:29:46 +0100 Subject: [PATCH] Add restore function in wiki --- controllers/d.wiki.php | 4 ++++ models/d.wiki.php | 29 +++++++++++++++++++++++++++-- views/d.wiki.view.html | 11 ++++++----- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/controllers/d.wiki.php b/controllers/d.wiki.php index c8e7cdc..63b27f6 100755 --- a/controllers/d.wiki.php +++ b/controllers/d.wiki.php @@ -54,6 +54,10 @@ else if(isset($controller->splitted_url[1]) && $wikiPage->checkPermalink($contro // Delete page $wikiPage->delete(); header('Location: '.$config['rel_root_folder']."wiki/".$wikiPage->permalink); + } else if (isset($controller->splitted_url[2]) && $controller->splitted_url[2]=="restore" && $user->rankIsHigher('moderator')) { + // Restore page + $wikiPage->restore(); + header('Location: '.$config['rel_root_folder']."wiki/".$wikiPage->permalink); } else { // Display page if($user->rankIsHigher('premium')) { diff --git a/models/d.wiki.php b/models/d.wiki.php index e59a33a..72b36b6 100755 --- a/models/d.wiki.php +++ b/models/d.wiki.php @@ -125,7 +125,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 = "UPDATE contents SET is_archive = TRUE WHERE permalink = $1 AND type='wiki'"; + $query = "UPDATE contents SET is_public=FALSE WHERE permalink=$1 AND type='wiki'"; pg_prepare($con, "prepare1", $query) or die ("Cannot prepare statement\n"); @@ -135,7 +135,32 @@ class WikiPage pg_close($con); error_log( - date('r')." \t".$user->name." (".$user->id.") \tDELETE \tArchive wiki page '".$this->permalink."'\r\n", + date('r')." \t".$user->name." (".$user->id.") \tDELETE \tUnpublish wiki page '".$this->permalink."'\r\n", + 3, + $config['logs_folder'].'wiki.log'); + } + + /***** + ** Restore a page from unpublishing it + *****/ + public function restore() { + 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"); + + $query = "UPDATE contents SET is_public=TRUE WHERE permalink=$1 AND type='wiki'"; + + pg_prepare($con, "prepare1", $query) + or die ("Cannot prepare statement\n"); + $result = pg_execute($con, "prepare1", array($this->permalink)) + or die ("Cannot execute statement\n"); + + pg_close($con); + + error_log( + date('r')." \t".$user->name." (".$user->id.") \tRESTORE \tPublish wiki page '".$this->permalink."'\r\n", 3, $config['logs_folder'].'wiki.log'); } diff --git a/views/d.wiki.view.html b/views/d.wiki.view.html index 4ec9e10..803c689 100755 --- a/views/d.wiki.view.html +++ b/views/d.wiki.view.html @@ -7,7 +7,7 @@ -
is_archive=="t"?'class="archive"':''?>> +
is_archive=="t"||$wikiPage->is_public=="f"?'class="archive"':''?>>

name?>.

rankIsHigher('premium')) { ?> @@ -24,11 +24,12 @@ — rankIsHigher('moderator')) { ?> - Éditer la page - is_archive=="f") { ?> - — + Éditer la page — + is_public=="t") { ?> Effacer la page - + + Restaurer la page +