diff --git a/formulaires/editer_rssarticle.php b/formulaires/editer_rssarticle.php index 5062ed0..8a21ce2 100644 --- a/formulaires/editer_rssarticle.php +++ b/formulaires/editer_rssarticle.php @@ -17,8 +17,9 @@ function formulaires_editer_rssarticle_charger_dist($id_syndic='new', $retour='' $valeurs['id_syndic'] = $id_syndic; $valeurs['editable'] = true; - if (!autoriser('modifier', 'syndic', $id_syndic)) + if (!autoriser('modifier', 'syndic', $id_syndic)) { $valeurs['editable'] = false; + } return $valeurs; } diff --git a/paquet.xml b/paquet.xml index 4280e0b..65cf8f1 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,20 +1,22 @@ Flux RSS en articles erational LudoRA - GNU/GPL v3 + GPL 3 + + diff --git a/rssarticle_administrations.php b/rssarticle_administrations.php index da76913..7b3a5b1 100644 --- a/rssarticle_administrations.php +++ b/rssarticle_administrations.php @@ -4,58 +4,31 @@ if (!defined('_ECRIRE_INC_VERSION')) { return; } -$GLOBALS['rssarticle_base_version'] = 0.3; - -function rssarticle_upgrade(){ - $version_base = $GLOBALS['rssarticle_base_version']; - $current_version = 0.0; - if ((!isset($GLOBALS['meta']['rssarticle_base_version']) ) - || (($current_version = $GLOBALS['meta']['rssarticle_base_version'])!=$version_base)){ - include_spip('base/rssarticle'); - if ($current_version==0.0){ - include_spip('base/create'); - include_spip('base/abstract_sql'); - creer_base(); - maj_tables('spip_syndic'); - echo "

"._T('rssarticle:install_rssarticle')."

"; - ecrire_meta('rssarticle_base_version',$current_version=$version_base,'non'); - } - - if (version_compare($current_version,"0.3","<")){ - include_spip('base/create'); - maj_tables('spip_syndic'); - echo "

"._T('rssarticle:mise_a_jour_v03')."

"; - ecrire_meta('rssarticle_base_version',$current_version="0.3",'non'); - } - ecrire_metas(); - } -} +/** + * Installation/maj du plugin rssarticle + * + * @param string $nom_meta_base_version + * @param string $version_cible + */ +function rssarticle_upgrade($nom_meta_base_version, $version_cible) { + $maj = array(); + $maj['create'] = array( + array('sql_alter', 'TABLE spip_syndic ADD rssarticle varchar(3) DEFAULT "non" NOT NULL'), + ); -function rssarticle_install($action){ - $version_base = $GLOBALS['rssarticle_base_version']; - switch ($action){ - case 'test': - return (isset($GLOBALS['meta']['rssarticle_base_version']) AND ($GLOBALS['meta']['rssarticle_base_version']>=$version_base)); - break; - case 'install': - rssarticle_upgrade(); - break; - case 'uninstall': - rssarticle_vider_tables(); - break; - } + include_spip('base/upgrade'); + maj_plugin($nom_meta_base_version, $version_cible, $maj); } /** - * Desinstallation du plugin + * Desinstallation du plugin rssarticle * * @param string $nom_meta_base_version */ -function rssarticle_vider_tables() { - sql_alter("TABLE spip_syndic DROP rssarticle"); - spip_query("DROP TABLE spip_articles_syndic"); - effacer_meta('rssarticle_base_version'); - ecrire_metas(); +function rssarticle_vider_tables($nom_meta_base_version) { + sql_alter("TABLE spip_syndic DROP COLUMN rssarticle"); + effacer_meta($nom_meta_base_version); } +