Minor - PHP fixes

1db4c6c89d
pull/3747/head
Julio 5 years ago
parent e093747faa
commit 206f1a2e40
  1. 37
      main/lp/learnpath.class.php
  2. 2
      plugin/check_extra_field_author_company/CheckExtraFieldAuthorsCompanyPlugin.php

@ -7749,7 +7749,7 @@ class learnpath
$form->addHidden('type', TOOL_QUIZ); $form->addHidden('type', TOOL_QUIZ);
$form->addHidden('post_time', time()); $form->addHidden('post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return '<div class="sectioncomment">'.$form->returnForm().'</div>'; return '<div class="sectioncomment">'.$form->returnForm().'</div>';
@ -8111,7 +8111,7 @@ class learnpath
} }
$form->addHidden('type', TOOL_FORUM); $form->addHidden('type', TOOL_FORUM);
$form->addHidden('post_time', time()); $form->addHidden('post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return '<div class="sectioncomment">'.$form->returnForm().'</div>'; return '<div class="sectioncomment">'.$form->returnForm().'</div>';
@ -8316,7 +8316,7 @@ class learnpath
$form->addHidden('type', TOOL_THREAD); $form->addHidden('type', TOOL_THREAD);
$form->addHidden('post_time', time()); $form->addHidden('post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return $form->returnForm(); return $form->returnForm();
@ -8966,7 +8966,7 @@ class learnpath
} }
$form->addElement('hidden', 'type', TOOL_DOCUMENT); $form->addElement('hidden', 'type', TOOL_DOCUMENT);
$form->addElement('hidden', 'post_time', time()); $form->addElement('hidden', 'post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return $form->returnForm(); return $form->returnForm();
@ -9258,7 +9258,7 @@ class learnpath
$form->addElement('hidden', 'type', TOOL_READOUT_TEXT); $form->addElement('hidden', 'type', TOOL_READOUT_TEXT);
$form->addElement('hidden', 'post_time', time()); $form->addElement('hidden', 'post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return $form->returnForm(); return $form->returnForm();
@ -9607,7 +9607,7 @@ class learnpath
} }
$form->addHidden('type', TOOL_LINK); $form->addHidden('type', TOOL_LINK);
$form->addHidden('post_time', time()); $form->addHidden('post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults($defaults); $form->setDefaults($defaults);
return '<div class="sectioncomment">'.$form->returnForm().'</div>'; return '<div class="sectioncomment">'.$form->returnForm().'</div>';
@ -9780,7 +9780,7 @@ class learnpath
$form->addHidden('type', TOOL_STUDENTPUBLICATION); $form->addHidden('type', TOOL_STUDENTPUBLICATION);
$form->addHidden('post_time', time()); $form->addHidden('post_time', time());
$form = $this->getAutorLpItem($form); $this->setAuthorLpItem($form);
$form->setDefaults(['title' => $item_title]); $form->setDefaults(['title' => $item_title]);
$return = '<div class="sectioncomment">'; $return = '<div class="sectioncomment">';
@ -14174,40 +14174,37 @@ EOD;
} }
/** /**
* Gets the form to evaluate if it exists contains the extra field extra_authorlpitem to establish authors when * Gets the form to evaluate if it exists contains the extra field extra_authorlpitem
* editing an item of an LP. Returns the form with the authors' setting. It must be set before the setDefault. * to establish authors when editing an item of an LP.
* *
* @param FormValidator $form
*
* @return FormValidator
*/ */
private function getAutorLpItem($form) private function setAuthorLpItem(FormValidator $form)
{ {
/** @var FormValidator $form */
if ($form->hasElement('extra_authorlpitem')) { if ($form->hasElement('extra_authorlpitem')) {
/** @var HTML_QuickForm_select $author */ /** @var HTML_QuickForm_select $author */
$author = $form->getElement('extra_authorlpitem'); $author = $form->getElement('extra_authorlpitem');
$options = []; $options = [];
$field = new ExtraField('user'); $field = new ExtraField('user');
$authorLp = $field->get_handler_field_info_by_field_variable('authorlp'); $authorLp = $field->get_handler_field_info_by_field_variable('authorlp');
$idExtraField = (int) (isset($authorLp['id']) ? $authorLp['id'] : 0); $extraFieldId = isset($authorLp['id']) ? (int) $authorLp['id'] : 0;
if ($idExtraField != 0) { if ($extraFieldId != 0) {
$extraFieldValueUser = new ExtraFieldValue('user'); $extraFieldValueUser = new ExtraFieldValue('user');
$arrayExtraFieldValueUser = $extraFieldValueUser->get_item_id_from_field_variable_and_field_value( $values = $extraFieldValueUser->get_item_id_from_field_variable_and_field_value(
$authorLp['variable'], $authorLp['variable'],
1, 1,
true, true,
false, false,
true true
); );
foreach ($arrayExtraFieldValueUser as $item) {
if (!empty($values)) {
foreach ($values as $item) {
$teacher = api_get_user_info($item['item_id']); $teacher = api_get_user_info($item['item_id']);
$options[$teacher['id']] = $teacher['complete_name']; $options[$teacher['id']] = $teacher['complete_name'];
} }
} }
}
$author->setOptions($options); $author->setOptions($options);
} }
return $form;
} }
} }

@ -198,7 +198,7 @@ class CheckExtraFieldAuthorsCompanyPlugin extends Plugin
{ {
$schedule = new ExtraField('lp_item'); $schedule = new ExtraField('lp_item');
$data = []; $data = [];
$data['visible_to_self'] = 0; $data['visible_to_self'] = 1;
$data['visible_to_others'] = 0; $data['visible_to_others'] = 0;
$data['changeable'] = 1; $data['changeable'] = 1;
$data['filter'] = 0; $data['filter'] = 0;

Loading…
Cancel
Save