mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 01:22:16 +02:00
replacing Net_Sieve with Horde\ManageSieve, thought we need some fixes not yet accepted in Horde, therefore we include a copy of fixed package
This commit is contained in:
Ralf Becker
parent
8e56039948
commit
d9759cced8
@ -10,16 +10,15 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.3.2,<=6.0.0alpha1",
|
||||
"pear-pear.php.net/Net_Sieve": "*",
|
||||
"php": ">=5.4,<=6.0.0alpha1",
|
||||
"pear-pear.horde.org/Horde_Imap_Client": ">=2.24.2",
|
||||
"pear-pear.horde.org/Horde_Nls": ">=2.0.3",
|
||||
"pear-pear.horde.org/Horde_Mail": ">=2.1.2",
|
||||
"pear-pear.horde.org/Horde_Imap_Client": ">=2.24.2",
|
||||
"pear-pear.horde.org/Horde_Smtp": ">=1.3.0",
|
||||
"pear-pear.horde.org/Horde_Compress": ">=2.0.8",
|
||||
"pear-pear.horde.org/Horde_Icalendar": ">=2.1.1",
|
||||
"pear-pear.horde.org/Horde_Mapi": ">=1.0.0",
|
||||
"pear-pear.php.net/Auth_SASL": "*",
|
||||
"pear-pear.php.net/XML_Feed_Parser": "*",
|
||||
"pear-pear.php.net/Log": "*",
|
||||
"pear-pear.php.net/Text_Diff": "*"
|
||||
|
||||
289
composer.lock
generated
289
composer.lock
generated
@ -4,14 +4,15 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "7cd8306e8b1349dcd17f0a5b43f492b1",
|
||||
"hash": "944b6b1c3277261de6d13473749bffed",
|
||||
"content-hash": "f96c4b8e901d7bc4932b836724eb2926",
|
||||
"packages": [
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Compress",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.3",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Compress-2.1.2.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Compress-2.1.3.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -23,7 +24,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_compress": "== 2.1.2.0"
|
||||
"pear-horde/horde_compress": "== 2.1.3.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -72,10 +73,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Date",
|
||||
"version": "2.1.0",
|
||||
"version": "2.1.1",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Date-2.1.0.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Date-2.1.1.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -86,7 +87,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_date": "== 2.1.0.0"
|
||||
"pear-horde/horde_date": "== 2.1.1.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -104,10 +105,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Exception",
|
||||
"version": "2.0.5",
|
||||
"version": "2.0.6",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Exception-2.0.5.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Exception-2.0.6.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -116,7 +117,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_exception": "== 2.0.5.0"
|
||||
"pear-horde/horde_exception": "== 2.0.6.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -127,14 +128,17 @@
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"LGPL-2.1"
|
||||
],
|
||||
"description": "This class provides the default exception handlers for the Horde Application Framework."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Icalendar",
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Icalendar-2.1.1.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Icalendar-2.1.2.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -148,7 +152,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_icalendar": "== 2.1.1.0"
|
||||
"pear-horde/horde_icalendar": "== 2.1.2.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -197,10 +201,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Imap_Client",
|
||||
"version": "2.29.0",
|
||||
"version": "2.29.4",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Imap_Client-2.29.0.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Imap_Client-2.29.4.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -219,7 +223,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_imap_client": "== 2.29.0.0"
|
||||
"pear-horde/horde_imap_client": "== 2.29.4.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -269,10 +273,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Mail",
|
||||
"version": "2.6.1",
|
||||
"version": "2.6.2",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Mail-2.6.1.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Mail-2.6.2.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -286,7 +290,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_mail": "== 2.6.1.0"
|
||||
"pear-horde/horde_mail": "== 2.6.2.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -336,10 +340,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Mime",
|
||||
"version": "2.9.1",
|
||||
"version": "2.9.2",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Mime-2.9.1.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Mime-2.9.2.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -356,7 +360,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_mime": "== 2.9.1.0"
|
||||
"pear-horde/horde_mime": "== 2.9.2.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -374,10 +378,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Nls",
|
||||
"version": "2.0.5",
|
||||
"version": "2.1.0",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Nls-2.0.5.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Nls-2.1.0.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -387,7 +391,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_nls": "== 2.0.5.0"
|
||||
"pear-horde/horde_nls": "== 2.1.0.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -398,14 +402,17 @@
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"LGPL-2.1"
|
||||
],
|
||||
"description": "Common methods for handling language data, timezones, and hostname->country lookups."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Secret",
|
||||
"version": "2.0.4",
|
||||
"version": "2.0.5",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Secret-2.0.4.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Secret-2.0.5.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -417,7 +424,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_secret": "== 2.0.4.0"
|
||||
"pear-horde/horde_secret": "== 2.0.5.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -428,6 +435,9 @@
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"LGPL-2.1"
|
||||
],
|
||||
"description": "An API for encrypting and decrypting small pieces of data with the use of a shared key."
|
||||
},
|
||||
{
|
||||
@ -467,10 +477,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Socket_Client",
|
||||
"version": "2.0.0",
|
||||
"version": "2.1.0",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Socket_Client-2.0.0.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Socket_Client-2.1.0.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -479,7 +489,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_socket_client": "== 2.0.0.0"
|
||||
"pear-horde/horde_socket_client": "== 2.1.0.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -579,10 +589,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Support",
|
||||
"version": "2.1.3",
|
||||
"version": "2.1.4",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Support-2.1.3.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Support-2.1.4.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -593,7 +603,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_support": "== 2.1.3.0"
|
||||
"pear-horde/horde_support": "== 2.1.4.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -664,10 +674,10 @@
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.horde.org/Horde_Util",
|
||||
"version": "2.5.5",
|
||||
"version": "2.5.6",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.horde.org/get/Horde_Util-2.5.5.tgz",
|
||||
"url": "http://pear.horde.org/get/Horde_Util-2.5.6.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
@ -676,7 +686,7 @@
|
||||
"php": "<6.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-horde/horde_util": "== 2.5.5.0"
|
||||
"pear-horde/horde_util": "== 2.5.6.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -693,19 +703,19 @@
|
||||
"description": "These classes provide functionality useful for all kind of applications."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Archive_Tar",
|
||||
"version": "1.3.16",
|
||||
"name": "pear-pear.php.net/Auth_SASL",
|
||||
"version": "1.0.6",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Archive_Tar-1.3.16.tgz",
|
||||
"url": "http://pear.php.net/get/Auth_SASL-1.0.6.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"php": ">=4.3.0.0"
|
||||
"php": ">=4.2.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/archive_tar": "== 1.3.16.0"
|
||||
"pear-pear/auth_sasl": "== 1.0.6.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -717,38 +727,9 @@
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"New BSD\n License"
|
||||
"BSD"
|
||||
],
|
||||
"description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Console_Getopt",
|
||||
"version": "1.4.0",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.4.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/console_getopt": "== 1.4.0.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"PHP License"
|
||||
],
|
||||
"description": "This is a PHP implementation of "getopt" supporting both\nshort and long options."
|
||||
"description": "Provides code to generate responses to common SASL mechanisms, including:\n- Digest-MD5\n- Cram-MD5\n- Plain\n- Anonymous\n- Login (Pseudo mechanism)\n- SCRAM"
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Log",
|
||||
@ -809,142 +790,20 @@
|
||||
],
|
||||
"description": "Supports base-2, base-10, base-16, and base-256 numbers. Uses the GMP or BCMath extensions, if available, and an internal implementation, otherwise."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Net_Sieve",
|
||||
"version": "1.3.4",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Net_Sieve-1.3.4.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"pear-pear.php.net/net_socket": ">=1.0.0.0",
|
||||
"pear-pear.php.net/pear": ">=1.0.0.0",
|
||||
"php": ">=4.0.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/net_sieve": "== 1.3.4.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"BSD"
|
||||
],
|
||||
"description": "This package provides an API to talk to servers implementing the managesieve protocol. It can be used to install and remove sieve scripts, mark them active etc."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Net_Socket",
|
||||
"version": "1.0.14",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Net_Socket-1.0.14.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"php": ">=4.3.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/net_socket": "== 1.0.14.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"description": "Net_Socket is a class interface to TCP sockets. It provides blocking\n and non-blocking operation, with different reading and writing modes\n (byte-wise, block-wise, line-wise and special formats like network\n byte-order ip addresses)."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/PEAR",
|
||||
"version": "1.9.5",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/PEAR-1.9.5.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"ext-pcre": "*",
|
||||
"ext-xml": "*",
|
||||
"pear-pear.php.net/archive_tar": ">=1.3.11.0",
|
||||
"pear-pear.php.net/console_getopt": ">=1.2.0.0",
|
||||
"pear-pear.php.net/structures_graph": ">=1.0.2.0",
|
||||
"pear-pear.php.net/xml_util": ">=1.2.0.0",
|
||||
"php": ">=4.4.0.0,!=5.0.0.0,!=5.1.0.0,!=5.1.1.0,!=5.1.2.0,!=5.1.3.0,!=5.1.4.0,!=5.1.5.0"
|
||||
},
|
||||
"conflict": {
|
||||
"pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0",
|
||||
"pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/pear": "== 1.9.5.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n where PHP is running on\n * the System class for quick handling of common operations\n with files and directories\n * the PEAR base class\n Features in a nutshell:\n * full support for channels\n * pre-download dependency validation\n * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n * support for optional dependency groups and limited support for sub-packaging\n * robust dependency support\n * full dependency validation on uninstall\n * remote install for hosts with only ftp access - no more problems with\n restricted host installation\n * full support for mirroring\n * support for bundling several packages into a single tarball\n * support for static dependencies on a url-based package\n * support for custom file roles and installation tasks"
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Structures_Graph",
|
||||
"version": "1.1.0",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Structures_Graph-1.1.0.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/structures_graph": "== 1.1.0.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"LGPL License"
|
||||
],
|
||||
"description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/Text_Diff",
|
||||
"version": "1.1.1",
|
||||
"version": "1.2.1",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/Text_Diff-1.1.1.tgz",
|
||||
"url": "http://pear.php.net/get/Text_Diff-1.2.1.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"php": ">=4.2.0.0"
|
||||
"php": ">=5.2.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/text_diff": "== 1.1.1.0"
|
||||
"pear-pear/text_diff": "== 1.2.1.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
@ -990,36 +849,6 @@
|
||||
"LGPL"
|
||||
],
|
||||
"description": "XML_Feed_Parser is a parser for (the various) RSS and Atom format XML feeds. It attempts to provide a somewhat unified API while still allowing access to the full details of each feed type."
|
||||
},
|
||||
{
|
||||
"name": "pear-pear.php.net/XML_Util",
|
||||
"version": "1.3.0",
|
||||
"dist": {
|
||||
"type": "file",
|
||||
"url": "http://pear.php.net/get/XML_Util-1.3.0.tgz",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
"require": {
|
||||
"ext-pcre": "*",
|
||||
"php": ">=5.3.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"pear-pear/xml_util": "== 1.3.0.0"
|
||||
},
|
||||
"type": "pear-library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
""
|
||||
]
|
||||
},
|
||||
"include-path": [
|
||||
"/"
|
||||
],
|
||||
"license": [
|
||||
"BSD License"
|
||||
],
|
||||
"description": "Selection of methods that are often needed when working with XML documents. Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
|
||||
}
|
||||
],
|
||||
"packages-dev": [],
|
||||
@ -1029,7 +858,7 @@
|
||||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
"php": ">=5.3.2,<=6.0.0alpha1"
|
||||
"php": ">=5.4,<=6.0.0alpha1"
|
||||
},
|
||||
"platform-dev": []
|
||||
}
|
||||
|
||||
@ -397,17 +397,13 @@ class mail_sieve
|
||||
throw new egw_exception_no_permission();
|
||||
}
|
||||
|
||||
if(PEAR::isError($error = $this->account->imapServer()->retrieveRules()) )
|
||||
{
|
||||
$rules = array();
|
||||
$emailNotification = array();
|
||||
}
|
||||
else
|
||||
{
|
||||
$rules = $this->account->imapServer()->getRules();
|
||||
try {
|
||||
$emailNotification = $this->account->imapServer()->getEmailNotification();
|
||||
}
|
||||
|
||||
catch(Exception $e) {
|
||||
unset($e);
|
||||
$emailNotification = array();
|
||||
}
|
||||
return $emailNotification;
|
||||
}
|
||||
|
||||
@ -1160,19 +1156,19 @@ class mail_sieve
|
||||
*/
|
||||
function getRules($ruleID = null)
|
||||
{
|
||||
if(PEAR::isError($error = $this->account->imapServer()->retrieveRules()) )
|
||||
{
|
||||
error_log(__METHOD__.__LINE__.$error->message);
|
||||
$this->rules = array();
|
||||
$this->rulesByID = array();
|
||||
$this->vacation = array();
|
||||
}
|
||||
else
|
||||
{
|
||||
try {
|
||||
$this->account->imapServer()->retrieveRules();
|
||||
$this->rules = $this->account->imapServer()->getRules();
|
||||
$this->rulesByID = $this->rules[$ruleID];
|
||||
$this->vacation = $this->account->imapServer()->getVacation();
|
||||
}
|
||||
catch(Exception $e) {
|
||||
error_log(__METHOD__.__LINE__.$e->getMessage().': '.$e->details);
|
||||
$this->rules = array();
|
||||
$this->rulesByID = array();
|
||||
$this->vacation = array();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user