|
current/templates blocked, 1.16, 1.17 cgi-error-disabled, 1.11, 1.12 connec: msg#00022web.privoxy.cvs
Update of /cvsroot/ijbswa/current/templates In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26899/templates Modified Files: blocked cgi-error-disabled connect-failed edit-actions-add-url-form edit-actions-for-url edit-actions-for-url-filter edit-actions-list edit-actions-list-section edit-actions-list-url edit-actions-remove-url-form edit-actions-url-form mod-title no-such-domain show-status Log Message: Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) with what was really the latest development (the v_3_0_branch branch) Index: blocked =================================================================== RCS file: /cvsroot/ijbswa/current/templates/blocked,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- blocked 5 Sep 2002 16:07:41 -0000 1.16 +++ blocked 18 Jul 2006 14:49:13 -0000 1.17 @@ -55,9 +55,11 @@ # protocol: # The request's protocol: http:// or https:// # hostport: -# The host and port part of the request that lead to this problem +# The host and port part of the blocked request's URL. # path: -# The path part of the request that lead to this problem +# The path part of the blocked request's URL. +# path-ue: +# The path part of the blocked request's URL, url-encoded. # # # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS: @@ -142,7 +144,7 @@ document.write('\ <p class="small" align="center"> \ <a href="@default-cgi@" target="_blank">Privoxy</a> blocked <b>@protocol@@hostport@@path@</b>. \ - <br><a href="@default-cgi@show-url-info?url=@hostport@@path@" target="_blank">See why</a> \ + <br><a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" target="_blank">See why</a> \ <!-- @if-force-support-start --> \ or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. \ <!-- if-force-support-end@ --> \ @@ -184,7 +186,7 @@ <td class="box" colspan="2"> \ <h2>Request for blocked URL</h2> \ <p>Your request for <b>@protocol@@hostport@@path@</b> was blocked. \ - <br><a href="@default-cgi@show-url-info?url=@hostport@@path@">See why</a> \ + <br><a href="@default-cgi@show-url-info?url=@hostport@@path-ue@">See why</a> \ <!-- @if-force-support-start --> \ or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. \ <!-- if-force-support-end@ --> \ @@ -259,7 +261,7 @@ <noscript> <p class="small" align="center"> <a href="@default-cgi@" target="_blank">Privoxy</a> blocked <b>@protocol@@hostport@@path@</b>. - <br><a href="@default-cgi@show-url-info?url=@hostport@@path@" target="_blank">See why</a> + <br><a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" target="_blank">See why</a> <!-- @if-force-support-start --> or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. <!-- if-force-support-end@ --> Index: cgi-error-disabled =================================================================== RCS file: /cvsroot/ijbswa/current/templates/cgi-error-disabled,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cgi-error-disabled 5 Sep 2002 16:07:43 -0000 1.11 +++ cgi-error-disabled 18 Jul 2006 14:49:13 -0000 1.12 @@ -101,13 +101,13 @@ <tr> <td class="warning"> - <h2>Privoxy Configuration page diasabled</h2> - <p>The Privoxy administrator has decided to disable this - feature. If you want to use it, you must ask them to - enable it.</p> - <p>If you are the Privoxy administrator, you can enable - this feature by changing the appropriate line in your - configuration file.</p> + <h2>Privoxy Configuration access denied</h2> + <p>The feature you are trying to access has either been disabled + by the Privoxy administrator, or you came here by following an + unsafe external link.</p> + + <p>All enabled features are accessible from the + <a href="@default-cgi@">main menu</a>.</p> </td> </tr> Index: connect-failed =================================================================== RCS file: /cvsroot/ijbswa/current/templates/connect-failed,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- connect-failed 7 Mar 2003 01:43:32 -0000 1.18 +++ connect-failed 18 Jul 2006 14:49:13 -0000 1.19 @@ -117,9 +117,7 @@ not be fulfilled, because the connection to <b>@host@</b> (@host-ip@) could not be established. </p> <p>This is often a temporary failure, so you might just - <a href="@protocol@@hostport@@path@">try again</a> - or look the site up at - <a href="http://www.google.com/search?q=@protocol@@hostport@@path@">Google</a>. + <a href="@protocol@@hostport@@path@">try again</a>. </p> </td> </tr> Index: edit-actions-add-url-form =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-add-url-form,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- edit-actions-add-url-form 5 Sep 2002 16:08:57 -0000 1.15 +++ edit-actions-add-url-form 18 Jul 2006 14:49:13 -0000 1.16 @@ -31,10 +31,9 @@ # # Revisions : # $Log$ -# Revision 1.15 2002/09/05 16:08:57 oes -# Synced with stable branch: -# Revision 1.14.2.2 2002/08/23 02:22:53 hal9 -# Fix a perl brain fart with <li> in comments. +# Revision 1.16 2006/07/18 14:49:13 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) # # Revision 1.14.2.2 2002/08/23 02:22:53 hal9 # Fix a perl brain fart with <li> in comments. Index: edit-actions-for-url =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-for-url,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- edit-actions-for-url 5 Oct 2004 03:21:40 -0000 1.33 +++ edit-actions-for-url 18 Jul 2006 14:49:13 -0000 1.34 @@ -32,31 +32,22 @@ # # Revisions : # $Log$ -# Revision 1.33 2004/10/05 03:21:40 david__schmidt +# Revision 1.34 2006/07/18 14:49:13 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.29.2.5 2004/10/05 03:17:26 david__schmidt # Typo: inspect_jpegs, not inspect-jpegs in form # -# Revision 1.32 2004/10/05 02:03:19 david__schmidt +# Revision 1.29.2.4 2004/10/03 12:53:46 david__schmidt # Add the ability to check jpeg images for invalid # lengths of comment blocks. Defensive strategy # against the exploit: -# Microsoft Security Bulletin MS04-028 +# Microsoft Security Bulletin MS04-028 # Buffer Overrun in JPEG Processing (GDI+) Could # Allow Code Execution (833987) # Enabled with +inspect-jpegs in actions files. # -# Revision 1.31 2003/09/22 00:33:01 david__schmidt -# Enable sending a custom 'blocked' image. Shows up as -# "image-blocker-custom-file" parameter in config, and -# "+set-image-blocker{custom}" in action files. -# -# Revision 1.30 2002/09/05 16:12:02 oes -# Synced with stable branch: -# Revision 1.29.2.3 2002/08/23 02:22:53 hal9 -# Fix a perl brain fart with <li> in comments. -# -# Revision 1.29.2.1 2002/08/02 12:51:42 oes -# Added top submit button; Consistency with docs: Change default name for action from hide-referer to hide-referrer -# # Revision 1.29.2.3 2002/08/23 02:22:53 hal9 # Fix a perl brain fart with <li> in comments. # @@ -531,6 +522,19 @@ </tr> <tr class="bg1" align="left" valign="top"> <td class="en1" align="center" valign="middle"><input type="radio" + name="inspect_jpegs" value="Y" @inspect-jpegs-y@ + ></td> + <td class="dis1" align="center" valign="middle"><input type="radio" + name="inspect_jpegs" value="N" @inspect-jpegs-n@ + ></td> + <td class="noc1" align="center" valign="middle"><input type="radio" + name="inspect_jpegs" value="X" @inspect-jpegs-x@ + ></td> + <td class="action"><a href="@user-manual@@actions-help-prefix@INSPECT-JPEGS">inspect-jpegs</a></td> + <td>Checks jpeg images for malicious content.</td> + </tr> + <tr class="bg1" align="left" valign="top"> + <td class="en1" align="center" valign="middle"><input type="radio" name="downgrade_http_version" value="Y" @downgrade-http-version-y@></td> <td class="dis1" align="center" valign="middle"><input type="radio" name="downgrade_http_version" value="N" @downgrade-http-version-n@></td> @@ -687,19 +691,6 @@ </tr> <tr class="bg1" align="left" valign="top"> <td class="en1" align="center" valign="middle"><input type="radio" - name="inspect_jpegs" value="Y" @inspect-jpegs-y@ - ></td> - <td class="dis1" align="center" valign="middle"><input type="radio" - name="inspect_jpegs" value="N" @inspect-jpegs-n@ - ></td> - <td class="noc1" align="center" valign="middle"><input type="radio" - name="inspect_jpegs" value="X" @inspect-jpegs-x@ - ></td> - <td class="action"><a href="@user-manual@@actions-help-prefix@INSPECT-JPEGS">inspect-jpegs</a></td> - <td>Checks jpeg images for malicious content.</td> - </tr> - <tr class="bg1" align="left" valign="top"> - <td class="en1" align="center" valign="middle"><input type="radio" name="kill_popups" value="Y" @kill-popups-y@ ></td> <td class="dis1" align="center" valign="middle"><input type="radio" @@ -835,11 +826,7 @@ <input type="radio" name="set_image_blocker_mode" value="blank" onclick="set_image_blocker_param_disable(true)" id="set_image_blocker_mode_blank" @set-image-blocker-param-blank@><label - for="set_image_blocker_mode_blank">Send a 1x1 transparent image</label><br> - <input type="radio" name="set_image_blocker_mode" value="custom" - onclick="set_image_blocker_param_disable(true)" - id="set_image_blocker_mode_custom" @set-image-blocker-param-custom@><label - for="set_image_blocker_mode_custom">Send a custom image</label><br> + for="set_image_blocker_mode_blank">Send a 1x1 transparent GIF</label><br> <input type="radio" name="set_image_blocker_mode" value="CUSTOM" onclick="set_image_blocker_param_disable(false)" id="set_image_blocker_mode_set" @set-image-blocker-param-custom@><label Index: edit-actions-for-url-filter =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-for-url-filter,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- edit-actions-for-url-filter 14 May 2002 21:36:57 -0000 1.5 +++ edit-actions-for-url-filter 18 Jul 2006 14:49:13 -0000 1.6 @@ -1,7 +1,7 @@ -<tr class="bg1" align="left" valign="top"> - <td class="en1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="Y" @this-filter-y@></td> - <td class="dis1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="N" @this-filter-n@></td> - <td class="noc1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="X" @this-filter-x@></td> - <td class="action"><a href="@user-manual@@actions-help-prefix@FILTER">filter</a> @name@<input type="hidden" name="filter_n@index@" value="@name@"></td> - <td>@description@</td> -</tr> +<tr class="bg1" align="left" valign="top"> + <td class="en1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="Y" @this-filter-y@></td> + <td class="dis1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="N" @this-filter-n@></td> + <td class="noc1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="X" @this-filter-x@></td> + <td class="action"><a href="@user-manual@@actions-help-prefix@FILTER">filter</a> @name@<input type="hidden" name="filter_n@index@" value="@name@"></td> + <td>@description@</td> +</tr> Index: edit-actions-list =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-list,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- edit-actions-list 17 Sep 2002 14:12:58 -0000 1.28 +++ edit-actions-list 18 Jul 2006 14:49:13 -0000 1.29 @@ -31,19 +31,22 @@ # # Revisions : # $Log$ -# Revision 1.28 2002/09/17 14:12:58 oes +# Revision 1.29 2006/07/18 14:49:13 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.26.2.4 2003/12/17 16:35:17 oes +# Work around new & silly MSIE behaviour where the request resulting from +# changing window.location.href doesn't reveal the referrer anymore +# +# Revision 1.26.2.3 2002/09/25 15:34:09 oes # - Work around JS problem in NS 2.0 (no joke) # - Make JS string edit popup remove the pattern # if edited to empty; make JS add popup do nothing # if pattern empty. # -# Revision 1.27 2002/09/05 16:14:59 oes -# Synced with stable branch: -# Revision 1.26.2.2 2002/08/23 02:22:53 hal9 -# Fix a perl brain fart with <li> in comments -# -# Revision 1.26.2.1 2002/08/22 23:31:54 hal9 -# Add Documentation Link to menu. +# Revision 1.26.2.2 2002/08/23 02:22:53 hal9 +# Fix a perl brain fart with <li> in comments. # # Revision 1.26 2002/05/23 23:37:25 oes # Nit @@ -228,32 +231,38 @@ // JavaScript-capable browsers will call this function, which does a // client-side prompt for speed. It may kick off the delete directly. // It always returns false to cancel following the link. -function rm_p(pattern,curtext) +function rm_p(link,pattern,curtext) { if (window.confirm("Are you sure you want to delete this URL pattern?\nPattern is: "+unescape(curtext))) - { window.location.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; } + { + link.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; + return true; + } return false; } -function e_p(pattern,curtext) +function e_p(link,pattern,curtext) { if ((newtext=window.prompt("Edit the pattern to your needs:", unescape(curtext))) != null) { if (newtext != "") - { window.location.href="edit-actions-url?f=@f@&v=@v@&p="+pattern+"&u="+escape(newtext); } + { link.href="edit-actions-url?f=@f@&v=@v@&p="+pattern+"&u="+escape(newtext); } else - { window.location.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; } + { link.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; } + return true; } return false; } -function a_p(section) +function a_p(link,section) { if (((newtext=window.prompt("Enter the new pattern:", "")) != null ) && (newtext != "")) - { window.location.href="edit-actions-add-url?f=@f@&v=@v@&s="+section+"&u="+escape(newtext); } + { + link.href="edit-actions-add-url?f=@f@&v=@v@&s="+section+"&u="+escape(newtext); + return true; + } return false; } - //--> </script> </head> Index: edit-actions-list-section =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-list-section,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- edit-actions-list-section 21 May 2002 21:02:52 -0000 1.15 +++ edit-actions-list-section 18 Jul 2006 14:49:13 -0000 1.16 @@ -31,6 +31,14 @@ # # Revisions : # $Log$ +# Revision 1.16 2006/07/18 14:49:13 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.15.2.1 2003/12/17 16:35:17 oes +# Work around new & silly MSIE behaviour where the request resulting from +# changing window.location.href doesn't reveal the referrer anymore +# # Revision 1.15 2002/05/21 21:02:52 oes # Added more help links # @@ -104,7 +112,7 @@ <tr class="actions"><td class="indentbuttons"><a href="eafu?f=@f@&v=@v@&s=@s@">Edit</a></td></tr> <tr class="actions"><td class="action">@actions@</td></tr> <tr class="url"><td class="header"><a href="@user-manual@@actions-help-prefix@AF-PATTERNS">URL patterns</a>:</td></tr> -<tr class="url"><td class="indentbuttons"><a href="eaa?f=@f@&v=@v@&s=@s@" onclick="return a_p(@s@);">Add</a></td></tr> +<tr class="url"><td class="indentbuttons"><a href="eaa?f=@f@&v=@v@&s=@s@" onclick="return a_p(this,@s@);">Add</a></td></tr> @urls@ <tr class="adv"><td class="header">Advanced:</td></tr> <tr class="adv"><td class="indentbuttons"> Index: edit-actions-list-url =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-list-url,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- edit-actions-list-url 21 May 2002 19:13:14 -0000 1.10 +++ edit-actions-list-url 18 Jul 2006 14:49:14 -0000 1.11 @@ -31,6 +31,14 @@ # # Revisions : # $Log$ +# Revision 1.11 2006/07/18 14:49:14 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.10.2.1 2003/12/17 16:35:17 oes +# Work around new & silly MSIE behaviour where the request resulting from +# changing window.location.href doesn't reveal the referrer anymore +# # Revision 1.10 2002/05/21 19:13:14 oes # Added client-side JavaScript versions of edit and add URL forms # @@ -82,6 +90,6 @@ ############################################################################# <tr class="url" valign="top"> <td class="indentbuttons"><a name="l@p@" -href="ear?f=@f@&v=@v@&p=@p@" onclick="return rm_p(@p@,'@url@');">Remove</a> <a -href="eau?f=@f@&v=@v@&p=@p@" onclick="return e_p(@p@,'@url@');">Edit</a> @url-html@</td> +href="ear?f=@f@&v=@v@&p=@p@" onclick="return rm_p(this, @p@,'@url@');">Remove</a> <a +href="eau?f=@f@&v=@v@&p=@p@" onclick="return e_p(this, @p@,'@url@');">Edit</a> @url-html@</td> </tr> Index: edit-actions-remove-url-form =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-remove-url-form,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- edit-actions-remove-url-form 5 Sep 2002 16:16:46 -0000 1.15 +++ edit-actions-remove-url-form 18 Jul 2006 14:49:14 -0000 1.16 @@ -33,13 +33,9 @@ # # Revisions : # $Log$ -# Revision 1.15 2002/09/05 16:16:46 oes -# Synced with stable branch: -# Revision 1.14.2.2 2002/08/23 02:22:53 hal9 -# Fix a perl brain fart with <li> in comments. -# -# Revision 1.14.2.1 2002/08/22 23:31:54 hal9 -# Add Documentation Link to menu. +# Revision 1.16 2006/07/18 14:49:14 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) # # Revision 1.14.2.2 2002/08/23 02:22:53 hal9 # Fix a perl brain fart with <li> in comments. Index: edit-actions-url-form =================================================================== RCS file: /cvsroot/ijbswa/current/templates/edit-actions-url-form,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- edit-actions-url-form 5 Sep 2002 16:18:09 -0000 1.15 +++ edit-actions-url-form 18 Jul 2006 14:49:14 -0000 1.16 @@ -31,13 +31,12 @@ # # Revisions : # $Log$ -# Revision 1.15 2002/09/05 16:18:09 oes -# Synced with stable branch: -# Revision 1.14.2.2 2002/08/23 02:22:53 hal9 -# Fix a perl brain fart with <li> in comments. +# Revision 1.16 2006/07/18 14:49:14 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) # -# Revision 1.14.2.1 2002/08/22 23:31:54 hal9 -# Add Documentation Link to menu. +# Revision 1.14.2.2 2002/08/23 02:22:53 hal9 +# Fix a perl brain fart with <li> in comments. # # Revision 1.14 2002/05/21 19:14:10 oes # Added button style and jumptarget "cancel" link Index: mod-title =================================================================== RCS file: /cvsroot/ijbswa/current/templates/mod-title,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mod-title 10 Apr 2002 13:33:20 -0000 1.1 +++ mod-title 18 Jul 2006 14:49:14 -0000 1.2 @@ -1,4 +1,4 @@ <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ + This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@<!-- @if-can-toggle-start -->, + @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@<!-- if-can-toggle-end@ --> </h1> Index: no-such-domain =================================================================== RCS file: /cvsroot/ijbswa/current/templates/no-such-domain,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- no-such-domain 7 Mar 2003 01:43:32 -0000 1.18 +++ no-such-domain 18 Jul 2006 14:49:14 -0000 1.19 @@ -119,9 +119,7 @@ could not be fulfilled, because the domain name <b>@host@</b> could not be resolved. </p> <p>This is often a temporary failure, so you might just - <a href="@protocol@@hostport@@path@">try again</a> - or look the site up at - <a href="http://www.google.com/search?q=@protocol@@hostport@@path@">Google</a>. + <a href="@protocol@@hostport@@path@">try again</a>. </p> </td> </tr> Index: show-status =================================================================== RCS file: /cvsroot/ijbswa/current/templates/show-status,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- show-status 20 Feb 2003 13:55:24 -0000 1.24 +++ show-status 18 Jul 2006 14:49:14 -0000 1.25 @@ -149,17 +149,12 @@ </tr> @actions-filenames@ <tr> - <th colspan="2"><a href="@user-manual@xxxxxxxxxxxxxxxx">Filter File:</a></th> + <th colspan="2"><a href="@user-manual@xxxxxxxxxxxxxxxx">Filter Files:</a></th> </tr> <tr> <td> @re-filter-filename@ </td> - <td class="buttons"> - <!-- @if-have-filterfile-start --> - <a href="show-status?file=filter">View</a> - <!-- if-have-filterfile-end@ --> - </td> </tr> <!-- @if-trust-support-start --> <tr> ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| News | FAQ | advertise |