From e4541e380b0f7ed33f8b26658f8c108f4988f874 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 17 Mar 2006 07:47:50 +0000 Subject: [PATCH] improved copy & paste git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2856 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupGeneric.inc | 14 +++++++------- plugins/admin/groups/class_groupMail.inc | 9 ++++----- plugins/admin/groups/tabs_group.inc | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index d009a6f1e..63fc8f760 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -821,9 +821,9 @@ class group extends plugin $dis = " disabled "; } - $str =" + $str ="
- - + -
". + ". _("Group name"). " @@ -833,19 +833,19 @@ class group extends plugin
+ "._("Force GID")."   +
"; - return($str); } @@ -855,10 +855,10 @@ class group extends plugin $this->cn = $_POST['cn']; } if(isset($_POST['force_gid'])){ - $this->force_gid = true; + $this->force_gid = 1; $this->gidNumber= $_POST['gidNumber']; }else{ - $this->force_gid = false; + $this->force_gid = 0; $this->gidNumber = false; } } diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index 64bf1be72..6f02f0794 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -47,7 +47,7 @@ class mailgroup extends plugin var $indexed_user= array(); /* attribute list for save action */ - var $attributes= array( "mail", "gosaMailServer", "gosaMailQuota", "gosaMailMaxSize", + var $attributes= array( "mail", "gosaMailServer", "gosaMailQuota", "gosaMailMaxSize", "gosaMailAlternateAddress", "gosaMailForwardingAddress", "gosaMailDeliveryMode", "gosaSpamSortLevel", "gosaSpamMailbox", "acl","gosaSharedFolderTarget", "gosaVacationMessage"); @@ -808,7 +808,7 @@ I: Only insider delivery */ if ($ldap->count() != 0){ $message[]= _("The primary address you've entered is already in use."); } - + /* Check quota */ if ($this->gosaMailQuota != '' && chkacl ($this->acl, "gosaMailQuota") == ""){ if (!is_numeric($this->gosaMailQuota)) { @@ -946,9 +946,9 @@ I: Only insider delivery */ { if(!$this->is_account) return(""); - $str =" + $str ="
-
". + ". _("Primary mail address"). " @@ -958,7 +958,6 @@ I: Only insider delivery */
"; - return($str); } diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc index 9205244d5..53031e89b 100644 --- a/plugins/admin/groups/tabs_group.inc +++ b/plugins/admin/groups/tabs_group.inc @@ -62,6 +62,22 @@ class grouptabs extends tabs return tabs::save(); } + function saveCopyDialog() + { + tabs::saveCopyDialog(); + + /* Update reference, transfer variables */ + $baseobject= $this->by_object['group']; + foreach ($this->by_object as $name => $obj){ + /* Don't touch base object */ + if ($name != 'group'){ + $obj->parent= &$this; + $obj->cn= $baseobject->cn; + $this->by_object[$name]= $obj; + } + } + } + } ?> -- 2.30.2