Only save one file

fixes for changes made in shorewall 4.5.3, 4.5.11 and 4.6.0

README

@@ -1,4 +1,4 @@
-Webmin Version 1.780
+Webmin Version 1.790
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

acl/acl-lib.pl

@@ -2163,5 +2163,21 @@ elsif ($str =~ /^postgresql:/) {
 	}
 }
 
+# used_for_anonymous(username)
+# Returns a list of modules this user has an anonymous grant to
+sub used_for_anonymous
+{
+my ($user) = @_;
+my @rv;
+my %miniserv;
+&get_miniserv_config(\%miniserv);
+foreach $a (split(/\s+/, $miniserv{'anonymous'})) {
+        if ($a =~ /^([^=]+)=(\S+)$/ && $2 eq $user) {
+		push(@rv, $1);
+		}
+	}
+return @rv;
+}
+
 1;
 

acl/delete_user.cgi

@@ -10,6 +10,7 @@ our (%in, %text, %config, %access, $base_remote_user);
 &error_setup($text{'delete_err'});
 $access{'delete'} || &error($text{'delete_ecannot'});
 &can_edit_user($in{'user'}) || &error($text{'delete_euser'});
+&used_for_anonymous($in{'user'}) && &error($text{'delete_eanonuser'});
 if ($base_remote_user eq $in{'user'}) {
 	&error($text{'delete_eself'});
 	}

acl/delete_users.cgi

@@ -17,6 +17,7 @@ foreach my $user (@d) {
 	if ($base_remote_user eq $user && !$in{'joingroup'}) {
 		&error($text{'delete_eself'});
 		}
+	&used_for_anonymous($user) && &error($text{'delete_eanonuser'});
 	my $uinfo = &get_user($user);
 	$uinfo->{'readonly'} && &error($text{'udeletes_ereadonly'});
 	}

acl/lang/ca

@@ -362,6 +362,7 @@ rbac_ecpan=No tens acc
 rbac_ok=La integració amb RBAC està disponible en aquest sistema, i es pot activar en base a cada usuari a la pàgina d'Edició d'Usuaris Webmin.
 
 udeletes_err=No s'han pogut suprimir els usuaris
+udeletes_jerr=No s'han pogut afegir els usuaris al grup
 udeletes_enone=No n'has seleccionat cap
 udeletes_title=Supressió d'Usuaris
 udeletes_rusure=Segur que vols suprimir els $1 usuaris seleccionats? Es perdran tots els seus detalls i totes les seves configuracions de control d'accés.

acl/lang/de

@@ -100,6 +100,7 @@ cpass_notre=Entspricht einen nicht erlaubten Muster
 cpass_old=Alte Kennwörter können nicht wieder verwendet werden
 cpass_re=Entspricht nicht einem erforderlichen Muster
 cpass_spellcmd=Entweder der $1 oder $2 Befehl muss installiert sein um eine Wörterbuchprüfung durchzuführen
+delete_eanonuser=Dieser Benutzer wird für anonymen Modul-Zugriff verwendet
 delete_ecannot=Sie haben keine Berechtigung Benutzer zu löschen
 delete_err=Fehler beim Löschen des Benutzers
 delete_eself=Sie können sich selber nicht löschen

acl/lang/en

@@ -146,6 +146,7 @@ delete_err=Failed to delete user
 delete_eself=You cannot delete yourself
 delete_ecannot=You are not allowed to delete users
 delete_euser=You are not allowed to delete this user
+delete_eanonuser=This user is being used for anonymous module access
 
 cert_title=Request Certificate
 cert_issue=Issue Certificate

acl/lang/no

@@ -421,6 +421,7 @@ twofactor_title=To-faktor autentisering
 udeletes_enone=Ingen valgt
 udeletes_ereadonly=En av de valgte brukerne er merket som ikke-redigerbar
 udeletes_err=Kunne ikke slette brukere
+udeletes_jerr=Kunne ikke legg til brukere i gruppe
 udeletes_ok=Slett brukere
 udeletes_rusure=Er du sikker på at du ønsker å slette de $1 valgte brukerne? Alle deres tilgangskontroll innstillinger og andre brukerdetaljer vil gå tapt.
 udeletes_title=Slett brukere

apache/lang/no

@@ -186,6 +186,7 @@ core_edefchar=Manglende eller ugyldig tegnsett for dokumenter
 core_edefmime=Standard MIME type må være på formen type/undertype
 core_edefport=Ugyldig standard port
 core_edirlog=Feil-logg filen ligger ikke under tillatt katalog
+core_eduplisten=Lytte-adressen $1 er angitt to ganger
 core_eerror='$1' er ikke en gyldig feilkode
 core_eerrordir=Katalog for feillogg filen finnes ikke
 core_efilelog=Ugyldig feillogg fil

bacula-backup/bacula-backup-lib.pl

@@ -552,7 +552,8 @@ sub is_bacula_running
 local ($proc) = @_;
 if (&has_command($bacula_cmd)) {
 	# Get status from bacula status command
-	$bacula_status_cache ||= `$bacula_cmd status 2>&1 </dev/null`;
+	$bacula_status_cache ||=
+		&backquote_command("$bacula_cmd status 2>&1 </dev/null");
 	if ($bacula_status_cache =~ /\Q$proc\E\s+\(pid\s+([0-9 ]+)\)\s+is\s+running/i ||
 	    $bacula_status_cache =~ /\Q$proc\E\s+is\s+running/i) {
 		return 1;
@@ -819,17 +820,17 @@ local $jobs = &console_cmd($h, "show jobs");
 local @rv;
 local $job;
 foreach my $l (split(/\r?\n/, $jobs)) {
-	if ($l =~ /^Job:\s+name=([^=]*\S)\s/ ||
-	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
+	if ($l =~ /^Job:\s+name=([^=]*\S)\s/i ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/i) {
 		$job = { 'name' => $1 };
 		push(@rv, $job);
 		}
-	elsif (($l =~ /Client:\s+name=([^=]*\S)\s/ ||
-		$l =~ /^\s*Client\s*=\s*"(.*)"/) && $job) {
+	elsif (($l =~ /Client:\s+name=([^=]*\S)\s/i ||
+		$l =~ /^\s*Client\s*=\s*"(.*)"/i) && $job) {
 		$job->{'client'} = $1;
 		}
-	elsif (($l =~ /FileSet:\s+name=([^=]*\S)\s/ ||
-	        $l =~ /^FileSet\s*=\s*"(.*)"/) && $job) {
+	elsif (($l =~ /FileSet:\s+name=([^=]*\S)\s/i ||
+	        $l =~ /^FileSet\s*=\s*"(.*)"/i) && $job) {
 		$job->{'fileset'} = $1;
 		}
 	}
@@ -846,21 +847,21 @@ local $clients = &console_cmd($h, "show clients");
 local @rv;
 local $client;
 foreach my $l (split(/\r?\n/, $clients)) {
-	if ($l =~ /^Client:\s+name=([^=]*\S)\s/ ||
-	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
+	if ($l =~ /^Client:\s+name=([^=]*\S)\s/i ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/i) {
 		$client = { 'name' => $1 };
-		if ($l =~ /address=(\S+)/ && $client) {
+		if ($l =~ /address=(\S+)/i && $client) {
 			$client->{'address'} = $1;
 			}
-		if ($l =~ /FDport=(\d+)/ && $client) {
+		if ($l =~ /FDport=(\d+)/i && $client) {
 			$client->{'port'} = $1;
 			}
 		push(@rv, $client);
 		}
-	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/ && $client) {
+	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/i && $client) {
 		$client->{'address'} = $1;
 		}
-	elsif ($l =~ /^\s*FDport\s*=\s*"(.*)"/ && $client) {
+	elsif ($l =~ /^\s*FDport\s*=\s*"(.*)"/i && $client) {
 		$client->{'port'} = $1;
 		}
 	}
@@ -877,21 +878,21 @@ local $storages = &console_cmd($h, "show storages");
 local @rv;
 local $storage;
 foreach my $l (split(/\r?\n/, $storages)) {
-	if ($l =~ /^Storage:\s+name=([^=]*\S)\s/ ||
-	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
+	if ($l =~ /^Storage:\s+name=([^=]*\S)\s/i ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/i) {
 		$storage = { 'name' => $1 };
-		if ($l =~ /address=(\S+)/) {
+		if ($l =~ /address=(\S+)/i) {
 			$storage->{'address'} = $1;
 			}
-		if ($l =~ /SDport=(\d+)/) {
+		if ($l =~ /SDport=(\d+)/i) {
 			$storage->{'port'} = $1;
 			}
 		push(@rv, $storage);
 		}
-	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/ && $storage) {
+	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/i && $storage) {
 		$storage->{'address'} = $1;
 		}
-	elsif ($l =~ /^\s*SDport\s*=\s*"(.*)"/ && $storage) {
+	elsif ($l =~ /^\s*SDport\s*=\s*"(.*)"/i && $storage) {
 		$storage->{'port'} = $1;
 		}
 	}
@@ -908,15 +909,15 @@ local $pools = &console_cmd($h, "show pools");
 local @rv;
 local $pool;
 foreach my $l (split(/\r?\n/, $pools)) {
-	if ($l =~ /^Pool:\s+name=([^=]*\S)\s/ ||
-	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
+	if ($l =~ /^Pool:\s+name=([^=]*\S)\s/i ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/i) {
 		$pool = { 'name' => $1 };
-		if ($l =~ /PoolType=(\S+)/) {
+		if ($l =~ /PoolType=(\S+)/i) {
 			$pool->{'type'} = $1;
 			}
 		push(@rv, $pool);
 		}
-	elsif ($l =~ /^\s*PoolType\s*=\s*"(.*)"/ && $pool) {
+	elsif ($l =~ /^\s*PoolType\s*=\s*"(.*)"/i && $pool) {
 		$pool->{'type'} = $1;
 		}
 	}
@@ -1011,7 +1012,7 @@ foreach my $l (split(/\r?\n/, $status)) {
 			     'name' => &job_name("$2"),
 			     'status' => $4 });
 		}
-	elsif ($sect == 2 && $l =~ /^\s*Backup\s+Job\s+started:\s+(\S+\s+\S+)/) {
+	elsif ($sect == 2 && $l =~ /^\s*Backup\s+Job\s+started:\s+(\S+\s+\S+)/i) {
 		$run[$#run]->{'date'} = $1;
 		}
 	elsif ($sect == 3 && $l =~ /^\s*(\d+)\s+(\S+)\s+([0-9,]+)\s+([0-9,]+\.[0-9,]+\s+\S+|\d+)\s+(\S+)\s+(\S+\s+\S+)\s+(\S+)\s*$/) {
@@ -1047,7 +1048,7 @@ foreach my $l (split(/\r?\n/, $status)) {
 	if ($l =~ /^Running\s+Jobs/i) { $sect = 2; }
 	elsif ($l =~ /^Terminated\s+Jobs/i) { $sect = 3; }
 
-	if ($sect == 2 && $l =~ /^\s*Backup\s+Job\s+(\S+)\.(\d+\-\d+\-\S+)\s+(.*)/) {
+	if ($sect == 2 && $l =~ /^\s*Backup\s+Job\s+(\S+)\.(\d+\-\d+\-\S+)\s+(.*)/i) {
 		push(@run, { 'name' => &job_name("$1"),
 			     'status' => $3 });
 		}
@@ -1061,7 +1062,7 @@ foreach my $l (split(/\r?\n/, $status)) {
 		$run[$#run]->{'volume'} = $4;
 		$run[$#run]->{'device'} = $6;
 		}
-	elsif ($sect == 3 && $l =~ /^\s*(\d+)\s+(\S+)\s+([0-9,]+)\s+([0-9,]+\.[0-9,]+\s+\S+|\d+)\s+(\S+)\s+(\S+\s+\S+)\s+(\S+)\s*$/) {
+	elsif ($sect == 3 && $l =~ /^\s*(\d+)\s+(\S+)\s+([0-9,]+)\s+([0-9,]+\.[0-9,]+\s+\S+|\d+)\s+(\S+)\s+(\S+\s+\S+)\s+(\S+)\s*$/i) {
 		push(@done, { 'id' => $1,
 			      'level' => &full_level("$2"),
 			      'files' => &remove_comma("$3"),

bind8/bind8-lib.pl

@@ -11,6 +11,7 @@ if ($have_dnssec_tools) {
 	      use Net::DNS::SEC::Tools::rollmgr;
 	      use Net::DNS::SEC::Tools::rollrec;
 	      use Net::DNS::SEC::Tools::keyrec;
+	      use Net::DNS::RR::DS;
 	      use Net::DNS;";
 	}
 
@@ -4002,7 +4003,7 @@ else {
 	}
 if (&has_command("dnssec-dsfromkey")) {
 	# Generate with a command
-	my $out = &backquote_command("dnssec-dsfromkey -f ".quotemeta(&make_chroot(&absolute_path($zonefile)))." ZONE 2>/dev/null");
+	my $out = &backquote_command("dnssec-dsfromkey -f ".quotemeta(&make_chroot(&absolute_path($zonefile)))." ".quotemeta($dom)." 2>/dev/null");
 	return undef if ($?);
 	$out =~ s/\r|\n//g;
 	return $out;

bind8/edit_zonekey.cgi

@@ -52,7 +52,7 @@ if (@keyrecs) {
 	$ds = &get_ds_record($zone);
 	if ($ds) {
 		print $text{'zonekey_ds'},"<br>\n";
-		print &ui_textarea("ds", $ds, 2, 80, "off", 0,
+		print &ui_textarea("ds", $ds."\n", 2, 80, "off", 0,
 				   "readonly style='width:90%'"),"<br>\n";
 		}
 

bind8/lang/de

@@ -272,6 +272,7 @@ edit_err=Fehler beim Speichern des Datensatzes
 edit_eserv=Sie haben keinen bekannten Dienst eingetragen
 edit_eserv2='$1' ist kein gültiger Dienstname
 edit_espfa='$1' ist kein gültiger Host um den Versand zu erlauben
+edit_espfa2='$1' muss ein Hostname sein, keine IP-Adresse
 edit_espfexp='$1' ist ein gültiger Aufnahmenamen für eine Zurückweisungsnachricht
 edit_espfinclude='$1' ist keine gültige zusätzliche Domain von der E-Mail versandt wird
 edit_espfip='$1' ist keine gültige IP-Adresse oder IP/Netzmaske um den Versand zu erlauben

bind8/lang/en

@@ -286,6 +286,7 @@ edit_rusure=Are you sure you want to delete the record $1 from domain $2, and po
 edit_dok=Yes, Delete It
 edit_eptr='$1' is not a valid reverse address record hostname
 edit_espfa='$1' is not a valid host to allow sending from
+edit_espfa2='$1' must be a hostname, not an IP address
 edit_espfmx='$1' is not a valid domain name to allow MX sending from
 edit_espfmxmax=You are not allowed to have more than 10 domains to allow MX sending from
 edit_espfip='$1' is not a valid IP address or IP/prefix to allow sending from

bind8/lang/no

@@ -13,6 +13,7 @@ acl_findfree=Kan søk etter ledige IP adresser?
 acl_forward=Kan opprette videresendings-soner?
 acl_gen=Kan redigere oppførings-generatorer?
 acl_inview=Soner i visning <$1>
+acl_inviews=Visninger denne brukeren kan redigere domener i
 acl_master=Kan opprette master soner?
 acl_multiple=Kan flere adresser ha samme IP?
 acl_opts=Kan redigere sone-innstillinger?
@@ -22,6 +23,7 @@ acl_reverse=Kan oppdatere reverse adresser i alle domener?
 acl_ro=Read-only tilgangsmodus?
 acl_slave=Kan opprette slave/stub soner?
 acl_slaves=Kan administrere klynge slave tjenere?
+acl_toplevel=Utenfor en hver visning
 acl_types=Tillatte oppføringstyper
 acl_types0=Bare listede
 acl_types1=Alle
@@ -106,7 +108,10 @@ controls_unixopt=Tillat kontroll via Unix FIFO?
 controls_unixowner=FIFO er eid av bruker
 controls_unixperm=Tillatelser på FIFO
 controls_unixyes=Ja, ved bruk av filen $1
+convert_ebinary=Kommandoen som trenges for å konvertere fra en binær slave-sone til en tekst-format master er ikke installert
+convert_ecompile=Binær til tekst-format konvertering feilet : $1
 convert_efile=En oppføringsfil må angis før du kan konvertere en slavesone til en master.
+convert_efilesize=Oppføringsfilen $1 finnes ikke eller den er tom
 convert_err=Kunne ikke konvertere sone
 create_edom='$1' er ikke et gyldig domenenavn
 create_edom2='$1' må være et domene, ikke et nettverk
@@ -219,6 +224,7 @@ dt_zone_zskrolldesc=Tving rollover av sonens sonesignerings nøkkel
 edit_A=Adresse
 edit_AAAA=IPv6 adresse
 edit_CNAME=Navn Alias
+edit_DMARC=DMARC
 edit_HINFO=Vertsinformasjon
 edit_KEY=Offentlig nøkkel
 edit_LOC=Plassering
@@ -244,6 +250,9 @@ edit_ecname='$1' er ikke et gyldig alias mål
 edit_ecname1=Du kan ikke opprette en navne-alias oppføring med samme navn som en eksisterende oppføring.
 edit_ecname2=Du kan ikke opprette en oppføring med samme navn som en eksisterende navne-alias oppføring.
 edit_edit=Rediger $1 oppføring
+edit_edmarcpct=Prosent av meldinger må være et heltall mellom 0 og 100
+edit_edmarcrua=Mangler adresse for aggregert feedback
+edit_edmarcruf=Mangler adresse for "forensic" informasjon
 edit_edupip=En adresseoppføring for $1 finnes allerede
 edit_eemail='$1' er ikke en gyldig e-post adresse
 edit_eflags='$1' er ikke et gydig desimalt eller heksadesimalt nøkkel-flagg nummer
@@ -260,6 +269,7 @@ edit_emx='$1' er ikke en gyldig e-post tjener
 edit_ename='$1' er ikke et gyldig oppføringsnavn
 edit_ens='$1' er ikke en gyldig navnetjener
 edit_ensec3value2=Manglende eller ikke-base64 salt
+edit_ensec3value3=Mangler eller ikke-base64 salt
 edit_eos=Manglende OS type
 edit_eport='$1' er ikke et gyldig portnummer
 edit_epri='$1' er ikke en gyldig prioritet
@@ -777,6 +787,7 @@ recs_A=Adresse
 recs_AAAA=IPv6 adresse
 recs_ALL=Alle
 recs_CNAME=Navne-alias
+recs_DMARC=DMARC
 recs_HINFO=Vertsinformasjon
 recs_KEY=Offenlig nøkkel
 recs_LOC=Plassering
@@ -977,6 +988,7 @@ type_A=Adresse
 type_AAAA=IPv6 adresse
 type_ALL=Alle oppføringstyper
 type_CNAME=Navne-alias
+type_DMARC=DMARC
 type_HINFO=Vertsinformasjon
 type_KEY=Offentlig nøkkel
 type_LOC=Plassering
@@ -1009,6 +1021,7 @@ umass_type=Oppføringstype som skal oppdateres
 value_A1=Adresse
 value_AAAA1=IPv6 adresse
 value_CNAME1=Faktisk navn
+value_DMARC1=DMARC spesifikasjon
 value_HINFO1=Maskinvare
 value_HINFO2=Operativsystem
 value_KEY1=Flagg
@@ -1037,6 +1050,18 @@ value_WKS1=Adresse
 value_WKS2=Protokoll
 value_WKS3=Tjenester
 value_delegated=Delegert sone
+value_dmarcadkim=Krev streng DKIM justering
+value_dmarcaspf=Krev streng SPF justering
+value_dmarcnone=Ikke gjør noe
+value_dmarcnop=Samme som dette domenet
+value_dmarcnor=Ikke send
+value_dmarcp=Policy for e-poster som feiler SPF eller DKIM
+value_dmarcpct=Prosent av meldinger for å ta i bruk policy
+value_dmarcquar=Karantene e-post
+value_dmarcreject=Avvis e-post
+value_dmarcrua=Send aggregert feedback til
+value_dmarcruf=Send "forensic" informasjon til
+value_dmarcsp=Policy for underdomener
 value_notdelegated=Annen sone
 value_other=Verdier (en per linje)
 value_spfa=Tillat sending fra domenets IP adresse?

bind8/records-lib.pl

@@ -661,7 +661,7 @@ sub valemail
 {
 return $_[0] eq "." ||
        $_[0] =~ /^[A-Za-z0-9\.\-]+$/ ||
-       $_[0] =~ /(.*)\@(.*)/ && 
+       $_[0] =~ /(\S*)\@(\S*)/ && 
        &valdnsname($2, 0, ".") && 
        $1 =~ /[a-z][\w\-\.$uscore]+/i;
 }

bind8/save_record.cgi

@@ -298,6 +298,7 @@ else {
 		$spf->{'a:'} = [ split(/\s+/, $in{'spfas'}) ];
 		foreach my $a (@{$spf->{'a:'}}) {
 			&to_ipaddress($a) || &error(&text('edit_espfa', $a));
+			&check_ipaddress($a) && &error(&text('edit_espfa2',$a));
 			}
 		$spf->{'mx:'} = [ split(/\s+/, $in{'spfmxs'}) ];
 		foreach my $mx (@{$spf->{'mx:'}}) {

bind8/syslog_logs.pl

@@ -13,7 +13,7 @@ local @chans = &find("channel", $logging->{'members'});
 local @rv;
 foreach my $c (@chans) {
 	local $file = &find("file", $c->{'members'});
-	if ($file) {
+	if ($file && $file->{'values'}->[0] =~ /^\//) {
 		push(@rv, { 'file' => $file->{'values'}->[0],
 			    'active' => 1,
 			    'desc' => $text{'syslog_desc'} });

cluster-copy/cluster-copy-lib.pl

@@ -205,6 +205,11 @@ foreach $s (@run) {
 			else {
 				push(@errs, [ $f, "Copy was incomplete" ]);
 				}
+
+			# Preserve file permissions
+			&remote_foreign_call($s->{'host'}, "webmin",
+				"set_ownership_permissions", $st[4], $st[5],
+				$st[2] & 0777, $dest);
 			}
 
 		# Run the post command on remote

create-module.pl

@@ -64,12 +64,19 @@ foreach $m (@ARGV) {
 		}
 	$flags = !-r $file ? "chf" : "rhf";
 	system("cd /tmp/create-module && find . -name .svn | xargs rm -rf");
+	system("cd /tmp/create-module && find . -name .git | xargs rm -rf");
+	system("cd /tmp/create-module && find . -name .build | xargs rm -rf");
+	system("cd /tmp/create-module && find . -name .pyc | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name \\*.svn-work | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name \\*.svn-base | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name '*~' -o -name '*.rej' -o -name '*.orig' -o -name '.*.swp' | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name RELEASE -o -name RELEASE.sh | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name linux.sh -o -name freebsd.sh -o -name LICENCE -o -name README.md -o -name distrib | xargs rm -rf");
 	system("cd /tmp/create-module && find . -name 'makemodule*.pl' | xargs rm -rf");
+	if (-r "/tmp/create-module/$subdir/EXCLUDE") {
+		system("cd /tmp/create-module/$subdir && cat EXCLUDE | xargs rm");
+		unlink("/tmp/create-module/$subdir/EXCLUDE");
+		}
 	unlink("/tmp/create-module/$subdir/IDEAS");
 	system("cd /tmp/create-module && find . -name \\*.cgi | xargs chmod +x");
 	system("cd /tmp/create-module && find . -name \\*.pl | xargs chmod +x");

exports-nfs4/lang/no

@@ -0,0 +1,96 @@
+alert_no_nfsv4root=Ingen NFSv4 virtuell rot er definert!\n Du må først definere en katalog dom NFSv4 root og så binde noen kataloger under denne roten.
+create_title=Opprett eksport
+edit_active=Aktiv?
+edit_address=Adresse
+edit_all=Alle
+edit_anongid=Behandle ubetrodde grupper som
+edit_anonuid=Behandle ubetrodde brukere som
+edit_auth=(med eller uten Autentisering)
+edit_default=Standard
+edit_details=Eksport detaljer
+edit_dir=Katalog som skal eksporteres
+edit_everyone=Alle
+edit_except=Alle unntatt root
+edit_gids=Ikke stol på GIDer
+edit_hide=Skjul filsystemet?
+edit_host=Vert(er)
+edit_in=i
+edit_insecure=Klienter må være på sikker port?
+edit_integrity=Integritet
+edit_ispfs=NFSv4 root
+edit_mode=Tilgangsmodus
+edit_netgroup=NIS Nettgruppe
+edit_netmask=Nettmaske
+edit_network=Nettverk
+edit_nfs_vers=NFS Versjon
+edit_noaccess=Nekt tilgang til katalog?
+edit_nobody=Ingen
+edit_none=Ingen
+edit_pfs=NFSv4 Pseudofilsystem som skal eksporteres
+edit_prefix=/
+edit_privacy=Hemmelighold (inkludert Integritet)
+edit_relative=Gjør symbolske lenker relative?
+edit_ro=Bare-les?
+edit_sec=Sikkerhetsnivå
+edit_security=Eksporter sikkerhet
+edit_squash=Stol på eksterne brukere
+edit_subtree_check=Deaktiver sjekking av under-tre?
+edit_sync=Synk. alle skrivinger øyeblikketlig?
+edit_sync0=Standard
+edit_sync1=Ja
+edit_sync2=Nei
+edit_title=Rediger eksport
+edit_to=Eksporter til..
+edit_to_detail=(verter og tilknyttede sikkerhetstyper)
+edit_uids=Ikke stol på UIDene
+edit_v2opts=NFSv2-spesifikke innstillinger
+edit_vers=NFS Versjon
+edit_webnfs=WebNFS klienter
+exports_all=Alle
+exports_gss=Autentisert nettverk: $1
+exports_host=Vert;nbsp;$1
+exports_hosts=Verter;nbsp;$1
+exports_net=Nettverk;nbsp;$1
+exports_ngroup=Nettgruppe;nbsp;$1
+exports_webnfs=WebNFS klienter
+hostsec_down=Ned
+hostsec_enabled=Aktivert
+hostsec_flavors=Sortert liste over sikkerhetstyper tillatt for denne verten
+hostsec_host=Vert valg
+hostsec_supported=Støttet
+hostsec_up=Opp
+index_add=Legg til ny eksport.
+index_apply=Bruk endringer
+index_applymsg=Klikk på denne knappen for å ta i bruk gjeldende fileksport konfigurasjon. Dette vil gjøre alle kataloger angitt ovenfor, tilgjengelige med de spesifiserte innstillingene.
+index_delete=Slett valgte eksporter
+index_dir=Katalog
+index_disable=Deaktiver valgte
+index_enable=Aktiver valgte
+index_eprog=Fant ikke NFS tjener programmet på systemet ditt. Det ser ikke ut til at NFS pakken er installert.
+index_inactive=Inaktiv
+index_none=Du eksporterer ikke noen kataloger enda.
+index_return=liste over eksporter
+index_return_edit=rediger eksporter
+index_title=NFS Eksporter
+index_to=Eksportert til..
+index_vr=virtuell rot
+log_apply=Tatt i bruk konfigurasjon
+log_create=Opprettet NFS eksport $1
+log_create_l=Opprettet NFS eksport $1 til $2
+log_delete=Slettet NFS eksport $1
+log_delete_exports=Slettet $1 NFS eksporter
+log_delete_l=Slettet NFS eksport $1 til $2
+log_modify=Endret NFS eksport $1
+log_modify_l=Endret NFS eksport $1 til $2
+save_create_dir=Kan ikke opprette katalogen '$1'
+save_eaddress='$1' er ikke en gyldig IPv6 adresse
+save_edir=Katalogen '$1' finnes ikke
+save_egids=GIDer som ikke skal betros må være en komma-separert liste med tall eller tallområder
+save_ehost='$1' er ikke et gyldig vertsnavn
+save_enetgroup=Ugyldig eller manglende nettgruppe
+save_enetmask='$1' er ikke en gyldig nettmaske
+save_enetwork='$1' er ikke et gyldig nettverk
+save_eprefix='$1' er ikke et gyldig IPv6 prefiks
+save_err=Kunne ikke lagre eksport
+save_euids=UIDer som ikke skal betros må være en komma-separert liste med tall eller tallområder
+save_pfs='$1' er allerede eksportert som en katalog

exports-nfs4/module.info

@@ -26,3 +26,4 @@ desc_ko_KR.UTF-8=NFS 내보내기
 desc_ru.UTF-8=Каталоги NFS
 desc_pl.UTF-8=Udostępnianie po NFS
 longdesc_de=Bearbeitet NFSv4-Dateifreigaben, welche in /etc/exports definiert sind.
+desc_no=NFS Eksporter v4

fail2ban/lang/ca

@@ -10,6 +10,7 @@ index_startdesc=Fes clic sobre aquest bot
 index_restart=Reinicia  el Servidor Fail2Ban
 index_restartdesc=Fes clic sobre aquest botó per aplicar la configuració actual reiniciant el servidor Fail2Ban.
 index_return=a l'índex de mòduls
+index_header=Mòdul Fail2Ban
 
 check_edir=El directori de configuració $1 no existeix
 check_econf=El fitxer de configuració $2 de $1 no existeix

fail2ban/lang/no

@@ -67,6 +67,7 @@ index_atboot=Start ved oppstart?
 index_atbootdesc=Endre denne innstillingen for å kontrollere hvorvidt Fail2Ban tjeneren startes når systemet startes opp. Hvis nødvendig, vil det bli opprettet et oppstartsscript slik at tjeneren startes på korrekt måte.
 index_echeck=En feil oppstod under oppdaging av Fail2Ban p&#229; dette systemet : $1. Enten er den ikke installert eller s&#229; er <a href='$2'>modulkonfigurasjonen</a> feil.
 index_fail2ban=Fail2Ban
+index_header=Fail2Ban modul
 index_restart=Omstart Fail2Ban tjener
 index_restartdesc=Klikk p&#229; denne knappen for &#229; ta i bruk gjeldende konfigurasjon ved &#229; omstarte Fail2Ban tjeneren.
 index_return=modulindeks
@@ -77,6 +78,7 @@ index_stopdesc=Klikk p&#229; denne knappen for &#229; stoppe Fail2Ban tjeneren.
 index_title=Fail2Ban Innbruddsoppdager
 jail_action=Handling
 jail_actions=Handlinger som skal brukes
+jail_allprotocol=Alle protokoller
 jail_aname=Navn
 jail_auto=Bestem automatisk
 jail_backend=Sjekk for loggfil oppdateringer vha.

fail2ban/save_jail.cgi

@@ -86,7 +86,7 @@ else {
 
 	# Validate various counters
 	foreach my $f ("maxretry", "findtime", "bantime") {
-		$in{$f.'_def'} || $in{$f} =~ /^\-?[1-9]\d*$/ ||
+		$in{$f.'_def'} || $in{$f} =~ /^\-?\d+$/ ||
 			&error($text{'jail_e'.$f});
 		}
 

filemin/CHANGELOG

@@ -0,0 +1,194 @@
+-- Version 0.9.6 --
+ - Fixed `Undefined subroutine &filemin::ceil
+   Caused on some systems by not including POSIX package in filemin-lib.pl.
+ - Major Authentic interface improvement by Ilia Rostovtsev
+    1. Working sorting files by size (with next Authentic Theme - perfectly, now just alright).
+       This fix will also prevent fatal code breaks despite of user settings
+    2. Store user chose on columns sorting upon page refresh
+    3. Hide paginations when there is nothing to paginate.
+    4. Let user navigate with arrows (left/right) when trying to do pagination
+ - Code cleanup and security tightening by Jamie Cameron
+ - Add ACL options to allowing running as a specific user, thanks Jamie :)
+ - WARNING: work as root is now DEFAULT behavior.
+   IF YOU GRANTED FILEMIN ACCESS TO ANY USERS NOT SUPPOSED TO WORK AS ROOT - GO AND CHECK ACL!!!
+
+  #42 fixed:
+ - Fixing conflict with Authentic Theme codeMirror
+   By Ilia.
+
+  #46 fixed:
+ - Module is now installable from Usermin.
+   When running in Usermin, access is always as the connected user.
+
+  #52 fixed:
+ - Working as non UNIX user is now possible. By Jamie Cameron.
+
+  #54 fixed:
+ - Pasting a directory either by copy or cut pasted not the directory, but it's content.
+
+-- Version 0.9.5 --
+ - Made top level menu items translatable.
+ - Added https://github.com/Real-Gecko/filemin/pull/29
+   Selected rows also highlight on hover + color tweaks, by https://github.com/qooob
+ - Some code cleanup, got rid of Regexp::Common and URI dependencies.
+   Thanks to Jamie Cameron.
+ - Added error message if file saving fails.
+ - Removed not working "Help" link for now.
+
+  #35 fixed:
+ - Permissions column configurable and displayable.
+
+  #36 fixed:
+ - README instructions for Debian/Ubuntu fixed.
+
+-- Version 0.9.4 --
+ - Implemented "Search".
+   Users may search files and folders by name, wildcards supported.
+ - Symlinked inode-mount-point.png to inode-directory.png.
+   Mount points displayed with 'directory' icon.
+ - Made toolbar more compact under modern themes.
+ - Added per user configuration.
+   Users now can individually configure some display options.
+     * Items per page - how many entries to display in one page, OLD THEMES ONLY!.
+     * Columns - users can check which columns he/she wants to see.
+     * Authentic theme users may disable pagination completely.
+     * Choose toolbar style between menu with dropdowns or good old "all in one".
+     * Manage personal bookmarks
+ - Implemented "Bookmarks" functionality.
+   Users can now bookmark current directory.
+   Bookmarks are managed in per user module settings.
+ - Added "Save and close" button on file edit page.
+   Save button now saves and reopens file for editing again,
+   while save and close saves and redirects back to originated folder.
+ - Update Russian translation.
+
+  #21 fixed:
+ - Added Codemirror to module for syntax highlighting, thanks to https://github.com/pabloko for solution.
+ - Under Authentic 14.01 now works too, thanks to https://github.com/qooob for fix.
+
+  #24 fixed:
+ - Added zip compression method, user now can select between 'zip' and 'tar' compression methods.
+
+  #27 fixed:
+ - Chmodding now have new option to apply new permissions to:
+    * Selected directories and files only
+    * Selected files and directorires and files in selected directories
+    * All (recursive)
+    * Selected files and files under selected directories and subdirectories
+    * Selected directories and subdirectories
+
+  #28 fixed:
+ - Added new toolbar style - menu-like with dropdowns (Authentic only).
+
+  #31 fixed:
+ - Removed Data::Dumper declaration.
+
+-- Version 0.9.3 --
+ - Removed unused CGI dependency.
+ - "Increased" download speed by increasing buffer length in download.cgi.
+ - Some syntax errors fixed in english translation, thanks to https://github.com/Zen4All
+ - Specially for Fireserver developers http://www.fireserver.com.br/index_en.html
+   Added "Work as root" option to ACL, if enabled for any particular user he/she will work as 'root',
+   but directory access will still be limited to those listed in ACL.
+   BEWARE!!! DO NOT ENABLE THIS OPTION FOR ANYONE UNLESS YOU'RE REALLY SURE WHAT ARE YOU DOING!!!
+
+  #17 fixed:
+ - YAML files are now editable.
+
+  #20 fixed:
+ - Using Perl's `-d` to determine if entry is file or folder.
+
+-- Version 0.9.2 --
+ - Switched to Webmin functions for HTTP/FTP Download, so download progress is shown now. Got rid of File::Fetch dependecy in module code.
+ - HTTP/FTP Download now prompts for username and password on remote server, if any required user can provide it.
+ - Removed "openlayers" folder. How did it get in here???? :D
+ - Completely rewrote upload.cgi. Now upload progress is shown with Webmin`s upload tracker.
+   Memory usage is low due to direct HD write, even with REALLY big uploads(tested with 3 files totalling 1.61 GB).
+   BEWARE: if user reaches his/her disk quota then Webmin simply resets connection with no errors, can do nothing with it right now.
+ - Fixed "select-unselect" checkbox behavior for old themes.
+ - Updated russian translation.
+ - THE LONG WAITED! THE MOST WANTED! THE ONE AND ONLY - ACL!!!
+   Default ACL behavior sets only one ACL entry '$HOME' for each user. This locks user in $HOME directory.
+   To grant full FS access to user replace '$HOME' with '$ROOT' in user`s ACL.
+   If there`s only one entry in ACL then it counts as "home" or "chroot", otherwise user will see accessible dirs relative to "/", just like it is in old FM.
+   Avoid trailing slash in ACL entries: "/usr/share/webmin" - gooooood, "/home/test/" - baaaaad.
+   Root bypasses ACL completely.
+   Note that even though user can be granted full FS access, he still works with his own privileges.
+   So anything that requires "root" permissions or "sudo" won't work.
+ - Folders go first.
+   Rewrote directory listing procedure, now folders appear before files in list as in any other adequate file manager.
+   As a result first and second entry in '/' are now visible :)
+   Note that sorting table with javascript under Authentic or Framed themes will mix everything again until page reload ;-)
+ - Major code cleanup of rendering procedure.
+ - Fixed copy/cut/paste functionality.
+ - FreeBSD support added.
+   Module uses Regexp::Common and URI packages to validate URIs in HTTP/FTP download functionality.
+   Be sure to install theese to make functionality work.
+   Admin user created during Webmin installation is not UNIX user, so module won't work for him.
+   If you want to provide some "system" file operations then convert "root" to Webmin user.
+
+  #11 fixed:
+ - CRLF is replaced with UNIX style LF while saving a file.
+
+-- Version 0.9.1 --
+#8 fixed:
+ - Not sure if it was an issue, cause I was unable to reproduce "User without $HOME" scenario. However added some code to handle this, just in case.
+ 
+#7 fixed:
+ - Removed Archive::* dependencies, all archive extraction procedures now go through system calls. *.tar.gz, *.tar.xz, *.tar.bz2, *.zip archive types tested.
+
+#6 fixed:
+ - Switched to Regexp::Common for URI validation in "HTTP Download" operation to avoid additional dependencies.
+
+#5 fixed:
+ - Added HDD icon for "/" while under root for legacy themes.
+
+ - Added BWTheme support.
+ - Changed license to BSD style.
+ - Chown now asks for group too.
+ - Slight interface improvements for modern dialogs.
+ - Major interface imprevements for legacy dialogs, jQuery and jQueryUI shipped with the module for this purpose.
+ - Added $in{'...'} parameters check in some operations to prevent errors if user submits emtpy form by hitting "Enter".
+ - Changed textarea font to monospace.
+ - Added sticky bit and setgid to chmod.
+ - Chmod and chown can be done recursively.
+ - Made list table more compact for Bootstrap enabled themes.
+ - Removed group column, group is displayed now within "Owner User" column: "root:root", "realgecko:users" etc.
+ - Modified date/time display format for better sorting under Authentic theme.
+ - Added "Refresh" quick button for modern themes, just for fun :D
+ - Added a work around to fix JS hell provided by Framed Theme family with "onmouseover" and "onmouseout" events, that led to unselectable rows by "Select All" and "Inverse Selection" operations.
+ - Using the same class to highlight rows as Authentic.
+ - Moved icons to images folder, as Authentic Theme author improved third party modules' files handling.
+ - Added .deb package for distribution flexibility.
+
+-- Version 0.9 --
+Mielstone reached:
+ - Checks for overwrites while using paste, new folder, new file, upload, http download ... at last :D
+ - If file exists it will not be overwritten.
+ - BEWARE: uncompressing archive still overwrites existing files!
+
+#1 fixed:
+ - After long discussion upper-left toolbar finally looks good in modern interface
+ - Thanks to https://github.com/Goeny for his brilliant solution and https://github.com/qooob for debugging
+
+#3 fixed:
+ - Some misspellings fixed
+
+#5 fix suggestion:
+ - Replaced '~' for '/' directory with FontAwesome's HDD icon, still open for discussion...
+
+Minor tweaks for modern interface
+More verbose output on errors
+
+-- Version 0.8.3 --
+Added tooltips for icons on toolbar
+Message appears if nothing selected and user tries copy/cut/compress/chmod/chown/delete
+
+-- Version 0.8.2 --
+Various bug fixes
+Added Authentic Theme support
+"root" is not locked in his "~" dir anymore
+Check for overwrites during http download, and only there for now...
+
+-- Version 0.8.1 --
+Initial release

filemin/acl_security.pl

@@ -0,0 +1,61 @@
+require 'filemin-lib.pl';
+
+sub acl_security_form {
+    my ($access) = @_;
+
+    # Directories the user can access
+    print &ui_table_row($text{'acl_allowed_paths'},
+	ui_textarea("allowed_paths",
+		    join("\n", split(/\s+/, $access->{'allowed_paths'})),
+		    10, 80, undef, undef, "style='width: 100%'"), 2);
+
+    # Mimetypes allowed to be edited
+    print &ui_table_row($text{'acl_allowed_for_edit'},
+	ui_textarea("allowed_for_edit",
+		    join("\n", split(/\s+/, $access->{'allowed_for_edit'})),
+		    10, 80, undef, undef, "style='width: 100%'"), 2);
+
+    # Run as Unix user
+    print &ui_table_row($text{'acl_work_as'},
+	ui_radio_table("user_mode", $access->{'work_as_root'} ? 0 :
+			            $access->{'work_as_user'} ? 2 : 1,
+	       [ [ 0, $text{'acl_root'} ],
+		 [ 1, $text{'acl_same'} ],
+		 [ 2, $text{'acl_user'},
+		   ui_user_textbox("acl_user", $access->{'work_as_user'}) ] ]),
+	3);
+
+    # Upload max
+    print &ui_table_row($text{'acl_max'},
+	&ui_opt_textbox("max", $access->{'max'}, 10, $text{'acl_unlimited'}).
+	" ".$text{'acl_bytes'}, 3);
+}
+
+sub acl_security_save {
+    my ($access, $in) = @_;
+    local @allowed_paths = split(/\s+/, $in->{'allowed_paths'});
+    if (scalar(@allowed_paths) == 0) { &error("No allowed paths defined"); }
+    for $path(@allowed_paths) {
+        if (!-e $path && $path ne '$HOME' && $path ne '$ROOT') {
+            &error(&text('acl_epath', &html_escape($path)));
+        }
+    }
+    $access->{'allowed_paths'} = join(" ", @allowed_paths);
+
+    local @allowed_for_edit = split(/\s+/, $in->{'allowed_for_edit'});
+    if (scalar(@allowed_for_edit) == 0) { &error("No mimetypes allowed for edit defined"); }
+    $access->{'allowed_for_edit'} = join(" ", @allowed_for_edit);
+
+    if ($in->{'user_mode'} == 0) {
+        $access->{'work_as_root'} = 1;
+        $access->{'work_as_user'} = undef;
+    } elsif ($in->{'user_mode'} == 1) {
+        $access->{'work_as_root'} = 0;
+        $access->{'work_as_user'} = undef;
+    } else {
+	defined(getpwnam($in->{'acl_user'})) || &error($text{'acl_euser'});
+        $access->{'work_as_root'} = 0;
+        $access->{'work_as_user'} = $in->{'acl_user'};
+    }
+    $access->{'max'} = $in->{'max_def'} ? undef : $in{'max'};
+}

filemin/bookmark.cgi

@@ -0,0 +1,23 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+use lib './lib';
+
+&ReadParse();
+
+get_paths();
+
+$confdir = "$remote_user_info[7]/.filemin";
+if(!-e $confdir) {
+    mkdir $confdir or &error("$text{'error_creating_conf'}: $!");
+}
+
+if(!-e "$confdir/.bookmarks") {
+    utime time, time, "$configdir/.bookmarks";
+}
+
+$bookmarks = &read_file_lines($confdir.'/.bookmarks');
+push @$bookmarks, $path;
+&flush_file_lines("$confdir/.bookmarks");
+
+&redirect("index.cgi?path=$path");

filemin/chmod.cgi

@@ -0,0 +1,78 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+
+&ReadParse();
+
+get_paths();
+
+my @errors;
+
+my $perms = $in{'perms'};
+
+# Selected directories and files only
+if($in{'applyto'} eq '1') {
+    foreach $name (split(/\0/, $in{'name'})) {
+        if (system_logged("chmod ".quotemeta($perms)." ".quotemeta("$cwd/$name")) != 0) {
+            push @errors, "$name - $text{'error_chmod'}: $?";
+        }
+    }
+}
+
+# Selected files and directories and files in selected directories
+if($in{'applyto'} eq '2') {
+    foreach $name (split(/\0/, $in{'name'})) {
+        if(system_logged("chmod ".quotemeta($perms)." ".quotemeta("$cwd/$name")) != 0) {
+            push @errors, "$name - $text{'error_chmod'}: $?";
+        }
+        if(-d "$cwd/$name") {
+            if(system_logged("find ".quotemeta("$cwd/$name")." -maxdepth 1 -type f -exec chmod ".quotemeta($perms)." {} \\;") != 0) {
+                push @errors, "$name - $text{'error_chmod'}: $?";
+            }
+        }
+    }
+}
+
+# All (recursive)
+if($in{'applyto'} eq '3') {
+    foreach $name (split(/\0/, $in{'name'})) {
+        if(system_logged("chmod -R ".quotemeta($perms)." ".quotemeta("$cwd/$name")) != 0) {
+            push @errors, "$name - $text{'error_chmod'}: $?";
+        }
+    }
+}
+
+# Selected files and files under selected directories and subdirectories
+if($in{'applyto'} eq '4') {
+    foreach $name (split(/\0/, $in{'name'})) {
+        if(-f "$cwd/$name") {
+            if(system_logged("chmod ".quotemeta($perms)." ".quotemeta("$cwd/$name")) != 0) {
+                push @errors, "$name - $text{'error_chmod'}: $?";
+            }
+        } else {
+            if(system_logged("find ".quotemeta("$cwd/$name")." -type f -exec chmod ".quotemeta($perms)." {} \\;") != 0) {
+                push @errors, "$name - $text{'error_chmod'}: $?";
+            }
+        }
+    }
+}
+
+# Selected directories and subdirectories
+if($in{'applyto'} eq '5') {
+    foreach $name (split(/\0/, $in{'name'})) {
+        if(-d "$cwd/$name") {
+            if(system_logged("chmod ".quotemeta($perms)." ".quotemeta("$cwd/$name")) != 0) {
+                push @errors, "$name - $text{'error_chmod'}: $?";
+            }
+            if(system_logged("find ".quotemeta("$cwd/$name")." -type d -exec chmod ".quotemeta($perms)." {} \\;") != 0) {
+                push @errors, "$name - $text{'error_chmod'}: $?";
+            }
+        }
+    }
+}
+
+if (scalar(@errors) > 0) {
+    print_errors(@errors);
+} else {
+    &redirect("index.cgi?path=$path");
+}

filemin/chown.cgi

@@ -0,0 +1,42 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+
+&ReadParse();
+
+get_paths();
+
+if(!$in{'owner'} or !$in{'group'}) {
+    &redirect("index.cgi?path=$path");
+}
+
+(my $login, my $pass, my $uid, my $gid) = getpwnam($in{'owner'});
+my $grid = getgrnam($in{'group'});
+my $recursive;
+if($in{'recursive'} eq 'true') { $recursive = '-R'; } else { $recursive = ''; }
+
+my @errors;
+
+if(! defined $login) {
+    push @errors, "<b>$in{'owner'}</b> $text{'error_user_not_found'}";
+}
+
+if(! defined $grid) {
+    push @errors, "<b>$in{'group'}</b> $text{'error_group_not_found'}";
+}
+
+if (scalar(@errors) > 0) {
+        print_errors(@errors);
+} else {
+    foreach $name (split(/\0/, $in{'name'})) {
+#        if(!chown $uid, $grid, $cwd.'/'.$name) {
+        if(system_logged("chown $recursive $uid:$grid ".quotemeta("$cwd/$name")) != 0) {
+            push @errors, "$name - $text{'error_chown'}: $?";
+        }
+    }
+    if (scalar(@errors) > 0) {
+        print_errors(@errors);
+    } else {
+        &redirect("index.cgi?path=$path");
+    }
+}

filemin/compress.cgi

@@ -0,0 +1,29 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+get_paths();
+
+if(!$in{'arch'}) {
+    &redirect("index.cgi?path=$path");
+}
+
+my $command;
+
+if($in{'method'} eq 'tar') {
+    $command = "tar czf ".quotemeta("$cwd/$in{'arch'}.tar.gz").
+	       " -C ".quotemeta($cwd);
+} elsif($in{'method'} eq 'zip') {
+    $command = "cd ".quotemeta($cwd)." && zip -r ".
+	       quotemeta("$cwd/$in{'arch'}.zip");
+}
+
+foreach my $name(split(/\0/, $in{'name'}))
+{
+    $name =~ s/$in{'cwd'}\///ig;
+    $command .= " ".quotemeta($name);
+}
+
+system_logged($command);
+
+&redirect("index.cgi?path=$path");

filemin/config

@@ -0,0 +1 @@
+allowed_paths=$HOME

filemin/config.cgi

@@ -0,0 +1,53 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+use lib './lib';
+use File::MimeInfo;
+
+&ReadParse();
+
+get_paths();
+
+&ui_print_header(undef, $text{'module_config'}, "");
+$head = "<link rel='stylesheet' type='text/css' href='unauthenticated/css/style.css' />";
+print $head;
+
+$confdir = "$remote_user_info[7]/.filemin";
+if(!-e $confdir) {
+    mkdir $confdir or &error("$text{'error_creating_conf'}: $!");
+}
+
+if(!-e "$confdir/.config") {
+    &read_file("$module_root_directory/defaultuconf", \%config);
+} else {
+    &read_file("$confdir/.config", \%config);
+}
+
+if(!-e "$confdir/.bookmarks") {
+    $bookmarks = '';
+} else {
+    $bookmarks = &read_file_contents($confdir.'/.bookmarks', 1);
+}
+
+print &ui_form_start("save_config.cgi", "post");
+
+print &ui_table_start($text{'module_config'}, undef, 2);
+print &ui_table_row($text{'config_columns_to_display'},
+    &ui_checkbox('columns', 'type', $text{'type'}, $config{'columns'} =~ /type/).
+    &ui_checkbox('columns', 'size', $text{'size'}, $config{'columns'} =~ /size/).
+    &ui_checkbox('columns', 'owner_user', $text{'owner_user'}, $config{'columns'} =~ /owner_user/).
+    &ui_checkbox('columns', 'permissions', $text{'permissions'}, $config{'columns'} =~ /permissions/).
+    &ui_checkbox('columns', 'last_mod_time', $text{'last_mod_time'}, $config{'columns'} =~ /last_mod_time/)
+);
+print &ui_table_row($text{'config_per_page'}, ui_textbox("per_page", $config{'per_page'}, 80));
+print &ui_table_row($text{'config_disable_pagination'}, &ui_checkbox('disable_pagination', 1, '', $config{'disable_pagination'}));
+print &ui_table_row($text{'config_toolbar_style'}, &ui_yesno_radio('menu_style', $config{'menu_style'}, 1, 0));
+print &ui_table_row($text{'config_bookmarks'}, &ui_textarea("bookmarks", $bookmarks, 5, 40));
+
+print &ui_table_end();
+
+print &ui_hidden('path', $path);
+
+print &ui_form_end([ [ save, $text{'save'} ] ]);
+
+&ui_print_footer("index.cgi?path=$path", $text{'previous_page'});

filemin/config.info

@@ -0,0 +1,2 @@
+allowed_paths=Directories accessible to Usermin users,9,60,5,\t
+max=Maximum size for uploaded files,3,Unlimited

filemin/config.info.ca

@@ -0,0 +1,2 @@
+allowed_paths=Directoris accessibles als usuaris de Usermin,9,60,5,\t
+max=Mida màxima dels fitxers pujats,3,Il·limitada

filemin/copy.cgi

@@ -0,0 +1,19 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+open(my $fh, ">", &get_paste_buffer_file()) or die "Error: $!";
+print $fh "copy\n";
+print $fh "$path\n";
+#$info = "Copied ".scalar(@list)." files to buffer";
+
+foreach $name (split(/\0/, $in{'name'})) {
+    print $fh "$name\n";
+}
+
+close($fh);
+
+&redirect("index.cgi?path=$path");

filemin/create_file.cgi

@@ -0,0 +1,21 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+if(!$in{'name'}) {
+    &redirect("index.cgi?path=$path");
+}
+
+if (-e "$cwd/$in{'name'}") {
+    print_errors("$in{'name'} $text{'error_exists'}");
+} else {
+    if (open my $fh, "> $cwd/$in{'name'}") {
+        close($fh);
+        &redirect("index.cgi?path=$path");
+    } else {
+        print_errors("$in{'name'} - $text{'error_create'} $!");
+    }
+}

filemin/create_folder.cgi

@@ -0,0 +1,20 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+if(!$in{'name'}) {
+    &redirect("index.cgi?path=$path");
+}
+
+if (-e "$cwd/$in{'name'}") {
+    print_errors("$in{'name'} $text{'error_exists'}");
+} else {
+    if( mkdir ("$cwd/$in{'name'}", oct(755)) ) {
+        &redirect("index.cgi?path=$path");
+    } else {
+        print_errors("$text{'error_create'} $in{'name'}: $!");
+    }
+}

filemin/cut.cgi

@@ -0,0 +1,19 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+open(my $fh, ">", &get_paste_buffer_file()) or die "Error: $!";
+print $fh "cut\n";
+print $fh "$path\n";
+#$info = "Copied ".scalar(@list)." files to buffer";
+
+foreach $name (split(/\0/, $in{'name'})) {
+    print $fh "$name\n";
+}
+
+close($fh);
+
+&redirect("index.cgi?path=$path");

filemin/defaultacl

@@ -0,0 +1,3 @@
+allowed_paths=$HOME
+work_as_root=1
+allowed_for_edit=application-x-php application-x-ruby application-xml application-javascript application-x-shellscript application-x-perl application-x-yaml

filemin/defaultuconf

@@ -0,0 +1,4 @@
+columns=size,owner_user,permissions,last_mod_time
+per_page=50
+disable_pagination=0
+menu_style=1

filemin/delete.cgi

@@ -0,0 +1,20 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+my @errors;
+
+foreach $name (split(/\0/, $in{'name'})) {
+    if(!&unlink_logged($cwd.'/'.$name)) {
+        push @errors, "$name - $text{'error_delete'}: $!";
+    }
+}
+
+if (scalar(@errors) > 0) {
+    print_errors(@errors);
+} else {
+    &redirect("index.cgi?path=$path");
+}

filemin/download.cgi

@@ -0,0 +1,25 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+use lib './lib';
+
+use File::Basename;
+use Cwd 'abs_path';
+
+&ReadParse();
+
+get_paths();
+
+my $file = $cwd.'/'.$in{'file'};
+my $size = -s "$file";
+(my $name, my $dir, my $ext) = fileparse($file, qr/\.[^.]*/);
+print "Content-Type: application/x-download\n";
+print "Content-Disposition: attachment; filename=\"$name$ext\"\n";
+print "Content-Length: $size\n\n";
+open (FILE, "< $file") or die "can't open $file: $!";
+binmode FILE;
+local $/ = \102400;
+while (<FILE>) {
+    print $_;
+}
+close FILE;

filemin/edit_file.cgi

@@ -0,0 +1,43 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+&ReadParse();
+
+get_paths();
+
+$data = &read_file_contents($cwd.'/'.$in{file});
+
+&ui_print_header(undef, $text{'edit_file'}, "");
+$head = "<link rel='stylesheet' type='text/css' href='unauthenticated/css/style.css' />";
+
+if ($current_theme ne 'authentic-theme') {
+    $head.= "<script type='text/javascript' src='unauthenticated/jquery/jquery.min.js'></script>";
+    $head.= "<script type='text/javascript' src='unauthenticated/jquery/jquery-ui.min.js'></script>";
+    $head.= "<link rel='stylesheet' type='text/css' href='unauthenticated/jquery/jquery-ui.min.css' />";
+
+    # Include Codemirror specific files
+    $head.= "<link rel='stylesheet' href='unauthenticated/js/lib/codemirror/lib/codemirror.css' />";
+    $head.= "<script src='unauthenticated/js/lib/codemirror/lib/codemirror.js'></script>";
+    $head.= "<script src='unauthenticated/js/lib/codemirror/addon/mode/loadmode.js'></script>";
+    $head.= "<script src='unauthenticated/js/lib/codemirror/mode/meta.js'></script>";
+    $head.= "<script src='unauthenticated/js/lib/codemirror/mode/javascript/javascript.js'></script>";
+    $head.= "<script src='unauthenticated/js/lib/codemirror/mode/scheme/scheme.js'></script>";
+    $head.= "<style type='text/css'>.CodeMirror {height: auto;}</style>";
+}
+
+print $head;
+
+print ui_table_start("$path/$in{'file'}", undef, 1);
+
+print &ui_form_start("save_file.cgi", "post");
+print &ui_hidden("file", $in{'file'}),"\n";
+print &ui_textarea("data", $data, 20, 80, undef, undef, "style='width: 100%' id='data'");
+print &ui_hidden("path", $path);
+print &ui_form_end([ [ save, $text{'save'} ], [ save_close, $text{'save_close'} ] ]);
+
+print ui_table_end();
+
+print "<script type='text/javascript' src='unauthenticated/js/cmauto.js'></script>";
+print "<script type='text/javascript'>\$(document).ready( function() { change('".$in{'file'}."'); });</script>";
+
+&ui_print_footer("index.cgi?path=$path", $text{'previous_page'});

filemin/extract.cgi

@@ -0,0 +1,25 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+use lib './lib';
+use File::MimeInfo;
+
+&ReadParse();
+
+get_paths();
+
+$archive_type = mimetype($cwd.'/'.$in{'file'});
+
+if ($archive_type eq 'application/zip') {
+    &backquote_logged("unzip ".quotemeta("$cwd/$in{'file'}").
+		      " -d ".quotemeta($cwd));
+    &redirect("index.cgi?path=$path");
+} elsif (index($archive_type, "tar") != -1) {
+    &backquote_logged("tar xf ".quotemeta("$cwd/$in{'file'}").
+		      " -C ".quotemeta($cwd));
+    &redirect("index.cgi?path=$path");
+} else {
+    &ui_print_header(undef, "Filemin", "");
+    print "$archive_type $text{'error_archive_type_not_supported'}";
+    &ui_print_footer("index.cgi?path=$path", $text{'previous_page'});
+}

filemin/filemin-lib.pl

@@ -0,0 +1,404 @@
+# filemin-lib.pl
+
+BEGIN { push(@INC, ".."); };
+use WebminCore;
+&init_config();
+use Encode qw(decode encode);
+use File::Basename;
+use POSIX;
+
+sub get_paths {
+    %access = &get_module_acl();
+
+    # Switch to the correct user
+    if (&get_product_name() eq 'usermin') {
+        # In Usermin, the module only ever runs as the connected user
+        &switch_to_remote_user();
+        &create_user_config_dirs();
+    }
+    elsif ($access{'work_as_root'}) {
+        # Root user, so no switching
+        @remote_user_info = getpwnam('root');
+    }
+    elsif ($access{'work_as_user'}) {
+        # A specific user
+        @remote_user_info = getpwnam($access{'work_as_user'});
+        @remote_user_info ||
+            &error("Unix user $access{'work_as_user'} does not exist!");
+        &switch_to_unix_user(\@remote_user_info);
+    }
+    else {
+        # The Webmin user we are connected as
+        &switch_to_remote_user();
+    }
+
+    # Get and check allowed paths
+    @allowed_paths = split(/\s+/, $access{'allowed_paths'});
+    if (&get_product_name() eq 'usermin') {
+        # Add paths from Usermin config
+        push(@allowed_paths, split(/\t+/, $config{'allowed_paths'}));
+    }
+    if($remote_user_info[0] eq 'root' || $allowed_paths[0] eq '$ROOT') {
+        # Assume any directory can be accessed
+        $base = "/";
+        @allowed_paths = ( $base );
+    } else {
+        @allowed_paths = map { $_ eq '$HOME' ? @remote_user_info[7] : $_ }
+                             @allowed_paths;
+        @allowed_paths = map { s/\$USER/$remote_user/g; $_ } @allowed_paths;
+        if (scalar(@allowed_paths == 1)) {
+            $base = $allowed_paths[0];
+        } else {
+            $base = '/';
+        }
+    }
+    $path = $in{'path'} ? $in{'path'} : '';
+    $cwd = &simplify_path($base.$path);
+
+    # Work out max upload size
+    if (&get_product_name() eq 'usermin') {
+	$upload_max = $config{'max'};
+    } else {
+	$upload_max = $access{'max'};
+    }
+
+    # Check that current directory is one of those that is allowed
+    my $error = 1;
+    for $allowed_path (@allowed_paths) {
+        if (&is_under_directory($allowed_path, $cwd) ||
+            $allowed_path =~ /^$cwd/) {
+            $error = 0;
+        }
+    }
+    if ($error) {
+        &error(&text('notallowed', &html_escape($cwd),
+                                   &html_escape(join(" , ", @allowed_paths))));
+    }
+
+    if (index($cwd, $base) == -1)
+    {
+        $cwd = $base;
+    }
+
+    # Initiate per user config
+    $confdir = "$remote_user_info[7]/.filemin";
+    if(!-e "$confdir/.config") {
+        &read_file_cached("$module_root_directory/defaultuconf", \%userconfig);
+    } else {
+        &read_file_cached("$confdir/.config", \%userconfig);
+    }
+}
+
+sub print_template {
+    $template_name = @_[0];
+    if (open(my $fh, '<:encoding(UTF-8)', $template_name)) {
+      while (my $row = <$fh>) {
+        print (eval "qq($row)");
+      }
+    } else {
+      print "$text{'error_load_template'} '$template_name' $!";
+    }
+}
+
+sub print_errors {
+    my @errors = @_;
+    &ui_print_header(undef, "Filemin", "");
+    print $text{'errors_occured'};
+    print "<ul>";
+    foreach $error(@errors) {
+        print("<li>$error</li>");
+    }
+    print "<ul>";
+    &ui_print_footer("index.cgi?path=$path", $text{'previous_page'});
+}
+
+sub print_interface {
+    # Some vars for "upload" functionality
+    local $upid = time().$$;
+    local @remote_user_info = getpwnam($remote_user);
+    local $uid = @remote_user_info[2];
+    $bookmarks = get_bookmarks();
+    @allowed_for_edit = split(/\s+/, $access{'allowed_for_edit'});
+    %allowed_for_edit = map { $_ => 1} @allowed_for_edit;
+
+    # Set things up according to currently used theme
+    if ($current_theme eq 'authentic-theme' or $current_theme eq 'bootstrap') {
+        # Interface for Bootstrap 3 powered themes
+        # Set icons variables
+        $edit_icon = "<i class='fa fa-edit' alt='$text{'edit'}'></i>";
+        $rename_icon = "<i class='fa fa-font' title='$text{'rename'}'></i>";
+        $extract_icon = "<i class='fa fa-external-link' alt='$text{'extract_archive'}'></i>";
+        $goto_icon = "<i class='fa fa-arrow-right' alt='$text{'goto_folder'}'></i>";
+        # Add static files
+        print "<script type=\"text/javascript\" src=\"unauthenticated/js/main.js\"></script>";
+        print "<script type=\"text/javascript\" src=\"unauthenticated/js/chmod-calculator.js\"></script>";
+        print "<script type=\"text/javascript\" src=\"unauthenticated/js/dataTables.bootstrap.js\"></script>";
+        print "<script type=\"text/javascript\" src=\"unauthenticated/js/bootstrap-hover-dropdown.min.js\"></script>";
+        print "<link rel=\"stylesheet\" type=\"text/css\" href=\"unauthenticated/css/style.css\" />";
+        print "<link rel=\"stylesheet\" type=\"text/css\" href=\"unauthenticated/css/dataTables.bootstrap.css\" />";
+        init_datatables();
+        # Set "root" icon
+        if($base eq '/') {
+            $root_icon = "<i class='fa fa-hdd-o'></i>";
+        } else {
+            $root_icon = "~";
+        }
+        # Breadcrumbs
+        print "<ol class='breadcrumb pull-left'><li><a href='index.cgi?path='>$root_icon</a></li>";
+        my @breadcr = split('/', $path);
+        my $cp = '';
+        for(my $i = 1; $i <= scalar(@breadcr)-1; $i++) {
+            chomp($breadcr[$i]);
+            $cp = $cp.'/'.$breadcr[$i];
+            print "<li><a href='index.cgi?path=$cp'>".
+                  &html_escape($breadcr[$i])."</a></li>";
+        }
+        print "</ol>";
+        # And toolbar
+        if($userconfig{'menu_style'}) {
+            print_template("unauthenticated/templates/menu.html");
+        } else {
+            print_template("unauthenticated/templates/quicks.html");
+        }
+        $page = 1;
+        $pagelimit = 9001; # IT'S OVER NINE THOUSAND!
+        print_template("unauthenticated/templates/dialogs.html");
+    } else {
+        # Interface for legacy themes
+        # Set icons variables
+        $edit_icon = "<img src='images/icons/quick/edit.png' alt='$text{'edit'}' />";
+        $rename_icon = "<img src='images/icons/quick/rename.png' alt='$text{'rename'}' />";
+        $extract_icon = "<img src='images/icons/quick/extract.png' alt='$text{'extract_archive'}' />";
+        $goto_icon = "<img src='images/icons/quick/go-next.png' alt='$text{'goto_folder'}'";
+        # Add static files
+        $head = "<link rel=\"stylesheet\" type=\"text/css\" href=\"unauthenticated/css/style.css\" />";
+        $head.= "<script type=\"text/javascript\" src=\"unauthenticated/jquery/jquery.min.js\"></script>";
+        $head.= "<script type=\"text/javascript\" src=\"unauthenticated/jquery/jquery-ui.min.js\"></script>";
+        $head.= "<script type=\"text/javascript\" src=\"unauthenticated/js/legacy.js\"></script>";
+        $head.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"unauthenticated/jquery/jquery-ui.min.css\" />";
+        $head.= "<script type=\"text/javascript\" src=\"unauthenticated/js/chmod-calculator.js\"></script>";
+        $head.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"unauthenticated/dropdown/fg.menu.css\" />";
+        $head.= "<script type=\"text/javascript\" src=\"unauthenticated/dropdown/fg.menu.js\"></script>";
+        print $head;
+        # Set "root" icon
+        if($base eq '/') {
+            $root_icon = "<img src=\"images/icons/quick/drive-harddisk.png\" class=\"hdd-icon\" />";
+        } else {
+            $root_icon = "~";
+        }
+        # Legacy breadcrumbs
+        print "<div id='bread' style='float: left; padding-bottom: 2px;'><a href='index.cgi?path='>$root_icon</a> / ";
+        my @breadcr = split('/', $path);
+        my $cp = '';
+        for(my $i = 1; $i <= scalar(@breadcr)-1; $i++) {
+            chomp($breadcr[$i]);
+            $cp = $cp.'/'.$breadcr[$i];
+            print "<a href='index.cgi?path=$cp'>".
+                  &html_escape($breadcr[$i])."</a> / ";
+        }
+        print "<br />";
+        # And pagination
+        $page = $in{'page'};
+        $pagelimit = $userconfig{'per_page'};
+        $pages = ceil((scalar(@list))/$pagelimit);
+        if (not defined $page or $page > $pages) { $page = 1; }
+        print "Pages: ";
+        for(my $i = 1;$i <= $pages;$i++) {
+            if($page eq $i) {
+                print "<a class='pages active' ".
+                      "href='?path=$path".
+                      "&page=$i".
+                      "&query=$query".
+                      "'>".&html_escape($i)."</a>";
+            } else {
+                print "<a class='pages' ".
+                      "href='?path=$path".
+                      "&page=$i".
+                      "&query=$query'>".&html_escape($i)."</a>";
+            }
+        }
+        print "</div>";
+        # And toolbar
+        print_template("unauthenticated/templates/legacy_quicks.html");
+        print_template("unauthenticated/templates/legacy_dialogs.html");
+    }
+    print "<div class='total'>" . &text('info_total', scalar @files, scalar @folders) . "</div>";
+#    use Data::Dumper;
+#    print Dumper(\%allowed_for_edit);
+
+    # Render current directory entries
+    print &ui_form_start("", "post", undef, "id='list_form'");
+    @ui_columns = (
+            '<input id="select-unselect" type="checkbox" onclick="selectUnselect(this)" />',
+            ''
+        );
+    push @ui_columns, $text{'name'};
+    push @ui_columns, $text{'type'} if($userconfig{'columns'} =~ /type/);
+    push @ui_columns, $text{'actions'};
+    push @ui_columns, $text{'size'} if($userconfig{'columns'} =~ /size/);
+    push @ui_columns, $text{'owner_user'} if($userconfig{'columns'} =~ /owner_user/);
+    push @ui_columns, $text{'permissions'} if($userconfig{'columns'} =~ /permissions/);
+    push @ui_columns, $text{'last_mod_time'} if($userconfig{'columns'} =~ /last_mod_time/);
+
+    print &ui_columns_start(\@ui_columns);
+    #foreach $link (@list) {
+    for(my $count = 1 + $pagelimit*($page-1);$count <= $pagelimit+$pagelimit*($page-1);$count++) {
+        if ($count > scalar(@list)) { last; }
+        my $class = $count & 1 ? "odd" : "even";
+        my $link = $list[$count - 1][0];
+        $link =~ s/\Q$cwd\E\///;
+        $link =~ s/^\///g;
+        $vlink = html_escape($link);
+        $vlink = quote_escape($vlink);
+        $vlink = decode('UTF-8', $vlink, Encode::FB_CROAK);
+        $path = html_escape($path);
+        $vpath = quote_escape($vpath);
+        $vpath = decode('UTF-8', $vpath, Encode::FB_CROAK);
+
+        my $type = $list[$count - 1][14];
+        $type =~ s/\//\-/g;
+        my $img = "images/icons/mime/$type.png";
+        unless (-e $img) { $img = "images/icons/mime/unknown.png"; }
+        $size = &nice_size($list[$count - 1][8]);
+        $user = getpwuid($list[$count - 1][5]) ? getpwuid($list[$count - 1][5]) : $list[$count - 1][5];
+        $group = getgrgid($list[$count - 1][6]) ? getgrgid($list[$count - 1][6]) : $list[$count - 1][6];
+        $permissions = sprintf("%04o", $list[$count - 1][3] & 07777);
+        $mod_time = POSIX::strftime('%Y/%m/%d - %T', localtime($list[$count - 1][10]));
+
+        $actions = "<a class='action-link' href='javascript:void(0)' onclick='renameDialog(\"$vlink\")' title='$text{'rename'}' data-container='body'>$rename_icon</a>";
+
+        if ($list[$count - 1][15] == 1) {
+            $href = "index.cgi?path=".&urlize("$path/$link");
+        } else {
+            $href = "download.cgi?file=".&urlize($link)."&path=".&urlize($path);
+            if($0 =~ /search.cgi/) {
+                ($fname,$fpath,$fsuffix) = fileparse($list[$count - 1][0]);
+                if($base ne '/') {
+                    $fpath =~ s/^\Q$base\E//g;
+                }
+                $actions = "$actions<a class='action-link' ".
+                           "href='index.cgi?path=".&urlize($fpath)."' ".
+                           "title='$text{'goto_folder'}'>$goto_icon</a>";
+            }
+            if (
+                index($type, "text-") != -1 or
+                exists($allowed_for_edit{$type})
+            ) {
+                $actions = "$actions<a class='action-link' href='edit_file.cgi?file=".&urlize($link)."&path=".&urlize($path)."' title='$text{'edit'}' data-container='body'>$edit_icon</a>";
+            }
+            if (index($type, "zip") != -1 or index($type, "compressed") != -1) {
+                $actions = "$actions <a class='action-link' href='extract.cgi?path=".&urlize($path)."&file=".&urlize($link)."' title='$text{'extract_archive'}' data-container='body'>$extract_icon</a> ";
+            }
+        }
+        @row_data = (
+            "<a href='$href'><img src=\"$img\"></a>",
+            "<a href=\"$href\" data-filemin-path=\"$href\">$vlink</a>"
+        );
+        push @row_data, $type if($userconfig{'columns'} =~ /type/);
+        push @row_data, $actions;
+        push @row_data, $size if($userconfig{'columns'} =~ /size/);
+        push @row_data, $user.':'.$group if($userconfig{'columns'} =~ /owner_user/);
+        push @row_data, $permissions if($userconfig{'columns'} =~ /permissions/);
+        push @row_data, $mod_time if($userconfig{'columns'} =~ /last_mod_time/);
+
+        print &ui_checked_columns_row(\@row_data, "", "name", $link);
+    }
+    print ui_columns_end();
+    print &ui_hidden("path", $path),"\n";
+    print &ui_form_end();
+}
+
+sub init_datatables {
+    my ($a, $b, $c);
+    $a = '0, 1, 3';
+    $b = '4';
+    $c = '';
+    if ($userconfig{'columns'} =~ /type/) {
+        $a = '0, 1, 4';
+        $b = '5';
+    }
+    if ($userconfig{'columns'} =~ /size/) {
+        $c = '{ "type": "file-size", "targets": [' . $b . '] },';
+    }
+
+    if($userconfig{'disable_pagination'}) {
+        $bPaginate = 'false';
+    } else {
+        $bPaginate = 'true';
+    }
+print "<script>";
+print "\$( document ).ready(function() {";
+print "\$.fn.dataTableExt.sErrMode = 'throw';";
+print "\$('#list_form > table').dataTable({";
+print "\"order\": [],";
+print "\"aaSorting\": [],";
+print "\"bDestroy\": true,";
+print "\"bPaginate\": $bPaginate,";
+print " \"fnDrawCallback\": function(oSettings) {
+        if (oSettings.fnRecordsTotal() <= oSettings._iDisplayLength) {
+            \$('.dataTables_paginate').hide();
+        } else {
+            \$('.dataTables_paginate').show();
+        }
+    },";
+print " \"initComplete\": function() {
+        \$('div.dataTables_filter input').val('').trigger('keyup');
+        \$('div.dataTables_filter input').focus();
+        \$(document).on('keydown', function (event) {
+            var keycode = event.keyCode ? event.keyCode : event.which;
+            if (!\$('input').is(':focus') && !\$('select').is(':focus') && !\$('textarea').is(':focus')) {
+                if (keycode === 39) {
+                    \$('.paginate_button.next').trigger('click');
+                }
+                if (keycode === 37) {
+                    \$('.paginate_button.previous').trigger('click');
+                }
+            }
+        });
+    },";
+print "\"bInfo\": false,";
+print "\"destroy\": true,";
+print "\"oLanguage\": {";
+print "\"sSearch\": \" \"";
+print "},";
+print "\"columnDefs\": [ { \"orderable\": false, \"targets\": [$a] }, $c ],";
+print "\"bStateSave\": true,";
+print "\"iDisplayLength\": 50,";
+print "});";
+print "\$(\"form\").on('click', 'div.popover', function() {";
+print "\$(this).prev('input').popover('hide');";
+print "});";
+print "});";
+print "</script>";
+}
+
+sub get_bookmarks {
+    $confdir = "$remote_user_info[7]/.filemin";
+    if(!-e "$confdir/.bookmarks") {
+        return "<li><a>$text{'no_bookmarks'}</a></li>";
+    }
+    my $bookmarks = &read_file_lines($confdir.'/.bookmarks', 1);
+    $result = '';
+    foreach $bookmark(@$bookmarks) {
+        $result.= "<li><a href='index.cgi?path=$bookmark'>".
+                  &html_escape($bookmark)."</a><li>";
+    }
+    return $result;
+}
+
+# get_paste_buffer_file()
+# Returns the location of the file for temporary copy/paste state
+sub get_paste_buffer_file
+{
+    if (&get_product_name() eq 'usermin') {
+        return $user_module_config_directory."/.buffer";
+    }
+    else {
+        my $tmpdir = "$remote_user_info[7]/.filemin";
+        &make_dir($tmpdir, 0700) if (!-d $tmpdir);
+        return $tmpdir."/.buffer";
+    }
+}
+
+1;
+

filemin/http_download.cgi

@@ -0,0 +1,47 @@
+#!/usr/local/bin/perl
+
+require './filemin-lib.pl';
+use lib './lib';
+
+&ReadParse();
+get_paths();
+
+if(!$in{'link'}) {
+    &redirect("index.cgi?path=$path");
+}
+
+my $mode;
+my @errors;
+
+my ($host, $port, $page, $ssl) = &parse_http_url($in{'link'});
+if (!$host) {
+    # Not an HTTP or FTP URL
+    push @errors, $text{'error_invalid_uri'};
+} else {
+    # Looks like a valid URL
+    my $file = $page;
+    $file =~ s/^.*\///;
+    $file ||= "index.html";
+
+    if(-e "$cwd/$file") {
+        push @errors, "<i>$file</i> $text{'file_already_exists'} <i>$path</i>";
+    } else {
+        &ui_print_header(undef, "$text{'http_downloading'} $file", "");
+	if ($ssl == 0 || $ssl == 1) {
+	    # HTTP or HTTPS download
+	    &http_download($host, $port, $page, "$cwd/$file", undef,
+			   \&progress_callback, $ssl,
+			   $in{'username'}, $in{'password'});
+	} else {
+	    # Actually an FTP download
+	    &ftp_download($host, $page, "$cwd/$file", undef,
+			  \&progress_callback,
+			  $in{'username'}, $in{'password'}, $port);
+	}
+        &ui_print_footer("index.cgi?path=$path", $text{'previous_page'});
+   }
+}
+
+if (scalar(@errors) > 0) {
+    print_errors(@errors);
+}

filemin/images/icons/AUTHORS

@@ -0,0 +1,5 @@
+Faenza is designed and developed by Matthieu James <matthieu.james@gmail.com>.
+
+Faenza icons are all licensed under the GPL.
+
+Thanks to Holger Seelig and clemyeats for their help for having some text preview inside icons in Nautilus.

filemin/images/icons/COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.