Added Checkboxes to user multiple edit

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8075 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 51547403d0f4864ca433508f29e500c5f1e8162a..ff6786f10ec0bf8c75e7bdd14902bb384f012f99 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -128,6 +128,7 @@ class plugin
   /* This aviable indicates, that we are currently in multiple edit handle */
   var $multiple_support_active = FALSE; 
   var $selected_edit_values = array();
+  var $multi_boxes = array();
 
   /*! \brief plugin constructor
 
@@ -1701,11 +1702,6 @@ class plugin
    */
   function init_multiple_support()
   {
-    foreach($this->attributes as $attr){
-      if(isset($this->$attr) && is_string($this->$attr)){
-        $this->$attr = "{default}";
-      }
-    }
   }
 
 
@@ -1716,7 +1712,7 @@ class plugin
   {
     $ret = array();
     foreach($this->attributes as $attr){
-      if($this->$attr != "{default}"){
+      if(in_array($attr,$this->multi_boxes)){
         $ret[$attr] = $this->$attr;
       }
     }

diff --git a/include/smarty/plugins/block.render.php b/include/smarty/plugins/block.render.php
index 40a456aef679e984256f3c2ab3758757f96b1a89..e58e9ad1ab380b2699c34dabffa8f7c76a46da32 100755 (executable)
--- a/include/smarty/plugins/block.render.php
+++ b/include/smarty/plugins/block.render.php
@@ -26,7 +26,7 @@ function smarty_block_render($params, $text, &$smarty)
      * The parameter 'checked' specifies whether the box is checked or not.
      *  The checkbox disables or enables the current object.
      */
-       if(isset($params['checkbox'])){
+       if(isset($params['checkbox']) && $params['checkbox']){
 
                /* Detect name and id of the current object */
                $use_text = preg_replace("/\n/"," ",$text);

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index ba6943ce855a75cabe0de911721ec31e8c914224..b08f0c1a13e9ad53cdd68af7e16f3a4049c54ab5 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -109,11 +109,12 @@ class user extends plugin
   var $multiple_support = TRUE;
   var $multiple_user_handles  = array();
 
+  var $multi_boxes = array();
+
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
   function user (&$config, $dn= NULL)
   {
-
     $this->config= $config;
     /* Configuration is fine, allways */
     if ($this->config->current['GOVERNMENTMODE']){
@@ -282,12 +283,7 @@ class user extends plugin
     /* Assign sex */
     $sex= array(0 => " ", "F" => _("female"), "M" => _("male"));
     $smarty->assign("gender_list", $sex);
-    
-    if($this->multiple_support_active){
-      $language= array_merge(array(0 => " ","{default}"=>"{default}") ,get_languages(TRUE));
-    }else{
-      $language= array_merge(array(0 => " ") ,get_languages(TRUE));
-    }
+    $language= array_merge(array(0 => " ") ,get_languages(TRUE));
     $smarty->assign("preferredLanguage_list", $language);
 
     /* Get random number for pictures */
@@ -559,13 +555,10 @@ class user extends plugin
     $temp= passwordMethod::get_available_methods();
     $is_configurable= FALSE;
     $hashes = $temp['name'];
-    if($this->multiple_support_active){
-      $hashes["{default}"] = "{default}";
-    }
     if(isset($temp[$this->pw_storage])){
       $test= new $temp[$this->pw_storage]($this->config);
       $is_configurable= $test->is_configurable();
-    }elseif($this->pw_storage != "{default}"){
+    }else{
       new msg_dialog(_("Password method"),_("The selected password method is no longer available."),WARNING_DIALOG);
     }
     
@@ -573,6 +566,18 @@ class user extends plugin
     $ui =get_userinfo();
     foreach($this->attributes as $val){
       $smarty->assign("$val", $this->$val);
+      if(in_array($val,$this->multi_boxes)){
+        $smarty->assign("use_".$val,TRUE);
+      }else{
+        $smarty->assign("use_".$val,FALSE);
+      }
+    }
+    foreach(array("base","pw_storage","edit_picture") as $val){
+      if(in_array($val,$this->multi_boxes)){
+        $smarty->assign("use_".$val,TRUE);
+      }else{
+        $smarty->assign("use_".$val,FALSE);
+      }
     }
 
     /* Set acls */
@@ -592,9 +597,6 @@ class user extends plugin
 
     /* Create base acls */
     $tmp = @$this->allowedBasesToMoveTo();
-    if($this->multiple_support_active){
-      $tmp['{default}'] = "{"._("default")."}";
-    }
     $smarty->assign("bases", $tmp);
 
     /* Save government mode attributes */
@@ -990,7 +992,6 @@ class user extends plugin
       return (1);
     }
 
-
     /* Remove ACL dependencies too */
     if($this->dn != $this->orig_dn && $this->orig_dn != "new"){
       $tmp = new acl($this->config,$this->parent,$this->dn);
@@ -1173,8 +1174,8 @@ class user extends plugin
   /* Indicate whether a password change is needed or not */
   function password_change_needed()
   {
-    if($this->pw_storage == "{default}"){
-      return(FALSE);
+    if(in_array("pw_storage",$this->multi_boxes)){
+      return(TRUE);
     }
     return($this->pw_storage != $this->last_pw_storage);
   }
@@ -1468,17 +1469,16 @@ class user extends plugin
   function init_multiple_support()
   {
     plugin::init_multiple_support();
-    $this->pw_storage = "{default}";
   }
 
 
   function get_multi_edit_values()
   {
     $ret = plugin::get_multi_edit_values();
-    if($this->pw_storage != "{default}"){
+    if(in_array("pw_storage",$this->multi_boxes)){
       $ret['pw_storage'] = $this->pw_storage;
     }
-    if($this->jpegPhoto != "{default}"){
+    if(in_array("edit_picture",$this->multi_boxes)){
       $ret['jpegPhoto'] = $this->jpegPhoto;
       $ret['photoData'] = $this->photoData;
       $ret['old_jpegPhoto'] = $this->old_jpegPhoto;
@@ -1491,7 +1491,7 @@ class user extends plugin
       unset($ret['cn']);
     }
     $ret['is_modified'] = $this->is_modified;
-    if($this->base != "{default}"){
+    if(in_array("base",$this->multi_boxes)){
       $ret['orig_base']="Changed_by_Multi_Plug";
       $ret['base']=$this->base;
     }
@@ -1518,6 +1518,20 @@ class user extends plugin
     if(isset($_POST['base'])){
       $this->base = get_post('base');
     }
+
+    if(isset($_POST['user_mulitple_edit'])){
+      $this->multi_boxes = array();
+      foreach($this->attributes as $val){
+        if(isset($_POST["use_".$val])){
+          $this->multi_boxes[] = $val;
+        }
+      }
+      foreach(array("base","pw_storage","edit_picture") as $val){
+        if(isset($_POST["use_".$val])){
+          $this->multi_boxes[] = $val;
+        }
+      }
+    }
   }
 
   
@@ -1530,37 +1544,31 @@ class user extends plugin
     if($this->dn == "new") {
       $this->set_acl_base($this->base);
     }
-    if ($this->sn == ""){
-      $message[]= _("The required field 'Name' is not set.");
-    }
-    if ($this->givenName == ""){
-      $message[]= _("The required field 'Given name' is not set.");
-    }
-    if (!is_url($this->labeledURI) && $this->labeledURI != "{default}"){
+    if (!is_url($this->labeledURI) && in_array("labeledURI",$this->multi_boxes)){
       $message[]= _("The field 'Homepage' contains an invalid URL definition.");
     }
-    if (preg_match ("/[\\\\]/", $this->sn) && $this->sn != "{default}"){
+    if (preg_match ("/[\\\\]/", $this->sn) && in_array("sn",$this->multi_boxes)){
       $message[]= _("The field 'Name' contains invalid characters.");
     }
-    if (preg_match ("/[\\\\]/", $this->givenName) && $this->givenName != "{default}"){
+    if (preg_match ("/[\\\\]/", $this->givenName) && in_array("givenName",$this->multi_boxes)){
       $message[]= _("The field 'Given name' contains invalid characters.");
     }
-    if (!is_phone_nr($this->telephoneNumber) && $this->telephoneNumber != "{default}"){
+    if (!is_phone_nr($this->telephoneNumber) && in_array("telephoneNumber",$this->multi_boxes)){
       $message[]= _("The field 'Phone' contains an invalid phone number.");
     }
-    if (!is_phone_nr($this->facsimileTelephoneNumber) && $this->facsimileTelephoneNumber != "{default}"){
+    if (!is_phone_nr($this->facsimileTelephoneNumber) &&  in_array("facsimileTelephoneNumber",$this->multi_boxes)){
       $message[]= _("The field 'Fax' contains an invalid phone number.");
     }
-    if (!is_phone_nr($this->mobile) && $this->mobile != "{default}"){
+    if (!is_phone_nr($this->mobile) && in_array("mobile",$this->multi_boxes)){
       $message[]= _("The field 'Mobile' contains an invalid phone number.");
     }
-    if (!is_phone_nr($this->pager) && $this->pager != "{default}"){
+    if (!is_phone_nr($this->pager) && in_array("pager",$this->multi_boxes)){
       $message[]= _("The field 'Pager' contains an invalid phone number.");
     }
-    if (preg_match ('/[,+"?\'()=<>;]/', $this->givenName) && $this->givenName != "{default}"){
+    if (preg_match ('/[,+"?\'()=<>;]/', $this->givenName) && in_array("givenName",$this->multi_boxes)){
       $message[]= _("The field 'Given name' contains invalid characters.");
     }
-    if (preg_match ('/[,+"?\'()=<>;]/', $this->sn) && $this->sn != "{default}"){
+    if (preg_match ('/[,+"?\'()=<>;]/', $this->sn) && in_array("sn",$this->multi_boxes)){
       $message[]= _("The field 'Name' contains invalid characters.");
     }
     return($message);

diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index 998165b37185c9baf562b89a828d16d386c878d4..1127e944125c310cd0b91765947e78b1e64fa18e 100644 (file)
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -25,9 +25,9 @@
           </tr>
           <tr>
                <td>
-               {render acl=$userPictureACL}
+{render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture}
                        <input style='vertical-align:top;' type="submit" name="edit_picture" value="{t}Change picture{/t}...">
-               {/render}
+{/render}
                </td>
           </tr>
          </table>
@@ -82,9 +82,9 @@
      <td><label for="uid">{t}Login{/t}{$must}</label></td>
      <td>
                {if !$multiple_support}
-               {render acl=$uidACL}
+{render acl=$uidACL}
                        <input id="uid" name="uid" size=25 maxlength=60  value="{$uid}">
-               {/render}
+{/render}
                {else}
                        <input id="uid" name="dummy1" size=25 maxlength=60  value="{t}Multiple edit{/t}" disabled>
                {/if}
@@ -99,17 +99,17 @@
      </td>
      <td>
       <div style="height:10px;"></div>
-       {render acl=$personalTitleACL}
+{render acl=$personalTitleACL checkbox=$multiple_support checked=$use_personalTitle}
                <input id="personalTitle" name="personalTitle" size=25 maxlength=60 value="{$personalTitle}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="academicTitle">{t}Academic title{/t}</label></td>
      <td>
-       {render acl=$academicTitleACL}
+{render acl=$academicTitleACL checkbox=$multiple_support checked=$use_academicTitle}
              <input id="academicTitle" name="academicTitle" size=25 maxlength=60 value="{$academicTitle}">
-       {/render}
+{/render}
      </td>
     </tr>
 {if !$multiple_support}
@@ -120,7 +120,7 @@
      </td>
      <td>
       <div style="height:10px;"></div>
-       {render acl=$dateOfBirthACL}
+{render acl=$dateOfBirthACL}
              {if $use_dob eq 1}
              <select id="day" name=day onChange="createResult(this.form,this.form.dateOfBirth);"> 
               {html_options values=$days output=$days selected=$day}
@@ -136,21 +136,19 @@
              {else}
              <input type="submit" name="set_dob" value="{t}Set{/t}" >
              {/if}
-       {/render}
+{/render}
      </td>
     </tr>
-{/if}
-{if !$multiple_support}
     <tr>
      <td>
       <label for="gender">{t}Sex{/t}</label>
      </td>
      <td>
-       {render acl=$genderACL}
+{render acl=$genderACL}
              <select size="1" id="gender" name="gender">
               {html_options options=$gender_list selected=$gender}
              </select>
-       {/render}
+{/render}
      </td>
     </tr>
 {/if}
@@ -159,11 +157,11 @@
       <label for="preferredLanguage">{t}Preferred langage{/t}</label>
      </td>
      <td>
-       {render acl=$preferredLanguageACL}
+{render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
              <select size="1" id="preferredLanguage" name="preferredLanguage">
               {html_options options=$preferredLanguage_list selected=$preferredLanguage}
              </select>
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
@@ -173,14 +171,14 @@
      </td>
      <td>
       <div style="height:10px;"></div>
-       {render acl=$baseACL}
+{render acl=$baseACL checkbox=$multiple_support checked=$use_base}
                <select id="base" size="1" name="base" title="{t}Choose subtree to place user in{/t}">
                        {html_options options=$bases selected=$base_select}
                </select>
-       {/render}
-       {render acl=$baseACL disable_picture='images/folder_gray.png'}
+{/render}
+{render acl=$baseACL disable_picture='images/folder_gray.png'}
                <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -195,25 +193,25 @@
     <tr>
      <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
       <td>
-       {render acl=$homePostalAddressACL}
+{render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress}
             <textarea id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="homePhone">{t}Private phone{/t}</label>
      </td><td>
-       {render acl=$homePhoneACL}
+{render acl=$homePhoneACL checkbox=$multiple_support checked=$use_homePhone}
             <input id="homePhone" name="homePhone" size=25 maxlength=60 value="{$homePhone}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="labeledURI">{t}Homepage{/t}</label></td>
      <td>
-       {render acl=$labeledURIACL}
+{render acl=$labeledURIACL checkbox=$multiple_support checked=$use_labeledURI}
                <input id="labeledURI" name="labeledURI" size=25 maxlength=60 value="{$labeledURI}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
@@ -224,14 +222,14 @@
     <tr>
      <td><label for="pw_storage">{t}Password storage{/t}</label></td>
      <td>
-       {render acl=$passwordStorageACL}
+{render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage}
              <select size="1" id="pw_storage" name="pw_storage" onchange='document.mainform.submit()'>
               {html_options values=$pwmode output=$pwmode selected=$pwmode_select}
              </select>
        {if $pw_configurable eq "true"}
              &nbsp; <input id="edit_pw_method" type="submit" name="edit_pw_method" value="{t}Configure{/t}...">
        {/if}
-       {/render}
+{/render}
      </td>
     </tr>
 
@@ -239,9 +237,9 @@
     <tr>
      <td><label for="edit_cert">{t}Certificates{/t}</label></td>
      <td>
-       {render acl=$CertificatesACL mode=read_active}
+{render acl=$CertificatesACL mode=read_active}
                <input id="edit_cert" type="submit" name="edit_cert" value="{t}Edit certificates{/t}...">
-       {/render}
+{/render}
      </td>
     </tr>
     {/if}
@@ -272,41 +270,41 @@
     <tr>
      <td><label for="o">{t}Organization{/t}</label></td>
      <td>      
-       {render acl=$oACL}
+{render acl=$oACL checkbox=$multiple_support checked=$use_o}
                <input id="o" name="o" size=22 maxlength=60 value="{$o}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="ou">{t}Department{/t}</label></td>
      <td>
-       {render acl=$ouACL}
+{render acl=$ouACL checkbox=$multiple_support checked=$use_ou}
                <input id="ou" name="ou" size=22 maxlength=60 value="{$ou}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="departmentNumber">{t}Department No.{/t}</label></td>
      <td>
-       {render acl=$departmentNumberACL}
+{render acl=$departmentNumberACL checkbox=$multiple_support checked=$use_departmentNumber}
              <input id="departmentNumber" name="departmentNumber" size=22 maxlength=60 value="{$departmentNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="employeeNumber">{t}Employee No.{/t}</label></td>
      <td>
-       {render acl=$employeeNumberACL}
+{render acl=$employeeNumberACL checkbox=$multiple_support checked=$use_employeeNumber}
                <input id="employeeNumber" name="employeeNumber" size=22 maxlength=60 value="{$employeeNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="employeeType">{t}Employee type{/t}</label></td>
      <td>
-       {render acl=$employeeTypeACL}
+{render acl=$employeeTypeACL checkbox=$multiple_support checked=$use_employeeType}
                <input id="employeeType" name="employeeType" size=22 maxlength=60 value="{$employeeType}">
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -322,43 +320,43 @@
     <tr>
      <td><label for="roomNumber">{t}Room No.{/t}</label></td>
      <td>
-       {render acl=$roomNumberACL}
+{render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
                <input id="roomNumber" name="roomNumber" size=22 maxlength=60 value="{$roomNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     {if $has_phoneaccount ne "true"}
     <tr>
      <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
      <td>
-       {render acl=$telephoneNumberACL}
+{render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
                <input id="telephoneNumber" name="telephoneNumber" size=22 maxlength=60 value="{$telephoneNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     {/if}
     <tr>
      <td><label for="mobile">{t}Mobile{/t}</label></td>
      <td>
-       {render acl=$mobileACL}
+{render acl=$mobileACL checkbox=$multiple_support checked=$use_mobile}
                <input id="mobile" name="mobile" size=22 maxlength=60 value="{$mobile}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="pager">{t}Pager{/t}</label></td>
      <td>
-       {render acl=$pagerACL}
+{render acl=$pagerACL checkbox=$multiple_support checked=$use_pager}
                <input id="pager" name="pager" size=22 maxlength=60 value="{$pager}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
      <td>
-       {render acl=$facsimileTelephoneNumberACL}
+{render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
                <input id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=22 maxlength=60 value="{$facsimileTelephoneNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -374,25 +372,25 @@
     <tr>
      <td><label for="l">{t}Location{/t}</label></td>
      <td>
-       {render acl=$lACL}
+{render acl=$lACL checkbox=$multiple_support checked=$use_l}
                <input id="l" name="l" size=22 maxlength=60 value="{$l}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="st">{t}State{/t}</label></td>
      <td>
-       {render acl=$stACL}
+{render acl=$stACL checkbox=$multiple_support checked=$use_st}
                <input id="st" name="st" size=22 maxlength=60 value="{$st}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td style="vertical-align:top;"><label for="postalAddress">{t}Address{/t}</label></td>
      <td>
-       {render acl=$postalAddressACL}
+{render acl=$postalAddressACL checkbox=$multiple_support checked=$use_postalAddress}
                <textarea id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -406,44 +404,44 @@
     <tr>
      <td><label for="vocation">{t}Vocation{/t}</label></td>
      <td>
-       {render acl=$vocationACL}
+{render acl=$vocationACL checkbox=$multiple_support checked=$use_vocation}
                <input id="vocation" name="vocation" size=22 maxlength=60 value="{$vocation}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="gouvernmentOrganizationalUnitDescription">{t}Unit description{/t}</label></td>
      <td>
-       {render acl=$gouvernmentOrganizationalUnitDescriptionACL}
+{render acl=$gouvernmentOrganizationalUnitDescriptionACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitDescription}
                <input id="gouvernmentOrganizationalUnitDescription" name="gouvernmentOrganizationalUnitDescription" size=22 maxlength=60
                value="{$gouvernmentOrganizationalUnitDescription}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="gouvernmentOrganizationalUnitSubjectArea">{t}Subject area{/t}</label></td>
      <td>
-       {render acl=$gouvernmentOrganizationalUnitSubjectAreaACL}
+{render acl=$gouvernmentOrganizationalUnitSubjectAreaACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitSubjectArea}
                <input id="gouvernmentOrganizationalUnitSubjectArea" name="gouvernmentOrganizationalUnitSubjectArea" size=22 maxlength=60
                value="{$gouvernmentOrganizationalUnitSubjectArea}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="functionalTitle">{t}Functional title{/t}</label></td>
      <td>
-       {render acl=$functionalTitleACL}
+{render acl=$functionalTitleACL checkbox=$multiple_support checked=$use_functionalTitle}
                <input name="functionalTitle" id="functionalTitle"  size=22 maxlength=60
                value="{$functionalTitle}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="role">{t}Role{/t}</label></td>
      <td>
-       {render acl=$roleACL}
+{render acl=$roleACL checkbox=$multiple_support checked=$use_role}
                <input id="role" name="role" size=22 maxlength=60 value="{$role}">
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -455,44 +453,44 @@
     <tr>
      <td><label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label></td>
      <td>
-       {render acl=$gouvernmentOrganizationalPersonLocalityACL}
+{render acl=$gouvernmentOrganizationalPersonLocalityACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalPersonLocality}
                <input id="gouvernmentOrganizationalPersonLocality" name="gouvernmentOrganizationalPersonLocality" size=22 maxlength=60
                 value="{$gouvernmentOrganizationalPersonLocality}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="gouvernmentOrganizationalUnit">{t}Unit{/t}</label></td>
      <td>
-       {render acl=$gouvernmentOrganizationalUnitACL}
+{render acl=$gouvernmentOrganizationalUnitACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnit}
                <input id="gouvernmentOrganizationalUnit" name="gouvernmentOrganizationalUnit" size=22 maxlength=60 
                value="{$gouvernmentOrganizationalUnit}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="street">{t}Street{/t}</label></td>
      <td>
-       {render acl=$streetACL}
+{render acl=$streetACL checkbox=$multiple_support checked=$use_street}
                <input name="street" id="street" size=22 maxlength=60 value="{$street}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="postalCode">{t}Postal code{/t}</label></td>
      <td> 
-       {render acl=$postalCodeACL}
+{render acl=$postalCodeACL checkbox=$multiple_support checked=$use_postalCode}
                <input name="postalCode" id="postalCode" size=22 maxlength=60 value="{$postalCode}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="houseIdentifier">{t}House identifier{/t}</label></td>
      <td>
-       {render acl=$houseIdentifierACL}
+{render acl=$houseIdentifierACL checkbox=$multiple_support checked=$use_houseIdentifier}
                <input id="houseIdentifier" name="houseIdentifier" size=22 maxlength=60
                value="{$houseIdentifier}">
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -504,49 +502,49 @@
     <tr>
      <td><label for="roomNumber">{t}Room No.{/t}</label></td>
      <td>
-       {render acl=$roomNumberACL}
+{render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
                <input id="roomNumber" name="roomNumber" size=22 maxlength=60 value="{$roomNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
      <td>
-       {render acl=$telephoneNumberACL}
+{render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
              {if $has_phoneaccount ne "true"}
                        <input id="telephoneNumber" name="telephoneNumber" size=22 maxlength=60 value="{$telephoneNumber}">
              {else}
                        <i>{t}Please use the phone tab{/t}</i>
              {/if}
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
      <td>
-       {render acl=$facsimileTelephoneNumberACL}
+{render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
                <input id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=22 maxlength=60 
                 value="{$facsimileTelephoneNumber}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="ivbbLastDeliveryCollective">{t}Last delivery{/t}</label></td>
      <td>
-       {render acl=$ivbbLastDeliveryCollectiveACL}
+{render acl=$ivbbLastDeliveryCollectiveACL checkbox=$multiple_support checked=$use_ivbbLastDeliveryCollective}
                <input name="ivbbLastDeliveryCollective" size=22 maxlength=60 id="ivbbLastDeliveryCollective" 
                value="{$ivbbLastDeliveryCollective}">
-       {/render}
+{/render}
      </td>
     </tr>
     <tr>
      <td><label for="publicVisible">{t}Public visible{/t}</label></td>
      <td>
-       {render acl=$publicVisibleACL}
+{render acl=$publicVisibleACL checkbox=$multiple_support checked=$use_publicVisible}
              <select size="1" id="publicVisible" name="publicVisible">
               {html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible}
              </select>
-       {/render}
+{/render}
      </td>
     </tr>
    </table>
@@ -555,6 +553,9 @@
  </tr>
 </table>
 
+{if $multiple_support}
+       <input type="hidden" name="user_mulitple_edit" value="1">
+{/if}
 <input type=hidden name="generic">
 
 <!-- Place cursor -->