changes

src/main/java/stirling/software/SPDF/controller/ContrastController.java

@@ -1,29 +0,0 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class ContrastController {
-
-    @GetMapping("/adjust-contrast")
-    public String adjustContrastMain(Model model) {
-        model.addAttribute("currentPage", "adjustContrast");
-        return "adjust-contrast";
-    }
-
-
-
-}

src/main/java/stirling/software/SPDF/controller/security/MetadataController.java

@@ -9,6 +9,7 @@ import java.util.Map.Entry;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -28,40 +29,74 @@ public class MetadataController {
         return "security/change-metadata";
     }
 
+    private String checkUndefined(String entry) {
+        // Check if the string is "undefined"
+        if("undefined".equals(entry)) {
+            // Return null if it is
+            return null;
+        }
+        // Return the original string if it's not "undefined"
+        return entry;
+        
+    }
     @PostMapping("/update-metadata")
     public ResponseEntity<byte[]> metadata(@RequestParam("fileInput") MultipartFile pdfFile,
-            @RequestParam(value = "deleteAll", required = false, defaultValue = "false") Boolean deleteAll,
+            @RequestParam(value = "deleteAll", required = false, defaultValue = "false") Boolean deleteAll, @RequestParam(value = "author", required = false) String author,
-            @RequestParam(value = "author", required = false) String author,
+            @RequestParam(value = "creationDate", required = false) String creationDate, @RequestParam(value = "creator", required = false) String creator,
-            @RequestParam(value = "creationDate", required = false) String creationDate,
+            @RequestParam(value = "keywords", required = false) String keywords, @RequestParam(value = "modificationDate", required = false) String modificationDate,
-            @RequestParam(value = "creator", required = false) String creator,
+            @RequestParam(value = "producer", required = false) String producer, @RequestParam(value = "subject", required = false) String subject,
-            @RequestParam(value = "keywords", required = false) String keywords,
+            @RequestParam(value = "title", required = false) String title, @RequestParam(value = "trapped", required = false) String trapped,
-            @RequestParam(value = "modificationDate", required = false) String modificationDate,
-            @RequestParam(value = "producer", required = false) String producer,
-            @RequestParam(value = "subject", required = false) String subject,
-            @RequestParam(value = "title", required = false) String title,
-            @RequestParam(value = "trapped", required = false) String trapped,
             @RequestParam Map<String, String> allRequestParams) throws IOException {
 
-        System.out.println("1 allRequestParams.size() = " + allRequestParams.size());
+        // Load the PDF file into a PDDocument
-        for (Entry entry : allRequestParams.entrySet()) {
-            System.out.println("1 key=" + entry.getKey() + ", value=" + entry.getValue());
-        }
-        
         PDDocument document = PDDocument.load(pdfFile.getBytes());
 
-        // Remove all metadata based on flag
+        // Get the document information from the PDF
         PDDocumentInformation info = document.getDocumentInformation();
         
-        if(deleteAll) { 
+        // Check if each metadata value is "undefined" and set it to null if it is
+        author = checkUndefined(author);
+        creationDate = checkUndefined(creationDate);
+        creator = checkUndefined(creator);
+        keywords = checkUndefined(keywords);
+        modificationDate = checkUndefined(modificationDate);
+        producer = checkUndefined(producer);
+        subject = checkUndefined(subject);
+        title = checkUndefined(title);
+        trapped = checkUndefined(trapped);
+     
+     // If the "deleteAll" flag is set, remove all metadata from the document information
+        if (deleteAll) {
             for (String key : info.getMetadataKeys()) {
                 info.setCustomMetadataValue(key, null);
             }
+            author = null;
+            creationDate = null;
+            creator = null;
+            keywords = null;
+            modificationDate = null;
+            producer = null;
+            subject = null;
+            title = null;
+            trapped = null;
         } else {
-        if(author != null && author.length() > 0) {
+         // Iterate through the request parameters and set the metadata values
-            info.setAuthor(author);
+            for (Entry<String, String> entry : allRequestParams.entrySet()) {
+                String key = entry.getKey();
+                // Check if the key is a standard metadata key
+                if (!key.equalsIgnoreCase("Author") && !key.equalsIgnoreCase("CreationDate") && !key.equalsIgnoreCase("Creator") && !key.equalsIgnoreCase("Keywords")
+                        && !key.equalsIgnoreCase("modificationDate") && !key.equalsIgnoreCase("Producer") && !key.equalsIgnoreCase("Subject") && !key.equalsIgnoreCase("Title")
+                        && !key.equalsIgnoreCase("Trapped") && !key.contains("customKey") && !key.contains("customValue")) {
+                    info.setCustomMetadataValue(key, entry.getValue());
+                } else if (key.contains("customKey")) {
+                    int number = Integer.parseInt(key.replaceAll("\\D", ""));
+                    String customKey = entry.getValue();
+                    String customValue = allRequestParams.get("customValue" + number);
+                    info.setCustomMetadataValue(customKey, customValue);
                 }
-        
+            }
-        if(creationDate != null && creationDate.length() > 0) {
+        }
+        if (creationDate != null && creationDate.length() > 0) {
             Calendar creationDateCal = Calendar.getInstance();
             try {
                 creationDateCal.setTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
@@ -69,14 +104,10 @@ public class MetadataController {
                 e.printStackTrace();
             }
             info.setCreationDate(creationDateCal);
+        } else {
+            info.setCreationDate(null);
         }
-        if(creator != null && creator.length() > 0) {
+        if (modificationDate != null && modificationDate.length() > 0) {
-            info.setCreator(creator);
-        }
-        if(keywords != null && keywords.length() > 0) {
-            info.setKeywords(keywords);
-        }
-        if(modificationDate != null && modificationDate.length() > 0) {
             Calendar modificationDateCal = Calendar.getInstance();
             try {
                 modificationDateCal.setTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
@@ -84,53 +115,21 @@ public class MetadataController {
                 e.printStackTrace();
             }
             info.setModificationDate(modificationDateCal);
+        } else {
+            info.setModificationDate(null);
         }
-        if(producer != null && producer.length() > 0) {
+        info.setCreator(creator);
+        info.setKeywords(keywords);
+        info.setAuthor(author);
         info.setProducer(producer);
-        }
-        if(subject != null && subject.length() > 0) {
         info.setSubject(subject);
-        }
-        if(title != null && title.length() > 0) {
         info.setTitle(title);
-        }
-        if(trapped != null && trapped.length() > 0) {
         info.setTrapped(trapped);
-        }
-        }
-        
-
-
-
         
+        document.setDocumentInformation(info);
         return PdfUtils.pdfDocToWebResponse(document, pdfFile.getName() + "_metadata.pdf");
     }
     
-//	@PostMapping("/update-metadata")
-//	public ResponseEntity<byte[]> addWatermark(@RequestParam("fileInput") MultipartFile pdfFile,
-//			@RequestParam Map<String,String> allRequestParams,HttpServletRequest request, ModelMap model) throws IOException {
-//	  // Load the PDF file
-//		System.out.println("1 allRequestParams.size() = " + allRequestParams.size());
-//	  for(Entry entry : allRequestParams.entrySet()) {
-//		  System.out.println("1 key=" + entry.getKey() + ", value=" + entry.getValue());
-//	  }
-//
-//
-//	  System.out.println("request.getParameterMap().size() = " + request.getParameterMap().size());
-//	  for(Entry entry : request.getParameterMap().entrySet()) {
-//		  System.out.println("2 key=" + entry.getKey() + ", value=" + entry.getValue());
-//	  }
-//
-//
-//	  System.out.println("mdoel.size() = " + model.size());
-//	  for(Entry entry :  model.entrySet()) {
-//		  System.out.println("3 key=" + entry.getKey() + ", value=" + entry.getValue());
-//	  }
-//
     
     
-//	  // Loop over all pages and remove annotations
-//	  for (PDPage page : document.getPages()) {
-//	    page.getAnnotations().clear();
-//	  }
 }

src/main/resources/messages_ar_AR.properties

@@ -190,3 +190,21 @@ removePassword.header=إزالة كلمة المرور (فك التشفير)
 removePassword.selectText.1=حدد PDF لفك التشفير
 removePassword.selectText.2=كلمة المرور
 removePassword.submit=إزالة
+
+changeMetadata.title = \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0648\u0635\u0641\u064A\u0629
+changeMetadata.header = \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0648\u0635\u0641\u064A\u0629
+changeMetadata.selectText.1 = \u064A\u0631\u062C\u0649 \u062A\u0639\u062F\u064A\u0644 \u0627\u0644\u0645\u062A\u063A\u064A\u0631\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u0631\u063A\u0628 \u0641\u064A \u062A\u063A\u064A\u064A\u0631\u0647\u0627
+changeMetadata.selectText.2 = \u062D\u0630\u0641 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u064A\u0629
+changeMetadata.selectText.3 = \u0625\u0638\u0647\u0627\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u064A\u0629 \u0627\u0644\u0645\u062E\u0635\u0635\u0629:
+changeMetadata.author = \u0627\u0644\u0645\u0624\u0644\u0641:
+changeMetadata.creationDate = \u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0625\u0646\u0634\u0627\u0621 (yyyy / MM / dd HH: mm: ss):
+changeMetadata.creator = \u0627\u0644\u0645\u0646\u0634\u0626:
+changeMetadata.keywords = \u0627\u0644\u0643\u0644\u0645\u0627\u062A \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629:
+changeMetadata.modDate = \u062A\u0627\u0631\u064A\u062E \u0627\u0644\u062A\u0639\u062F\u064A\u0644 (yyyy / MM / dd HH: mm: ss):
+changeMetadata.producer = \u0627\u0644\u0645\u0646\u062A\u062C:
+changeMetadata.subject = \u0627\u0644\u0645\u0648\u0636\u0648\u0639:
+changeMetadata.title = \u0627\u0644\u0639\u0646\u0648\u0627\u0646:
+changeMetadata.trapped = \u0645\u062D\u0627\u0635\u0631:
+changeMetadata.selectText.4 = \u0628\u064A\u0627\u0646\u0627\u062A \u0648\u0635\u0641\u064A\u0629 \u0623\u062E\u0631\u0649:
+changeMetadata.selectText.5 = \u0625\u0636\u0627\u0641\u0629 \u0625\u062F\u062E\u0627\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0623\u0648\u0644\u064A\u0629 \u0645\u062E\u0635\u0635
+changeMetadata.submit = \u062A\u063A\u064A\u064A\u0631

src/main/resources/messages_de_DE.properties

@@ -189,7 +189,23 @@ removePassword.selectText.2=Passwort
 removePassword.submit=Entfernen
 
 
-
+changeMetadata.title=Metadaten ändern
+changeMetadata.header=Metadaten ändern
+changeMetadata.selectText.1=Bitte bearbeiten Sie die Variablen, die Sie ändern möchten
+changeMetadata.selectText.2=Alle Metadaten löschen
+changeMetadata.selectText.3=Benutzerdefinierte Metadaten anzeigen:
+changeMetadata.author=Autor:
+changeMetadata.creationDate=Erstellungsdatum (jjjj/MM/tt HH:mm:ss):
+changeMetadata.creator=Ersteller:
+changeMetadata.keywords=Schlüsselwörter:
+changeMetadata.modDate=Änderungsdatum (JJJJ/MM/TT HH:mm:ss):
+changeMetadata.producer=Produzent:
+changeMetadata.subject=Betreff:
+changeMetadata.title=Titel:
+changeMetadata.trapped=Gefangen:
+changeMetadata.selectText.4=Andere Metadaten:
+changeMetadata.selectText.5=Benutzerdefinierten Metadateneintrag hinzufügen
+changeMetadata.submit=Ändern
 
 
 

src/main/resources/messages_en_GB.properties

@@ -9,6 +9,9 @@ genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
 pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) :
 goToPage=Go
+true=True
+false=False
+unknown=Unknown
 #############
 # HOME-PAGE #
 #############
@@ -58,8 +61,8 @@ home.removePassword.desc=Remove password protection from your PDF document.
 home.compressPdfs.title=Compress PDFs
 home.compressPdfs.desc=Compress PDFs to reduce their file size.
 
-home.changeMetadata.title=Remove Metadata
+home.changeMetadata.title=Change Metadata
-home.changeMetadata.desc=Remove unwanted metadata from a PDF document
+home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
 
 
 #Add image
@@ -186,14 +189,23 @@ removePassword.selectText.1=Select PDF to Decrypt
 removePassword.selectText.2=Password
 removePassword.submit=Remove
 
-changeMetadata.title=Remove Metadata
+changeMetadata.title=Change Metadata
-changeMetadata.header=Remove Metadata
+changeMetadata.header=Change Metadata
-changeMetadata.selectText.1=Select PDF to remove metadata from
+changeMetadata.selectText.1=Please edit the variables you wish to change
-changeMetadata.selectText.2=Remove document information
+changeMetadata.selectText.2=Delete all metadata
-changeMetadata.selectText.3=Remove page labels
+changeMetadata.selectText.3=Show Custom Metadata:
-changeMetadata.selectText.4=Remove XMP Metadata
+changeMetadata.author=Author:
-changeMetadata.selectText.5=Remove annotations
+changeMetadata.creationDate=Creation Date (yyyy/MM/dd HH:mm:ss):
-changeMetadata.submit=remove data
+changeMetadata.creator=Creator:
+changeMetadata.keywords=Keywords:
+changeMetadata.modDate=Modification Date (yyyy/MM/dd HH:mm:ss):
+changeMetadata.producer=Producer:
+changeMetadata.subject=Subject:
+changeMetadata.title=Title:
+changeMetadata.trapped=Trapped:
+changeMetadata.selectText.4=Other Metadata:
+changeMetadata.selectText.5=Add Custom Metadata Entry
+changeMetadata.submit=Change
 
 
 

src/main/resources/messages_en_US.properties

@@ -12,6 +12,9 @@ genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
 pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) :
 goToPage=Go
+true=True
+false=False
+unknown=Unknown
 #############
 # HOME-PAGE #
 #############
@@ -190,16 +193,23 @@ removePassword.selectText.1=Select PDF to Decrypt
 removePassword.selectText.2=Password
 removePassword.submit=Remove
 
-changeMetadata.title=Remove Metadata
+changeMetadata.title=Change Metadata
-changeMetadata.header=Remove Metadata
+changeMetadata.header=Change Metadata
-changeMetadata.selectText.1=Select PDF to remove metadata from
+changeMetadata.selectText.1=Please edit the variables you wish to change
-changeMetadata.selectText.2=Remove document information
+changeMetadata.selectText.2=Delete all metadata
-changeMetadata.selectText.3=Remove page labels
+changeMetadata.selectText.3=Show Custom Metadata:
-changeMetadata.selectText.4=Remove XMP Metadata
+changeMetadata.author=Author:
-changeMetadata.selectText.5=Remove annotations
+changeMetadata.creationDate=Creation Date (yyyy/MM/dd HH:mm:ss):
-changeMetadata.submit=remove data
+changeMetadata.creator=Creator:
-
+changeMetadata.keywords=Keywords:
-
+changeMetadata.modDate=Modification Date (yyyy/MM/dd HH:mm:ss):
+changeMetadata.producer=Producer:
+changeMetadata.subject=Subject:
+changeMetadata.title=Title:
+changeMetadata.trapped=Trapped:
+changeMetadata.selectText.4=Other Metadata:
+changeMetadata.selectText.5=Add Custom Metadata Entry
+changeMetadata.submit=Change
 
 
 

src/main/resources/messages_fr_FR.properties

@@ -190,3 +190,21 @@ removePassword.header=Supprimer le mot de passe (Déchiffrer)
 removePassword.selectText.1=Sélectionnez le PDF à déchiffrer
 removePassword.selectText.2=Mot de passe
 removePassword.submit=Supprimer
+
+changeMetadata.title=Modifier les métadonnées
+changeMetadata.header=Modifier les métadonnées
+changeMetadata.selectText.1=Veuillez modifier les variables que vous souhaitez modifier
+changeMetadata.selectText.2=Supprimer toutes les métadonnées
+changeMetadata.selectText.3=Afficher les métadonnées personnalisées:
+changeMetadata.author=Auteur:
+changeMetadata.creationDate=Date de création (aaaa/MM/jj HH:mm:ss):
+changeMetadata.creator=Créateur:
+changeMetadata.keywords=Mots clés:
+changeMetadata.modDate=Date de modification (aaaa/MM/jj HH:mm:ss):
+changeMetadata.producer=Producteur:
+changeMetadata.subject=Objet:
+changeMetadata.title=Titre:
+changeMetadata.trapped=Piégé:
+changeMetadata.selectText.4=Autres métadonnées:
+changeMetadata.selectText.5=Ajouter une entrée de métadonnées personnalisées
+changeMetadata.submit=Modifier

src/main/resources/templates/adjust-contrast.html

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
-
-
-<th:block th:insert="~{fragments/common :: head(title=#{contrast.title})}"></th:block>
-
-
-<body>
-    <div id="page-container">
-        <div id="content-wrap">
-            <div th:insert="~{fragments/navbar.html :: navbar}"></div>
-            <br> <br>
-            <div class="container">
-                <div class="row justify-content-center">
-                    <div class="col-md-6">
-                        <h2 th:text="#{contrast.header}"></h2>
-                        <form action="#" th:action="@{adjust-contrast}" method="post" enctype="multipart/form-data">
-                            <p th:text="#{processTimeWarning}"></p>
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
-                            <div class="form-group">
-                                <label for="imagecontrastionLevel" th:text="#{contrast.contrastLevel}"></label> 
-                                <input type="number" class="form-control" id="imagecontrastionLevel" name="imagecontrastionLevel" step="1" value="1" min="1" max="100" required>
-                            </div>
-                            <button type="submit" class="btn btn-primary" th:text="#{contrast.submit}"></button>
-                        </form>
-                        <th:block th:insert="~{fragments/common :: filelist}"></th:block>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div th:insert="~{fragments/footer.html :: footer}"></div>
-    </div>
-</body>
-
-</html>

src/main/resources/templates/security/change-metadata.html

@@ -15,109 +15,106 @@
 
                         <form method="post" id="form1" enctype="multipart/form-data" th:action="@{/update-metadata}">
                             <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
-                            <p class="text-muted">Please select the variables you wish to change</p>
+                            <p class="text-muted" th:text="#{changeMetadata.selectText.1}"></p>
 
                             <div class="form-group-inline form-check">
                                 <input type="checkbox" class="form-check-input" id="deleteAll" name="deleteAll"> 
-                                <label class="ml-3" for="deleteAll">Delete all metadata</label>
+                                <label class="ml-3" for="deleteAll"  th:text="#{changeMetadata.selectText.2}" ></label>
                             </div>
 
                             <div class="form-group-inline form-check">
-                                <input type="checkbox" class="form-check-input" id="advancedModeCheckbox"> 
+                                <input type="checkbox" class="form-check-input" id="customModeCheckbox"> 
-                                <label class="ml-3" for="advancedModeCheckbox">Show Advanced Metadata:</label>
+                                <label class="ml-3" for="customModeCheckbox" th:text="#{changeMetadata.selectText.3}"></label>
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="author">Author:</label> 
+                                <label class="form-check-label" for="author" th:text="#{changeMetadata.author}"></label> 
                                 <input type="text" class="form-control" id="author" name="author">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="creationDate">Creation Date:</label> 
+                                <label class="form-check-label" for="creationDate" th:text="#{changeMetadata.creationDate}"></label> 
                                 <input type="text" class="form-control" id="creationDate" name="creationDate" placeholder="2020/12/25 18:30:59">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="creator">Creator:</label> 
+                                <label class="form-check-label" for="creator" th:text="#{changeMetadata.creator}"></label> 
                                 <input type="text" class="form-control" id="creator" name="creator">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="keywords">Keywords:</label> 
+                                <label class="form-check-label" for="keywords" th:text="#{changeMetadata.keywords}"></label> 
                                 <input type="text" class="form-control" id="keywords" name="keywords">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="modificationDate">Modification Date:</label> 
+                                <label class="form-check-label" for="modificationDate" th:text="#{changeMetadata.modDate}"></label> 
                                 <input type="text" class="form-control" id="modificationDate" name="modificationDate" placeholder="2020/12/25 18:30:59">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="producer">Producer:</label> 
+                                <label class="form-check-label" for="producer" th:text="#{changeMetadata.producer}"></label> 
                                 <input type="text" class="form-control" id="producer" name="producer">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="subject">Subject:</label> 
+                                <label class="form-check-label" for="subject" th:text="#{changeMetadata.subject}"></label> 
                                 <input type="text" class="form-control" id="subject" name="subject">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="title">Title:</label> 
+                                <label class="form-check-label" for="title" th:text="#{changeMetadata.title}"></label> 
                                 <input type="text" class="form-control" id="title" name="title">
                             </div>
 
                             <div class="form-group">
-                                <label class="form-check-label" for="trapped">Trapped:</label> 
+                                <label class="form-check-label" for="trapped" th:text="#{changeMetadata.trapped}"></label> 
                                 <select class="form-control" id="trapped" name="trapped">
-                                    <option value="True">True</option>
+                                    <option value="True" th:text="#{true}"></option>
-                                    <option value="False">False</option>
+                                    <option value="False"  th:text="#{false}" selected></option>
-                                    <option value="Unknown">Unknown</option>
+                                    <option value="Unknown" th:text="#{unknown}"></option>
                                   </select>
                             </div>
-                            <div id="advancedMetadata" style="display: none;">
+                            <div id="customMetadata" style="display: none;">
-                                <h3>Other Metadata:</h3>
+                                <h3 th:text="#{changeMetadata.selectText.4}"></h3>
                                 <div class="form-group" id="otherMetadataEntries"></div>
                             </div>
                             <div id="customMetadataEntries"></div>
-                            <button type="button" class="btn btn-secondary" id="addMetadataBtn">Add Custom Metadata Entry</button>
+                            <button type="button" class="btn btn-secondary" id="addMetadataBtn" th:text="#{changeMetadata.selectText.5}"></button>
                             <br>
                             <br>
-                            <button class="btn btn-primary" type="submit">Save Changes and Download PDF</button>
+                            <button class="btn btn-primary" type="submit" th:text="#{changeMetadata.submit}"></button>
                             <script>
   
-  
+    const deleteAllCheckbox = document.querySelector("#deleteAll");
-  const advancedModeCheckbox = document.getElementById('advancedModeCheckbox');
+    const inputs = document.querySelectorAll(".form-control");
-  const advancedMetadataDiv = document.getElementById('advancedMetadata');
+    const customMetadataDiv = document.getElementById('customMetadata');
     const otherMetadataEntriesDiv = document.getElementById('otherMetadataEntries');
     
+    deleteAllCheckbox.addEventListener("change", function(event) {
+      if (event.target !== deleteAllCheckbox) {
+        return;
+      }
+
+      inputs.forEach(input => {
+        if (input === deleteAllCheckbox) {
+          return;
+        }
+        input.disabled = deleteAllCheckbox.checked;
+      });
+    });
+                            
+                            
+  const customModeCheckbox = document.getElementById('customModeCheckbox');
+  
+  
+
   
   
   const addMetadataBtn = document.getElementById("addMetadataBtn");
   const customMetadataFormContainer = document.getElementById("customMetadataEntries");
   var count = 1;
-  addMetadataBtn.addEventListener("click", () => {
-    const keyInput = document.createElement("input");
-    keyInput.type = "text";
-    keyInput.placeholder = "Key";
-    keyInput.className = "form-control";
-    keyInput.name = "customKey" + count;
   
-    const valueInput = document.createElement("input");
-    valueInput.type = "text";
-    valueInput.placeholder = "Value";
-    valueInput.className = "form-control";
-    valueInput.name = "customValue1" + count;
-    count = count + 1;
-    
-    const formGroup = document.createElement("div");
-    formGroup.className = "form-group";
-    formGroup.appendChild(keyInput);
-    formGroup.appendChild(valueInput);
-    
-    
-    customMetadataFormContainer.appendChild(formGroup);
-  });
 
   
 
@@ -134,6 +131,16 @@
   
   var lastPDFFileMeta = null;
   fileInput.addEventListener("change", async function() {
+	  
+	  while (otherMetadataEntriesDiv.firstChild) {
+		  otherMetadataEntriesDiv.removeChild(otherMetadataEntriesDiv.firstChild);
+	  }
+	  while (customMetadataFormContainer.firstChild) {
+		  customMetadataFormContainer.removeChild(customMetadataFormContainer.firstChild);
+      }
+	  
+	  
+	  
     const file = this.files[0];
     var url = URL.createObjectURL(file)
 
@@ -149,10 +156,42 @@
     producerInput.value = pdfMetadata?.info?.Producer;
     subjectInput.value = pdfMetadata?.info?.Subject;
     titleInput.value = pdfMetadata?.info?.Title;
-    trappedInput.value = pdfMetadata?.info?.Trapped;
+    console.log(pdfMetadata?.info);
-    
+    const trappedValue = pdfMetadata?.info?.Trapped;
+    // Get all options in the select element
+    const options = trappedInput.options;
+    // Loop through all options to find the one with a matching value
+    for (let i = 0; i < options.length; i++) {
+      if (options[i].value === trappedValue) {
+        options[i].selected = true;
+        break;
+      }
+    }  
     addExtra();
   });
+  
+  addMetadataBtn.addEventListener("click", () => {
+	    const keyInput = document.createElement("input");
+	    keyInput.type = "text";
+	    keyInput.placeholder = "Key";
+	    keyInput.className = "form-control";
+	    keyInput.name = "customKey" + count;
+	    
+	    const valueInput = document.createElement("input");
+	    valueInput.type = "text";
+	    valueInput.placeholder = "Value";
+	    valueInput.className = "form-control";
+	    valueInput.name = "customValue" + count;
+	    count = count + 1;
+	    
+	    const formGroup = document.createElement("div");
+	    formGroup.className = "form-group";
+	    formGroup.appendChild(keyInput);
+	    formGroup.appendChild(valueInput);
+	    
+	    
+	    customMetadataFormContainer.appendChild(formGroup);
+	  });
   function convertDateFormat(dateTimeString) {
 	  if (!dateTimeString || dateTimeString.length < 17) {
 	    return dateTimeString;
@@ -169,12 +208,12 @@
 	}
   
     function addExtra() {
-         const event = document.getElementById("advancedModeCheckbox");
+         const event = document.getElementById("customModeCheckbox");
         
     
-        if (event.checked) {
+        if (event.checked && lastPDFFile?.Custom) {
-          advancedMetadataDiv.style.display = 'block';
+          customMetadataDiv.style.display = 'block';
-          for (const [key, value] of Object.entries(lastPDFFile)) {
+          for (const [key, value] of Object.entries(lastPDFFile.Custom)) {
             if (key === 'Author' || key === 'CreationDate' || key === 'Creator' || key === 'Keywords' || key === 'ModDate' || key === 'Producer' || key === 'Subject' || key === 'Title' || key === 'Trapped') {
               continue;
             }
@@ -187,7 +226,7 @@
             otherMetadataEntriesDiv.appendChild(entryDiv);
           }
         } else {
-          advancedMetadataDiv.style.display = 'none';
+          customMetadataDiv.style.display = 'none';
           while (otherMetadataEntriesDiv.firstChild) {
             otherMetadataEntriesDiv.removeChild(otherMetadataEntriesDiv.firstChild);
           }
@@ -196,7 +235,7 @@
     
     }
     
-  advancedModeCheckbox.addEventListener('change', (event) => {
+  customModeCheckbox.addEventListener('change', (event) => {
      
       addExtra();
       });