From 87732f6dfd2a3bb6a05d9a80b8f456bcbea3c7bb Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 19 Jun 2017 08:30:09 +0200 Subject: [PATCH] Minor - format code. --- main/session/add_courses_to_session.php | 7 --- main/session/session_add.php | 78 ++++++++++++------------- 2 files changed, 39 insertions(+), 46 deletions(-) diff --git a/main/session/add_courses_to_session.php b/main/session/add_courses_to_session.php index e03a1a0a28..615d53d7fe 100644 --- a/main/session/add_courses_to_session.php +++ b/main/session/add_courses_to_session.php @@ -76,7 +76,6 @@ function remove_item(origin) } '; -$errorMsg = ''; $CourseList = $SessionList = array(); $courses = $sessions = array(); @@ -209,12 +208,6 @@ unset($Courses);
> - -
diff --git a/main/session/session_add.php b/main/session/session_add.php index 0e95ea45d2..0bb9745a15 100644 --- a/main/session/session_add.php +++ b/main/session/session_add.php @@ -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 .= ''.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')
'; - } - } - $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 .= ''.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')
'; + } + } + $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[] = " "; 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 '
';