@@ -249,7 +249,7 @@ |
||
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' . |
|
| 252 | + $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' . |
|
| 253 | 253 | Display::return_icon( |
| 254 | 254 | 'percentage.png', |
| 255 | 255 | get_lang('EditAllWeights'), |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | <?php |
| 88 | 88 | echo Display::get_alphabet_options($firstLetterUserGroup); |
| 89 | 89 | echo Display::get_numeric_options(0, 9, $firstLetterUserGroup); |
| 90 | - ?> |
|
| 90 | + ?> |
|
| 91 | 91 | </select> |
| 92 | 92 | </td> |
| 93 | 93 | <td width="20%"> </td> |
@@ -18,93 +18,93 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $defaults = array(); |
| 20 | 20 | $term_preview = array( |
| 21 | - 'type' => 0, |
|
| 22 | - 'content' => '', |
|
| 23 | - 'changes' => '', |
|
| 21 | + 'type' => 0, |
|
| 22 | + 'content' => '', |
|
| 23 | + 'changes' => '', |
|
| 24 | 24 | ); |
| 25 | 25 | if ($form->validate()) { |
| 26 | - $check = Security::check_token('post'); |
|
| 27 | - if ($check) { |
|
| 28 | - $values = $form->getSubmitValues(); |
|
| 29 | - $lang = $values['language']; |
|
| 30 | - //language id |
|
| 31 | - $lang = api_get_language_id($lang); |
|
| 32 | - |
|
| 33 | - if (isset($values['type'])) { |
|
| 34 | - $type = $values['type']; |
|
| 35 | - } else { |
|
| 36 | - $type = 0; |
|
| 37 | - } |
|
| 38 | - if (isset($values['content'])) { |
|
| 39 | - $content = $values['content']; |
|
| 40 | - } else { |
|
| 41 | - $content = ''; |
|
| 42 | - } |
|
| 43 | - if (isset($values['changes'])) { |
|
| 44 | - $changes = $values['changes']; |
|
| 45 | - } else { |
|
| 46 | - $changes = ''; |
|
| 47 | - } |
|
| 48 | - $navigator_info = api_get_navigator(); |
|
| 49 | - |
|
| 50 | - if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
| 51 | - if (isset($values['preview'])) { |
|
| 52 | - $submit ='preview'; |
|
| 53 | - } elseif (isset($values['save'])) { |
|
| 54 | - $submit ='save'; |
|
| 55 | - } elseif (isset($values['back'])) { |
|
| 56 | - $submit ='back'; |
|
| 57 | - } |
|
| 58 | - } else { |
|
| 59 | - $submit = $values['send']; |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - $default['content'] = $content; |
|
| 63 | - if (isset($values['language'])) { |
|
| 64 | - if ($submit == 'back') { |
|
| 65 | - header('Location: legal_add.php'); |
|
| 66 | - exit; |
|
| 67 | - } elseif ($submit == 'save') { |
|
| 68 | - $insert_result = LegalManager::add($lang, $content, $type, $changes); |
|
| 69 | - if ($insert_result ) { |
|
| 70 | - $message = get_lang('TermAndConditionSaved'); |
|
| 71 | - } else { |
|
| 72 | - $message = get_lang('TermAndConditionNotSaved'); |
|
| 73 | - } |
|
| 74 | - Security::clear_token(); |
|
| 75 | - $tok = Security::get_token(); |
|
| 76 | - header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok); |
|
| 77 | - exit(); |
|
| 78 | - } elseif ($submit=='preview') { |
|
| 79 | - $defaults['type'] = $type; |
|
| 80 | - $defaults['content'] = $content; |
|
| 81 | - $defaults['changes'] = $changes; |
|
| 82 | - $term_preview = $defaults; |
|
| 83 | - $term_preview['type'] = intval($_POST['type']); |
|
| 84 | - } else { |
|
| 85 | - $my_lang = $_POST['language']; |
|
| 86 | - if (isset($_POST['language'])){ |
|
| 87 | - $all_langs = api_get_languages(); |
|
| 88 | - if (in_array($my_lang, $all_langs['folder'])){ |
|
| 89 | - $language = api_get_language_id($my_lang); |
|
| 90 | - $term_preview = LegalManager::get_last_condition($language); |
|
| 91 | - $defaults = $term_preview; |
|
| 92 | - if (!$term_preview) { |
|
| 93 | - // there are not terms and conditions |
|
| 94 | - $term_preview['type']=-1; |
|
| 95 | - $defaults['type']=0; |
|
| 96 | - } |
|
| 97 | - } |
|
| 98 | - } |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - } |
|
| 26 | + $check = Security::check_token('post'); |
|
| 27 | + if ($check) { |
|
| 28 | + $values = $form->getSubmitValues(); |
|
| 29 | + $lang = $values['language']; |
|
| 30 | + //language id |
|
| 31 | + $lang = api_get_language_id($lang); |
|
| 32 | + |
|
| 33 | + if (isset($values['type'])) { |
|
| 34 | + $type = $values['type']; |
|
| 35 | + } else { |
|
| 36 | + $type = 0; |
|
| 37 | + } |
|
| 38 | + if (isset($values['content'])) { |
|
| 39 | + $content = $values['content']; |
|
| 40 | + } else { |
|
| 41 | + $content = ''; |
|
| 42 | + } |
|
| 43 | + if (isset($values['changes'])) { |
|
| 44 | + $changes = $values['changes']; |
|
| 45 | + } else { |
|
| 46 | + $changes = ''; |
|
| 47 | + } |
|
| 48 | + $navigator_info = api_get_navigator(); |
|
| 49 | + |
|
| 50 | + if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
| 51 | + if (isset($values['preview'])) { |
|
| 52 | + $submit ='preview'; |
|
| 53 | + } elseif (isset($values['save'])) { |
|
| 54 | + $submit ='save'; |
|
| 55 | + } elseif (isset($values['back'])) { |
|
| 56 | + $submit ='back'; |
|
| 57 | + } |
|
| 58 | + } else { |
|
| 59 | + $submit = $values['send']; |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + $default['content'] = $content; |
|
| 63 | + if (isset($values['language'])) { |
|
| 64 | + if ($submit == 'back') { |
|
| 65 | + header('Location: legal_add.php'); |
|
| 66 | + exit; |
|
| 67 | + } elseif ($submit == 'save') { |
|
| 68 | + $insert_result = LegalManager::add($lang, $content, $type, $changes); |
|
| 69 | + if ($insert_result ) { |
|
| 70 | + $message = get_lang('TermAndConditionSaved'); |
|
| 71 | + } else { |
|
| 72 | + $message = get_lang('TermAndConditionNotSaved'); |
|
| 73 | + } |
|
| 74 | + Security::clear_token(); |
|
| 75 | + $tok = Security::get_token(); |
|
| 76 | + header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok); |
|
| 77 | + exit(); |
|
| 78 | + } elseif ($submit=='preview') { |
|
| 79 | + $defaults['type'] = $type; |
|
| 80 | + $defaults['content'] = $content; |
|
| 81 | + $defaults['changes'] = $changes; |
|
| 82 | + $term_preview = $defaults; |
|
| 83 | + $term_preview['type'] = intval($_POST['type']); |
|
| 84 | + } else { |
|
| 85 | + $my_lang = $_POST['language']; |
|
| 86 | + if (isset($_POST['language'])){ |
|
| 87 | + $all_langs = api_get_languages(); |
|
| 88 | + if (in_array($my_lang, $all_langs['folder'])){ |
|
| 89 | + $language = api_get_language_id($my_lang); |
|
| 90 | + $term_preview = LegalManager::get_last_condition($language); |
|
| 91 | + $defaults = $term_preview; |
|
| 92 | + if (!$term_preview) { |
|
| 93 | + // there are not terms and conditions |
|
| 94 | + $term_preview['type']=-1; |
|
| 95 | + $defaults['type']=0; |
|
| 96 | + } |
|
| 97 | + } |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $form->setDefaults($defaults); |
| 105 | 105 | |
| 106 | 106 | if (isset($_POST['send'])) { |
| 107 | - Security::clear_token(); |
|
| 107 | + Security::clear_token(); |
|
| 108 | 108 | } |
| 109 | 109 | $token = Security::get_token(); |
| 110 | 110 | |
@@ -115,34 +115,34 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | if (isset($_POST['language'])) { |
| 117 | 117 | |
| 118 | - $form->addElement('static', Security::remove_XSS($_POST['language'])); |
|
| 119 | - $form->addElement('hidden', 'language',Security::remove_XSS($_POST['language'])); |
|
| 120 | - $form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250')); |
|
| 118 | + $form->addElement('static', Security::remove_XSS($_POST['language'])); |
|
| 119 | + $form->addElement('hidden', 'language',Security::remove_XSS($_POST['language'])); |
|
| 120 | + $form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250')); |
|
| 121 | 121 | |
| 122 | - $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0'); |
|
| 123 | - $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1'); |
|
| 124 | - $form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20')); |
|
| 122 | + $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0'); |
|
| 123 | + $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1'); |
|
| 124 | + $form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20')); |
|
| 125 | 125 | |
| 126 | - $preview = LegalManager::show_last_condition($term_preview); |
|
| 126 | + $preview = LegalManager::show_last_condition($term_preview); |
|
| 127 | 127 | |
| 128 | - if ($term_preview['type']!=-1) { |
|
| 129 | - $form->addElement('label', get_lang('Preview'), $preview); |
|
| 130 | - } |
|
| 128 | + if ($term_preview['type']!=-1) { |
|
| 129 | + $form->addElement('label', get_lang('Preview'), $preview); |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | - // Submit & preview button |
|
| 132 | + // Submit & preview button |
|
| 133 | 133 | $navigator_info = api_get_navigator(); |
| 134 | 134 | |
| 135 | 135 | //ie6 fix |
| 136 | - if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
| 137 | - $buttons = '<div class="row" align="center"> |
|
| 136 | + if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
| 137 | + $buttons = '<div class="row" align="center"> |
|
| 138 | 138 | <div class="formw"> |
| 139 | 139 | <input type="submit" name="back" value="'.get_lang('Back').'"/> |
| 140 | 140 | <input type="submit" name="preview" value="'.get_lang('Preview').'"/> |
| 141 | 141 | <input type="submit" name="save" value="'.get_lang('Save').'"/> |
| 142 | 142 | </div> |
| 143 | 143 | </div>'; |
| 144 | - $form->addElement('html',$buttons); |
|
| 145 | - } else { |
|
| 144 | + $form->addElement('html',$buttons); |
|
| 145 | + } else { |
|
| 146 | 146 | $buttons = '<div class="row" align="center"> |
| 147 | 147 | <div class="formw"> |
| 148 | 148 | <button type="submit" class="back" name="send" value="back">'.get_lang('Back').'</button> |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | <button type="submit" class="save" name="send" value="save">'.get_lang('Save').'</button> |
| 151 | 151 | </div> |
| 152 | 152 | </div>'; |
| 153 | - $form->addElement('html',$buttons); |
|
| 154 | - } |
|
| 153 | + $form->addElement('html',$buttons); |
|
| 154 | + } |
|
| 155 | 155 | } else { |
| 156 | - $form->addElement('select_language', 'language', get_lang('Language'),null,array()); |
|
| 157 | - $form->addElement('button', 'send', get_lang('Load')); |
|
| 156 | + $form->addElement('select_language', 'language', get_lang('Language'),null,array()); |
|
| 157 | + $form->addElement('button', 'send', get_lang('Load')); |
|
| 158 | 158 | |
| 159 | 159 | } |
| 160 | 160 | |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | echo '</div>'; |
| 177 | 177 | |
| 178 | 178 | if (isset ($_GET['action'])) { |
| 179 | - switch ($_GET['action']) { |
|
| 180 | - case 'show_message' : |
|
| 181 | - Display :: display_normal_message(stripslashes($_GET['message'])); |
|
| 182 | - break; |
|
| 183 | - } |
|
| 179 | + switch ($_GET['action']) { |
|
| 180 | + case 'show_message' : |
|
| 181 | + Display :: display_normal_message(stripslashes($_GET['message'])); |
|
| 182 | + break; |
|
| 183 | + } |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $form->setDefaults($defaults); |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | <select name="firstLetterClass" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();"> |
| 91 | 91 | <option value="">--</option> |
| 92 | 92 | <?php |
| 93 | - echo Display::get_alphabet_options($first_letter_class); |
|
| 94 | - ?> |
|
| 93 | + echo Display::get_alphabet_options($first_letter_class); |
|
| 94 | + ?> |
|
| 95 | 95 | </select> |
| 96 | 96 | </td> |
| 97 | 97 | <td width="20%"> </td> |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | <select name="firstLetterCourse" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();"> |
| 103 | 103 | <option value="">--</option> |
| 104 | 104 | <?php |
| 105 | - echo Display::get_alphabet_options($first_letter_course); |
|
| 106 | - ?> |
|
| 105 | + echo Display::get_alphabet_options($first_letter_course); |
|
| 106 | + ?> |
|
| 107 | 107 | </select> |
| 108 | 108 | </td> |
| 109 | 109 | </tr> |
@@ -157,27 +157,27 @@ discard block |
||
| 157 | 157 | $form->addElement('hidden', 'user_id', $user_id); |
| 158 | 158 | |
| 159 | 159 | if (api_is_western_name_order()) { |
| 160 | - // Firstname |
|
| 161 | - $form->addElement('text', 'firstname', get_lang('FirstName')); |
|
| 162 | - $form->applyFilter('firstname', 'html_filter'); |
|
| 163 | - $form->applyFilter('firstname', 'trim'); |
|
| 164 | - $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 165 | - // Lastname |
|
| 166 | - $form->addElement('text', 'lastname', get_lang('LastName')); |
|
| 167 | - $form->applyFilter('lastname', 'html_filter'); |
|
| 168 | - $form->applyFilter('lastname', 'trim'); |
|
| 169 | - $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 160 | + // Firstname |
|
| 161 | + $form->addElement('text', 'firstname', get_lang('FirstName')); |
|
| 162 | + $form->applyFilter('firstname', 'html_filter'); |
|
| 163 | + $form->applyFilter('firstname', 'trim'); |
|
| 164 | + $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 165 | + // Lastname |
|
| 166 | + $form->addElement('text', 'lastname', get_lang('LastName')); |
|
| 167 | + $form->applyFilter('lastname', 'html_filter'); |
|
| 168 | + $form->applyFilter('lastname', 'trim'); |
|
| 169 | + $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 170 | 170 | } else { |
| 171 | - // Lastname |
|
| 172 | - $form->addElement('text', 'lastname', get_lang('LastName')); |
|
| 173 | - $form->applyFilter('lastname', 'html_filter'); |
|
| 174 | - $form->applyFilter('lastname', 'trim'); |
|
| 175 | - $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 176 | - // Firstname |
|
| 177 | - $form->addElement('text', 'firstname', get_lang('FirstName')); |
|
| 178 | - $form->applyFilter('firstname', 'html_filter'); |
|
| 179 | - $form->applyFilter('firstname', 'trim'); |
|
| 180 | - $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 171 | + // Lastname |
|
| 172 | + $form->addElement('text', 'lastname', get_lang('LastName')); |
|
| 173 | + $form->applyFilter('lastname', 'html_filter'); |
|
| 174 | + $form->applyFilter('lastname', 'trim'); |
|
| 175 | + $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 176 | + // Firstname |
|
| 177 | + $form->addElement('text', 'firstname', get_lang('FirstName')); |
|
| 178 | + $form->applyFilter('firstname', 'html_filter'); |
|
| 179 | + $form->applyFilter('firstname', 'trim'); |
|
| 180 | + $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | // Official code |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | // OpenID |
| 201 | 201 | if (api_get_setting('openid_authentication') == 'true') { |
| 202 | - $form->addElement('text', 'openid', get_lang('OpenIDURL')); |
|
| 202 | + $form->addElement('text', 'openid', get_lang('OpenIDURL')); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | // Phone |
@@ -225,18 +225,18 @@ discard block |
||
| 225 | 225 | $form->addHidden('cropResult', ''); |
| 226 | 226 | |
| 227 | 227 | $form->addRule( |
| 228 | - 'picture', |
|
| 229 | - get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', |
|
| 230 | - 'filetype', |
|
| 231 | - $allowed_picture_types |
|
| 228 | + 'picture', |
|
| 229 | + get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', |
|
| 230 | + 'filetype', |
|
| 231 | + $allowed_picture_types |
|
| 232 | 232 | ); |
| 233 | 233 | if (strlen($user_data['picture_uri']) > 0) { |
| 234 | - $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage')); |
|
| 234 | + $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage')); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | // Username |
| 238 | 238 | if (api_get_setting('login_is_email') != 'true') { |
| 239 | - $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH)); |
|
| 239 | + $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH)); |
|
| 240 | 240 | $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required'); |
| 241 | 241 | $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); |
| 242 | 242 | $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username'); |
@@ -308,15 +308,15 @@ discard block |
||
| 308 | 308 | |
| 309 | 309 | // Platform admin |
| 310 | 310 | if (api_is_platform_admin()) { |
| 311 | - $group = array(); |
|
| 312 | - $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1); |
|
| 313 | - $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0); |
|
| 311 | + $group = array(); |
|
| 312 | + $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1); |
|
| 313 | + $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0); |
|
| 314 | 314 | |
| 315 | - $user_data['status'] == 1 ? $display = 'block':$display = 'none'; |
|
| 315 | + $user_data['status'] == 1 ? $display = 'block':$display = 'none'; |
|
| 316 | 316 | |
| 317 | - $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">'); |
|
| 318 | - $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false); |
|
| 319 | - $form->addElement('html', '</div>'); |
|
| 317 | + $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">'); |
|
| 318 | + $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false); |
|
| 319 | + $form->addElement('html', '</div>'); |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | //Language |
@@ -334,16 +334,16 @@ discard block |
||
| 334 | 334 | $form->addElement('label', get_lang('RegistrationDate'), $date); |
| 335 | 335 | |
| 336 | 336 | if (!$user_data['platform_admin']) { |
| 337 | - // Expiration Date |
|
| 338 | - $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0); |
|
| 339 | - $group = array (); |
|
| 340 | - $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1); |
|
| 341 | - $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();')); |
|
| 342 | - $form->addGroup($group, 'max_member_group', null, '', false); |
|
| 343 | - |
|
| 344 | - // Active account or inactive account |
|
| 345 | - $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1); |
|
| 346 | - $form->addElement('radio', 'active', '', get_lang('Inactive'), 0); |
|
| 337 | + // Expiration Date |
|
| 338 | + $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0); |
|
| 339 | + $group = array (); |
|
| 340 | + $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1); |
|
| 341 | + $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();')); |
|
| 342 | + $form->addGroup($group, 'max_member_group', null, '', false); |
|
| 343 | + |
|
| 344 | + // Active account or inactive account |
|
| 345 | + $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1); |
|
| 346 | + $form->addElement('radio', 'active', '', get_lang('Inactive'), 0); |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | // EXTRA FIELDS |
@@ -366,18 +366,18 @@ discard block |
||
| 366 | 366 | $expiration_date = $user_data['expiration_date']; |
| 367 | 367 | |
| 368 | 368 | if (empty($expiration_date)) { |
| 369 | - $user_data['radio_expiration_date'] = 0; |
|
| 370 | - $user_data['expiration_date'] = api_get_local_time(); |
|
| 369 | + $user_data['radio_expiration_date'] = 0; |
|
| 370 | + $user_data['expiration_date'] = api_get_local_time(); |
|
| 371 | 371 | } else { |
| 372 | - $user_data['radio_expiration_date'] = 1; |
|
| 373 | - $user_data['expiration_date'] = api_get_local_time($expiration_date); |
|
| 372 | + $user_data['radio_expiration_date'] = 1; |
|
| 373 | + $user_data['expiration_date'] = api_get_local_time($expiration_date); |
|
| 374 | 374 | } |
| 375 | 375 | $form->setDefaults($user_data); |
| 376 | 376 | |
| 377 | 377 | $error_drh = false; |
| 378 | 378 | // Validate form |
| 379 | 379 | if ($form->validate()) { |
| 380 | - $user = $form->getSubmitValues(1); |
|
| 380 | + $user = $form->getSubmitValues(1); |
|
| 381 | 381 | $reset_password = intval($user['reset_password']); |
| 382 | 382 | if ($reset_password == 2 && empty($user['password'])) { |
| 383 | 383 | Display::addFlash(Display::return_message(get_lang('PasswordIsTooShort'))); |
@@ -385,18 +385,18 @@ discard block |
||
| 385 | 385 | exit(); |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']); |
|
| 388 | + $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']); |
|
| 389 | 389 | |
| 390 | - if ($user['status'] == DRH && $is_user_subscribed_in_course) { |
|
| 391 | - $error_drh = true; |
|
| 392 | - } else { |
|
| 393 | - $picture_element = $form->getElement('picture'); |
|
| 394 | - $picture = $picture_element->getValue(); |
|
| 390 | + if ($user['status'] == DRH && $is_user_subscribed_in_course) { |
|
| 391 | + $error_drh = true; |
|
| 392 | + } else { |
|
| 393 | + $picture_element = $form->getElement('picture'); |
|
| 394 | + $picture = $picture_element->getValue(); |
|
| 395 | 395 | |
| 396 | - $picture_uri = $user_data['picture_uri']; |
|
| 397 | - if (isset($user['delete_picture']) && $user['delete_picture']) { |
|
| 398 | - $picture_uri = UserManager::delete_user_picture($user_id); |
|
| 399 | - } elseif (!empty($picture['name'])) { |
|
| 396 | + $picture_uri = $user_data['picture_uri']; |
|
| 397 | + if (isset($user['delete_picture']) && $user['delete_picture']) { |
|
| 398 | + $picture_uri = UserManager::delete_user_picture($user_id); |
|
| 399 | + } elseif (!empty($picture['name'])) { |
|
| 400 | 400 | $picture_uri = UserManager::update_user_picture( |
| 401 | 401 | $user_id, |
| 402 | 402 | $_FILES['picture']['name'], |
@@ -404,30 +404,30 @@ discard block |
||
| 404 | 404 | $user['cropResult'] |
| 405 | 405 | |
| 406 | 406 | ); |
| 407 | - } |
|
| 407 | + } |
|
| 408 | 408 | |
| 409 | - $lastname = $user['lastname']; |
|
| 410 | - $firstname = $user['firstname']; |
|
| 409 | + $lastname = $user['lastname']; |
|
| 410 | + $firstname = $user['firstname']; |
|
| 411 | 411 | $password = $user['password']; |
| 412 | 412 | $auth_source = isset($user['auth_source']) ? $user['auth_source'] : $userInfo['auth_source']; |
| 413 | - $official_code = $user['official_code']; |
|
| 414 | - $email = $user['email']; |
|
| 415 | - $phone = $user['phone']; |
|
| 416 | - $username = isset($user['username']) ? $user['username'] : $userInfo['username']; |
|
| 417 | - $status = intval($user['status']); |
|
| 418 | - $platform_admin = intval($user['platform_admin']); |
|
| 419 | - $send_mail = intval($user['send_mail']); |
|
| 420 | - $reset_password = intval($user['reset_password']); |
|
| 421 | - $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null; |
|
| 422 | - $language = $user['language']; |
|
| 423 | - |
|
| 424 | - if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) { |
|
| 413 | + $official_code = $user['official_code']; |
|
| 414 | + $email = $user['email']; |
|
| 415 | + $phone = $user['phone']; |
|
| 416 | + $username = isset($user['username']) ? $user['username'] : $userInfo['username']; |
|
| 417 | + $status = intval($user['status']); |
|
| 418 | + $platform_admin = intval($user['platform_admin']); |
|
| 419 | + $send_mail = intval($user['send_mail']); |
|
| 420 | + $reset_password = intval($user['reset_password']); |
|
| 421 | + $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null; |
|
| 422 | + $language = $user['language']; |
|
| 423 | + |
|
| 424 | + if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) { |
|
| 425 | 425 | $expiration_date = $user['expiration_date']; |
| 426 | - } else { |
|
| 427 | - $expiration_date = null; |
|
| 428 | - } |
|
| 426 | + } else { |
|
| 427 | + $expiration_date = null; |
|
| 428 | + } |
|
| 429 | 429 | |
| 430 | - $active = $user_data['platform_admin'] ? 1 : intval($user['active']); |
|
| 430 | + $active = $user_data['platform_admin'] ? 1 : intval($user['active']); |
|
| 431 | 431 | |
| 432 | 432 | //If the user is set to admin the status will be overwrite by COURSEMANAGER = 1 |
| 433 | 433 | if ($platform_admin == 1) { |
@@ -461,31 +461,31 @@ discard block |
||
| 461 | 461 | $reset_password |
| 462 | 462 | ); |
| 463 | 463 | |
| 464 | - if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) { |
|
| 465 | - $up = UserManager::update_openid($user_id, $user['openid']); |
|
| 466 | - } |
|
| 464 | + if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) { |
|
| 465 | + $up = UserManager::update_openid($user_id, $user['openid']); |
|
| 466 | + } |
|
| 467 | 467 | $currentUserId = api_get_user_id(); |
| 468 | - if ($user_id != $currentUserId) { |
|
| 469 | - if ($platform_admin == 1) { |
|
| 468 | + if ($user_id != $currentUserId) { |
|
| 469 | + if ($platform_admin == 1) { |
|
| 470 | 470 | UserManager::add_user_as_admin($user_id); |
| 471 | - } else { |
|
| 471 | + } else { |
|
| 472 | 472 | UserManager::remove_user_admin($user_id); |
| 473 | - } |
|
| 474 | - } |
|
| 473 | + } |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | 476 | $extraFieldValue = new ExtraFieldValue('user'); |
| 477 | 477 | $extraFieldValue->saveFieldValues($user); |
| 478 | 478 | |
| 479 | - $tok = Security::get_token(); |
|
| 480 | - header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok); |
|
| 481 | - exit(); |
|
| 482 | - } |
|
| 479 | + $tok = Security::get_token(); |
|
| 480 | + header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok); |
|
| 481 | + exit(); |
|
| 482 | + } |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | $message = null; |
| 486 | 486 | if ($error_drh) { |
| 487 | - $err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager'); |
|
| 488 | - $message = Display::return_message($err_msg, 'error'); |
|
| 487 | + $err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager'); |
|
| 488 | + $message = Display::return_message($err_msg, 'error'); |
|
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | $content = null; |
@@ -229,31 +229,31 @@ discard block |
||
| 229 | 229 | <td align="center"> |
| 230 | 230 | <div id="content_source"> |
| 231 | 231 | <?php |
| 232 | - if (!($add_type=='multiple')) { |
|
| 232 | + if (!($add_type=='multiple')) { |
|
| 233 | 233 | ?> |
| 234 | 234 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
| 235 | 235 | <div id="ajax_list_users_single"></div> |
| 236 | 236 | <?php |
| 237 | - } else { |
|
| 238 | - ?> |
|
| 237 | + } else { |
|
| 238 | + ?> |
|
| 239 | 239 | <div id="ajax_list_multiple"> |
| 240 | 240 | <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?> |
| 241 | 241 | </div> |
| 242 | 242 | <?php |
| 243 | - } |
|
| 244 | - ?> |
|
| 243 | + } |
|
| 244 | + ?> |
|
| 245 | 245 | </div> |
| 246 | 246 | </td> |
| 247 | 247 | <td width="10%" valign="middle" align="center"> |
| 248 | 248 | <?php |
| 249 | - if ($ajax_search) { |
|
| 250 | - ?> |
|
| 249 | + if ($ajax_search) { |
|
| 250 | + ?> |
|
| 251 | 251 | <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" > |
| 252 | 252 | <em class="fa fa-arrow-left"></em> |
| 253 | 253 | </button> |
| 254 | 254 | <?php |
| 255 | - } else { |
|
| 256 | - ?> |
|
| 255 | + } else { |
|
| 256 | + ?> |
|
| 257 | 257 | <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))"> |
| 258 | 258 | <em class="fa fa-arrow-right"></em> |
| 259 | 259 | </button> |
@@ -262,8 +262,8 @@ discard block |
||
| 262 | 262 | <em class="fa fa-arrow-left"></em> |
| 263 | 263 | </button> |
| 264 | 264 | <?php |
| 265 | - } |
|
| 266 | - ?> |
|
| 265 | + } |
|
| 266 | + ?> |
|
| 267 | 267 | <br /><br /><br /><br /><br /><br /> |
| 268 | 268 | </td> |
| 269 | 269 | <td align="center"> |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $courses = $course_list; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if (!empty($courses)) { |
|
| 49 | + if (!empty($courses)) { |
|
| 50 | 50 | |
| 51 | 51 | $archiveFile = 'export_courses_list_'.api_get_local_time(); |
| 52 | 52 | |
@@ -98,13 +98,13 @@ discard block |
||
| 98 | 98 | Export::arrayToXls($listToExport, $archiveFile); |
| 99 | 99 | break; |
| 100 | 100 | } |
| 101 | - } else { |
|
| 101 | + } else { |
|
| 102 | 102 | Display::addFlash( |
| 103 | 103 | Display::return_message( |
| 104 | 104 | get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty') |
| 105 | 105 | ) |
| 106 | 106 | ); |
| 107 | - } |
|
| 107 | + } |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | |
@@ -114,29 +114,29 @@ discard block |
||
| 114 | 114 | $form->addHeader($tool_name); |
| 115 | 115 | $form->addHidden('formSent', 1); |
| 116 | 116 | $form->addElement( |
| 117 | - 'radio', |
|
| 118 | - 'select_type', |
|
| 119 | - get_lang('Option'), |
|
| 120 | - get_lang('ExportAllCoursesList'), |
|
| 121 | - '1', |
|
| 122 | - ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"] |
|
| 117 | + 'radio', |
|
| 118 | + 'select_type', |
|
| 119 | + get_lang('Option'), |
|
| 120 | + get_lang('ExportAllCoursesList'), |
|
| 121 | + '1', |
|
| 122 | + ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"] |
|
| 123 | 123 | ); |
| 124 | 124 | |
| 125 | 125 | $form->addElement( |
| 126 | - 'radio', |
|
| 127 | - 'select_type', |
|
| 128 | - '', |
|
| 129 | - get_lang('ExportSelectedCoursesFromCoursesList'), |
|
| 130 | - '2', |
|
| 131 | - ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"] |
|
| 126 | + 'radio', |
|
| 127 | + 'select_type', |
|
| 128 | + '', |
|
| 129 | + get_lang('ExportSelectedCoursesFromCoursesList'), |
|
| 130 | + '2', |
|
| 131 | + ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"] |
|
| 132 | 132 | ); |
| 133 | 133 | |
| 134 | 134 | if (!empty($course_list)) { |
| 135 | - $form->addHtml('<div id="div-course-list" style="display:none">'); |
|
| 136 | - $coursesInList = []; |
|
| 137 | - foreach ($course_list as $course) { |
|
| 138 | - $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')'; |
|
| 139 | - } |
|
| 135 | + $form->addHtml('<div id="div-course-list" style="display:none">'); |
|
| 136 | + $coursesInList = []; |
|
| 137 | + foreach ($course_list as $course) { |
|
| 138 | + $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')'; |
|
| 139 | + } |
|
| 140 | 140 | |
| 141 | 141 | $form->addSelect( |
| 142 | 142 | 'course_code', |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | ['multiple' => 'multiple'] |
| 146 | 146 | ); |
| 147 | 147 | |
| 148 | - $form->addHtml('</div>'); |
|
| 148 | + $form->addHtml('</div>'); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null); |
@@ -11,58 +11,58 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | $nbre=0; |
| 13 | 13 | echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">'; |
| 14 | - if($statut==1) |
|
| 15 | - { |
|
| 16 | - echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>'; |
|
| 17 | - } |
|
| 18 | - else |
|
| 19 | - { |
|
| 20 | - echo '<input type="hidden" name="mailling" value="1">'; |
|
| 21 | - } |
|
| 14 | + if($statut==1) |
|
| 15 | + { |
|
| 16 | + echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>'; |
|
| 17 | + } |
|
| 18 | + else |
|
| 19 | + { |
|
| 20 | + echo '<input type="hidden" name="mailling" value="1">'; |
|
| 21 | + } |
|
| 22 | 22 | if(!empty($course)) |
| 23 | 23 | { |
| 24 | - echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">'; |
|
| 24 | + echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">'; |
|
| 25 | 25 | } |
| 26 | 26 | elseif(!empty($id_session)) |
| 27 | 27 | { |
| 28 | - echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">'; |
|
| 28 | + echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">'; |
|
| 29 | 29 | } |
| 30 | 30 | $is_western_name_order = api_is_western_name_order(); |
| 31 | 31 | echo '<input type="hidden" name="confirmed" value="yes">'; |
| 32 | 32 | echo '<table border="0" cellspacing="0" width="100%">'; |
| 33 | 33 | echo '<tr align="center" id="header3">' . |
| 34 | - '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' . |
|
| 35 | - '<td width="40%"><b>'.get_lang('Email').'</b></td>' . |
|
| 36 | - ($is_western_name_order |
|
| 37 | - ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' . |
|
| 38 | - '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
| 39 | - : '<td width="15%"><b>'.get_lang('Name').'</b></td>' . |
|
| 40 | - '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') . |
|
| 41 | - '<td width="15%"><b>'.get_lang('Login').'</b></td>' . |
|
| 42 | - '</tr>'."\n"; |
|
| 34 | + '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' . |
|
| 35 | + '<td width="40%"><b>'.get_lang('Email').'</b></td>' . |
|
| 36 | + ($is_western_name_order |
|
| 37 | + ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' . |
|
| 38 | + '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
| 39 | + : '<td width="15%"><b>'.get_lang('Name').'</b></td>' . |
|
| 40 | + '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') . |
|
| 41 | + '<td width="15%"><b>'.get_lang('Login').'</b></td>' . |
|
| 42 | + '</tr>'."\n"; |
|
| 43 | 43 | while (list ($key, $val) = each($nom_form)) { |
| 44 | - $nbre=$nbre+1; |
|
| 45 | - if($nbre & 1) $ndiv=2; else $ndiv=3; |
|
| 46 | - echo '<tr align="center" id="header'.$ndiv.'">'; |
|
| 47 | - echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
| 48 | - echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
| 49 | - if ($is_western_name_order) |
|
| 50 | - { |
|
| 51 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 52 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 53 | - } |
|
| 54 | - else |
|
| 55 | - { |
|
| 56 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 57 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 58 | - } |
|
| 59 | - echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
| 60 | - echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
| 61 | - echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
| 62 | - echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
| 63 | - echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
| 64 | - echo '</td>'; |
|
| 65 | - echo '</tr>'; |
|
| 44 | + $nbre=$nbre+1; |
|
| 45 | + if($nbre & 1) $ndiv=2; else $ndiv=3; |
|
| 46 | + echo '<tr align="center" id="header'.$ndiv.'">'; |
|
| 47 | + echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
| 48 | + echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
| 49 | + if ($is_western_name_order) |
|
| 50 | + { |
|
| 51 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 52 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 53 | + } |
|
| 54 | + else |
|
| 55 | + { |
|
| 56 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 57 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 58 | + } |
|
| 59 | + echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
| 60 | + echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
| 61 | + echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
| 62 | + echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
| 63 | + echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
| 64 | + echo '</td>'; |
|
| 65 | + echo '</tr>'; |
|
| 66 | 66 | } |
| 67 | 67 | echo '</table>'; |
| 68 | 68 | echo '<br />'; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | $add_type = 'multiple'; |
| 56 | 56 | if (isset($_GET['add_type']) && $_GET['add_type']!='') { |
| 57 | - $add_type = Security::remove_XSS($_REQUEST['add_type']); |
|
| 57 | + $add_type = Security::remove_XSS($_REQUEST['add_type']); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!api_is_platform_admin()) { |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | "; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $rs = Database::query($sql); |
|
| 124 | - $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
| 123 | + $rs = Database::query($sql); |
|
| 124 | + $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
| 125 | 125 | |
| 126 | 126 | if ($type == 'single') { |
| 127 | 127 | $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $return .= '...<br />'; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
| 163 | + $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
| 164 | 164 | } else { |
| 165 | 165 | $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">'; |
| 166 | 166 | while($user = Database :: fetch_array($rs)) { |
@@ -170,8 +170,8 @@ discard block |
||
| 170 | 170 | $return .= '</select>'; |
| 171 | 171 | $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return)); |
| 172 | 172 | } |
| 173 | - } |
|
| 174 | - return $xajax_response; |
|
| 173 | + } |
|
| 174 | + return $xajax_response; |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | $xajax->processRequests(); |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | |
| 285 | 285 | $msg = ''; |
| 286 | 286 | if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) { |
| 287 | - $user_list = $_POST['UsersList']; |
|
| 287 | + $user_list = $_POST['UsersList']; |
|
| 288 | 288 | |
| 289 | 289 | switch ($userStatus) { |
| 290 | 290 | case DRH: |
@@ -349,13 +349,13 @@ discard block |
||
| 349 | 349 | $assigned_users_id = array_keys($assigned_users_to_hrm); |
| 350 | 350 | $without_assigned_users = ''; |
| 351 | 351 | if (count($assigned_users_id) > 0) { |
| 352 | - $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND "; |
|
| 352 | + $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND "; |
|
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | $search_user = ''; |
| 356 | 356 | if (!empty($firstLetterUser)) { |
| 357 | - $needle = Database::escape_string($firstLetterUser); |
|
| 358 | - $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; |
|
| 357 | + $needle = Database::escape_string($firstLetterUser); |
|
| 358 | + $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | $sqlConditions = null; |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | } |
| 376 | 376 | |
| 377 | 377 | if (api_is_multiple_url_enabled()) { |
| 378 | - $sql = "SELECT user.user_id, username, lastname, firstname |
|
| 378 | + $sql = "SELECT user.user_id, username, lastname, firstname |
|
| 379 | 379 | FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id) |
| 380 | 380 | WHERE |
| 381 | 381 | $without_assigned_users |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | $sqlConditions |
| 386 | 386 | ORDER BY firstname"; |
| 387 | 387 | } else { |
| 388 | - $sql = "SELECT user_id, username, lastname, firstname |
|
| 388 | + $sql = "SELECT user_id, username, lastname, firstname |
|
| 389 | 389 | FROM $tbl_user user |
| 390 | 390 | WHERE |
| 391 | 391 | $without_assigned_users |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | <input type="hidden" name="formSent" value="1" /> |
| 402 | 402 | <?php |
| 403 | 403 | if(!empty($msg)) { |
| 404 | - Display::display_normal_message($msg); //main API |
|
| 404 | + Display::display_normal_message($msg); //main API |
|
| 405 | 405 | } |
| 406 | 406 | ?> |
| 407 | 407 | |
@@ -454,26 +454,26 @@ discard block |
||
| 454 | 454 | </div> |
| 455 | 455 | |
| 456 | 456 | <?php |
| 457 | - } |
|
| 458 | - ?> |
|
| 457 | + } |
|
| 458 | + ?> |
|
| 459 | 459 | <div class="separate-action"> |
| 460 | 460 | <?php |
| 461 | - echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>'; |
|
| 461 | + echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>'; |
|
| 462 | 462 | ?> |
| 463 | 463 | </div> |
| 464 | 464 | </div> |
| 465 | 465 | </div> |
| 466 | 466 | <div class="col-md-4"> |
| 467 | 467 | <?php |
| 468 | - if (UserManager::is_admin($user_id)) { |
|
| 469 | - echo get_lang('AssignedUsersListToPlatformAdministrator'); |
|
| 468 | + if (UserManager::is_admin($user_id)) { |
|
| 469 | + echo get_lang('AssignedUsersListToPlatformAdministrator'); |
|
| 470 | 470 | } else if ($user_info['status'] == SESSIONADMIN) { |
| 471 | 471 | echo get_lang('AssignedUsersListToSessionsAdministrator'); |
| 472 | 472 | } else if ($user_info['status'] == STUDENT_BOSS) { |
| 473 | 473 | echo get_lang('AssignedUsersListToStudentBoss'); |
| 474 | 474 | } else { |
| 475 | 475 | echo get_lang('AssignedUsersListToHumanResourcesManager'); |
| 476 | - } |
|
| 476 | + } |
|
| 477 | 477 | ?> |
| 478 | 478 | <div class="form-group"> |
| 479 | 479 | <div class="col-sm-12"> |