Browse Source

Minor - format code

Julio Montoya 5 years ago
parent
commit
98ca2a5c23

+ 3 - 1
main/gradebook/lib/be/abstractlink.class.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\GradebookLink;
+
 /**
  * Class AbstractLink
  * Defines a gradebook AbstractLink object.
@@ -17,7 +19,7 @@ abstract class AbstractLink implements GradebookItem
 {
     public $course_id;
     public $studentList;
-    /** @var \Chamilo\CoreBundle\Entity\GradebookLink */
+    /** @var GradebookLink */
     public $entity;
     protected $id;
     protected $type;

+ 1 - 0
main/gradebook/lib/be/category.class.php

@@ -643,6 +643,7 @@ class Category implements GradebookItem
     {
         $em = Database::getManager();
 
+        /** @var GradebookCategory $gradebookCategory */
         $gradebookCategory = $em
             ->getRepository('ChamiloCoreBundle:GradebookCategory')
             ->find($this->id);

+ 2 - 1
main/gradebook/lib/be/evaluation.class.php

@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\GradebookEvaluation;
 use ChamiloSession as Session;
 
 /**
@@ -11,7 +12,7 @@ use ChamiloSession as Session;
 class Evaluation implements GradebookItem
 {
     public $studentList;
-    /** @var \Chamilo\CoreBundle\Entity\GradebookEvaluation */
+    /** @var GradebookEvaluation */
     public $entity;
     private $id;
     private $name;

+ 1 - 1
main/inc/lib/tracking.lib.php

@@ -171,13 +171,13 @@ class Tracking
 
         // Extend all button
         $output = '';
-        $extend_all = 0;
         if ($origin === 'tracking') {
             $url_suffix = '&session_id='.$session_id.'&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.$lp_id.'&origin='.$origin;
         } else {
             $url_suffix = '&lp_id='.$lp_id;
         }
 
+        $extend_all = 0;
         if (!empty($extendedAll)) {
             $extend_all_link = Display::url(
                 Display::return_icon('view_less_stats.gif', get_lang('HideAllAttempts')),

+ 6 - 11
main/mySpace/lp_tracking.php

@@ -37,12 +37,12 @@ $userInfo = api_get_user_info($user_id);
 $name = $userInfo['complete_name'];
 $isBoss = UserManager::userIsBossOfStudent(api_get_user_id(), $user_id);
 
-if (!api_is_platform_admin(true) &&
-    !CourseManager::is_course_teacher(api_get_user_id(), $courseCode) &&
-    !$isBoss &&
-    !Tracking::is_allowed_to_coach_student(api_get_user_id(), $user_id) &&
+if (!$isBoss &&
+    !api_is_platform_admin(true) &&
     !api_is_drh() &&
-    !api_is_course_tutor()
+    !api_is_course_tutor() &&
+    !CourseManager::is_course_teacher(api_get_user_id(), $courseCode) &&
+    !Tracking::is_allowed_to_coach_student(api_get_user_id(), $user_id)
 ) {
     api_not_allowed(api_get_origin() !== 'learnpath');
 }
@@ -252,15 +252,10 @@ switch ($action) {
         $logo2 = Display::img($secondLogo, null, ['style' => 'height:70px;']);
         $table->setCellContents(0, 1, $logo2);
         $table->setCellAttributes(0, 1, ['style' => 'display:block;float:right;text-align:right']);
-
         $pdf->set_custom_header($table->toHtml());
 
         $background = api_get_path(SYS_PATH).'custompages/url-images/'.api_get_current_access_url_id().'_pdf_background.png';
-
-        $content =
-            '<html>
-                <body style="background-image-resize: 5; background-position: top left; background-image: url('.$background.');">'
-            .$content.'</body></html>';
+        $content = '<html><body style="background-image-resize: 5; background-position: top left; background-image: url('.$background.');">'.$content.'</body></html>';
 
         $pdf->content_to_pdf(
             $content,