From e8addcb8ba2df0c292f47cd14fe2b6fdcb9e968f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 12:25:21 +0100
Subject: [PATCH] Fixed: [ bug #1756 ] PHP error while removing an import
profile
---
htdocs/core/tpl/extrafields_view.tpl.php | 15 ++++++++-------
htdocs/imports/class/import.class.php | 7 ++++---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index ad2fa068757..7f0115b83bc 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -33,13 +33,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
if ($action == 'edit_extras')
{
- $value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
+ $value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
}
else
{
- $value = $object->array_options ["options_" . $key];
+ $value = $object->array_options["options_" . $key];
}
- if ($extrafields->attribute_type [$key] == 'separate')
+ if ($extrafields->attribute_type[$key] == 'separate')
{
print $extrafields->showSeparator($key);
}
@@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td';
- if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"';
+ //var_dump($action);exit;
+ if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
print '>' . $label . '</td>';
//TODO Improve element and rights detection
@@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
print '<td colspan="5">';
// Convert date into timestamp format
- if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) {
- $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
+ if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+ $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
}
//TODO Improve element and rights detection
@@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
print '<input type="hidden" name="action" value="update_extras">';
print '<input type="hidden" name="attribute" value="' . $key . '">';
- print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+ print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="id" value="' . $object->id . '">';
print $extrafields->showInputField($key, $value);
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 58a1bf3e931..b846d158227 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -22,8 +22,7 @@
*/
/**
- * \class Import
- * \brief Class to manage imports
+ * Class to manage imports
*/
class Import
{
@@ -313,10 +312,12 @@ class Import
{
if (! $notrigger)
{
+ /* Not used. This is not a business object. To convert it we must herit from CommonObject
// Call trigger
$result=$this->call_trigger('IMPORT_DELETE',$user);
- if ($result < 0) $error++;
+ if ($result < 0) $error++;
// End call triggers
+ */
}
}
--
GitLab