Revision: 5000
http://ipcop.svn.sourceforge.net/ipcop/?rev=5000&view=rev
Author: owes
Date: 2010-10-06 21:17:26 +0000 (Wed, 06 Oct 2010)
Log Message:
-----------
Add information 'field' for update package size, display package size in updates GUI page. TODO: use size info to check for enough available space before downloading update package.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/updates.cgi
ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
ipcop/trunk/updates/1.9.18/information.xml
ipcop/trunk/updates/template/information.xml
Modified: ipcop/trunk/html/cgi-bin/updates.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/updates.cgi 2010-10-06 20:39:55 UTC (rev 4999)
+++ ipcop/trunk/html/cgi-bin/updates.cgi 2010-10-06 21:17:26 UTC (rev 5000)
@@ -1,11 +1,27 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
+# This file is part of the IPCop Firewall.
#
-# This code is distributed under the terms of the GPL
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# updates.cgi is based on Smoothwall updates.cgi which is
# (c) The SmoothWall Team
#
+# With many, many changes since 2001,
+# (c) 2001-2010, the IPCop team
+#
# $Id$
#
@@ -227,9 +243,10 @@
</tr>
<tr valign='bottom'>
<td width='7%' class='boldbase'>$Lang::tr{'title'}</td>
- <td width='65%' class='boldbase'>$Lang::tr{'description'}</td>
+ <td width='60%' class='boldbase'>$Lang::tr{'description'}</td>
<td width='10%' class='boldbase'>$Lang::tr{'released'}</td>
<td width='10%' class='boldbase'>$Lang::tr{'release notes'}</td>
+ <td width='5%' class='boldbase'>$Lang::tr{'size'}</td>
<td width='8%' class='boldbase' colspan='2'>$Lang::tr{'action'}</td>
</tr>
END
@@ -260,6 +277,7 @@
notes-${version}
</a>
</td>
+ <td nowrap='nowrap' align='right'>$available->{"update-${version}"}->{size} KiB</td>
<td width='3%' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'download'}' value='download-${version}' src='/images/download.png' alt='download' title='$Lang::tr{'download'}' />
<input type='hidden' name='ACTION' value='download-${version}' />
@@ -281,7 +299,7 @@
if ($number == 0) {
print <<END
- <td colspan='3' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <td colspan='4' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='submit' name='ACTION' value='$Lang::tr{'apply'}' />
<input type='hidden' name='APPLY_VERSION' value='${version}' />
</form></td></tr>
@@ -289,7 +307,7 @@
;
}
else {
- print "<td colspan='3'> </td></tr>";
+ print "<td colspan='4'> </td></tr>";
}
}
else {
Modified: ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
===================================================================
--- ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-10-06 20:39:55 UTC (rev 4999)
+++ ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-10-06 21:17:26 UTC (rev 5000)
@@ -1 +1,2 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/updates.cgi
\ No newline at end of file
Modified: ipcop/trunk/updates/1.9.18/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.18/information.xml 2010-10-06 20:39:55 UTC (rev 4999)
+++ ipcop/trunk/updates/1.9.18/information.xml 2010-10-06 21:17:26 UTC (rev 5000)
@@ -2,6 +2,7 @@
<update>
<version>1.9.18</version>
<releasedate>2010-mm-dd</releasedate>
+ <size>0</size>
<description>Description (needs modification, shortly before release at the latest).</description>
<previousversion>1.9.17</previousversion>
<installdate>INSTALLDATE</installdate>
Modified: ipcop/trunk/updates/template/information.xml
===================================================================
--- ipcop/trunk/updates/template/information.xml 2010-10-06 20:39:55 UTC (rev 4999)
+++ ipcop/trunk/updates/template/information.xml 2010-10-06 21:17:26 UTC (rev 5000)
@@ -2,6 +2,7 @@
<update>
<version>UPGRADEVERSION</version>
<releasedate>2010-mm-dd</releasedate>
+ <size>0</size>
<description>Description (needs modification, shortly before release at the latest).</description>
<previousversion>PREVIOUSVERSION</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|