Browse Source

Fix php warnings add current user id in Skill::isAllow();

Julio 7 years ago
parent
commit
2101ef5229
3 changed files with 7 additions and 8 deletions
  1. 4 4
      main/inc/ajax/skill.ajax.php
  2. 2 3
      main/inc/lib/skill.lib.php
  3. 1 1
      main/social/skills_ranking.php

+ 4 - 4
main/inc/ajax/skill.ajax.php

@@ -10,11 +10,11 @@ $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
 
 api_block_anonymous_users();
 
-Skill::isAllow();
+Skill::isAllow(api_get_user_id());
 
 $skill = new Skill();
 $gradebook = new Gradebook();
-$skill_gradebook = new SkillRelGradebook();
+$skillGradeBook = new SkillRelGradebook();
 $userId = api_get_user_id();
 
 switch ($action) {
@@ -285,12 +285,12 @@ switch ($action) {
     case 'remove_skill':
         if (api_is_platform_admin() || api_is_drh()) {
             if (!empty($_REQUEST['skill_id']) && !empty($_REQUEST['gradebook_id'])) {
-                $skill_item = $skill_gradebook->getSkillInfo(
+                $skill_item = $skillGradeBook->getSkillInfo(
                     $_REQUEST['skill_id'],
                     $_REQUEST['gradebook_id']
                 );
                 if (!empty($skill_item)) {
-                    $skill_gradebook->delete($skill_item['id']);
+                    $skillGradeBook->delete($skill_item['id']);
                     echo 1;
                 } else {
                     echo 0;

+ 2 - 3
main/inc/lib/skill.lib.php

@@ -876,7 +876,7 @@ class Skill extends Model
         $skillRelSkill = new SkillRelSkill();
         $children = $skillRelSkill->getChildren($skillId);
         foreach ($children as $child) {
-            $subChildren = $this->getAllChildren($child['skill_id']);
+            $subChildren = $this->getAllChildren($child['id']);
         }
 
         if (!empty($subChildren)) {
@@ -1437,7 +1437,7 @@ class Skill extends Model
             foreach ($family as $main_family_id => $family_items) {
                 if (!empty($family_items)) {
                     foreach ($family_items as $item) {
-                        $new_family_array[$item['skill_id']] = $family_id;
+                        $new_family_array[$item['id']] = $family_id;
                     }
                 }
                 $new_family_array[$main_family_id] = $family_id;
@@ -1451,7 +1451,6 @@ class Skill extends Model
                 $flat_array[$skill_id] = $skills[$skill_id];
             } else {
                 // Moving node to the children index of their parents
-
                 foreach ($skills as $my_skill_id => &$skill) {
                     if (isset($new_family_array[$skill['id']])) {
                         $skill['data']['family_id'] = $new_family_array[$skill['id']];

+ 1 - 1
main/social/skills_ranking.php

@@ -10,7 +10,7 @@ $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_block_anonymous_users();
-Skill::isAllow();
+Skill::isAllow(api_get_user_id());
 
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();