fixed Smarty handling for GOsa 2.6

[gosa.git] / gosa-core / plugins / admin / users / class_userManagement.inc

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 97182f56032b5872000b2e6308467d8679618ed4..a3817e77ea083942846f25935b96812558892aac 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -326,7 +326,7 @@ class userManagement extends management
                   return($smarty->fetch(get_template_path('password.tpl', TRUE)));
               }
 
-              // Change cassword
+              // Change password
               if(isset($this->force_hash_type[$this->dn])){
                   if(!change_password ($this->dn, $new_password,0,$this->force_hash_type[$this->dn])){
                       return($smarty->fetch(get_template_path('password.tpl', TRUE)));
@@ -342,9 +342,19 @@ class userManagement extends management
                   $ldap->cat($this->dn,array('uid'));
                   $attrs = $ldap->fetch();
                   exec($this->config->get_cfg_value("passwordHook")." ".
-                          escapeshellarg($attrs['uid'][0])." ".escapeshellarg($_POST['new_password']), $resarr);
+                          escapeshellarg($attrs['uid'][0])." ".escapeshellarg($new_password), $resarr);
+                  $check_hook_output = "";
+                  if(count($resarr) > 0) {
+                      $check_hook_output= join('\n', $resarr);
+                  }
+                  if(!empty($check_hook_output)){
+                      $message[] = sprintf(_("Check-hook reported a problem: %s. Password change canceled!"),$check_hook_output);
+                      msg_dialog::displayChecks($message);
+                      return($smarty->fetch(get_template_path('password.tpl', TRUE)));
+                  }
               }
 
+
               // The user has to change his password on next login
               // - We are going to update samba and posix attributes here, to enforce
               //   such a password change.
@@ -473,6 +483,7 @@ class userManagement extends management
       $smarty->assign("template",  array_pop($target));
       $smarty->assign("templates", $templates);
       $smarty->assign("edit_uid", "");
+      $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("allowUidProposalModification", "false"));
       return($smarty->fetch(get_template_path('template.tpl', TRUE)));
 
       // -> See 'templateContinue' for further handling!
@@ -509,6 +520,7 @@ class userManagement extends management
       $smarty->assign("template", "none");
       $smarty->assign("templates", $templates);
       $smarty->assign("edit_uid", "");
+      $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("allowUidProposalModification", "false"));
       return($smarty->fetch(get_template_path('template.tpl', TRUE)));
 
       // -> See 'templateContinue' for further handling!
@@ -562,6 +574,7 @@ class userManagement extends management
       $smarty->assign("templates",$templates);
       $smarty->assign("got_uid", $this->got_uid);
       $smarty->assign("edit_uid",false);
+      $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("allowUidProposalModification", "false"));
       return($smarty->fetch(get_template_path('template.tpl', TRUE)));
     }
 
@@ -610,6 +623,7 @@ class userManagement extends management
         $smarty->assign("template", $_POST['template']);
       }
       $smarty->assign("templates",$templates); 
+      $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("allowUidProposalModification", "false"));
       return($smarty->fetch(get_template_path('template.tpl', TRUE)));
     }