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

Merge

Browse Source
skala
Noel Dieschburg 16 years ago
parent a5222167c0 0c09148098
commit fe46e798f2
10 changed files with 92 additions and 80 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. 10
      main/group/group_edit.php
  2. 4
      main/group/group_overview.php
  3. 2
      main/inc/lib/asciimath/filter.php
  4. 10
      main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php
  5. 2
      main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php
  6. 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php
  7. 19
      main/inc/lib/groupmanager.lib.php
  8. 3
      main/messaging/email_editor.php
  9. 8
      main/newscorm/lp_view.php
  10. 28
      main/user/subscribe_user.php

10
main/group/group_edit.php
Unescape View File

@ -211,12 +211,11 @@ if (isset($_SESSION['id_session'])) {
$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'],true,$_SESSION['id_session']); $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'],true,$_SESSION['id_session']);
$complete_user_list2 = CourseManager :: get_coach_list_from_course_code($_course['id'],$_SESSION['id_session']); $complete_user_list2 = CourseManager :: get_coach_list_from_course_code($_course['id'],$_SESSION['id_session']);
$complete_user_list = array_merge($complete_user_list,$complete_user_list2); $complete_user_list = array_merge($complete_user_list,$complete_user_list2);
usort($complete_user_list, 'sort_users');
} else { } else {
$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id']); $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'],false, '','',api_get_setting('user_order_by'));
} }
usort($complete_user_list, 'sort_users');
$possible_users = array (); $possible_users = array ();
foreach ($complete_user_list as $index => $user) { foreach ($complete_user_list as $index => $user) {
@ -324,7 +323,10 @@ if ($referer != 'group_space.php' && $referer != 'group.php') {
$referer = 'group.php'; $referer = 'group.php';
} }
if (isset($_POST['group_members'])) { if (isset($_POST['group_members'])) {
if (count($_POST['group_members'])<=$defaults['max_member']) { // if it has been specified that there is a limit (contradictionary this is max_member_no_limit = 1) then we have to check if the limit
// has been exceeded or not
if($_POST['max_member_no_limit'] == 1){
if (count($_POST['group_members'])<=$defaults['max_member'] AND $defaults['max_member_no_limit']) {
// //
} else { } else {
header('Location:group_edit.php?show_message='.get_lang('GroupTooMuchMembers')); header('Location:group_edit.php?show_message='.get_lang('GroupTooMuchMembers'));

4
main/group/group_overview.php
Unescape View File

@ -68,7 +68,7 @@ if( isset($_GET['action']))
$data = array(); $data = array();
foreach($groups as $index => $group) foreach($groups as $index => $group)
{ {
$users = GroupManager::get_users($group['id']); $users = GroupManager::get_users($group['id'],api_get_setting('user_order_by'));
foreach($users as $index => $user) foreach($users as $index => $user)
{ {
$row = array(); $row = array();
@ -136,7 +136,7 @@ foreach($categories as $index => $category)
echo '<li>'; echo '<li>';
echo stripslashes($group['name']); echo stripslashes($group['name']);
echo '<ul>'; echo '<ul>';
$users = GroupManager::get_users($group['id']); $users = GroupManager::get_users($group['id'],api_get_setting('user_order_by'));
foreach($users as $index => $user) foreach($users as $index => $user)
{ {
$user_info = api_get_user_info($user); $user_info = api_get_user_info($user);

2
main/inc/lib/asciimath/filter.php
Unescape View File

@ -1,4 +1,4 @@
<?PHP <?php
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// // // //
// NOTICE OF COPYRIGHT // // NOTICE OF COPYRIGHT //

10
main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php
Unescape View File

@ -140,16 +140,16 @@ body {
&nbsp;<input type="file" name="upload" id="upload"/> &nbsp;<input type="file" name="upload" id="upload"/>
<input type="hidden" name="dir" id="dir" value="<?php echo dirname($clean_img)?>" /> <input type="hidden" name="dir" id="dir" value="<?php echo dirname($clean_img)?>" />
&nbsp; &nbsp;
<? if (count($IMConfig['maxWidth']) > 1){ ?> <?php if (count($IMConfig['maxWidth']) > 1){ ?>
<label for="uploadSize" style="white-space: nowrap;">Upload Size</label> <label for="uploadSize" style="white-space: nowrap;">Upload Size</label>
<select name="uploadSize" id="uploadSize"> <select name="uploadSize" id="uploadSize">
<? for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?> <?php for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?>
<option value="<?=$i?>"><?=$IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option> <option value="<?php echo $i?>"><?php echo $IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
<? } ?> <?php } ?>
<span style="padding-left: 5px;"> <span style="padding-left: 5px;">
(max width x height dimensions) (max width x height dimensions)
</span> </span>
<? } ?> <?php } ?>
</form> </form>
</td> </td>
<td> <td>

2
main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php
Unescape View File

@ -222,7 +222,7 @@ body {
<td> <td>
<select name="uploadSize" id="uploadSize"> <select name="uploadSize" id="uploadSize">
<?php for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?> <?php for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?>
<option value="<?=$i?>"><?=$IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option> <option value="<?php echo $i; ?>"><?php echo $IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
<?php } ?> <?php } ?>
</select> </select>
</td> </td>

2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php
Unescape View File

@ -1,4 +1,4 @@
<? <?php
include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
$error = ''; $error = '';
$fileMoved = array(); $fileMoved = array();

19
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -768,11 +768,22 @@ class GroupManager {
* Get all users from a given group * Get all users from a given group
* @param int $group_id The group * @param int $group_id The group
*/ */
public static function get_users ($group_id) { public static function get_users ($group_id, $order_by='', $direction='ASC') {
// Database table definition
$group_user_table = Database :: get_course_table(TABLE_GROUP_USER); $group_user_table = Database :: get_course_table(TABLE_GROUP_USER);
$group_id = Database::escape_string($group_id); $table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT user_id FROM $group_user_table WHERE group_id = $group_id";
$res = Database::query($sql,__FILE__,__LINE__); if (!empty($order_by) AND in_array($order_by, array('lastname', 'firstname', 'username', 'email', 'official_code'))){
$order_by_sql = 'ORDER BY user.'.$order_by.' '.$direction;
} else {
$order_by_sql = '';
}
$sql = "SELECT user.user_id FROM $group_user_table group_rel_user, $table_user user
WHERE group_rel_user.group_id = '".Database::escape_string($group_id)."'
AND group_rel_user.user_id = user.user_id
$order_by_sql";
$res = api_sql_query($sql,__FILE__,__LINE__);
$users = array (); $users = array ();
while ($obj = Database::fetch_object($res)) { while ($obj = Database::fetch_object($res)) {
$users[] = $obj->user_id; $users[] = $obj->user_id;

3
main/messaging/email_editor.php
Unescape View File

@ -105,8 +105,7 @@ Display::display_header(get_lang('SendEmail'));
</form> </form>
</table> </table>
<? <?php
/* Footer */ /* Footer */
Display::display_footer(); Display::display_footer();
?> ?>

8
main/newscorm/lp_view.php
Unescape View File

@ -318,7 +318,7 @@ if($_SESSION['oLP']->mode == 'fullscreen') {
<!-- end media player layaout --> <!-- end media player layaout -->
<!-- toc layout --> <!-- toc layout -->
<div id="toc_id" name="toc_name" style="padding:0;margin-top:20px;height:60%;width:100%"> <div id="toc_id" name="toc_name" style="overflow: auto; padding:0;margin-top:20px;height:60%;width:100%">
<div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?> <div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?>
<!-- log message layout --> <!-- log message layout -->
@ -393,6 +393,8 @@ window.onload = function() {
rightZoneHeightOccupied = docHeight - initialRightZoneHeight; rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
updateContentHeight(); updateContentHeight();
viewportheight = window.innerHeight
document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
} }
window.onresize = updateContentHeight; window.onresize = updateContentHeight;
@ -508,7 +510,7 @@ window.onresize = updateContentHeight;
<!-- end media player layaout --> <!-- end media player layaout -->
<!-- toc layout --> <!-- toc layout -->
<div id="toc_id" name="toc_name" style="padding:0;margin-top:20px;height:60%;width:100%"> <div id="toc_id" name="toc_name" style="overflow: auto; padding:0;margin-top:20px;height:60%;width:100%">
<div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?> <div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?>
<?php if (!empty($_SESSION['oLP']->scorm_debug)) { //only show log ?> <?php if (!empty($_SESSION['oLP']->scorm_debug)) { //only show log ?>
@ -582,6 +584,8 @@ window.onload = function() {
leftZoneHeightOccupied = docHeight - initialLeftZoneHeight; leftZoneHeightOccupied = docHeight - initialLeftZoneHeight;
rightZoneHeightOccupied = docHeight - initialRightZoneHeight; rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
viewportheight = window.innerHeight
document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
updateContentHeight(); updateContentHeight();
} }

28
main/user/subscribe_user.php
Unescape View File

@ -41,10 +41,12 @@ include ('../inc/global.inc.php');
// the section (for the tabs) // the section (for the tabs)
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
// access restriction // access restriction
if (!api_is_allowed_to_edit()) { if (!api_is_allowed_to_edit()) {
api_not_allowed(true); api_not_allowed(true);
} }
// including additional libraries // including additional libraries
require_once (api_get_path(LIBRARY_PATH).'course.lib.php'); require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php'); require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php');
@ -228,7 +230,7 @@ function get_number_of_users() {
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'"; LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
// we change the SQL when we have a filter // we change the SQL when we have a filter
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -262,7 +264,7 @@ function get_number_of_users() {
} }
// when there is a keyword then we are searching and we have to change the SQL statement // when there is a keyword then we are searching and we have to change the SQL statement
if (isset ($_REQUEST['keyword'])) { if (isset ($_GET['keyword']) AND !empty($_GET['keyword'])) {
$keyword = Database::escape_string($_REQUEST['keyword']); $keyword = Database::escape_string($_REQUEST['keyword']);
$sql .= " AND (firstname LIKE '%".$keyword."%' OR lastname LIKE '%".$keyword."%' OR email LIKE '%".$keyword."%' OR username LIKE '%".$keyword."%' OR official_code LIKE '%".$keyword."%')"; $sql .= " AND (firstname LIKE '%".$keyword."%' OR lastname LIKE '%".$keyword."%' OR email LIKE '%".$keyword."%' OR username LIKE '%".$keyword."%' OR official_code LIKE '%".$keyword."%')";
@ -333,7 +335,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'"; LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){ if (isset($_GET['subscribe_user_filter_value']) !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -361,7 +363,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'"; LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -399,7 +401,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -431,7 +433,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'"; LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value'])){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -458,7 +460,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'"; LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value'])){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -495,7 +497,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -615,7 +617,7 @@ $sort_by_first_name = api_sort_by_first_name();
echo '<div class="actions">'; echo '<div class="actions">';
$actions .= '<a href="user.php">'.Display::return_icon('members.gif',get_lang('BackToUserList')).' '.get_lang('BackToUserList').'</a>'; $actions .= '<a href="user.php">'.Display::return_icon('members.gif',get_lang('BackToUserList')).' '.get_lang('BackToUserList').'</a>';
if ($_POST['keyword']) if ($_GET['keyword'] AND !empty($_GET['keyword']))
{ {
$actions .= '<a href="subscribe_user.php?type='.Security::remove_XSS($_GET['type']).'">'.Display::return_icon('clean_group.gif').' '.get_lang('ClearSearchResults').'</a>'; $actions .= '<a href="subscribe_user.php?type='.Security::remove_XSS($_GET['type']).'">'.Display::return_icon('clean_group.gif').' '.get_lang('ClearSearchResults').'</a>';
} }
@ -627,7 +629,7 @@ if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
display_extra_profile_fields_filter(); display_extra_profile_fields_filter();
} }
$form = new FormValidator('search_user', 'POST',api_get_self().'?type='.$_REQUEST['type'],'',null,false); $form = new FormValidator('search_user', 'GET',api_get_self().'?type='.$_REQUEST['type'],'',null,false);
$renderer = & $form->defaultRenderer(); $renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> '); $renderer->setElementTemplate('<span>{element}</span> ');
$form->add_textfield('keyword', '', false); $form->add_textfield('keyword', '', false);
@ -763,9 +765,3 @@ function display_extra_profile_fields_filter()
echo '</form>'; echo '</form>';
} }
function debug($var) {
echo '<pre>';
print_r($var);
echo '</pre>';
}
Write Preview
Loading…
Cancel
Save