SPIP/BlockLog
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

correction sur l'objet blocklog, c'est bien on objet spip et non une table de lien

Browse source
This commit is contained in:
Christophe 2020-10-07 15:42:40 +02:00
parent 665c1733ec
commit 160fb0f0b3
5 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/blocklog.php
View file

@ -55,10 +55,7 @@ function blocklog_declarer_tables_objets_sql($tables) {
'maj' => 'TIMESTAMP' 'maj' => 'TIMESTAMP'
), ),
'key' => array( 'key' => array(
'PRIMARY KEY' => 'id_blocklog,id_objet,objet', 'PRIMARY KEY' => 'id_blocklog',
'KEY id_blocklog' => 'id_blocklog',
'KEY id_objet' => 'id_objet',
'KEY objet' => 'objet'
), ),
'champs_editables' => array('num', 'blockchaine', 'chaine','id_objet', 'objet'), 'champs_editables' => array('num', 'blockchaine', 'chaine','id_objet', 'objet'),
); );

14
blocklog_administrations.php
View file

@ -27,7 +27,7 @@ function blocklog_upgrade($nom_meta_base_version, $version_cible) {
$maj = array(); $maj = array();
$maj['create'] = array(array('maj_tables', array('spip_blocklogs'))); $maj['create'] = array(array('maj_tables', array('spip_blocklogs')));
$maj['1.0.1'] = array(array('maj_tables', array('spip_blocklogs'))); $maj['1.0.2'] = array(array('maj_tables', array('spip_blocklogs')));
include_spip('base/upgrade'); include_spip('base/upgrade');
maj_plugin($nom_meta_base_version, $version_cible, $maj); maj_plugin($nom_meta_base_version, $version_cible, $maj);
@ -43,17 +43,5 @@ function blocklog_upgrade($nom_meta_base_version, $version_cible) {
**/ **/
function blocklog_vider_tables($nom_meta_base_version) { function blocklog_vider_tables($nom_meta_base_version) {
sql_drop_table('spip_blocklogs');
sql_drop_table('spip_blocklogs_liens');
# Nettoyer les liens courants (le génie optimiser_base_disparus se chargera de nettoyer toutes les tables de liens)
sql_delete('spip_documents_liens', sql_in('objet', array('blocklog')));
sql_delete('spip_mots_liens', sql_in('objet', array('blocklog')));
sql_delete('spip_auteurs_liens', sql_in('objet', array('blocklog')));
# Nettoyer les versionnages et forums
sql_delete('spip_versions', sql_in('objet', array('blocklog')));
sql_delete('spip_versions_fragments', sql_in('objet', array('blocklog')));
sql_delete('spip_forum', sql_in('objet', array('blocklog')));
effacer_meta($nom_meta_base_version); effacer_meta($nom_meta_base_version);
} }

3
blocklog_fonctions.php
View file

@ -118,6 +118,9 @@ function blocklog_verifier_blockchaines($objet, $date_debut = '', $date_fin = ''
} }
} }
} }
var_dump($retour);
die;
return $retour; return $retour;
} }

4
inc/blocklog.php
View file

@ -68,8 +68,8 @@ function inc_blocklog_dist($objet, $id_objet = 0, $num = 0, $chaine = '') {
include_spip('action/editer_objet'); include_spip('action/editer_objet');
set_request('id_auteur', null); set_request('id_auteur', null);
$r = objet_inserer("blocklog", null, $set); $r = objet_inserer("blocklog", null, $set);
if (!$r) { if (!intval($r)) {
spip_log("la blockchaine pour $objet / $id_objet existe deja", 'blocklog'._LOG_ERREUR); spip_log("la blockchaine pour $objet / $id_objet ne pas pas etre inserer en bdd", 'blocklog'._LOG_ERREUR);
} }
return $r; return $r;

4
paquet.xml
View file

@ -1,12 +1,12 @@
<paquet <paquet
prefix="blocklog" prefix="blocklog"
categorie="outil" categorie="outil"
version="1.1.0" version="1.1.1"
etat="dev" etat="dev"
compatibilite="[3.2.0;3.3.*]" compatibilite="[3.2.0;3.3.*]"
logo="prive/themes/spip/images/blocklog-64.png" logo="prive/themes/spip/images/blocklog-64.png"
documentation="" documentation=""
schema="1.0.1" schema="1.0.2"
> >
<nom>Block Log</nom> <nom>Block Log</nom>