Minor - format code

pull/3732/head
Julio Montoya 5 years ago
parent 444c18558b
commit ce2afdaeef
  1. 5
      main/inc/lib/extra_field_value.lib.php
  2. 14
      main/lp/learnpath.class.php
  3. 46
      plugin/check_extra_field_author_company/CheckExtraFieldAuthorsCompanyPlugin.php

@ -799,12 +799,11 @@ class ExtraFieldValue extends Model
if ($result['field_type'] == ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD) { if ($result['field_type'] == ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD) {
if (!empty($result['value'])) { if (!empty($result['value'])) {
$options = explode('::', $result['value']); $options = explode('::', $result['value']);
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$result = $field_option->get($options[0]); $result = $field_option->get($options[0]);
if (!empty($result)) { if (!empty($result)) {
$result['value'] = $result['display_text'].'→'.$options[1]; } $result['value'] = $result['display_text'].'→'.$options[1];
}
} }
} }
if ($result['field_type'] == ExtraField::FIELD_TYPE_TRIPLE_SELECT) { if ($result['field_type'] == ExtraField::FIELD_TYPE_TRIPLE_SELECT) {

@ -6668,20 +6668,7 @@ class learnpath
); );
} }
/*if ($backToBuild) {
$back = Display::url(
Display::return_icon(
'back.png',
get_lang('GoBack'),
'',
ICON_SIZE_MEDIUM
),
"lp_controller.php?action=add_item&type=step&lp_id=$lpId&".api_get_cidreq()
);
}*/
$actionsLeft = $back; $actionsLeft = $back;
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( Display::return_icon(
'preview_view.png', 'preview_view.png',
@ -6711,7 +6698,6 @@ class learnpath
); );
$subscriptionSettings = self::getSubscriptionSettings(); $subscriptionSettings = self::getSubscriptionSettings();
$request = api_request_uri(); $request = api_request_uri();
if (strpos($request, 'edit') === false) { if (strpos($request, 'edit') === false) {
$actionsLeft .= Display::url( $actionsLeft .= Display::url(

@ -271,29 +271,6 @@ class CheckExtraFieldAuthorsCompanyPlugin extends Plugin
return $companyField; return $companyField;
} }
/**
* Returns the array of an element in the database that matches the variable.
*
* @param string $variableName
*
* @return array
*/
protected function getInfoExtrafield($variableName = null)
{
if ($variableName == null) {
return [];
}
$variableName = strtolower(Database::escape_string($variableName));
$tblExtraField = $this->tblExtraField;
$query = "SELECT * FROM $tblExtraField WHERE variable = '$variableName'";
$data = Database::fetch_assoc(Database::query($query));
if ($data == false || !isset($data['display_text'])) {
return [];
}
return $data;
}
/** /**
* Verify that the "authors" field exists in the database. * Verify that the "authors" field exists in the database.
* *
@ -382,4 +359,27 @@ class CheckExtraFieldAuthorsCompanyPlugin extends Plugin
} }
} }
} }
/**
* Returns the array of an element in the database that matches the variable.
*
* @param string $variableName
*
* @return array
*/
protected function getInfoExtrafield($variableName = null)
{
if ($variableName == null) {
return [];
}
$variableName = strtolower(Database::escape_string($variableName));
$tblExtraField = $this->tblExtraField;
$query = "SELECT * FROM $tblExtraField WHERE variable = '$variableName'";
$data = Database::fetch_assoc(Database::query($query));
if ($data == false || !isset($data['display_text'])) {
return [];
}
return $data;
}
} }

Loading…
Cancel
Save