Some W3c fixes

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

diff --git a/html/main.php b/html/main.php
index dc33b4831c47463b5ed3d949186dc499245be44e..9674a7c39070b87f434186f0d4ca962c082d6a04 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -19,6 +19,7 @@
  */
 
 /* Basic setup, remove eventually registered sessions */
+$start = microtime();
 $timing= array();
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
@@ -353,5 +354,21 @@ echo $display;
 /* Save plist */
 $_SESSION['plist']= $plist;
 
+/* Echo compilation time */
+$r = split(" ",$start);
+$ms = $r[0];
+$s= $r[1];
+
+$re = split(" ",microtime());
+$mse = $re[0];
+$se= $re[1];
+
+$add = 0;
+if(($mse -$ms)<0){
+  $se --;
+  $add = 1;
+}
+echo ($se -$s).",";
+echo (int)(($add+($mse -$ms))*1000)." s";
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/include/class_debconfTemplate.inc b/include/class_debconfTemplate.inc
index 76ee781760dd858ef372020403c9a787587550c1..d044c46f79124065eac9e2dc6a7315feca4ddd79 100644 (file)
--- a/include/class_debconfTemplate.inc
+++ b/include/class_debconfTemplate.inc
@@ -223,7 +223,7 @@ class debconf
   function get_dialog()
   {
     if ($this->has_template){
-      $result= "<table>";
+      $result= "<table summary=''>";
 
       foreach ($this->template as $post_name => $entry){
 

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index 9031196e98ad2535883807e3f5f869e0e482f226..ecc405d8d83a8b7dbbde8e7a75085984f7023345 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -83,6 +83,7 @@ class mailMethodKolab extends mailMethodCyrus
 
   function fixAttributesOnStore(&$mailObject)
   {
+    global $config;
     /* Convert attributes and objectClasses */
     foreach ($this->attribute_map as $source => $dest){
       if (isset($mailObject->attrs[$source])){
@@ -98,20 +99,70 @@ class mailMethodKolab extends mailMethodCyrus
     }
     $mailObject->attrs['objectClass']= $objectclasses;
     if (in_array("posixGroup", $mailObject->attrs['objectClass'])){
+  
+      /* Add kolabSharedFoleder Class */
       $mailObject->attrs['objectClass'][]= 'kolabSharedFolder';
 
       /* Work on acl attribute */
       $new_acl= array();
       foreach ($mailObject->attrs['acl'] as $uacl){
+
+        /* Get user=(mail) & acls  */
         list($user, $acl) = split(" ", $uacl);
+      
+        /* Add al users which have seperated acls 
+           %members% are all users in this group, 
+           which have the standard group acl
+        */
         if ($user != "%members%"){
           $new_acl[$user]= $uacl;
         } else {
+        
+          /* All groupmembers will be added */
+          $ldap = $config->get_ldap_link();
+          $ldap->cd($config->current['BASE']);
           foreach ($mailObject->members as $member){
-            $new_acl[$member]= "$member $acl";
+
+            /* Get user mail address .... */
+            $ldap->search("(&(objectClass=person)(|(uid=".$member.")(mail=".$member.")))",array("mail"));
+            $res = $ldap->fetch();
+
+            /* Default mail address is set to uid - 
+               So if there is no mail address defined the uid is added 
+             */
+            $mail = $member;
+
+            /* Use mail address if it is available */
+            if(isset($res['mail'][0])){
+              $mail = $res['mail'][0];
+            }
+
+            /* only append this mail/permission string to acl,
+               if there arn't already some (special) configs for this user */
+            $found =false;
+            foreach($mailObject->imapacl as $mailA => $acl){
+              if(strtolower(trim($mailA))==strtolower(trim($mail))){
+                $found = true;
+              }
+            }
+
+            /* Skipp user, with no email adress too */     
+            if($member == $mail){
+              $found = true;
+            }
+   
+            /* Append new user acl */
+            if(!$found){
+              $new_acl[$member]= "$mail $acl";
+            }
+
+            /* Old line */
+            //  $new_acl[$member]= "$member $acl";
           }
         }
       }
+  
+      /* Assign new acls */
       $mailObject->attrs['acl']= array();
       foreach ($new_acl as $key => $value){
         $mailObject->attrs['acl'][]= $value;
@@ -126,7 +177,6 @@ class mailMethodKolab extends mailMethodCyrus
     $mailObject->attrs['kolabDeleteFlag']= array();
   }
 
-
   function fixAttributesOnRemove(&$mailObject)
   {
     /* Add attribute for object deletion and remove GOsa specific

diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc
index f9f3ed2717412c8d9a8567df3639c8885488f3c4..17420ed7d2c40c39d71669df4e7f2c81ec5b5c1a 100644 (file)
--- a/plugins/admin/systems/class_printerPPDDialog.inc
+++ b/plugins/admin/systems/class_printerPPDDialog.inc
@@ -306,7 +306,7 @@ class printerPPDDialog extends plugin
       }
 
       /* Create a table */
-      $str .= "<div style='padding-left:30px;'><table>";
+      $str .= "<div style='padding-left:30px;'><table summary=''>";
 
       /* Input all data to the table */
       foreach($this->ppdConfig as $cat => $obj){

diff --git a/plugins/admin/systems/servnfs.tpl b/plugins/admin/systems/servnfs.tpl
index aabb8afe0423f6b18b0171dbbaa30a0ead71be83..095e159d6ce4645fd480e5faafd906ad0d34e1f5 100644 (file)
--- a/plugins/admin/systems/servnfs.tpl
+++ b/plugins/admin/systems/servnfs.tpl
@@ -3,7 +3,7 @@
        <tr>
                <td width="45%">
                <!--Table left-top-->
-                       <table >
+                       <table summary="">
                                <tr>
                                        <td>
                                                {t}Name{/t} {$must}
@@ -33,7 +33,7 @@
                <td style="border-left:1px solid #A0A0A0">
 
                <!--Table right-top-->
-                       <table>
+                       <table summary="">
                                <tr>
                                        <td>
                                                {t}Type{/t}

diff --git a/plugins/gofax/faxaccount/lists.tpl b/plugins/gofax/faxaccount/lists.tpl
index 6359718a0da53196bd72ad0cf63becf496e4ad6e..8794a9c768ff088cf3006e177ef3be2a2fab9e45 100644 (file)
--- a/plugins/gofax/faxaccount/lists.tpl
+++ b/plugins/gofax/faxaccount/lists.tpl
@@ -15,7 +15,7 @@
   </td>
   <td>
        <b>{t}List of predefined blocklists{/t}</b><br>
-       <table height="300" style="width:100%">
+       <table style="width:100%;height:300px;" summary="">
                <tr>
                        <td valign="top">
                                        {$divSelectPredefined}

diff --git a/plugins/personal/environment/hotplugDialogNew.tpl b/plugins/personal/environment/hotplugDialogNew.tpl
index 97a1a55a095ea7d25811ea411205685d04543dbb..4c3f6fca1a9be99e0a9ca344dbe6ae3766848a89 100644 (file)
--- a/plugins/personal/environment/hotplugDialogNew.tpl
+++ b/plugins/personal/environment/hotplugDialogNew.tpl
@@ -2,7 +2,7 @@
        
        <input type="hidden" name="dialogissubmitted" value="1">
        
-<table width="100%">
+<table width="100%" summary="">
  <tr>
   <td width="50%">
        <table summary="{t}Create new hotplug device{/t}" style="border-right:1px solid #B0B0B0;width:100%">
@@ -23,7 +23,7 @@
        </table>
    </td>
    <td style="vertical-align:top">
-       <table>
+       <table summary="">
                <tr>
                        <td><LABEL for="HOT_id">{t}Device ID{/t}</LABEL>
                        </td>

diff --git a/plugins/personal/environment/logonManagement.tpl b/plugins/personal/environment/logonManagement.tpl
index b7cd0beee1556efa3385aed3eaca64371f1dc46b..87e282ba343521f58b7415e94d883128c33790f2 100644 (file)
--- a/plugins/personal/environment/logonManagement.tpl
+++ b/plugins/personal/environment/logonManagement.tpl
@@ -49,7 +49,7 @@
                </tr>
        </table>
        <p class="seperator">&nbsp;</p>
-       <table width=100%>
+       <table width="100%" summary="">
                <tr>
                        <td colspan="2">
                        <h2><img class="center" alt="" src="images/fai_script.png" align="middle">&nbsp;{t}Script{/t}</h2>
@@ -68,7 +68,7 @@
                                        </table>
                        </td>
                </tr>
-       <table> 
+       </table>        
 
        <p class="seperator">&nbsp;</p>
     <p align="right">

diff --git a/plugins/personal/samba/samba3_workstations.tpl b/plugins/personal/samba/samba3_workstations.tpl
index d71e2fa8fc86a111f62070795c34121d80490632..f2ecfcc0b4d4fc22e16feca9206c86e50b82b0c5 100644 (file)
--- a/plugins/personal/samba/samba3_workstations.tpl
+++ b/plugins/personal/samba/samba3_workstations.tpl
@@ -27,7 +27,7 @@
     <select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
       {html_options options=$deplist selected=$depselect}
     </select></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="18px"><img class="center" alt="" src="{$search_image}" align="middle">&nbsp;</td>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="18"><img class="center" alt="" src="{$search_image}" align="middle">&nbsp;</td>
     <td><input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
    {$apply}
    </div>