Projects
Kolab:16:Enterprise
chwala
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 46
View file
chwala.spec
Changed
@@ -37,7 +37,7 @@ %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: chwala -Version: 0.5.11 +Version: 0.5.12 Release: 1%{?dist} Summary: Glorified WebDAV, done right @@ -51,16 +51,10 @@ BuildArch: noarch -%if 0%{?rhel} < 8 -Requires: php-pear(HTTP_Request2) -Requires: php-Smarty >= 3.1.7 -%endif - Requires(post): roundcubemail(core) %if 0%{?plesk} < 1 Requires: roundcubemail -Requires: roundcubemail-plugins-kolab %endif %if 0%{?suse_version} @@ -71,7 +65,6 @@ %if 0%{?suse_version} BuildRequires: roundcubemail -BuildRequires: roundcubemail-plugins-kolab %endif %description @@ -117,14 +110,9 @@ pushd %{buildroot}/%{_datadir}/%{name} -mkdir -p lib/drivers/kolab/plugins - -pushd lib/drivers/kolab/plugins -%if 0%{?plesk} < 1 -ln -s ../../../../../roundcubemail/plugins/kolab_auth kolab_auth -%endif -ln -s ../../../../../roundcubemail/plugins/kolab_folders kolab_folders -ln -s ../../../../../roundcubemail/plugins/libkolab libkolab +mkdir -p lib/drivers/kolab +pushd lib/drivers/kolab +ln -s ../../../../roundcubemail/plugins plugins popd pushd lib @@ -136,11 +124,15 @@ ln -s ../../..%{_localstatedir}/lib/%{name} temp ln -s ../../..%{_localstatedir}/log/%{name} logs -%if 0%{?rhel} >= 8 ln -s ../roundcubemail/vendor vendor -%endif popd +%pretrans +# upgrade path for `plugins` directory -> symlink change. It only contains symlinks, so we don't do the rpmmoved dance. +if -d "/usr/share/chwala/lib/drivers/kolab/plugins" -a ! -L "/usr/share/chwala/lib/drivers/kolab/plugins" ; then + rm -rf /usr/share/chwala/lib/drivers/kolab/plugins +fi + %post 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 @@ -168,6 +160,9 @@ %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name} %changelog +* Mon Dec 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.5.12-1 +- Release of version 0.5.12 + * Wed Apr 29 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.10-1 - Release of version 0.5.10
View file
fix-autoload-path-debian.patch
Deleted
@@ -1,11 +0,0 @@ ---- chwala-0.5.orig/lib/drivers/webdav/webdav_file_storage.php 2016-11-14 12:46:52.000000000 +0100 -+++ chwala-0.5/lib/drivers/webdav/webdav_file_storage.php 2016-12-04 23:05:30.548000000 +0100 -@@ -28,7 +28,7 @@ - } - // fallback to System-installed package - else { -- require 'Sabre/autoload.php'; -+ require 'sabre21/Sabre/autoload.php'; - } - - use Sabre\DAV\Client;
View file
chwala-0.5.11.tar.gz/lib/api/common.php -> chwala-0.5.12.tar.gz/lib/api/common.php
Changed
@@ -71,6 +71,7 @@ if ($err = $_FILES'file''error'$i) { if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) { $maxsize = ini_get('upload_max_filesize'); + //@phpstan-ignore-next-line $maxsize = $this->show_bytes(parse_bytes($maxsize)); throw new Exception("Maximum file size ($maxsize) exceeded", file_api_core::ERROR_CODE); @@ -90,6 +91,7 @@ else if ($_SERVER'REQUEST_METHOD' == 'POST') { // if filesize exceeds post_max_size then $_FILES array is empty, if ($maxsize = ini_get('post_max_size')) { + //@phpstan-ignore-next-line $maxsize = $this->show_bytes(parse_bytes($maxsize)); throw new Exception("Maximum file size ($maxsize) exceeded", file_api_core::ERROR_CODE); } @@ -103,7 +105,7 @@ /** * Return built-in viewer opbject for specified mimetype * - * @return object Viewer object + * @return object|null Viewer object */ protected function find_viewer($mimetype) {
View file
chwala-0.5.11.tar.gz/lib/api/folder_list.php -> chwala-0.5.12.tar.gz/lib/api/folder_list.php
Changed
@@ -33,7 +33,7 @@ $params = $this->folder_list_params(); $search = isset($params'search') ? mb_strtoupper($params'search') : null; - $drivers = $this->api->get_drivers(true, $admin_drivers); + $drivers = $this->api->get_drivers(true, $this->admin_drivers); $errors = array(); $has_more = false; @@ -49,7 +49,7 @@ catch (Exception $e) { $folders = array(); if ($e->getCode() == file_storage::ERROR_NOAUTH) { - if (!in_array($title, $admin_drivers)) { + if (!in_array($title, $this->admin_drivers)) { // inform UI about to ask user for credentials $errors$title = $this->parse_metadata($driver->driver_metadata()); } @@ -108,7 +108,7 @@ } catch (Exception $e) { if ($e->getCode() == file_storage::ERROR_NOAUTH) { - if (!in_array($title, $admin_drivers)) { + if (!in_array($title, $this->admin_drivers)) { // inform UI about to ask user for credentials $errors$title = $this->parse_metadata($driver->driver_metadata()); }
View file
chwala-0.5.11.tar.gz/lib/drivers/kolab/kolab_file_storage.php -> chwala-0.5.12.tar.gz/lib/drivers/kolab/kolab_file_storage.php
Changed
@@ -112,6 +112,7 @@ 'host' => $auth'host', 'user' => $auth'user', )); + return false; } /** @@ -154,8 +155,10 @@ // take the first entry if $host is not found if (is_array($host)) { - list($key, $val) = each($host); - $host = is_numeric($key) ? $val : $key; + foreach($host as $key => $val) { + $host = is_numeric($key) ? $val : $key; + break; + } } }
View file
chwala-0.5.11.tar.gz/lib/drivers/seafile/seafile_api.php -> chwala-0.5.12.tar.gz/lib/drivers/seafile/seafile_api.php
Changed
@@ -43,6 +43,8 @@ const CONNECTION_ERROR = 550; + private $status = null; + /** * Specifies how long max. we'll wait and renew throttled request (in seconds) */ @@ -304,7 +306,7 @@ * @param string $username User name (email) * @param string $password User password * - * @return string Authentication token + * @return string|null Authentication token */ public function authenticate($username, $password) {
View file
chwala-0.5.11.tar.gz/lib/drivers/seafile/seafile_file_storage.php -> chwala-0.5.12.tar.gz/lib/drivers/seafile/seafile_file_storage.php
Changed
@@ -1058,7 +1058,7 @@ $this->init_lock_db(); // convert URI to global resource string - $uri = $this->uri2resource($path); + $uri = $this->path2uri($path); if (!$this->lock_db->lock($uri, $lock)) { throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR); @@ -1610,36 +1610,6 @@ } /** - * Get file object. - * - * @param string $file_name Name of a file (with folder path) - * @param kolab_storage_folder $folder Reference to folder object - * - * @return array File data - * @throws Exception - */ - protected function get_file_object(&$file_name, &$folder = null) - { - // extract file path and file name - $path = explode(file_storage::SEPARATOR, $file_name); - $file_name = array_pop($path); - $folder_name = implode(file_storage::SEPARATOR, $path); - - if ($folder_name === '') { - throw new Exception("Missing folder name", file_storage::ERROR); - } - - // get folder object - $folder = $this->get_folder_object($folder_name); - $files = $folder->select(array( - array('type', '=', 'file'), - array('filename', '=', $file_name) - )); - - return $files0; - } - - /** * Simplify internal structure of the file object */ protected function from_file_object($file)
View file
chwala-0.5.11.tar.gz/lib/file_api.php -> chwala-0.5.12.tar.gz/lib/file_api.php
Changed
@@ -160,6 +160,7 @@ } // Rouncube Framework < 1.2 else { + /* @phpstan-ignore-next-line */ $this->session = new rcube_session($rcube->get_dbh(), $this->config); $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER'SCRIPT_NAME')); $this->session->set_ip_check($this->config->get('ip_check'));
View file
chwala-0.5.11.tar.gz/lib/file_api_core.php -> chwala-0.5.12.tar.gz/lib/file_api_core.php
Changed
@@ -32,6 +32,7 @@ const ERROR_CODE = 500; const ERROR_INVALID = 501; const ERROR_NOT_IMPLEMENTED = 501; + const ERROR_UNSUPPORTED = 501; const OUTPUT_JSON = 'application/json'; const OUTPUT_HTML = 'text/html'; @@ -46,6 +47,7 @@ protected $drivers = array(); protected $icache = array(); protected $backend; + protected $admin_drivers = array(); /** * Returns API version @@ -310,7 +312,7 @@ * * @param string $email User identifier * - * @return string User name + * @return string|null User name */ public function resolve_user($email) {
View file
chwala-0.5.11.tar.gz/lib/file_document.php -> chwala-0.5.12.tar.gz/lib/file_document.php
Changed
@@ -44,7 +44,6 @@ const DB_DATE_FORMAT = 'Y-m-d H:i:s'; - /** * Class constructor * @@ -372,7 +371,7 @@ * * @return array Sessions list */ - public function sessions_list($param = array()) + public function sessions_list($params = array()) { $db = $this->rc->get_dbh(); $sessions = array();
View file
chwala-0.5.11.tar.gz/lib/file_ui.php -> chwala-0.5.12.tar.gz/lib/file_ui.php
Changed
@@ -400,7 +400,7 @@ /** * Returns name of the current task. * - * @return string Task name + * @return string|null Task name */ public function get_task() { @@ -440,7 +440,7 @@ /** * Returns task menu output. * - * @return string HTML output + * @return string|null HTML output */ protected function menu() {
View file
chwala-0.5.11.tar.gz/lib/file_ui_api.php -> chwala-0.5.12.tar.gz/lib/file_ui_api.php
Changed
@@ -181,7 +181,7 @@ */ public function get_capabilities() { - $this->get('capabilities'); + return $this->get('capabilities'); } /**
View file
chwala-0.5.11.tar.gz/lib/file_utils.php -> chwala-0.5.12.tar.gz/lib/file_utils.php
Changed
@@ -106,7 +106,7 @@ * * @param string $mimetype File mimetype * - * @return string Class name + * @return string|null Class name */ static function mimetype2class($mimetype) {
View file
chwala-0.5.12.tar.gz/phpstan.neon
Added
@@ -0,0 +1,17 @@ +includes: +parameters: + level: 0 + parallel: + processTimeout: 300.0 + ignoreErrors: + - '#Access to an undefined property#' + bootstrapFiles: + - lib/init.php + excludePaths: + analyse: + - lib/ext/Roundcube + - lib/drivers/kolab/plugins + - lib/viewers/text.php + - lib/drivers/seafile/seafile_request_observer.php + paths: + - lib/
View file
chwala.dsc
Changed
@@ -2,7 +2,7 @@ Source: chwala Binary: chwala Architecture: all -Version: 0.5.11-0~kolab1 +Version: 0.5.12-1~kolab1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://kolab.org/about/chwala/ @@ -11,5 +11,5 @@ Package-List: roundcubemail deb web extra Files: - 00000000000000000000000000000000 0 chwala-0.5.11.tar.gz + 00000000000000000000000000000000 0 chwala-0.5.12.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +chwala (0.5.12-1~kolab1) unsable; urgency=low + + * Release version 0.5.12 + + -- Christian Mollekopf <mollekopf@apheleia-it.ch> Mon, 19 Dec 2022 12:12:12 +0100 + chwala (0.5.11-0~kolab1) unsable; urgency=low * Release version 0.5.11
View file
debian.control
Changed
@@ -10,11 +10,7 @@ Package: chwala Architecture: all Depends: - php-http-request2, - smarty3 (>= 3.1.7), roundcubemail-core, - roundcubemail-plugin-libkolab, - php-sabre-dav-2.1 (>= 2.1), ${misc:Depends} Description: Glorified WebDAV, done right Chwala is a file storage suite purposed for integration in to other
View file
debian.rules
Changed
@@ -12,7 +12,7 @@ fi override_dh_install: - dh_install -XLICENSE -X.gitignore + dh_install -X.arcconfig -X.gitignore if ! -f "/etc/plesk-release" ; then \ mkdir -p $(CURDIR)/debian/chwala/etc/apache2/sites-available ; \ @@ -21,4 +21,4 @@ fi # prepare for symbolic links, throw away unneeded code (same as in .spec file) - mkdir -p $(CURDIR)/debian/chwala/usr/share/chwala/lib/drivers/kolab/plugins + mkdir -p $(CURDIR)/debian/chwala/usr/share/chwala/lib/drivers/kolab
View file
debian.series
Changed
@@ -1,2 +1,1 @@ chwala-0.5.4-suhosin.session.encrypt-php_flag.patch -p1 -fix-autoload-path-debian.patch -p1
View file
debian.tar.gz/links
Changed
@@ -3,6 +3,5 @@ var/lib/chwala /usr/share/chwala/temp var/log/chwala /usr/share/chwala/logs usr/share/roundcubemail/program/lib/Roundcube /usr/share/chwala/lib/Roundcube -usr/share/roundcubemail/plugins/kolab_auth /usr/share/chwala/lib/drivers/kolab/plugins/kolab_auth -usr/share/roundcubemail/plugins/kolab_folders /usr/share/chwala/lib/drivers/kolab/plugins/kolab_folders -usr/share/roundcubemail/plugins/libkolab /usr/share/chwala/lib/drivers/kolab/plugins/libkolab +usr/share/roundcubemail/plugins /usr/share/chwala/lib/drivers/kolab/plugins +usr/share/roundcubemail/vendor /usr/share/chwala/vendor
View file
debian.tar.gz/preinst
Changed
@@ -32,6 +32,7 @@ a2ensite chwala.conf reload_apache fi + rm -rf /usr/share/chwala/lib/drivers/kolab/plugins ;; esac
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.