Merge branch 'removeReadOnlyFromForms' of github.com:PedroPF1233/Stirling-PDF into removeReadOnlyFromForms

.github/workflows/multiOSReleases.yml

@@ -70,7 +70,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
-          gradle-version: 8.12
+          gradle-version: 8.14
 
       - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe
@@ -158,7 +158,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
-          gradle-version: 8.12
+          gradle-version: 8.14
 
       # Install Windows dependencies
       - name: Install WiX Toolset

.github/workflows/push-docker.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
-          gradle-version: 8.12
+          gradle-version: 8.14
 
       - name: Run Gradle Command
         run: ./gradlew clean build

.github/workflows/releaseArtifacts.yml

@@ -37,7 +37,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
-          gradle-version: 8.12
+          gradle-version: 8.14
 
       - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe

README.md

@@ -128,14 +128,14 @@ Stirling-PDF currently supports 39 languages!
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
 | French (Français) (fr_FR)                    | ![92%](https://geps.dev/progress/92)   |
-| German (Deutsch) (de_DE)                     | ![94%](https://geps.dev/progress/94)   |
+| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
 | Greek (Ελληνικά) (el_GR)                     | ![91%](https://geps.dev/progress/91)   |
 | Hindi (हिंदी) (hi_IN)                          | ![92%](https://geps.dev/progress/92)   |
 | Hungarian (Magyar) (hu_HU)                   | ![89%](https://geps.dev/progress/89)   |
 | Indonesian (Bahasa Indonesia) (id_ID)        | ![81%](https://geps.dev/progress/81)   |
 | Irish (Gaeilge) (ga_IE)                      | ![92%](https://geps.dev/progress/92)   |
 | Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                    | ![89%](https://geps.dev/progress/89)   |
+| Japanese (日本語) (ja_JP)                    | ![94%](https://geps.dev/progress/94)   |
 | Korean (한국어) (ko_KR)                      | ![92%](https://geps.dev/progress/92)   |
 | Norwegian (Norsk) (no_NB)                    | ![86%](https://geps.dev/progress/86)   |
 | Persian (فارسی) (fa_IR)                      | ![88%](https://geps.dev/progress/88)   |

build.gradle

@@ -404,7 +404,7 @@ sonar {
 //        rules=['unused-dependency']
 //    }
 tasks.wrapper {
-    gradleVersion = "8.12"
+    gradleVersion = "8.14"
     distributionType = Wrapper.DistributionType.ALL
 }
 //tasks.withType(JavaCompile) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -1 +1,5 @@
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}
 rootProject.name = 'Stirling-PDF'

src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java

@@ -121,7 +121,7 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         if (probe.isConsumed()) {
             response.setHeader(
                     "X-Rate-Limit-Remaining",
-                    Newlines.stripAll(Long.toString(probe.getRemainingTokens())));
+                    stripNewlines(Newlines.stripAll(Long.toString(probe.getRemainingTokens()))));
             filterChain.doFilter(request, response);
         } else {
             long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000;
@@ -141,4 +141,8 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
                         .build();
         return Bucket.builder().addLimit(limit).build();
     }
+
+    private static String stripNewlines(final String s) {
+        return s.replaceAll("[\n\r]", "");
+    }
 }

src/main/resources/static/js/multitool/PdfContainer.js

@@ -34,7 +34,8 @@ class PdfContainer {
     this.splitPDF = this.splitPDF.bind(this);
     this.splitAll = this.splitAll.bind(this);
     this.deleteSelected = this.deleteSelected.bind(this);
-    this.toggleSelectAll = this.toggleSelectAll.bind(this);
+    this.selectAll = this.selectAll.bind(this);
+    this.deselectAll = this.deselectAll.bind(this);
     this.updateSelectedPagesDisplay = this.updateSelectedPagesDisplay.bind(this);
     this.toggleSelectPageVisibility = this.toggleSelectPageVisibility.bind(this);
     this.updatePagesFromCSV = this.updatePagesFromCSV.bind(this);
@@ -63,7 +64,8 @@ class PdfContainer {
     window.rotateAll = this.rotateAll;
     window.splitAll = this.splitAll;
     window.deleteSelected = this.deleteSelected;
-    window.toggleSelectAll = this.toggleSelectAll;
+    window.selectAll = this.selectAll;
+    window.deselectAll = this.deselectAll;
     window.updateSelectedPagesDisplay = this.updateSelectedPagesDisplay;
     window.toggleSelectPageVisibility = this.toggleSelectPageVisibility;
     window.updatePagesFromCSV = this.updatePagesFromCSV;
@@ -72,7 +74,6 @@ class PdfContainer {
     window.addFilesBlankAll = this.addFilesBlankAll;
     window.removeAllElements = this.removeAllElements;
     window.resetPages = this.resetPages;
-    window.selectAll = false;
 
     let undoBtn = document.getElementById('undo-btn');
     let redoBtn = document.getElementById('redo-btn');
@@ -433,33 +434,43 @@ class PdfContainer {
     this.undoManager.pushUndoClearRedo(removeSelectedCommand);
   }
 
-  toggleSelectAll() {
+  selectAll() {
     const checkboxes = document.querySelectorAll('.pdf-actions_checkbox');
-    window.selectAll = !window.selectAll;
     const selectIcon = document.getElementById('select-All-Container');
     const deselectIcon = document.getElementById('deselect-All-Container');
 
-    if (!window.selectAll) {
+    this.showButton(selectIcon, false);
-      this.showButton(selectIcon, true);
+    this.showButton(deselectIcon, true);
-      this.showButton(deselectIcon, false);
+
-    } else {
-      this.showButton(selectIcon, false);
-      this.showButton(deselectIcon, true);
-    }
     checkboxes.forEach((checkbox) => {
-      checkbox.checked = window.selectAll;
+      checkbox.checked = true;
 
       const pageNumber = Array.from(checkbox.parentNode.parentNode.children).indexOf(checkbox.parentNode) + 1;
 
-      if (checkbox.checked) {
+      if (!window.selectedPages.includes(pageNumber)) {
-        if (!window.selectedPages.includes(pageNumber)) {
+        window.selectedPages.push(pageNumber);
-          window.selectedPages.push(pageNumber);
+      }
-        }
+    });
-      } else {
+
-        const index = window.selectedPages.indexOf(pageNumber);
+    this.updateSelectedPagesDisplay();
-        if (index !== -1) {
+  }
-          window.selectedPages.splice(index, 1);
+
-        }
+  deselectAll() {
+    const checkboxes = document.querySelectorAll('.pdf-actions_checkbox');
+    const selectIcon = document.getElementById('select-All-Container');
+    const deselectIcon = document.getElementById('deselect-All-Container');
+
+    this.showButton(selectIcon, true);
+    this.showButton(deselectIcon, false);
+    
+    checkboxes.forEach((checkbox) => {
+      checkbox.checked = false;
+
+      const pageNumber = Array.from(checkbox.parentNode.parentNode.children).indexOf(checkbox.parentNode) + 1;
+
+      const index = window.selectedPages.indexOf(pageNumber);
+      if (index !== -1) {
+        window.selectedPages.splice(index, 1);
       }
     });
 
@@ -569,6 +580,34 @@ class PdfContainer {
 
     // Update the input field with the formatted page list
     selectedPagesInput.value = this.formatSelectedPages(window.selectedPages);
+
+    const selectIcon = document.getElementById('select-All-Container');
+    const deselectIcon = document.getElementById('deselect-All-Container');
+    
+    if (window.selectPage) { // Check if selectPage mode is active
+      console.log("Page Select on. Showing buttons");
+      //Check if no pages are selected
+      if (window.selectedPages.length === 0) {
+        this.showButton(selectIcon, true);
+        this.showButton(deselectIcon, false);
+      } else {
+        this.showButton(deselectIcon, true);
+      }
+
+      //Check if all pages are selected
+      const allCheckboxes = document.querySelectorAll('.pdf-actions_checkbox');
+      const allSelected = Array.from(allCheckboxes).every((checkbox) => checkbox.checked);
+      if (allSelected) {
+        this.showButton(selectIcon, false);
+        this.showButton(deselectIcon, true);
+      } else {
+        this.showButton(selectIcon, true);
+      }
+    } else {
+      console.log("Page Select off. Hidding buttons");
+      this.showButton(selectIcon, false);
+      this.showButton(deselectIcon, false);
+    }
   }
 
   parsePageRanges(ranges) {
@@ -793,13 +832,9 @@ class PdfContainer {
     });
 
     const checkboxes = document.querySelectorAll('.pdf-actions_checkbox');
-    window.selectAll = false;
     const selectIcon = document.getElementById('select-All-Container');
     const deselectIcon = document.getElementById('deselect-All-Container');
 
-    selectIcon.style.display = 'inline';
-    deselectIcon.style.display = 'none';
-
     checkboxes.forEach((checkbox) => {
       const pageNumber = Array.from(checkbox.parentNode.parentNode.children).indexOf(checkbox.parentNode) + 1;
 
@@ -852,18 +887,30 @@ class PdfContainer {
     deleteButton.classList.toggle('hidden', !window.selectPage);
     const selectedPages = document.getElementById('selected-pages-display');
     selectedPages.classList.toggle('hidden', !window.selectPage);
+
     if(!window.selectPage)
     {
       this.showButton(document.getElementById('deselect-All-Container'), false);
       this.showButton(document.getElementById('select-All-Container'), false);
-    }
+
-    else if(window.selectAll){
+      // Uncheck all checkboxes and clear selected pages
-      this.showButton(document.getElementById('deselect-All-Container'), true);
+      const allCheckboxes = document.querySelectorAll('.pdf-actions_checkbox');
-      this.showButton(document.getElementById('select-All-Container'), false);
+      allCheckboxes.forEach((checkbox) => {
+        checkbox.checked = false;
+      });
+      window.selectedPages = [];
+      this.updateSelectedPagesDisplay();
     }
     else{
-      this.showButton(document.getElementById('deselect-All-Container'), false);
+      const allCheckboxes = document.querySelectorAll('.pdf-actions_checkbox');
-      this.showButton(document.getElementById('select-All-Container'), true);
+      const allSelected = Array.from(allCheckboxes).every((checkbox) => checkbox.checked);
+      if (!allSelected) {
+        this.showButton(document.getElementById('select-All-Container'), true);
+      }
+      
+      if (window.selectedPages.length > 0) {
+        this.showButton(document.getElementById('deselect-All-Container'), true);
+      }
     }
 
     const exportSelected = document.getElementById('export-selected-button');

src/main/resources/templates/multi-tool.html

@@ -94,11 +94,11 @@
                   </span>
                 </button>
                 <button id="deselect-All-Container" th:title="#{multiTool.deselectAll}"
-                  class="btn btn-secondary enable-on-file hidden" onclick="toggleSelectAll()" disabled>
+                  class="btn btn-secondary enable-on-file hidden" onclick="deselectAll()" disabled>
                   <span class="material-symbols-rounded" id="deselect-icon">deselect</span>
                 </button>
                 <button id="select-All-Container" th:title="#{multiTool.selectAll}"
-                  class="btn btn-secondary enable-on-file hidden" onclick="toggleSelectAll()" disabled>
+                  class="btn btn-secondary enable-on-file hidden" onclick="selectAll()" disabled>
                   <span class="material-symbols-rounded" id="select-icon">select_all</span>
                 </button>
                 <button id="delete-button" th:title="#{multiTool.deleteSelected}"

testing/test_webpages.sh

@@ -26,7 +26,7 @@ check_webpage() {
   fi
 
   # Check if response contains HTML
-  if ! printf '%s' "$BODY" | grep -q "<!DOCTYPE html>\|<html"; then
+  if ! grep -q "<!DOCTYPE html>\|<html" <<< "$BODY"; then
     echo "FAILED - Response is not HTML - $full_url" >> "$result_file"
     return 1
   fi