← Back to branch summary

~automne-team/automne/trunk

« back to all changes in this revision

Viewing changes to automne/admin/users-controler.php

  • Committer: sebastien-pauchet
  • Date: 2012-02-15 16:47:40 UTC
  • mfrom: (363.2.105 4.2)
  • Revision ID: seb@automne-cms.org-20120215164740-xrk26iafkvztwv6s
Merge stable branch 4.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
automne/admin/users-controler.php
67
67
$pass1 = sensitiveIO::request('pass1', 'sensitiveIO::isValidPassword');
68
68
$pass2 = sensitiveIO::request('pass2', 'sensitiveIO::isValidPassword');
69
69
$language = sensitiveIO::request('language');
70
 
$dn = sensitiveIO::request('dn');
71
70
//user details vars
72
71
$address1 = sensitiveIO::request('address1');
73
72
$address2 = sensitiveIO::request('address2');
81
80
$service = sensitiveIO::request('service');
82
81
$state = sensitiveIO::request('state');
83
82
$zipcode = sensitiveIO::request('zipcode');
 
83
$company = sensitiveIO::request('company');
 
84
$gender = sensitiveIO::request('gender');
 
85
 
84
86
//alerts
85
87
$alerts = sensitiveIO::request('alerts', 'is_array', array());
86
88
//groups
396
398
                //lastname
397
399
                if ($lastname) {
398
400
                        $user->setLastName(ucfirst($lastname));
399
 
                } elseif (!$user->getDN()) {
 
401
                } elseif (!$user->getLastName()) {
400
402
                        $cms_message = $cms_language->getMessage(MESSAGE_INCORRECT_FIELD_VALUE, array($cms_language->getMessage(MESSAGE_FIELD_LASTNAME)))."\n";
401
403
                }
402
404
                //firstname
406
408
                        $cms_message .= $cms_language->getMessage(MESSAGE_LOGIN_EXISTS, array($login))."\n";
407
409
                } elseif ($login && !$user->setLogin($login)) { 
408
410
                        $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_FIELD_VALUE, array($cms_language->getMessage(MESSAGE_FIELD_LOGIN)))."\n";
409
 
                } elseif (APPLICATION_LDAP_AUTH && !$user->getDN()) {
410
 
                        $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_FIELD_VALUE, array($cms_language->getMessage(MESSAGE_FIELD_LOGIN)))."\n";
411
411
                }
412
412
                
413
413
                //Check password fields
414
414
                if($pass1 && $pass2 && $pass1 == $pass2 && $user->getLogin() != $pass1) {
415
415
                   $user->setPassword($pass1);
416
 
                   /*if (!APPLICATION_LDAP_AUTH)  {
417
 
                                $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_PASSWORD_VALUES)."\n";
418
 
                   }*/
419
 
                } elseif (!$user->havePassword() && !$user->getDN()) {
420
 
                        $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_FIELD_VALUE, array($cms_language->getMessage(MESSAGE_FIELD_PASSWORD)))."\n";
421
416
                } elseif ($pass1 || $pass2) {
422
417
                        $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_PASSWORD_VALUES)."\n";
423
418
                }
432
427
                        }
433
428
                }
434
429
                
435
 
                // LDAP dn, only required when LDAP Auth activated
436
 
                if ($dn) {
437
 
                        if (CMS_profile_usersCatalog::dnExists($dn, $user)) {
438
 
                                $cms_message .= $cms_language->getMessage(MESSAGE_DISTINGUISHED_NAME_EXISTS, array($dn))."\n";
439
 
                        } else {
440
 
                                $user->setDN(CMS_ldap_query::appendWithBaseDn($dn));
441
 
                        }
442
 
                } elseif (APPLICATION_LDAP_AUTH && !$user->getDN()) {
443
 
                        $cms_message .= $cms_language->getMessage(MESSAGE_INCORRECT_FIELD_VALUE,array($cms_language->getMessage(MESSAGE_FIELD_DISTINGUISHED_NAME)))."\n";
444
 
                }
445
 
                
446
430
                // Check if any errors when updating user datas
447
431
                if (!$cms_message) {
448
432
                        $user->writeToPersistence();
497
481
                        $contactData->setCity($city);
498
482
                        $contactData->setState($state);
499
483
                        $contactData->setCountry($country);
 
484
                        $contactData->setCompany($company);
 
485
                        $contactData->setGender($gender);
 
486
                        
500
487
                        $user->setContactData($contactData); 
501
488
                        $user->writeToPersistence();
502
489