Squid gefixt damit auch andere auth meachanismen funktionieren

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@613 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/language_issues.de b/doc/language_issues.de
index cfc26ea484223fd08b46c846f433685d59b766b5..5db31c987681f67e46b94cb85f287bb56711b47c 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -175,6 +175,7 @@ WARNING: translation string unused: iowait
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipfire side is invalid
+WARNING: translation string unused: iptable rules
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version
@@ -224,6 +225,7 @@ WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
 WARNING: translation string unused: net config type help
+WARNING: translation string unused: net-traffic configuration
 WARNING: translation string unused: network configuration
 WARNING: translation string unused: network status information
 WARNING: translation string unused: new optionsfw later
@@ -363,4 +365,3 @@ WARNING: translation string unused: written sectors
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: qos graphs

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3001d4e7f7175f834269ff82fc74f08ac410852a..0f7239ba5262cd676e6082f550fbb4f9fd4dbad8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -186,6 +186,7 @@ WARNING: translation string unused: iowait
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipfire side is invalid
+WARNING: translation string unused: iptable rules
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version
@@ -235,6 +236,7 @@ WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
 WARNING: translation string unused: net config type help
+WARNING: translation string unused: net-traffic configuration
 WARNING: translation string unused: network configuration
 WARNING: translation string unused: network status information
 WARNING: translation string unused: new optionsfw later
@@ -366,4 +368,3 @@ WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: written sectors
 WARNING: translation string unused: year
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: qos graphs

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index e0d8452bbe94ce8117e9f2cc3c1a7cfb3b43215e..ee44b0e344291dd8213e7aa8d5c5236c26d20422 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2166,7 +2166,7 @@ if (-e $disgrp)
 
 # If the password file contains entries, print entries and action icons
 
-if (! -z "$userdb") {
+if ( $userdb ne "" ) {
        print <<END
        <tr>
                <td width='30%' class='boldbase' align='center'><b><i>$Lang::tr{'advproxy NCSA username'}</i></b></td>
@@ -2733,7 +2733,7 @@ sub write_acls
 
 sub writepacfile
 {
-       open(FILE, ">/home/httpd/html/proxy.pac");
+       open(FILE, ">/srv/web/ipfire/html/proxy.pac");
        flock(FILE, 2);
        print FILE "function FindProxyForURL(url, host)\n";
        print FILE "{\n";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d7d8e6452c5640add6946ad1d1cfccff04b45552..3173e7fd6911287a21899736faf4290abce98d2e 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1199,6 +1199,7 @@
 'psk' => 'PSK',
 'pulse' => 'Puls',
 'pulse dial' => 'Pulswahl:',
+'qos graphs' => 'Qos Diagramme',
 'ram' => 'RAM-Speicher',
 'read list' => 'Liste der Leseberechtigten',
 'read sectors' => 'Sektoren lesen',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2d784fc5b47cfe858f74f7746a1f7bf65d809873..ade961edb0c91878588575460fc4b1be31014b04 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1207,6 +1207,7 @@
 'psk' => 'PSK',
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
+'qos graphs' => 'Qos Graphs',
 'quick control' => 'Quick Control',
 'ram' => 'RAM',
 'read list' => 'list with readonly hosts',

diff --git a/lfs/squid b/lfs/squid
index 2bdf5bea82017e417355e9bb9af824c7fe5153ee..54a96147275e237e7f59432a9ac06e9e33d57acd 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -125,8 +125,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 755 /var/log/updatexlrator
        
   chwon squid:squid /var/log/squid
-  mkdir /var/ipfire/proxy/advanced/auth
-       cp -f $(DIR_SRC)/config/proxy/auth /var/ipfire/proxy/advanced/auth
+  mkdir /usr/lib/squid/auth
+       cp -f $(DIR_SRC)/config/proxy/auth /usr/lib/squid/auth
        cp -f $(DIR_SRC)/config/proxy/proxy.pac /srv/web/ipfire/html/proxy.pac
        chown nobody.nobody /srv/web/ipfire/html/proxy.pac
        ln -f /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html//wpad.dat