w3c

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

diff --git a/html/main.php b/html/main.php
index ef71ea11b81ebfc8c88ea90bce0770cc91ffa3e1..d0d182243bdac9a02fd5641f15a3b524fe5149df 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -284,7 +284,8 @@ if(file_exists("dow3ccheck.chk"))
   $fp = fopen("/tmp/current.html","w+");
   fwrite($fp,$display,strlen($display));
   $str = shell_exec( "curl -F uploaded_file=@/tmp/current.html http://127.0.0.1/w3c-markup-validator/check ");
-  print $str;
+  if(!preg_match("/This Page Is Valid/",$str ))
+    print $str;
   }
 
 $_SESSION['plist']= $plist;

diff --git a/include/functions.inc b/include/functions.inc
index b00d39a398a1e57ec05ca614a2b9840e9184bf80..cb583f749e34003016ee46fba4a48ec7dc54121b 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -889,11 +889,11 @@ function print_red()
   /* If DEBUGLEVEL is set, we're in web mode, use textual output in
      the other case... */
   if (isset($_SESSION['DEBUGLEVEL'])){
-    $_SESSION['errors'].= "<div align=\"middle\" style=\"border-width:5px;".
+    $_SESSION['errors'].= "<div align=\"center\" style=\"border-width:5px;".
       "border-style:solid;border-color:red; background-color:black;".
       "margin-bottom:10px; padding:8px;\"><table><tr><td><img alt=\"\" src=\"".
       get_template_path('images/warning.png')."\"></td>".
-      "<td width=\"100%\" align=\"middle\"><font color=#FFFFFF>".
+      "<td width=\"100%\" align=\"center\"><font color=\"#FFFFFF\">".
       "<b style='font-size:16px;'>$string</b></font></td><td>".
       "<img alt=\"\"src=\"".get_template_path('images/warning.png').
       "\"></td></tr></table></div>\n";

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 58021043cf05edbeb3e99183411c03ac814ad886..6f092f9113809db834062c2ee7b4ba5a722dc18e 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -11,7 +11,11 @@
      <td>{t}Server{/t}</td>
      <td>
       <select size="1" name="gosaMailServer" {$gosaMailServerACL} title="{t}Specify the mail server where the user will be hosted on{/t}">
-       {html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
+               {if $mailServers ==""}
+                   {html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
+               {else}
+                       <option>
+               {/if}
       </select>
      </td>
     </tr>
@@ -47,7 +51,12 @@
    <h2><img alt="" align="middle" src="images/alternatemail.png"> {t}Alternative addresses{/t}</h2>
    <select style="width:350px; height:100px;" name="alternates_list[]" size=15
         multiple title="{t}List of alternative mail addresses{/t}">
-    {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
+        {if $gosaMailAlternateAddress ==""}
+            {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
+        {else}
+            <option>
+        {/if}
+    
    </select>
    <br>
    <input name="alternate_address" size=30 align="middle" maxlength="60"{$gosaMailAlternateAddressACL} value="">
@@ -78,11 +87,20 @@
    <input type=checkbox name="use_spam_filter" value="1" {$use_spam_filter}
        {$gosaSpamSortLevelACL} title="{t}Select if you want to filter this mails through spamassassin{/t}"> {t}Move mails tagged with spam level greater than{/t}
    <select size="1" name="gosaSpamSortLevel" {$gosaSpamSortLevelACL} title="{t}Choose spam level - smaller values are more sensitive{/t}">
-    {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
+        {if $spamlevel ==""}
+            {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
+        {else}
+            <option>
+        {/if}
+ {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
    </select>
    {t}to folder{/t}
    <select size="1" name="gosaSpamMailbox" {$gosaSpamMailboxACL}>
-    {html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
+        {if $spambox ==""}
+               {html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
+               {else}
+            <option>
+        {/if}
    </select>
    <br>
    <input type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit}
@@ -96,12 +114,17 @@
    <p style="margin-bottom:0px;">
     <b>{t}Vacation message{/t}</b>
    </p>
-   <textarea style="width:350px; height:100px;" name="gosaVacationMessage" rows="4"
+   <textarea style="width:350px; height:100px;" name="gosaVacationMessage" rows="4" cols="512"
        {$gosaVacationMessageACL}>{$gosaVacationMessage}</textarea>
    <br>
    {if $show_templates eq "true"}
    <select name="vacation_template">
-    {html_options options=$vacationtemplates selected=$template}
+        {if $vacationtemplates ==""}
+               {html_options options=$vacationtemplates selected=$template}
+               {else}
+            <option>
+        {/if}
+       {html_options options=$vacationtemplates selected=$template}
    </select>
    <input type="submit" value="{t}Import{/t}" name="import_vacation"
        {$gosaVacationMessageACL}>
@@ -112,7 +135,11 @@
     <b>{t}Forward messages to{/t}</b>
    </p>
    <select style="width:350px; height:100px;" name="forwarder_list[]" size=15 multiple>
-    {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}
+        {if $gosaMailForwardingAddress ==""}
+                       {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}        
+               {else}
+            <option>
+        {/if}
    </select>
    <br>
    <input name="forward_address" size=20 align="middle" maxlength=60

diff --git a/plugins/personal/mail/mail_locals.tpl b/plugins/personal/mail/mail_locals.tpl
index df3d5a56d55a7a3f356e215c1de1642c440c327a..046b2d9c3771f31af1c6adf8df500dbc6b0e8ffb 100644 (file)
--- a/plugins/personal/mail/mail_locals.tpl
+++ b/plugins/personal/mail/mail_locals.tpl
@@ -9,7 +9,11 @@
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
      <select style="width:500px; margin-top:4px; height:450px;" name="local_list[]" size=15" multiple>
-       {html_options options=$mailusers}
+        {if $mailusers ==""}
+               {html_options options=$mailusers}
+               {else}
+            <option>
+        {/if}
      </select>
     </p>
    </div>
@@ -28,7 +32,11 @@ t}Filters{/t}</b></p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
     <table width="100%"><tr><td width="50%"><img src="{$tree_image}" align=center>&nbsp;{t}Display addresses of department{/t}</td>
     <td><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}
+        {if $deplist ==""}
+               {html_options options=$deplist selected=$depselect}
+               {else}
+            <option>
+        {/if}
     </select></td></tr></table>
     </p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">

diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index aa1d22a791cdad662207c54f501f270407d9a567..1ad1f1c951731446ee4c4411a3ace8c153380473 100644 (file)
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -104,13 +104,13 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-      $info= "<img align=\"center\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img align=\"center\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
              "\"> ".$ui->dn."&nbsp;";
       if (isset($editacl) && $editacl != "#none#"){
-        $info.= "<img align=\"center\" src=\"".get_template_path('images/lamp.png').
+        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
             "\"> "._("Click the 'Edit' button below to change informations in this dialog");
         $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">\n";
       }