From: hickert
Date: Tue, 24 May 2005 09:32:14 +0000 (+0000)
Subject: w3c
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=739909e8d6028cf20004eecd8c143f3417005663;p=gosa.git
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 ef71ea11b..d0d182243 100644
--- 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 b00d39a39..cb583f749 100644
--- 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'].= " | ".
- "".
+ " | ".
"$string | ".
" |
\n";
diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 58021043c..6f092f911 100644
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -11,7 +11,11 @@
{t}Server{/t} |
|
@@ -47,7 +51,12 @@
{t}Alternative addresses{/t}
@@ -78,11 +87,20 @@
{t}Move mails tagged with spam level greater than{/t}
{t}to folder{/t}
{t}Vacation message{/t}
-
{if $show_templates eq "true"}
@@ -112,7 +135,11 @@
{t}Forward messages to{/t}
@@ -28,7 +32,11 @@ t}Filters{/t}
{t}Display addresses of department{/t} |
|
diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index aa1d22a79..1ad1f1c95 100644
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -104,13 +104,13 @@ if (!$remove_lock){
$display.= "\n";
$display.= " ";
$display.= "\n";
- $info= " ".$ui->dn." ";
} else {
- $info= " ".$ui->dn." ";
if (isset($editacl) && $editacl != "#none#"){
- $info.= " "._("Click the 'Edit' button below to change informations in this dialog");
$display.= "\n";
}