chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing some lang variables and order values see BT#3609

Browse Source
skala
Julio Montoya 14 years ago
parent 0eae615656
commit 67815dca32
5 changed files with 28 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      main/admin/add_courses_to_usergroup.php
  2. 1
      main/admin/add_sessions_to_usergroup.php
  3. 15
      main/admin/add_users_to_usergroup.php
  4. 20
      main/admin/resume_session.php
  5. 8
      main/inc/lib/usermanager.lib.php

16
main/admin/add_courses_to_usergroup.php
Unescape View File

@ -5,10 +5,10 @@
*/
// name of the language file that needs to be included
$language_file=array('admin','registration');
$language_file = array('admin','registration');
// resetting the course id
$cidReset=true;
$cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
@ -96,7 +96,7 @@ if($_POST['form_sent']) {
}
$data = $usergroup->get($id);
$course_list_in = $usergroup->get_courses_by_usergroup($id);
$course_list = CourseManager::get_courses_list();
$course_list = CourseManager::get_courses_list(0,0,'title');
//api_display_tool_title($tool_name.' ('.$session_info['name'].')');
$elements_not_in = $elements_in= array();
@ -104,9 +104,9 @@ $elements_not_in = $elements_in= array();
if (!empty($course_list)) {
foreach($course_list as $item) {
if (in_array($item['id'], $course_list_in)) {
$elements_in[$item['id']] = $item['title'];
$elements_in[$item['id']] = $item['title']." (".$item['code'].")";
} else {
$elements_not_in[$item['id']] = $item['title'];
$elements_not_in[$item['id']] = $item['title']." (".$item['code'].")";
}
}
}
@ -134,7 +134,7 @@ function search($needle,$type) {
$order_clause.
' LIMIT 11';*/
} else {
$list = CourseManager::get_courses_list(0, 0, 1, 'ASC', -1, $needle);
$list = CourseManager::get_courses_list(0, 0, 2, 'ASC', -1, $needle);
}
$i=0;
if ($type=='single') {
@ -154,7 +154,7 @@ function search($needle,$type) {
foreach ($list as $row ) {
if (!in_array($row['id'], array_keys($elements_in))) {
$return .= '<option value="'.$row['id'].'">'.$row['title'].'</option>';
$return .= '<option value="'.$row['id'].'">'.$row['title'].' ('.$row['code'].')</option>';
}
}
$return .= '</select>';
@ -229,7 +229,7 @@ if(!empty($errorMsg)) {
<?php if ($add_type=='multiple') { ?>
<tr>
<td align="center">
<?php echo get_lang('FirstLetterSessions'); ?> :
<?php echo get_lang('FirstLetterCourseTitle'); ?> :
<select name="firstLetterUser" onchange = "xajax_search(this.value,'multiple')" >
<option value = "%">--</option>
<?php

1
main/admin/add_sessions_to_usergroup.php
Unescape View File

@ -14,7 +14,6 @@ $cidReset=true;
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
$xajax = new xajax();

15
main/admin/add_users_to_usergroup.php
Unescape View File

@ -5,16 +5,15 @@
*/
// name of the language file that needs to be included
$language_file=array('admin','registration');
$language_file = array('admin','registration');
// resetting the course id
$cidReset=true;
$cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
@ -74,7 +73,6 @@ function validate_filter() {
$form_sent = 0;
$errorMsg = '';
$sessions = array();
$extra_field_list= UserManager::get_extra_fields();
$new_field_list = array();
@ -110,8 +108,7 @@ if ($_POST['form_sent']) {
//Filter by Extra Fields
$use_extra_fields = false;
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
$result_list=array();
if (is_array($new_field_list) && count($new_field_list)>0 ) {
foreach ($new_field_list as $new_field) {
$varname = 'field_'.$new_field['variable'];
if (Usermanager::is_extra_field_available($new_field['variable'])) {
@ -146,9 +143,9 @@ if (api_is_western_name_order()) {
}
if (!empty($first_letter_user)) {
$user_list = UserManager::get_user_list_like(array('firstname'=>$first_letter_user), $order);
$user_list = UserManager::get_user_list_like(array('lastname' => $first_letter_user), $order, true);
} else {
$user_list = UserManager::get_user_list(array(),$order);
$user_list = UserManager::get_user_list(array(),$order);
}
//api_display_tool_title($tool_name.' ('.$session_info['name'].')');
@ -235,7 +232,7 @@ if(!empty($errorMsg)) {
<?php if ($add_type=='multiple') { ?>
<tr>
<td align="center">
<?php echo get_lang('FirstLetterSessions'); ?> :
<?php echo get_lang('FirstLetterUser'); ?> :
<select name="firstLetterUser" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
<option value = "%">--</option>
<?php

20
main/admin/resume_session.php
Unescape View File

@ -11,8 +11,10 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
// setting the section (for the tabs)
$this_section=SECTION_PLATFORM_ADMIN;
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
@ -69,11 +71,9 @@ if($_GET['action'] == 'delete') {
$idChecked="'".implode("','",$idChecked)."'";
Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)");
$nbr_affected_rows=Database::affected_rows();
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)");
Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
}
@ -86,6 +86,7 @@ if($_GET['action'] == 'delete') {
if (!empty($_GET['user'])) {
Database::query("DELETE FROM $tbl_session_rel_user WHERE relation_type<>".SESSION_RELATION_TYPE_RRHH." AND id_session='$id_session' AND id_user=".intval($_GET['user']));
$nbr_affected_rows=Database::affected_rows();
Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'");
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND id_user=".intval($_GET['user']));
@ -161,7 +162,6 @@ echo Display::tag('h1', Display::return_icon('session.png', get_lang('Session'))
<?php echo intval($session['nb_days_access_after_end']) ?>
</td>
</tr>
<tr>
<td>
<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
@ -172,7 +172,6 @@ echo Display::tag('h1', Display::return_icon('session.png', get_lang('Session'))
</tr>
<?php
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if (api_get_multiple_access_url()) {
echo '<tr><td>';
@ -204,13 +203,12 @@ if (api_get_multiple_access_url()) {
</tr>
</tr>
<?php
if($session['nbr_courses']==0){
if ($session['nbr_courses']==0){
echo '
<tr>
<td colspan="4">'.get_lang('NoCoursesForThisSession').'</td>
</tr>';
}
else {
} else {
// select the courses
$sql = "SELECT code,title,visual_code, nbr_users
FROM $tbl_course,$tbl_session_rel_course
@ -270,9 +268,7 @@ else {
}
?>
</table>
<br />
<!--List of courses -->
<table class="data_table" width="100%">
<tr>
@ -287,9 +283,9 @@ if($session['nbr_users']==0){
<tr>
<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
</tr>';
}
else {
} else {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
$sql = 'SELECT '.$tbl_user.'.user_id, lastname, firstname, username '.
' FROM '.$tbl_user.
' INNER JOIN '.$tbl_session_rel_user.

8
main/inc/lib/usermanager.lib.php
Unescape View File

@ -650,7 +650,7 @@ class UserManager {
* @return array An array with all users of the platform.
* @todo optional course code parameter, optional sorting parameters...
*/
public static function get_user_list_like($conditions = array(), $order_by = array()) {
public static function get_user_list_like($conditions = array(), $order_by = array(), $simple_like = false) {
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$return_array = array();
$sql_query = "SELECT * FROM $user_table";
@ -659,7 +659,11 @@ class UserManager {
foreach ($conditions as $field => $value) {
$field = Database::escape_string($field);
$value = Database::escape_string($value);
$sql_query .= $field.' LIKE \'%'.$value.'%\'';
if ($simple_like) {
$sql_query .= $field." LIKE '$value%'";
} else {
$sql_query .= $field.' LIKE \'%'.$value.'%\'';
}
}
}
if (count($order_by) > 0) {

Write Preview
Loading…
Cancel
Save