Commit 12566e80 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-682 updated classmap for CalDav and CardDav backends. Removed

includes from the backends.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 04cf5398
......@@ -45,10 +45,6 @@
// config file
require_once("backend/caldav/config.php");
// TODO: remove this after ZP-682 merge
require_once("include/z_caldav.php");
require_once("include/iCalendar.php");
require_once("include/z_RTF.php");
class BackendCalDAV extends BackendDiff {
/**
......
......@@ -43,8 +43,6 @@
// config file
require_once("backend/carddav/config.php");
// TODO: remove this after ZP-682 merge
require_once("include/z_carddav.php");
class BackendCardDAV extends BackendDiff implements ISearchProvider {
......
{
"autoload": {
"classmap": ["autodiscover/", "include/", "lib/"],
"files": ["version.php", "lib/core/zpush-utils.php", "lib/core/zpushdefs.php", "lib/utils/compat.php"]
"files": ["version.php", "lib/core/zpushdefs.php", "lib/utils/compat.php"]
}
}
......@@ -11,6 +11,8 @@ return array(
'Backend' => $baseDir . '/lib/default/backend.php',
'BackendDiff' => $baseDir . '/lib/default/diffbackend/diffbackend.php',
'BodyPreference' => $baseDir . '/lib/core/bodypreference.php',
'CalDAVClient' => $baseDir . '/include/z_caldav.php',
'CalendarInfo' => $baseDir . '/include/z_caldav.php',
'ChangesMemoryWrapper' => $baseDir . '/lib/core/changesmemorywrapper.php',
'ContentParameters' => $baseDir . '/lib/core/contentparameters.php',
'DeviceManager' => $baseDir . '/lib/core/devicemanager.php',
......@@ -19,6 +21,7 @@ return array(
'FatalException' => $baseDir . '/lib/exceptions/fatalexception.php',
'FatalMisconfigurationException' => $baseDir . '/lib/exceptions/fatalmisconfigurationexception.php',
'FatalNotImplementedException' => $baseDir . '/lib/exceptions/fatalnotimplementedexception.php',
'FileLog' => $baseDir . '/lib/log/filelog.php',
'FileStateMachine' => $baseDir . '/lib/default/filestatemachine.php',
'FolderChange' => $baseDir . '/lib/request/folderchange.php',
'FolderSync' => $baseDir . '/lib/request/foldersync.php',
......@@ -37,6 +40,7 @@ return array(
'ImportChangesStream' => $baseDir . '/lib/core/streamimporter.php',
'InterProcessData' => $baseDir . '/lib/core/interprocessdata.php',
'ItemOperations' => $baseDir . '/lib/request/itemoperations.php',
'Log' => $baseDir . '/lib/log/log.php',
'LoopDetection' => $baseDir . '/lib/core/loopdetection.php',
'Mail_RFC822' => $baseDir . '/include/z_RFC822.php',
'Mail_mimeDecode' => $baseDir . '/include/mimeDecode.php',
......@@ -104,6 +108,7 @@ return array(
'SyncTaskRecurrence' => $baseDir . '/lib/syncobjects/synctaskrecurrence.php',
'SyncUserInformation' => $baseDir . '/lib/syncobjects/syncuserinformation.php',
'SyncValidateCert' => $baseDir . '/lib/syncobjects/syncvalidatecert.php',
'Syslog' => $baseDir . '/lib/log/syslog.php',
'TimezoneUtil' => $baseDir . '/lib/utils/timezoneutil.php',
'TopCollector' => $baseDir . '/lib/core/topcollector.php',
'Utils' => $baseDir . '/lib/utils/utils.php',
......@@ -120,6 +125,10 @@ return array(
'ZPushAdmin' => $baseDir . '/lib/utils/zpushadmin.php',
'ZPushAutodiscover' => $baseDir . '/autodiscover/autodiscover.php',
'ZPushException' => $baseDir . '/lib/exceptions/zpushexception.php',
'ZSyslog' => $baseDir . '/include/z_syslog.php',
'carddav_backend' => $baseDir . '/include/z_carddav.php',
'iCalComponent' => $baseDir . '/include/iCalendar.php',
'iCalProp' => $baseDir . '/include/iCalendar.php',
'iCalendar' => $baseDir . '/include/iCalendar.php',
'replace_nullchar_filter' => $baseDir . '/lib/wbxml/replacenullcharfilter.php',
'rtf' => $baseDir . '/include/z_RTF.php',
);
......@@ -7,7 +7,6 @@ $baseDir = dirname($vendorDir);
return array(
'158e247719544c05f5e89c414f630c24' => $baseDir . '/version.php',
'23e8c3c5e051a522b6e8f9c62ef9902f' => $baseDir . '/lib/core/zpush-utils.php',
'7e65a9fc8bb44d8c2fe16fa283aeaaee' => $baseDir . '/lib/core/zpushdefs.php',
'd2a63a53b4a43a2bd71de0cec5c1abfb' => $baseDir . '/lib/utils/compat.php',
);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment