Fixed problem reported by 'mmerlone' closes #1122

-passwordHook return ignored on class_userManagement.inc

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

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 9b1c574c250c72dd530f686df96d910864bb3746..f15817603281d8ed9823003180d3b9f6383b5c57 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -343,8 +343,18 @@ class userManagement extends management
                   $attrs = $ldap->fetch();
                   exec($this->config->get_cfg_value("passwordHook")." ".
                           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.