Projects
Kolab:3.4
roundcubemail
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 88
View file
roundcubemail.spec
Changed
@@ -43,7 +43,7 @@ Name: roundcubemail Version: 1.1 -Release: 0.10.beta20150129.git0a584170%{?dist} +Release: 0.10.beta20150204.git09d52dbb%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client @@ -51,7 +51,7 @@ License: GPLv2 URL: http://www.roundcube.net -# From GIT 0a5841702fdc6e71f23b7eebd046ef715b74b544 +# From GIT 09d52dbb6716373ded6c116547cc5fcdc84f5487 Source0: roundcubemail-1.1.tar.gz Source1: comm.py @@ -3020,6 +3020,9 @@ %defattr(-,root,root,-) %changelog +* Wed Feb 4 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1-0.10-git +- Ship a new GIT snapshot (09d52dbb) + * Thu Jan 29 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1-0.10-git - Ship a new GIT snapshot to resolve #3436 / #4431
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +roundcubemail (1:1.1~dev20150204-0~kolab7) unstable; urgency=low + + * New GIT snapshot (09d52dbb6716373ded6c116547cc5fcdc84f5487) + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Wed, 4 Feb 2015 07:14:39 +0200 + roundcubemail (1:1.1~dev20150129-0~kolab7) unstable; urgency=low * New GIT snapshot (0a5841702fdc6e71f23b7eebd046ef715b74b544)
View file
roundcubemail-1.1.tar.gz/bin/installto.sh
Changed
@@ -54,7 +54,7 @@ break; } } - foreach (array('index.php','.htaccess','config/defaults.inc.php','composer.json-dist','CHANGELOG','README.md','UPGRADING','LICENSE') as $file) { + foreach (array('index.php','.htaccess','config/defaults.inc.php','composer.json-dist','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) { if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) { $err = true; break;
View file
roundcubemail-1.1.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
Changed
@@ -2105,7 +2105,10 @@ foreach ($rules['actions'] as $action) { if ($action['type'] == 'include' && empty($action['global'])) { $name = preg_replace($filename_regex, '', $action['target']); - $this->active[] = $name; + // make sure the script exist + if (in_array($name, $this->list)) { + $this->active[] = $name; + } } } }
View file
roundcubemail-1.1.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
Changed
@@ -124,7 +124,7 @@ private function vacation_rule() { - if ($this->script_name === null || !$this->sieve->load($this->script_name)) { + if ($this->script_name === false || $this->script_name === null || !$this->sieve->load($this->script_name)) { return; } @@ -556,7 +556,7 @@ protected function save_vacation_script($rule) { // if script does not exist create a new one - if ($this->script_name === null) { + if ($this->script_name === null || $this->script_name === false) { $this->script_name = $this->rc->config->get('managesieve_script_name'); if (empty($this->script_name)) { $this->script_name = 'roundcube';
View file
roundcubemail-1.1.tar.gz/program/include/iniset.php
Changed
@@ -68,7 +68,7 @@ // backward compatybility (to be removed) require_once INSTALL_PATH . 'program/include/bc.php'; -// load the UTF-8 portablity layer from Patchwor +// load the UTF-8 portablity layer from Patchwork if (!function_exists('iconv') || !function_exists('utf8_encode') || !extension_loaded('mbstring')) { \Patchwork\Utf8\Bootup::initAll(); }
View file
roundcubemail-1.1.tar.gz/program/include/rcmail_install.php
Changed
@@ -234,10 +234,9 @@ else if (is_numeric($value)) { $value = intval($value); } - else if ($prop == 'plugins') { + else if ($prop == 'plugins' && !empty($_POST['submit'])) { $value = array(); - foreach(array_keys($_POST) as $key) - { + foreach (array_keys($_POST) as $key) { if (preg_match('/^_plugins_*/', $key)) array_push($value, $_POST[$key]); }
View file
roundcubemail-1.1.tar.gz/program/lib/Roundcube/bootstrap.php
Changed
@@ -490,8 +490,11 @@ */ function rcube_pear_error($err) { - error_log(sprintf("%s (%s): %s", - $err->getMessage(), - $err->getCode(), - $err->getUserinfo()), 0); + $msg = sprintf("ERROR: %s (%s)", $err->getMessage(), $err->getCode()); + + if ($info = $err->getUserinfo()) { + $msg .= ': ' . $info; + } + + error_log($msg, 0); }
View file
roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube_config.php
Changed
@@ -233,8 +233,14 @@ $this->prop['skin'] = self::DEFAULT_SKIN; // fix paths - $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : RCUBE_INSTALL_PATH . 'logs'; - $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : RCUBE_INSTALL_PATH . 'temp'; + foreach (array('log_dir' => 'logs', 'temp_dir' => 'temp') as $key => $dir) { + foreach (array($this->prop[$key], '../' . $this->prop[$key], RCUBE_INSTALL_PATH . $dir) as $path) { + if ($path && ($realpath = realpath(unslashify($path)))) { + $this->prop[$key] = $realpath; + break; + } + } + } // fix default imap folders encoding foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder) {
View file
roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube_imap.php
Changed
@@ -3951,7 +3951,13 @@ // @TODO: Honor MAXSIZE and DEPTH options foreach ($queries as $attrib => $entry) { - if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) { + $result = $this->conn->getAnnotation($folder, $entry, $attrib); + + // an error, invalidate any previous getAnnotation() results + if (!is_array($result)) { + return null; + } + else { foreach ($result as $fldr => $data) { $res[$fldr] = array_merge((array) $res[$fldr], $data); }
View file
roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube_plugin_api.php
Changed
@@ -374,9 +374,11 @@ */ public function unregister_hook($hook, $callback) { - $callback_id = array_search($callback, $this->handlers[$hook]); + $callback_id = array_search($callback, (array) $this->handlers[$hook]); if ($callback_id !== false) { - unset($this->handlers[$hook][$callback_id]); + // array_splice() removes the element and re-indexes keys + // that is required by the 'for' loop in exec_hook() below + array_splice($this->handlers[$hook], $callback_id, 1); } } @@ -395,7 +397,7 @@ $args = array('arg' => $args); } - // TODO: avoid recusion by checking in_array($hook, $this->exec_stack) ? + // TODO: avoid recursion by checking in_array($hook, $this->exec_stack) ? $args += array('abort' => false); array_push($this->exec_stack, $hook);
View file
roundcubemail.dsc
Changed
@@ -2,7 +2,7 @@ Source: roundcubemail Binary: roundcubemail Architecture: all -Version: 1:1.1~dev20150129-0~kolab7 +Version: 1:1.1~dev20150204-0~kolab7 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org> Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://www.roundcube.net/
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
.