Request 2445 (accepted)

Overview

Request 2445 (accepted)

Switch around the plesk premium logic

Created by vanmeeuwen about 5 years ago
In state accepted
Open review for Admin

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / 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
 
@@ -95,7 +93,9 @@
 %if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
+%if 0%{?rhel} <= 7
 BuildRequires:  php-mcrypt
+%endif
 BuildRequires:  php-pdo
 BuildRequires:  php-pear >= 1.9.0
 BuildRequires:  php-phpunit-PHPUnit
@@ -126,14 +126,14 @@
 %endif
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
-BuildRequires:  python-cssmin
+BuildRequires:  python%{?python3_pkgversion}-cssmin
 %endif
 
 # This can, regrettably, not be BuildRequires'ed, since the OSC
 # command-line so epicly fails at downloading as large a chunk of data.
 #BuildRequires:  firefox
-BuildRequires:  python
-BuildRequires:  python-nose
+BuildRequires:  python%{?python3_pkgversion}
+BuildRequires:  python%{?python3_pkgversion}-nose
 #BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -386,6 +386,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       php-pear-crypt-gpg
 %if 0%{?plesk}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -1624,6 +1625,9 @@
         echo "Group:          Applications/Internet"
         echo "Requires:       %%{name}(core) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo "Requires:       %%{name}(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        if [ "$(basename ${plugin})" == "enigma" ]; then
+            echo "Requires:       php-pear-crypt-gpg"
+        fi
         if [ -d "${target_dir}/skins/" ]; then
             echo "%%if 0%%{?plesk}"
             echo "%%if 0%%{?bootstrap} < 1"
@@ -1726,7 +1730,7 @@
             echo "        fi"
             echo "    fi"
             echo ""
-            echo "    /usr/share/roundcubemail/bin/updatedb.sh \\"
+            echo "    %%{_datadir}/roundcubemail/bin/updatedb.sh \\"
             echo "        --dir \$dir \\"
             echo "        --package $(basename ${plugin}) \\"
             echo "        >/dev/null 2>&1 || :"
@@ -1850,7 +1854,7 @@
     find %{buildroot}%{datadir} -type l >> current-new.files
 
     if [ -f "current.files" ]; then
-        python ./comm.py current.files current-new.files
+        python%{?python3_pkgversion} ./comm.py current.files current-new.files
     else
         cat current-new.files
     fi
@@ -2371,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 || :
@@ -2580,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
@@ -2598,8 +2594,8 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-/usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/roundcubemail-core-%{version}%{?dash_rel_suffix}/SQL/ \
+%{_datadir}/roundcubemail/bin/updatedb.sh \
+    --dir %{_datadir}/doc/roundcubemail-core-%{version}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -3120,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

plesk.premium.inc.php Deleted

Build Results
RPM Lint

Refresh

Comments for request 2445 0

Request History

vanmeeuwen created request about 5 years ago

Switch around the plesk premium logic

vanmeeuwen accepted review about 5 years ago

vanmeeuwen accepted request about 5 years ago