smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch

diff -Nur --no-dereference smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks
--- smeserver-roundcube-1.2.old/createlinks     2024-02-24 09:22:05.481000000 -0500
+++ smeserver-roundcube-1.2/createlinks 2024-02-24 17:35:58.066000000 -0500
@@ -8,7 +8,7 @@
 #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
 
 foreach my $file (qw(
-                /etc/systemd/system-preset/49-koozali.preset
+        /etc/systemd/system-preset/49-koozali.preset
 ))
 {
     templates2events( $file, $event );
@@ -36,8 +36,10 @@
     ))
 {
     templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event);
+    templates2events("/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php", $event);
     templates2events("/etc/roundcubemail/config.inc.php", $event);
     templates2events("/etc/e-smith/sql/init/80roundcube", $event);
+
 }
 
 #restart specific services to avoid to reboot after the installation
@@ -47,8 +49,10 @@
     roundcube-update
     ))
 {
+    templates2events("/etc/opt/remi/php81/php-fpm.d/www.conf",$event);
     templates2events("/etc/httpd/conf/httpd.conf", $event);
     templates2events("/etc/dovecot/dovecot.conf", $event);
+    safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/php81-php-fpm");
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
     safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dovecot");
@@ -64,6 +68,7 @@
    ))
 {
     event_link("qmail-update-user", $event, "20");
+    event_link("roundcube-conf", $event, "03");
 }
 safe_symlink("/usr/share/php/Net/LDAP3","root/usr/share/pear/Net/LDAP3");
 safe_symlink("/usr/share/php/Net/LDAP3.php","root/usr/share/pear/Net/LDAP3.php");
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/access smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/access
--- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/access     1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/access 2024-02-24 11:59:38.299000000 -0500
@@ -0,0 +1 @@
+public
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        2024-02-24 09:22:05.478000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList    2024-02-24 11:31:22.111000000 -0500
@@ -1 +1 @@
-globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve
+globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve,nextcloud_attachments
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PublicAccess smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PublicAccess
--- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PublicAccess       2015-04-01 20:05:54.000000000 -0400
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PublicAccess   1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-global
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube
--- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube   2015-04-01 20:05:54.000000000 -0400
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube       2024-02-24 11:45:39.162000000 -0500
@@ -3,6 +3,15 @@
 
     my $rec = $DB->get('roundcube') || $DB->new_record('roundcube', {type => 'service'});
 
+# migrate PublicAccess to access
+    if ( my $PublicAccess = $DB->get_prop_and_delete('roundcube','PublicAccess') ) {
+       $DB->set_prop('roundcube','access', "private");
+       $DB->set_prop('roundcube','access', "public") if ($PublicAccess =~ /global/);
+       $DB->set_prop('roundcube','status', "disabled") if ($PublicAccess == "none");
+   }
+
+
+
     my $pw = $rec->prop('DbPassword');
     return "" if $pw;
 
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 2024-02-24 09:22:05.479000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration     2024-02-24 11:31:03.956000000 -0500
@@ -6,6 +6,12 @@
 
     return unless ($plugins ne '');
 
+#nextcloud_attachements is used
+if ($plugins !~ 'nextcloud_attachments')
+        {
+        $plugins = $plugins.',nextcloud_attachments';
+        $cdb->set_prop('roundcube','PluginsList',"$plugins");
+        }
 #sieverule is now used instead of 
 if ($plugins !~ 'managesieve')
         {
@@ -18,35 +24,30 @@
         $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')
         {
         $plugins =~ s/,carddav//g;
         $cdb->set_prop('roundcube','PluginsList',"$plugins");
         }
-
 #remove calendar
    if ($plugins =~ 'calendar')
         {
         $plugins =~ s/,calendar//g;
         $cdb->set_prop('roundcube','PluginsList',"$plugins");
         }
-
 #remove libcalendaring
    if ($plugins =~ 'libcalendaring')
         {
         $plugins =~ s/,libcalendaring//g;
         $cdb->set_prop('roundcube','PluginsList',"$plugins");
         }
-
 #remove tasklist
    if ($plugins =~ 'tasklist')
         {
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/events/actions/roundcube-conf smeserver-roundcube-1.2/root/etc/e-smith/events/actions/roundcube-conf
--- smeserver-roundcube-1.2.old/root/etc/e-smith/events/actions/roundcube-conf  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/events/actions/roundcube-conf      2024-02-24 12:23:40.761000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/rcplugin_update.sh
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2024-02-24 09:22:05.466000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2024-02-24 11:53:20.478000000 -0500
@@ -4,49 +4,17 @@
             unless $status eq 'enabled';
 
     $OUT = "";
-    my $allow = 'all granted';
-    my $pass = '0';
+    my $allow = "ip $localAccess";
     my $satisfy = 'all';
     my $name = $roundcube{'Name'} || 'RoundCube IMAP Client';
+    my $version = 81; # php version to use
     
     for ('exit-if-none')
     {
-      if ($roundcube{'PublicAccess'})
+      if ( (exists($roundcube{'access'})  &&  ($roundcube{'access'} eq 'public') )
       {
-          if ($roundcube{'PublicAccess'} eq 'none')
-          {
-           next;
-          }
-          elsif ($roundcube{'PublicAccess'} eq 'local')
-          {
-            $allow   = "ip $localAccess";
-            $pass    = 0;
-            $satisfy = 'all';
-          }
-          elsif ($roundcube{'PublicAccess'} eq 'local-pw')
-          {
-            $allow   = "ip $localAccess";
-            $pass    = 1;
-            $satisfy = 'all';
-          }
-          elsif ($roundcube{'PublicAccess'} eq 'global')
-          {
             $allow   = 'all granted';
-            $pass    = 0;
             $satisfy = 'all';
-          }
-          elsif ($roundcube{'PublicAccess'} eq 'global-pw')
-          {
-            $allow   = 'all granted';
-            $pass    = 1;
-            $satisfy = 'all';
-          }
-          elsif ($roundcube{'PublicAccess'} eq 'global-pw-remote')
-          {
-            $allow   = "ip $localAccess";
-            $pass    = 1;
-            $satisfy = 'any';
-          }
       }
       
       $OUT .= "#------------------------------------------------------------\n";
@@ -64,30 +32,15 @@
       $OUT .= "\n";
       $OUT .= "<Directory /usr/share/roundcubemail>\n";
       $OUT .= "    Require $allow\n";
-
-      if ($pass)
-      {
-          $OUT .= "    AuthName \"$name\"\n";
-          $OUT .= "    AuthBasicProvider external\n";
-          $OUT .= "    AuthType Basic\n";
-          $OUT .= "    AuthExternal pwauth\n";
-          $OUT .= "    require valid-user\n";
-          $OUT .= "    Satisfy $satisfy\n";
-      }
-       $OUT .= "    AddType application/x-httpd-php .php\n";
-       $version = 74;
-       $OUT .= "<FilesMatch \.php\$\>\n";
-       $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n";
-       $OUT .= "</FilesMatch>\n";
-#      $OUT .= "    php_admin_value eaccelerator.enable 1\n";
-       $OUT .= "</Directory>\n";
-
+      $OUT .= "    AddType application/x-httpd-php .php\n";
+      $OUT .= "<FilesMatch \.php\$\>\n";
+      $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version-roundcube.sock|fcgi://localhost\"\n";
+      $OUT .= "</FilesMatch>\n";
+      $OUT .= "</Directory>\n";
       $OUT .= qq (
 <Directory /usr/share/roundcubemail/installer/>
   Require all denied
 </Directory>
                  );
-
-
     }
 }
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-24 16:55:55.607000000 -0500
@@ -0,0 +1,67 @@
+{
+ my $phpversion="81";
+
+if ($PHP_VERSION eq $phpversion){
+  if (($roundcube{'status'} || 'disabled') eq 'enabled'){
+    my $max_upload_size = ($roundcube{MaxUploadSize} || '100M');
+    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
+    my $memory_limit = ($roundcube{MemoryLimit} || '512M');
+    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
+    my $open_basedir= $roundcube{PHPBaseDir} || '';
+    $open_basedir = "/usr/share/roundcubemail:/var/lib/roundcube:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir";
+    my $id = 'roundcube';
+    my $max_children = $roundcube{'PHPmaxChildren'} || 20;
+    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;
+    my $start_servers = $roundcube{'PHPstartServers'} || 6;
+    my $max_spare_servers = $roundcube{'PHPmaxServers'} || 8;
+    my $max_requests = $roundcube{'PHPmaxRequests'} || 1000;
+    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
+    $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 +  $min_spare_servers/2  ) : $start_servers;
+
+    $OUT .=<<_EOF;
+
+[php$PHP_VERSION-$id]
+user = www
+group = www
+listen.owner = root
+listen.group = www
+listen.mode = 0660
+listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock
+pm = dynamic
+pm.max_children = $max_children
+pm.start_servers = $start_servers
+pm.min_spare_servers = $min_spare_servers
+pm.max_spare_servers = $max_spare_servers
+pm.max_requests = $max_requests
+php_admin_value[sys_temp_dir] = /var/lib/php/$id/tmp
+php_admin_value[session.save_path] = /var/lib/php/$id/session
+php_admin_value[session.gc_maxlifetime] = 86400
+php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp
+php_admin_value[error_log] = /var/log/php/$id/error.log
+slowlog = /var/log/php/roundcube/slow.log
+php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
+php_admin_flag[display_errors] = off
+php_admin_flag[log_errors] = on
+php_admin_value[error_log] = syslog
+php_admin_value[memory_limit] = $memory_limit
+php_admin_value[max_execution_time] = 3600
+php_admin_value[post_max_size] = $max_upload_size
+php_admin_value[upload_max_filesize] = $max_upload_size
+php_admin_value[disable_functions] = system, show_source, symlink, dl, passthru 
+php_admin_value[open_basedir] = $open_basedir
+php_admin_flag[allow_url_fopen] = on
+php_admin_flag[file_upload] = on
+php_admin_flag[session.cookie_httponly] = on
+php_admin_flag[allow_url_include] = off
+php_admin_value[session.save_handler] = files
+php_admin_flag[output_buffering] = off
+
+_EOF
+
+  }
+  else{
+    $OUT .= '; RoudnCube is disabled';
+  }
+} 
+}
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server   1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server       2024-02-24 17:24:25.423000000 -0500
@@ -0,0 +1,5 @@
+// Full URL to the Nextcloud server 
+// e.g. https://example.com/nextcloud if in sub-path
+// or https://cloud.example.com if in root
+$config["nextcloud_attachment_server"] = "https://{$roundcube{'nextcloudURI'}||$nextcloud{'Virtualhost'}||$DomainName."/nextcloud"}";
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username 1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username     2024-02-24 17:25:55.035000000 -0500
@@ -0,0 +1,11 @@
+// Username resolving strategy from internal Roundcube
+// username which usually is the email address e.g. user@example.com or IMAP User
+// Placeholders are replaced as following
+// %s => verbatim RC username as reported by rcmail->get_user_name(). Depending on config loginuser@domain or login
+// %i => username used to login to imap. usually equal to %s
+// %e => user email
+// %l, %u => email localpart (%u is for backward compatibility)
+// %d => email domain
+// %h => IMAP Host
+$config["nextcloud_attachment_username"] = "%u";
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password        1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password    2024-02-24 17:25:48.875000000 -0500
@@ -0,0 +1,4 @@
+// Don't try the email password at all, because we know it won't work
+// Defaults to false, i.e. try the password
+$config["nextcloud_attachment_dont_try_mail_password"] = false;
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder        1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder    2024-02-24 17:32:13.004000000 -0500
@@ -0,0 +1,12 @@
+// Name for the sub-folder to upload to
+// Defaults to "Mail Attachments"
+// Can't be sub-folder of sub-folder link folder/sub
+$config["nextcloud_attachment_folder"] = "{$roundcube{'nextcloudFolder'}||'Mail Attachments'}";
+
+// Translate the folder name according to the users configured locale
+// When activating this $config["nextcloud_attachment_folder"] has to be an array
+// of locale => name, e.g.
+// $config["nextcloud_attachment_folder"] = ["en_US" => "Mail Attachments", "de_DE" => "E-Mail Anhänge"]
+// If locale doesn't exist, en_US or first will be used
+// Defaults to false
+$config["nextcloud_attachment_folder_translate_name"] = false;
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit     1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit 2024-02-24 17:29:39.128000000 -0500
@@ -0,0 +1,5 @@
+// Limit to show a warning at for large attachments.
+// has to be smaller then $config['max_message_size']
+// set to null to disable
+$config["nextcloud_attachment_softlimit"] = "{$roundcube{'NCsoftlimit'}||$qmail{'MaxMessageSize'}||'25M'}";
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior      1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior  2024-02-24 17:31:24.266000000 -0500
@@ -0,0 +1,6 @@
+// Behavior if $config['max_message_size'] is hit.
+// "prompt" to show dialog a la outlook or apple
+// "upload" to automatically upload without asking a la google
+// Defaults to "prompt"
+$config["nextcloud_attachment_behavior"] = "{$roundcube{'nextcloudBehavior'}||'prompt'}";
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers      2024-02-24 17:33:50.406000000 -0500
@@ -0,0 +1,57 @@
+// List of users to exclude
+// They won't be able to interact with the plugin at all
+// No prompts, no automatic uploading, no settings.
+// List by RC username or resolved username e.g. ["user@demo.com", "user"]
+$config["nextcloud_attachment_exclude_users"] = [];
+
+// Exclude users listed by uid (you need add the mapping to the address book) or email in any of the following
+// address books. This allows you to configure a hidden LDAP address book containing the users
+// to exclude.
+//
+// Hide an addressbook by setting
+// $config['ldap_public'][*] = [
+//      ...
+//      'hidden' => true,
+// ...
+//  ];
+// in the global config.
+//
+// Add the uid mapping via
+// $config['ldap_public'][*] = [
+//      ...
+//      'fieldmap' => [
+//          ...
+//     //internal => ldapattr
+//          'uid' => 'uid',
+//          ...
+//      ],
+//      ...
+// ]
+// in the global config. Replace mapped attribute with appropriate value for your directory e.g. cn
+// And replace "*" with the appropriate address book name
+$config["nextcloud_attachment_exclude_users_in_addr_books"] = [];
+
+// Exclude users that have a mapped value in an address book
+// format [ [ 'address_book', 'mapped_attribute', 'matched_value' ], ... ]
+//
+// Resulting in every user listed in the address book "address_book"
+// to be excluded if they have a "mapped_attribute", matching "matched_value".
+//
+// E.g. ['public', 'memberOf', 'cn=no_cloud,ou=groups,dc=example,dc=com']
+//
+// multiple attributes and multiple address books are supported
+$config["nextcloud_attachment_exclude_users_with_addr_book_value"] = [];
+
+// Exclude user that that are in a given group in an address book
+// format [ [ 'address_book', 'group' ], ... ]
+//
+// Resulting in every user listed in the address book "address_book" that is
+// is in group "group" to be excluded. You have to correctly configure the group
+// mapping for the LDAP entry
+//
+// E.g. ['public', 'nocloud']
+//
+// multiple groups and multiple address books are supported
+$config["nextcloud_attachment_exclude_users_in_addr_book_group"] = [];
+
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https      2024-02-24 17:34:52.039000000 -0500
@@ -0,0 +1,4 @@
+// Enable/Disable certificate validation for https on WebDAV and API requests
+// Defaults to true (enabled)
+$config["nextcloud_attachment_verify_https"] = {$roundcube{'nextcloudVerifyCerts'}||'true'};
+
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin      2024-02-24 17:20:03.116000000 -0500
@@ -0,0 +1,14 @@
+{
+    $OUT = <<HERE;
+<?php
+/*
+HERE
+
+    $OUT .= 
+    Text::Template::_load_text("/etc/e-smith/templates-default/template-begin");
+
+    $OUT .= <<HERE;
+*/
+HERE
+
+}
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 2024-02-24 09:22:05.482000000 -0500
+++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh     2024-02-24 17:36:14.068000000 -0500
@@ -1,19 +1,20 @@
 #!/bin/bash
-/sbin/e-smith/db configuration setprop php AllowUrlFopen On
-/sbin/e-smith/expand-template /etc/php.ini
-/etc/init.d/httpd-e-smith restart >/dev/null 2>&1
+/sbin/e-smith/db configuration setprop php81 AllowUrlFopen On
+/sbin/e-smith/expand-template /etc/opt/remi/php81/php.ini
+/usr/bin/systemctl restart php81-php-fpm >/dev/null 2>&1
+#/etc/init.d/httpd-e-smith restart >/dev/null 2>&1
 pathroundcube=$(pwd)
 
 cd /usr/share/roundcubemail
-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/php81  /usr/local/bin/composer require johndoh/contextmenu --with-dependencies
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php81  /usr/local/bin/composer require johndoh/globaladdressbook ~2.1 --with-dependencies
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php81  /usr/local/bin/composer require roundcube/larry ~1.6.0 --with-dependencies
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php81  /usr/local/bin/composer require bennet0496/nextcloud_attachments --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 --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
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php81 /usr/local/bin/composer self-update
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php81  /usr/local/bin/composer update --with-dependencies
+/sbin/e-smith/db configuration setprop php81 AllowUrlFopen off
+/sbin/e-smith/expand-template /etc/opt/remi/php81/php.ini
+/usr/bin/systemctl restart php81-php-fpm >/dev/null 2>&1
 cd $pathroundcube
 