![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 177e6836bc89e5a2b25d21218b8c169a62c8969e..b37bbf119ce2f66597e8281c333c1057b2d32fad 100644 (file)
$display= "";
if ($this->parent != NULL){
if ($this->is_account){
- $display= $this->show_header(_("Remove samba account"),
+ $display= $this->show_disable_header(_("Remove samba account"),
_("This account has samba features enabled. You can disable them by clicking below."));
} else {
$obj= $this->parent->by_object['posixAccount'];
on. */
if ($obj->is_account){
- $display= $this->show_header(_("Create samba account"),
+ $display= $this->show_enable_header(_("Create samba account"),
_("This account has samba features disabled. You can enable them by clicking below."));
} else {
- $display= $this->show_header(_("Create samba account"),
+ $display= $this->show_enable_header(_("Create samba account"),
_("This account has samba features disabled. Posix features are needed for samba accounts, enable them first."), TRUE);
}
return ($display);
/* Prepare templating */
$smarty= get_smarty();
+ $tmp = $this->plInfo();
+ foreach($tmp['plProvidedAcls'] as $var => $rest){
+ $smarty->assign($var."ACL",$this->getacl($var));
+ }
+
/* PHP Fehler "Undefined index: sambaPwdMustChangeACL" */
#hickert test
- $smarty->assign("sambaPwdMustChangeACL", chkacl($this->acl, "sambaPwdMustChangeACL"));
+# $smarty->assign("sambaPwdMustChangeACL", chkacl($this->acl, "sambaPwdMustChangeACL"));
#hickert test
- $smarty->assign("sambaPwdMustChange",$this->sambaPwdMustChange);
+# $smarty->assign("sambaPwdMustChange",$this->sambaPwdMustChange);
if ($this->sambaPwdMustChange=="0"){
$date= getdate();
$acl= array($this->config->current['BASE'] => ":all");
$regex= $sambafilter['regex'];
$filter= "(&(objectClass=sambaSAMAccount)$exclude(uid=*$)(|(uid=$regex)(cn=$regex)))";
- $res= get_list($acl, "$filter", TRUE, $sambafilter['depselect'], array("uid"), TRUE);
+ $res= get_list($filter, $acl, $sambafilter['depselect'], array("uid"), GL_SUBSEARCH | GL_SIZELIMIT);
$wslist= array();
foreach ($res as $attrs){
$wslist[]= preg_replace('/\$/', '', $attrs['uid'][0]);
} else {
$smarty->assign("$attr", "");
}
- $smarty->assign("$attr"."ACL", chkacl($this->acl, $attr));
}
/* Assign enum values for preset items */
/* Fill preset items with values */
$smarty->assign("shadowmode", $this->mungedObject->getShadow());
- $smarty->assign("shadowACL", chkacl($this->acl,"shadow"));
+# $smarty->assign("shadowACL", chkacl($this->acl,"shadow"));
$smarty->assign("brokenconnmode", $this->mungedObject->getBrokenConn());
- $smarty->assign("brokenconnACL", chkacl($this->acl,"brokenconn"));
+# $smarty->assign("brokenconnACL", chkacl($this->acl,"brokenconn"));
$smarty->assign("reconnmode", $this->mungedObject->getReConn());
- $smarty->assign("reconnACL", chkacl($this->acl,"reconn"));
+# $smarty->assign("reconnACL", chkacl($this->acl,"reconn"));
if($_SESSION['js']){
/* Set form elements to disabled/enable state */
/* Set checkboxes to checked or unchecked state */
$smarty->assign("tslogin", $this->mungedObject->getTsLogin()?"checked":"");
- $smarty->assign("tsloginACL", chkacl($this->acl,"tslogin"));
+ # $smarty->assign("tsloginACL", chkacl($this->acl,"tslogin"));
$smarty->assign("inherit", $this->mungedObject->getInheritMode()?"checked":"");
- $smarty->assign("inheritACL", chkacl($this->acl,"inherit"));
+ # $smarty->assign("inheritACL", chkacl($this->acl,"inherit"));
$smarty->assign("connectclientdrives",
$this->mungedObject->getConnectClientDrives()?"checked":"");
- $smarty->assign("connectclientdrivesACL", chkacl($this->acl,"connectclientdrives"));
+# $smarty->assign("connectclientdrivesACL", chkacl($this->acl,"connectclientdrives"));
$smarty->assign("connectclientprinters",
$this->mungedObject->getConnectClientPrinters()?"checked":"");
- $smarty->assign("connectclientprintersACL", chkacl($this->acl,"connectclientprinters"));
+# $smarty->assign("connectclientprintersACL", chkacl($this->acl,"connectclientprinters"));
$smarty->assign("defaultprinter",
$this->mungedObject->getDefaultPrinter()?"checked":"");
- $smarty->assign("defaultprinterACL", chkacl($this->acl,"defaultprinter"));
+# $smarty->assign("defaultprinterACL", chkacl($this->acl,"defaultprinter"));
$smarty->assign("CtxMaxConnectionTimeF",
$this->mungedObject->getCtxMaxConnectionTimeF()?"checked":"");
$smarty->assign("CtxMaxDisconnectionTimeF",
/* Variables */
foreach($this->attributes as $val){
$smarty->assign("$val", $this->$val);
- $smarty->assign("$val"."ACL", chkacl($this->acl,$val));
}
-
/* 'sambaAcctFlags' checkboxes */
/* Check for 'lock-account'-flag: 'D' or 'L' */
if (is_integer(strpos($this->sambaAcctFlags, "D")) ||
} else {
$smarty->assign("flagsK", "");
}
-
+
+ /*
$smarty->assign("allow_pwchangeACL", chkacl($this->acl, "allow_pwchange"));
$smarty->assign("password_expiresACL", chkacl($this->acl, "password_expires"));
$smarty->assign("no_password_requiredACL", chkacl($this->acl, "no_password_required"));
$smarty->assign("sambaLogonTimeACL", chkacl($this->acl, "sambaLogonTime"));
$smarty->assign("sambaLogoffTimeACL", chkacl($this->acl, "sambaLogoffTime"));
$smarty->assign("sambaKickoffTimeACL", chkacl($this->acl, "sambaKickoffTime"));
-
+*/
/* In case of javascript, disable some fields on demand */
if ($this->samba3){
$this->attributes, "Save");
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/samba account with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->handle_post_events("remove");
{
/* Load uid and gid of this 'dn' */
$ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('uidNumber', 'gidNumber'));
$tmp= $ldap->fetch();
$this->uidNumber= $tmp['uidNumber'][0];
$this->gidNumber= $tmp['gidNumber'][0];
/* Write back to ldap */
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/samba account with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
$sambafilter= array( "depselect" => $base, "regex" => "*");
register_global("sambafilter", $sambafilter);
}
-
-
}
+
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Samba"),
+ "plDescription" => _("Samba settings"),
+ "plSelfModify" => TRUE,
+ "plDepends" => array("user"),
+ "plPriority" => 5, // Position in tabs
+ "plSection" => "personal", // This belongs to personal
+ "plCategory" => array("users"), // Add to following categories
+ "plOptions" => array(),
+
+ "plProvidedAcls" => array(
+ "AllowLoginOnTerminalServer" => _("Allow login on terminal server"),
+ "InheritClientConfig" => _("Inherit client config"),
+
+ "sambaPwdCanChange" => _("Allow user to change password") ,
+ "sambaAcctFlagsN" => _("Login from windows client requires no password"),
+ "sambaAcctFlagsL" => _("Lock samba account"),
+
+
+ "sambaKickoffTime" => _("Account expires") ,
+ "sambaPwdMustChange" => _("Password expires") ,
+
+ "sambaLogonTime" => _("Limit Logon Time") ,
+ "sambaLogoffTime" => _("Limit Logoff Time") ,
+
+ "sambaHomePath" => _("Generic home directory") ,
+ "sambaHomeDrive" => _("Generic samba home drive") ,
+ "sambaLogonScript" => _("Generic script path") ,
+ "sambaProfilePath" => _("Generic profile path") ,
+ "sambaDomainName" => _("Domain") ,
+ "sambaUserWorkstations" => _("Allow connection from")))
+ );
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: