some user w3c fixes

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

diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index 31d5a5abf36e27335e72290b0346c6110b331835..0dec827bd6320b24f2bcda89404b1421d1db2674 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -256,7 +256,7 @@ class divListUsers extends MultiSelectWindow
         name='user_edit_%KEY%' title='"._("Edit user")."'>";
 
       /* Add Password change icon, if we are able to write users/password */
-      if(preg_match("/w/",$ui->get_permissions($val['dn'],"users/password"))) {
+      if(!in_array_ics("gosaUserTemplate",$val['objectClass']) && preg_match("/w/",$ui->get_permissions($val['dn'],"users/password"))) {
         $action.= "<input class='center' type='image' src='images/list_password.png' alt='"._("password")."'
           name='user_chgpw_%KEY%' title='"._("Change password")."'>";
       }else{

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index a5fa9f66c5aa44f26f640ec0f0d91f343b5ce638..5cf79f71e1bf2e400892b2721fe38a8510ef08da 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -832,7 +832,6 @@ class userManagement extends plugin
         $dn= $this->list[trim($s_entry)]['dn'];
         $obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
         $obj->set_acl_base($dn);
-        $obj->set_acl_category("users");
         $this->CopyPasteHandler->Cut($obj);
       }
     }

diff --git a/plugins/personal/generic/paste_generic.tpl b/plugins/personal/generic/paste_generic.tpl
index 6f80f009a31326fe521005586cc884fd23ee090d..6f35f708d9e708192ba3767c000939decd5f1db7 100644 (file)
--- a/plugins/personal/generic/paste_generic.tpl
+++ b/plugins/personal/generic/paste_generic.tpl
@@ -46,7 +46,7 @@
                        <table>
                          <tr>
                                <td width="147" height="200" bgcolor="gray">
-                                 <img align="center" valign="center" border="0" width="100%" src="getbin.php?rand={$rand}"
+                                 <img align="middle" style='vertical-align:middle;' border="0" width="100%" src="getbin.php?rand={$rand}"
                                          alt="{t}Personal picture{/t}">
                                </td>
                          </tr>

diff --git a/plugins/personal/posix/paste_generic.tpl b/plugins/personal/posix/paste_generic.tpl
index 0d02fa93932f5482f9be15ed51f9cb87db6ee9b7..fbb298152578cc707c0b5319754f7efa2673de33 100644 (file)
--- a/plugins/personal/posix/paste_generic.tpl
+++ b/plugins/personal/posix/paste_generic.tpl
@@ -15,7 +15,7 @@
                        <table>
                                <tr>
                                        <td>
-                                               <input id="force_ids" type=checkbox name="force_ids" value="1" ".$force_ids."}
+                                               <input id="force_ids" type=checkbox name="force_ids" value="1"  {$force_ids}
                                                                 onclick="changeState('uidNumber');changeState('gidNumber');">
                                        </td>
                                        <td>