Projects
Kolab:3.4
roundcubemail
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 97
View file
roundcubemail.spec
Changed
@@ -43,7 +43,7 @@ Name: roundcubemail Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client @@ -51,7 +51,7 @@ License: GPLv2 URL: http://www.roundcube.net -# From 366ffd7aa05748d27d0bf778131ffae4b13840b6 +# From bbbd02bd6a43ae0e2ee00519be8d56fb21161dcd Source0: roundcubemail-%{version}.tar.gz Source1: comm.py @@ -2989,6 +2989,9 @@ %defattr(-,root,root,-) %changelog +* Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1.0-4 +- Repack of 1.1 release branch at bbbd02bd + * Tue Feb 23 2015 Daniel Hoffend <dh@dotlan.net> - 1.1.0-3 - Fixed rewrite rules again
View file
debian.changelog
Changed
@@ -1,4 +1,10 @@ -roundcubemail (1:1.1.0-0~kolab4) unstable; urgency=low +roundcubemail (1:1.1.0-0~kolab6) unstable; urgency=low + + * Repack of 1.1.0 at bbbd02bd6a43ae0e2ee00519be8d56fb21161dcd + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Wed, 25 Feb 2015 07:14:39 +0200 + +roundcubemail (1:1.1.0-0~kolab5) unstable; urgency=low * Fixed rewrite rules again
View file
roundcubemail-1.1.0.tar.gz/CHANGELOG
Changed
@@ -2,6 +2,7 @@ =========================== - Add possibility to print contact information (of a single contact) +- Add possibility to configure max_allowed_packet value for all database engines (#1490283) - Fix refreshing of drafts list when sending a message which was saved in meantime (#1490238) - Fix saving/sending emoticon images when assets_dir is set - Fix PHP fatal error when visiting Vacation interface and there's no sieve script yet @@ -12,6 +13,7 @@ - Fix missing or not up-to-date CATEGORIES entry in vCard export (#1490277) - Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280) - Fix cursor position on reply below the quote in HTML mode (#1490263) +- Fix so "over quota" errors are displayed also in message compose page RELEASE 1.1.0 -------------
View file
roundcubemail-1.1.0.tar.gz/config/defaults.inc.php
Changed
@@ -51,6 +51,12 @@ // 'cache_messages' => 'r', ); +// It is possible to specify database variable values e.g. some limits here. +// Use them if your server is not MySQL or for better performance. +// For example Roundcube uses max_allowed_packet value (in bytes) +// which limits query size for database cache operations. +$config['db_max_allowed_packet'] = 23423440; + // ---------------------------------- // LOGGING/DEBUGGING
View file
roundcubemail-1.1.0.tar.gz/program/include/rcmail.php
Changed
@@ -1791,8 +1791,9 @@ * @param string $fallback Fallback message label * @param array $fallback_args Fallback message label arguments * @param string $suffix Message label suffix + * @param array $params Additional parameters (type, prefix) */ - public function display_server_error($fallback = null, $fallback_args = null, $suffix = '') + public function display_server_error($fallback = null, $fallback_args = null, $suffix = '', $params = array()) { $err_code = $this->storage->get_error_code(); $res_code = $this->storage->get_response_code(); @@ -1813,8 +1814,8 @@ $error = 'errornoperm'; } // try to detect full mailbox problem and display appropriate message - // there can be e.g. "Quota exceeded" or "quotum would exceed" - else if (stripos($err_str, 'quot') !== false && stripos($err_str, 'exceed') !== false) { + // there can be e.g. "Quota exceeded" / "quotum would exceed" / "Over quota" + else if (stripos($err_str, 'quot') !== false && preg_match('/exceed|over/i', $err_str)) { $error = 'erroroverquota'; } else { @@ -1828,13 +1829,21 @@ else if ($fallback) { $error = $fallback; $args = $fallback_args; + $params['prefix'] = false; } if ($error) { if ($suffix && $this->text_exists($error . $suffix)) { $error .= $suffix; } - $this->output->show_message($error, 'error', $args); + + $msg = $this->gettext(array('name' => $error, 'vars' => $args)); + + if ($params['prefix'] && $fallback) { + $msg = $this->gettext(array('name' => $fallback, 'vars' => $fallback_args)) . ' ' . $msg; + } + + $this->output->show_message($msg, $params['type'] ?: 'error'); } }
View file
roundcubemail-1.1.0.tar.gz/program/js/treelist.js
Changed
@@ -366,6 +366,12 @@ indexbyid[node.id] = node; + // set new reference to node.html after insert + // will otherwise vanish in Firefox 3.6 + if (typeof node.html == 'object') { + indexbyid[node.id].html = id2dom(node.id, true).children(); + } + if (sort) { resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : ''); }
View file
roundcubemail-1.1.0.tar.gz/program/lib/Roundcube/rcube_addressbook.php
Changed
@@ -544,13 +544,20 @@ $fn = trim($fn, ', '); - // fallback to display name - if (empty($fn) && $contact['name']) - $fn = $contact['name']; - - // fallback to email address - if (empty($fn) && ($email = self::get_col_values('email', $contact, true)) && !empty($email)) { - return $email[0]; + // fallbacks... + if ($fn === '') { + // ... display name + if (!empty($contact['name'])) { + $fn = $contact['name']; + } + // ... organization + else if (!empty($contact['organization'])) { + $fn = $contact['organization']; + } + // ... email address + else if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) { + $fn = $email[0]; + } } return $fn;
View file
roundcubemail-1.1.0.tar.gz/program/lib/Roundcube/rcube_db.php
Changed
@@ -357,7 +357,7 @@ public function get_variable($varname, $default = null) { // to be implemented by driver class - return $default; + return rcube::get_instance()->config->get('db_' . $varname, $default); } /**
View file
roundcubemail-1.1.0.tar.gz/program/lib/Roundcube/rcube_db_mysql.php
Changed
@@ -167,6 +167,12 @@ return $this->variables[$varname]; } + // configured value has higher prio + $conf_value = rcube::get_instance()->config->get('db_' . $varname); + if ($conf_value !== null) { + return $this->variables[$varname] = $conf_value; + } + $result = $this->query('SHOW VARIABLES LIKE ?', $varname); while ($row = $this->fetch_array($result)) {
View file
roundcubemail-1.1.0.tar.gz/program/lib/Roundcube/rcube_db_pgsql.php
Changed
@@ -139,9 +139,11 @@ // There's a known case when max_allowed_packet is queried // PostgreSQL doesn't have such limit, return immediately if ($varname == 'max_allowed_packet') { - return $default; + return rcube::get_instance()->config->get('db_' . $varname, $default); } + $this->variables[$varname] = rcube::get_instance()->config->get('db_' . $varname); + if (!isset($this->variables)) { $this->variables = array();
View file
roundcubemail-1.1.0.tar.gz/program/lib/Roundcube/rcube_smtp.php
Changed
@@ -288,7 +288,8 @@ } // Send the message's headers and the body as SMTP data. - if (PEAR::isError($this->conn->data($data, $text_headers))) { + $result = $this->conn->data($data, $text_headers); + if (PEAR::isError($result)) { $err = $this->conn->getResponse(); if (!in_array($err[0], array(354, 250, 221))) { $msg = sprintf('[%d] %s', $err[0], $err[1]);
View file
roundcubemail-1.1.0.tar.gz/program/steps/mail/sendmail.inc
Changed
@@ -635,7 +635,8 @@ 'message' => "Could not save message in $store_target"), true, false); if ($savedraft) { - $OUTPUT->show_message('errorsaving', 'error'); + $RCMAIL->display_server_error('errorsaving'); + // start the auto-save timer again $OUTPUT->command('auto_save_start'); $OUTPUT->send('iframe'); @@ -699,7 +700,7 @@ $OUTPUT->command('remove_compose_data', $COMPOSE_ID); if ($store_folder && !$saved) { - $OUTPUT->command('sent_successfully', 'error', $RCMAIL->gettext('errorsavingsent'), $folders); + $RCMAIL->display_server_error('errorsavingsent', null, null, array('prefix' => true)); } else if ($store_folder) { $folders[] = $store_target;
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
.