--- rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz11430-plugins.patch	2022/12/07 20:06:53	1.1
+++ rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz11430-plugins.patch	2022/12/10 06:38:43	1.3
@@ -18,7 +18,7 @@ diff -Nur --no-dereference smeserver-rou
 -#        $plugins = $plugins.',managesieve';
 -#        $cdb->set_prop('roundcube','PluginsList',"$plugins");
 -#        }
-+sieverule is now used instead of 
++#sieverule is now used instead of 
 +if ($plugins !~ 'managesieve')
 +        {
 +        $plugins = $plugins.',managesieve';
@@ -81,11 +81,35 @@ diff -Nur --no-dereference smeserver-rou
 +/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/share/roundcubemail/composer.phar self-update
-+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/share/roundcubemail/composer.phar update
++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