Removed duplicated addslashes

[gosa.git] / plugins / personal / generic / main.inc

diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index fee316db5e7e33626172bcb1e7e6113bc85875b5..729d9d5c15e4b348d9e1f87f87770dced9a624db 100644 (file)
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -34,6 +34,8 @@ if (!$remove_lock){
   /* Create user object on demand */
   if (!isset($_SESSION['user']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['user']= new user ($config, $ui->dn);
+    $_SESSION['user']->set_acl_base($ui->dn);
+    $_SESSION['user']->set_acl_category("users");
   }
   $user= $_SESSION['user'];
 
@@ -43,7 +45,7 @@ if (!$remove_lock){
   }
 
   /* Enter edit mode? */
-  if (isset($_POST['edit'])){
+  if ((isset($_POST['edit'])) && (!isset( $_SESSION['edit']))){
 
     /* Check locking */
     if (($username= get_lock($ui->dn)) != ""){
@@ -58,21 +60,11 @@ if (!$remove_lock){
     $_SESSION['edit']= TRUE;
   }
 
-  /* Adjust acl's to mode */
-  if (isset($_SESSION['edit'])){
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $user->acl= get_module_permission($acl, "user", $ui->dn);
-  } else {
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $editacl= get_module_permission($acl, "user", $ui->dn);
-    $user->acl= "#none#";
-  }
-
   /* Perform password change */
   if (isset($_POST['password_finish'])){
 
     /* For security reasons, check if user is allowed to set password again */
-    if (chkacl($user->acl, "password") == "" || chkacl($user->acl, "create")){
+    if ($user->acl_is_writable("userPassword") || $user->acl_is_createable()){
 
       /* Check input and feed errors into 'message' */
       $message= array();
@@ -107,7 +99,6 @@ if (!$remove_lock){
       print_red (_("You are not allowed to set your password!"));
     }
 
-    $user->acl= "#none#";
     del_lock ($ui->dn);
   }
 
@@ -121,7 +112,6 @@ if (!$remove_lock){
     if (count ($message) == 0){
       $user->save ();
       gosa_log ("User/generic object'".$ui->dn."' has been saved");
-      $user->acl= "#none#";
       del_lock ($ui->dn);
       sess_del ('edit');
 
@@ -149,16 +139,16 @@ if (!$remove_lock){
   }
 
   $info = "";
+
   /* Show page footer depending on the mode */
   if (!$user->cert_dialog && !$user->picture_dialog && $user->is_account){
     $display.= "<p class=\"plugbottom\">";
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-      $display.="<script language='javascript'>";
 
       $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
@@ -174,11 +164,16 @@ if (!$remove_lock){
         $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
                "\"> ".$ui->dn."&nbsp;";
       }
-      if ($fn == "edit" && isset($editacl) && $editacl != "#none#"){
-        $info.= "<img class=\"center\" 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=\"$fn\" value=\"$str\">\n";
+
+      /* Only display edit button if there is at least one attribute editable */
+      if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/user"))){
+        if ($fn == "edit"){
+          $info.= "<img class=\"center\" 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=\"$fn\" value=\"$str\">\n";
+        }
       }
+
       $display.= "<input type=\"hidden\" name=\"ignore\">\n";
     }
     $display.= "</p>\n";