Changeset 3208711

Timestamp:

12/16/2024 04:58:06 PM (14 months ago)

Author:

suaudeau

Message:

4.9.1

*Release Date - 16 December 2024*

• BUG : Import tool was not functionnal because of a bad check of file extension

Location:

mon-laboratoire/trunk

Files:

• Admin/Import/class-import-main.php (modified) (3 diffs)
• Admin/class-csv.php (modified) (1 diff)
• mon-laboratoire.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

mon-laboratoire/trunk/Admin/Import/class-import-main.php

@@ -16 +16 @@
     render_main_form( )
     processing()
+    _process_csv_submited_file( string $file_submit_name )
 */
 
@@ -116 +117 @@
         $imported_teams = array();
         if ( $this->_check_nonce( 'import_cvs_files' ) ) {
-            $csv = Csv::getInstance();
-            if ( isset( $_FILES['submit_import_persons'] ) ) {     
-                if ( !empty( $_FILES['submit_import_persons']['tmp_name'] ) ) {     
-                    $imported_persons = $csv->importCsvToArray( $_FILES['submit_import_persons']['tmp_name'] );
-                }
-            }
-            if ( isset( $_FILES['submit_import_teams_members'] ) ) {     
-                if ( !empty(( $_FILES['submit_import_teams_members']['tmp_name'] ) ) ) {     
-                    $imported_teams_members = $csv->importCsvToArray( $_FILES['submit_import_teams_members']['tmp_name'] );
-                }
-            }
-            if ( isset( $_FILES['submit_import_teams'] ) ) {     
-                if ( !empty(( $_FILES['submit_import_teams']['tmp_name'] ) ) ) {     
-                    $imported_teams = $csv->importCsvToArray( $_FILES['submit_import_teams']['tmp_name'] );
-                }
-            }                       
+            $imported_persons       = $this->_process_csv_submited_file('submit_import_persons' );
+            $imported_teams_members = $this->_process_csv_submited_file('submit_import_teams_members' );
+            $imported_teams         = $this->_process_csv_submited_file('submit_import_teams' );                        
             $Pre_Import = New Pre_Import( $imported_persons, $imported_teams_members, $imported_teams );
             $retval .= $Pre_Import->processing( );
@@ -146 +134 @@
     }
 
+    /**
+     * Process import of CSV submited file
+     * @param string $file_submit_name : Field name of file import
+     * @return array<int,array<string,string>>
+     */
+    private function _process_csv_submited_file( string $file_submit_name ) {
+        $csv = Csv::getInstance();
+        $imported_array = array();
+        if ( isset( $_FILES[ $file_submit_name ] ) && !empty( $_FILES[ $file_submit_name ]['tmp_name'] ) ) {    
+            $extension = strtolower( pathinfo( $_FILES[ $file_submit_name ]['name'], PATHINFO_EXTENSION ) );
+            if ( 'csv' === $extension ) {
+                $imported_array = $csv->importCsvToArray( $_FILES[ $file_submit_name ]['tmp_name'] );
+            }
+        }
+        return $imported_array;
+    }
+
 }

mon-laboratoire/trunk/Admin/class-csv.php

@@ -204 +204 @@
     function importCsvToArray( string $filepath ) : array {
         $table_imported = array();
-        $extension = strtolower( pathinfo( $filepath, PATHINFO_EXTENSION ) );
-        if ( 'csv' === $extension ) {
-            $csvFile = fopen( $filepath, 'r');
-            if ( $csvFile !== false ) {
-                while( ! feof( $csvFile ) ){
-                    $data = fgetcsv( $csvFile );
-                    $table_imported[] = $data;
-                }
-                fclose($csvFile);
-            }
+        $csvFile = fopen( $filepath, 'r');
+        if ( $csvFile !== false ) {
+            while( ! feof( $csvFile ) ){
+                $data = fgetcsv( $csvFile );
+                $table_imported[] = $data;
+            }
+            fclose($csvFile);
         }
         return $this->_clean_imported_array( $table_imported );

mon-laboratoire/trunk/mon-laboratoire.php

@@ -12 +12 @@
  * Plugin URI:        http://www.monlabo.org
  * Description:       Simplify the management of a research unit's website
- * Version:           4.9
+ * Version:           4.9.1
  * Requires at least: 5.6
  * Requires PHP:      7.2
@@ -48 +48 @@
 * @return string version
 */
-function get_MonLabo_version(): string { return '4.9'; }
+function get_MonLabo_version(): string { return '4.9.1'; }
 
 ///////////////////////////////////////////////////////////////////////////////////////////

mon-laboratoire/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 5.6
 Tested up to: 6.7
-Stable tag: 4.9
+Stable tag: 4.9.1
 Requires PHP: 7.2
 License: GPLv3 or later
@@ -42 +42 @@
 == Changelog ==
 
+= 4.9.1 =
+*Release Date - 16 December 2024*
+
+* BUG : Import tool was not functionnal because of a bad check of file extension
+
 = 4.9 =
-*Release Date - 11 November 2024 *
+*Release Date - 11 November 2024*
 
 * Evolutions of functionalities :