From d5a7ff9500d4a206bc9780c2deab54e96c7c3f79 Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 10 Jan 2013 16:39:58 +0100
Subject: [PATCH] Squid: added check if ram cache is greater than harddisk
 cache

---
 html/cgi-bin/proxy.cgi | 5 +++++
 langs/de/cgi-bin/de.pl | 1 +
 langs/en/cgi-bin/en.pl | 1 +
 3 files changed, 7 insertions(+)

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 015502a4e5..991d69109b 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -348,6 +348,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
 		$errormessage = $Lang::tr{'invalid input'};
 		goto ERROR;
 	}
+	if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'}){
+		$errormessage = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
+		goto ERROR;
+	}
+	
 	if (!(&General::validport($proxysettings{'PROXY_PORT'})))
 	{
 		$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ca5dbb3f86..9c3d281ef8 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -212,6 +212,7 @@
 'advproxy errmsg auth children' => 'Ungültige Anzahl Authentifizierungsprozesse',
 'advproxy errmsg auth ipcache may not be null' => 'Authentifizierungscache TTL darf nicht 0 sein wenn IP-Adressbeschränkungen verwendet werden',
 'advproxy errmsg auth ipcache ttl' => 'Ungültiger Wert für Benutzer/IP-Cache TTL',
+'advproxy errmsg cache' => 'Der RAM-Cache-Größe ist größer als die Festplatten-Cache-Größe:',
 'advproxy errmsg change fail' => 'Passwort konnte nicht geändert werden',
 'advproxy errmsg change success' => 'Passwort für Webzugriff erfolgreich geändert',
 'advproxy errmsg hdd cache size' => 'Ungültiger Wert für die Größe des Festplatten-Cachespeichers (min. 10 MB erforderlich)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ede45179fc..23df6bd6a8 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -212,6 +212,7 @@
 'advproxy errmsg auth children' => 'Invalid number of authentication processes',
 'advproxy errmsg auth ipcache may not be null' => 'Authentication cache TTL may not be 0 when using IP address limits',
 'advproxy errmsg auth ipcache ttl' => 'Invalid value for user/IP cache TTL',
+'advproxy errmsg cache' => 'The RAM cache size is greater than the harddisk cache size:',
 'advproxy errmsg change fail' => 'Password could not be changed',
 'advproxy errmsg change success' => 'Password for web access sucessfully changed',
 'advproxy errmsg hdd cache size' => 'Invalid value for harddisk cache size (min 10 MB required)',
-- 
2.39.2