![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e47078544a44f8fd8862f1af2fbdc18658323602..c24f100f06db46e18e03179de982bf3b060dba37 100644 (file)
/* attribute list for save action */
var $attributes= array("sn", "givenName", "uid", "personalTitle", "academicTitle",
"homePostalAddress", "homePhone", "labeledURI", "o", "ou", "dateOfBirth", "gender","preferredLanguage",
- "departmentNumber", "employeeNumber", "employeeType", "l", "st",
+ "departmentNumber", "employeeNumber", "employeeType", "l", "st","jpegPhoto",
"roomNumber", "telephoneNumber", "mobile", "pager", "cn", "userPKCS12",
"postalAddress", "facsimileTelephoneNumber", "userSMIMECertificate");
} else {
if(is_array($this->dateOfBirth)){
$date = $this->dateOfBirth;
- }else{
+
+ // Trigger on dates like 1985-04-01, getdate only understands timestamps
+ } else if (!empty($this->dateOfBirth) && !is_numeric($this->dateOfBirth)){
+ $date= getdate(strtotime($this->dateOfBirth));
+
+ } else {
$date = getdate($this->dateOfBirth);
}
}
$smarty->assign("gender_list", $sex);
/* Assign prefered langage */
- $language= array(0 => " ", "fr_FR" => ("fr_FR"), "en_EN" => ("en_EN"), "de_DE" => ("de_DE"), "it_IT" => ("it_IT"), "nl_NL" => ("nl_NL"));
+ $language= array(0 => " ", "fr_FR" => ("fr_FR"), "en_EN" => ("en_EN"),
+ "de_DE" => ("de_DE"), "it_IT" => ("it_IT"),
+ "nl_NL" => ("nl_NL"), "ru_RU" => ("ru_RU"));
$smarty->assign("preferredLanguage_list", $language);
/* Get random number for pictures */
/* Remove picture? */
if (isset($_POST['picture_remove'])){
+ $this->set_picture ();
$this->jpegPhoto= "*removed*";
- $this->set_picture ("./images/default.jpg");
$this->is_modified= TRUE;
return($smarty->fetch (get_template_path('generic_picture.tpl', TRUE, dirname(__FILE__))));
/* Read out data*/
$timeto = $certificate->getvalidto_date();
$timefrom = $certificate->getvalidfrom_date();
- $str = "<table summary=\"\" border=0><tr><td style='vertical-align:top'>CN</td><td>".preg_replace("/ /", " ", $certificate->getname())."</td></tr></table><br>".
- sprintf(_("Certificate is valid from %s to %s and is currently %s."), "<b>".date('d M Y',$timefrom)."</b>","<b>".date('d M Y',$timeto)."</b>", $certificate->isvalid()?"<b><font style='color:green'>"._("valid")."</font></b>":"<b><font style='color:red'>"._("invalid")."</font></b>");
+
+ /* Additional info if start end time is '0' */
+ $add_str_info = "";
+ if($timeto == 0 && $timefrom == 0){
+ $add_str_info = "<br><i>"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.)")."</i>";
+ }
+
+ $str = "<table summary=\"\" border=0>
+ <tr>
+ <td style='vertical-align:top'>CN</td>
+ <td>".preg_replace("/ /", " ", $certificate->getname())."</td>
+ </tr>
+ </table><br>".
+
+ sprintf(_("Certificate is valid from %s to %s and is currently %s."),
+ "<b>".date('d M Y',$timefrom)."</b>",
+ "<b>".date('d M Y',$timeto)."</b>",
+ $certificate->isvalid()?"<b><font style='color:green'>"._("valid")."</font></b>":
+ "<b><font style='color:red'>"._("invalid")."</font></b>").$add_str_info;
$smarty->assign($cert."info",$str);
$smarty->assign($cert."_state","true");
} else {
$this->pw_storage= $this->config->current['HASH'];
}
- $temp = passwordMethod::get_available_methods();
+ $temp = @passwordMethod::get_available_methods();
$hashes = $temp['name'];
$smarty->assign("pwmode", $hashes);
{
$ldap= $this->config->get_ldap_link();
$ldap->rmdir ($this->dn);
+ show_ldap_error($ldap->get_error(), _("Removing generic user account failed"));
/* Delete references to groups */
$ldap->cd ($this->config->current['BASE']);
$og->save ();
}
+ /* Kerberos server defined? */
+ if (isset($this->config->data['SERVERS']['KERBEROS'])){
+ $cfg= $this->config->data['SERVERS']['KERBEROS'];
+ }
+ if (isset($cfg['SERVER']) && function_exists('kadm5_init_with_password')){
+
+ /* Connect to the admin interface */
+ $handle = kadm5_init_with_password($cfg['SERVER'], $cfg['REALM'],
+ $cfg['ADMIN'], $cfg['PASSWORD']);
+
+ /* Errors? */
+ if ($handle === FALSE){
+ print_red (_("Kerberos database communication failed"));
+ return (2);
+ }
+
+ /* Build user principal, get list of existsing principals */
+ $principal= $this->uid."@".$cfg['REALM'];
+ $principals = kadm5_get_principals($handle);
+
+ /* User exists in database? */
+ if (in_array($principal, $principals)){
+
+ /* Ok. User exists. Remove him/her */
+ $ret= kadm5_delete_principal ( $handle, $principal);
+ if ($ret === FALSE){
+ print_red (_("Can't remove user from kerberos database."));
+ }
+ }
+
+ /* Free kerberos admin handle */
+ kadm5_destroy($handle);
+ }
+
+
/* Optionally execute a command after we're done */
- $this->handle_post_events("remove");
+ $this->handle_post_events("remove",array("uid" => $this->uid));
}
/* Only force save of changes ....
If this attributes aren't changed, avoid saving.
*/
- if ($this->use_dob == "1"){
- $this->dateOfBirth= date("Y-m-d", $this->dateOfBirth);
- }
if($this->gender=="0") $this->gender ="";
if($this->preferredLanguage=="0") $this->preferredLanguage ="";
/* First use parents methods to do some basic fillup in $this->attrs */
plugin::save ();
+ if ($this->use_dob == "1"){
+ /* If it is an array, the generic page has never been loaded - so there's no difference. Using an array would cause an error btw. */
+ if(!is_array($this->attrs['dateOfBirth'])) {
+ $this->attrs['dateOfBirth']= date("Y-m-d", $this->attrs['dateOfBirth']);
+ }
+ }
/* Remove additional objectClasses */
$tmp= array();
foreach ($this->attrs['objectClass'] as $key => $set){
$this->attrs["jpegPhoto"] = $output;
}
- } elseif(!$this->new) {
+ } else{
$this->attrs["jpegPhoto"] = array();
}
$this->cleanup();
$ldap->cd ($this->dn);
$ldap->$mode ($this->attrs);
- if (show_ldap_error($ldap->get_error())){
+ if (show_ldap_error($ldap->get_error(), _("Saving generic user account failed"))){
return (1);
}
/* Ok. User exists. Remove him/her when pw_storage has
changed to be NOT kerberos. */
- if ($this->pw_storage != "kerberos"){
+ if ($this->pw_storage != $this->config->current['KRBSASL']){
$ret= kadm5_delete_principal ( $handle, $principal);
if ($ret === FALSE){
} else {
- /* User doesn't exists, create it when pw_storage is kerberos. */
- if ($this->pw_storage == "kerberos"){
+ /* User doesn't exists, create it when pw_storage is kerberos or SASL. */
+ if ($this->pw_storage == "kerberos" || $this->pw_storage == "sasl" ){
$ret= kadm5_create_principal ( $handle, $principal);
if ($ret === FALSE){
/* Optionally execute a command after we're done */
if ($mode == "add"){
- $this->handle_post_events("add");
+ $this->handle_post_events("add",array("uid" => $this->uid));
} elseif ($this->is_modified){
- $this->handle_post_events("modify");
+ $this->handle_post_events("modify",array("uid" => $this->uid));
}
/* Fix tagging if needed */
$message= plugin::check();
/* Assemble cn */
- $this->cn= $this->givenName." ".$this->sn;
+ $pt= "";
+ if(isset($this->config->current['INCLUDE_PERSONAL_TITLE']) && preg_match("/true/i",$this->config->current['INCLUDE_PERSONAL_TITLE'])){
+ if(!empty($this->personalTitle)){
+ $pt = $this->personalTitle." ";
+ }
+ }
+
+ $this->cn= $pt.$this->givenName." ".$this->sn;
/* Permissions for that base? */
if (isset($this->config->current['DNMODE']) && $this->config->current['DNMODE'] == "uid"){
/* Load picture from file to object */
- function set_picture($filename)
+ function set_picture($filename ="")
{
- if (!is_file($filename)){
+ if (!is_file($filename) || $filename == ""){
$filename= "./images/default.jpg";
$this->jpegPhoto= "*removed*";
}
foreach($attrs['gosaSubtreeACL'] as $attr){
if((preg_match("/:user#/",$attr))||(preg_match("/:all/",$attr))){
- $s = preg_replace("/^.*ou=groups,/","",$attrs['dn']);
+ $s = preg_replace("/^.*".get_groups_ou().",/","",$attrs['dn']);
foreach($this->config->idepartments as $key => $dep) {
if(preg_match("/".$s."/i",$key)){
}
}
}
+
+
+ function PrepareForCopyPaste($source)
+ {
+ plugin::PrepareForCopyPaste($source);
+
+ /* Reset certificate information addepted from source user
+ to avoid setting the same user certificate for the destination user. */
+ $this->userPKCS12= "";
+ $this->userSMIMECertificate= "";
+ $this->userCertificate= "";
+ $this->certificateSerialNumber= "";
+ $this->old_certificateSerialNumber= "";
+ $this->old_userPKCS12= "";
+ $this->old_userSMIMECertificate= "";
+ $this->old_userCertificate= "";
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: