WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kolab update

This commit is contained in:
Roland Gruber 2013-11-03 20:00:12 +00:00
parent 384a30fab6
commit 5ca1f7528d
3 changed files with 93 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/config/templates/pdf/default.kolabSharedFolderType.xml
View File

@ -1,6 +1,8 @@
<pdf type="kolabSharedFolderType" filename="printLogo.jpg" headline="Shared folder information" foldingmarks="no"> <pdf type="kolabSharedFolderType" filename="printLogo.jpg" headline="Shared folder information" foldingmarks="no">
<section name="_kolabSharedFolder_cn"> <section name="_kolabSharedFolder_cn">
<entry name="kolabSharedFolder_mailHost" /> <entry name="kolabSharedFolder_mailHost" />
<entry name="kolabSharedFolder_kolabTargetFolder" />
<entry name="kolabSharedFolder_kolabFolderType" />
<entry name="kolabSharedFolder_delegate" /> <entry name="kolabSharedFolder_delegate" />
<entry name="kolabSharedFolder_aliases" /> <entry name="kolabSharedFolder_aliases" />
<entry name="kolabSharedFolder_kolabAllowSMTPSender" /> <entry name="kolabSharedFolder_kolabAllowSMTPSender" />

9
lam/lib/html.inc
View File

@ -259,6 +259,15 @@ class htmlTable extends htmlElement {
$this->addElement(new htmlSpacer($width, null)); $this->addElement(new htmlSpacer($width, null));
} }
/**
* Adds an htmlSpacer with the given height and ends the row.
*
* @param String $height height (e.g. 10px)
*/
public function addVerticalSpace($height) {
$this->addElement(new htmlSpacer(null, $height), true);
}
/** /**
* Prints the HTML code for this element. * Prints the HTML code for this element.
* *

88
lam/lib/modules/kolabSharedFolder.inc
View File

@ -32,7 +32,7 @@ $Id$
* *
* @package modules * @package modules
*/ */
class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFolder class kolabSharedFolder extends baseModule { // TODO folder type
/** cache for mailHost values */ /** cache for mailHost values */
private $mailHostCache = null; private $mailHostCache = null;
@ -50,11 +50,11 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
parent::__construct($scope); parent::__construct($scope);
$this->folderTypes = array( $this->folderTypes = array(
// TODO reactivate types when stable 3.1 is released // TODO reactivate types when stable 3.1 is released
/*_('Shared Address Book') => 'addressbook', /*_('Shared address book') => 'addressbook',
_('Shared Calendar') => 'calendar', _('Shared calendar') => 'calendar',
_('Shared Journal') => 'journal', _('Shared journal') => 'journal',
_('Shared Tasks') => 'task',*/ _('Shared tasks') => 'task',*/
_('Shared Mail Folder') => 'mail', _('Shared mail folder') => 'mail',
); );
} }
@ -147,6 +147,14 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
"Headline" => _("Mailbox home server"), 'attr' => 'mailHost', "Headline" => _("Mailbox home server"), 'attr' => 'mailHost',
"Text" => _("The name of the server where the mailbox is located.") "Text" => _("The name of the server where the mailbox is located.")
), ),
'kolabTargetFolder' => array(
"Headline" => _("Target IMAP folder"), 'attr' => 'kolabTargetFolder',
"Text" => _("The folder on the server where the shared folder is located (e.g. user/myfolder@example.com).")
),
'kolabFolderType' => array(
"Headline" => _("Type"), 'attr' => 'kolabFolderType',
"Text" => _("Specifies the folder type (e.g. shared mail folder).")
),
'deleteFlag' => array( 'deleteFlag' => array(
"Headline" => _("Mark for deletion"), 'attr' => 'kolabDeleteflag', "Headline" => _("Mark for deletion"), 'attr' => 'kolabDeleteflag',
"Text" => _("This will set a special flag on the account which tells Kolabd to remove it. Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes).") "Text" => _("This will set a special flag on the account which tells Kolabd to remove it. Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes).")
@ -173,6 +181,19 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
'description' => _('Mailbox home server'), 'description' => _('Mailbox home server'),
'help' => 'mailHost', 'help' => 'mailHost',
'example' => 'localhost', 'example' => 'localhost',
),
array(
'name' => 'kolabSharedFolder_kolabTargetFolder',
'description' => _('Target IMAP folder'),
'help' => 'kolabTargetFolder',
'example' => 'user/myfolder@example.com',
'required' => true
),
array(
'name' => 'kolabSharedFolder_kolabFolderType',
'description' => _('Type'),
'help' => 'kolabFolderType',
'example' => 'mail',
'required' => true 'required' => true
), ),
array( array(
@ -209,6 +230,8 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
'delegate' => _('Delegates'), 'delegate' => _('Delegates'),
'mailHost' => _('Mailbox home server'), 'mailHost' => _('Mailbox home server'),
'mail' => _('Email address'), 'mail' => _('Email address'),
'kolabTargetFolder' => _('Target IMAP folder'),
'kolabFolderType' => _('Type'),
); );
return $return; return $return;
} }
@ -227,9 +250,10 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$this->messages['delegate'][0] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_delegates', _('Unknown delegate address: %s')); $this->messages['delegate'][0] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_delegates', _('Unknown delegate address: %s'));
$this->messages['mailHost'][0] = array('ERROR', _('Mailbox home server name is invalid!')); // third array value is set dynamically $this->messages['mailHost'][0] = array('ERROR', _('Mailbox home server name is invalid!')); // third array value is set dynamically
$this->messages['mailHost'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_mailHost', _('Mailbox home server name is invalid!')); $this->messages['mailHost'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_mailHost', _('Mailbox home server name is invalid!'));
$this->messages['mailHost'][2] = array('ERROR', _('Mailbox home server name is empty!'));
$this->messages['mail'][0] = array('ERROR', _('Email address'), _('Please enter a valid email address!')); $this->messages['mail'][0] = array('ERROR', _('Email address'), _('Please enter a valid email address!'));
$this->messages['mail'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_mail', _('Please enter a valid email address!')); $this->messages['mail'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_mail', _('Please enter a valid email address!'));
$this->messages['cn'][0] = array('ERROR', _('Name'), _('Please enter a name.'));
$this->messages['kolabTargetFolder'][0] = array('ERROR', _('Target IMAP folder'), _('Please enter a target folder.'));
} }
/** /**
@ -251,13 +275,28 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$this->addSimpleInputTextField($baseContainer, 'mail', _('Email address'), true); $this->addSimpleInputTextField($baseContainer, 'mail', _('Email address'), true);
// mailbox server // mailbox server
if (!isset($this->orig['mailHost'][0])) { // value currently not set if (!isset($this->orig['mailHost'][0])) { // value currently not set
$this->addSimpleInputTextField($baseContainer, 'mailHost', _('Mailbox home server'), true); $this->addSimpleInputTextField($baseContainer, 'mailHost', _('Mailbox home server'));
} }
else { // input is unchangable when set else { // input is unchangable when set
$baseContainer->addElement(new htmlOutputText(_('Mailbox home server'))); $baseContainer->addElement(new htmlOutputText(_('Mailbox home server')));
$baseContainer->addElement(new htmlOutputText($this->attributes['mailHost'][0])); $baseContainer->addElement(new htmlOutputText($this->attributes['mailHost'][0]));
$baseContainer->addElement(new htmlHelpLink('mailHost'), true); $baseContainer->addElement(new htmlHelpLink('mailHost'), true);
} }
// target folder
$this->addSimpleInputTextField($baseContainer, 'kolabTargetFolder', _('Target IMAP folder'), true);
// folder type
$possibleTypes = $this->folderTypes;
$selectedTypes = array('mail');
if (!empty($this->attributes['kolabFolderType'])) {
$selectedTypes = $this->attributes['kolabFolderType'];
if (!in_array($this->attributes['kolabFolderType'][0], $possibleTypes)) {
$possibleTypes[$this->attributes['kolabFolderType'][0]] = $this->attributes['kolabFolderType'][0];
}
}
$typeSelect = new htmlTableExtendedSelect('kolabFolderType', $possibleTypes, $selectedTypes, _('Type'), 'kolabFolderType');
$typeSelect->setHasDescriptiveElements(true);
$baseContainer->addElement($typeSelect, true);
$baseContainer->addVerticalSpace('10px');
// allowed recepients // allowed recepients
$this->addMultiValueInputTextField($baseContainer, 'kolabAllowSMTPRecipient', _('Allowed recepients')); $this->addMultiValueInputTextField($baseContainer, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
// allowed senders // allowed senders
@ -314,6 +353,9 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$errors = array(); $errors = array();
// cn // cn
$this->attributes['cn'][0] = $_POST['cn']; $this->attributes['cn'][0] = $_POST['cn'];
if (empty($_POST['cn'])) {
$errors[] = $this->messages['cn'][0];
}
// mail // mail
$this->attributes['mail'][0] = $_POST['mail']; $this->attributes['mail'][0] = $_POST['mail'];
if (empty($_POST['mail']) || !get_preg($_POST['mail'], 'email')) { if (empty($_POST['mail']) || !get_preg($_POST['mail'], 'email')) {
@ -321,10 +363,11 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
} }
// mailbox server // mailbox server
if (isset($_POST['mailHost'])) { if (isset($_POST['mailHost'])) {
if ($_POST['mailHost'] == "") { if (($_POST['mailHost'] == "") && isset($this->attributes['mailHost'])) {
$errors[] = $this->messages['mailHost'][2]; unset($this->attributes['mailHost']);
} }
elseif (get_preg($_POST['mailHost'], 'DNSname')) { elseif (!empty($_POST['mailHost'])) {
if (get_preg($_POST['mailHost'], 'DNSname')) {
$this->attributes['mailHost'][0] = $_POST['mailHost']; $this->attributes['mailHost'][0] = $_POST['mailHost'];
} }
else { else {
@ -333,6 +376,14 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$errors[] = $message; $errors[] = $message;
} }
} }
}
// target folder
$this->attributes['kolabTargetFolder'][0] = $_POST['kolabTargetFolder'];
if (empty($_POST['kolabTargetFolder'])) {
$errors[] = $this->messages['kolabTargetFolder'][0];
}
// folder type
$this->attributes['kolabFolderType'][0] = $_POST['kolabFolderType'];
// allowed recepients // allowed recepients
$this->processMultiValueInputTextField('kolabAllowSMTPRecipient', $errors, 'kolabEmailPrefix'); $this->processMultiValueInputTextField('kolabAllowSMTPRecipient', $errors, 'kolabEmailPrefix');
// allowed senders // allowed senders
@ -426,7 +477,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$partialAccounts[$i]['mail'] = $rawAccounts[$i][$ids['kolabSharedFolder_mail']]; $partialAccounts[$i]['mail'] = $rawAccounts[$i][$ids['kolabSharedFolder_mail']];
} }
// mailbox server // mailbox server
if ($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']] != "") { if (!empty($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']])) {
if (get_preg($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']], 'DNSname')) { if (get_preg($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']], 'DNSname')) {
$partialAccounts[$i]['mailHost'] = $rawAccounts[$i][$ids['kolabSharedFolder_mailHost']]; $partialAccounts[$i]['mailHost'] = $rawAccounts[$i][$ids['kolabSharedFolder_mailHost']];
} }
@ -436,6 +487,10 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$messages[] = $errMsg; $messages[] = $errMsg;
} }
} }
// target folder
$partialAccounts[$i]['kolabTargetFolder'] = $rawAccounts[$i][$ids['kolabSharedFolder_kolabTargetFolder']];
// folder type
$partialAccounts[$i]['kolabFolderType'] = $rawAccounts[$i][$ids['kolabSharedFolder_kolabFolderType']];
// allowed recipients // allowed recipients
if (!empty($rawAccounts[$i][$ids['kolabSharedFolder_kolabAllowSMTPRecipient']])) { if (!empty($rawAccounts[$i][$ids['kolabSharedFolder_kolabAllowSMTPRecipient']])) {
$mails = preg_split('/;[ ]*/', $rawAccounts[$i][$ids['kolabSharedFolder_kolabAllowSMTPRecipient']]); $mails = preg_split('/;[ ]*/', $rawAccounts[$i][$ids['kolabSharedFolder_kolabAllowSMTPRecipient']]);
@ -510,10 +565,19 @@ class kolabSharedFolder extends baseModule { // TODO folder type + kolabTargetFo
$this->addSimplePDFField($return, 'cn', _('Name')); $this->addSimplePDFField($return, 'cn', _('Name'));
$this->addSimplePDFField($return, 'mail', _('Email address')); $this->addSimplePDFField($return, 'mail', _('Email address'));
$this->addSimplePDFField($return, 'mailHost', _('Mailbox home server')); $this->addSimplePDFField($return, 'mailHost', _('Mailbox home server'));
$this->addSimplePDFField($return, 'kolabTargetFolder', _('Target IMAP folder'));
$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients')); $this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
$this->addSimplePDFField($return, 'kolabAllowSMTPSender', _('Allowed senders')); $this->addSimplePDFField($return, 'kolabAllowSMTPSender', _('Allowed senders'));
$this->addSimplePDFField($return, 'aliases', _('Email aliases'), 'alias'); $this->addSimplePDFField($return, 'aliases', _('Email aliases'), 'alias');
$this->addSimplePDFField($return, 'delegate', _('Delegates'), 'kolabDelegate'); $this->addSimplePDFField($return, 'delegate', _('Delegates'), 'kolabDelegate');
if (!empty($this->attributes['kolabFolderType'])) {
$type = $this->attributes['kolabFolderType'][0];
$typeList = array_flip($this->folderTypes);
if (isset($typeList[$type])) {
$type = $typeList[$type];
}
$return[get_class($this) . '_kolabFolderType'] = array('<block><key>' . _('Type') . '</key><value>' . $type . '</value></block>');
}
return $return; return $return;
} }