@@ -22,7 +22,7 @@ |
||
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | -$formSequence = new FormValidator('sequence_form', 'post', api_get_self(),null,null,'inline'); |
|
25 | +$formSequence = new FormValidator('sequence_form', 'post', api_get_self(), null, null, 'inline'); |
|
26 | 26 | $formSequence->addText('name', get_lang('Sequence'), true, ['cols-size' => [3, 8, 1]]); |
27 | 27 | $formSequence->addButtonCreate(get_lang('AddSequence'), 'submit_sequence', false, ['cols-size' => [3, 8, 1]]); |
28 | 28 |
@@ -8,43 +8,43 @@ discard block |
||
8 | 8 | */ |
9 | 9 | exit(); //not yet functional, needs to be revised |
10 | 10 | |
11 | -$cidReset=true; |
|
11 | +$cidReset = true; |
|
12 | 12 | |
13 | 13 | require('../inc/global.inc.php'); |
14 | 14 | $libpath = api_get_path(LIBRARY_PATH); |
15 | 15 | require("../auth/ldap/authldap.php"); |
16 | -$annee_base=date('Y'); |
|
16 | +$annee_base = date('Y'); |
|
17 | 17 | // setting the section (for the tabs) |
18 | 18 | $this_section = SECTION_PLATFORM_ADMIN; |
19 | 19 | api_protect_admin_script(); |
20 | 20 | |
21 | 21 | // setting breadcrumbs |
22 | -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); |
|
23 | -$interbreadcrumb[]=array('url' => api_get_self(),"name" => get_lang('SessionsList')); |
|
22 | +$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
23 | +$interbreadcrumb[] = array('url' => api_get_self(), "name" => get_lang('SessionsList')); |
|
24 | 24 | |
25 | 25 | // Database Table Definitions |
26 | 26 | $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
27 | -$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | -$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | -$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | -$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | -$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | -$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | -$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | -$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
27 | +$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | +$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | +$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | +$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | +$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | +$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | +$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | +$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
35 | 35 | |
36 | -$tbl_session_rel_etape = "session_rel_etape"; |
|
36 | +$tbl_session_rel_etape = "session_rel_etape"; |
|
37 | 37 | |
38 | -$id_session=intval($_GET['id_session']); |
|
38 | +$id_session = intval($_GET['id_session']); |
|
39 | 39 | |
40 | -$formSent=0; |
|
41 | -$errorMsg=$firstLetterUser=$firstLetterSession=''; |
|
42 | -$UserList=$SessionList=array(); |
|
43 | -$users=$sessions=array(); |
|
44 | -$noPHP_SELF=true; |
|
40 | +$formSent = 0; |
|
41 | +$errorMsg = $firstLetterUser = $firstLetterSession = ''; |
|
42 | +$UserList = $SessionList = array(); |
|
43 | +$users = $sessions = array(); |
|
44 | +$noPHP_SELF = true; |
|
45 | 45 | |
46 | -$page=intval($_GET['page']); |
|
47 | -$action=$_REQUEST['action']; |
|
46 | +$page = intval($_GET['page']); |
|
47 | +$action = $_REQUEST['action']; |
|
48 | 48 | |
49 | 49 | $tool_name = get_lang('Synchro LDAP : Import Etudiants/Etapes dans session'); |
50 | 50 | Display::display_header($tool_name); |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | </form> |
60 | 60 | |
61 | 61 | <?php |
62 | -if (isset($action) && ($action=="synchro")) { |
|
63 | - $included=true; |
|
62 | +if (isset($action) && ($action == "synchro")) { |
|
63 | + $included = true; |
|
64 | 64 | require('ldap_synchro.php'); |
65 | - Display :: display_normal_message($message,false); |
|
65 | + Display :: display_normal_message($message, false); |
|
66 | 66 | } |
67 | 67 | Display::display_footer(); |
68 | 68 | ?> |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | $tool_name = get_lang('Export'); |
15 | 15 | |
16 | -$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
17 | -$interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Classes')); |
|
16 | +$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
17 | +$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes')); |
|
18 | 18 | |
19 | 19 | set_time_limit(0); |
20 | 20 |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | . '<script type="text/javascript">' |
21 | 21 | . '$(document).ready(function() {' |
22 | 22 | . '$.ajax({' |
23 | - . 'url: "'. api_get_path(WEB_CODE_PATH) .'inc/ajax/statistics.ajax.php?a=recentlogins",' |
|
23 | + . 'url: "'.api_get_path(WEB_CODE_PATH).'inc/ajax/statistics.ajax.php?a=recentlogins",' |
|
24 | 24 | . 'type: "POST",' |
25 | 25 | . 'success: function(data) {' |
26 | 26 | . 'Chart.defaults.global.responsive = true;' |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | // users ... |
51 | 51 | $tools[$strUsers]['report=users'] = get_lang('CountUsers'); |
52 | 52 | $tools[$strUsers]['report=recentlogins'] = get_lang('Logins'); |
53 | -$tools[$strUsers]['report=logins&type=month'] = get_lang('Logins') . ' (' . get_lang('PeriodMonth') . ')'; |
|
54 | -$tools[$strUsers]['report=logins&type=day'] = get_lang('Logins') . ' (' . get_lang('PeriodDay') . ')'; |
|
55 | -$tools[$strUsers]['report=logins&type=hour'] = get_lang('Logins') . ' (' . get_lang('PeriodHour') . ')'; |
|
56 | -$tools[$strUsers]['report=pictures'] = get_lang('CountUsers') . ' (' . get_lang('UserPicture') . ')'; |
|
53 | +$tools[$strUsers]['report=logins&type=month'] = get_lang('Logins').' ('.get_lang('PeriodMonth').')'; |
|
54 | +$tools[$strUsers]['report=logins&type=day'] = get_lang('Logins').' ('.get_lang('PeriodDay').')'; |
|
55 | +$tools[$strUsers]['report=logins&type=hour'] = get_lang('Logins').' ('.get_lang('PeriodHour').')'; |
|
56 | +$tools[$strUsers]['report=pictures'] = get_lang('CountUsers').' ('.get_lang('UserPicture').')'; |
|
57 | 57 | $tools[$strUsers]['report=no_login_users'] = get_lang('StatsUsersDidNotLoginInLastPeriods'); |
58 | 58 | $tools[$strUsers]['report=zombies'] = get_lang('Zombies'); |
59 | 59 | |
@@ -68,10 +68,10 @@ discard block |
||
68 | 68 | echo '<table><tr>'; |
69 | 69 | foreach ($tools as $section => $items) { |
70 | 70 | echo '<td style="vertical-align:top;">'; |
71 | - echo '<h3>' . $section . '</h3>'; |
|
71 | + echo '<h3>'.$section.'</h3>'; |
|
72 | 72 | echo '<ul>'; |
73 | 73 | foreach ($items as $key => $value) { |
74 | - echo '<li><a href="index.php?' . $key . '">' . $value . '</a></li>'; |
|
74 | + echo '<li><a href="index.php?'.$key.'">'.$value.'</a></li>'; |
|
75 | 75 | } |
76 | 76 | echo '</ul>'; |
77 | 77 | echo '</td>'; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | echo '</tr></table>'; |
80 | 80 | |
81 | 81 | $course_categories = Statistics::getCourseCategories(); |
82 | -echo '<br/><br/>';//@todo: spaces between elements should be handled in the css, br should be removed if only there for presentation |
|
82 | +echo '<br/><br/>'; //@todo: spaces between elements should be handled in the css, br should be removed if only there for presentation |
|
83 | 83 | |
84 | 84 | switch ($report) { |
85 | 85 | case 'courses': |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | Statistics::printStats(get_lang('Students'), $students); |
122 | 122 | break; |
123 | 123 | case 'recentlogins': |
124 | - echo '<h2>'. sprintf(get_lang('LastXDays'), '15') . '</h2>'; |
|
124 | + echo '<h2>'.sprintf(get_lang('LastXDays'), '15').'</h2>'; |
|
125 | 125 | echo '<canvas class="col-md-12" id="canvas" height="100px" style="margin-bottom: 20px"></canvas>'; |
126 | 126 | Statistics::printRecentLoginStats(); |
127 | 127 | Statistics::printRecentLoginStats(true); |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | // Setting breadcrumbs. |
22 | 22 | $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
23 | -$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('Classes')); |
|
23 | +$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('Classes')); |
|
24 | 24 | |
25 | 25 | // Setting the name of the tool. |
26 | 26 | $tool_name = get_lang("AddClasses"); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1 |
27 | 27 | ) { |
28 | 28 | $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
29 | - $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course |
|
29 | + $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course |
|
30 | 30 | ON (c.id = url_rel_course.c_id)"; |
31 | 31 | } |
32 | 32 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | if ((api_is_platform_admin() || api_is_session_admin()) && |
63 | 63 | api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1 |
64 | 64 | ) { |
65 | - $sql.= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id(); |
|
65 | + $sql .= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id(); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $res = Database::query($sql); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1 |
102 | 102 | ) { |
103 | 103 | $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
104 | - $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course |
|
104 | + $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course |
|
105 | 105 | ON (course.id = url_rel_course.c_id)"; |
106 | 106 | } |
107 | 107 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | if ((api_is_platform_admin() || api_is_session_admin()) && |
137 | 137 | api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1 |
138 | 138 | ) { |
139 | - $sql.= " AND url_rel_course.access_url_id=".api_get_current_access_url_id(); |
|
139 | + $sql .= " AND url_rel_course.access_url_id=".api_get_current_access_url_id(); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | $sql .= " ORDER BY col$column $direction "; |
@@ -206,13 +206,13 @@ discard block |
||
206 | 206 | |
207 | 207 | if (isset($_GET['session_id']) && !empty($_GET['session_id'])) { |
208 | 208 | $sessionId = intval($_GET['session_id']); |
209 | - $sql.= " WHERE s.id = ".$sessionId; |
|
209 | + $sql .= " WHERE s.id = ".$sessionId; |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | $sql .= " ORDER BY col$column $direction "; |
213 | 213 | $sql .= " LIMIT $from,$number_of_items"; |
214 | 214 | $res = Database::query($sql); |
215 | - $courses = array (); |
|
215 | + $courses = array(); |
|
216 | 216 | while ($course = Database::fetch_array($res)) { |
217 | 217 | // Place colour icons in front of courses. |
218 | 218 | $show_visual_code = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null; |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | */ |
256 | 256 | function get_course_visibility_icon($v) { |
257 | 257 | $style = 'margin-bottom:0;margin-right:5px;'; |
258 | - switch($v) { |
|
258 | + switch ($v) { |
|
259 | 259 | case 0: |
260 | 260 | return Display::return_icon('bullet_red.png', get_lang('CourseVisibilityClosed'), array('style' => $style)); |
261 | 261 | break; |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | $form->setDefaults($defaults); |
343 | 343 | $content .= $form->return_form(); |
344 | 344 | } else { |
345 | - $interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
345 | + $interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
346 | 346 | $tool_name = get_lang('CourseList'); |
347 | 347 | |
348 | 348 | if (isset($_GET['action'])) { |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE); |
370 | 370 | $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword')); |
371 | 371 | $form->addButtonSearch(get_lang('SearchCourse')); |
372 | - $advanced = '<a class="btn btn-default" href="'. api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>'; |
|
372 | + $advanced = '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>'; |
|
373 | 373 | |
374 | 374 | // Create a filter by session |
375 | 375 | $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE); |
@@ -390,9 +390,9 @@ discard block |
||
390 | 390 | $courseListUrl = api_get_self(); |
391 | 391 | $actions .= '<div class="row">'; |
392 | 392 | $actions .= '<div class="col-md-2">'; |
393 | - $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> '; |
|
393 | + $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'), '', ICON_SIZE_MEDIUM).'</a> '; |
|
394 | 394 | if (api_get_setting('course_validation') == 'true') { |
395 | - $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
395 | + $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
396 | 396 | } |
397 | 397 | $actions .= '</div>'; |
398 | 398 | $actions .= '<div class="col-md-4">'; |
@@ -430,18 +430,18 @@ discard block |
||
430 | 430 | $table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2, 20, 'ASC', 'course-list'); |
431 | 431 | } |
432 | 432 | |
433 | - $parameters=array(); |
|
433 | + $parameters = array(); |
|
434 | 434 | |
435 | 435 | if (isset ($_GET['keyword'])) { |
436 | - $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword'])); |
|
436 | + $parameters = array('keyword' => Security::remove_XSS($_GET['keyword'])); |
|
437 | 437 | } elseif (isset ($_GET['keyword_code'])) { |
438 | - $parameters['keyword_code'] = Security::remove_XSS($_GET['keyword_code']); |
|
439 | - $parameters['keyword_title'] = Security::remove_XSS($_GET['keyword_title']); |
|
438 | + $parameters['keyword_code'] = Security::remove_XSS($_GET['keyword_code']); |
|
439 | + $parameters['keyword_title'] = Security::remove_XSS($_GET['keyword_title']); |
|
440 | 440 | $parameters['keyword_category'] = Security::remove_XSS($_GET['keyword_category']); |
441 | 441 | $parameters['keyword_language'] = Security::remove_XSS($_GET['keyword_language']); |
442 | - $parameters['keyword_visibility'] = Security::remove_XSS($_GET['keyword_visibility']); |
|
443 | - $parameters['keyword_subscribe'] = Security::remove_XSS($_GET['keyword_subscribe']); |
|
444 | - $parameters['keyword_unsubscribe'] = Security::remove_XSS($_GET['keyword_unsubscribe']); |
|
442 | + $parameters['keyword_visibility'] = Security::remove_XSS($_GET['keyword_visibility']); |
|
443 | + $parameters['keyword_subscribe'] = Security::remove_XSS($_GET['keyword_subscribe']); |
|
444 | + $parameters['keyword_unsubscribe'] = Security::remove_XSS($_GET['keyword_unsubscribe']); |
|
445 | 445 | } |
446 | 446 | |
447 | 447 | $table->set_additional_parameters($parameters); |
@@ -8,47 +8,47 @@ discard block |
||
8 | 8 | */ |
9 | 9 | exit(); //not yet functional, needs to be revised |
10 | 10 | |
11 | -$cidReset=true; |
|
11 | +$cidReset = true; |
|
12 | 12 | |
13 | 13 | require('../inc/global.inc.php'); |
14 | 14 | $libpath = api_get_path(LIBRARY_PATH); |
15 | 15 | require_once('../auth/ldap/authldap.php'); |
16 | -$annee_base=date('Y'); |
|
16 | +$annee_base = date('Y'); |
|
17 | 17 | // setting the section (for the tabs) |
18 | 18 | $this_section = SECTION_PLATFORM_ADMIN; |
19 | 19 | //api_protect_admin_script(); // on vire la secu... qui n'a pas lieu d'etre ici (script de synchro) |
20 | 20 | |
21 | 21 | // setting breadcrumbs |
22 | -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); |
|
23 | -$interbreadcrumb[]=array('url' => api_get_self(),"name" => "Liste des sessions"); |
|
22 | +$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
23 | +$interbreadcrumb[] = array('url' => api_get_self(), "name" => "Liste des sessions"); |
|
24 | 24 | |
25 | 25 | // Database Table Definitions |
26 | 26 | $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
27 | -$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | -$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | -$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | -$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | -$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | -$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | -$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | -$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
27 | +$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | +$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | +$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | +$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | +$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | +$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | +$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | +$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
35 | 35 | |
36 | -$tbl_session_rel_etape = "session_rel_etape"; |
|
36 | +$tbl_session_rel_etape = "session_rel_etape"; |
|
37 | 37 | |
38 | -$message=""; |
|
38 | +$message = ""; |
|
39 | 39 | |
40 | -$result=Database::query("SELECT id, name FROM $tbl_session"); |
|
41 | -$Sessions=Database::store_result($result); |
|
40 | +$result = Database::query("SELECT id, name FROM $tbl_session"); |
|
41 | +$Sessions = Database::store_result($result); |
|
42 | 42 | |
43 | -$result=Database::query($sql); |
|
44 | -$users=Database::store_result($result); |
|
43 | +$result = Database::query($sql); |
|
44 | +$users = Database::store_result($result); |
|
45 | 45 | |
46 | -foreach($Sessions as $session){ |
|
46 | +foreach ($Sessions as $session) { |
|
47 | 47 | $id_session = $session['id']; |
48 | 48 | $name_session = $session['name']; |
49 | - $UserList=array(); |
|
50 | - $UserUpdate=array(); |
|
51 | - $UserAdd=array(); |
|
49 | + $UserList = array(); |
|
50 | + $UserUpdate = array(); |
|
51 | + $UserAdd = array(); |
|
52 | 52 | |
53 | 53 | // Parse des code etape de la session |
54 | 54 | /* |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | { |
66 | 66 | $r = false; |
67 | 67 | $res = ldap_handle_bind($ds, $r); |
68 | - $UserList=array(); |
|
69 | - if($result !== false) |
|
68 | + $UserList = array(); |
|
69 | + if ($result !== false) |
|
70 | 70 | { |
71 | 71 | //while($row = Database::fetch_array($result)) |
72 | 72 | //{ |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn"); |
82 | 82 | $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)'); |
83 | 83 | $info = ldap_get_entries($ds, $sr); |
84 | - for ($key = 0; $key < $info["count"]; $key ++) |
|
84 | + for ($key = 0; $key < $info["count"]; $key++) |
|
85 | 85 | { |
86 | 86 | echo "<pre>"; |
87 | 87 | print_r($info[$key]); |
@@ -90,28 +90,28 @@ discard block |
||
90 | 90 | $firstname = api_utf8_decode($info[$key]["givenname"][0]); |
91 | 91 | $email = $info[$key]["mail"][0]; |
92 | 92 | // Get uid from dn |
93 | - $dn_array=ldap_explode_dn($info[$key]["dn"],1); |
|
93 | + $dn_array = ldap_explode_dn($info[$key]["dn"], 1); |
|
94 | 94 | $username = $dn_array[0]; // uid is first key |
95 | 95 | $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student" |
96 | 96 | $val = ldap_get_values_len($ds, $sr, "userPassword"); |
97 | 97 | $password = $val[0]; |
98 | 98 | // Pour faciliter la gestion on ajoute le code "etape-annee" |
99 | - $official_code=$etape."-".$annee; |
|
100 | - $auth_source="ldap"; |
|
99 | + $official_code = $etape."-".$annee; |
|
100 | + $auth_source = "ldap"; |
|
101 | 101 | // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP) |
102 | - $expiration_date='0000-00-00 00:00:00'; |
|
103 | - $active=1; |
|
102 | + $expiration_date = '0000-00-00 00:00:00'; |
|
103 | + $active = 1; |
|
104 | 104 | // Ajout de l'utilisateur |
105 | 105 | if (UserManager::is_username_available($username)) { |
106 | - $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active); |
|
107 | - $UserAdd[]=$user_id; |
|
106 | + $user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active); |
|
107 | + $UserAdd[] = $user_id; |
|
108 | 108 | } else { |
109 | 109 | $user = api_get_user_info_from_username($username); |
110 | - $user_id=$user['user_id']; |
|
110 | + $user_id = $user['user_id']; |
|
111 | 111 | UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active); |
112 | - $UserUpdate[]=$user_id; |
|
112 | + $UserUpdate[] = $user_id; |
|
113 | 113 | } |
114 | - $UserList[]=$user_id; |
|
114 | + $UserList[] = $user_id; |
|
115 | 115 | } |
116 | 116 | //} |
117 | 117 | } |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session |
128 | - $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'"); |
|
129 | - $CourseList=array(); |
|
130 | - while($row=Database::fetch_array($result)) { |
|
131 | - $CourseList[]= $row['c_id']; |
|
128 | + $result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'"); |
|
129 | + $CourseList = array(); |
|
130 | + while ($row = Database::fetch_array($result)) { |
|
131 | + $CourseList[] = $row['c_id']; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | foreach ($CourseList as $enreg_course) { |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | VALUES('$id_session','$enreg_course','$enreg_user')"; |
139 | 139 | Database::query($sql); |
140 | 140 | } |
141 | - $sql = "SELECT COUNT(user_id) as nbUsers " . |
|
142 | - "FROM $tbl_session_rel_course_rel_user " . |
|
141 | + $sql = "SELECT COUNT(user_id) as nbUsers ". |
|
142 | + "FROM $tbl_session_rel_course_rel_user ". |
|
143 | 143 | "WHERE session_id='$id_session' AND c_id='$enreg_course'"; |
144 | 144 | $rs = Database::query($sql); |
145 | 145 | list($nbr_users) = Database::fetch_array($rs); |
@@ -148,13 +148,13 @@ discard block |
||
148 | 148 | Database::query($sql); |
149 | 149 | } |
150 | 150 | // On ajoute la relation entre l'utilisateur et la session |
151 | - foreach($UserList as $enreg_user){ |
|
152 | - $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " . |
|
153 | - "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')"; |
|
151 | + foreach ($UserList as $enreg_user) { |
|
152 | + $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) ". |
|
153 | + "VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')"; |
|
154 | 154 | Database::query($sql); |
155 | 155 | } |
156 | - $sql = "SELECT COUNT(user_id) as nbUsers " . |
|
157 | - "FROM $tbl_session_rel_user " . |
|
156 | + $sql = "SELECT COUNT(user_id) as nbUsers ". |
|
157 | + "FROM $tbl_session_rel_user ". |
|
158 | 158 | "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH.""; |
159 | 159 | $rs = Database::query($sql); |
160 | 160 | list($nbr_users) = Database::fetch_array($rs); |
@@ -59,8 +59,8 @@ |
||
59 | 59 | api_protect_admin_script(); |
60 | 60 | |
61 | 61 | // setting breadcrumbs |
62 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
63 | -$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('Classes')); |
|
62 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
63 | +$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('Classes')); |
|
64 | 64 | |
65 | 65 | // Database Table Definitions |
66 | 66 |
@@ -23,14 +23,14 @@ |
||
23 | 23 | |
24 | 24 | $interbreadcrumb = array( |
25 | 25 | array( |
26 | - 'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php', |
|
26 | + 'url' => api_get_path(WEB_CODE_PATH).'admin/index.php', |
|
27 | 27 | 'name' => get_lang('Administration') |
28 | 28 | ) |
29 | 29 | ); |
30 | 30 | |
31 | 31 | $toolbar = Display::toolbarButton( |
32 | 32 | get_lang('ManageSkills'), |
33 | - api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php', |
|
33 | + api_get_path(WEB_CODE_PATH).'admin/skill_list.php', |
|
34 | 34 | 'list', |
35 | 35 | 'primary', |
36 | 36 | ['title' => get_lang('ManageSkills')] |