Request 3276 (accepted)

Overview

Request 3276 (accepted)

New release 0.5.14.6

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

Submit chwala

Submit package Kolab:16:Testing / chwala to package Kolab:16 / chwala

chwala.spec Changed

chwala-0.5.14.tar.gz/config/config.inc.php.dist Changed

chwala-0.5.14.tar.gz/lib/drivers/kolab/kolab_file_storage.php Changed

chwala-0.5.14.tar.gz/lib/drivers/kolabfiles/kolabfiles_file_storage.php Changed

@@ -62,8 +62,7 @@
     {
         $this->rc = rcube::get_instance();
         $this->config = 
-            'baseuri' => $this->rc->config->get('fileapi_kolabfiles_baseuri', 'https://' . $_SERVER"HTTP_HOST" . '/api/'),
-            'host' => $this->rc->config->get('fileapi_kolabfiles_host', $_SERVER"HTTP_HOST"),
+            'baseuri' => $this->rc->config->get('fileapi_kolabfiles_baseuri', 'https://' . $_SERVER"HTTP_HOST" . '/api/')
         ;
     }
 
@@ -963,6 +962,12 @@
         throw new Exception("Autocomplete not implemented", file_storage::ERROR_UNSUPPORTED);
     }
 
+    private static function getHost($url)
+    {
+        // Remove protocol prefix and path, we work with host only
+        return preg_replace('#(^https?://|/.*$)#i', '', $url);
+    }
+
     /**
      * Convert file/folder path into a global URI.
      *
@@ -973,8 +978,7 @@
      */
     public function path2uri($path)
     {
-        // Remove protocol prefix and path, we work with host only
-        $host = preg_replace('#(^https?://|/.*$)#i', '', $this->config'host');
+        $host = self::getHost($this->config'baseuri');
 
         if (!is_string($path) || !strlen($path)) {
             $user = $_SESSION$this->title . 'user';
@@ -1004,7 +1008,7 @@
         $user   = rawurldecode($matches1);
         $host   = $matches2;
         $path   = file_utils::decode_path($matches3);
-        $c_host = preg_replace('#(^https?://|/.*$)#i', '', $this->config'host');
+        $c_host = self::getHost($this->config'baseuri');
 
         if (strlen($path)) {
             list($file, $repo_id, $collection) = $this->find_collection($path, true);

chwala-0.5.14.tar.gz/lib/drivers/seafile/seafile_file_storage.php Changed

@@ -306,7 +306,7 @@
         if ($this->config'username') {
             $metadata'form_values' = array(
                 'host'     => $this->config'host',
-                'username' => $this->config'username',
+                'username' => $this->config'username' ?? null,
             );
         }
 
@@ -563,8 +563,8 @@
             'name'     => $file'name',
             'size'     => (int) $file'size',
             'type'     => (string) $file'type',
-            'mtime'    => file_utils::date_format($file'changed', $this->config'date_format', $this->config'timezone'),
-            'ctime'    => file_utils::date_format($file'created', $this->config'date_format', $this->config'timezone'),
+            'mtime'    => file_utils::date_format($file'changed' ?? null, $this->config'date_format', $this->config'timezone'),
+            'ctime'    => file_utils::date_format($file'created' ?? null, $this->config'date_format', $this->config'timezone'),
             'modified' => $file'changed' ? $file'changed'->format('U') : 0,
             'created'  => $file'created' ? $file'created'->format('U') : 0,
         );
@@ -637,8 +637,8 @@
                 'name'     => $file'name',
                 'size'     => (int) $file'size',
                 'type'     => (string) $file'type',
-                'mtime'    => file_utils::date_format($file'changed', $this->config'date_format', $this->config'timezone'),
-                'ctime'    => file_utils::date_format($file'created', $this->config'date_format', $this->config'timezone'),
+                'mtime'    => file_utils::date_format($file'changed' ?? null, $this->config'date_format', $this->config'timezone'),
+                'ctime'    => file_utils::date_format($file'created' ?? null, $this->config'date_format', $this->config'timezone'),
                 'modified' => $file'changed' ? $file'changed'->format('U') : 0,
                 'created'  => $file'created' ? $file'created'->format('U') : 0,
             );

chwala-0.5.14.tar.gz/lib/file_wopi.php Changed

chwala.dsc Changed

debian.changelog Changed

Build Results
RPM Lint

Refresh

Comments for request 3276 0

Request History

mollekopf created request about 1 year ago

New release 0.5.14.6

mollekopf accepted request about 1 year ago