@@ -480,7 +480,7 @@ |
||
| 480 | 480 | } |
| 481 | 481 | $sql .= " AND access_url_id = $url_access_id"; |
| 482 | 482 | } else { |
| 483 | - // adding a teacher NOT through a session |
|
| 483 | + // adding a teacher NOT through a session |
|
| 484 | 484 | $sql = "SELECT $select_fields |
| 485 | 485 | FROM $user_table u |
| 486 | 486 | LEFT JOIN $course_user_table cu |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | <option value="">--</option> |
| 300 | 300 | <?php |
| 301 | 301 | echo Display :: get_alphabet_options($first_letter_user); |
| 302 | - ?> |
|
| 302 | + ?> |
|
| 303 | 303 | </select> |
| 304 | 304 | </td> |
| 305 | 305 | <td width="20%"> </td> |
@@ -312,8 +312,8 @@ discard block |
||
| 312 | 312 | aria-label="<?php echo get_lang('FirstLetterCourse'); ?>"> |
| 313 | 313 | <option value="">--</option> |
| 314 | 314 | <?php |
| 315 | - echo Display :: get_alphabet_options($first_letter_course); |
|
| 316 | - ?> |
|
| 315 | + echo Display :: get_alphabet_options($first_letter_course); |
|
| 316 | + ?> |
|
| 317 | 317 | </select> |
| 318 | 318 | </td> |
| 319 | 319 | </tr> |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $userName = $officialCode.$userName; |
| 330 | 330 | } |
| 331 | 331 | echo $userName; |
| 332 | - ?> |
|
| 332 | + ?> |
|
| 333 | 333 | </option> |
| 334 | 334 | <?php } ?> |
| 335 | 335 | </select> |
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'), |
| 56 | 56 | array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'), |
| 57 | 57 | array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select', |
| 58 | - //for the bottom bar |
|
| 58 | + //for the bottom bar |
|
| 59 | 59 | 'searchoptions' => array( |
| 60 | 60 | 'defaultValue' => '1', |
| 61 | 61 | 'value' => '1:'.get_lang('Active').';0:'.get_lang('Inactive') |
| 62 | 62 | ), |
| 63 | - //for the top bar |
|
| 64 | - 'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))), |
|
| 63 | + //for the top bar |
|
| 64 | + 'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))), |
|
| 65 | 65 | array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
| 66 | 66 | array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false') |
| 67 | 67 | ); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | //With this function we can add actions to the jgrid (edit, delete, etc) |
| 77 | 77 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
| 78 | 78 | return \' <a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'. |
| 79 | - '\'; |
|
| 79 | + '\'; |
|
| 80 | 80 | }'; |
| 81 | 81 | ?> |
| 82 | 82 | <script> |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | if (stripos($line, '$_configuration[\'system_version\']') !== false) { |
| 39 | 39 | $found_version = true; |
| 40 | 40 | $line = '$_configuration[\'system_version\'] = \''.$GLOBALS['new_version'].'\';'."\r\n"; |
| 41 | - } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) { |
|
| 41 | + } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) { |
|
| 42 | 42 | $found_stable = true; |
| 43 | 43 | $line = '$_configuration[\'system_stable\'] = '.($GLOBALS['new_version_stable'] ? 'true' : 'false').';'."\r\n"; |
| 44 | 44 | } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) { |
@@ -29,35 +29,35 @@ |
||
| 29 | 29 | echo '<input type="hidden" name="confirmed" value="yes">'; |
| 30 | 30 | echo '<table border="0" cellspacing="0" width="100%">'; |
| 31 | 31 | echo '<tr align="center" id="header3">'. |
| 32 | - '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'. |
|
| 33 | - '<td width="40%"><b>'.get_lang('Email').'</b></td>'. |
|
| 34 | - ($is_western_name_order |
|
| 35 | - ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'. |
|
| 36 | - '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
| 37 | - : '<td width="15%"><b>'.get_lang('Name').'</b></td>'. |
|
| 38 | - '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'). |
|
| 39 | - '<td width="15%"><b>'.get_lang('Login').'</b></td>'. |
|
| 40 | - '</tr>'."\n"; |
|
| 32 | + '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'. |
|
| 33 | + '<td width="40%"><b>'.get_lang('Email').'</b></td>'. |
|
| 34 | + ($is_western_name_order |
|
| 35 | + ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'. |
|
| 36 | + '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
| 37 | + : '<td width="15%"><b>'.get_lang('Name').'</b></td>'. |
|
| 38 | + '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'). |
|
| 39 | + '<td width="15%"><b>'.get_lang('Login').'</b></td>'. |
|
| 40 | + '</tr>'."\n"; |
|
| 41 | 41 | while (list ($key, $val) = each($nom_form)) { |
| 42 | - $nbre = $nbre + 1; |
|
| 43 | - if ($nbre & 1) $ndiv = 2; else $ndiv = 3; |
|
| 44 | - echo '<tr align="center" id="header'.$ndiv.'">'; |
|
| 45 | - echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
| 46 | - echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
| 47 | - if ($is_western_name_order) { |
|
| 48 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 49 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 50 | - } else { |
|
| 51 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 52 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 53 | - } |
|
| 54 | - echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
| 55 | - echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
| 56 | - echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
| 57 | - echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
| 58 | - echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
| 59 | - echo '</td>'; |
|
| 60 | - echo '</tr>'; |
|
| 42 | + $nbre = $nbre + 1; |
|
| 43 | + if ($nbre & 1) $ndiv = 2; else $ndiv = 3; |
|
| 44 | + echo '<tr align="center" id="header'.$ndiv.'">'; |
|
| 45 | + echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
| 46 | + echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
| 47 | + if ($is_western_name_order) { |
|
| 48 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 49 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 50 | + } else { |
|
| 51 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
| 52 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
| 53 | + } |
|
| 54 | + echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
| 55 | + echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
| 56 | + echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
| 57 | + echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
| 58 | + echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
| 59 | + echo '</td>'; |
|
| 60 | + echo '</tr>'; |
|
| 61 | 61 | } |
| 62 | 62 | echo '</table>'; |
| 63 | 63 | echo '<br />'; |
@@ -43,10 +43,10 @@ |
||
| 43 | 43 | " . |
| 44 | 44 | "\n". |
| 45 | 45 | '$().ready(function() {'."\n". |
| 46 | - 'if ($(\'#previous\')) {'."\n". |
|
| 46 | + 'if ($(\'#previous\')) {'."\n". |
|
| 47 | 47 | 'if(\'parent is\'+$(\'#idParent\').val()) {'. |
| 48 | - 'load_cbo($(\'#idParent\').val());'."\n". |
|
| 49 | - '}}'."\n". |
|
| 48 | + 'load_cbo($(\'#idParent\').val());'."\n". |
|
| 49 | + '}}'."\n". |
|
| 50 | 50 | '});</script>'."\n"; |
| 51 | 51 | |
| 52 | 52 | /* Constants and variables */ |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | $filename = disable_dangerous_file($filename); |
| 73 | 73 | |
| 74 | 74 | if (strlen(trim($filename)) == 0) { |
| 75 | - echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please |
|
| 76 | - exit; |
|
| 75 | + echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please |
|
| 76 | + exit; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | //check file_get_contents |
@@ -46,10 +46,9 @@ discard block |
||
| 46 | 46 | - Universite Jean Monet (J Dubois / Michel Courbon) |
| 47 | 47 | - Michel Panckoucke for reporting and fixing a bug |
| 48 | 48 | - Patrick Cool: fixing security hole |
| 49 | - |
|
| 50 | - * @author Roan Embrechts |
|
| 51 | - * @version 3.0 |
|
| 52 | - * @package chamilo.auth.ldap |
|
| 49 | + * @author Roan Embrechts |
|
| 50 | + * @version 3.0 |
|
| 51 | + * @package chamilo.auth.ldap |
|
| 53 | 52 | * Note: |
| 54 | 53 | * If you are using a firewall, you might need to check port 389 is open in |
| 55 | 54 | * order for Chamilo to communicate with the LDAP server. |
@@ -207,8 +206,8 @@ discard block |
||
| 207 | 206 | $language = api_get_setting('platformLanguage'); |
| 208 | 207 | if (empty($language)) { $language = 'english'; } |
| 209 | 208 | $_userId = UserManager::create_user($prenom, $nom, $status, |
| 210 | - $email, $uname, $password, $official_code, |
|
| 211 | - $language, '', '', 'ldap'); |
|
| 209 | + $email, $uname, $password, $official_code, |
|
| 210 | + $language, '', '', 'ldap'); |
|
| 212 | 211 | |
| 213 | 212 | //echo "new user added to Chamilo, id = $_userId"; |
| 214 | 213 | |
@@ -265,7 +264,7 @@ discard block |
||
| 265 | 264 | // Open anonymous LDAP connection |
| 266 | 265 | $result = false; |
| 267 | 266 | $ldap_bind_res = ldap_handle_bind($ds, $result); |
| 268 | - // Executing the search with the $filter parametr |
|
| 267 | + // Executing the search with the $filter parametr |
|
| 269 | 268 | //error_log('Searching for '.$filter.' on LDAP server',0); |
| 270 | 269 | $sr = ldap_search($ds, $ldap_basedn, $filter); |
| 271 | 270 | $info = ldap_get_entries($ds, $sr); |
@@ -557,35 +556,35 @@ discard block |
||
| 557 | 556 | foreach ($UserList as $enreg_user) { |
| 558 | 557 | $enreg_user = (int) $enreg_user; |
| 559 | 558 | Database::query("INSERT IGNORE ". |
| 560 | - " INTO $tbl_session_rel_course_rel_user ". |
|
| 561 | - "(session_id,c_id,user_id) VALUES ". |
|
| 562 | - "('$id_session','$enreg_course','$enreg_user')"); |
|
| 559 | + " INTO $tbl_session_rel_course_rel_user ". |
|
| 560 | + "(session_id,c_id,user_id) VALUES ". |
|
| 561 | + "('$id_session','$enreg_course','$enreg_user')"); |
|
| 563 | 562 | } |
| 564 | 563 | $sql = "SELECT COUNT(user_id) as nbUsers ". |
| 565 | - " FROM $tbl_session_rel_course_rel_user ". |
|
| 566 | - " WHERE session_id='$id_session' ". |
|
| 567 | - " AND c_id='$enreg_course'"; |
|
| 564 | + " FROM $tbl_session_rel_course_rel_user ". |
|
| 565 | + " WHERE session_id='$id_session' ". |
|
| 566 | + " AND c_id='$enreg_course'"; |
|
| 568 | 567 | $rs = Database::query($sql); |
| 569 | 568 | list($nbr_users) = Database::fetch_array($rs); |
| 570 | 569 | Database::query("UPDATE $tbl_session_rel_course ". |
| 571 | - " SET nbr_users=$nbr_users ". |
|
| 572 | - " WHERE session_id='$id_session' ". |
|
| 573 | - " AND c_id='$enreg_course'"); |
|
| 570 | + " SET nbr_users=$nbr_users ". |
|
| 571 | + " WHERE session_id='$id_session' ". |
|
| 572 | + " AND c_id='$enreg_course'"); |
|
| 574 | 573 | } |
| 575 | 574 | foreach ($UserList as $enreg_user) { |
| 576 | 575 | $enreg_user = (int) $enreg_user; |
| 577 | 576 | Database::query("INSERT IGNORE INTO $tbl_session_rel_user ". |
| 578 | - " (session_id, user_id, registered_at) ". |
|
| 579 | - " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')"); |
|
| 577 | + " (session_id, user_id, registered_at) ". |
|
| 578 | + " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')"); |
|
| 580 | 579 | } |
| 581 | 580 | // We update the number of users in the session |
| 582 | 581 | $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ". |
| 583 | - " WHERE session_id='$id_session' ". |
|
| 584 | - " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." "; |
|
| 582 | + " WHERE session_id='$id_session' ". |
|
| 583 | + " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." "; |
|
| 585 | 584 | $rs = Database::query($sql); |
| 586 | 585 | list($nbr_users) = Database::fetch_array($rs); |
| 587 | 586 | Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ". |
| 588 | - " WHERE id='$id_session'"); |
|
| 587 | + " WHERE id='$id_session'"); |
|
| 589 | 588 | } |
| 590 | 589 | |
| 591 | 590 | function syncro_users() { |
@@ -1555,7 +1555,7 @@ discard block |
||
| 1555 | 1555 | $media .= '<div class="col-md-2 col-xs-2 social-post-answers">'; |
| 1556 | 1556 | $media .= '<div class="user-image pull-right">'; |
| 1557 | 1557 | $media .= '<a href="'.$url.'" ><img src="'.$users[$userIdLoop]['avatar']. |
| 1558 | - '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>'; |
|
| 1558 | + '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>'; |
|
| 1559 | 1559 | $media .= '</div>'; |
| 1560 | 1560 | $media .= '</div>'; |
| 1561 | 1561 | $media .= '<div class="col-md-9 col-xs-9 social-post-answers">'; |
@@ -1770,10 +1770,10 @@ discard block |
||
| 1770 | 1770 | } |
| 1771 | 1771 | |
| 1772 | 1772 | /** |
| 1773 | - * Delete messages delete logic |
|
| 1774 | - * @param int $id id message to delete. |
|
| 1775 | - * @return bool status query |
|
| 1776 | - */ |
|
| 1773 | + * Delete messages delete logic |
|
| 1774 | + * @param int $id id message to delete. |
|
| 1775 | + * @return bool status query |
|
| 1776 | + */ |
|
| 1777 | 1777 | public static function deleteMessage($id) |
| 1778 | 1778 | { |
| 1779 | 1779 | $id = intval($id); |