Updated error displaying. Only shows first error.

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

diff --git a/html/include/focus.js b/html/include/focus.js
index 3768f4995d503e7c7b49dc807ac58f05d3234fdf..18bca214033ae1f6250e61493877e9dd782c8e2a 100644 (file)
--- a/html/include/focus.js
+++ b/html/include/focus.js
@@ -152,7 +152,7 @@ function hide(element) {
      document.poppedLayer = document.all[element];
   else
      document.poppedLayer = document.layers[element];
-  document.poppedLayer.style.visibility = "hidden";
+       document.poppedLayer.style.visibility = "hidden";
 }
 
 function show(element) {
@@ -173,11 +173,11 @@ function toggle(element) {
   else
      document.poppedLayer = document.layers[element];
 
-  if (document.poppedLayer.style.visibility == "visible")
+  if (document.poppedLayer.style.visibility == "visible") {
          hide (element);
-  else
+       } else {
          show (element);
-
+       }
 }
 
 function popup(target, name) {
@@ -207,6 +207,9 @@ function adjust(e) {
 function adjust_height(e) {
        if (!e) e=window.event;
        var px_height= window.innerHeight-230;
+       if(document.defaultView) {
+               var div_width=parseInt(document.defaultView.getComputedStyle(document.getElementById("t_scrolltable"),"").getPropertyValue('height'));
+       }
        if(px_height >= 480) {
                document.getElementById("d_scrollbody").style.height=px_height+"px";
        }

diff --git a/include/functions.inc b/include/functions.inc
index 0bee05f49f3033260d39b6008f09d602d7b25da6..00f8914548def78c6da7910597a1ca645b093771 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -953,11 +953,11 @@ function print_red()
   if (isset($_SESSION['DEBUGLEVEL'])){
 
     if($_SESSION['LastError'] == $string){
-
+    
       if((!isset($_SESSION['errorsAlreadyPosted'][$string]))){
         $_SESSION['errorsAlreadyPosted'][$string] = 1;
       }
-      $_SESSION['errorsAlreadyPosted'][$string] ++;
+      $_SESSION['errorsAlreadyPosted'][$string]++;
 
     }else{
 #      if((!empty($_SESSION['LastError'])) && ($_SESSION['errorsAlreadyPosted'][$_SESSION['LastError']]>1)){
@@ -986,17 +986,19 @@ function print_red()
           $string.= ".";
         }
         $string= preg_replace('/<br>/', ' ', $string);
-        $_SESSION['errors'].= "<div style='margin-left:15%;margin-top:100px;background-color:white;padding:5px;border:5px solid red;width:60%;position:absolute' id='e_layer'>".
-        "<table style='width:100%' summary='' border=0><tr><td style='vertical-align:top;padding:10px'><img alt='' src='".get_template_path('images/warning.png')."'></td>".
-        "<td style='width:100%'><h1>"._("An error occured while processing your request")."</h1>".
-        "<b>$string</b> "._("Please check your input and fix the contents of the highlighted field. Pess 'OK' to close this message box.")."</td>".
-        "</tr><tr><td colspan='2' align='center'><br><button style='width:80px' onClick='toggle(\"e_layer\")'>"._("OK")."</button></td></tr></table></div>";
+      
+        if(isset($_SESSION['errors']) && strlen($_SESSION['errors'])==0) {
+          $_SESSION['errors'].= "<div style='margin-left:15%;margin-top:100px;background-color:white;padding:5px;border:5px solid red;width:60%;position:absolute' id='e_layer'>".
+          "<table style='width:100%' summary='' border=0><tr><td style='vertical-align:top;padding:10px'><img alt='' src='".get_template_path('images/warning.png')."'></td>".
+          "<td style='width:100%'><h1>"._("An error occured while processing your request")."</h1>".
+          "<b>$string</b> "._("Please check your input and fix the contents of the highlighted field. Press 'OK' to close this message box.")."</td>".
+          "</tr><tr><td colspan='2' align='center'><br><button ".(($_SESSION['js']==FALSE)?"type='submit'":"type='button'")." style='width:80px' onClick='hide(\"e_layer\")'>"._("OK")."</button></td></tr></table></div>";
+        }
   #########################
-
       }else{
         return;
       }
-      $_SESSION['errorsAlreadyPosted'] = array();
+      #$_SESSION['errorsAlreadyPosted'] = array();
       $_SESSION['errorsAlreadyPosted'][$string] = 1;
 
     }
@@ -1005,7 +1007,6 @@ function print_red()
     echo "Error: $string\n";
   }
   $_SESSION['LastError'] = $string; 
-
 }