Merge 40eeead52c into e5c0ddc9fa

docs/webserver.md

@@ -153,7 +153,7 @@ Click **File Manager** to access file management features.
 
 1. Click the **+ Add** button in the top-right corner
 2. Select **New Folder** from the dropdown menu
-3. Enter a folder name (must not contain characters \" * : < > ? / \\ | and must not be . or ..)
+3. Enter a folder name (letters, numbers, underscores, and hyphens only)
 4. Click **Create Folder**
 
 This is useful for organizing your ebooks by genre, author, or series.

lib/GfxRenderer/GfxRenderer.cpp

@@ -318,37 +318,37 @@ void GfxRenderer::fillRoundedRect(const int x, const int y, const int width, con
 
   const int horizontalWidth = width - 2 * maxRadius;
   if (horizontalWidth > 0) {
-    fillRectDither(x + maxRadius + 1, y, horizontalWidth - 2, height, color);
+    fillRectDither(x + maxRadius, y, horizontalWidth, height, color);
   }
 
-  const int verticalHeight = height - 2 * maxRadius - 2;
+  const int verticalHeight = height - 2 * maxRadius;
   if (verticalHeight > 0) {
-    fillRectDither(x, y + maxRadius + 1, maxRadius + 1, verticalHeight, color);
-    fillRectDither(x + width - maxRadius - 1, y + maxRadius + 1, maxRadius + 1, verticalHeight, color);
+    fillRectDither(x, y + maxRadius, maxRadius, verticalHeight, color);
+    fillRectDither(x + width - maxRadius, y + maxRadius, maxRadius, verticalHeight, color);
   }
 
   if (roundTopLeft) {
     fillArc(maxRadius, x + maxRadius, y + maxRadius, -1, -1, color);
   } else {
-    fillRectDither(x, y, maxRadius + 1, maxRadius + 1, color);
+    fillRectDither(x, y, maxRadius, maxRadius, color);
   }
 
   if (roundTopRight) {
     fillArc(maxRadius, x + width - maxRadius - 1, y + maxRadius, 1, -1, color);
   } else {
-    fillRectDither(x + width - maxRadius - 1, y, maxRadius + 1, maxRadius + 1, color);
+    fillRectDither(x + width - maxRadius, y, maxRadius, maxRadius, color);
   }
 
   if (roundBottomRight) {
     fillArc(maxRadius, x + width - maxRadius - 1, y + height - maxRadius - 1, 1, 1, color);
   } else {
-    fillRectDither(x + width - maxRadius - 1, y + height - maxRadius - 1, maxRadius + 1, maxRadius + 1, color);
+    fillRectDither(x + width - maxRadius, y + height - maxRadius, maxRadius, maxRadius, color);
   }
 
   if (roundBottomLeft) {
     fillArc(maxRadius, x + maxRadius, y + height - maxRadius - 1, -1, 1, color);
   } else {
-    fillRectDither(x, y + height - maxRadius - 1, maxRadius + 1, maxRadius + 1, color);
+    fillRectDither(x, y + height - maxRadius, maxRadius, maxRadius, color);
   }
 }
 

src/network/html/FilesPage.html

@@ -1146,10 +1146,10 @@ function retryAllFailedUploads() {
       return;
     }
 
-    // Validate folder name
-    const validName = /^(?!\.{1,2}$)[^"*:<>?\/\\|]+$/.test(folderName);
+    // Validate folder name (no special characters except underscore and hyphen)
+    const validName = /^[a-zA-Z0-9_\-]+$/.test(folderName);
     if (!validName) {
-      alert('Folder name cannot contain \" * : < > ? / \\ | and must not be . or ..');
+      alert('Folder name can only contain letters, numbers, underscores, and hyphens.');
       return;
     }