diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index 99c1c39bd7..60ec490484 100644 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -20,8 +20,8 @@ SessionManager::protect_session_edit($id_session); $tool_name = get_lang('SessionOverview'); -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); -$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList')); +$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin')); +$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList')); // Database Table Definitions $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); @@ -35,8 +35,6 @@ $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY) $table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); - - $sql = 'SELECT name, nbr_courses, nbr_users, nbr_classes, DATE_FORMAT(date_start,"%d-%m-%Y") as date_start, DATE_FORMAT(date_end,"%d-%m-%Y") as date_end, lastname, firstname, username, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM '.$tbl_session.' LEFT JOIN '.$tbl_user.' ON id_coach = user_id WHERE '.$tbl_session.'.id='.$id_session; @@ -117,17 +115,13 @@ if (!empty($message)) { } echo Display::page_header(Display::return_icon('session.png', get_lang('Session')).' '.$session['name']); + +$url = Display::url(Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL), "session_edit.php?page=resume_session.php&id=$id_session"); +echo Display::page_subheader(get_lang('GeneralProperties').$url); + ?> - - - - +
- - - - -
@@ -205,16 +199,16 @@ if ($multiple_url_is_on) { ?>
:

+ + + - - - - +
- - - - -
@@ -276,6 +270,7 @@ if ($session['nbr_courses'] == 0){
'.Display::return_icon('course_home.gif', get_lang('Course')).' '.Display::return_icon('user.png', get_lang('Edit'), '', ICON_SIZE_SMALL).' + '.Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), null, ICON_SIZE_SMALL).' '.Display::return_icon('statistics.gif', get_lang('Tracking')).'  '.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).' '.Display::return_icon('delete.png', get_lang('Delete')).' @@ -286,16 +281,26 @@ if ($session['nbr_courses'] == 0){ ?>

- - - - - + + + + + +
- - - - -
+ + + +
+ + + +
- '.$user_link.' + '.$user_link.' '.Display::return_icon('statistics.gif', get_lang('Reporting')).'  diff --git a/main/admin/session_user_import.php b/main/admin/session_user_import.php new file mode 100644 index 0000000000..19f166a40a --- /dev/null +++ b/main/admin/session_user_import.php @@ -0,0 +1,110 @@ + 'index.php', 'name' => get_lang('PlatformAdmin')); +$interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList')); +$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$session_id,"name" => get_lang('SessionOverview')); + +set_time_limit(0); + +if ($_POST['formSent']) { + if (isset($_FILES['import_file']['tmp_name']) && !empty($_FILES['import_file']['tmp_name'])) { + $form_sent = $_POST['formSent']; + $send_mail = $_POST['sendMail'] ? 1 : 0; + + // CSV + $users = Import::csv_to_array($_FILES['import_file']['tmp_name']); + $user_list = array(); + foreach ($users as $user) { + $user_list[] = $user['id']; + } + + if (!empty($user_list)) { + SessionManager::suscribe_users_to_session($session_id, $user_list, null, false, $send_mail); + foreach ($user_list as & $user_id) { + $user_info = api_get_user_info($user_id); + $user_id = $user_info['complete_name']; + } + $error_message = get_lang('UsersAdded').' : '.implode(', ', $user_list); + } + } else { + $error_message = get_lang('NoInputFile'); + } +} + +// Display the header. +Display::display_header($tool_name); + +if (count($inserted_in_course) > 1) { + $msg = get_lang('SeveralCoursesSubscribedToSessionBecauseOfSameVisualCode').': '; + foreach ($inserted_in_course as $code => $title) { + $msg .= ' '.$title.' ('.$title.'),'; + } + $msg = substr($msg, 0, -1); + Display::display_warning_message($msg); +} + +echo '
'; +echo ''.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).''; +echo '
'; + +if (!empty($error_message)) { + Display::display_normal_message($error_message, false); +} + +$form = new FormValidator('import_sessions', 'post', api_get_self().'?id_session='.$session_id, null, array('enctype' => 'multipart/form-data')); +$form->addElement('hidden', 'formSent', 1); +$form->addElement('file', 'import_file', get_lang('ImportCSVFileLocation')); + +$form->addElement('checkbox', 'sendMail', null, get_lang('SendMailToUsers')); +$form->addElement('button', 'submit', get_lang('Import')); + +$defaults = array('sendMail' => 'true'); +$form->setDefaults($defaults); + +$form->display(); + +?> + +

:

+ +
+
+id;
+06;
+30;
+
+
+ +0) { - foreach($user_list as $enreg_user) { - if (!in_array($enreg_user,$existingUsers )) { - //send email - $emailbody = ''; - $emailheaders = ''; - - $user_info = UserManager::get_user_info_by_id($enreg_user); - $firstname = $user_info['firstname']; - $lastname = $user_info['lastname']; - $email = $user_info['email']; - - $emailto = '"'.$firstname.' '.$lastname.'" <'.$email.'>'; - $emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName'); - $emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n"; + foreach ($user_list as $user_id) { + if (!in_array($user_id, $existingUsers)) { + + $subject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName'); + $user_info = api_get_user_info($user_id); + $content = get_lang('Dear')." ".stripslashes($user_info['complete_name']).",\n\n".sprintf(get_lang('YouAreRegisterToSessionX'), $session_name) ." \n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". api_get_path(WEB_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator'); + + MessageManager::send_message($user_id, $subject, $content, array(), array(), null, null, null, null, null); + + /*$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n"; $emailheaders .= 'Reply-To: '.get_setting('emailAdministrator'); $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".sprintf(get_lang('YouAreRegisterToSessionX'), $session_name) ." \n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". api_get_path(WEB_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator'); - @api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders); + @api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);*/ } }