From 993958d3461d61f026ffe7fc7583085e36f7ad59 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Fri, 9 Dec 2011 10:11:41 +0000
Subject: [PATCH] update icons

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@549 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                               |   6 +-
 var/mongoose/cgi-bin/browse.jim               |  38 +++++++++-
 var/mongoose/cgi-bin/browse/browse.js         |  69 ++++++++++++++++++
 var/mongoose/cgi-bin/browse/delete.jim        |  12 ++-
 .../html/img/channels/Channel 5 + 1.png       |   1 +
 .../html/img/channels/Channel 5 +1.png        | Bin 0 -> 6561 bytes
 .../html/img/channels/Channel 5+1.png         |   1 +
 .../{The Jewellery Channel.png => Sports.png} |   0
 .../html/img/channels/TOPUP Anytime5.png      |   1 +
 .../html/img/channels/TOPUP Anytime6.png      |   1 +
 var/mongoose/html/img/channels/The Zone.png   | Bin 0 -> 4438 bytes
 var/mongoose/lib/cat                          |   2 +-
 12 files changed, 120 insertions(+), 11 deletions(-)
 create mode 120000 var/mongoose/html/img/channels/Channel 5 + 1.png
 create mode 100644 var/mongoose/html/img/channels/Channel 5 +1.png
 create mode 120000 var/mongoose/html/img/channels/Channel 5+1.png
 rename var/mongoose/html/img/channels/{The Jewellery Channel.png => Sports.png} (100%)
 create mode 120000 var/mongoose/html/img/channels/TOPUP Anytime5.png
 create mode 120000 var/mongoose/html/img/channels/TOPUP Anytime6.png
 create mode 100644 var/mongoose/html/img/channels/The Zone.png

diff --git a/CONTROL/control b/CONTROL/control
index 2c519df..afc21e3 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,11 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.3-1
+Version: 0.8.4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp
-Replaces: af123-webif
-Conflicts: af123-webif
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp,anacron
 Suggests: ffmpeg,webif-iphone,nicesplice
 Description: An evolving web interface for the Humax.
diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim
index ff8e380..354f4ba 100755
--- a/var/mongoose/cgi-bin/browse.jim
+++ b/var/mongoose/cgi-bin/browse.jim
@@ -33,10 +33,19 @@ proc directory {file bfile} {
 	puts "<img border=0 class=va id=\"img$tbfile\"
 	    src=/images/711_1_09_Media_Folder.png>"
 	puts "<input class=\"fs fsdir\" type=checkbox>"
-	puts "<a href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
+	puts "<a class=dbf
+	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
 	    file=\"$file\">"
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
-		</span></div>"
+		</span>"
+	puts "
+	      <a href=#>
+		<img class=\"dopt va\" border=0 width=45 
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
 }
 
 proc entry {file} {{i 0}} {
@@ -181,6 +190,11 @@ if $nicesplice {
 puts {
 	</ul>
 
+	<ul id=doptmenu class=contextMenu>
+		<li class=delete><a href=#delete>Delete</a></li>
+		<li><a href=#rename>Rename</a></li>
+	</ul>
+
 	<div id=renameform title="Rename media file" style="display: none">
 		<form id=renameform_form>
 		<input type=hidden name="renameorig" id="renameorig" value="">
@@ -217,6 +231,26 @@ puts {
 		</form>
 	</div>
 
+	<div id=drenameform title="Rename directory" style="display: none">
+		<form id=drenameform_form>
+		<input type=hidden name="renameorig" id="drenameorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="drename">
+				<b>New Directory Name</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="drename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
 	<div id=savestreamform title="Save streamed content"
 	    style="display: none">
 		<div class=pre id=savestream_detail></div>
diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js
index 0bbb4a4..04c64ca 100755
--- a/var/mongoose/cgi-bin/browse/browse.js
+++ b/var/mongoose/cgi-bin/browse/browse.js
@@ -116,6 +116,13 @@ function rename_submit()
 	    function() { window.location.reload(true); });
 }
 
+function drename_submit()
+{
+	var s = $('#drenameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
 function savestream_submit()
 {
 	var s = $('#savestream_form').serialize();
@@ -274,6 +281,47 @@ var menuclick = function(action, el, pos)
 	}
 };
 
+var dmenuclick = function(action, el, pos)
+{
+	var direl = $(el).parent().parent();
+	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
+	var bfile = file.replace(/.*\//g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var results = $(el).parent().next('div.results');
+
+	switch (action)
+	{
+	    case 'delete':
+		var url = '/cgi-bin/browse/delete.jim?file=' +
+		    encodeURIComponent(file) + '&type=dir';
+
+		if (confirm('Are you sure you wish to delete "' + file +
+		    '" and all files within it?'))
+		{
+			$(results)
+			    .html('<img src=/img/loading.gif>' +
+			    'Deleting, please wait...')
+			    .slideDown('slow')
+			    .load(url, function() {
+				$(direl).delay(3000).slideUp(300, function() {
+					$(direl).remove();
+				});
+			});
+		}
+		break;
+
+	    case 'rename':
+		$('#drename').val(bfile);
+		$('#drenameorig').val(file);
+		$('#drenameform').dialog('open');
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
 	// Bind context menu to opt+ image
 	$('img.opt').contextMenu(
 		{
@@ -284,6 +332,14 @@ var menuclick = function(action, el, pos)
 		menuclick
 	);
 
+	$('img.dopt').contextMenu(
+		{
+			menu: 'doptmenu',
+			leftButton: true,
+		},
+		dmenuclick
+	);
+
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
@@ -327,6 +383,19 @@ var menuclick = function(action, el, pos)
 		close: function() { $('#rename').val(''); }
 	});
 
+	$('#drenameform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": drename_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#drename').val(''); }
+	});
+
 	$('#savestreamform').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
diff --git a/var/mongoose/cgi-bin/browse/delete.jim b/var/mongoose/cgi-bin/browse/delete.jim
index cd9e145..c5538e4 100755
--- a/var/mongoose/cgi-bin/browse/delete.jim
+++ b/var/mongoose/cgi-bin/browse/delete.jim
@@ -20,9 +20,13 @@ if {$type eq "ts"} {
 		puts "Problem deleting $file, [$ts get error]"
 	}
 	exit
+} elseif {$type eq "dir"} {
+	puts -nonewline "Directory..."
+	puts [exec /mod/bin/busybox/rm -rf $file]
+	puts -nonewline "Done..."
+} else {
+	file delete $file
+	file delete "[file rootname $file].hmi"
+	puts "Successfully deleted $file."
 }
 
-file delete $file
-file delete "[file rootname $file].hmi"
-puts "Successfully deleted $file."
-
diff --git a/var/mongoose/html/img/channels/Channel 5 + 1.png b/var/mongoose/html/img/channels/Channel 5 + 1.png
new file mode 120000
index 0000000..a8c9a4b
--- /dev/null
+++ b/var/mongoose/html/img/channels/Channel 5 + 1.png	
@@ -0,0 +1 @@
+Channel 5 +1.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/Channel 5 +1.png b/var/mongoose/html/img/channels/Channel 5 +1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0700be0978b86a3673c2946b9691dca85226a9c
GIT binary patch
literal 6561
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
Teg$gq00000NkvXXu0mjf$0?J=

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/img/channels/Channel 5+1.png b/var/mongoose/html/img/channels/Channel 5+1.png
new file mode 120000
index 0000000..a8c9a4b
--- /dev/null
+++ b/var/mongoose/html/img/channels/Channel 5+1.png	
@@ -0,0 +1 @@
+Channel 5 +1.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/The Jewellery Channel.png b/var/mongoose/html/img/channels/Sports.png
similarity index 100%
rename from var/mongoose/html/img/channels/The Jewellery Channel.png
rename to var/mongoose/html/img/channels/Sports.png
diff --git a/var/mongoose/html/img/channels/TOPUP Anytime5.png b/var/mongoose/html/img/channels/TOPUP Anytime5.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/TOPUP Anytime5.png	
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/TOPUP Anytime6.png b/var/mongoose/html/img/channels/TOPUP Anytime6.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/TOPUP Anytime6.png	
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/The Zone.png b/var/mongoose/html/img/channels/The Zone.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7acd423f2fa99c7642eeef75915a221e5fd2b2
GIT binary patch
literal 4438
zcmV-c5vlHpP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRa1+(|@1RCwC#o!M_($#uqmRdtu%xo;XSq9jT)(%3WOEpp-@PflVWK!70sN1pPQ
zKOwI{9`hC;K#<n}h7-pbJ7aqmc`SRhjz*$Li94IU-0r(nRUU44v$;teTT)ZwdjLWd
zd%4y1-E+S0oH|u4thE4aR^u4~|0D$0g%C4R00IPp%wC*XELboWthEoV<v)SHA0Kv`
z0K!_!RyF=>;9ndiMwAlBE)W?OFAEinwHOQ9ShThet>tefM%)`>V<);QB%ioS_>K}t
zC6Iu~z<9Zsbi71sOJXcZV%M$ZiX#O7=*Scdr36xf6m;Vio!>HhF^<vu#bOZ_gb<K`
zl}u@4|3Pe3qqgfv-*E(v1Sv)49k0?$j3v>KXiFHI+foSOOObko5Lu{tl_t8vNv6L`
z!J;Gjf|5mGZ8lMZiDMvy@Fjf&o;k;0+(h)vz0-|l{r_h6YCXi-eMfQj{YD)0pUeh=
zj&nGaWstmj3hAG7r~8Ml+hja47(}|D$ZST=mN~sJWx-}NGSKXOpVYfdpT(?!Wb6GZ
zHw#&3FJ#$$VzHTf48}t&-F2ybm6c^81LqM7I0q2O&=@QlT@JCwBq*7^+QiWICx$&5
z$q*R`hj6r(mBp(wl8vMs(nBd@^<xq?d*bcd)1*Qi{QsA|PM??bGWA}#5`TCzZ#xtJ
zyN7Li5G0YVm7iwy)!IG|v0V=NLz2Cn27~?#`GtE{AF}Dv?6X^{j+eb(aU{~@>(vVv
zYe8dA2Ii2wbq+r!zA^xGKsY1n(RP~Sq)0n^PQU}F=e}QofMpMqBF^R*b*J@5$h1TB
zz<8}a=pnDOCm8#h-8jaAJlZ+k;}H8A@yP24!m-|>)3_w$epq#07lqZmtIStSd>9Kt
z+q9*WzBVA+5ddc`_8M!k=Bq0LyG_@Yl<=JcR4>lP0PR;CgkwLqfyh{#FtNBQ1w#&C
zOGr02FlSg9z4TB_XCqIS)U`<`Bi)K1UTV{|?RDx6CQ&=9QvLYE(1Pwu`9-(y^mhcv
z+SemDI7{aAPu$_jJp9)KP1)jbeW?F+nSEI|=|&6Z%ii&?Th8*@d5E=HbHiCsmK;tD
zGdl}PtJ{~A`N)}p#yQ+u`l>CC6T&dUT7k9Zkcbeyl|09h6bktxuMfkBpcxQH5sB7#
zu8Zfnl*(nKI$dLC6h^d~O`<p=NfLb5!_D~=iba%Cr%387jYfk;y+*s)0>IDbC{-$y
zE9G8U<auiJi0mDNwOS$TYg;KG{Y#+&q?8>8HstdjzV98Fpg2ybR_lb#CccpPu8Y!!
zFbDvs3=f^+`fb`l3z<X|mBI)?k|YGR7-L{)xbochsMi}bcB;g!0OABI1g$V331g&y
zQl)b0`Pi@a4k&6ZFK_azk8k3;5~Vz(lt?9!IR~Y{6E3b}$>;Lqaz#c*(+^kO-D7WS
zhn!I497WuYN!kgyVvfm)3cl~Kxw8$9N2y#s_S(C<JCr=h!pty1v(5Haoj8i{1dQf<
z+CiK3W{Z)DQC!zO@_J(o8&5WftGfto34(|)F<5I+SaP|LwOS3gTw?CRB0|b%s#l&R
zdyTQIt!*+nIfmn?UU+a_C%toDkd;b9lq=)tB*x-kguq%$7#PARWTY&~<viM<Mr#eg
zUbV)~>N<JXW2085+Jt<mg6Fs-O~a%04HnLoxccTan>%~d8V!o2(t+z%t5wd8ml-Pg
ze0p<*wXF~@SHy8j=vWhNG?*@1DwRAt>+4LMJ9pr7>qPT(`3Y__pxunwNgRsh2`Z%`
z8bQ0&WM{XE+iX&b>OAHVa~ID)H++dNp0w=Y4hgL-ySq((^uzz<`+xpD#>UgT^1uJ<
z|G0AH5^u~-zA!+HfmUEJ)`B#2Wq2G5?%!XfzV`%22&Bky{ZGG!PBbg`ACps>mCb;{
z@FW*5Oj0bR_m(ygwI!=7I~4Oxu77ipl_%ST<a&2`*pA7`7ISms{N!g3K;(I2ZUoPh
zy*suU2p-;BWg;I@F8Bn#VtjJ{bFVG0BAZQi_Ci{2fs2<HD3?6I00N7o-G+ysuhQOJ
zp;%DlCr6lHJb!Y2XKiOYf<5>XCx%8t6SfU;Y<hoh1qpk#){*D`K0i`Gu_!5*6y<_T
zrRY*Fx_GXo)!amgghr5X?dz9u9mUGSCpb1{ZM(_n^fYh3JwvJF^tKi|5()*w#Y@9P
zrp(PdPnew@r`4?WuGtKl%*{=3_ueYP&9Qi449}Il#|2O-ST0|EgKFfFXoG14L}8S^
zz8;`!b%J(6ODV2?ZIMdJL0~%Lut+q8oaV|~vy`Ui3B#CRW0yv)c61*4M3p=S4-##O
zbvm*nvBZh)JSM=(FFo&ZoDjvysh^){!=2AQr`>MR3It0_7Z@2U5CjQfGayO~Dp%s-
zr746I$G(S<FgIIaYs(O{L&irvq9`WOhMa4$Xx7%7%)T*p;y7H_GB!0vBTDe3q|s<%
zf!fX<u9EDuH5V=~;<+c!iIfTRi!+E^1sx}>udY+8)lR~re_M24$TFs*Vj@2H;6sLn
zid?<6L_Y7MwWVHf^LTlct<5d`oX_m+Ii{vZdtB4C&CMMie7?%s(@j7#Iy%gyrSnWp
zk3ExzmLG2LbafpZ&G66|7cNZ$mc89N3QZ7N<}RN{%4h3!sbF|?gthe=bLT2-Y}d)>
zbCe1$Q550lOQfRh<o75IDK_@NL9o|oGcsxkn=NvQCe{Mifh37izc{kt-*zI7K;}yj
zH3_N#yY4RKO8FTo>yW}yoi-IABx_H%Y1CUREG**Z3Osta!bcx|L>wE2hKA9)%BP>+
z=gl`4`0jV##dRI5g)bhg^0S|Qgr6T`VtRsNzQFe84nO(v4X(Ytz_qt8A83c!C)*~s
zKf4Dy2I=z7yKkbTz#6DEnkXc~6%3XAQ>nsYLD6noT-T%BYT^4n%5e}vp&aqt_wXEr
zk`4k(6o*7%j3PZ!X{xB$`Qi~q+m2+nSZfX}Gh1uX)*v+?4Ph8kuhx&hZntysu;Nux
z;z)2^m%seMcbJ+Q!Sy^IEw6I_!Doz*%=5iJ`zB*!!x#grD_h+7_?L{1e!;c3m)PE_
z@&5ZCF*kRSci&s0JmlgiNgOY-z18CV_kT`hsLcGrxr0e!r1|8d-_i<dNagd5uV1BD
z^01`sGeHni5}=esIr4NWU5Fmh#&O*1)sj+@=;XQYVeEc`lqFp|O0>ZdP^-5{wC>Gb
z8d$o$U>0jkC(NghCl;hD@f~pz9>>dGZ7jO;ilLzbrE(5qEX`({QelL@_`#nrHeT4j
z3yV`|{S9v3{59v!E%3=FcbJ@-;`$$7CZG3u&vRYL^h}XI`tE!D`qP`toSVXRRnN=s
z+*xL8eG{c%W?_~$=EnEu6>uF78#R#9#Ta|6haFWg2G4V_Hc1tn5Zy)W)0^0De3nvn
zj^~5jHq6XjAXi9J0VyOxoKy`rC<&#KgX5}auZNsi@)8!)DQ8#<?RLalSFbQSRygoX
z-?PlljdS;w;?eRJySuy0Oi%D+^(je`?5l^)&C&=oNu=4U))=1{>F`aJ+rPPmK~pFU
z@y<I-^wW%#P%0OxuWwP#DZ(%!pZA|%7KuXU&*iCBn|NL>9Yd!rP@HnrEnTZH=)~f>
z3gzYz?U04pG3GCio~|Mhw1}e!*Y!}Y^Bh3z;Q{P-(se!o0w@$6hK4HX+SH-fc%Fmn
zIMkZ~Ns@5;&KEp*xI#XkOP7UFy$R6Pkn<gkP9=31Cj8=qj|rm?$0_j5Z@r7}%Olqq
z9xk)7A}NcQ-K|~nv(wL+NQ+Hc43&qtapMt{%6KRCh=XO;)0ARKJxd^P3weS@6&W;W
zHv@8o!ZY6@Y=?aQ+q=Z=HuFmh43CYY9OoG;hDUw0Hx?m8M@9;aPEbmmxL3krP|Cq^
zJl=bEi8tma@jVwIWv9(3O+c;DByqyXNC{&tH$J(=&ek?kc`RL7WNK#U*lXmA3a>ap
z(A=Tu)~QzW3_YV>Ro&g?>e4tnyA8JM5f`Ui+N}s7yL&$DsqiocjIdadK7V{_n0p)R
z6m`PJ@(NRn3wXYNLh&?a`SVA_&45HI%EO~b$2sx3$HL?&g{Kq-bMTm0A+c7U7-x;O
z6bmku;SsD2nVvp=vQ{6j@$~5iW8+_EdHE@KZ{0>niF90MXQybl!%pQ_bbwAnjO%$^
zygbckpEfA865_oYTR})=Y#7hq=c=IDByKl(b7=x=1;6~{A@hriec?xAg*f$kv%sQt
z(&H@0mCT%<XZhBBin`9j+qW5?nWj9Pil4N!lF+O-dHQ&j)?SlPTNaki<Mxg7)PM+U
z@qHJ8Vt2RNE1ei^PV9EDq+Nx1-{q~VZ}C4r`Vp=#xq5A>SF+IBu=aG5pZ@qm-n;$|
z+E{-5tJ}n3Os<$C=NLZx#m7it(gLFpD91rMik$B<F*U}8ix*hDa*@wJyT_Ofm>Lu4
zy*+lU2CK>EJf<gy7#p8wbF;?BHy$uOJ4-(2?n_IhaFjYVhoo(|64AFjFg#i$S-Ql7
zTX!jiZMIq~Y`IU7ITr)iND~Haq9`QMIp!{3WNK#O6xH5iOgT_2x?H?)g&+R#C#*iX
z%v)D4qm)9Ou*M(|SZyd372{JyzH|LLzx??J+_`g~g@rkkP;77SQrinSzjTR(g_(};
zDU6Y{0!^!>5qkkjIVh=+O5v!KoAL#RTqi7y3`?%PdxiUVpHP3i$HYj?<XDALxs2l}
z>h+LY_wG?^Smw{qQY`s>$)aL=t47$0j;-Jxr<x;U*lgCxO^h9QY<#jvuJASw?>uI^
zx{V;hApkUyfkZfziX&WobCJqO@pRt!V6|mWQWo`^=F^+^S$n#|x4(UjD2k|5icC+B
z9hJ)3^4s5h!TIx3RECOZ4cnV-?%sVsy|ITB4uxWl`S}^9XNK|p^j_GlhAcnaBu-4H
z-N+)O+;2k?0wpBAFPJ$uOtF~jyC&3X5u59Kw3-3hCP<|y7V?aaml+w!ACbn^LeOZT
zbxf&TI@Kap7)Izg#?R-DU9d6+f@Vam+M?MA0E6rK438Emm2x=l>3gV71f)CoFtW5-
zZOSDN$5B{oPjq#yJ3EE?CLxX?i8aPp92Y$AXsECUmMz7zbG#GAnIsl#((5~}9N6iq
z);@o{zcV12y?V<|1Ihr&ECb{<G6%9l<j#uiS9>!=&I}@1$jUe*vuARM=#@S)8#I3i
z(zW{xku!vdlc908Q0d9u43fcztAnyPL*z^#;`C#YVUo$-%nr+5dS9`ceM8%zqgLi2
zXEibWeNJo0?8UiAM`dM{ewL)xfjlIGWUwXxr}y=rS;!hZsb}T)vnYG}2tD(V!O7jO
zu*y8-EGCAckJ&RP8IY&gzC5I}Q6N)V0}Nc<KL3N&-VBWalSn_Qlhv~ZnuFMG9&*S*
zGCa-zsb|u6@KLK9r83!j);uKLh$;Fu$Yhi9%K4+q-QrMhZ^j{m17x2=*x!boAu>qm
zn{J4AY~LAwBFoeVmWFgrw{AGrvV&!`kMA=cc~xNa9g5Nc=B5Px)%1OZ&}mLL$n3><
zM)w;c%>LIm{hN5a-kt_-C?%$q6exMnLo#Q1Ng;~#KmubdT3fWSH-T?Cz#8yZTHF7?
zGH*NQAZC@{m+T$gsATAZ@q^h(KN64E+ui340e=VltrX&G8IQbt{xH`56!>@GpJyli
c2;lz*0Nct;AbN*(pa1{>07*qoM6N<$f~>TOzyJUM

literal 0
HcmV?d00001

diff --git a/var/mongoose/lib/cat b/var/mongoose/lib/cat
index cee1485..ca79dd6 100644
--- a/var/mongoose/lib/cat
+++ b/var/mongoose/lib/cat
@@ -1,7 +1,7 @@
 
 if {[expr ! [exists -proc cat ]]} {
 	proc cat {file} {
-		if {[catch {set fp [open $file r]]}} { return }
+		if {[catch {set fp [open $file r}]} { return }
 		puts [read $fp]
 		close $fp
 	}