![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 0bff3f32651195801d26ac64e8db004ce7195bb9..2b5ae71c864e4d6a8fca2f7367dc92493ea134f6 100644 (file)
/* attribute list for save action */
var $attributes= array( "kolabFreeBusyFuture", "unrestrictedMailSize", "calFBURL");
- var $objectclasses= array();
+ var $objectclasses= array("kolab");
+
+ /* Helper */
+ var $imapping= array();
function kolabAccount ($config, $dn= NULL)
{
function execute()
{
+ /* Call parent execute */
+// plugin::execute();
+
/* Show tab dialog headers */
$display= "";
$smarty->assign($val."ACL", chkacl($this->acl, "$val"));
}
+ /* Check for invitation action */
+ $nr= 0;
+ while (isset($_POST["policy$nr"])){
+ if (isset($_POST["add$nr"])){
+ $this->kolabInvitationPolicy[]= ": ACT_MANUAL";
+ }
+ if (isset($_POST["remove$nr"])){
+ $new= array();
+ foreach ($this->kolabInvitationPolicy as $entry){
+ if (!preg_match("/^".$this->imapping[$nr].":/", $entry)){
+ $new[]= $entry;
+ }
+ }
+ $this->kolabInvitationPolicy= $new;
+ }
+ $nr++;
+ }
+
+ /* Unify addresses */
+ $new= array();
+ foreach($this->kolabInvitationPolicy as $value){
+ if (preg_match('/^:/', $value)){
+ continue;
+ }
+ $address= preg_replace('/^([^:]+:).*$/', '\1', $value);
+ $new[$address]= $value;
+ }
+ $this->kolabInvitationPolicy= array();
+ foreach($new as $value){
+ $this->kolabInvitationPolicy[]= $value;
+ }
+
/* Add delegation */
if (isset($_POST['add_delegation'])){
if ($_POST['delegate_address'] != ""){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->config->current['BASE']);
- $ldap->search('(mail='.$address.')');
+ $ldap->search('(mail='.$address.')',array("mail"));
if ($ldap->count() == 0){
print_red (_("The mail address you're trying to add is no primary mail address of an existing user."));
} else {
}
/* Transfer account states for this union */
- if ($this->parent->by_object['mailAccount']->is_account){
+ if (isset($this->parent) && $this->parent->by_object['mailAccount']->is_account){
$smarty->assign('is_account', 'true');
} else {
$smarty->assign('is_account', '');
}
/* Transfer delegation list */
- $smarty->assign("kolabDelegate", $this->kolabDelegate);
+ if (!count($this->kolabDelegate)){
+ /* Smarty will produce <option value=""></option> and tidy don't like that, so tell smarty to create no option (array();)*/
+ $smarty->assign("kolabDelegate", array());
+ } else {
+ $smarty->assign("kolabDelegate", $this->kolabDelegate);
+ }
+ $smarty->assign("kolabDelegateACL", chkacl($this->acl, $this->kolabDelegate));
/* Create InvitationPolicy table */
$invitation= "";
+ $this->imapping= array();
$nr= 0;
$acl= chkacl($this->acl, "kolabInvitationPolicy");
foreach ($this->kolabInvitationPolicy as $entry){
/* The default entry does not have colons... */
if (!preg_match('/:/', $entry)){
$invitation.= _("Anonymous");
+ $name= "";
$mode= $entry;
} else {
$name= preg_replace('/:.*$/', '', $entry);
- $mode= preg_replace('/^[^:]+: */', '', $entry);
- $invitation.= "<input name=\"address$nr\" size=25 maxlength=60 $acl value=\"$name\">";
+ $mode= preg_replace('/^[^:]*: */', '', $entry);
+ $invitation.= "<input name=\"address$nr\" size=16 maxlength=60 $acl value=\"$name\">";
}
$invitation.= "</td>";
/* Assign buttons */
$button= "";
if ($nr == count($this->kolabInvitationPolicy)-1){
- $button= "[Add button]";
- } elseif ($nr != 0) {
- $button= "[Remove button]";
+ $button= "<input type=submit name=\"add$nr\" value=\""._("Add")."\">";
+ }
+ if ($nr != 0) {
+ $button.= "<input type=submit name=\"remove$nr\" value=\""._("Remove")."\">";
}
$invitation.= "</select> $button</td></tr>\n";
+ $this->imapping[$nr]= $name;
$nr++;
}
$smarty->assign("invitation", $invitation);
}
/* Check for URL scheme... */
- if ($this->calFBURL != "" && !preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
+ if ($this->calFBURL != "" && !@preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
$message[]= _("The value specified as Free Busy Information URL is invalid.");
}
+ /* Check invitation policy for existing mail addresses */
+ foreach($this->kolabInvitationPolicy as $policy){
+
+ /* Ignore anonymous string */
+ if (!preg_match('/:/', $policy)){
+ continue;
+ }
+
+ $address= preg_replace('/^([^:]+).*$/', '\1', $policy);
+ if (!is_email($address)){
+ if (!is_email($address, TRUE)){
+ $message[]= sprintf(_("The invitation policy entry for address '%s' is not valid."), $address);
+ }
+ } else {
+
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->search('(mail='.$address.')',array("mail"));
+ if ($ldap->count() == 0){
+ $message[]= sprintf(_("There's no mail user with address '%s' for your invitation policy!"), $address);
+ } else {
+ $valid= TRUE;
+ }
+ }
+ }
+
return ($message);
}
$nr++;
}
+ /* If this one is empty, preset with ACT_MANUAL for anonymous users */
+ if (count ($this->kolabInvitationPolicy) == 0){
+ $this->kolabInvitationPolicy= array("ACT_MANUAL");
+ }
+
}
/* Save to LDAP */
function save()
{
+ /* Check mailmethod before doing something useful */
plugin::save();
- /* Transfer delegation array */
+ /* Transfer arrays */
$this->attrs['kolabDelegate']= $this->kolabDelegate;
+ $this->attrs['kolabInvitationPolicy']= $this->kolabInvitationPolicy;
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+$ldap->modify ($this->attrs);
+
show_ldap_error($ldap->get_error());
/* Optionally execute a command after we're done */