From f7d11e59394fb183611e8f493dc0e36a15bc457d Mon Sep 17 00:00:00 2001 From: tofulm Date: Tue, 17 Dec 2019 22:19:19 +0100 Subject: [PATCH] correction --- base/blocklog.php | 7 +------ blocklog_autorisations.php | 7 ------- inc/blocklog.php | 15 ++++++++++----- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/base/blocklog.php b/base/blocklog.php index 8b937db..77c47a0 100644 --- a/base/blocklog.php +++ b/base/blocklog.php @@ -55,14 +55,9 @@ function blocklog_declarer_tables_objets_sql($tables) { 'key' => array( 'PRIMARY KEY' => 'id_blocklog', ), - //'titre' => '"" AS titre, "" AS lang', - #'date' => '', + 'champs_editables' => array('num', 'blockchaine', 'chaine'), - 'champs_versionnes' => array('num', 'blockchaine', 'chaine'), - 'rechercher_champs' => array(), 'tables_jointures' => array('spip_blocklogs_liens'), - - ); return $tables; diff --git a/blocklog_autorisations.php b/blocklog_autorisations.php index 2ab1765..5a333d2 100644 --- a/blocklog_autorisations.php +++ b/blocklog_autorisations.php @@ -20,13 +20,6 @@ if (!defined('_ECRIRE_INC_VERSION')) { function blocklog_autoriser() { } -function autoriser_connecte_etre($faire, $type, $id, $qui, $opt) { - if ($qui['id_auteur'] > 0) { - return true; - } - return false; -} - // ----------------- // Objet blocklogs diff --git a/inc/blocklog.php b/inc/blocklog.php index 3e629e2..e58bbd1 100644 --- a/inc/blocklog.php +++ b/inc/blocklog.php @@ -12,7 +12,7 @@ if (!defined('_ECRIRE_INC_VERSION')){ * @param string | array $chaine : ensemble des valeurs utilisées pour creer la chaine * @return array [id_blocklog, chaine, blockchaine] */ -function inc_blocklog_dist($objet, $id_objet, $chaine) { +function inc_blocklog_dist($objet, $id_objet, $num, $chaine) { if (!$objet or !$id_objet or !$chaine) { return false; } @@ -26,19 +26,24 @@ function inc_blocklog_dist($objet, $id_objet, $chaine) { $date = date_create(); $chaine .= "|". date_timestamp_get($date); + $chaine = hash(_BACKLOG_ALGO, $chaine); - $chaine = hash(_BACKLOG_ALGO, $chaine); - $blockchaine = sql_getfetsel('blockchaine', 'spip_blocklogs',1,'', 'id_blocklog DESC', '1'); + $blockchaine = sql_getfetsel('blockchaine', 'spip_blocklogs',1,'', 'id_blocklog DESC', '1'); + $blockchaine .= "|" . $blockchaine; + $blockchaine = hash(_BACKLOG_ALGO, $blockchaine); - include_spip('action/editer_objet'); $set = array ( 'blockchaine' => $blockchaine, 'chaine' => $chaine, + 'num' => intval($num) ); - $id_blocklog = objet_inserer($objet); + + include_spip('action/editer_objet'); + $id_blocklog = objet_inserer("blocklog"); objet_modifier("blocklog", $id_blocklog, $set); $set['id_blocklog'] = $id_blocklog; + include_spip('action/editer_liens'); $objets_source = array("blocklog"=>$id_blocklog); $objets_lies = array($objet => $id_objet);