Minor - format code.

pull/2487/head
jmontoyaa 9 years ago
parent 1102ece3bd
commit 87732f6dfd
  1. 7
      main/session/add_courses_to_session.php
  2. 78
      main/session/session_add.php

@ -76,7 +76,6 @@ function remove_item(origin)
}
</script>';
$errorMsg = '';
$CourseList = $SessionList = array();
$courses = $sessions = array();
@ -209,12 +208,6 @@ unset($Courses);
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $sessionId; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
<legend><?php echo $tool_name.' ('.$session_info['name'].')'; ?></legend>
<input type="hidden" name="formSent" value="1" />
<?php
if (!empty($errorMsg)) {
echo Display::return_message($errorMsg); //main API
}
?>
<div id="multiple-add-session" class="row">
<div class="col-md-4">
<label><?php echo get_lang('CourseListInPlatform') ?> :</label>

@ -2,8 +2,8 @@
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
*/
* @package chamilo.admin
*/
$cidReset = true;
@ -34,27 +34,27 @@ $interbreadcrumb[] = array(
function search_coachs($needle)
{
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$xajax_response = new xajaxResponse();
$return = '';
if (!empty($needle)) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
// search users where username or firstname or lastname begins likes $needle
$sql = 'SELECT username, lastname, firstname
FROM '.$tbl_user.' user
WHERE (username LIKE "'.$needle.'%"
OR firstname LIKE "'.$needle.'%"
OR lastname LIKE "'.$needle.'%")
AND status=1'.
$order_clause.
' LIMIT 10';
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = 'SELECT username, lastname, firstname
$xajax_response = new xajaxResponse();
$return = '';
if (!empty($needle)) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
// search users where username or firstname or lastname begins likes $needle
$sql = 'SELECT username, lastname, firstname
FROM '.$tbl_user.' user
WHERE (username LIKE "'.$needle.'%"
OR firstname LIKE "'.$needle.'%"
OR lastname LIKE "'.$needle.'%")
AND status=1'.
$order_clause.
' LIMIT 10';
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = 'SELECT username, lastname, firstname
FROM '.$tbl_user.' user
INNER JOIN '.$tbl_user_rel_access_url.' url_user
ON (url_user.user_id=user.user_id)
@ -68,19 +68,19 @@ function search_coachs($needle)
AND status=1'.
$order_clause.'
LIMIT 10';
}
}
$rs = Database::query($sql);
while ($user = Database :: fetch_array($rs)) {
$return .= '<a href="javascript: void(0);" onclick="javascript: fill_coach_field(\''.$user['username'].'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
}
}
$xajax_response -> addAssign('ajax_list_coachs', 'innerHTML', api_utf8_encode($return));
return $xajax_response;
}
}
$rs = Database::query($sql);
while ($user = Database :: fetch_array($rs)) {
$return .= '<a href="javascript: void(0);" onclick="javascript: fill_coach_field(\''.$user['username'].'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
}
}
$xajax_response -> addAssign('ajax_list_coachs', 'innerHTML', api_utf8_encode($return));
return $xajax_response;
}
$xajax -> processRequests();
$xajax->processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = "
<script>
@ -90,8 +90,8 @@ $(document).ready( function() {
});
function fill_coach_field (username) {
document.getElementById('coach_username').value = username;
document.getElementById('ajax_list_coachs').innerHTML = '';
document.getElementById('coach_username').value = username;
document.getElementById('ajax_list_coachs').innerHTML = '';
}
function accessSwitcher(accessFromReady) {
@ -120,7 +120,7 @@ function emptyDuration() {
</script>";
if (isset($_POST['formSent']) && $_POST['formSent']) {
$formSent = 1;
$formSent = 1;
}
$tool_name = get_lang('AddSession');
@ -210,7 +210,7 @@ if ($form->validate()) {
if ($return == strval(intval($return))) {
// integer => no error on session creation
header('Location: add_courses_to_session.php?id_session='.$return.'&add=true&msg=');
header('Location: add_courses_to_session.php?id_session='.$return.'&add=true');
exit();
}
}
@ -218,7 +218,7 @@ if ($form->validate()) {
Display::display_header($tool_name);
if (!empty($return)) {
echo Display::return_message($return, 'error', false);
echo Display::return_message($return, 'error', false);
}
echo '<div class="actions">';

Loading…
Cancel
Save