Minor - flint fixes

pull/2495/head
jmontoyaa 8 years ago
parent c056499ecf
commit f958b79f26
  1. 2
      main/course_description/index.php
  2. 2
      main/document/document.php
  3. 2
      main/document/edit_document.php
  4. 2
      main/document/upload.php
  5. 1
      main/gradebook/certificate_report.php
  6. 2
      main/inc/ajax/document.ajax.php
  7. 4
      main/inc/lib/AnnouncementEmail.php
  8. 2
      main/inc/lib/AnnouncementManager.php
  9. 2
      main/inc/lib/groupmanager.lib.php
  10. 1
      main/mySpace/index.php
  11. 1
      main/mySpace/teachers.php
  12. 16
      src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php
  13. 2
      src/Chamilo/CourseBundle/Entity/CGroupInfo.php

@ -79,7 +79,7 @@ $course_description_controller = new CourseDescriptionController();
if (in_array($action, ['add', 'edit', 'delete']) && if (in_array($action, ['add', 'edit', 'delete']) &&
!api_is_allowed_to_edit(null, true) !api_is_allowed_to_edit(null, true)
) { ) {
api_not_allowed(true); api_not_allowed(true);
} }
// Actions to controller // Actions to controller

@ -200,7 +200,7 @@ if (!empty($groupId)) {
} }
// Group mode // Group mode
if (!GroupManager::allowUploadEditDocument($userId , $courseId, $group_properties)) { if (!GroupManager::allowUploadEditDocument($userId, $courseId, $group_properties)) {
$groupMemberWithUploadRights = false; $groupMemberWithUploadRights = false;
} }
Session::write('group_member_with_upload_rights', $groupMemberWithUploadRights); Session::write('group_member_with_upload_rights', $groupMemberWithUploadRights);

@ -62,7 +62,7 @@ $sessionId = api_get_session_id();
if (api_is_in_group()) { if (api_is_in_group()) {
$group_properties = GroupManager::get_group_properties($group_id); $group_properties = GroupManager::get_group_properties($group_id);
GroupManager::allowUploadEditDocument(api_get_user_id() , api_get_course_int_id(), $group_properties, true); GroupManager::allowUploadEditDocument(api_get_user_id(), api_get_course_int_id(), $group_properties, true);
} }
$dir = '/'; $dir = '/';

@ -121,7 +121,7 @@ if (!empty($groupId)) {
api_not_allowed(true); api_not_allowed(true);
} }
GroupManager::allowUploadEditDocument(api_get_user_id() , api_get_course_int_id(), $group_properties, true); GroupManager::allowUploadEditDocument(api_get_user_id(), api_get_course_int_id(), $group_properties, true);
} elseif ($is_allowed_to_edit || } elseif ($is_allowed_to_edit ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $path, api_get_session_id())) { DocumentManager::is_my_shared_folder(api_get_user_id(), $path, api_get_session_id())) {
} else { } else {

@ -22,7 +22,6 @@ if (!$is_allowedToTrack) {
api_not_allowed(true); api_not_allowed(true);
} }
$this_section = SECTION_TRACKING; $this_section = SECTION_TRACKING;
$interbreadcrumb[] = [ $interbreadcrumb[] = [

@ -40,7 +40,7 @@ switch ($action) {
$groupInfo = GroupManager::get_group_properties(api_get_group_id()); $groupInfo = GroupManager::get_group_properties(api_get_group_id());
// Only course admin or group members allowed // Only course admin or group members allowed
if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), $groupInfo)) { if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), $groupInfo)) {
if (!GroupManager::allowUploadEditDocument(api_get_user_id() , api_get_course_int_id(), $groupInfo)) { if (!GroupManager::allowUploadEditDocument(api_get_user_id(), api_get_course_int_id(), $groupInfo)) {
exit; exit;
} }
} else { } else {

@ -278,8 +278,8 @@ class AnnouncementEmail
* Send emails to users. * Send emails to users.
* *
* @param bool $sendToUsersInSession * @param bool $sendToUsersInSession
* @param bool $sendToDrhUsers send a copy of the message to the DRH users * @param bool $sendToDrhUsers send a copy of the message to the DRH users
* @param int $senderId related to the main user * @param int $senderId related to the main user
*/ */
public function send($sendToUsersInSession = false, $sendToDrhUsers = false, $senderId = 0) public function send($sendToUsersInSession = false, $sendToDrhUsers = false, $senderId = 0)
{ {

@ -1449,7 +1449,7 @@ class AnnouncementManager
* @param bool $sendToUsersInSession * @param bool $sendToUsersInSession
* @param bool $sendToDrhUsers * @param bool $sendToDrhUsers
* @param Monolog\Handler\HandlerInterface logger * @param Monolog\Handler\HandlerInterface logger
* @param int $senderId * @param int $senderId
*/ */
public static function sendEmail( public static function sendEmail(
$courseInfo, $courseInfo,

@ -673,7 +673,6 @@ class GroupManager
WHERE c_id = $course_id AND id=".$group_id; WHERE c_id = $course_id AND id=".$group_id;
$result = Database::query($sql); $result = Database::query($sql);
/* Here we are updating a field in the table forum_forum that perhaps /* Here we are updating a field in the table forum_forum that perhaps
duplicates the table group_info.forum_state cvargas*/ duplicates the table group_info.forum_state cvargas*/
$forum_state = (int) $forum_state; $forum_state = (int) $forum_state;
@ -2990,6 +2989,7 @@ class GroupManager
if ($blockPage) { if ($blockPage) {
api_not_allowed(true); api_not_allowed(true);
} }
return false; return false;
} }

@ -36,7 +36,6 @@ $is_session_admin = api_is_session_admin();
$title = ''; $title = '';
$skipData = api_get_configuration_value('tracking_skip_generic_data'); $skipData = api_get_configuration_value('tracking_skip_generic_data');
// Access control // Access control
api_block_anonymous_users(); api_block_anonymous_users();

@ -18,7 +18,6 @@ if (!$allowToTrack) {
api_not_allowed(true); api_not_allowed(true);
} }
$export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false; $export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null; $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$active = isset($_GET['active']) ? intval($_GET['active']) : 1; $active = isset($_GET['active']) ? intval($_GET['active']) : 1;

@ -4,10 +4,10 @@
namespace Chamilo\CoreBundle\Entity\Repository; namespace Chamilo\CoreBundle\Entity\Repository;
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\UserBundle\Entity\Group;
use Chamilo\UserBundle\Entity\User;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CourseBundle\Entity\CItemProperty; use Chamilo\CourseBundle\Entity\CItemProperty;
use Chamilo\UserBundle\Entity\Group;
use Chamilo\UserBundle\Entity\User;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
/** /**
@ -18,7 +18,7 @@ class ItemPropertyRepository extends EntityRepository
/** /**
* Get users subscribed to a item LP, Document, etc (item_property). * Get users subscribed to a item LP, Document, etc (item_property).
* *
* @param string $tool learnpath | document | etc * @param string $tool learnpath | document | etc
* @param int $itemId * @param int $itemId
* @param Course $course * @param Course $course
* @param Session $session * @param Session $session
@ -48,7 +48,7 @@ class ItemPropertyRepository extends EntityRepository
/** /**
* Get Groups subscribed to a item: LP, Doc, etc. * Get Groups subscribed to a item: LP, Doc, etc.
* *
* @param string $tool learnpath | document | etc * @param string $tool learnpath | document | etc
* @param int $itemId * @param int $itemId
* @param Course $course * @param Course $course
* @param Session $session * @param Session $session
@ -77,7 +77,7 @@ class ItemPropertyRepository extends EntityRepository
* Subscribe groups to a LP, doc (itemproperty). * Subscribe groups to a LP, doc (itemproperty).
* *
* @param User $currentUser * @param User $currentUser
* @param string $tool learnpath | document | etc * @param string $tool learnpath | document | etc
* @param Course $course * @param Course $course
* @param Session $session * @param Session $session
* @param int $itemId * @param int $itemId
@ -277,11 +277,11 @@ class ItemPropertyRepository extends EntityRepository
/** /**
* Unsubscribe users to item. * Unsubscribe users to item.
* *
* @param string $tool * @param string $tool
* @param Course $course * @param Course $course
* @param Session $session * @param Session $session
* @param int $itemId * @param int $itemId
* @param array $usersToDelete * @param array $usersToDelete
*/ */
public function unsubcribeUsersToItem( public function unsubcribeUsersToItem(
$tool, $tool,

@ -155,7 +155,7 @@ class CGroupInfo
private $sessionId; private $sessionId;
/** /**
* @var int needed for setting $_configuration['group_document_access'] * @var int needed for setting['group_document_access']
* *
* ORM\Column(name="doc_access", type="integer", nullable=false, options={"default":0}) * ORM\Column(name="doc_access", type="integer", nullable=false, options={"default":0})
*/ */

Loading…
Cancel
Save