From 7ecfa33afc0ad2ee26e16ccff351e749b9d2f915 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 4 Feb 2021 12:35:14 +0100
Subject: [PATCH] import: fix some PHP warnings and update comments

---
 src/includes/class/class.LSimport.php |  9 +++++++--
 src/includes/routes.php               | 21 ++++++++-------------
 src/templates/default/import.tpl      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/includes/class/class.LSimport.php b/src/includes/class/class.LSimport.php
index 5c28d450..719f75d8 100644
--- a/src/includes/class/class.LSimport.php
+++ b/src/includes/class/class.LSimport.php
@@ -98,7 +98,7 @@ class LSimport extends LSlog_staticLoggerClass {
   }
 
   /**
-   * Import objects form POST data
+   * Import objects from POST data
    *
    * This method retreive, validate and import POST data.
    *
@@ -106,6 +106,11 @@ class LSimport extends LSlog_staticLoggerClass {
    *
    *
    *   array (
+   *     'success' => boolean,
+   *     'LSobject' => '[object type]',
+   *     'ioFormat' => '[ioFormat name]',
+   *     'justTry' => boolean,
+   *     'updateIfExists' => boolean,
    *     'imported' => array (
    *       '[object1 dn]' => '[object1 display name]',
    *       '[object2 dn]' => '[object2 display name]',
@@ -139,7 +144,7 @@ class LSimport extends LSlog_staticLoggerClass {
    *
    * @author Benjamin Renard <brenard@easter-eggs.com>
    *
-   * @retval boolean Array of the import result, false on error
+   * @retval array Array of the import result
    */
   public static function importFromPostData() {
     // Get data from $_POST
diff --git a/src/includes/routes.php b/src/includes/routes.php
index 33816e46..13ac12a6 100644
--- a/src/includes/routes.php
+++ b/src/includes/routes.php
@@ -781,26 +781,21 @@ function handle_LSobject_import($request) {
    return;
 
   $ioFormats = array();
-  $result = null;
-  if ( LSsession :: loadLSclass('LSimport')) {
+  $result = array();
+  if ( LSsession :: loadLSclass('LSimport', null, true)) {  // import class with warning
     $ioFormats = $object->listValidIOformats();
-    if (is_array($ioFormats) && !empty($ioFormats)) {
-      if (LSimport::isSubmit()) {
-        $result = LSimport::importFromPostData();
-        LSlog :: debug("LSimport::importFromPostData(): result = ".varDump($result));
-      }
-    }
-    else {
+    if (!is_array($ioFormats) || empty($ioFormats)) {
       $ioFormats = array();
       LSerror :: addErrorCode('LSsession_16');
     }
-  }
-  else {
-    LSerror :: addErrorCode('LSsession_05','LSimport');
+    else if (LSimport::isSubmit()) {
+      $result = LSimport::importFromPostData();
+      LSlog :: debug("LSimport::importFromPostData(): result = ".varDump($result));
+    }
   }
 
   // Define page title & template variables
-  LStemplate :: assign('pagetitle',_('Import').' : '.$object->getLabel());
+  LStemplate :: assign('pagetitle', _('Import').' : '.$object->getLabel());
   LStemplate :: assign('LSobject', $object -> getType());
   LStemplate :: assign('ioFormats', $ioFormats);
   LStemplate :: assign('result', $result);
diff --git a/src/templates/default/import.tpl b/src/templates/default/import.tpl
index 04d1bde4..8759285a 100644
--- a/src/templates/default/import.tpl
+++ b/src/templates/default/import.tpl
@@ -37,7 +37,7 @@
 </dl>
 </form>
 </div>
-{if is_array($result)}
+{if $result}
 <h1>{tr msg='Result'}</h1>
 {if !empty($result.errors)}
 <h2>{tr msg='Errors'}</h2>