[svn r20501] Fixed warning when you added a hotpotatoes in lp - partial FS#3909

skala
Arthur Portugal 17 years ago
parent 37f46dc98e
commit 0aef1fab69
  1. 58
      main/newscorm/learnpath.class.php

@ -5509,27 +5509,29 @@ class learnpath {
$arrHide = array($id); $arrHide = array($id);
for($i = 0; $i < count($arrLP); $i++) if (count($arrLP) > 0) {
{ for($i = 0; $i < count($arrLP); $i++)
if($action != 'add')
{ {
if(($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) if($action != 'add')
{ {
$return .= "\t\t\t\t\t" . '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding) . '</option>'; if(($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide))
{
$return .= "\t\t\t\t\t" . '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding) . '</option>';
}
else
{
$arrHide[] = $arrLP[$i]['id'];
}
} }
else else
{ {
$arrHide[] = $arrLP[$i]['id']; if($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
$return .= "\t\t\t\t\t" . '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding) . '</option>';
} }
} }
else
{
if($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
$return .= "\t\t\t\t\t" . '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding) . '</option>';
}
}
reset($arrLP); reset($arrLP);
}
$return .= "\t\t\t\t" . '</select>'; $return .= "\t\t\t\t" . '</select>';
@ -5578,24 +5580,26 @@ class learnpath {
$id_prerequisite=0; $id_prerequisite=0;
foreach($arrLP as $key=>$value){ if (is_array($arrLP) && count($arrLP) > 0) {
if($value['id']==$id){ foreach($arrLP as $key=>$value){
$id_prerequisite=$value['prerequisite']; if($value['id']==$id){
break; $id_prerequisite=$value['prerequisite'];
break;
}
} }
}
$arrHide=array(); $arrHide=array();
for($i = 0; $i < count($arrLP); $i++) for($i = 0; $i < count($arrLP); $i++)
{
if($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter')
{ {
if($extra_info['previous_item_id'] == $arrLP[$i]['id']) if($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter')
$s_selected_position=$arrLP[$i]['id']; {
elseif($action == 'add') if($extra_info['previous_item_id'] == $arrLP[$i]['id'])
$s_selected_position=0; $s_selected_position=$arrLP[$i]['id'];
$arrHide[$arrLP[$i]['id']]['value']=mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding); elseif($action == 'add')
$s_selected_position=0;
$arrHide[$arrLP[$i]['id']]['value']=mb_convert_encoding($arrLP[$i]['title'],$charset,$this->encoding);
}
} }
} }

Loading…
Cancel
Save