diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList --- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList 2022-12-07 14:10:48.098000000 -0500 +++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList 2022-12-07 14:42:32.886000000 -0500 @@ -1 +1 @@ -globaladdressbook,contextmenu,markasjunk2,vcard_attachments,newmail_notifier,emoticons,sieverules +globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration --- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration 2022-12-07 14:10:48.098000000 -0500 +++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration 2022-12-07 14:45:58.551000000 -0500 @@ -6,13 +6,25 @@ return unless ($plugins ne ''); -#sieverule is now used instead of -# if ($plugins !~ 'managesieve') -# -# { -# $plugins = $plugins.',managesieve'; -# $cdb->set_prop('roundcube','PluginsList',"$plugins"); -# } +#sieverule is now used instead of +if ($plugins !~ 'managesieve') + { + $plugins = $plugins.',managesieve'; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } +# sieverule deprecated + if ($plugins =~ 'sieverule') + { + $plugins =~ s/,sieverule//g; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } + +# markasjunk2 deprecated + if ($plugins =~ 'markasjunk') + { + $plugins =~ s/markasjunk2/markasjunk/g; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } #Carddav is a really bad plugin, when available it will become usefull if ($plugins =~ 'carddav') diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2022-12-07 14:10:48.114000000 -0500 +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2022-12-07 15:05:38.021000000 -0500 @@ -9,12 +9,17 @@ //Then issue //signal-event conf-roundcube or signal-event roundcube-update -//The default list is : globaladdressbook,calendar,libcalendaring,contextmenu,markasjunk2,vcard_attachments,newmail_notifier,emoticons,tasklist +//The default list is : globaladdressbook,calendar,libcalendaring,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve { use esmith::ConfigDB; my $DB = esmith::ConfigDB->open_ro; my $plugins = $DB->get_prop('roundcube','PluginsList') || ""; my @plugs = split(',',$plugins); + my @plugd ; + for my $p (@plugs) { + push @plugd, $p if -d "/usr/share/roundcubemail/plugins/$p"; + } + @plugs=@plugd; s/^(.*)$/"\1"/ for @plugs; $plugins = join(',',@plugs); $OUT .= "\$config['plugins'] = array($plugins);"; diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh --- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2015-04-01 20:05:54.000000000 -0400 +++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh 2022-12-07 14:22:15.296000000 -0500 @@ -3,11 +3,17 @@ /sbin/e-smith/expand-template /etc/php.ini /etc/init.d/httpd-e-smith restart >/dev/null 2>&1 pathroundcube=$(pwd) + cd /usr/share/roundcubemail -php /usr/share/roundcubemail/composer.phar self-update -php /usr/share/roundcubemail/composer.phar update -/sbin/e-smith/db configuration setprop php AllowUrlFopen off -/sbin/e-smith/expand-template /etc/php.ini -/etc/init.d/httpd-e-smith restart >/dev/null 2>&1 +# add needed ones +/usr/bin/jq -r ".require.\"johndoh/contextmenu\" = \"~3.3.1\"" composer.json > tmp.json && mv -f tmp.json composer.json +/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json + + +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer self-update +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer update +/sbin/e-smith/db configuration setprop php74 AllowUrlFopen off +/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini +/usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1 cd $pathroundcube Les fichiers binaires smeserver-roundcube-1.2.old/root/usr/share/roundcubemail/composer.phar et smeserver-roundcube-1.2/root/usr/share/roundcubemail/composer.phar sont différents diff -Nur --no-dereference smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks --- smeserver-roundcube-1.2.old/createlinks 2022-12-10 00:44:47.059000000 -0500 +++ smeserver-roundcube-1.2/createlinks 2022-12-10 00:53:13.496000000 -0500 @@ -36,7 +36,6 @@ )) { templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event); - templates2events("/usr/share/roundcubemail/plugins/sieverules/config.inc.php", $event); templates2events("/etc/roundcubemail/config.inc.php", $event); templates2events("/etc/e-smith/sql/init/80roundcube", $event); } diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES 2015-04-01 20:05:54.000000000 -0400 +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES 2022-12-10 01:10:36.082000000 -0500 @@ -6,7 +6,8 @@ $config['default_charset'] = 'ISO-8859-1'; // skin name: folder from skins/ -$config['skin'] = 'larry'; +$config['skin'] = '{ # for 1.5 we use larry and classic, elastic are vailable, for 1.6 only elastic is available. +$OUT = (-d "/usr/share/roundcubemail/skins/larry") ? "larry" : "elastic"}'; // Enables using standard browser windows (that can be handled as tabs) // instead of popup windows diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh --- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2022-12-11 16:07:13.382000000 -0500 +++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh 2022-12-11 16:08:04.034000000 -0500 @@ -5,13 +5,13 @@ pathroundcube=$(pwd) cd /usr/share/roundcubemail -# add needed ones -/usr/bin/jq -r ".require.\"johndoh/contextmenu\" = \"~3.3.1\"" composer.json > tmp.json && mv -f tmp.json composer.json -/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer require johndoh/contextmenu --with-dependencies +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer require johndoh/globaladdressbook ~2.1 --with-dependencies +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer require roundcube/larry ~1.6.0 --with-dependencies COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer self-update -COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer update +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer update --with-dependencies /sbin/e-smith/db configuration setprop php74 AllowUrlFopen off /sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini /usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1