From 0d8db3c6a99657b4d98fddb21d5150ace4f67ea9 Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Sat, 23 Aug 2014 16:08:26 +0200
Subject: [PATCH] Allow to change directory with GUI`s files.

This can be very helpful for Developers and Advanced users.
---
 release/src-rt-6.x.4708/router/httpd/tomato.c       | 1 +
 release/src-rt-6.x.4708/router/rc/services.c        | 8 +++++++-
 release/src-rt-6.x.4708/router/shared/defaults.c    | 1 +
 release/src-rt-6.x.4708/router/www/admin-access.asp | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/release/src-rt-6.x.4708/router/httpd/tomato.c b/release/src-rt-6.x.4708/router/httpd/tomato.c
index 886d2b180f..ca344703b9 100644
--- a/release/src-rt-6.x.4708/router/httpd/tomato.c
+++ b/release/src-rt-6.x.4708/router/httpd/tomato.c
@@ -960,6 +960,7 @@ static const nvset_t nvset_list[] = {
 	{ "https_lanport",		V_PORT				},
 	{ "web_wl_filter",		V_01				},
 	{ "web_css",			V_LENGTH(1, 32)		},
+	{ "web_dir",			V_LENGTH(1, 32)		},
 	{ "ttb_css",			V_LENGTH(0, 128)		},
 	{ "web_mx",				V_LENGTH(0, 128)	},
 	{ "http_wanport",		V_PORT				},
diff --git a/release/src-rt-6.x.4708/router/rc/services.c b/release/src-rt-6.x.4708/router/rc/services.c
index 5002a71c01..7316aa57a8 100644
--- a/release/src-rt-6.x.4708/router/rc/services.c
+++ b/release/src-rt-6.x.4708/router/rc/services.c
@@ -611,7 +611,13 @@ void start_httpd(void)
 		xstart( "/usr/sbin/ttb" );
 
 	stop_httpd();
-	chdir("/www");
+
+// set www dir
+	if ( nvram_match( "web_dir", "jffs" ) ) { chdir("/jffs/www"); }
+	else if ( nvram_match( "web_dir", "opt" ) ) { chdir("/opt/www"); }
+	else if ( nvram_match( "web_dir", "tmp" ) ) { chdir("/tmp/www");}
+	else { chdir("/www"); }
+
 	eval("httpd");
 	chdir("/");
 }
diff --git a/release/src-rt-6.x.4708/router/shared/defaults.c b/release/src-rt-6.x.4708/router/shared/defaults.c
index d48b1090b8..a96aa6322c 100644
--- a/release/src-rt-6.x.4708/router/shared/defaults.c
+++ b/release/src-rt-6.x.4708/router/shared/defaults.c
@@ -561,6 +561,7 @@ struct nvram_tuple router_defaults[] = {
 	{ "https_crt",			""				, 0 },
 	{ "web_wl_filter",		"0"				, 0 },	// Allow/Deny Wireless Access Web
 	{ "web_css",			"openlinksys"			, 0 },
+	{ "web_dir",			"default"			, 0 },  // jffs, opt, tmp or default (/www)
 	{ "ttb_css",			"example"			, 0 },	//Tomato Themes Base
 	{ "web_svg",			"1"				, 0 },
 	{ "telnetd_eas",		"1"				, 0 },
diff --git a/release/src-rt-6.x.4708/router/www/admin-access.asp b/release/src-rt-6.x.4708/router/www/admin-access.asp
index d42b11c523..e3ad574075 100644
--- a/release/src-rt-6.x.4708/router/www/admin-access.asp
+++ b/release/src-rt-6.x.4708/router/www/admin-access.asp
@@ -29,7 +29,7 @@ textarea {
 
 <script type='text/javascript'>
 
-//	<% nvram("http_enable,https_enable,http_lanport,https_lanport,remote_management,remote_mgt_https,web_wl_filter,web_css,ttb_css,sshd_eas,sshd_pass,sshd_remote,telnetd_eas,http_wanport,sshd_authkeys,sshd_port,sshd_rport,sshd_forwarding,telnetd_port,rmgt_sip,https_crt_cn,https_crt_save,lan_ipaddr,ne_shlimit,sshd_motd"); %>
+//	<% nvram("http_enable,https_enable,http_lanport,https_lanport,remote_management,remote_mgt_https,web_wl_filter,web_css,web_dir,ttb_css,sshd_eas,sshd_pass,sshd_remote,telnetd_eas,http_wanport,sshd_authkeys,sshd_port,sshd_rport,sshd_forwarding,telnetd_port,rmgt_sip,https_crt_cn,https_crt_save,lan_ipaddr,ne_shlimit,sshd_motd"); %>
 
 changed = 0;
 tdup = parseInt('<% psup("telnetd"); %>');
@@ -295,6 +295,8 @@ var m = [
 	{ title: 'Port', indent: 2, name: 'http_wanport', type: 'text', maxlen: 5, size: 7, value:  fixPort(nvram.http_wanport, 8080) },
 	{ title: 'Allow Wireless Access', name: 'f_http_wireless', type: 'checkbox', value:  nvram.web_wl_filter == 0 },
 	null,
+	{ title: 'Directory with GUI files', name: 'web_dir', type: 'select',
+		options: [['default','Default: /www'], ['jffs', 'Custom: /jffs/www (Experts Only!)'], ['opt', 'Custom: /opt/www (Experts Only!)'], ['tmp', 'Custom: /tmp/www (Experts Only!)']], value: nvram.web_dir, suffix: ' <small>Please be sure of your decision before change this settings!</small>' },
 	{ title: 'Color Scheme', name: 'web_css', type: 'select',
 		options: [['openlinksys','USB Blue - OpenLinksys'],['red','Tomato'],['ext/custom','Custom (ext/custom.css)'], ['online', 'On-line from TTB']], value: nvram.web_css },
 	{ title: 'TTB ID#', indent: 2, name: 'ttb_css', type: 'text', maxlen: 25, size: 30, value: nvram.ttb_css, suffix: ' Theme name from <a href="http://www.tomatothemebase.eu" target="_blanc"><u><i>TTB themes gallery</i></u></a>' },
-- 
2.11.4.GIT