Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 0733e168

Přidáno uživatelem Ondřej Fibich před více než 6 roky(ů)

Fixes #1092: User birthday can be no longer mandatory. Administrator can disable mandatory field in settings.

Zobrazit rozdíly:

application/controllers/members.php
->selected($default_speed_class ? $default_speed_class->id : NULL)
->add_button('speed_classes')
->style('width:200px');
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required');
if (Settings::get('user_birthday_required'))
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required');
}
else
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->value('');
}
$form->date('entrance_date')
->label('Entrance date')
......
$user->surname = $form_data['surname'];
$user->pre_title = $form_data['title1'];
$user->post_title = $form_data['title2'];
$user->birthday = date("Y-m-d",$form_data['birthday']);
if (empty($form_data['birthday']))
{
$user->birthday = NULL;
}
else
{
$user->birthday = date("Y-m-d", $form_data['birthday']);
}
$user->password = sha1($form_data['password']);
$user->type = User_Model::MAIN_USER;
$user->application_password = security::generate_password();
application/controllers/registration.php
->label('Post title')
->rules('length[3,30]');
$form->date('birthday')
->label('Birthday')
->years(date('Y') - 100, date('Y'))
->rules('required');
if (Settings::get('user_birthday_required'))
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required');
}
else
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->value('');
}
$legalp_group = $form->group('Legal person innformation')->visible(FALSE);
......
$user->surname = $form_data['surname'];
$user->pre_title = $form_data['title1'];
$user->post_title = $form_data['title2'];
$user->birthday = date('Y-m-d', $form_data['birthday']);
$user->type = User_Model::MAIN_USER;
if (empty($form_data['birthday']))
{
$user->birthday = NULL;
}
else
{
$user->birthday = date("Y-m-d", $form_data['birthday']);
}
// entrance fee
$fee_model = new Fee_Model();
$fee = $fee_model->get_by_date_type(date('Y-m-d'), 'entrance fee');
application/controllers/settings.php
$this->form->checkbox('user_email_duplicities_enabled')
->label('Enable multiple users to have assigned same e-mail contact')
->checked(Settings::get('user_email_duplicities_enabled'));
$this->form->checkbox('user_birthday_required')
->label('Is user birthday a mandatory information?')
->checked(Settings::get('user_birthday_required'));
$this->form->group('Security');
application/controllers/users.php
->years(date('Y')-100, date('Y'))
->rules('required')
->value(strtotime($user->birthday));
if (Settings::get('user_birthday_required'))
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required')
->value(strtotime($user->birthday));
}
else
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->value(strtotime($user->birthday));
}
if ($this->acl_check_edit(get_class($this), 'comment', $user->member_id))
{
......
{
$user_data->login = $form_data['username'];
}
$user_data->birthday = date("Y-m-d",$form_data['birthday']);
if (empty($form_data['birthday']))
{
$user_data->birthday = NULL;
}
else
{
$user_data->birthday = date("Y-m-d", $form_data['birthday']);
}
$user_data->pre_title = $form_data['pre_title'];
$user_data->name = $form_data['name'];
$user_data->middle_name = $form_data['middle_name'];
......
$form->group('Additional information');
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required');
if (Settings::get('user_birthday_required'))
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->rules('required');
}
else
{
$form->date('birthday')
->label('Birthday')
->years(date('Y')-100, date('Y'))
->value('');
}
if ($this->acl_check_new(get_class($this),'comment',$member_id))
{
......
$form_data = $form->as_array();
$user_data = new User_Model;
$user_data->birthday = date("Y-m-d",$form_data['birthday']);
$user_data->login = $form_data['username'];
$user_data->password = sha1($form_data['password']);
$user_data->pre_title = $form_data['pre_title'];
......
$user_data->surname = $form_data['surname'];
$user_data->post_title = $form_data['post_title'];
if (empty($form_data['birthday']))
{
$user_data->birthday = NULL;
}
else
{
$user_data->birthday = date("Y-m-d", $form_data['birthday']);
}
if (isset($form_data['comment']))
$user_data->comment = $form_data['comment'];
application/i18n/cs_CZ/texts.php
'is not in' => 'není v',
'is unreachable' => 'je nedostupný',
'is unreachable since' => 'je nedostupný od',
'is user birthday a mandatory information?' => 'Je narození uživatele povinný údaj?',
'issued' => 'Vydaná',
'it can means that username/password/host are bad or host is unavailable' => 'To může znamenat, že uživatelské jméno/heslo/hostitel je špatné nebo je hostitel nedostupný.',
'it is not possible activate e-mail notification for this message' => 'Není možné aktivovat e-mail upozornění pro tuto zprávu.',
application/libraries/Settings.php
// contact duplicities
'user_email_duplicities_enabled' => FALSE,
'user_phone_duplicities_enabled' => FALSE,
// user birthday
'user_birthday_required' => TRUE,
// username regex #360
'username_regex' => '/^[a-z][a-z0-9_]{4,}$/',

Také k dispozici: Unified diff