]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7e78cc)
Captive-Portal: SHow always licencebox in config
authorAlexander Marx <alexander.marx@ipfire.org>
Thu, 4 Feb 2016 06:30:05 +0000 (07:30 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Sep 2017 17:54:03 +0000 (18:54 +0100)
Also fix index.cgi to show individual title

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
html/cgi-bin/captive.cgi patch | blob | blame | history
html/cgi-bin/captive/index.cgi patch | blob | blame | history
lfs/web-user-interface patch | blob | blame | history

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 0a16dc12b18f1567b2af4ba2b1b2fed84129b1db..841f946b3c2e5618812058d851fc873de77ab42a 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -28,7 +28,7 @@ use HTML::Entities();
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-unless (-e "${General::swroot}/captive/settings")      { system("touch ${General::swroot}/captive/settings"); }
+
 my %settings=();
 my %mainsettings;
 my %color;
@@ -42,6 +42,7 @@ my %voucherhash=();
 my %clientshash=();
 my $settingsfile="${General::swroot}/captive/settings";
 
+unless (-e $settingsfile)      { system("touch $settingsfile"); }
 unless (-e $voucherout)        { system("touch $voucherout"); }
 
 &Header::getcgihash(\%cgiparams);
@@ -256,12 +257,9 @@ END
 END
 ;
 
-       if($settings{'AUTH'} eq 'LICENSE'){ 
-               &agbbox();
-       }
+       &agbbox();
 
        print"<tr><td>$Lang::tr{'Captive vouchervalid'}</td><td>";
-
        print "<br><table border='0' with=100%>";
        print "<th>$Lang::tr{'hours'}</th><th>$Lang::tr{'days'}</th><th>$Lang::tr{'weeks'}</th><th>$Lang::tr{'months'}</th>";
 
diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index dd459319966be4f130bb068a4a1d134085d1b9be..975bd61d5f8bb9f27ea3c575534e19a607a37755 100755 (executable)
--- a/html/cgi-bin/captive/index.cgi
+++ b/html/cgi-bin/captive/index.cgi
@@ -168,7 +168,7 @@ print<<END
        <body>
        <center>
                <div class="title">
-                       <h1>$settings{'TITLE'}
+                       <h1>$settings{'TITLE'}</h1>
                </div>
                <br>
                <div class="agb">
@@ -196,7 +196,7 @@ sub voucher(){
        <body>
        <center>
                <div class="title">
-                       <h1>LOGIN</h1>
+                       <h1>$settings{'TITLE'}</h1>
                </div>
                <br>
                <div class="login">
diff --git a/lfs/web-user-interface b/lfs/web-user-interface
index 0f581008d76284fdd8db01eda9088803a22b204d..f30791f4eb596d262506f8c077d8d377c1735c67 100644 (file)
--- a/lfs/web-user-interface
+++ b/lfs/web-user-interface
@@ -64,7 +64,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R root:root /srv/web/ipfire
        chmod -R 755 /srv/web/ipfire/cgi-bin
        chmod -R 644 /srv/web/ipfire/html
-       chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*,captive/*}
+       chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*,captive/*,captive/*/*}
        ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded
 
        # Reset permissions of redirect templates and theme directories
Peter's tree of IPFire 2.x