Merge branch '1.10.x' of ssh://github.com/chamilo/chamilo-lms into 1.10.x

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);
 }
 

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);
 }
 

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);
 }
 

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);
 }
 

main/css/base.css

@@ -5351,6 +5351,7 @@ i.size-32.icon-new-work{
 
 #settings .span6:nth-child(2n+1) {
     clear:left
+}
 
 /***** Survey *****/
 #list-survey p{

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();

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;
             }

main/inc/ajax/admin.ajax.php

@@ -61,18 +61,16 @@ switch ($action) {
         }
 
         if (!is_dir($newUrlDir)) {
-            @mkdir($newUrlDir, api_get_permissions_for_new_directories(), true);
+            mkdir($newUrlDir, api_get_permissions_for_new_directories(), true);
         }
 
-        $fullFilePath = "{$newUrlDir}{$blockName}_extra.html";
-
-        if (file_exists($fullFilePath)) {
-            @unlink($fullFilePath);
+        if (!is_writable($newUrlDir)) {
+            die;
         }
 
-        @touch($fullFilePath);
+        $fullFilePath = "{$newUrlDir}{$blockName}_extra.html";
 
-        @file_put_contents($fullFilePath, $content);
+        file_put_contents($fullFilePath, $content);
 
         break;
 
@@ -99,9 +97,15 @@ switch ($action) {
             $newUrlDir = api_get_path(SYS_PATH) . "home/admin/";
         }
 
-        if (Security::check_abs_path("{$newUrlDir}{$blockName}_extra.html", $newUrlDir)) {
-            echo @file_get_contents("{$newUrlDir}{$blockName}_extra.html");
+        if (!Security::check_abs_path("{$newUrlDir}{$blockName}_extra.html", $newUrlDir)) {
+            die;
         }
+
+        if (!file_exists("{$newUrlDir}{$blockName}_extra.html")) {
+            die;
+        }
+
+        echo file_get_contents("{$newUrlDir}{$blockName}_extra.html");
         break;
 }