OO-4201: validate the quota numbers (as number and between 1 and 5TB)

src/main/java/org/olat/admin/quota/QuotaForm.java

@@ -38,6 +38,8 @@ import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.Formatter;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.vfs.Quota;
 import org.olat.core.util.vfs.QuotaManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Mike Stock
  */
 public class QuotaForm extends FormBasicController {
+	
+	private static final long MAX_QUOTA = 5l * 1000l * 1000l * 1000l;
 
 	private TextElement path;
 	private TextElement quotaKB;
@@ -101,9 +105,7 @@ public class QuotaForm extends FormBasicController {
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		if (quota != null && quota.getPath() != null && !quota.getPath().equals("")) {
 			path = uifactory.addTextElement("qf_path", "qf.path", 255, quota.getPath(), formLayout);
-			if (quota != null) {
-				path.setEnabled(false);
-			}
+			path.setEnabled(false);
 		} else {
 			path = uifactory.addTextElement("qf_path", "qf.path", 255, "", formLayout);
 			path.setNotEmptyCheck("qf.error.path.invalid");
@@ -149,6 +151,36 @@ public class QuotaForm extends FormBasicController {
 			path.setErrorKey("qf.error.path.invalid", null);
 			allOk &= false;	
 		}
+		allOk &= validateQuota(quotaKB);
+		allOk &= validateQuota(ulLimitKB);
+		return allOk;
+	}
+	
+	private boolean validateQuota(TextElement textEl) {
+		boolean allOk = true;
+		
+		textEl.clearError();
+		if(textEl.isEnabled()) {
+			
+			if(!StringHelper.containsNonWhitespace(textEl.getValue())) {
+				textEl.setErrorKey("form.legende.mandatory", null);
+				allOk &= false;
+			} else if(!StringHelper.isLong(textEl.getValue())) {
+				textEl.setErrorKey("form.error.nointeger", null);
+				allOk &= false;
+			} else {
+				try {
+					long val = Long.parseLong(textEl.getValue());
+					if(val <= 0 || val > MAX_QUOTA) {
+						textEl.setErrorKey("error.quota.range", new String[] { Long.toString(MAX_QUOTA), Formatter.formatBytes(MAX_QUOTA * 1000l) });
+						allOk &= false;
+					}
+				} catch (NumberFormatException e) {
+					textEl.setErrorKey("form.error.nointeger", null);
+					allOk &= false;
+				}
+			}
+		}
 		
 		return allOk;
 	}

src/main/java/org/olat/admin/quota/QuotaTableModel.java

@@ -29,14 +29,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.core.gui.components.table.BaseTableDataModelWithoutFilter;
-import org.olat.core.gui.components.table.TableDataModel;
 import org.olat.core.util.vfs.Quota;
 
 /**
  * Initial Date: Mar 30, 2004
  * @author Mike Stock 
  */
-public class QuotaTableModel extends BaseTableDataModelWithoutFilter<Quota> implements TableDataModel<Quota> {
+public class QuotaTableModel extends BaseTableDataModelWithoutFilter<Quota> {
 
 	private List<Quota> quotaList;
 

src/main/java/org/olat/admin/quota/_i18n/LocalStrings_de.properties

 #Mon Mar 02 09:54:03 CET 2009
+error.quota.range=Bitte geben Sie ein Quota zwischen 1 und {0} ({1}) ein.
 qd.coursefolder=Kursordner
 qd.groups=Gruppen
 qd.nodefolder=Kursbausteine

src/main/java/org/olat/admin/quota/_i18n/LocalStrings_en.properties

 #Fri Feb 24 12:00:07 CET 2012
+error.quota.range=Please enter a quota between 1 and {0} ({1}).
 qd.coursefolder=Course folder
 qd.feeds=Blogs and podcasts
 qd.groups=Groups

src/main/java/org/olat/admin/quota/_i18n/LocalStrings_fr.properties

 #Fri Sep 07 11:33:33 CEST 2018
+error.quota.range=Entrez s'il vous pla\u00EEt un quota entre 1 et {0} ({1}).
 qd.coursefolder=Dossier de cours
 qd.feeds=Blogues et podcasts
 qd.groups=Groupes

src/main/java/org/olat/core/util/Formatter.java

@@ -386,7 +386,7 @@ public class Formatter {
 	 * @return human readable formatted bytes
 	 */
 	public static String formatBytes(long bytes) {
-	    int unit = BYTE_UNIT;
+	    long unit = BYTE_UNIT;
 	    if (bytes < unit) return bytes + " B";
 	    int exp = (int) (Math.log(bytes) / Math.log(unit));
 	    String pre = "kMGTPE".charAt(exp-1) + "";