[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1638682beb691a4bf40f4db155c109d9a34536a4
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 1638682beb691a4bf40f4db155c109d9a34536a4 (commit) via a9fb14d0513d71accacfded36f46e471cb3a88d6 (commit) via 040b8b0c5ed052025d9c35e26eb7092510deb25c (commit) via bc2b3e9483f37ec497b3460faf0208cfb87cdfc5 (commit) via d9fe569366e9dca7f833b53a212ea2ef4311d45f (commit) via ed4b4c19b9e47229ead960bd43bcc9cd6a01413a (commit) from 7e8d00649625a1f8f77e086d402e02b2ab2dce79 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1638682beb691a4bf40f4db155c109d9a34536a4 Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:56:42 2014 +0200
cgi-bin: Add title attribute to input type image where missing
Almost all of <input type="image"... has both an alt and a title attribute, but some are missing title, and when the icon is not very clear, it makes it harder to understand what the icon does. By adding title, the browser displays text when mouse pointer is over the icon.
Also add missing quotes for alt and title attributes where needed.
commit a9fb14d0513d71accacfded36f46e471cb3a88d6 Author: Alf Høgemark alf@i100.no Date: Tue Feb 18 17:48:57 2014 +0000
cgi-bin: Use readonly="readonly" attribute on html input elements
The proper way to mark readonly is to use readonly="readonly", not readonly="true", like it was done some places.
commit 040b8b0c5ed052025d9c35e26eb7092510deb25c Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:54:27 2014 +0200
ovpnmain.cgi: Use language string keys already defined
commit bc2b3e9483f37ec497b3460faf0208cfb87cdfc5 Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:51:50 2014 +0200
vpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase
commit d9fe569366e9dca7f833b53a212ea2ef4311d45f Author: Alexander Marx amarx@ipfire.org Date: Fri Jan 31 21:23:21 2014 +0100
openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
commit ed4b4c19b9e47229ead960bd43bcc9cd6a01413a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 12 15:40:50 2014 +0100
Re-apply: OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected to the server.
Conflicts: html/cgi-bin/index.cgi html/cgi-bin/ovpnmain.cgi
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/ovpnmain.cgi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index a051b5d..907e8c0 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -567,7 +567,7 @@ sub getccdadresses my @iprange=(); my %ccdhash=(); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %ccdhash); - $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; + $iprange[0]=$ip1.".".$ip2.".".$ip3.".".($ip4+2); for (my $i=1;$i<=$count;$i++) { my $tmpip=$iprange[$i-1]; my $stepper=$i*4; @@ -2698,7 +2698,7 @@ print <<END; <option value='SHA1' $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'})</option> </select> </td> - <td>Default: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td> + <td>$Lang::tr{'openvpn default'}: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td> </tr> </table>
@@ -2793,7 +2793,7 @@ if ($cgiparams{'ACTION'} eq "edit"){ <table width='100%' border='0'> <tr><form method='post'> <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> - <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly='readonly' /></td></tr> <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> </td></tr> @@ -2853,7 +2853,7 @@ END print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; print <<END; <form method='post' /> - <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> <input type='hidden' name='ACTION' value='edit'/> <input type='hidden' name='ccdname' value='$ccdconf[0]' /> <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> @@ -2862,7 +2862,7 @@ END <td><input type='hidden' name='ACTION' value='kill'/> <input type='hidden' name='number' value='$count' /> <input type='hidden' name='net' value='$ccdconf[0]' /> - <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> + <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr> END ; } @@ -3092,7 +3092,7 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> - <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>$Lang::tr{'openvpn default'}: Client Packagename</td></tr> <tr><td colspan='3'><hr /></td></tr> <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> @@ -4729,7 +4729,7 @@ if ($cgiparams{'TYPE'} eq 'host') { <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr> - <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td> + <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr> <tr><td colspan='3'> </td></tr> <tr><td colspan='3'><hr /></td></tr> @@ -5046,7 +5046,7 @@ END <td class='boldbase'>$Lang::tr{'destination port'}:</td> <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} </td> - <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' /></td> + <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}' size='5' /></td>
<td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td> <td><select name='DCIPHER'> @@ -5177,7 +5177,7 @@ END #EXITING -- A graceful exit is in progress. ####
- if ($tustate[1] eq 'CONNECTED') { + if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) { $col1="bgcolor='${Header::colourgreen}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; }else {
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org