X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=be15e04cdb2e1ea03ce37c7bcd84d950a7f875ee;hb=3f6e9871ce3d4e550302d08740d251dad9735396;hp=f5f6408b8f58f2f46b62092224728e35354f9966;hpb=d8332a2f8467a9678c48d879d6d89de15e0f2c1c;p=gosa.git
diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index f5f6408b8..be15e04cd 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -33,6 +33,7 @@ class userManagement extends management
var $edit_uid = "";
var $pwd_change_queue = array();
+ var $force_hash_type = array();
// Tab definition
protected $tabClass = "usertabs";
@@ -91,6 +92,16 @@ class userManagement extends management
$this->registerAction("sendMessage", "sendMessage");
$this->registerAction("saveEventDialog", "saveEventDialog");
$this->registerAction("abortEventDialog", "closeDialogs");
+
+ // Register shortcut icon actions
+ $this->registerAction("edit_user","editEntry");
+ $this->registerAction("edit_posixAccount","editEntry");
+ $this->registerAction("edit_mailAccount","editEntry");
+ $this->registerAction("edit_sambaAccount","editEntry");
+ $this->registerAction("edit_netatalk","editEntry");
+ $this->registerAction("edit_environment","editEntry");
+ $this->registerAction("edit_gofaxAccount","editEntry");
+ $this->registerAction("edit_phoneAccount","editEntry");
}
@@ -111,6 +122,22 @@ class userManagement extends management
}
+ function editEntry($action="",$target=array(),$all=array(), $altTabClass ="", $altTabType = "", $altAclCategory="")
+ {
+ $str = management::editEntry($action,$target);
+ if($str) return($str);
+
+ if(preg_match("/^edit_/",$action)){
+ $tab = preg_replace("/^edit_/","",$action);
+ if(isset($this->tabObject->by_object[$tab])){
+ $this->tabObject->current = $tab;
+ }else{
+ trigger_error("Unknown tab: ".$tab);
+ }
+ }
+ }
+
+
function closeDialogs()
{
management::closeDialogs();
@@ -231,8 +258,14 @@ class userManagement extends management
}
// Change cassword
- if(!change_password ($this->dn, $_POST['new_password'])){
- return($smarty->fetch(get_template_path('password.tpl', TRUE)));
+ if(isset($this->force_hash_type[$this->dn])){
+ if(!change_password ($this->dn, $_POST['new_password'],0,$this->force_hash_type[$this->dn])){
+ return($smarty->fetch(get_template_path('password.tpl', TRUE)));
+ }
+ }else{
+ if(!change_password ($this->dn, $_POST['new_password'])){
+ return($smarty->fetch(get_template_path('password.tpl', TRUE)));
+ }
}
if ($this->config->get_cfg_value("passwordHook") != ""){
exec($this->config->get_cfg_value("passwordHook")." ".$username." ".$_POST['new_password'], $resarr);
@@ -261,8 +294,36 @@ class userManagement extends management
*/
function saveChanges()
{
- management::saveChanges();
- if($this->last_dn == "new"){
+ $str = management::saveChanges();
+
+ if(!empty($str)) return($str);
+
+ if($this->last_tabObject instanceOf multi_plug){
+ foreach($this->last_tabObject->a_handles as $user){
+ if($user->password_change_needed()){
+ $this->force_hash_type[$user->dn] = $user->by_object['user']->pw_storage;
+ $this->pwd_change_queue[] = $user->dn;
+ }
+ }
+ return($this->handlePasswordQueue());
+ }
+
+ if(isset($this->last_tabObject->by_object['user']) && $this->last_tabObject->by_object['user']->password_change_needed()){
+ $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage;
+ $this->pwd_change_queue[] = $this->last_tabObject->dn;
+ return($this->handlePasswordQueue());
+ }
+ }
+
+ function cancelEdit()
+ {
+ $str = management::cancelEdit();
+ if(!empty($str)) return($str);
+
+ if(isset($this->last_tabObject->by_object['user']) &&
+ $this->last_tabObject->by_object['user']->dn != "new" &&
+ $this->last_tabObject->by_object['user']->password_change_needed()){
+ $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage;
$this->pwd_change_queue[] = $this->last_tabObject->dn;
return($this->handlePasswordQueue());
}
@@ -276,7 +337,8 @@ class userManagement extends management
function newUserFromTemplate($action="",$target=array(),$all=array())
{
// Call parent method, it knows whats to do, locking and so on ...
- management::newEntry($action,$target,$all);
+ $str = management::newEntry($action,$target,$all);
+ if(!empty($str)) return($str);
// Reset uid selection.
$this->got_uid= "";
@@ -312,7 +374,8 @@ class userManagement extends management
{
// Call parent method, it manages everything, locking, object creation...
- management::newEntry($action,$target,$all);
+ $str = management::newEntry($action,$target,$all);
+ if(!empty($str)) return($str);
// If we've at least one template, then ask the user if he wants to use one?
$templates = array();
@@ -320,7 +383,7 @@ class userManagement extends management
$templates = array_merge($templates,$this->get_templates());
// Display template selection
- if (count($templates)){
+ if (count($templates) > 1){
$smarty = get_smarty();
// Set default variables, normally empty.
@@ -466,7 +529,7 @@ class userManagement extends management
// Adapt template values.
$template_dn = $_POST['template'];
$this->tabObject->adapt_from_template($template_dn, array("uid","cn","givenName","sn"));
- $template_base = preg_replace("/^[^,]+,".preg_quote(get_people_ou(), '/')."/", '', $template_dn);
+ $template_base = preg_replace("/^[^,]+,".preg_quote(get_people_ou(), '/i')."/", '', $template_dn);
$this->tabObject->by_object['user']->base= $template_base;
// The user Tab object is already instantiated, so just go back and let the
@@ -489,6 +552,7 @@ class userManagement extends management
// Check entry locking
foreach($target as $dn){
if (($user= get_lock($dn)) != ""){
+ $this->dn = $dn;
return(gen_locked_message ($user, $dn));
}
$this->dns[] = $dn;
@@ -537,6 +601,7 @@ class userManagement extends management
*/
function lockUsers($action,$target,$all)
{
+ if(!count($target)) return;
if($action == "lockUsers"){
$this->lockEntry($action,$target, $all, "lock");
}else{
@@ -640,13 +705,17 @@ class userManagement extends management
function copyPasteHandler($action="",$target=array(),$all=array(),
$altTabClass ="", $altTabType = "", $altAclCategory="",$altAclPlugin="")
{
- $this->cpHandler->lastdn = "";
- $str = management::copyPasteHandler($action,$target,$all);
- if($this->cpHandler->lastdn != "" && isset($_POST['passwordTodo']) && $_POST['passwordTodo'] == "new"){
- $this->pwd_change_queue[] = $this->cpHandler->lastdn;
- return($this->handlePasswordQueue());
+ if ($this->config->boolValueIsTrue("main", "copyPaste")){
+ $this->cpHandler->lastdn = "";
+ $str = management::copyPasteHandler($action,$target,$all);
+ if($this->cpHandler->lastdn != "" && isset($_POST['passwordTodo']) && $_POST['passwordTodo'] == "new"){
+ $this->pwd_change_queue[] = $this->cpHandler->lastdn;
+ return($this->handlePasswordQueue());
+ }
+ return($str);
}
- return($str);
+
+ return "";
}
@@ -698,30 +767,28 @@ class userManagement extends management
"alt" => _("Samba"),
"title" => _("Edit samba properties")),
"apple-user" => array("image" => "plugins/netatalk/images/select_netatalk.png",
- "plugin" => "sambaAccount",
+ "plugin" => "netatalk",
"alt" => _("Netatalk"),
"title" => _("Edit netatalk properties")),
"gotoEnvironment" => array("image" => "plugins/users/images/small_environment.png",
- "plugin" => "gotoEnvironment",
+ "plugin" => "environment",
"alt" => _("Environment"),
"title" => _("Edit environment properties")),
"goFaxAccount" => array("image" => "plugins/users/images/fax_small.png",
- "plugin" => "goFaxAccount",
+ "plugin" => "gofaxAccount",
"alt" => _("FAX"),
"title" => _("Edit FAX properties")),
"goFonAccount" => array("image" => "plugins/gofon/images/select_phone.png",
- "plugin" => "goFonAccount",
+ "plugin" => "phoneAccount",
"alt" => _("Phone"),
"title" => _("Edit phone properties")));
// Walk thru map
foreach ($map as $oc => $properties) {
if (in_array_ics($oc, $classes)) {
- $result.="";
+ $result.= image($properties['image'], "listing_edit_".$properties['plugin']."_$row", $properties['title']);
} else {
- $result.="
";
+ $result.= image('images/empty.png');
}
}
return $result;