Nicklas373 · Nicklas373 · Dec 7, 2023 · Nov 20, 2023 · Nov 20, 2023 · Nov 20, 2023
diff --git a/app/Helpers/AppHelper.php b/app/Helpers/AppHelper.php
@@ -63,15 +63,18 @@ function getFtpResponse($download_file, $proc_file){
         $login = ftp_login($ftp_conn, env('FTP_USERNAME'), env('FTP_USERPASS'));
         $login_pasv = ftp_pasv($ftp_conn, true) or die("Cannot switch to passive mode");
 
-        if (ftp_get($ftp_conn, $download_file, $proc_file, FTP_BINARY) ) {
-            return true;
-        } else {
-            die("Cannot find specified file");
+        try {
+            if (ftp_get($ftp_conn, $download_file, $proc_file, FTP_BINARY)) {
+                return true;
+            } else {
+                die("Cannot find specified file");
+                ftp_close($ftp_conn);
+                return false;
+            }
             ftp_close($ftp_conn);
+        } catch (Exception $e) {
             return false;
         }
-
-        ftp_close($ftp_conn);
     }
 
     function get_guid() {

diff --git a/app/Http/Controllers/compressController.php b/app/Http/Controllers/compressController.php
diff --git a/app/Http/Controllers/convertController.php b/app/Http/Controllers/convertController.php
diff --git a/app/Http/Controllers/htmltopdfController.php b/app/Http/Controllers/htmltopdfController.php
diff --git a/app/Http/Controllers/mergeController.php b/app/Http/Controllers/mergeController.php
diff --git a/app/Http/Controllers/splitController.php b/app/Http/Controllers/splitController.php
diff --git a/app/Http/Controllers/watermarkController.php b/app/Http/Controllers/watermarkController.php
diff --git a/app/Models/compression_pdf.php b/app/Models/compression_pdf.php
@@ -16,7 +16,6 @@ class compression_pdf extends Model
         'compMethod',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/extract_pdf.php → app/Models/delete_pdf.php b/app/Models/extract_pdf.php → app/Models/delete_pdf.php
@@ -5,18 +5,17 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class extract_pdf extends Model
+class delete_pdf extends Model
 {
     use HasFactory;
 
     protected $fillable = [
         'fileName',
         'fileSize',
-        'customPage',
+        'deletePage',
         'mergePDF',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/html_pdf.php b/app/Models/html_pdf.php
@@ -13,7 +13,6 @@ class html_pdf extends Model
         'urlName',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/init_pdf.php b/app/Models/init_pdf.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class init_pdf extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'err_reason',
+        'err_api_reason',
+    ];
+}
diff --git a/app/Models/merge_pdf.php b/app/Models/merge_pdf.php
@@ -14,7 +14,6 @@ class merge_pdf extends Model
         'fileSize',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/pdf_cnv.php b/app/Models/pdf_cnv.php
@@ -13,9 +13,9 @@ class pdf_cnv extends Model
         'fileName',
         'fileSize',
         'container',
+        'img_extract',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/split_pdf.php b/app/Models/split_pdf.php
@@ -20,7 +20,6 @@ class split_pdf extends Model
         'mergePDF',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/app/Models/watermark_pdf.php b/app/Models/watermark_pdf.php
@@ -25,7 +25,6 @@ class watermark_pdf extends Model
         'watermarkPage',
         'result',
         'err_reason',
-        'err_api_reason',
-        'uuid'
+        'err_api_reason'
     ];
 }
diff --git a/composer.json b/composer.json
@@ -12,7 +12,6 @@
         "laravel/framework": "^10.29",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
-        "spatie/pdf-to-image": "^2.2",
         "symfony/process": "^6.3"
     },
     "require-dev": {