From 2ca07099873dc202ef27564423329ae3380c4fb3 Mon Sep 17 00:00:00 2001 From: Shibby Date: Tue, 8 Jan 2013 13:10:48 +0100 Subject: [PATCH] TTB: project integration and GUI --- release/src/router/httpd/tomato.c | 12 +- release/src/router/nvram/defaults.c | 1 + release/src/router/others/Makefile | 3 + release/src/router/others/ttb | 47 +++ release/src/router/rc/services.c | 3 + release/src/router/www/about.asp | 3 +- release/src/router/www/admin-access.asp | 25 +- release/src/router/www/asus-bg.png | Bin 17246 -> 0 bytes release/src/router/www/asus.css | 328 --------------------- release/src/router/www/asus.png | Bin 21103 -> 0 bytes release/src/router/www/asusred.css | 1 - release/src/router/www/asusred_logo.png | Bin 7435 -> 0 bytes release/src/router/www/black.css | 50 ---- release/src/router/www/blue.css | 47 --- release/src/router/www/bluegreen.css | 56 ---- release/src/router/www/bluegreen2.css | 42 --- release/src/router/www/brown.css | 51 ---- release/src/router/www/cyan.css | 47 --- release/src/router/www/linksysred.css | 1 - release/src/router/www/linksysred_logo.png | Bin 1717 -> 0 bytes release/src/router/www/olive.css | 47 --- .../router/www/{usbblue.css => openlinksys.css} | 0 release/src/router/www/pumpkin.css | 47 --- release/src/router/www/red_bg.gif | Bin 308 -> 0 bytes release/src/router/www/rtn66u.css | 313 -------------------- release/src/router/www/rtn66u.png | Bin 21017 -> 0 bytes release/src/router/www/tomatousb.png | Bin 3461 -> 0 bytes release/src/router/www/usbred.css | 298 ------------------- release/src/router/www/white_arrow.gif | Bin 53 -> 0 bytes 29 files changed, 81 insertions(+), 1341 deletions(-) create mode 100755 release/src/router/others/ttb delete mode 100644 release/src/router/www/asus-bg.png delete mode 100644 release/src/router/www/asus.css delete mode 100644 release/src/router/www/asus.png delete mode 100644 release/src/router/www/asusred.css delete mode 100644 release/src/router/www/asusred_logo.png delete mode 100644 release/src/router/www/black.css delete mode 100644 release/src/router/www/blue.css delete mode 100644 release/src/router/www/bluegreen.css delete mode 100644 release/src/router/www/bluegreen2.css delete mode 100644 release/src/router/www/brown.css delete mode 100644 release/src/router/www/cyan.css delete mode 100644 release/src/router/www/linksysred.css delete mode 100644 release/src/router/www/linksysred_logo.png delete mode 100644 release/src/router/www/olive.css rename release/src/router/www/{usbblue.css => openlinksys.css} (100%) delete mode 100644 release/src/router/www/pumpkin.css delete mode 100644 release/src/router/www/red_bg.gif delete mode 100644 release/src/router/www/rtn66u.css delete mode 100644 release/src/router/www/rtn66u.png delete mode 100644 release/src/router/www/tomatousb.png delete mode 100644 release/src/router/www/usbred.css delete mode 100644 release/src/router/www/white_arrow.gif diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c index 9b58c4dfca..dbaeb5a1ba 100644 --- a/release/src/router/httpd/tomato.c +++ b/release/src/router/httpd/tomato.c @@ -423,9 +423,14 @@ const aspapi_t aspapi[] = { static void asp_css(int argc, char **argv) { const char *css = nvram_safe_get("web_css"); - - if (strcmp(css, "tomato") != 0) { - web_printf("", css); + const char *ttb = nvram_safe_get("ttb_css"); + + if( nvram_match( "web_css", "online" ) ) { + web_printf("", ttb); + } else { + if (strcmp(css, "tomato") != 0) { + web_printf("", css); + } } } @@ -931,6 +936,7 @@ static const nvset_t nvset_list[] = { { "https_lanport", V_PORT }, { "web_wl_filter", V_01 }, { "web_css", V_LENGTH(1, 32) }, + { "ttb_css", V_LENGTH(1, 32) }, { "web_mx", V_LENGTH(0, 128) }, { "http_wanport", V_PORT }, { "telnetd_eas", V_01 }, diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c index afc329c045..93dfc731f8 100644 --- a/release/src/router/nvram/defaults.c +++ b/release/src/router/nvram/defaults.c @@ -557,6 +557,7 @@ const defaults_t defaults[] = { { "https_crt", "" }, { "web_wl_filter", "0" }, // Allow/Deny Wireless Access Web { "web_css", "usbblue" }, + { "ttb_css", "" }, //Tomato Themes Base { "web_svg", "1" }, { "telnetd_eas", "1" }, { "telnetd_port", "23" }, diff --git a/release/src/router/others/Makefile b/release/src/router/others/Makefile index 905f7338de..e7d1a406fb 100644 --- a/release/src/router/others/Makefile +++ b/release/src/router/others/Makefile @@ -25,6 +25,9 @@ endif #TomatoAnon project install -m 0700 tomatoanon $(INSTALLDIR)/usr/sbin +#TTB project + install -m 0700 ttb $(INSTALLDIR)/usr/sbin + # cron helper install -m 0700 cru $(INSTALLDIR)/usr/sbin diff --git a/release/src/router/others/ttb b/release/src/router/others/ttb new file mode 100755 index 0000000000..bf31c24247 --- /dev/null +++ b/release/src/router/others/ttb @@ -0,0 +1,47 @@ +#!/bin/sh + +# Shibby 2013 + +SCHEME=`nvram get web_css` +if [ ! "$SCHEME" == "online" ]; then + exit 0 +fi + +LOCK="/tmp/ttb.lock" + +if [ -f $LOCK ]; then #skrypt w działaniu + logger TTB: Another process is already working. Exiting... + exit 0 +else + touch $LOCK + + TTB=`nvram get ttb_css` + + if [ ! -f /www/ext/$TTB.css ]; then #brak skórki + + if [ -f /www/ext/$TTB.zip ]; then #brak skorki ale jest zip ze skorka + + unzip -o /www/ext/$TTB.zip -d /www/ext/ + + else #nie ma skorki ani zipa ze skorka + + rm /www/ext/*.css /www/ext/*.zip /www/ext/*.png /www/ext/*.gif /www/ext/*.jpg + wget http://www.tomatothemebase.eu/wp-content/uploads/$TTB.zip -O /www/ext/$TTB.zip + sleep 5 + + if [ -f /www/ext/$TTB.zip ]; then #zip sciagniety + + unzip -o /www/ext/$TTB.zip -d /www/ext/ + + else #brak zipa !! + + logger TTB: Cannot download Online themes. Will try again soon... + sleep 30 + rm $LOCK + /usr/sbin/ttb + fi + fi + fi + + rm $LOCK +fi \ No newline at end of file diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c index 6f49d9f1ca..e732ce5b8b 100644 --- a/release/src/router/rc/services.c +++ b/release/src/router/rc/services.c @@ -506,6 +506,9 @@ void start_httpd(void) return; } + if( nvram_match( "web_css", "online" ) ) + xstart( "/usr/sbin/ttb" ); + stop_httpd(); chdir("/www"); eval("httpd"); diff --git a/release/src/router/www/about.asp b/release/src/router/www/about.asp index 54eb25cc1a..15d1fa4332 100644 --- a/release/src/router/www/about.asp +++ b/release/src/router/www/about.asp @@ -142,7 +142,8 @@ Copyright (C) 2010 Keith Moyer,
- TOR Project integration and GUI
- TomatoAnon project integration and GUI
-Copyright (C) 2011 Michał Rupental
+- TomatoThemeBase project imtegration and GUI
+Copyright (C) 2011-2013 Michał Rupental
http://openlinksys.info

diff --git a/release/src/router/www/admin-access.asp b/release/src/router/www/admin-access.asp index 5df0b3d8c2..d61c69fb8e 100644 --- a/release/src/router/www/admin-access.asp +++ b/release/src/router/www/admin-access.asp @@ -29,7 +29,7 @@ textarea {