Fix PHP warnings

1.10.x
Julio Montoya 10 years ago
parent 736761c13a
commit e51a039425
  1. 36
      main/admin/user_add.php
  2. 9
      main/attendance/attendance_calendar.php
  3. 2
      main/attendance/attendance_list.php

@ -235,7 +235,14 @@ $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), ' ');
$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
$group = array ();
$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
$group[] = $form->createElement('DatePicker', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
$group[] = $form->createElement(
'DatePicker',
'expiration_date',
null,
array(
'onchange' => 'javascript: enable_expiration_date();'
)
);
$form->addGroup($group, 'max_member_group', null, '', false);
// Active account or inactive account
$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
@ -258,12 +265,9 @@ $defaults['admin']['platform_admin'] = 0;
$defaults['mail']['send_mail'] = 1;
$defaults['password']['password_auto'] = 1;
$defaults['active'] = 1;
$defaults['expiration_date'] = array();
$days = api_get_setting('account_valid_duration');
$time = strtotime('+'.$days.' day');
$defaults['expiration_date']['d'] = date('d', $time);
$defaults['expiration_date']['F'] = date('m', $time);
$defaults['expiration_date']['Y'] = date('Y', $time);
$defaults['expiration_date'] = date('Y-m-d', api_strtotime('+'.$days.' day'));
$defaults['radio_expiration_date'] = 0;
$defaults['status'] = STUDENT;
$defaults = array_merge($defaults, $extra_data);
@ -352,7 +356,25 @@ if( $form->validate()) {
} else {
if (!empty($picture['name'])) {
$picture_uri = UserManager::update_user_picture($user_id, $_FILES['picture']['name'], $_FILES['picture']['tmp_name']);
UserManager::update_user($user_id, $firstname, $lastname, $username, $password, $auth_source, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active, null, $hr_dept_id, null, $language);
UserManager::update_user(
$user_id,
$firstname,
$lastname,
$username,
$password,
$auth_source,
$email,
$status,
$official_code,
$phone,
$picture_uri,
$expiration_date,
$active,
null,
$hr_dept_id,
null,
$language
);
}
foreach ($extra as $key => $value) {

@ -38,12 +38,12 @@ if (!empty($message_information)) {
Display::display_normal_message($message, false);
}
if ($error_repeat_date) {
if (isset($error_repeat_date) && $error_repeat_date) {
$message = get_lang('EndDateMustBeMoreThanStartDate');
Display::display_error_message($message, false);
}
if ($error_checkdate) {
if (isset($error_checkdate) && $error_checkdate) {
$message = get_lang('InvalidDate');
Display::display_error_message($message, false);
}
@ -70,13 +70,14 @@ if (isset($action) && $action == 'calendar_add') {
)
);
$defaults['repeat'] = $repeat;
$defaults['repeat'] = isset($repeat) ? $repeat : null;
if ($repeat) {
if ($defaults['repeat']) {
$form->addElement('html', '<div id="repeat-date-attendance" style="display:block">');
} else {
$form->addElement('html', '<div id="repeat-date-attendance" style="display:none">');
}
$a_repeat_type = array(
'daily' => get_lang('RepeatDaily'),
'weekly' => get_lang('RepeatWeekly'),

@ -30,6 +30,8 @@ if ($attendance->get_number_of_attendances() == 0) {
$attendance->set_description(get_lang('Attendances'));
$attendance->attendance_add();
}
$default_column = isset($default_column) ? $default_column : null;
$parameters = isset($parameters) ? $parameters : null;
$table = new SortableTable(
'attendance_list',
array('Attendance', 'get_number_of_attendances'),

Loading…
Cancel
Save