Revision: 6240
http://ipcop.svn.sourceforge.net/ipcop/?rev=6240&view=rev
Author: dotzball
Date: 2012-01-19 08:17:24 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Change redirect background image from jpg to png.
Use custom-redirect-background.png instead of redirect-background.png if
available.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ipcop-gui
ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi
ipcop/trunk/lfs/ipcop-gui
ipcop/trunk/updates/2.0.3/setup
Added Paths:
-----------
ipcop/trunk/html/html/images/redirect-background.png
Removed Paths:
-------------
ipcop/trunk/html/html/images/redirect-background.jpg
Modified: ipcop/trunk/config/rootfiles/common/ipcop-gui
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-gui 2012-01-18 07:34:19 UTC
(rev 6239)
+++ ipcop/trunk/config/rootfiles/common/ipcop-gui 2012-01-19 08:17:24 UTC
(rev 6240)
@@ -108,7 +108,7 @@
home/httpd/html/images/on.gif
home/httpd/html/images/openvpnzip.gif
home/httpd/html/images/reboot_cgi.png
-home/httpd/html/images/redirect-background.jpg
+home/httpd/html/images/redirect-background.png
home/httpd/html/images/reload.gif
home/httpd/html/images/sflogo.gif
home/httpd/html/images/shieldedtux.png
Deleted: ipcop/trunk/html/html/images/redirect-background.jpg
===================================================================
(Binary files differ)
Added: ipcop/trunk/html/html/images/redirect-background.png
===================================================================
(Binary files differ)
Property changes on: ipcop/trunk/html/html/images/redirect-background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi
===================================================================
--- ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi 2012-01-18 07:34:19 UTC
(rev 6239)
+++ ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi 2012-01-19 08:17:24 UTC
(rev 6240)
@@ -89,19 +89,23 @@
END
;
-if (($filtersettings{'ENABLE_JPEG'} eq 'on') && (-e
"/home/httpd/html/images/redirect-background.jpg"))
-{
- print <<END
- <body
style="background-image:URL('http://$netsettings{'GREEN_1_ADDRESS'}:$http_port//images/redirect-background.jpg');
background-color:#FFFFFF; font-family:verdana, arial, 'sans serif';">
-END
-;
+my $image = '';
+if ($filtersettings{'ENABLE_BG_IMAGE'} eq 'on') {
+ $image = "background-image:
url('http://$netsettings{'GREEN_1_ADDRESS'}:$http_port/images/";
+
+ if (-e "/home/httpd/html/images/custom-redirect-background.png") {
+ $image .= "custom-redirect-background.png";
+ }
+ else {
+ $image .= "redirect-background.png";
+ }
+ $image .= "');";
}
-else {
- print <<END
- <body style="background-color:#FFFFFF; font-family:verdana, arial, 'sans
serif';">
+
+print <<END
+ <body style="$image background-color:#FFFFFF; font-family:verdana, arial,
'sans serif';">
END
;
-}
print <<END
<div style="width:80%; margin:20px auto;">
Modified: ipcop/trunk/lfs/ipcop-gui
===================================================================
--- ipcop/trunk/lfs/ipcop-gui 2012-01-18 07:34:19 UTC (rev 6239)
+++ ipcop/trunk/lfs/ipcop-gui 2012-01-19 08:17:24 UTC (rev 6240)
@@ -78,9 +78,6 @@
chown nobody:nobody /home/httpd/html/backup
chmod 744 /home/httpd/html/backup
- # redirect background image needs nobody:nobody permissions as it can
be written by webui
- chown nobody.nobody /home/httpd/html/images/redirect-background.jpg
-
# repository directory for urlfilter
mkdir -p /home/httpd/vhost81/html/repository
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2012-01-18 07:34:19 UTC (rev 6239)
+++ ipcop/trunk/updates/2.0.3/setup 2012-01-19 08:17:24 UTC (rev 6240)
@@ -41,9 +41,6 @@
fi
-# redirect background image needs nobody:nobody permissions as it can be
written by webui
-chown nobody.nobody /home/httpd/html/images/redirect-background.jpg
-
#####
#
# End of version specific handling. Continue with universal stuff.
@@ -88,6 +85,9 @@
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
+# redirect background image converted to png, remove obsolete jpg
+/bin/rm -f /home/httpd/html/images/redirect-background.jpg
+
#####
#
# Add version specific handling *after* unpacking the patch here.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
