From d2a2b183088abe76cc988724b310a40cb948f16e Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sat, 30 Oct 2021 00:59:40 +0200 Subject: [PATCH] clean up install file --- _install.php | 72 ++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/_install.php b/_install.php index a7b7930..0aab9b1 100644 --- a/_install.php +++ b/_install.php @@ -12,57 +12,45 @@ */ if (!defined('DC_CONTEXT_ADMIN')) { - return null; } +$new_version = $core->plugins->moduleInfo('postWidgetText', 'version'); +$old_version = $core->getVersion('postWidgetText'); + +if (version_compare($old_version, $new_version, '>=')) { + return; +} + try { - # Check module version - if (version_compare( - $core->getVersion('postWidgetText'), - $core->plugins->moduleInfo('postWidgetText', 'version'), - '>=' - )) { - - return null; - } - - # Check Dotclear version - if (!method_exists('dcUtils', 'versionsCompare') - || dcUtils::versionsCompare(DC_VERSION, '2.6', '<', false)) { - throw new Exception(sprintf( - '%s requires Dotclear %s', 'postWidgetText', '2.6' - )); - } - # Table is the same for plugins # pollsFactory, postTask, postWidgetText - $s = new dbStruct($core->con,$core->prefix); + $s = new dbStruct($core->con, $core->prefix); $s->post_option - ->option_id ('bigint',0,false) - ->post_id ('bigint',0,false) - ->option_creadt ('timestamp',0,false,'now()') - ->option_upddt ('timestamp',0,false,'now()') - ->option_type ('varchar',32,false,"''") - ->option_format ('varchar',32,false,"'xhtml'") - ->option_lang ('varchar',5,true,null) - ->option_title ('varchar',255,true,null) - ->option_content ('text',0,true,null) - ->option_content_xhtml ('text',0,false) + ->option_id ('bigint', 0, false) + ->post_id ('bigint', 0, false) + ->option_creadt ('timestamp', 0, false, 'now()') + ->option_upddt ('timestamp', 0, false, 'now()') + ->option_type ('varchar', 32, false, "''") + ->option_format ('varchar', 32, false, "'xhtml'") + ->option_lang ('varchar', 5, true, null) + ->option_title ('varchar', 255, true, null) + ->option_content ('text', 0, true, null) + ->option_content_xhtml ('text', 0, false) - ->index('idx_post_option_option','btree','option_id') - ->index('idx_post_option_post','btree','post_id') - ->index('idx_post_option_type','btree','option_type'); + ->index('idx_post_option_option', 'btree', 'option_id') + ->index('idx_post_option_post', 'btree', 'post_id') + ->index('idx_post_option_type', 'btree', 'option_type'); - $si = new dbStruct($core->con,$core->prefix); + $si = new dbStruct($core->con, $core->prefix); $changes = $si->synchronize($s); # Settings $core->blog->settings->addNamespace('postwidgettext'); $core->blog->settings->postwidgettext->put('postwidgettext_active', - true,'boolean','post widget text plugin enabled',false,true); + true, 'boolean', 'post widget text plugin enabled', false, true); $core->blog->settings->postwidgettext->put('postwidgettext_importexport_active', - true,'boolean','activate import/export behaviors',false,true); + true, 'boolean', 'activate import/export behaviors', false, true); # Transfert records from old table to the new one if ($core->getVersion('postWidgetText') !== null @@ -72,15 +60,11 @@ try { } # Set module version - $core->setVersion( - 'postWidgetText', - $core->plugins->moduleInfo('postWidgetText', 'version') - ); + $core->setVersion('postWidgetText', $new_version); return true; -} -catch (Exception $e) { +} catch (Exception $e) { $core->error->add($e->getMessage()); +} - return false; -} \ No newline at end of file +return false; \ No newline at end of file