@@ -7,16 +7,16 @@ |
||
7 | 7 | * @package chamilo.admin |
8 | 8 | */ |
9 | 9 | include ('../inc/global.inc.php'); |
10 | -$this_section=SECTION_PLATFORM_ADMIN; |
|
10 | +$this_section = SECTION_PLATFORM_ADMIN; |
|
11 | 11 | |
12 | 12 | api_protect_admin_script(); |
13 | 13 | $tool_name = get_lang('DummyCourseCreator'); |
14 | -$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
15 | 15 | Display::display_header($tool_name); |
16 | 16 | //api_display_tool_title($tool_name); |
17 | 17 | if (api_get_setting('server_type') != 'test') { |
18 | 18 | echo get_lang('DummyCourseOnlyOnTestServer'); |
19 | -} elseif( isset($_POST['action'])) { |
|
19 | +} elseif (isset($_POST['action'])) { |
|
20 | 20 | require_once('../coursecopy/classes/DummyCourseCreator.class.php'); |
21 | 21 | $dcc = new DummyCourseCreator(); |
22 | 22 | $dcc->create_dummy_course($_POST['course_code']); |
@@ -5,13 +5,13 @@ |
||
5 | 5 | * @package chamilo.admin |
6 | 6 | */ |
7 | 7 | |
8 | -$cidReset=true; |
|
8 | +$cidReset = true; |
|
9 | 9 | require_once '../inc/global.inc.php'; |
10 | 10 | $this_section = SECTION_PLATFORM_ADMIN; |
11 | 11 | |
12 | 12 | api_protect_admin_script(); |
13 | 13 | |
14 | -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
15 | 15 | $tool_name = get_lang('Statistics'); |
16 | 16 | Display::display_header($tool_name); |
17 | 17 | Display::display_footer(); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | Display::addFlash(Display::return_message(get_lang('FileDeleted'))); |
60 | 60 | } |
61 | 61 | |
62 | -if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') { |
|
62 | +if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') { |
|
63 | 63 | $id = intval($_GET['id']); |
64 | 64 | api_delete_setting_option($id); |
65 | 65 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | } |
123 | 123 | } |
124 | 124 | |
125 | - if (isset($category) && $category== 'search_setting') { |
|
125 | + if (isset($category) && $category == 'search_setting') { |
|
126 | 126 | if (!empty($_REQUEST['search_field'])) { |
127 | 127 | $settings = search_setting($_REQUEST['search_field']); |
128 | 128 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | // Set true for allow_message_tool variable if social tool is actived |
221 | 221 | foreach ($convert_byte_to_mega_list as $item) { |
222 | 222 | if (isset($values[$item])) { |
223 | - $values[$item] = round($values[$item]*1024*1024); |
|
223 | + $values[$item] = round($values[$item] * 1024 * 1024); |
|
224 | 224 | } |
225 | 225 | } |
226 | 226 |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
19 | 19 | |
20 | 20 | // setting breadcrumbs |
21 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
22 | -$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions')); |
|
21 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
22 | +$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions')); |
|
23 | 23 | |
24 | 24 | Display :: display_header(null); |
25 | 25 | |
26 | -$form = new FormValidator('filter_form','GET', api_get_self()); |
|
26 | +$form = new FormValidator('filter_form', 'GET', api_get_self()); |
|
27 | 27 | |
28 | 28 | $career = new Career(); |
29 | 29 | |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | // action links |
55 | 55 | echo '<div class="actions" style="margin-bottom:20px">'; |
56 | 56 | echo '<a href="../admin/index.php">'. |
57 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
57 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
58 | 58 | echo '<a href="careers.php">'. |
59 | - Display::return_icon('career.png',get_lang('Careers'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
59 | + Display::return_icon('career.png', get_lang('Careers'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
60 | 60 | echo '<a href="promotions.php">'. |
61 | - Display::return_icon('promotion.png',get_lang('Promotions'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
61 | + Display::return_icon('promotion.png', get_lang('Promotions'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
62 | 62 | echo '</div>'; |
63 | 63 | |
64 | 64 | $form->display(); |
@@ -119,22 +119,22 @@ discard block |
||
119 | 119 | foreach ($career_array as $career_id => $data) { |
120 | 120 | $career = $data['name']; |
121 | 121 | $promotions = $data['promotions']; |
122 | - $career = Display::url($career, 'careers.php?action=edit&id=' . $career_id); |
|
122 | + $career = Display::url($career, 'careers.php?action=edit&id='.$career_id); |
|
123 | 123 | $career = Display::tag('h4', $career); |
124 | - echo '<tr><td style="background-color:#ECF0F1" colspan="3">' . $career . '</td></tr>'; |
|
124 | + echo '<tr><td style="background-color:#ECF0F1" colspan="3">'.$career.'</td></tr>'; |
|
125 | 125 | if (!empty($promotions)) { |
126 | 126 | foreach ($promotions as $promotion_id => $promotion) { |
127 | 127 | $promotion_name = $promotion['name']; |
128 | - $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id=' . $promotion_id); |
|
128 | + $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id='.$promotion_id); |
|
129 | 129 | $sessions = $promotion['sessions']; |
130 | 130 | echo '<tr>'; |
131 | 131 | $count = count($sessions); |
132 | 132 | $rowspan = ''; |
133 | 133 | if (!empty($count)) { |
134 | 134 | $count++; |
135 | - $rowspan = 'rowspan="' . $count . '"'; |
|
135 | + $rowspan = 'rowspan="'.$count.'"'; |
|
136 | 136 | } |
137 | - echo '<td ' . $rowspan . '>'; |
|
137 | + echo '<td '.$rowspan.'>'; |
|
138 | 138 | echo Display::tag('h5', $promotion_url); |
139 | 139 | echo '</td>'; |
140 | 140 | echo '</tr>'; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $course_list = $session['courses']; |
145 | 145 | |
146 | 146 | $url = Display::url($session['data']['name'], |
147 | - '../session/resume_session.php?id_session=' . $session['data']['id']); |
|
147 | + '../session/resume_session.php?id_session='.$session['data']['id']); |
|
148 | 148 | echo '<tr>'; |
149 | 149 | //Session name |
150 | 150 | echo Display::tag('td', $url); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | $url = Display::url( |
159 | 159 | $course['title'], |
160 | - api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id'] |
|
160 | + api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.$session['data']['id'] |
|
161 | 161 | ); |
162 | 162 | echo Display::tag('td', $url); |
163 | 163 | echo '</tr>'; |
@@ -15,18 +15,18 @@ discard block |
||
15 | 15 | |
16 | 16 | $tool_name = get_lang('SessionOverview'); |
17 | 17 | |
18 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
19 | -$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList')); |
|
18 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
19 | +$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList')); |
|
20 | 20 | |
21 | 21 | // Database Table Definitions |
22 | -$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
23 | -$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
22 | +$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
23 | +$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
24 | 24 | $table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
25 | 25 | $url_id = api_get_current_access_url_id(); |
26 | 26 | |
27 | 27 | $action = $_GET['action']; |
28 | 28 | |
29 | -switch($action) { |
|
29 | +switch ($action) { |
|
30 | 30 | case 'add_user_to_url': |
31 | 31 | $user_id = $_REQUEST['user_id']; |
32 | 32 | $result = UrlManager::add_user_to_url($user_id, $url_id); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | |
61 | -foreach($session_list as $session_item) { |
|
61 | +foreach ($session_list as $session_item) { |
|
62 | 62 | $session_id = $session_item['id']; |
63 | 63 | $html .= '<h3>'.$session_item['name'].'</h3>'; |
64 | 64 |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | $interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
36 | 36 | |
37 | 37 | $add_type = 'multiple'; |
38 | -if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') { |
|
38 | +if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') { |
|
39 | 39 | $add_type = Security::remove_XSS($_REQUEST['add_type']); |
40 | 40 | } |
41 | 41 | |
42 | 42 | $access_url_id = 1; |
43 | -if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') { |
|
43 | +if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') { |
|
44 | 44 | $access_url_id = Security::remove_XSS($_REQUEST['access_url_id']); |
45 | 45 | } |
46 | 46 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | if ($form_sent == 1) { |
94 | - if ($access_url_id==0) { |
|
94 | + if ($access_url_id == 0) { |
|
95 | 95 | header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL')); |
96 | 96 | } elseif (is_array($course_list)) { |
97 | 97 | UrlManager::update_urls_rel_course($course_list, $access_url_id); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | Display::display_header($tool_name); |
104 | 104 | |
105 | 105 | echo '<div class="actions">'; |
106 | -echo Display::url( Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_courses_to_url.php'); |
|
106 | +echo Display::url(Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_courses_to_url.php'); |
|
107 | 107 | echo '</div>'; |
108 | 108 | |
109 | 109 | api_display_tool_title($tool_name); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $no_course_list = $course_list = array(); |
115 | 115 | $ajax_search = $add_type == 'unique' ? true : false; |
116 | 116 | |
117 | -if($ajax_search) { |
|
117 | +if ($ajax_search) { |
|
118 | 118 | $courses = UrlManager::get_url_rel_course_data($access_url_id); |
119 | 119 | foreach ($courses as $course) { |
120 | 120 | $course_list[$course['c_id']] = $course; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); |
132 | - $sql="SELECT id, code, title |
|
132 | + $sql = "SELECT id, code, title |
|
133 | 133 | FROM $tbl_course u |
134 | 134 | ORDER BY title, code"; |
135 | 135 | $result = Database::query($sql); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | } |
144 | 144 | |
145 | -if($add_type == 'multiple') { |
|
145 | +if ($add_type == 'multiple') { |
|
146 | 146 | $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>'; |
147 | 147 | $link_add_type_multiple = get_lang('SessionAddTypeMultiple'); |
148 | 148 | } else { |
@@ -155,23 +155,23 @@ discard block |
||
155 | 155 | <?php echo $link_add_type_unique ?> | <?php echo $link_add_type_multiple ?> |
156 | 156 | </div> |
157 | 157 | <br /><br /> |
158 | - <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?> > |
|
158 | + <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?> > |
|
159 | 159 | <?php echo get_lang('SelectUrl').' : '; ?> |
160 | 160 | <select name="access_url_id" onchange="javascript:send();"> |
161 | 161 | <option value="0">-- <?php echo get_lang('SelectUrl')?> -- </option> |
162 | 162 | <?php |
163 | - $url_selected=''; |
|
163 | + $url_selected = ''; |
|
164 | 164 | foreach ($url_list as $url_obj) { |
165 | 165 | $checked = ''; |
166 | 166 | if (!empty($access_url_id)) { |
167 | - if ($url_obj[0]==$access_url_id) { |
|
167 | + if ($url_obj[0] == $access_url_id) { |
|
168 | 168 | $checked = 'selected=true'; |
169 | - $url_selected=$url_obj[1]; |
|
169 | + $url_selected = $url_obj[1]; |
|
170 | 170 | } |
171 | 171 | } |
172 | - if ($url_obj['active']==1) { |
|
172 | + if ($url_obj['active'] == 1) { |
|
173 | 173 | ?> |
174 | - <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option> |
|
174 | + <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option> |
|
175 | 175 | <?php |
176 | 176 | } |
177 | 177 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | <input type="hidden" name="form_sent" value="1" /> |
182 | 182 | <input type="hidden" name="add_type" value = "<?php echo $add_type ?>" /> |
183 | 183 | <?php |
184 | - if(!empty($errorMsg)) { |
|
184 | + if (!empty($errorMsg)) { |
|
185 | 185 | Display::display_normal_message($errorMsg); //main API |
186 | 186 | } |
187 | 187 | ?> |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | <td align="center"> |
200 | 200 | <div id="content_source"> |
201 | 201 | <?php |
202 | - if($ajax_search) { |
|
202 | + if ($ajax_search) { |
|
203 | 203 | ?> |
204 | 204 | <input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" /> |
205 | 205 | <div id="ajax_list_courses"></div> |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | ?> |
209 | 209 | <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;"> |
210 | 210 | <?php |
211 | - foreach($no_course_list as $no_course) { |
|
211 | + foreach ($no_course_list as $no_course) { |
|
212 | 212 | ?> |
213 | 213 | <option value="<?php echo $no_course['id']; ?>"><?php echo $no_course['title'].' ('.$no_course['code'].')'; ?></option> |
214 | 214 | <?php |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | </td> |
224 | 224 | <td width="10%" valign="middle" align="center"> |
225 | 225 | <?php |
226 | - if($ajax_search) { |
|
226 | + if ($ajax_search) { |
|
227 | 227 | ?> |
228 | 228 | <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" > |
229 | 229 | <em class="fa fa-arrow-left"></em> |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | <td align="center"> |
247 | 247 | <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;"> |
248 | 248 | <?php |
249 | - foreach($course_list as $course) { |
|
249 | + foreach ($course_list as $course) { |
|
250 | 250 | $courseInfo = api_get_course_info_by_id($course['id']); |
251 | 251 | ?> |
252 | 252 | <option value="<?php echo $course['id']; ?>"><?php echo $course['title'].' ('.$courseInfo['code'].')'; ?></option> |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | <td colspan="3" align="center"> |
262 | 262 | <br /> |
263 | 263 | <?php |
264 | - if(isset($_GET['add'])) |
|
264 | + if (isset($_GET['add'])) |
|
265 | 265 | echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>'; |
266 | 266 | else |
267 | 267 | echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>'; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | api_protect_admin_script(true); |
17 | 17 | |
18 | 18 | // setting breadcrumbs |
19 | -$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
19 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
20 | 20 | |
21 | 21 | $form = new FormValidator('archive_cleanup_form', 'post', '', '', array(), FormValidator::LAYOUT_BOX); |
22 | 22 | $form->addButtonSend(get_lang('ArchiveDirCleanupProceedButton')); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | if (isset($_GET['msg']) && isset($_GET['type'])) { |
52 | 52 | if (in_array($_GET['msg'], array('ArchiveDirCleanupSucceeded', 'ArchiveDirCleanupFailed'))) |
53 | - switch($_GET['type']) { |
|
53 | + switch ($_GET['type']) { |
|
54 | 54 | case 'error': |
55 | 55 | $message = Display::return_message(get_lang($_GET['msg']), 'error'); |
56 | 56 | break; |
@@ -12,13 +12,13 @@ |
||
12 | 12 | */ |
13 | 13 | function validate_data($courses) |
14 | 14 | { |
15 | - $errors = array (); |
|
16 | - $coursecodes = array (); |
|
15 | + $errors = array(); |
|
16 | + $coursecodes = array(); |
|
17 | 17 | foreach ($courses as $index => $course) { |
18 | - $course['line'] = $index +1; |
|
18 | + $course['line'] = $index + 1; |
|
19 | 19 | |
20 | 20 | // 1. Check whether mandatory fields are set. |
21 | - $mandatory_fields = array ('Code', 'Title', 'CourseCategory'); |
|
21 | + $mandatory_fields = array('Code', 'Title', 'CourseCategory'); |
|
22 | 22 | foreach ($mandatory_fields as $field) { |
23 | 23 | if (!isset($course[$field]) || strlen($course[$field]) == 0) { |
24 | 24 | $course['error'] = get_lang($field.'Mandatory'); |
@@ -32,16 +32,16 @@ discard block |
||
32 | 32 | $result = Database::query($sql); |
33 | 33 | |
34 | 34 | if (!list ($class_name) = Database::fetch_row($result)) { |
35 | - header('Location: class_list.php?filtreCours=' . urlencode($course)); |
|
35 | + header('Location: class_list.php?filtreCours='.urlencode($course)); |
|
36 | 36 | exit(); |
37 | 37 | } |
38 | 38 | |
39 | 39 | $noPHP_SELF = true; |
40 | 40 | |
41 | -$tool_name = get_lang('AddUsersToAClass') . ' (' . $class_name . ')'; |
|
41 | +$tool_name = get_lang('AddUsersToAClass').' ('.$class_name.')'; |
|
42 | 42 | |
43 | 43 | $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
44 | -$interbreadcrumb[] = array("url" => "class_list.php?filtreCours=" . urlencode($course), "name" => get_lang('AdminClasses')); |
|
44 | +$interbreadcrumb[] = array("url" => "class_list.php?filtreCours=".urlencode($course), "name" => get_lang('AdminClasses')); |
|
45 | 45 | |
46 | 46 | if ($_POST['formSent']) { |
47 | 47 | $form_sent = $_POST['formSent']; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | foreach ($left_user_list as $user_id) { |
60 | 60 | ClassManager :: add_user($user_id, $class_id); |
61 | 61 | } |
62 | - header('Location: class_list.php?filtreCours=' . urlencode($course)); |
|
62 | + header('Location: class_list.php?filtreCours='.urlencode($course)); |
|
63 | 63 | exit(); |
64 | 64 | } |
65 | 65 | } elseif ($remove_from_class) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | foreach ($right_user_list as $index => $user_id) { |
70 | 70 | ClassManager :: unsubscribe_user($user_id, $class_id); |
71 | 71 | } |
72 | - header('Location: class_list.php?filtreCours=' . urlencode($course)); |
|
72 | + header('Location: class_list.php?filtreCours='.urlencode($course)); |
|
73 | 73 | exit(); |
74 | 74 | } |
75 | 75 | } |
@@ -78,10 +78,10 @@ discard block |
||
78 | 78 | Display :: display_header($tool_name); |
79 | 79 | //api_display_tool_title($tool_name); |
80 | 80 | $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname'; |
81 | -$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u LEFT JOIN $tbl_class_user cu ON u.user_id=cu.user_id AND class_id='$class_id' WHERE " . $target_name . " LIKE '" . $first_letter_left . "%' AND class_id IS NULL ORDER BY " . (count($left_user_list) > 0 ? "(user_id IN(" . implode(',', $left_user_list) . ")) DESC," : "") . " " . $target_name; |
|
81 | +$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u LEFT JOIN $tbl_class_user cu ON u.user_id=cu.user_id AND class_id='$class_id' WHERE ".$target_name." LIKE '".$first_letter_left."%' AND class_id IS NULL ORDER BY ".(count($left_user_list) > 0 ? "(user_id IN(".implode(',', $left_user_list).")) DESC," : "")." ".$target_name; |
|
82 | 82 | $result = Database::query($sql); |
83 | 83 | $left_users = Database::store_result($result); |
84 | -$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u,$tbl_class_user cu WHERE cu.user_id=u.user_id AND class_id='$class_id' AND " . $target_name . " LIKE '" . $first_letter_right . "%' ORDER BY " . (count($right_user_list) > 0 ? "(user_id IN(" . implode(',', $right_user_list) . ")) DESC," : "") . " " . $target_name; |
|
84 | +$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u,$tbl_class_user cu WHERE cu.user_id=u.user_id AND class_id='$class_id' AND ".$target_name." LIKE '".$first_letter_right."%' ORDER BY ".(count($right_user_list) > 0 ? "(user_id IN(".implode(',', $right_user_list).")) DESC," : "")." ".$target_name; |
|
85 | 85 | $result = Database::query($sql); |
86 | 86 | $right_users = Database::store_result($result); |
87 | 87 | if (!empty($error_message)) { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | <?php |
123 | 123 | foreach ($left_users as $user) { |
124 | 124 | ?> |
125 | - <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option> |
|
125 | + <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?></option> |
|
126 | 126 | <?php |
127 | 127 | } |
128 | 128 | ?> |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | <?php |
139 | 139 | foreach ($right_users as $user) { |
140 | 140 | ?> |
141 | - <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option> |
|
141 | + <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?></option> |
|
142 | 142 | <?php |
143 | 143 | } |
144 | 144 | ?> |