diff --git a/main/course_description/index.php b/main/course_description/index.php index 1f16a8ce41..87c06b16ad 100755 --- a/main/course_description/index.php +++ b/main/course_description/index.php @@ -79,7 +79,7 @@ $course_description_controller = new CourseDescriptionController(); if (in_array($action, ['add', 'edit', 'delete']) && !api_is_allowed_to_edit(null, true) ) { - api_not_allowed(true); + api_not_allowed(true); } // Actions to controller diff --git a/main/document/document.php b/main/document/document.php index 359c3f56af..f2c7b1c504 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -200,7 +200,7 @@ if (!empty($groupId)) { } // Group mode - if (!GroupManager::allowUploadEditDocument($userId , $courseId, $group_properties)) { + if (!GroupManager::allowUploadEditDocument($userId, $courseId, $group_properties)) { $groupMemberWithUploadRights = false; } Session::write('group_member_with_upload_rights', $groupMemberWithUploadRights); diff --git a/main/document/edit_document.php b/main/document/edit_document.php index 6fa6434a9a..9eaf093568 100755 --- a/main/document/edit_document.php +++ b/main/document/edit_document.php @@ -62,7 +62,7 @@ $sessionId = api_get_session_id(); if (api_is_in_group()) { $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 = '/'; diff --git a/main/document/upload.php b/main/document/upload.php index ed99ce7da9..74b6d2cc39 100755 --- a/main/document/upload.php +++ b/main/document/upload.php @@ -121,7 +121,7 @@ if (!empty($groupId)) { 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 || DocumentManager::is_my_shared_folder(api_get_user_id(), $path, api_get_session_id())) { } else { diff --git a/main/gradebook/certificate_report.php b/main/gradebook/certificate_report.php index 0c961bc6a3..547ac8897f 100644 --- a/main/gradebook/certificate_report.php +++ b/main/gradebook/certificate_report.php @@ -22,7 +22,6 @@ if (!$is_allowedToTrack) { api_not_allowed(true); } - $this_section = SECTION_TRACKING; $interbreadcrumb[] = [ diff --git a/main/inc/ajax/document.ajax.php b/main/inc/ajax/document.ajax.php index 1fce5191ba..f24941e650 100755 --- a/main/inc/ajax/document.ajax.php +++ b/main/inc/ajax/document.ajax.php @@ -40,7 +40,7 @@ switch ($action) { $groupInfo = GroupManager::get_group_properties(api_get_group_id()); // Only course admin or group members allowed 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; } } else { diff --git a/main/inc/lib/AnnouncementEmail.php b/main/inc/lib/AnnouncementEmail.php index 312099e6ff..ddc94d6dff 100644 --- a/main/inc/lib/AnnouncementEmail.php +++ b/main/inc/lib/AnnouncementEmail.php @@ -278,8 +278,8 @@ class AnnouncementEmail * Send emails to users. * * @param bool $sendToUsersInSession - * @param bool $sendToDrhUsers send a copy of the message to the DRH users - * @param int $senderId related to the main user + * @param bool $sendToDrhUsers send a copy of the message to the DRH users + * @param int $senderId related to the main user */ public function send($sendToUsersInSession = false, $sendToDrhUsers = false, $senderId = 0) { diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php index b5eebeb09f..20f5f38057 100755 --- a/main/inc/lib/AnnouncementManager.php +++ b/main/inc/lib/AnnouncementManager.php @@ -1449,7 +1449,7 @@ class AnnouncementManager * @param bool $sendToUsersInSession * @param bool $sendToDrhUsers * @param Monolog\Handler\HandlerInterface logger - * @param int $senderId + * @param int $senderId */ public static function sendEmail( $courseInfo, diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php index d23fdf416c..c58f16e1cb 100755 --- a/main/inc/lib/groupmanager.lib.php +++ b/main/inc/lib/groupmanager.lib.php @@ -673,7 +673,6 @@ class GroupManager WHERE c_id = $course_id AND id=".$group_id; $result = Database::query($sql); - /* Here we are updating a field in the table forum_forum that perhaps duplicates the table group_info.forum_state cvargas*/ $forum_state = (int) $forum_state; @@ -2990,6 +2989,7 @@ class GroupManager if ($blockPage) { api_not_allowed(true); } + return false; } diff --git a/main/mySpace/index.php b/main/mySpace/index.php index 6e88e7a331..8c6ce0c603 100755 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -36,7 +36,6 @@ $is_session_admin = api_is_session_admin(); $title = ''; $skipData = api_get_configuration_value('tracking_skip_generic_data'); - // Access control api_block_anonymous_users(); diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php index 044e721da4..c2b44fdc8b 100755 --- a/main/mySpace/teachers.php +++ b/main/mySpace/teachers.php @@ -18,7 +18,6 @@ if (!$allowToTrack) { api_not_allowed(true); } - $export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false; $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null; $active = isset($_GET['active']) ? intval($_GET['active']) : 1; diff --git a/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php index 6e3114b260..f4ffbcf986 100644 --- a/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php +++ b/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php @@ -4,10 +4,10 @@ namespace Chamilo\CoreBundle\Entity\Repository; use Chamilo\CoreBundle\Entity\Course; -use Chamilo\UserBundle\Entity\Group; -use Chamilo\UserBundle\Entity\User; use Chamilo\CoreBundle\Entity\Session; use Chamilo\CourseBundle\Entity\CItemProperty; +use Chamilo\UserBundle\Entity\Group; +use Chamilo\UserBundle\Entity\User; use Doctrine\ORM\EntityRepository; /** @@ -18,7 +18,7 @@ class ItemPropertyRepository extends EntityRepository /** * 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 Course $course * @param Session $session @@ -48,7 +48,7 @@ class ItemPropertyRepository extends EntityRepository /** * 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 Course $course * @param Session $session @@ -77,7 +77,7 @@ class ItemPropertyRepository extends EntityRepository * Subscribe groups to a LP, doc (itemproperty). * * @param User $currentUser - * @param string $tool learnpath | document | etc + * @param string $tool learnpath | document | etc * @param Course $course * @param Session $session * @param int $itemId @@ -277,11 +277,11 @@ class ItemPropertyRepository extends EntityRepository /** * Unsubscribe users to item. * - * @param string $tool + * @param string $tool * @param Course $course * @param Session $session - * @param int $itemId - * @param array $usersToDelete + * @param int $itemId + * @param array $usersToDelete */ public function unsubcribeUsersToItem( $tool, diff --git a/src/Chamilo/CourseBundle/Entity/CGroupInfo.php b/src/Chamilo/CourseBundle/Entity/CGroupInfo.php index f8c137a8de..28d654d3a2 100644 --- a/src/Chamilo/CourseBundle/Entity/CGroupInfo.php +++ b/src/Chamilo/CourseBundle/Entity/CGroupInfo.php @@ -155,7 +155,7 @@ class CGroupInfo 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}) */