From a5512d9aac1d36e4f58a567d87a9a369b33bf995 Mon Sep 17 00:00:00 2001
From: starthomas610 <stmk93610@gmail.com>
Date: Tue, 30 Jul 2024 15:24:41 -0400
Subject: [PATCH] fixed some errors

---
 public/userarea/importify/check_vocabulary.php   |  6 ++++--
 public/userarea/importify/importifydashboard.php | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php
index 3126509..2ba56fb 100644
--- a/public/userarea/importify/check_vocabulary.php
+++ b/public/userarea/importify/check_vocabulary.php
@@ -64,7 +64,8 @@ if(isset($_FILES['f_csv'])) {
 
                     foreach($arr_diff_anaysisvoc_words as $item) {
                         $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
-                        $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$item'");
+                        $trim_item = str_replace("'", "\'", $item);
+                        $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'");
                         $arr_analysis_refdata->execute();
                         $arr_analysis_ref = $arr_analysis_refdata->Results;
                         if(count($arr_analysis_ref) == 0) {
@@ -102,7 +103,8 @@ if(isset($_FILES['f_csv'])) {
                     foreach($arr_diff_compundsvoc_words as $item) {
                         $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
                         $compund_word = $item['word'];
-                        $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$compund_word' or cascompoundvocabulary like '$compund_word'");
+                        $trim_item = str_replace("'", "\'", $compund_word);
+                        $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'");
                         $arr_compunds_refdata->execute();
                         $arr_compunds_ref = $arr_compunds_refdata->Results;
                         if(count($arr_compunds_ref) == 0) {
diff --git a/public/userarea/importify/importifydashboard.php b/public/userarea/importify/importifydashboard.php
index 69e76be..a6a19f0 100644
--- a/public/userarea/importify/importifydashboard.php
+++ b/public/userarea/importify/importifydashboard.php
@@ -348,10 +348,11 @@
 
                                                 let swal_html = `<div class="row">
                                                     <div class="col-md-12">
-                                                        <select class="form-control ipt_type">`;
+                                                        <select class="form-control ipt_type">
+                                                        <option value="0">Add new</option>`;
                                                 swal_html += str_arr_option;
 
-                                                swal_html += `<option value="0">Add new</option>
+                                                swal_html += `
                                                         </select>
                                                     </div>
                                                     <div class="col-md-12 flex_center div_input ` + (str_arr_option != "" ? "hidden" : "") + `" style="margin-top: 5px">
@@ -438,10 +439,11 @@
 
                                                 let swal_html = `<div class="row">
                                                     <div class="col-md-12">
-                                                        <select class="form-control ipt_type">`;
+                                                        <select class="form-control ipt_type">
+                                                            <option value="0">Add new</option>`;
                                                 swal_html += str_arr_option;
 
-                                                swal_html += `<option value="0">Add new</option>
+                                                swal_html += `
                                                         </select>
                                                     </div>
                                                     <div class="col-md-12 flex_center div_input ` + (str_arr_option != "" ? "hidden" : "") + `" style="margin-top: 5px">