From 92f6cab32a20486b83340520e4a2f85f879f8be5 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 5 Jul 2006 09:22:42 +0000 Subject: [PATCH] Fixed kolabAccount work in newer connectivity class git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4027 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/acl_definition.inc | 12 ++ .../connectivity/class_kolabAccount.inc | 106 +++++++++++++----- plugins/personal/connectivity/kolab.tpl | 42 ++++--- 3 files changed, 121 insertions(+), 39 deletions(-) diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc index b616cbd26..92d285b9d 100644 --- a/plugins/admin/groups/acl_definition.inc +++ b/plugins/admin/groups/acl_definition.inc @@ -8,6 +8,17 @@ $ACLD['application']=array("cn" => "LDAP name", "gosaApplicationExecute" => "Execute", "gosaApplicationFlags" => "Modify flags", "gosaApplicationName" => "Visible name"); +$ACLD['mimetype']=array("cn" => "LDAP name", + "create" => "Create", + "delete" => "Delete", + "description" => "Description", + "gotoMimeIcon" => "Icon", + "gotoMimeApplication" => "Modify flags", + "gotoMimeEmbeddedApplication" => "Embedded applications", + "gotoMimeLeftClickAction" => "Left click actions", + "gotoMimeFilePattern" => "File patterns", + "gotoMimeGroup" => "Mime group", + "description" => "Description"); $ACLD['department']= array( "businessCategory", "description", @@ -314,5 +325,6 @@ $ACLD['FAIclass'] = array( // Allow displaying of FAI menu element "FAIclass" => "FAI management enabled"); $ACLD['goFonMacro'] =array("goFonMacro","edit","delete"); +$ACLD['kolabAccount'] =array("kolabAccount","kolabFreeBusyFuture", "unrestrictedMailSize", "calFBURL","kolabDelegate"); ?> diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc index 16e23b9fa..6fcbd06f9 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -2,28 +2,29 @@ class kolabAccount extends plugin { /* Definitions */ - var $plHeadline= "Kolab"; - var $plDescription= "This does something"; + var $plHeadline = "Kolab"; + var $plDescription = "This does something"; /* CLI vars */ - var $cli_summary= "Manage users Kolab account"; - var $cli_description= "Some longer text\nfor help"; - var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser"); + var $cli_summary = "Manage users Kolab account"; + var $cli_description = "Some longer text\nfor help"; + var $cli_parameters = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser"); /* Kolab attributes */ - var $kolabInvitationPolicy= array(); - var $kolabFreeBusyFuture= 60; - var $unrestrictedMailSize= 0; - var $calFBURL= ""; - var $kolabDelegate= array(); + var $kolabInvitationPolicy = array(); + var $kolabFreeBusyFuture = 60; + var $unrestrictedMailSize = 0; + var $calFBURL = ""; + var $kolabDelegate = array(); /* attribute list for save action */ - var $attributes= array( "kolabFreeBusyFuture", "unrestrictedMailSize", "calFBURL"); - var $objectclasses= array("kolab"); + var $attributes = array("kolabFreeBusyFuture", "unrestrictedMailSize", "calFBURL","kolabDelegate"); + var $objectclasses = array("kolabInetOrgPerson"); /* Helper */ var $imapping= array(); + function kolabAccount ($config, $dn= NULL) { plugin::plugin ($config, $dn); @@ -31,9 +32,11 @@ class kolabAccount extends plugin /* Pull arrays */ foreach(array("kolabDelegate", "kolabInvitationPolicy") as $attr){ if (isset($this->attrs["$attr"]["count"])){ + $tmp = array(); for ($i= 0; $i<$this->attrs["$attr"]["count"]; $i++){ - array_push($this->$attr, $this->attrs["$attr"][$i]); + $tmp[]=$this->attrs["$attr"][$i]; } + $this->$attr = $tmp; } } @@ -42,12 +45,23 @@ class kolabAccount extends plugin $this->kolabInvitationPolicy= array("ACT_MANUAL"); } + /* Check is account state */ + $this->is_account = false; + if(count($this->kolabDelegate)){ + $this->is_account = true; + } + foreach(array("calFBURL","unrestrictedMailSize") as $attr){ + if(!empty($this->$attr)){ + $this->is_account = true; + } + } } + function execute() { /* Call parent execute */ -// plugin::execute(); + plugin::execute(); /* Show tab dialog headers */ $display= ""; @@ -60,6 +74,7 @@ class kolabAccount extends plugin $smarty->assign("$val", $this->$val); $smarty->assign($val."ACL", chkacl($this->acl, "$val")); } + $smarty->assign("kolabAccountACL", chkacl($this->acl, "kolabAccountACL")); /* Check for invitation action */ $nr= 0; @@ -82,9 +97,6 @@ class kolabAccount extends plugin /* Unify addresses */ $new= array(); foreach($this->kolabInvitationPolicy as $value){ - if (preg_match('/^:/', $value)){ - continue; - } $address= preg_replace('/^([^:]+:).*$/', '\1', $value); $new[$address]= $value; } @@ -153,9 +165,11 @@ class kolabAccount extends plugin /* Transfer account states for this union */ if (isset($this->parent) && $this->parent->by_object['mailAccount']->is_account){ - $smarty->assign('is_account', 'true'); - } else { - $smarty->assign('is_account', ''); + $smarty->assign('mail_account', 'true'); + } elseif($this-> initially_was_account && (isset($this->attrs['objectClass']) && (in_array("kolabInetOrgPerson",$this->attrs['objectClass'])))){ + $smarty->assign('mail_account', 'true'); + }else{ + $smarty->assign('mail_account', ''); } /* Transfer delegation list */ @@ -172,8 +186,19 @@ class kolabAccount extends plugin $this->imapping= array(); $nr= 0; $acl= chkacl($this->acl, "kolabInvitationPolicy"); + $changeState = ""; foreach ($this->kolabInvitationPolicy as $entry){ + + $changeState .= "changeState('address".$nr."'); \n changeState('policy".$nr."'); \n + changeState('add".$nr."'); \n changeState('remove".$nr."'); \n"; + $invitation.= ""; + if($this->is_account){ + $dis = " "; + }else{ + $dis = " disabled "; + } + /* The default entry does not have colons... */ if (!preg_match('/:/', $entry)){ @@ -183,12 +208,12 @@ class kolabAccount extends plugin } else { $name= preg_replace('/:.*$/', '', $entry); $mode= preg_replace('/^[^:]*: */', '', $entry); - $invitation.= ""; + $invitation.= ""; } $invitation.= ""; /* Add mode switch */ - $invitation.= ""; foreach($policies as $key => $value){ if ($key == $mode){ $invitation.= ""; @@ -200,10 +225,10 @@ class kolabAccount extends plugin /* Assign buttons */ $button= ""; if ($nr == count($this->kolabInvitationPolicy)-1){ - $button= ""; + $button= ""; } if ($nr != 0) { - $button.= ""; + $button.= ""; } $invitation.= " $button\n"; @@ -211,15 +236,30 @@ class kolabAccount extends plugin $nr++; } $smarty->assign("invitation", $invitation); - + $smarty->assign("changeState", $changeState); + $smarty->assign("kolabState",$this->is_account); $display.= $smarty->fetch (get_template_path('kolab.tpl', TRUE, dirname(__FILE__))); + + return ($display); } function remove_from_parent() { /* Optionally execute a command after we're done */ + plugin::remove_from_parent(); + + if(!in_array("kolabInetOrgPerson",$this->attrs['objectClass'])){ + $this->attrs['objectClass'][] = "kolabInetOrgPerson"; + } + + $ldap = $this->config->get_ldap_linK(); + $ldap->cd($this->config->current['BASE']); + $ldap->cd ($this->dn); + $ldap->modify($this->attrs); + $this->handle_post_events('remove'); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/kolab account with dn '%s' failed."),$this->dn)); } @@ -272,6 +312,13 @@ class kolabAccount extends plugin { /* Do we need to flip is_account state? */ if (isset($_POST['connectivityTab'])){ + + if(isset($_POST["kolabState"])){ + $this->is_account = true; + }else{ + $this->is_account = false; + } + if (chkacl('unrestrictedMailSize', $this->acl == "")){ if (isset($_POST['unrestrictedMailSize']) && $_POST['unrestrictedMailSize'] == 1){ $this->unrestrictedMailSize= 1; @@ -316,13 +363,20 @@ class kolabAccount extends plugin $this->attrs['kolabDelegate']= $this->kolabDelegate; $this->attrs['kolabInvitationPolicy']= $this->kolabInvitationPolicy; + /* unrestrictedMailSize is boolean */ + if($this->attrs['unrestrictedMailSize']){ + $this->attrs['unrestrictedMailSize'] = "TRUE"; + }else{ + $this->attrs['unrestrictedMailSize'] = "FALSE"; + } + /* Write back to ldap */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->dn); $this->cleanup(); $ldap->modify ($this->attrs); - show_ldap_error($ldap->get_error(), _("Saving Kolab account failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/kolab account with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ if ($this->initially_was_account == $this->is_account){ diff --git a/plugins/personal/connectivity/kolab.tpl b/plugins/personal/connectivity/kolab.tpl index f5d8c1075..56ef2bbc3 100644 --- a/plugins/personal/connectivity/kolab.tpl +++ b/plugins/personal/connectivity/kolab.tpl @@ -1,27 +1,43 @@ -

{t}Kolab account{/t}

-{if $is_account ne 'true'} +{if $mail_account ne 'true'} +

{t}Kolab account{/t}

{t}The kolab account is currently disabled. It's features can be adjusted if you add a mail account.{/t} {else} - + +{t}Kolab account{/t} +
+

- {html_options values=$kolabDelegate output=$kolabDelegate}
- -   - + +   +

{t}Mail size{/t}
-   {t}No mail size restriction for this account{/t} +   {t}No mail size restriction for this account{/t}

@@ -33,11 +49,11 @@ - + - +
{t}days{/t} {t}days{/t}
-- 2.30.2