Request 3116 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request supersedes: request 3111 (Show diff)

Overview

Request 3116 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3111
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit roundcubemail-selfcontained

Submit package Kolab:16:Testing / roundcubema...fcontained to package Kolab:16 / roundcubemail-selfcontained

buildroundcubemailtarball.sh Changed

@@ -194,7 +194,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.7.21",
-        "phpstan/phpstan": "^1.4"
+        "phpstan/phpstan": "^1.4",
+        "squizlabs/php_codesniffer": "^3.6",
+        "phpcompatibility/php-compatibility": "^9.3"
     },
     "suggest": {
         "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
@@ -291,20 +293,34 @@
     bin/updatecss.sh --dir skins/$skin
 done
 
+popd
+
+
+# Uncomment to run phpstan
+# pushd $NAME
 
 # cat << EOF > ./phpstan.neon
 # includes:
 # parameters:
-#     level: 1
+#     level: 0
 #     parallel:
 #         processTimeout: 300.0
+#     ignoreErrors:
+#         - '#Access to an undefined property#'
+#     excludePaths:
+#         analyse:
+#             - program/
+#             - skins/
 #     paths:
-#         - app/
+#         - program/include/
+#         - program/lib/
+#         - program/lib/Roundcube/
+#         - plugins/libkolab
 # EOF
 
 # php -dmemory_limit=500M vendor/bin/phpstan analyse
 
-popd
+# popd
 
 #  -d chwala  && rm -rf chwala
 # git clone --branch master ssh://git@git.kolab.org/diffusion/C/chwala.git chwala

debian.changelog Changed

plesk.calendar.inc.php Changed

plesk.config.inc.php Changed

@@ -1,7 +1,7 @@
 <?php
     include_once("/usr/share/psa-roundcube/config/config.inc.php");
 
-    $components = explode('.', $_SERVER"HTTP_HOST");
+    $components = explode('.', $_SERVER"HTTP_HOST" ?? "");
 
     if (count($components) > 2) {
         array_shift($components);
@@ -9,7 +9,7 @@
 
     $domain = implode('.', $components);
 
-    $config'session_domain' = $_SERVER"HTTP_HOST";
+    $config'session_domain' = $_SERVER"HTTP_HOST" ?? "";
     $config'username_domain' = $domain;
 
     $config'support_url' = "https://www.plesk.com/support/";
@@ -23,7 +23,7 @@
     $config'smtp_port' = 25;
     $config'smtp_user' = '%u';
     $config'smtp_pass' = '%p';
-    $config'smtp_helo_host' = $_SERVER"HTTP_HOST";
+    $config'smtp_helo_host' = $_SERVER"HTTP_HOST" ?? "";
 
     $config'use_secure_urls' = true;
     $config'force_https' = true;
@@ -195,28 +195,28 @@
 
     @include('/etc/roundcubemail/kolab_syncroton.inc.php');
 
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__))) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/'. basename(__FILE__))) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/'. basename(__FILE__));
     }
 
     // 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');
+    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
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/collabora.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/collabora.inc.php');
     }
 
     // Integration between Plesk Premium Email and Mattermost extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/mattermost.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/mattermost.inc.php');
     }
 
     // Integration between Plesk Premium Email and Seafile extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/seafile.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/seafile.inc.php');
     }
 
     @include('/etc/roundcubemail/licensing.inc.php');

plesk.kolab_addressbook.inc.php Changed

plesk.kolab_chat.inc.php Changed

plesk.libkolab.inc.php Changed

plesk.managesieve.inc.php Changed

roundcubemail-1.5.3.tar.gz Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3116 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago