Commit a4fd276f authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1174 Rename FLD_FLAGS_REPLYASUSER to FLD_FLAGS_SENDASOWNER to match

flag name in KOE, introduced FLD_FLAGS_TRACKSHARENAME (2) and
FLD_FLAGS_CALENDARREMINDERS (4).

Released under the Affero GNU General Public License (AGPL) version 3.
parent f68b1764
...@@ -461,13 +461,13 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -461,13 +461,13 @@ class BackendKopano implements IBackend, ISearchProvider {
ZLog::Write(LOGLEVEL_DEBUG, "KopanoBackend->SendMail(): Could not find FROM header to replace for send-as"); ZLog::Write(LOGLEVEL_DEBUG, "KopanoBackend->SendMail(): Could not find FROM header to replace for send-as");
} }
} }
// serverside Send-As - shared folder with DeviceManager::FLD_FLAGS_REPLYASUSER flag // serverside Send-As - shared folder with DeviceManager::FLD_FLAGS_SENDASOWNER flag
elseif (isset($sm->source->folderid)) { elseif (isset($sm->source->folderid)) {
// get the owner of this folder - System is not allowed // get the owner of this folder - System is not allowed
$sharedUser = ZPush::GetAdditionalSyncFolderStore($sm->source->folderid); $sharedUser = ZPush::GetAdditionalSyncFolderStore($sm->source->folderid);
if ($sharedUser != false && $sharedUser != 'SYSTEM') { if ($sharedUser != false && $sharedUser != 'SYSTEM') {
$folders = ZPush::GetAdditionalSyncFolders(); $folders = ZPush::GetAdditionalSyncFolders();
if (isset($folders[$sm->source->folderid]) && ($folders[$sm->source->folderid]->Flags & DeviceManager::FLD_FLAGS_REPLYASUSER)) { if (isset($folders[$sm->source->folderid]) && ($folders[$sm->source->folderid]->Flags & DeviceManager::FLD_FLAGS_SENDASOWNER)) {
$sendAs = $this->resolveRecipientGAL($sharedUser, 1); $sendAs = $this->resolveRecipientGAL($sharedUser, 1);
if (isset($sendAs[0])) { if (isset($sendAs[0])) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->SendMail(): Server side Send-As activated for shared folder. Sending as '%s'.", $sendAs[0]->emailaddress)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->SendMail(): Server side Send-As activated for shared folder. Sending as '%s'.", $sendAs[0]->emailaddress));
......
...@@ -840,7 +840,7 @@ class ASDevice extends StateObject { ...@@ -840,7 +840,7 @@ class ASDevice extends StateObject {
* @param string $folderid the folder id of the additional folder. * @param string $folderid the folder id of the additional folder.
* @param string $name the name of the additional folder (has to be unique for all folders on the device). * @param string $name the name of the additional folder (has to be unique for all folders on the device).
* @param string $type AS foldertype of SYNC_FOLDER_TYPE_USER_* * @param string $type AS foldertype of SYNC_FOLDER_TYPE_USER_*
* @param int $flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* @param string $parentid the parentid of this folder. * @param string $parentid the parentid of this folder.
* @param boolean $checkDups indicates if duplicate names and ids should be verified. Default: true * @param boolean $checkDups indicates if duplicate names and ids should be verified. Default: true
* *
...@@ -927,7 +927,7 @@ class ASDevice extends StateObject { ...@@ -927,7 +927,7 @@ class ASDevice extends StateObject {
* *
* @param string $folderid the folder id of the additional folder. * @param string $folderid the folder id of the additional folder.
* @param string $name the name of the additional folder (has to be unique for all folders on the device). * @param string $name the name of the additional folder (has to be unique for all folders on the device).
* @param int $flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* @param string $parentid the parentid of this folder. * @param string $parentid the parentid of this folder.
* @param boolean $checkDups indicates if duplicate names and ids should be verified. Default: true * @param boolean $checkDups indicates if duplicate names and ids should be verified. Default: true
* *
...@@ -1015,7 +1015,7 @@ class ASDevice extends StateObject { ...@@ -1015,7 +1015,7 @@ class ASDevice extends StateObject {
* 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used. * 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used.
* 'name' (string) the name of the additional folder (has to be unique for all folders on the device). * 'name' (string) the name of the additional folder (has to be unique for all folders on the device).
* 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_* * 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_*
* 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
......
...@@ -43,7 +43,9 @@ class DeviceManager { ...@@ -43,7 +43,9 @@ class DeviceManager {
const FLD_ORIGIN_SHARED = "S"; const FLD_ORIGIN_SHARED = "S";
const FLD_ORIGIN_GAB = "G"; const FLD_ORIGIN_GAB = "G";
const FLD_FLAGS_REPLYASUSER = 1; const FLD_FLAGS_SENDASOWNER = 1;
const FLD_FLAGS_TRACKSHARENAME = 2;
const FLD_FLAGS_CALENDARREMINDERS = 4;
private $device; private $device;
private $deviceHash; private $deviceHash;
......
...@@ -521,7 +521,7 @@ class ZPushAdmin { ...@@ -521,7 +521,7 @@ class ZPushAdmin {
* @param string $add_folderid the folder id of the additional folder. * @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the additional folder (has to be unique for all folders on the device). * @param string $add_name the name of the additional folder (has to be unique for all folders on the device).
* @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_* * @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_*
* @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
...@@ -564,7 +564,7 @@ class ZPushAdmin { ...@@ -564,7 +564,7 @@ class ZPushAdmin {
* @param string $devid device id of where the folder should be updated. * @param string $devid device id of where the folder should be updated.
* @param string $add_folderid the folder id of the additional folder. * @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the additional folder (has to be unique for all folders on the device). * @param string $add_name the name of the additional folder (has to be unique for all folders on the device).
* @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
...@@ -660,7 +660,7 @@ class ZPushAdmin { ...@@ -660,7 +660,7 @@ class ZPushAdmin {
* 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used. * 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used.
* 'name' (string) the name of the additional folder (has to be unique for all folders on the device). * 'name' (string) the name of the additional folder (has to be unique for all folders on the device).
* 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_* * 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_*
* 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
......
...@@ -179,7 +179,7 @@ class WebserviceDevice { ...@@ -179,7 +179,7 @@ class WebserviceDevice {
* @param string $add_folderid the folder id of the additional folder. * @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the additional folder (has to be unique for all folders on the device). * @param string $add_name the name of the additional folder (has to be unique for all folders on the device).
* @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_* * @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_*
* @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
...@@ -208,7 +208,7 @@ class WebserviceDevice { ...@@ -208,7 +208,7 @@ class WebserviceDevice {
* @param string $deviceId device id of where the folder should be updated. * @param string $deviceId device id of where the folder should be updated.
* @param string $add_folderid the folder id of the additional folder. * @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the additional folder (has to be unique for all folders on the device). * @param string $add_name the name of the additional folder (has to be unique for all folders on the device).
* @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * @param int $add_flags Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
...@@ -267,7 +267,7 @@ class WebserviceDevice { ...@@ -267,7 +267,7 @@ class WebserviceDevice {
* 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used. * 'parentid' (string) the folderid of the parent folder. If no parent folder is set or the parent folder is not defined, '0' (main folder) is used.
* 'name' (string) the name of the additional folder (has to be unique for all folders on the device). * 'name' (string) the name of the additional folder (has to be unique for all folders on the device).
* 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_* * 'type' (string) AS foldertype of SYNC_FOLDER_TYPE_USER_*
* 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_REPLYASUSER * 'flags' (int) Additional flags, like DeviceManager::FLD_FLAGS_SENDASOWNER
* *
* @access public * @access public
* @return boolean * @return boolean
......
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