Request 2444 (accepted)

This request supersedes: request 2443 (Show diff)

Overview

Request 2444 (accepted)

Removed the fix script invocations.

Created by mollekopf about 5 years ago
In state accepted
Supersedes 2443
Open review for Admin

Submit roundcubemail

Submit package home:molleko...b:Winterfell / roundcubemail to package Kolab:Winterfell / roundcubemail

roundcubemail.spec Changed

@@ -76,8 +76,6 @@
 
 Source200:      2017111400.sql
 
-Source300:      plesk.premium.inc.php
-
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
 
@@ -2377,10 +2375,6 @@
     -e '/^(%dir )*\/var\//d' \
     *.files
 
-%if 0%{?plesk}
-%{__install} %{SOURCE300} %{buildroot}%{confdir}/premium.inc.php
-%endif
-
 %pre
 if [ -L %{plugindir}/enigma/home -a ! -d %{plugindir}/enigma/home ]; then
     %{__rm} -rf %{plugindir}/enigma/home >/dev/null 2>&1 || :
@@ -2586,10 +2580,6 @@
 %{__sed} -i -r -e "s/.*(\s*define$\s*'RCMAIL_VERSION'\s*,\s*').*('$;)/\1%{version}-%{release}\2/g" \
     %{datadir}/program/include/iniset.php || :
 
-%if 0%{?plesk}
-/usr/local/psa/admin/bin/php %{_datadir}/roundcubemail/bin/fix-plesk-domains-config.php >/dev/null 2&1 || :
-%endif
-
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
@@ -3126,9 +3116,6 @@
 %endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/defaults.inc.php
-%if 0%{?plesk}
-%attr(0640,root,%{httpd_group}) %{confdir}/premium.inc.php
-%endif
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php
 %attr(0770,root,%{httpd_group}) %dir %{logdir}
 %attr(0770,root,%{httpd_group}) %dir %{tmpdir}

debian.rules Changed

debian.tar.gz/roundcubemail-core.postinst Changed

fix-premium-domains-config.php Deleted

@@ -1,36 +0,0 @@
-<?php
-    require_once('sdk.php');
-
-    pm_Context::init('kolab');
-
-    $fm = new \pm_ServerFileManager();
-
-    $str = "";
-
-    // Get the contents of premium.inc.php from the extension.
-    if ($fm->fileExists(rtrim(pm_Context::getVarDir(), '/') . '/webmail/premium.inc.php')) {
-        $str = $fm->getFileContents(
-            rtrim(pm_Context::getVarDir(), '/') . '/webmail/premium.inc.php'
-        );
-
-    // Get the contents of premium.inc.php from the software package.
-    } elseif ('/etc/roundcubemail/premium.inc.php') {
-        $str = $fm->getFileContents('/etc/roundcubemail/premium.inc.php');
-    } else {
-        return FALSE;
-    }
-
-    foreach (pm_Domain::getAllDomains() as $domain) {
-        if ($domain->hasPermission("manage_kolab") && $domain->hasHosting()) {
-            $w_domain    = 'webmail.' . $domain_name;
-
-            if ($domain->hasPermission('manage_kolab')) {
-                if (!$fm->fileExists("/etc/roundcubemail/{$w_domain}/")) {
-                    $fm->mkdir("/etc/roundcubemail/{$w_domain}/", '0755');
-                }
-
-                $fm->filePutContents("/etc/roundcubemail/{$w_domain}/premium.inc.php", $str);
-            }
-        }
-    }
-}

plesk.config.inc.php Changed

@@ -45,13 +45,28 @@
     $config['enable_installer'] = false;
 
     $config['plugins'] = Array(
+            'acl',
+            'archive',
+            'calendar',
             'jqueryui',
+            'kolab_activesync',
+            'kolab_addressbook',
             'kolab_config',
+            //'kolab_delegation',
+            'kolab_files',
             'kolab_folders',
+            'kolab_notes',
+            'kolab_tags',
             'libkolab',
             'libcalendaring',
+            'managesieve',
+            'markasjunk',
+            'newmail_notifier',
+            'odfviewer',
             'password',
-            'contextmenu'
+            'pdfviewer',
+            'tasklist',
+            'contextmenu',
         );
 
     $config['activesync_plugins'] = Array(
@@ -186,9 +201,9 @@
         @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/'. basename(__FILE__));
     }
 
-    // Additional options for Plesk Premium Email "Gold"
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/premium.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/premium.inc.php');
+    // Additional options for Plesk Premium Email - Free
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/freemium.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/freemium.inc.php');
     }
 
     // Integration between Plesk Premium Email and Collabora Online extensions