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 r13933] Re-enabled edit by users if option selected in course settings - see FS#1907

Browse Source
skala
Yannick Warnier 18 years ago
parent 04b2043626
commit 65ad6e80de
2 changed files with 34 additions and 25 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. 51
      main/calendar/agenda.inc.php
  2. 8
      main/calendar/agenda.php

51
main/calendar/agenda.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id$
<?php //$Id: agenda.inc.php 13772 2007-11-26 02:54:27Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -541,25 +541,31 @@ function construct_not_selected_select_form($group_list=null, $user_list=null,$t
foreach($group_list as $this_group)
{
//api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]);
if (!in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
{
echo "\t\t<option value=\"GROUP:".$this_group['id']."\">",
"G: ",$this_group['name']," &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
"</option>\n";
if(is_array($to_already_selected))
{
if (!in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
{
echo "\t\t<option value=\"GROUP:".$this_group['id']."\">",
"G: ",$this_group['name']," &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
"</option>\n";
}
}
}
// a divider
echo "\t\t<option value=\"\">---------------------------------------------------------</option>\n";
echo "\t\t<option value=\"\">----------------------------------</option>\n";
}
// adding the individual users to the select form
foreach($user_list as $this_user)
{
if (!in_array("USER:".$this_user['uid'],$to_already_selected)) // $to_already_selected is the array containing the users (and groups) that are already selected
if(is_array($to_already_selected))
{
echo "\t\t<option value=\"USER:",$this_user['uid'],"\">",
"",$this_user['lastName']," ",$this_user['firstName'],
"</option>\n";
if (!in_array("USER:".$this_user['uid'],$to_already_selected)) // $to_already_selected is the array containing the users (and groups) that are already selected
{
echo "\t\t<option value=\"USER:",$this_user['uid'],"\">",
"",$this_user['lastName']," ",$this_user['firstName'],
"</option>\n";
}
}
}
echo "\t\t</select>\n";
@ -589,16 +595,19 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
// we construct the form of the already selected groups / users
echo "\t\t<select name=\"selectedform[]\" size=\"5\" multiple=\"multiple\" style=\"width:200px\">";
foreach($to_already_selected as $groupuser)
if(is_array($to_already_selected))
{
list($type,$id)=explode(":",$groupuser);
if ($type=="GROUP")
foreach($to_already_selected as $groupuser)
{
echo "\t\t<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>";
}
else
{
echo "\t\t<option value=\"".$groupuser."\">".$ref_array_users[$id]['lastName']." ".$ref_array_users[$id]['firstName']."</option>";
list($type,$id)=explode(":",$groupuser);
if ($type=="GROUP")
{
echo "\t\t<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>";
}
else
{
echo "\t\t<option value=\"".$groupuser."\">".$ref_array_users[$id]['lastName']." ".$ref_array_users[$id]['firstName']."</option>";
}
}
}
echo "</select>\n";
@ -1018,12 +1027,12 @@ function change_visibility($tool,$id)
if ($row['visibility']=='1')
{
$sql_visibility="UPDATE $TABLE_ITEM_PROPERTY SET visibility='0' WHERE tool='$tool' AND ref='$id'";
api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,"invisible");
api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,"invisible",api_get_user_id());
}
else
{
$sql_visibility="UPDATE $TABLE_ITEM_PROPERTY SET visibility='1' WHERE tool='$tool' AND ref='$id'";
api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,"visible");
api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,"visible",api_get_user_id());
}
}

8
main/calendar/agenda.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: agenda.php 13487 2007-10-16 18:27:53Z yannoo $
<?php //$Id: agenda.php 13933 2007-12-05 05:23:10Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -210,7 +210,7 @@ $tbl_session_course_user= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USE
ACCESS RIGHTS
============================================================================== */
// permission stuff - also used by loading from global in agenda.inc.php
$is_allowed_to_edit = is_allowed_to_edit();
$is_allowed_to_edit = is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_agenda');
/* ==============================================================================
TITLE
@ -255,7 +255,7 @@ if ($_GET['origin']!='learnpath')
display_minimonthcalendar($agenda_items, $select_month,$select_year, $MonthName);
// the links for adding, filtering, showall, ...
echo '<ul id="agenda_select">';
if (is_allowed_to_edit())
if (is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_agenda'))
{
display_courseadmin_links();
}
@ -273,7 +273,7 @@ $fck_attribute['ToolbarSet'] = 'Middle';
// THE RIGHT PART
echo "<td valign=\"top\">";
if (is_allowed_to_edit())
if (is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_agenda'))
{
switch ($_GET['action'])
{

Write Preview
Loading…
Cancel
Save