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 r9982] replace $_uid with $_user['user_id']

Browse Source
skala
Patrick Cool 19 years ago
parent 8a5e4ab91a
commit 04b7fd5d07
2 changed files with 22 additions and 22 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. 24
      main/announcements/announcements.inc.php
  2. 20
      main/announcements/announcements.php

24
main/announcements/announcements.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: announcements.inc.php 9246 2006-09-25 13:24:53Z bmol $ <?php //$Id: announcements.inc.php 9982 2006-11-15 00:08:08Z pcool $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -40,18 +40,18 @@
*/ */
function display_announcement($announcement_id) function display_announcement($announcement_id)
{ {
global $_uid, $dateFormatLong; global $_user, $dateFormatLong;
$tbl_announcement = Database::get_course_table('announcement'); $tbl_announcement = Database::get_course_table('announcement');
$tbl_item_property = Database::get_course_table('item_property'); $tbl_item_property = Database::get_course_table('item_property');
if ($_uid) if ($_user['user_id'])
{ {
$sql_query = " SELECT announcement.*, toolitemproperties.* $sql_query = " SELECT announcement.*, toolitemproperties.*
FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
WHERE announcement.id = toolitemproperties.ref WHERE announcement.id = toolitemproperties.ref
AND announcement.id = '$announcement_id' AND announcement.id = '$announcement_id'
AND toolitemproperties.tool='announcement' AND toolitemproperties.tool='announcement'
AND (toolitemproperties.to_user_id=$_uid OR toolitemproperties.to_group_id='0') AND (toolitemproperties.to_user_id='".$_user['user_id']."' OR toolitemproperties.to_group_id='0')
AND toolitemproperties.visibility='1' AND toolitemproperties.visibility='1'
ORDER BY display_order DESC"; ORDER BY display_order DESC";
@ -592,7 +592,7 @@ function store_advalvas_item($emailTitle,$newContent, $order, $to)
global $_course; global $_course;
global $nameTools; global $nameTools;
global $_uid; global $_user;
global $tbl_announcement; global $tbl_announcement;
global $tbl_item_property; global $tbl_item_property;
@ -611,7 +611,7 @@ function store_advalvas_item($emailTitle,$newContent, $order, $to)
{ {
foreach ($send_to['groups'] as $group) foreach ($send_to['groups'] as $group)
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_uid, $group); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], $group);
} }
} }
@ -620,13 +620,13 @@ function store_advalvas_item($emailTitle,$newContent, $order, $to)
{ {
foreach ($send_to['users'] as $user) foreach ($send_to['users'] as $user)
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_uid, '', $user); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], '', $user);
} }
} }
} }
else // the message is sent to everyone, so we set the group to 0 else // the message is sent to everyone, so we set the group to 0
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_uid, '0'); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], '0');
} }
return $last_id; return $last_id;
@ -645,7 +645,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to)
{ {
global $_course; global $_course;
global $nameTools; global $nameTools;
global $_uid; global $_user;
global $tbl_announcement; global $tbl_announcement;
global $tbl_item_property; global $tbl_item_property;
@ -668,7 +668,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to)
{ {
foreach ($send_to['groups'] as $group) foreach ($send_to['groups'] as $group)
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_uid, $group); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], $group);
} }
} }
// storing the selected users // storing the selected users
@ -676,13 +676,13 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to)
{ {
foreach ($send_to['users'] as $user) foreach ($send_to['users'] as $user)
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_uid, '', $user); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], '', $user);
} }
} }
} }
else // the message is sent to everyone, so we set the group to 0 else // the message is sent to everyone, so we set the group to 0
{ {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_uid, '0'); api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], '0');
} }
} }

20
main/announcements/announcements.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: announcements.php 9654 2006-10-24 08:24:19Z bmol $ <?php //$Id: announcements.php 9982 2006-11-15 00:08:08Z pcool $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -860,7 +860,7 @@ if ($_GET['origin'] !== 'learnpath')
{ {
if ($_GET['origin'] !== 'learnpath') if ($_GET['origin'] !== 'learnpath')
{ {
$group_memberships=GroupManager::get_group_ids($_course['dbName'], $_uid); $group_memberships=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
// the user is member of several groups => display personal announcements AND his group announcements AND the general announcements // the user is member of several groups => display personal announcements AND his group announcements AND the general announcements
if (is_array($group_memberships)) if (is_array($group_memberships))
@ -871,7 +871,7 @@ if ($_GET['origin'] !== 'learnpath')
WHERE announcement.id = toolitemproperties.ref WHERE announcement.id = toolitemproperties.ref
AND toolitemproperties.tool='announcement' AND toolitemproperties.tool='announcement'
AND toolitemproperties.visibility='1' AND toolitemproperties.visibility='1'
AND ( toolitemproperties.to_user_id=$_uid " . AND ( toolitemproperties.to_user_id='".$_user['user_id']."'" .
"OR toolitemproperties.to_group_id IN (0, ".implode(", ", $group_memberships).") ) "OR toolitemproperties.to_group_id IN (0, ".implode(", ", $group_memberships).") )
GROUP BY toolitemproperties.ref GROUP BY toolitemproperties.ref
ORDER BY display_order DESC ORDER BY display_order DESC
@ -881,7 +881,7 @@ if ($_GET['origin'] !== 'learnpath')
else else
{ {
// this is an identified user => show the general announcements AND his personal announcements // this is an identified user => show the general announcements AND his personal announcements
if ($_uid) if ($_user['user_id'])
{ {
$sql="SELECT $sql="SELECT
announcement.*, toolitemproperties.* announcement.*, toolitemproperties.*
@ -889,7 +889,7 @@ if ($_GET['origin'] !== 'learnpath')
WHERE announcement.id = toolitemproperties.ref WHERE announcement.id = toolitemproperties.ref
AND toolitemproperties.tool='announcement' AND toolitemproperties.tool='announcement'
AND toolitemproperties.visibility='1' AND toolitemproperties.visibility='1'
AND ( toolitemproperties.to_user_id=$_uid OR toolitemproperties.to_group_id='0') AND ( toolitemproperties.to_user_id='".$_user['user_id']."' OR toolitemproperties.to_group_id='0')
GROUP BY toolitemproperties.ref GROUP BY toolitemproperties.ref
ORDER BY display_order DESC ORDER BY display_order DESC
LIMIT 0,$maximum"; LIMIT 0,$maximum";
@ -1105,7 +1105,7 @@ if ($message == true)
if ($display_announcement_list && !$surveyid) if ($display_announcement_list && !$surveyid)
{ {
// by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter // by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter
$user_id=$_uid; $user_id=$_user['user_id'];
if ($_SESSION['user']!==null) if ($_SESSION['user']!==null)
{ {
$user_id=$_SESSION['user']; $user_id=$_SESSION['user'];
@ -1115,8 +1115,8 @@ if ($message == true)
$group_id=$_SESSION['group']; $group_id=$_SESSION['group'];
} }
//$group_memberships=GroupManager::get_group_ids($_course['dbName'], $_uid); //$group_memberships=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
$group_memberships=GroupManager::get_group_ids($_course['dbName'],$_uid); $group_memberships=GroupManager::get_group_ids($_course['dbName'],$_user['user_id']);
if (api_is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_announcement')) if (api_is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_announcement'))
{ {
@ -1217,14 +1217,14 @@ if ($message == true)
} }
else else
{ {
if ($_uid) if ($_user['user_id'])
{ {
$sql="SELECT $sql="SELECT
announcement.*, toolitemproperties.* announcement.*, toolitemproperties.*
FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
WHERE announcement.id = toolitemproperties.ref WHERE announcement.id = toolitemproperties.ref
AND toolitemproperties.tool='announcement' AND toolitemproperties.tool='announcement'
AND (toolitemproperties.to_user_id=$_uid OR toolitemproperties.to_group_id='0') AND (toolitemproperties.to_user_id='".$_user['user_id']."' OR toolitemproperties.to_group_id='0')
AND toolitemproperties.visibility='1' AND toolitemproperties.visibility='1'
ORDER BY display_order DESC"; ORDER BY display_order DESC";

Write Preview
Loading…
Cancel
Save