Revision: 6249
http://ipcop.svn.sourceforge.net/ipcop/?rev=6249&view=rev
Author: owes
Date: 2012-01-21 07:59:49 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Remove references to background image upload. Rename 'urlfilter enable
background image' text to more generic text, in future we might want to use the
option elsewhere.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/urlfilter.cgi
ipcop/trunk/langs/ipcop.new.en.pl
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-01-21 07:47:57 UTC (rev
6248)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-01-21 07:59:49 UTC (rev
6249)
@@ -136,7 +136,7 @@
$filtersettings{'SHOW_URL'} = 'off';
$filtersettings{'SHOW_IP'} = 'off';
$filtersettings{'ENABLE_DNSERROR'} = 'off';
-$filtersettings{'ENABLE_BG_IMAGE'} = 'off';
+$filtersettings{'ENABLE_BG_IMAGE'} = 'off';
$filtersettings{'REDIRECT_PAGE'} = '';
$filtersettings{'MSG_TEXT_1'} = '';
$filtersettings{'MSG_TEXT_2'} = '';
@@ -165,7 +165,6 @@
|| ($filtersettings{'ACTION'} eq $Lang::tr{'save and restart'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'upload file'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter remove file'})
- || ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload background'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter backup'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter restore'}))
@@ -232,15 +231,6 @@
}
- if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload background'})
{
- &General::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' =>
'BACKGROUND'});
-
- if (copy($filtersettings{'BACKGROUND'},
"/home/httpd/html/images/redirect-background.jpg") != 1) {
- $errormessage = $!;
- goto ERROR;
- }
- }
-
if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'}) {
&General::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' =>
'UPDATEFILE'});
@@ -1061,9 +1051,9 @@
$checked{'ENABLE_DNSERROR'}{'off'}
= '';
$checked{'ENABLE_DNSERROR'}{'on'}
= '';
$checked{'ENABLE_DNSERROR'}{$filtersettings{'ENABLE_DNSERROR'}}
= "checked='checked'";
-$checked{'ENABLE_BG_IMAGE'}{'off'}
= '';
-$checked{'ENABLE_BG_IMAGE'}{'on'}
= '';
-$checked{'ENABLE_BG_IMAGE'}{$filtersettings{'ENABLE_BG_IMAGE'}}
= "checked='checked'";
+$checked{'ENABLE_BG_IMAGE'}{'off'}
= '';
+$checked{'ENABLE_BG_IMAGE'}{'on'}
= '';
+$checked{'ENABLE_BG_IMAGE'}{$filtersettings{'ENABLE_BG_IMAGE'}}
= "checked='checked'";
$checked{'ENABLE_EXPR_LISTS'}{'off'}
= '';
$checked{'ENABLE_EXPR_LISTS'}{'on'}
= '';
$checked{'ENABLE_EXPR_LISTS'}{$filtersettings{'ENABLE_EXPR_LISTS'}}
= "checked='checked'";
@@ -1476,7 +1466,7 @@
<td><input type='text' name='MSG_TEXT_3'
value='$filtersettings{'MSG_TEXT_3'}' size='40' /></td>
</tr>
<tr>
- <td class='base'>$Lang::tr{'urlfilter enable background image'}:</td>
+ <td class='base'>$Lang::tr{'enable background image'}:</td>
<td><input type='checkbox' name='ENABLE_BG_IMAGE'
$checked{'ENABLE_BG_IMAGE'}{'on'} /></td>
<td> </td>
<td> </td>
@@ -2696,7 +2686,6 @@
delete $filtersettings{'CUSTOM_WHITE_DOMAINS'};
delete $filtersettings{'CUSTOM_WHITE_URLS'};
delete $filtersettings{'CUSTOM_EXPRESSIONS'};
- delete $filtersettings{'BACKGROUND'};
delete $filtersettings{'UPDATEFILE'};
&General::writehash("/var/ipcop/proxy/filtersettings", \%filtersettings);
Modified: ipcop/trunk/langs/ipcop.new.en.pl
===================================================================
--- ipcop/trunk/langs/ipcop.new.en.pl 2012-01-21 07:47:57 UTC (rev 6248)
+++ ipcop/trunk/langs/ipcop.new.en.pl 2012-01-21 07:59:49 UTC (rev 6249)
@@ -222,7 +222,6 @@
'urlfilter empty ads' => 'Block \"ads\" with empty window',
'urlfilter empty repository' => 'Local file repository is empty',
'urlfilter enable automatic blacklist update' => 'Enable automatic update',
-'urlfilter enable background image' => 'Enable background image',
'urlfilter enable custom blacklist' => 'Enable custom blacklist',
'urlfilter enable custom expression list' => 'Enable custom expression list',
'urlfilter enable custom whitelist' => 'Enable custom whitelist',
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
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-dev2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
