From df9cfb6a7db9077bc09b79d8916d041737064514 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 11 Aug 2006 10:43:05 +0000
Subject: [PATCH] Fixed some w3C probs

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4486 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/class_CopyPasteHandler.inc            |  2 +-
 .../gofon/phoneaccount/class_phoneAccount.inc |  4 ++--
 .../connectivity/class_kolabAccount.inc       |  6 +++---
 plugins/personal/connectivity/kolab.tpl       | 19 +++++++++----------
 plugins/personal/connectivity/proxy.tpl       |  4 ++--
 plugins/personal/generic/generic.tpl          |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 4ec220be5..963e3df67 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -215,7 +215,7 @@ class CopyPasteHandler {
       $Copy_Paste.= "<input type='image' name='editPaste' class='center'
         src='".$img."' alt='"._("Paste")."' title='".$this->GetCurrentDn()."'>&nbsp;";
     }else{
-      $Copy_Paste.= "<img class='center' src='images/cant_editpaste.png' alt='"._("Can't paste")."'>&nbsp;";
+      $Copy_Paste.= "<img class='center' src='images/cant_editpaste.png' alt=\""._("Can't paste")."\" >&nbsp;";
     }
 
     return ($Copy_Paste);
diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index b38336fe9..d83831215 100644
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -8,7 +8,7 @@ class phoneAccount extends plugin
   var $has_mailAccount= FALSE;
 
   /* Attributes */
-  var $telephoneNumber        = "";
+  var $telephoneNumber        = array();
   var $goFonHardware          = "";
   var $goFonFormat            = "";
   var $goFonPIN               = "";
@@ -794,7 +794,7 @@ class phoneAccount extends plugin
     /* Fill arrays */
     $smarty->assign ("goFonHardware", $this->goFonHardware);
     if (!count($this->phoneNumbers)){
-      $smarty->assign ("phoneNumbers", array(""));
+      $smarty->assign ("phoneNumbers", array());
     } else {
       $smarty->assign ("phoneNumbers", $this->phoneNumbers);
     }
diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 6ef941200..318a118b9 100644
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -194,7 +194,7 @@ class kolabAccount extends plugin
                          changeState('add".$nr."'); \n changeState('remove".$nr."'); \n";
 
       $invitation.= "<tr><td>";
-      if($this->is_account){
+      if(($this->is_account) && !preg_match("/disabled/",$acl)){
         $dis = " ";
       }else{
         $dis = " disabled ";
@@ -209,12 +209,12 @@ class kolabAccount extends plugin
       } else {
         $name= preg_replace('/:.*$/', '', $entry);
         $mode= preg_replace('/^[^:]*: */', '', $entry);
-        $invitation.= "<input name=\"address$nr\" size=16 maxlength=60 $acl value=\"$name\" id='address".$nr."' ".$dis.">";
+        $invitation.= "<input name=\"address$nr\" size=16 maxlength=60 value=\"$name\" id='address".$nr."' ".$dis.">";
       }
       $invitation.= "</td>";
 
       /* Add mode switch */
-      $invitation.= "<td><select size=\"1\" name=\"policy$nr\" $acl  id='policy".$nr."' ".$dis.">";
+      $invitation.= "<td><select size=\"1\" name=\"policy$nr\" id='policy".$nr."' ".$dis.">";
       foreach($policies as $key => $value){
         if ($key == $mode){
           $invitation.= "<option value=\"$key\" selected>$value</option>";
diff --git a/plugins/personal/connectivity/kolab.tpl b/plugins/personal/connectivity/kolab.tpl
index 56ef2bbc3..23107ccc7 100644
--- a/plugins/personal/connectivity/kolab.tpl
+++ b/plugins/personal/connectivity/kolab.tpl
@@ -28,16 +28,15 @@
 	<option disabled>&nbsp;</option>
    </select>
    <br>
-   <input name="delegate_address" size=30 align=middle maxlength=60 {if !$kolabState} disabled {/if}
-        {$kolabDelegateACL} value="" id="delegate_address">
-   <input type=submit value="{t}Add{/t}" name="add_delegation" {if !$kolabState} disabled {/if}
-        {$kolabDelegateACL} id="add_delegation">&nbsp;
-   <input type=submit value="{t}Delete{/t}" name="delete_delegation" {if !$kolabState} disabled {/if}
-        {$kolabDelegateACL} id="delete_delegation">
+   <input name="delegate_address" size=30 align=middle maxlength=60 {if !$kolabState || $kolabDelegateACL !=""} disabled {/if}
+        value="" id="delegate_address">
+   <input type=submit value="{t}Add{/t}" name="add_delegation" {if !$kolabState || $kolabDelegateACL !=""} disabled {/if}
+        id="add_delegation">&nbsp;
+   <input type=submit value="{t}Delete{/t}" name="delete_delegation" {if !$kolabState || $kolabDelegateACL !=""} disabled {/if}
+        id="delete_delegation">
    <p>
     <b>{t}Mail size{/t}</b><br>
-     &nbsp;<input type="checkbox" id='unrestrictedMailSize' name="unrestrictedMailSize" value="1" {if !$kolabState} disabled {/if}
-	{$unrestrictedMailSizeACL} {$unrestrictedMailSizeState}> {t}No mail size restriction for this account{/t}
+     &nbsp;<input type="checkbox" id='unrestrictedMailSize' name="unrestrictedMailSize" value="1" {if !$kolabState || $unrestrictedMailSizeACL !=""} disabled {/if} {$unrestrictedMailSizeState}> {t}No mail size restriction for this account{/t}
     </p>
   </td>
   <td rowspan=2 style="border-left:1px solid #A0A0A0">
@@ -49,11 +48,11 @@
  <table summary="">
   <tr>
    <td><LABEL for="calFBURL">{t}URL{/t}</LABEL></td>
-   <td><input id="calFBURL" name="calFBURL" size=30 maxlength=60 {$calFBURLACL} value="{$calFBURL}" {if !$kolabState} disabled {/if}></td>
+   <td><input id="calFBURL" name="calFBURL" size=30 maxlength=60 value="{$calFBURL}" {if !$kolabState || $calFBURLACL !=""} disabled {/if}></td>
   </tr>
   <tr>
   <td><LABEL for="kolabFreeBusyFuture">{t}Future{/t}</LABEL></td>
-   <td><input id="kolabFreeBusyFuture" name="kolabFreeBusyFuture" size=5 maxlength=6 i {if !$kolabState} disabled {/if}{$kolabFreeBusyFutureACL} value="{$kolabFreeBusyFuture}"> {t}days{/t}</td>
+   <td><input id="kolabFreeBusyFuture" name="kolabFreeBusyFuture" size=5 maxlength=6 {if !$kolabState || $kolabFreeBusyFutureACL != ""} disabled {/if} value="{$kolabFreeBusyFuture}"> {t}days{/t}</td>
   </tr>
  </table>
 
diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl
index b8243cda6..911f173cc 100644
--- a/plugins/personal/connectivity/proxy.tpl
+++ b/plugins/personal/connectivity/proxy.tpl
@@ -14,12 +14,12 @@
    <td>
     <table summary="" border=0 width="100%" cellpadding=0>
     <tr><td colspan=2>
-    <input type="checkbox" name="filterF" id="filterF" value="F" {$filterF} {$gosaProxyAcctFlagsACL} {$pstate}>
+    <input type="checkbox" name="filterF" id="filterF" value="F" {$filterF} {if $gosaProxyAcctFlagsACL!="" || $pstate!=""} disabled {/if}>
     {t}Filter unwanted content (i.e. pornographic or violence related){/t}
     </td></tr>
      <tr>
       <td width="50%">
-    <input type="checkbox" name="filterT" id="filterT" value="T" {$filterT} {$Working_allowedACL} {$pstate}
+    <input type="checkbox" name="filterT" id="filterT" value="T" {$filterT} {if $gosaProxyAcctFlagsACL!="" || $pstate!=""} disabled {/if}
     	onClick="{$ProxyWorkingStateChange}">
     <LABEL for="startHour">{t}Limit proxy access to working time{/t}</LABEL>
     <br>
diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index c3fdd6ebf..0f02daef4 100644
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -134,7 +134,7 @@
 		{if $selectmode == ""}
 			<input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
 		{else}
-			<img src="images/folder_gray.png" class="center" title="{t}Select a base{/t}">
+			<img src="images/folder_gray.png" class="center" title="{t}Select a base{/t}" alt=''>
 		{/if}
      </td>
     </tr>
-- 
2.30.2