From 1cc2bdaaa95ca42f6d2ad9c23efc129b725bf1c4 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 25 Feb 2015 21:42:20 +0100
Subject: [PATCH] - yWeb: add filemanager

---
 src/nhttpd/web/Makefile.am                    |   8 +
 .../httpd/Y_Ext_Filemgr.css => Y_Filemgr.css} |   0
 .../Y_Ext_Filemgr.yhtm => Y_Filemgr.yhtm}     |   6 +-
 ..._Filemgr_Edit.yhtm => Y_Filemgr_Edit.yhtm} |   6 +-
 ...ilemgr_blocks.txt => Y_Filemgr_blocks.txt} |   0
 src/nhttpd/web/Y_Tools_Menue.yhtm             |   8 +-
 src/nhttpd/web/Y_Version.txt                  |   4 +-
 .../filemgr/files/httpd => }/accordion.js     |   0
 .../filemgr/files/httpd => }/effects.js       |   0
 .../extentions/filemgr/filemgr_uninstall.inc  |  44 ------
 .../filemgr/files/httpd/images/properties.gif | Bin 214 -> 0 bytes
 .../filemgr/files/httpd/images/rename.gif     | Bin 345 -> 0 bytes
 .../filemgr/files/httpd/images/save.png       | Bin 620 -> 0 bytes
 src/nhttpd/web/extentions/filemgr/install.inc |  20 ---
 src/nhttpd/web/extentions/filemgr/install.sh  | 143 ------------------
 .../web/extentions/filemgr/uninstall.sh       | 136 -----------------
 src/nhttpd/web/images/Makefile.am             |  20 +++
 .../filemgr/files/httpd => }/images/chmod.png | Bin
 .../filemgr/files/httpd => }/images/copy.gif  | Bin
 .../filemgr/files/httpd => }/images/cut.png   | Bin
 .../files/httpd => }/images/dir_up.gif        | Bin
 .../files/httpd => }/images/download.png      | Bin
 .../filemgr/files/httpd => }/images/film.png  | Bin
 .../files/httpd => }/images/folder_add.png    | Bin
 .../files/httpd => }/images/ftype_file.png    | Bin
 .../files/httpd => }/images/ftype_folder.png  | Bin
 .../files/httpd => }/images/ftype_link.png    | Bin
 .../filemgr/files/httpd => }/images/home.png  | Bin
 .../files/httpd => }/images/package.png       | Bin
 .../files/httpd => }/images/page_edit.png     | Bin
 .../filemgr/files/httpd => }/images/paste.gif | Bin
 .../files/httpd => }/images/picture.png       | Bin
 .../filemgr/files/httpd => }/images/text.png  | Bin
 .../files/httpd => }/images/upload.png        | Bin
 .../filemgr/files/httpd => }/images/work.gif  | Bin
 src/nhttpd/web/languages/Deutsch              |   2 +
 src/nhttpd/web/languages/English              |   2 +
 src/nhttpd/web/scripts/Makefile.am            |   3 +
 .../filemgr/files/httpd => }/scripts/Y_NAS.sh |   0
 39 files changed, 49 insertions(+), 353 deletions(-)
 rename src/nhttpd/web/{extentions/filemgr/files/httpd/Y_Ext_Filemgr.css => Y_Filemgr.css} (100%)
 rename src/nhttpd/web/{extentions/filemgr/files/httpd/Y_Ext_Filemgr.yhtm => Y_Filemgr.yhtm} (98%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd/Y_Ext_Filemgr_Edit.yhtm => Y_Filemgr_Edit.yhtm} (91%)
 rename src/nhttpd/web/{extentions/filemgr/files/httpd/Y_Ext_Filemgr_blocks.txt => Y_Filemgr_blocks.txt} (100%)
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/accordion.js (100%)
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/effects.js (100%)
 delete mode 100644 src/nhttpd/web/extentions/filemgr/filemgr_uninstall.inc
 delete mode 100755 src/nhttpd/web/extentions/filemgr/files/httpd/images/properties.gif
 delete mode 100755 src/nhttpd/web/extentions/filemgr/files/httpd/images/rename.gif
 delete mode 100755 src/nhttpd/web/extentions/filemgr/files/httpd/images/save.png
 delete mode 100644 src/nhttpd/web/extentions/filemgr/install.inc
 delete mode 100755 src/nhttpd/web/extentions/filemgr/install.sh
 delete mode 100755 src/nhttpd/web/extentions/filemgr/uninstall.sh
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/chmod.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/copy.gif (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/cut.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/dir_up.gif (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/download.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/film.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/folder_add.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/ftype_file.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/ftype_folder.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/ftype_link.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/home.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/package.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/page_edit.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/paste.gif (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/picture.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/text.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/upload.png (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/images/work.gif (100%)
 mode change 100755 => 100644
 rename src/nhttpd/web/{extentions/filemgr/files/httpd => }/scripts/Y_NAS.sh (100%)

diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am
index a7b0dff3f..3ac76f49a 100644
--- a/src/nhttpd/web/Makefile.am
+++ b/src/nhttpd/web/Makefile.am
@@ -91,3 +91,11 @@ install_DATA =	channels.js \
 		ywidget.css \
 		ywidget.js \
 		Y_yweb.js
+
+# file manager
+install_DATA +=	accordion.js \
+		effects.js \
+		Y_Filemgr.css \
+		Y_Filemgr.yhtm \
+		Y_Filemgr_Edit.yhtm \
+		Y_Filemgr_blocks.txt
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr.css b/src/nhttpd/web/Y_Filemgr.css
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr.css
rename to src/nhttpd/web/Y_Filemgr.css
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr.yhtm b/src/nhttpd/web/Y_Filemgr.yhtm
old mode 100755
new mode 100644
similarity index 98%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr.yhtm
rename to src/nhttpd/web/Y_Filemgr.yhtm
index 38bdff8cb..51fd6b535
--- a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr.yhtm
+++ b/src/nhttpd/web/Y_Filemgr.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-<link rel="stylesheet" type="text/css" href="/Y_Ext_Filemgr.css"/>
+<link rel="stylesheet" type="text/css" href="/Y_Filemgr.css"/>
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript" src="/effects.js"></script>
@@ -553,7 +553,7 @@ function do_download(){
 }
 function do_edit(){
 	if($F('ftype') != "d")
-		window.open("/Y_Ext_Filemgr_Edit.yhtm?file="+explorer.build_fname(),"edit", "width=800,height=600,resizable=yes");
+		window.open("/Y_Filemgr_Edit.yhtm?file="+explorer.build_fname(),"edit", "width=800,height=600,resizable=yes");
 	else
 		alert("you can not edit a directory");
 }
@@ -693,7 +693,7 @@ function ni() {
 					<tr><td align="right">
 						<input type="hidden" name="dummy" value="/"/>
 						<input type="hidden" name="path" value="/"/>
-						<input type="hidden" name="tmpl" value="/Y_Ext_Filemgr.yhtm"/>
+						<input type="hidden" name="tmpl" value="/Y_Filemgr.yhtm"/>
 						<input type="hidden" name="execute" value=""/>
 			
 						<input type="button" value="upload" name="su" onclick="do_upload()"/>
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr_Edit.yhtm b/src/nhttpd/web/Y_Filemgr_Edit.yhtm
similarity index 91%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr_Edit.yhtm
rename to src/nhttpd/web/Y_Filemgr_Edit.yhtm
index e6990ba39..4318080a1 100644
--- a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr_Edit.yhtm
+++ b/src/nhttpd/web/Y_Filemgr_Edit.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-<link rel="stylesheet" type="text/css" href="/Y_Ext_Filemgr.css"/>
+<link rel="stylesheet" type="text/css" href="/Y_Filemgr.css"/>
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript">
@@ -56,9 +56,9 @@ function ni(){
 				<td title="close without save"><a href='javascript:window.close()'><img src="/images/cross.png"/></a></td>
 			</tr>
 			</table>
-	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Ext_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
+	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
 		<textarea id="txt" name="editfile" cols="100" rows="31"  wrap="off" title="Editor" style="width:100%;background : white; font : 'Courier New',medium  monospace; color : #333333;">{=include:{=file=}=}</textarea>
-		<input type="hidden" name="tmpl" value="Y_Ext_Filemgr_Edit.yhtm"/>
+		<input type="hidden" name="tmpl" value="Y_Filemgr_Edit.yhtm"/>
 		<input type="hidden" name="file" value="{=file=}"/>
 	</form>
 	</div>
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr_blocks.txt b/src/nhttpd/web/Y_Filemgr_blocks.txt
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/Y_Ext_Filemgr_blocks.txt
rename to src/nhttpd/web/Y_Filemgr_blocks.txt
diff --git a/src/nhttpd/web/Y_Tools_Menue.yhtm b/src/nhttpd/web/Y_Tools_Menue.yhtm
index aa4a47799..f48381c41 100644
--- a/src/nhttpd/web/Y_Tools_Menue.yhtm
+++ b/src/nhttpd/web/Y_Tools_Menue.yhtm
@@ -23,7 +23,6 @@ function init(){
 		<div class="y_menu_sec_section">{=L:main.tools=}</div>
 		<div class="y_menu_sec">
 			<ul id="secmenu_tools">
-			{=if-not-equal:{=global-var-get:boxtype=}~coolstreamm~
 				<li>
 					{=if-empty:{=var-get:automount=}~
 					<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
@@ -40,7 +39,12 @@ function init(){
 					{=var-set:m_link_text={=L:tools.mounts=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
-			~=}
+				<li>
+					{=var-set:m_link_href=Y_Filemgr.yhtm=}
+					{=var-set:m_link_desc={=L:tools.filemgr_desc=}=}
+					{=var-set:m_link_text={=L:tools.filemgr=}=}
+					{=include-block:Y_Blocks.txt;management_link=}
+				</li>
 				<li>
 					{=if-empty:{=var-get:ether-wake=}~
 					<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.wake_on_lan=}</a>
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 1dd7f9347..d52e914c7 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.67
-date=05.12.2014
+version=2.8.0.68
+date=25.02.2015
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/accordion.js b/src/nhttpd/web/accordion.js
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/accordion.js
rename to src/nhttpd/web/accordion.js
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/effects.js b/src/nhttpd/web/effects.js
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/effects.js
rename to src/nhttpd/web/effects.js
diff --git a/src/nhttpd/web/extentions/filemgr/filemgr_uninstall.inc b/src/nhttpd/web/extentions/filemgr/filemgr_uninstall.inc
deleted file mode 100644
index e4949884c..000000000
--- a/src/nhttpd/web/extentions/filemgr/filemgr_uninstall.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-# ===========================================================
-# yWeb SDK: Extention Unnstaller Include
-# Extention Name: filemgr
-# by yjogol
-# -----------------------------------------------------------
-# $Date: 2007-12-29 17:08:16 $
-# $Revision: 1.3 $
-# ===========================================================
-
-yI_updatename="yWeb-Extension filemgr (02.02.2008)"
-yI_Ext_Tag="filemgr"
-yI_Ext_Version="1-0-0"
-yI_uninstall_log="$y_path_tmp/uninstall_filemgr.log"
-yI_uninstaller="filemgr_uninstall.inc"
-
-uninstall()
-{
-	rm $y_ywebover_dir/Y_Ext_Filemgr.yhtm
-	rm $y_ywebover_dir/Y_Ext_Filemgr.css
-	rm $y_ywebover_dir/Y_Ext_Filemgr_Edit.yhtm
-	rm $y_ywebover_dir/Y_Ext_Filemgr_blocks.txt
-#	rm $y_ywebover_dir/accordion.js
-#	rm $y_ywebover_dir/effects.js
-	rm $y_ywebover_dir/scripts/Y_NAS*
-	rm $y_ywebover_dir/images/chmod.png
-	rm $y_ywebover_dir/images/copy.gif
-	rm $y_ywebover_dir/images/cut.png
-#	rm $y_ywebover_dir/images/delete.gif
-	rm $y_ywebover_dir/images/dir_up.gif
-	rm $y_ywebover_dir/images/download.png
-	rm $y_ywebover_dir/images/folder_add.png
-	rm $y_ywebover_dir/images/ftype_file.png
-	rm $y_ywebover_dir/images/ftype_folder.png
-	rm $y_ywebover_dir/images/ftype_link.png
-	rm $y_ywebover_dir/images/home.png
-	rm $y_ywebover_dir/images/package.png
-	rm $y_ywebover_dir/images/page_edit.png
-	rm $y_ywebover_dir/images/paste.gif
-	rm $y_ywebover_dir/images/picture.png
-	rm $y_ywebover_dir/images/rename.gif
-	rm $y_ywebover_dir/images/text.png
-	rm $y_ywebover_dir/images/upload.png
-	rm $y_ywebover_dir/images/work.gif
-}
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/properties.gif b/src/nhttpd/web/extentions/filemgr/files/httpd/images/properties.gif
deleted file mode 100755
index 963ead1c99d9a67a57c8ffb6edda5c31c857fa7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmZ?wbhEHb<YVAtI3mF?my7Rsu+$$A_?@rC{HRpn_wPTC9zXie!0`Xh#NU5@zkmP!
z@uSDTfB$~};eGD;Z=nnf-@bigDBAP#<;$s4r@FbhF#uJ90g!<S6o0ZXGB8Lm=zyd^
zb~3OAD}?o?bk4oHbX`ts+!e>OCXc(WFM0oa?j=5{RK~^!N+(o=niw2{+8mt~Bs6sR
t8;qA~C8`RYe%<!7&3{GUPe!rD_tU=r4pE3WS6rfyc>XXmYn>v4H2@v@T>=0A

diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/rename.gif b/src/nhttpd/web/extentions/filemgr/files/httpd/images/rename.gif
deleted file mode 100755
index 0b2bcc6657ebb35124adcca7292028600bfbc5f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmZ?wbhEHb<YVAtxT?=kc=&bU;Wz*O{hM<2i}(6R8gp;1e)vmp;+4r)zC3#TNMqj3
zzkmO}|M212v!_3PeE;<M^QTWAz1Kf}`RetHmoGnl{P5@Z@6TVp{Qdjy-~WH#zJ2vt
z|LEEC=iVD0-G6ZZ+qZ9T-@g6%^XKnhzk%TU_wTP?zrK6#-n;kjZ{E7~=FOYOPoDhw
z^XK5fgZldVH8nN=!GM88p!k!8k%2*<K?kG{<R=EUvIEl!ENUcsb*C52%#n>h8LYWc
zQ8m_Y$?D0oYBY`{Z&Eb0wOL&v_R7gnhwtLitx@WVk`ufZtl1oqqpZm7U82LzuHz|M
zQ}3n2%F5NHC!wdqB3LiQBGV8)osofY5ko^xrnU|TGc(8X02f^yHZ~n?|DF2vI~^IU
E0n;m_2><{9

diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/save.png b/src/nhttpd/web/extentions/filemgr/files/httpd/images/save.png
deleted file mode 100755
index 99d532e8b1750115952f97302a92d713c0486f97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz{z*hZR2Ufr
z!99yzRTu`)wa@H3LxPg1V1z_O0}56FWgzjR6@P+-Xpt&H&?2QaR#qaS2xFnx3U-2G
zVU;2l7Qs%%LbMXa4BnZ0_I@ANYKL!p_ZA+*^LPUHk&Y(7-qI{flawm|>~H+MJzd|s
z^YP1Hc07G_>)Lgir!F1{Qn4GcTg%?koH<yu#__fspUiW={&{@m^KX9n<nYGV=N7ym
ze0Aqv6_U95;SZ`pYc{=EmS#6%yOvSfwDi|ry8O_YgZ+;dJQ7sJI?6f%){4HzrZ-iw
z-IaBO#P@ga+28Eho{s&Fv!jC8?g}ie5jK6%G$(7>o<=1qRN{}nPDolOeI^o4N5I>!
zU$N<nzOc^t@3f36RYau9I;Ny_w3<k~``M3LYnH~QFB(S07$pEWfBr%1*dx(}N~xM2
zzHpI769Q48sw7c~s-iXPI!Ng-CkfCJpixB<M1n+1BxPNjq;wdw5D?Kc5=o>=L=sg~
zDx#dOA*B<uLU`wuO8@`>0N~cqPsWI(^rbbkh)DS0_H_UN0C4l_kvWIm2#Kyy6%BCh
z(yIUf003&1xdx>t$*eR2ZvXxT0001Z_R$y3Iju92q*wg58};}zm(OaAH=p|y0002M
zh5O5#fxp|~jc?yi@+7$`d4Q6Hl%z;WiWG??NXR{Hx%)pMd~S<v5U`>E0000<MNUMn
GLSTZBL>OQI

diff --git a/src/nhttpd/web/extentions/filemgr/install.inc b/src/nhttpd/web/extentions/filemgr/install.inc
deleted file mode 100644
index cf97d93ef..000000000
--- a/src/nhttpd/web/extentions/filemgr/install.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-# ===========================================================
-# yWeb SDK: Extention Installer Include
-# Extention Name: filemgr
-# by yjogol
-# -----------------------------------------------------------
-# $Date: 2007-12-29 10:11:37 $
-# $Revision: 1.2 $
-# ===========================================================
-
-yI_updatename="yWeb-Extension filemgr (02.02.2008)"
-yI_Ext_Tag="filemgr"
-yI_Ext_Version="1-0-0"
-yI_install_log="$y_path_tmp/install_filemgr.log"
-yI_uninstaller="filemgr_uninstall.sh"
-
-install() 
-{
-	cp -r /tmp/files/httpd/* $y_ywebover_dir
-	chmod 755 $y_ywebover_dir/scripts/*.sh
-}
diff --git a/src/nhttpd/web/extentions/filemgr/install.sh b/src/nhttpd/web/extentions/filemgr/install.sh
deleted file mode 100755
index 2ce6a4f0e..000000000
--- a/src/nhttpd/web/extentions/filemgr/install.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-# ===========================================================
-# yWeb Extension: Install an Extension
-# by yjogol
-# -----------------------------------------------------------
-# $Date: 2007-12-29 10:11:37 $
-# $Revision: 1.3 $
-# -----------------------------------------------------------
-# Script starts in /tmp
-# ===========================================================
-
-# -----------------------------------------------------------
-# Installer Configs
-# -----------------------------------------------------------
-yI_Version="$Revision: 1.3 $"
-
-# -----------------------------------------------------------
-# Dirs
-# -----------------------------------------------------------
-y_path_usrbin="/var/bin"
-y_path_config="/var/tuxbox/config"
-y_path_tmp="/tmp"
-y_ywebover_dir="/var/httpd"
-y_ext_conf_dir="$y_path_config/ext"
-
-# -----------------------------------------------------------
-# Files
-# -----------------------------------------------------------
-y_config_Y_Web="$y_path_config/Y-Web.conf"
-y_config_nhttpd="$y_path_config/nhttpd.conf"
-y_config_neutrino="$y_path_config/neutrino.conf"
-y_upload_file="$y_path_tmp/upload.tmp"
-
-# ===========================================================
-# config-Dateien - lesen / schreiben
-# (Zeilenformat: VarName=VarValue)
-# ===========================================================
-cfg=""
-# -----------------------------------------------------------
-# config-Datei lesen/cachen (Inhalt in $cfg)
-# $1=config-Filename
-# -----------------------------------------------------------
-config_open()
-{
-	cfg=""
-	cfg=`cat $1`
-}
-# -----------------------------------------------------------
-# config-Datei schreiben (Inhalt in $cfg)
-# $1=config-Filename
-# -----------------------------------------------------------
-config_write()
-{
-	echo "$cfg" >$1
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (vorher open)
-# $1=VarName
-# -----------------------------------------------------------
-config_get_value()
-{
-	cmd="sed -n /^$1=/p"
-	tmp=`echo "$cfg" | $cmd`
-	cmd="sed -e s/^$1=//1"
-	tmp=`echo "$tmp" | $cmd`
-	echo $tmp
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (ohne open)
-# $1=config-Filename
-# $2=VarName
-# -----------------------------------------------------------
-config_get_value_direct()
-{
-	config_open $1
-	config_get_value $2
-}
-# -----------------------------------------------------------
-# Variablenwert setzen (vorher open)
-# $1=VarName)
-# $2=VarValue
-# -----------------------------------------------------------
-config_set_value()
-{
-	tmp=`echo "$cfg" | sed -n "/^$1=.*/p"`
-	if [ "$tmp" = "" ]
-	then
-		cfg=`echo -e "$cfg\n$1=$2"`
-	else
-		cmd="sed -e s/^$1=.*/$1=$2/g"
-		cfg=`echo "$cfg" | $cmd`
-	fi
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (ohne open)
-# $1=config-Filename
-# $2=VarName)
-# $3=VarValue
-# -----------------------------------------------------------
-config_set_value_direct()
-{
-	config_open $1
-	config_set_value $2 $3
-	config_write $1
-}
-
-# ===========================================================
-# Initialization
-# ===========================================================
-. ./install.inc
-hp=`config_get_value_direct "$y_config_nhttpd" "WebsiteMain.override_directory"`
-if [ "$hp" != "" ]; then
-	y_ywebover_dir=`echo "$hp"`
-fi
-mkdir -p $y_ywebover_dir
-chmod -R oug+rw $y_ywebover_dir
- 
-# -----------------------------------------------------------
-# prepare log
-# -----------------------------------------------------------
-date +%y%m%d_%H%M%S >"$yI_install_log"
-echo "" >>yI_install_log
-echo "installing $yI_updatename [$yI_Ext_Tag/$yI_Ext_Version]" >>"yI_install_log"
-echo "installdir: $y_ywebover_dir"
-
-# -----------------------------------------------------------
-# Install (from install.inc)
-# -----------------------------------------------------------
-install 
-
-# -----------------------------------------------------------
-# finishing
-# -----------------------------------------------------------
-mkdir -p $y_ext_conf_dir
-chmod oug+rw $y_ext_conf_dir
-chmod 755 ./uninstall* 
-cp ./uninstall.sh "$y_ext_conf_dir/" 
-cp ./*uninstall.inc "$y_ext_conf_dir/" 
-
-# -----------------------------------------------------------
-# Clean Up
-# -----------------------------------------------------------
-cd /tmp
-rm -r /tmp/files
diff --git a/src/nhttpd/web/extentions/filemgr/uninstall.sh b/src/nhttpd/web/extentions/filemgr/uninstall.sh
deleted file mode 100755
index ec83bbc95..000000000
--- a/src/nhttpd/web/extentions/filemgr/uninstall.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-# ===========================================================
-# yWeb Extension: Unnstall an Extension
-# by yjogol
-# -----------------------------------------------------------
-# $Date: 2007-12-29 17:08:16 $
-# $Revision: 1.4 $
-# -----------------------------------------------------------
-# Script starts in /tmp
-# ===========================================================
-
-# -----------------------------------------------------------
-# Installer Configs
-# -----------------------------------------------------------
-yI_Version="$Revision: 1.4 $"
-
-# -----------------------------------------------------------
-# Dirs
-# -----------------------------------------------------------
-y_path_usrbin="/var/bin"
-y_path_config="/var/tuxbox/config"
-y_path_tmp="/tmp"
-y_ywebover_dir="/var/httpd"
-y_ext_conf_dir="$y_path_config/ext"
-
-# -----------------------------------------------------------
-# Files
-# -----------------------------------------------------------
-y_config_Y_Web="$y_path_config/Y-Web.conf"
-y_config_nhttpd="$y_path_config/nhttpd.conf"
-y_config_neutrino="$y_path_config/neutrino.conf"
-y_upload_file="$y_path_tmp/upload.tmp"
-
-# ===========================================================
-# config-Dateien - lesen / schreiben
-# (Zeilenformat: VarName=VarValue)
-# ===========================================================
-cfg=""
-# -----------------------------------------------------------
-# config-Datei lesen/cachen (Inhalt in $cfg)
-# $1=config-Filename
-# -----------------------------------------------------------
-config_open()
-{
-	cfg=""
-	cfg=`cat $1`
-}
-# -----------------------------------------------------------
-# config-Datei schreiben (Inhalt in $cfg)
-# $1=config-Filename
-# -----------------------------------------------------------
-config_write()
-{
-	echo "$cfg" >$1
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (vorher open)
-# $1=VarName
-# -----------------------------------------------------------
-config_get_value()
-{
-	cmd="sed -n /^$1=/p"
-	tmp=`echo "$cfg" | $cmd`
-	cmd="sed -e s/^$1=//1"
-	tmp=`echo "$tmp" | $cmd`
-	echo $tmp
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (ohne open)
-# $1=config-Filename
-# $2=VarName
-# -----------------------------------------------------------
-config_get_value_direct()
-{
-	config_open $1
-	config_get_value $2
-}
-# -----------------------------------------------------------
-# Variablenwert setzen (vorher open)
-# $1=VarName)
-# $2=VarValue
-# -----------------------------------------------------------
-config_set_value()
-{
-	tmp=`echo "$cfg" | sed -n "/^$1=.*/p"`
-	if [ "$tmp" = "" ]
-	then
-		cfg=`echo -e "$cfg\n$1=$2"`
-	else
-		cmd="sed -e s/^$1=.*/$1=$2/g"
-		cfg=`echo "$cfg" | $cmd`
-	fi
-}
-# -----------------------------------------------------------
-# Variablenwert zurueckgeben (ohne open)
-# $1=config-Filename
-# $2=VarName)
-# $3=VarValue
-# -----------------------------------------------------------
-config_set_value_direct()
-{
-	config_open $1
-	config_set_value $2 $3
-	config_write $1
-}
-
-# ===========================================================
-# Initialization
-# ===========================================================
-. $y_ext_conf_dir/$1
-hp=`config_get_value_direct "$y_config_nhttpd" "WebsiteMain.override_directory"`
-if [ "$hp" != "" ]; then
-	y_ywebover_dir=`echo "$hp"`
-fi
-mkdir -p $y_ywebover_dir
- 
-# -----------------------------------------------------------
-# prepare log
-# -----------------------------------------------------------
-date +%y%m%d_%H%M%S >"$yI_uninstall_log"
-echo "" >>"$yI_uninstall_log"
-echo "uninstalling $yI_updatename [$yI_Ext_Tag/$yI_Ext_Version]" >>"$yI_uninstall_log"
-#echo "installdir: $y_ywebover_dir"
-
-# -----------------------------------------------------------
-# Uninstall (from uninstal_<tag>.inc)
-# -----------------------------------------------------------
-uninstall
-
-# -----------------------------------------------------------
-# finishing
-# -----------------------------------------------------------
-rm $y_ext_conf_dir/$1
-
-# -----------------------------------------------------------
-# Clean Up
-# -----------------------------------------------------------
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index a2c2c2015..b356d9bdf 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -109,3 +109,23 @@ install_DATA =	accept.png \
 		yjogol.gif \
 		y.png \
 		zap.png
+
+# file manager
+install_DATA +=	chmod.png \
+		copy.gif \
+		cut.png \
+		dir_up.gif \
+		download.png \
+		film.png \
+		folder_add.png \
+		ftype_file.png \
+		ftype_folder.png \
+		ftype_link.png \
+		home.png \
+		package.png \
+		page_edit.png \
+		paste.gif \
+		picture.png \
+		text.png \
+		upload.png \
+		work.gif
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/chmod.png b/src/nhttpd/web/images/chmod.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/chmod.png
rename to src/nhttpd/web/images/chmod.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/copy.gif b/src/nhttpd/web/images/copy.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/copy.gif
rename to src/nhttpd/web/images/copy.gif
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/cut.png b/src/nhttpd/web/images/cut.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/cut.png
rename to src/nhttpd/web/images/cut.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/dir_up.gif b/src/nhttpd/web/images/dir_up.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/dir_up.gif
rename to src/nhttpd/web/images/dir_up.gif
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/download.png b/src/nhttpd/web/images/download.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/download.png
rename to src/nhttpd/web/images/download.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/film.png b/src/nhttpd/web/images/film.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/film.png
rename to src/nhttpd/web/images/film.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/folder_add.png b/src/nhttpd/web/images/folder_add.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/folder_add.png
rename to src/nhttpd/web/images/folder_add.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_file.png b/src/nhttpd/web/images/ftype_file.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_file.png
rename to src/nhttpd/web/images/ftype_file.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_folder.png b/src/nhttpd/web/images/ftype_folder.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_folder.png
rename to src/nhttpd/web/images/ftype_folder.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_link.png b/src/nhttpd/web/images/ftype_link.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/ftype_link.png
rename to src/nhttpd/web/images/ftype_link.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/home.png b/src/nhttpd/web/images/home.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/home.png
rename to src/nhttpd/web/images/home.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/package.png b/src/nhttpd/web/images/package.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/package.png
rename to src/nhttpd/web/images/package.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/page_edit.png b/src/nhttpd/web/images/page_edit.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/page_edit.png
rename to src/nhttpd/web/images/page_edit.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/paste.gif b/src/nhttpd/web/images/paste.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/paste.gif
rename to src/nhttpd/web/images/paste.gif
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/picture.png b/src/nhttpd/web/images/picture.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/picture.png
rename to src/nhttpd/web/images/picture.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/text.png b/src/nhttpd/web/images/text.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/text.png
rename to src/nhttpd/web/images/text.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/upload.png b/src/nhttpd/web/images/upload.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/upload.png
rename to src/nhttpd/web/images/upload.png
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/images/work.gif b/src/nhttpd/web/images/work.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/images/work.gif
rename to src/nhttpd/web/images/work.gif
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index 61d62a87a..2c0cf82f0 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -420,6 +420,8 @@ tools.command=Kommando
 tools.cmd.enter_command=Auszuführendes Kommando eingeben
 tools.cmd.execute_command=Kommando ausführen
 tools.boot_logo=Boot Logo
+tools.filemgr_desc=Dateien und Verzeichnisse organisieren
+tools.filemgr=Dateimanager
 
 =========== LIVE Menue
 live.heading=Live/Timer
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index 004558a54..6a9dfa177 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -423,6 +423,8 @@ tools.command=Command
 tools.cmd.enter_command=enter command to execute
 tools.cmd.execute_command=execute shell command
 tools.boot_logo=Boot Logo
+tools.filemgr_desc=organize files and directorys
+tools.filemgr=File manager
 
 =========== LIVE Menue
 live.heading=Live/Timer
diff --git a/src/nhttpd/web/scripts/Makefile.am b/src/nhttpd/web/scripts/Makefile.am
index 09adfb357..946784cb3 100644
--- a/src/nhttpd/web/scripts/Makefile.am
+++ b/src/nhttpd/web/scripts/Makefile.am
@@ -2,6 +2,9 @@ installdir =  $(DATADIR)/neutrino/httpd/scripts
 
 install_DATA= api.sh _Y_Globals.sh _Y_Library.sh Y_Live.sh Y_Tools.sh
 
+# file manager
+install_DATA +=	Y_NAS.sh
+
 install-data-hook:
 	chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/api.sh
 	chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/Y_*.sh
diff --git a/src/nhttpd/web/extentions/filemgr/files/httpd/scripts/Y_NAS.sh b/src/nhttpd/web/scripts/Y_NAS.sh
similarity index 100%
rename from src/nhttpd/web/extentions/filemgr/files/httpd/scripts/Y_NAS.sh
rename to src/nhttpd/web/scripts/Y_NAS.sh