From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 25 Jul 2008 13:31:17 +0000 (+0000)
Subject: Fixed potential whitepage in netatalk plugin.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ebdb7c658a530eb2c80b9981457b055a22eb4c99;p=gosa.git

Fixed potential whitepage in netatalk plugin.


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

diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc
index cfaa7862a..36820497e 100644
--- a/gosa-plugins/netatalk/personal/netatalk/main.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/main.inc
@@ -19,6 +19,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+$lock_msg = "";
 if (!$remove_lock) {
   /* Reset requested? */
   if (isset ($_POST['edit_cancel']) || (isset ($_GET['reset']) && $_GET['reset'] == 1)) {
@@ -48,8 +49,7 @@ if (!$remove_lock) {
     /* Check locking */
     if (($username = get_lock($ui->dn)) != "") {
       session::set('back_plugin',$plug);
-      gen_locked_message($username, $ui->dn);
-      exit ();
+      $lock_msg =  gen_locked_message ($username, $ui->dn);
     }
 
     /* Lock the current entry */
@@ -79,7 +79,12 @@ if (!$remove_lock) {
   }
 
   /* Execute formular */
-  $display = $netatalk->execute();
+  if(!empty($lock_msg(){
+    $display = $lock_msg;
+  }else{
+    $display.= $netatalk->execute ();
+  }
+
 
   /* Store changes  in session */
   if (session::is_set('edit')) {