Browse Source

Merge pull request #491 from AngelFQC/BT9082

Allow OpenBadges with the enabled Skills tool - refs BT#9082
Yannick Warnier 10 years ago
parent
commit
2a6d7ae991

+ 1 - 1
main/admin/skill_badge.php

@@ -11,7 +11,7 @@ require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-if (!api_is_platform_admin()) {
+if (!api_is_platform_admin() || api_get_setting('allow_skills_tool') !== 'true') {
     api_not_allowed(true);
 }
 

+ 1 - 1
main/admin/skill_badge_create.php

@@ -10,7 +10,7 @@ $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/fileUpload.lib.php';
 
-if (!api_is_platform_admin()) {
+if (!api_is_platform_admin() || api_get_setting('allow_skills_tool') !== 'true') {
     api_not_allowed(true);
 }
 

+ 1 - 1
main/admin/skill_badge_issuer.php

@@ -9,7 +9,7 @@ $cidReset = true;
 
 require_once '../inc/global.inc.php';
 
-if (!api_is_platform_admin()) {
+if (!api_is_platform_admin() || api_get_setting('allow_skills_tool') !== 'true') {
     api_not_allowed(true);
 }
 

+ 1 - 1
main/admin/skill_badge_list.php

@@ -10,7 +10,7 @@ $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/fileUpload.lib.php';
 
-if (!api_is_platform_admin()) {
+if (!api_is_platform_admin() || api_get_setting('allow_skills_tool') !== 'true') {
     api_not_allowed(true);
 }
 

+ 4 - 0
main/gradebook/get_badges.php

@@ -7,6 +7,10 @@
  */
 require_once '../inc/global.inc.php';
 
+if (api_get_setting('allow_skills_tool') !== 'true') {
+    api_not_allowed(true);
+}
+
 $userId = isset($_GET['user']) ? intval($_GET['user']) : 0;
 $courseId = api_get_course_int_id();
 $sessionId = api_get_session_id();

+ 19 - 9
main/gradebook/lib/be/category.class.php

@@ -1666,14 +1666,6 @@ class Category implements GradebookItem
                             'class' => 'btn'
                         )
                     );
-                    $badges = Display::url(
-                        get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
-                        array(
-                            'target' => '_blank',
-                            'class' => 'btn'
-                        )
-                    );
                     $exportToPDF = Display::url(
                         Display::return_icon(
                             'pdf.png',
@@ -1684,10 +1676,28 @@ class Category implements GradebookItem
                         "$url&action=export"
                     );
                     $html = array(
-                        'badge_link' => $badges,
                         'certificate_link' => $certificates,
                         'pdf_link' => $exportToPDF
                     );
+
+                    if (api_get_setting('allow_skills_tool') == 'true') {
+                        $courseId = api_get_course_int_id();
+                        $sessionId = api_get_session_id();
+
+                        $objSkillRelUser = new SkillRelUser();
+                        $userSkills = $objSkillRelUser->get_user_skills($user_id, $courseId, $sessionId);
+
+                        if (!empty($userSkills)) {
+                            $html['badge_link'] = Display::url(
+                                get_lang('DownloadBadges'),
+                                api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                                array(
+                                    'target' => '_blank',
+                                    'class' => 'btn'
+                                )
+                            );
+                        }
+                    }
                 }
                 return $html;
             }