From 02f768229f773c54f2cd7ab0ddfb42c2bca723c7 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 26 Jun 2007 09:14:26 +0000
Subject: [PATCH] Updated error hanlding

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6695 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/images/opacity_black.png    | Bin 0 -> 169 bytes
 html/images/opacity_black_75.png | Bin 151 -> 0 bytes
 include/functions.inc            |  51 ++++++++++++++++---------------
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 html/images/opacity_black.png
 delete mode 100644 html/images/opacity_black_75.png

diff --git a/html/images/opacity_black.png b/html/images/opacity_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e1eb511f68daaed088e35f1f2e2ad66f8668932
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}blwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kweO^QQUfYITI5>QCC#5JPCIX^cyHLrxhxhOTUBsE2$
zJhLQ2AtWPJ!QIn0;C+f}9#A2#r;B3<$MxidgoGDB`zJE=8aOrS0wowcUHx3vIVCg!
E03Z!1CjbBd

literal 0
HcmV?d00001

diff --git a/html/images/opacity_black_75.png b/html/images/opacity_black_75.png
deleted file mode 100644
index 9fac09e50cad6dce57ad6c3199bfced4060cfcbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?3oVGw3ym^DWND9B#o
z>FdgVolTNk*CO?Bnh;P(w!}4}#5q4VH#M(>!MP|ku_QG`p**uBLm?z1Rl(iUH{gAW
qY93G_ucwP+2*>s0goK0}{0t077!DjToL&i(VDNPHb6Mw<&;$U{HY8R6

diff --git a/include/functions.inc b/include/functions.inc
index df840f500..91bb1e17c 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1065,28 +1065,29 @@ function print_red()
       
         if(isset($_SESSION['errors']) && strlen($_SESSION['errors'])==0) {
           $_SESSION['errors'].= "
-          <div  id='e_layer2'
-                style='
-                      position: absolute;
-                      left: 0px;
-                      top: 0px;
-                      right:0px;
-                      bottom:0px; 
-                      z-index:149;
-                      background-image: url(images/opacity_black_75.png);
-'
->
-          </div>
-          <div style='margin-left:15%;margin-top:100px;".
-            "background-color:white;padding:5px;border:5px solid red;width:55%;z-index:150;".
-            "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($img)."'></td>".
-            "<td style='width:100%'><h1>"._("An error occurred while processing your request").
-            "</h1><b>$string</b><br><br>$addmsg</td></tr><tr><td colspan='2' align='center'><br><button ".
-            (($_SESSION['js']==FALSE)?"type='submit'":"type='button'").
-            " style='width:80px' onClick='hide(\"e_layer\");hide(\"e_layer2\");'>".
-            _("OK")."</button></td></tr></table></div>";
+            <div  id='e_layer2'
+            style='
+              position: absolute;
+              left: 0px;
+              top: 0px;
+              right:0px;
+              bottom:0px;
+              z-index:149;
+              width:100%;
+              height:100%;
+              background-image: url(images/opacity_black.png);'>
+         </div>
+         <div style='left:20%;right:20%;top:30%;".
+         "background-color:white;padding:5px;border:5px solid red;z-index:150;".
+         "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($img)."'></td>".
+         "<td style='width:100%'><h1>"._("An error occurred while processing your request").
+         "</h1><b>$string</b><br><br>$addmsg</td></tr><tr><td colspan='2' align='center'><br><button ".
+         (($_SESSION['js']==FALSE)?"type='submit'":"type='button' name='error_accept'").
+         " style='width:80px' onClick='hide(\"e_layer\");hide(\"e_layer2\");'>".
+         _("OK")."</button></td></tr></table></div>";
+
         }
 
       }else{
@@ -1291,9 +1292,9 @@ function print_header($image, $headline, $info= "")
     $display.= "&nbsp;";
     $display.= "</div>\n";
   }
-  if (isset($_SESSION['errors'])){
-    $display.= $_SESSION['errors'];
-  }
+#  if (isset($_SESSION['errors'])){
+#    $display.= $_SESSION['errors'];
+#  }
 
   return ($display);
 }
-- 
2.30.2