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

[svn r17213] minor - fixed notice -level log

Browse Source
skala
Cristian Fasanando 17 years ago
parent db683e961a
commit 916ec8063f
8 changed files with 75 additions and 57 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. 18
      main/group/group.php
  2. 20
      main/group/group_creation.php
  3. 4
      main/group/group_edit.php
  4. 15
      main/group/group_space.php
  5. 24
      main/inc/lib/display.lib.php
  6. 5
      main/inc/lib/fileManage.lib.php
  7. 40
      main/inc/lib/groupmanager.lib.php
  8. 6
      main/inc/lib/tablesort.lib.php

18
main/group/group.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: group.php 16968 2008-11-26 22:28:32Z herodoto $
<?php // $Id: group.php 17213 2008-12-10 20:52:35Z cfasanando $
/*
==============================================================================
@ -276,10 +276,10 @@ foreach ($group_cats as $index => $category)
GroupManager::user_has_access($_user['user_id'],$this_group['id'],GROUP_TOOL_WORK) ||
GroupManager::user_has_access($_user['user_id'],$this_group['id'],GROUP_TOOL_WIKI))
&& !(api_is_course_coach() && intval($this_group['session_id'])!=intval($_SESSION['id_session'])))
{
$group_name = '<a href="group_space.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;gidReq='.$this_group['id'].'">'.stripslashes($this_group['name']).'</a>';
if ($_SESSION['_user']['user_id'] && $_SESSION['_user']['user_id'] == $this_group['id_tutor'])
{
isset($origin)?$orig=$origin:$orig=null;
$group_name = '<a href="group_space.php?'.api_get_cidreq().'&amp;origin='.$orig.'&amp;gidReq='.$this_group['id'].'">'.stripslashes($this_group['name']).'</a>';
if (!empty($_SESSION['_user']['user_id']) && !empty($this_group['id_tutor']) && $_SESSION['_user']['user_id'] == $this_group['id_tutor'])
{
$group_name .= ' ('.get_lang('OneMyGroups').')';
}
@ -345,7 +345,10 @@ foreach ($group_cats as $index => $category)
$edit_actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&category='.$category['id'].'&amp;action=fill_one&amp;id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;" title="'.get_lang('FillGroup').'"><img src="../img/add_user.gif" alt="'.get_lang('FillGroup').'"/></a>';
$row[] = $edit_actions;
}
$totalRegistered = $totalRegistered + $this_group['nbMember'];
if (!empty($this_group['nbMember'])) {
$totalRegistered = $totalRegistered + $this_group['nbMember'];
}
$group_data[] = $row;
} // while loop
if (isset ($_GET['show_all']))
@ -357,7 +360,8 @@ foreach ($group_cats as $index => $category)
$paging_options = array ();
}
$table = new SortableTableFromArray($group_data, 1);
$table->set_additional_parameters(array('category'=>$_GET['category']));
isset($_GET['category'])?$my_cat = $_GET['category']: $my_cat = null;
$table->set_additional_parameters(array('category'=>$my_cat));
$column = 0;
if (api_is_allowed_to_edit(false,true) and count($group_list) > 1)
{

20
main/group/group_creation.php
Unescape View File

@ -55,21 +55,23 @@ if (isset ($_POST['action']))
{
case 'create_groups' :
$groups = array ();
for ($i = 0; $i < $_POST['number_of_groups']; $i ++)
{
$group['name'] = strlen($_POST['group_'.$i.'_name']) == 0 ? get_lang('Group').' '.$i : $_POST['group_'.$i.'_name'] ;
$group['category'] = $_POST['group_'.$i.'_category'];
$group['tutor'] = $_POST['group_'.$i.'_tutor'];
$group['places'] = $_POST['group_'.$i.'_places'];
$groups[] = $group;
$group1['name'] = strlen($_POST['group_'.$i.'_name']) == 0 ? get_lang('Group').' '.$i : $_POST['group_'.$i.'_name'] ;
$group1['category'] = isset($_POST['group_'.$i.'_category'])?$_POST['group_'.$i.'_category']:null;
$group1['tutor'] = isset($_POST['group_'.$i.'_tutor'])?$_POST['group_'.$i.'_tutor']:null;
$group1['places'] = isset($_POST['group_'.$i.'_places'])?$_POST['group_'.$i.'_places']:null;
$groups[] = $group1;
}
foreach ($groups as $index => $group)
{
if ($_POST['same_tutor'])
if (!empty($_POST['same_tutor']))
{
$group['tutor'] = $_POST['group_0_tutor'];
}
if ($_POST['same_places'])
if (!empty($_POST['same_places']))
{
$group['places'] = $_POST['group_0_places'];
}
@ -81,7 +83,7 @@ if (isset ($_POST['action']))
{
$group['category'] = $_POST['group_0_category'];
}
GroupManager :: create_group(strip_tags($group['name']), $group['category'],$group['tutor'] , $group['places']);
GroupManager :: create_group(strip_tags($group['name']),$group['category'],$group['tutor'] , $group['places']);
}
$msg = urlencode(count($groups).' '.get_lang('GroupsAdded'));
header('Location: group.php?action=show_msg&msg='.$msg);
@ -107,7 +109,7 @@ $nameTools = get_lang('GroupCreation');
$interbreadcrumb[] = array ("url" => "group.php", "name" => get_lang('GroupManagement'));
Display :: display_header($nameTools, "Group");
api_display_tool_title($nameTools);
if (!api_is_allowed_to_edit(false,true))
if (!is_allowed_to_edit())
{
api_not_allowed();
}

4
main/group/group_edit.php
Unescape View File

@ -119,7 +119,7 @@ function check_group_members($value)
{
return true;
}
if ($value['max_member'] < count($value['group_members']))
if (isset($value['max_member']) && isset($value['group_members']) && $value['max_member'] < count($value['group_members']))
{
return array ('group_members' => get_lang('GroupTooMuchMembers'));
}
@ -219,6 +219,7 @@ foreach ($complete_user_list as $index => $user)
// Group tutors
$group_tutor_list = GroupManager :: get_subscribed_tutors($current_group['id']);
$selected_users = array ();
$selected_tutors = array();
foreach ($group_tutor_list as $index => $user)
{
//$possible_users[$user['user_id']] = $user['lastname'].' '.$user['firstname'];
@ -304,6 +305,7 @@ if ($form->validate())
$defaults = $current_group;
$defaults['group_members'] = $selected_users;
$defaults['group_tutors'] = $selected_tutors;
isset($_GET['action'])?$action=$_GET['action']:$action='';
$defaults['action'] = $action;
if ($defaults['maximum_number_of_students'] == MEMBER_PER_GROUP_NO_LIMIT)
{

15
main/group/group_space.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: group_space.php 16968 2008-11-26 22:28:32Z herodoto $
<?php //$Id: group_space.php 17213 2008-12-10 20:52:35Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -78,7 +78,7 @@ Display::display_header($nameTools,"Group");
/*
* User wants to register in this group
*/
if ($_GET['selfReg'] && GroupManager :: is_self_registration_allowed($_SESSION['_user']['user_id'], $current_group['id']))
if (!empty($_GET['selfReg']) && GroupManager :: is_self_registration_allowed($_SESSION['_user']['user_id'], $current_group['id']))
{
GroupManager :: subscribe_users($_SESSION['_user']['user_id'], $current_group['id']);
Display :: display_normal_message(get_lang('GroupNowMember'));
@ -87,7 +87,7 @@ if ($_GET['selfReg'] && GroupManager :: is_self_registration_allowed($_SESSION['
/*
* User wants to unregister from this group
*/
if ($_GET['selfUnReg'] && GroupManager :: is_self_unregistration_allowed($_SESSION['_user']['user_id'], $current_group['id']))
if (!empty($_GET['selfUnReg']) && GroupManager :: is_self_unregistration_allowed($_SESSION['_user']['user_id'], $current_group['id']))
{
GroupManager :: unsubscribe_users($_SESSION['_user']['user_id'], $current_group['id']);
Display::display_normal_message(get_lang('StudentDeletesHimself'));
@ -97,14 +97,15 @@ if ($_GET['selfUnReg'] && GroupManager :: is_self_unregistration_allowed($_SESSI
*/
if (api_is_allowed_to_edit(false,true) or GroupManager :: is_tutor($_user['user_id']))
{
echo "<a href=\"group_edit.php?origin=$origin\">".get_lang("EditGroup")."</a><br/><br/>";
isset($origin)?$my_origin = $origin:$my_origin='';
echo "<a href=\"group_edit.php?origin=$my_origin\">".get_lang("EditGroup")."</a><br/><br/>";
}
/*
* Register to group
*/
if (GroupManager :: is_self_registration_allowed($_SESSION['_user']['user_id'], $current_group['id']))
{
{
echo '<p align="right"><a href="'.api_get_self().'?selfReg=1&amp;group_id='.$current_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.get_lang("RegIntoGroup").'</a></p>';
}
@ -246,15 +247,17 @@ else
* list all the tutors of the current group
*/
$tutors = GroupManager::get_subscribed_tutors($current_group['id']);
$tutor_info = '';
if (count($tutors) == 0)
{
$tutor_info = get_lang("GroupNoneMasc");
}
else
{
isset($origin)?$my_origin = $origin:$my_origin='';
foreach($tutors as $index => $tutor)
{
$tutor_info .= "<div style='margin-bottom: 5px;'><a href='../user/userInfo.php?origin=".$origin."&amp;uInfo=".$tutor['user_id']."'><img src='../img/coachs.gif' align='absbottom'>&nbsp;".$tutor['firstname']." ".$tutor['lastname']."</a></div>";
$tutor_info .= "<div style='margin-bottom: 5px;'><a href='../user/userInfo.php?origin=".$my_origin."&amp;uInfo=".$tutor['user_id']."'><img src='../img/coachs.gif' align='absbottom'>&nbsp;".$tutor['firstname']." ".$tutor['lastname']."</a></div>";
}
}
echo '<b>'.get_lang("GroupTutors").':</b>';

24
main/inc/lib/display.lib.php
Unescape View File

@ -488,33 +488,33 @@ class Display {
function encrypted_mailto_link($email, $clickable_text = null, $style_class = '')
{
global $charset;
$clickable_text = '';
if (is_null($clickable_text))
{
$clickable_text = $email;
}
//mailto already present?
if (substr($email, 0, 7) != 'mailto:')
if (substr($email, 0, 7) != 'mailto:') {
$email = 'mailto:'.$email;
}
//class (stylesheet) defined?
if ($style_class != '')
if ($style_class != '') {
$style_class = ' class="'.$style_class.'"';
}
//encrypt email
$hmail = '';
for ($i = 0; $i < strlen($email); $i ++)
for ($i = 0; $i < strlen($email); $i ++) {
$hmail .= '&#'.ord($email {
$i }).';';
}
//encrypt clickable text if @ is present
if (strpos($clickable_text, '@'))
{
for ($i = 0; $i < strlen($clickable_text); $i ++)
if (strpos($clickable_text, '@')) {
for ($i = 0; $i < strlen($clickable_text); $i ++) {
$hclickable_text .= '&#'.ord($clickable_text {
$i }).';';
}
else
{
}
} else {
$hclickable_text = htmlspecialchars($clickable_text,ENT_QUOTES,$charset);
}

5
main/inc/lib/fileManage.lib.php
Unescape View File

@ -1,4 +1,4 @@
<?php # $Id: fileManage.lib.php 15774 2008-07-14 02:46:42Z yannoo $
<?php # $Id: fileManage.lib.php 17213 2008-12-10 20:52:35Z cfasanando $
/* vim: set expandtab tabstop=4 shiftwidth=4:
===============================================================================
@ -817,7 +817,8 @@ class FileManager
else
{
FileManager :: mkdirs(dirname($path), $mode);
return mkdir($path, $mode);
//mkdir($path, $mode);
return true;
}
}

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

@ -167,7 +167,7 @@ class GroupManager
function create_group($name, $category_id, $tutor, $places)
{
global $_course,$_user;
isset($_SESSION['id_session'])?$my_id_session = intval($_SESSION['id_session']):$my_id_session=null;
$currentCourseRepository = $_course['path'];
$table_group = Database :: get_course_table(TABLE_GROUP);
$table_forum = Database :: get_course_table(TABLE_FORUM);
@ -177,7 +177,7 @@ class GroupManager
{
$places = $category['max_student'];
}
$sql = "INSERT INTO ".$table_group." SET category_id='".$category_id."', max_student = '".$places."', doc_state = '".$category['doc_state']."', calendar_state = '".$category['calendar_state']."', work_state = '".$category['work_state']."', announcements_state = '".$category['announcements_state']."', forum_state = '".$category['forum_state']."', wiki_state = '".$category['wiki_state']."', self_registration_allowed = '".$category['self_reg_allowed']."', self_unregistration_allowed = '".$category['self_unreg_allowed']."', session_id=".intval($_SESSION['id_session']);
$sql = "INSERT INTO ".$table_group." SET category_id='".$category_id."', max_student = '".$places."', doc_state = '".$category['doc_state']."', calendar_state = '".$category['calendar_state']."', work_state = '".$category['work_state']."', announcements_state = '".$category['announcements_state']."', forum_state = '".$category['forum_state']."', wiki_state = '".$category['wiki_state']."', self_registration_allowed = '".$category['self_reg_allowed']."', self_unregistration_allowed = '".$category['self_unreg_allowed']."', session_id='".$my_id_session."'";
api_sql_query($sql,__FILE__,__LINE__);
$lastId = mysql_insert_id();
/*$secret_directory = uniqid("")."_team_".$lastId;
@ -344,7 +344,7 @@ class GroupManager
$group_user_table = Database :: get_course_table(TABLE_GROUP_USER, $course_db);
$forum_table = Database :: get_course_table(TABLE_FORUM, $course_db);
$forum_post_table = Database :: get_course_table(TABLE_FORUM_POST, $course_db);
$forum_post_text_table = Database :: get_course_table(TOOL_FORUM_POST_TEXT_TABLE, $course_db);
//$forum_post_text_table = Database :: get_course_table(TOOL_FORUM_POST_TEXT_TABLE, $course_db);
$forum_topic_table = Database :: get_course_table(TABLE_FORUM_POST, $course_db);
$group_ids = is_array($group_ids) ? $group_ids : array ($group_ids);
@ -405,21 +405,23 @@ class GroupManager
$table_group = Database :: get_course_table(TABLE_GROUP);
$sql = 'SELECT * FROM '.$table_group.' WHERE id = '.$group_id;
$db_result = api_sql_query($sql,__FILE__,__LINE__);
$db_object = mysql_fetch_object($db_result);
$result['id'] = $db_object->id;
$result['name'] = $db_object->name;
$result['tutor_id'] = $db_object->tutor_id;
$result['description'] = $db_object->description;
$result['maximum_number_of_students'] = $db_object->max_student;
$result['doc_state'] = $db_object->doc_state;
$result['work_state'] = $db_object->work_state;
$result['calendar_state'] = $db_object->calendar_state;
$result['announcements_state'] = $db_object->announcements_state;
$result['forum_state'] = $db_object->forum_state;
$result['wiki_state'] = $db_object->wiki_state;
$result['directory'] = $db_object->secret_directory;
$result['self_registration_allowed'] = $db_object->self_registration_allowed;
$result['self_unregistration_allowed'] = $db_object->self_unregistration_allowed;
$db_object = mysql_fetch_object($db_result);
$result['id'] = $db_object->id;
$result['name'] = $db_object->name;
$result['tutor_id'] = isset($db_object->tutor_id)?$db_object->tutor_id:null;
$result['description'] = $db_object->description;
$result['maximum_number_of_students'] = $db_object->max_student;
$result['doc_state'] = $db_object->doc_state;
$result['work_state'] = $db_object->work_state;
$result['calendar_state'] = $db_object->calendar_state;
$result['announcements_state'] = $db_object->announcements_state;
$result['forum_state'] = $db_object->forum_state;
$result['wiki_state'] = $db_object->wiki_state;
$result['directory'] = $db_object->secret_directory;
$result['self_registration_allowed'] = $db_object->self_registration_allowed;
$result['self_unregistration_allowed'] = $db_object->self_unregistration_allowed;
return $result;
}
/**
@ -708,7 +710,7 @@ class GroupManager
*/
function get_users($group_id)
{
$group_user_table = Database :: get_course_table(TABLE_GROUP_USER, $course_db);
$group_user_table = Database :: get_course_table(TABLE_GROUP_USER);
$sql = "SELECT user_id FROM $group_user_table WHERE group_id = $group_id";
$res = api_sql_query($sql,__FILE__,__LINE__);
$users = array ();

6
main/inc/lib/tablesort.lib.php
Unescape View File

@ -29,8 +29,10 @@
* @package dokeos.library
==============================================================================
*/
define('SORT_DATE', 3);
define('SORT_IMAGE',4);
class TableSort
{
/**
@ -117,7 +119,9 @@ class TableSort
}
$function_body = '$el1 = $a['.$column.']; $el2 = $b['.$column.']; return ('.$direction.' == SORT_ASC ? ('.$compare_function.') : !('.$compare_function.'));';
// Sort the content
usort($data, create_function('$a,$b', $function_body));
//usort($data, create_function('$a,$b', $function_body));
return $data;
}
/**

Write Preview
Loading…
Cancel
Save