From 184e91d78466a41077bd93f9c494ddc2f5abe8ce Mon Sep 17 00:00:00 2001 From: zefie Date: Mon, 6 Jan 2025 19:31:54 -0500 Subject: [PATCH] v0.9.57 - move wtv-guide romcache + some fixes - fix getAbsolutePath - fix adding users (broken with getAbsolutePath update) - fix bugs, update badwords, more bugs with account addition to fix yet - implement bad username check (wordlist from Redialed) - update zefie server IP (again) - proper x-powered-by version format - fix: also respect in hide_minisrv_version in cgi - fix: properly respect hide_minisrv_version flag - removed a scary warning - add default php_binpath config entry (php is still disabled by default) --- zefie_wtvp_minisrv/app.js | 34 ++- .../AboutWebTVBanner.gif | Bin .../ROMCache => SharedROMCache}/Back.gif | Bin .../ROMCache => SharedROMCache}/BigAlpha.gif | Bin .../CenterButton.gif | Bin .../ROMCache => SharedROMCache}/CodeSet.gif | Bin .../ContinueButton.gif | Bin .../ROMCache => SharedROMCache}/Cursor.gif | Bin .../DoneButton.gif | Bin .../EchoStar/ArrowButtons.gif | Bin .../EchoStar/ArrowButtonsCenter.gif | Bin .../EchoStar/ArrowsGlow.gif | Bin .../EchoStar/BackGlow.gif | Bin .../EchoStar/CenterButton.gif | Bin .../EchoStar/DownArrowButton.gif | Bin .../EchoStar/EchoStarRemote.gif | Bin .../EchoStar/HomeGlow.gif | Bin .../EchoStar/InfoGlow.gif | Bin .../EchoStar/ListingsGlow.gif | Bin .../EchoStar/MuteGlow.gif | Bin .../EchoStar/NumbersGlow.gif | Bin .../EchoStar/OptionsGlow.gif | Bin .../EchoStar/PipGlow.gif | Bin .../EchoStar/PowerGlow.gif | Bin .../EchoStar/RecallGlow.gif | Bin .../EchoStar/RecentGlow.gif | Bin .../EchoStar/ScrollGlow.gif | Bin .../EchoStar/TVVIDSwitch.gif | Bin .../EchoStar/ViewGlow.gif | Bin .../EchoStar/VolChGlow.gif | Bin .../EmptyMailbox.gif | Bin .../ROMCache => SharedROMCache}/Favorites.gif | Bin .../GuideBanner.gif | Bin .../HelpDoneButton.gif | Bin .../HelpEmailButton.gif | Bin .../ROMCache => SharedROMCache}/Home.gif | Bin .../LittleRemote.gif | Bin .../Mitsubishi/CenterButton.gif | Bin .../MitsubishiArrowsGlow.gif | Bin .../MitsubishiBackGlow.gif | Bin .../MitsubishiHomeGlow.gif | Bin .../MitsubishiNumbersGlow.gif | Bin .../MitsubishiOptionsGlow.gif | Bin .../MitsubishiPowerGlow.gif | Bin .../MitsubishiRecentGlow.gif | Bin .../MitsubishiRemote.gif | Bin .../MitsubishiScrollGlow.gif | Bin .../MitsubishiViewGlow.gif | Bin .../MitsubishiVolChGlow.gif | Bin .../ROMCache => SharedROMCache}/Nothing.gif | Bin .../ROMCache => SharedROMCache}/Numbers.gif | Bin .../ROMCache => SharedROMCache}/Options.gif | Bin .../OptionsButton.gif | Bin .../Philips-Plus-Remote/ArrowsGlow.gif | Bin .../Philips-Plus-Remote/BackGlow.gif | Bin .../Philips-Plus-Remote/CenterGlow.gif | Bin .../Philips-Plus-Remote/ChannelGlow.gif | Bin .../Philips-Plus-Remote/ExploreGlow.gif | Bin .../Philips-Plus-Remote/FavoritesGlow.gif | Bin .../Philips-Plus-Remote/HomeGlow.gif | Bin .../Philips-Plus-Remote/MailGlow.gif | Bin .../Philips-Plus-Remote/MuteGlow.gif | Bin .../Philips-Plus-Remote/NumbersGlow.gif | Bin .../Philips-Plus-Remote/OptionsGlow.gif | Bin .../Philips-Plus-Remote/PhilipsPlusRemote.gif | Bin .../Philips-Plus-Remote/PowerGlow.gif | Bin .../Philips-Plus-Remote/RecentGlow.gif | Bin .../Philips-Plus-Remote/ReloadGlow.gif | Bin .../Philips-Plus-Remote/ScrollGlow.gif | Bin .../Philips-Plus-Remote/TVGlow.gif | Bin .../Philips-Plus-Remote/TVVideoGlow.gif | Bin .../Philips-Plus-Remote/ViewGlow.gif | Bin .../Philips-Plus-Remote/VolChGlow.gif | Bin .../Philips-Plus/CenterButton.gif | Bin .../Philips/CenterButton.gif | Bin .../PhilipsArrowsGlow.gif | Bin .../PhilipsBackGlow.gif | Bin .../PhilipsCenterButton.gif | Bin .../PhilipsFavoritesGlow.gif | Bin .../PhilipsHomeGlow.gif | Bin .../PhilipsOptionsGlow.gif | Bin .../PhilipsPowerGlow.gif | Bin .../PhilipsRecentGlow.gif | Bin .../PhilipsRemote.gif | Bin .../PhilipsScrollGlow.gif | Bin .../PhilipsSearchGlow.gif | Bin .../PhilipsTVWebGlow.gif | Bin .../ROMCache => SharedROMCache}/Recent.gif | Bin .../ROMCache => SharedROMCache}/Rule.gif | Bin .../RuleLeftEnd.gif | Bin .../SampleGreeting.gif | Bin .../Samsung/CenterButton.gif | Bin .../SamsungArrowsGlow.gif | Bin .../SamsungBackGlow.gif | Bin .../SamsungHomeGlow.gif | Bin .../SamsungNumbersGlow.gif | Bin .../SamsungOptionsGlow.gif | Bin .../SamsungPowerGlow.gif | Bin .../SamsungRecentGlow.gif | Bin .../SamsungRemote.jpg | Bin .../SamsungScrollGlow.gif | Bin .../SamsungViewGlow.gif | Bin .../SamsungVolChGlow.gif | Bin .../ROMCache => SharedROMCache}/Scroll.gif | Bin .../ROMCache => SharedROMCache}/Searching.gif | Bin .../ROMCache => SharedROMCache}/Signature.gif | Bin .../SmallAlpha.gif | Bin .../Sony-Plus/SonyPlusRemote.gif | Bin .../Sony-Plus/SonyPlusViewGlow.gif | Bin .../Sony/CenterButton.gif | Bin .../SonyArrowsGlow.gif | Bin .../SonyBackGlow.gif | Bin .../SonyCodeSetGlow.gif | Bin .../SonyHomeGlow.gif | Bin .../SonyNumbersGlow.gif | Bin .../SonyOptionsGlow.gif | Bin .../SonyPowerGlow.gif | Bin .../SonyRecentGlow.gif | Bin .../SonyRemote.gif | Bin .../SonyScrollGlow.gif | Bin .../SonyViewGlow.gif | Bin .../SonyVolChGlow.gif | Bin .../ROMCache => SharedROMCache}/Steps.gif | Bin .../ROMCache => SharedROMCache}/VolCh.gif | Bin .../ROMCache => SharedROMCache}/Wallet1.gif | Bin .../ROMCache => SharedROMCache}/Wallet2.gif | Bin .../WebTV/CenterButton.gif | Bin .../YellowPixel.gif | Bin .../YourAccountBanner.gif | Bin .../ROMCache => SharedROMCache}/btn.gif | Bin .../ROMCache => SharedROMCache}/cbot.gif | Bin .../ROMCache => SharedROMCache}/cfront.gif | Bin .../ROMCache => SharedROMCache}/contro.gif | Bin .../grungeIntro/account.jpg | Bin .../grungeIntro/classic-account.jpg | Bin .../grungeIntro/classic-settings.jpg | Bin .../grungeIntro/classic-webhome-center.jpg | Bin .../grungeIntro/classic-webhome-links.jpg | Bin .../grungeIntro/classic-webhome.jpg | Bin .../grungeIntro/grungeTourBg.swf | Bin .../grungeIntro/help.jpg | Bin .../grungeIntro/news.jpg | Bin .../grungeIntro/page-builder.jpg | Bin .../grungeIntro/search-text.jpg | Bin .../grungeIntro/search-things.jpg | Bin .../grungeIntro/search.jpg | Bin .../grungeIntro/settings.jpg | Bin .../grungeIntro/shopping.jpg | Bin .../grungeIntro/test.gif | Bin .../grungeIntro/webhome-center.jpg | Bin .../grungeIntro/webhome-links.jpg | Bin .../grungeIntro/webhome.jpg | Bin .../help/account/account-main-metered.jpg | Bin .../help/account/account-main-msn.jpg | Bin .../help/account/account-main.gif | Bin .../account/metered-detailed-period-msn.jpg | Bin .../help/account/metered-detailed-period.jpg | Bin .../help/account/metered-main-msn.jpg | Bin .../help/account/metered-main.jpg | Bin .../help/account/metered-user-msn.jpg | Bin .../help/account/metered-user.jpg | Bin .../help/account/user-info.gif | Bin .../help/account/webtv-users.gif | Bin .../help/common/arrowDL.gif | Bin .../help/common/arrowDR.gif | Bin .../help/common/arrowUL.gif | Bin .../help/common/arrowUR.gif | Bin .../help/common/audio-video.gif | Bin .../help/common/audio-video2.gif | Bin .../help/common/coaxial.gif | Bin .../help/common/helpBannerImage.gif | Bin .../help/common/helpMasthead.swf | Bin .../help/common/less.gif | Bin .../help/common/less_dim.gif | Bin .../help/common/microphone.gif | Bin .../help/common/more.gif | Bin .../help/common/more_dim.gif | Bin .../helpMasthead.swf | Bin .../mail_delete.gif | Bin .../mail_forward.gif | Bin .../mail_reply.gif | Bin .../ROMCache => SharedROMCache}/mail_save.gif | Bin .../ROMCache => SharedROMCache}/mail_send.gif | Bin .../marketplace.gif | Bin .../ROMCache => SharedROMCache}/network.gif | Bin .../power-highlight.gif | Bin .../quickhelp/ComingA_logo.jpg | Bin .../quickhelp/QH_Banner.swf | Bin .../quickhelp/QH_mRemote.gif | Bin .../quickhelp/TVCrossover.gif | Bin .../quickhelp/TopicArrow.gif | Bin .../quickhelp/TopicArrow2.gif | Bin .../quickhelp/bullet1.gif | Bin .../quickhelp/bullet2.gif | Bin .../quickhelp/tocBullet.gif | Bin .../quickhelp/triangleBlk.gif | Bin .../quickhelp/triangleWht.gif | Bin .../remote-bottom-half.jpg | Bin .../remote-top-half.jpg | Bin .../remote_sec.1b.jpg | Bin .../ROMCache => SharedROMCache}/topbanner.gif | Bin .../wtv-guide/ROMCache/BulletArrow.gif | Bin 84 -> 0 bytes .../wtv-guide/ROMCache/Spacer.gif | Bin 43 -> 0 bytes .../wtv-guide/ROMCache/UsingWebTVBanner.gif | Bin 1558 -> 0 bytes .../help/common/helpMastheadBlank.swf | Bin 123 -> 0 bytes .../wtv-register/ValidateAccountInfo.js | 7 +- .../wtv-register/ValidateAgreement.js | 14 +- .../wtv-register/ValidateReviewAccountInfo.js | 212 +++++++++--------- .../ServiceVault/wtv-setup/add-user-name.js | 7 +- .../wtv-setup/add-user-password.js | 7 +- .../ServiceVault/wtv-setup/add-user.js | 13 +- .../ServiceVault/wtv-setup/edit-password.js | 3 +- .../wtv-setup/validate-add-user-done.js | 2 +- .../wtv-setup/validate-add-user.js | 16 +- .../ServiceVault/wtv-tricks/htv-cSetup.js | 2 +- .../ServiceVault/wtv-tricks/tricks.js | 2 +- zefie_wtvp_minisrv/includes/badWords.json | 76 +++++++ .../includes/classes/WTVClientSessionData.js | 1 - .../includes/classes/WTVRegister.js | 16 +- .../includes/classes/WTVShared.js | 60 ++++- zefie_wtvp_minisrv/includes/config.json | 12 +- .../includes/reservedWords.json | 53 +++++ zefie_wtvp_minisrv/package-lock.json | 4 +- zefie_wtvp_minisrv/package.json | 2 +- .../user_config.pconly_example.json | 8 +- 225 files changed, 380 insertions(+), 171 deletions(-) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/AboutWebTVBanner.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Back.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/BigAlpha.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/CodeSet.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/ContinueButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Cursor.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/DoneButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ArrowButtons.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ArrowButtonsCenter.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/BackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/DownArrowButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/EchoStarRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/HomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/InfoGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ListingsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/MuteGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/NumbersGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/OptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/PipGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/PowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/RecallGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/RecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/TVVIDSwitch.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/ViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EchoStar/VolChGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/EmptyMailbox.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Favorites.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/GuideBanner.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/HelpDoneButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/HelpEmailButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Home.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/LittleRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Mitsubishi/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiBackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiHomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiNumbersGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiOptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiPowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiRecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/MitsubishiVolChGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Nothing.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Numbers.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Options.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/OptionsButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/BackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/CenterGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ChannelGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ExploreGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/FavoritesGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/HomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/MailGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/MuteGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/NumbersGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/OptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/PhilipsPlusRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/PowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/RecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ReloadGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/TVGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/TVVideoGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/ViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus-Remote/VolChGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips-Plus/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Philips/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsBackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsCenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsFavoritesGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsHomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsOptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsPowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsRecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsSearchGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/PhilipsTVWebGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Recent.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Rule.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/RuleLeftEnd.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SampleGreeting.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Samsung/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungBackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungHomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungNumbersGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungOptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungPowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungRecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungRemote.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SamsungVolChGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Scroll.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Searching.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Signature.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SmallAlpha.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Sony-Plus/SonyPlusRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Sony-Plus/SonyPlusViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Sony/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyArrowsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyBackGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyCodeSetGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyHomeGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyNumbersGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyOptionsGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyPowerGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyRecentGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyScrollGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyViewGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/SonyVolChGlow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Steps.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/VolCh.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Wallet1.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/Wallet2.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/WebTV/CenterButton.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/YellowPixel.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/YourAccountBanner.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/btn.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/cbot.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/cfront.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/contro.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/account.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/classic-account.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/classic-settings.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/classic-webhome-center.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/classic-webhome-links.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/classic-webhome.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/grungeTourBg.swf (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/help.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/news.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/page-builder.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/search-text.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/search-things.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/search.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/settings.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/shopping.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/test.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/webhome-center.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/webhome-links.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/grungeIntro/webhome.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/account-main-metered.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/account-main-msn.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/account-main.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-detailed-period-msn.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-detailed-period.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-main-msn.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-main.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-user-msn.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/metered-user.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/user-info.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/account/webtv-users.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/arrowDL.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/arrowDR.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/arrowUL.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/arrowUR.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/audio-video.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/audio-video2.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/coaxial.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/helpBannerImage.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/helpMasthead.swf (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/less.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/less_dim.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/microphone.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/more.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/help/common/more_dim.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/helpMasthead.swf (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/mail_delete.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/mail_forward.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/mail_reply.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/mail_save.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/mail_send.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/marketplace.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/network.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/power-highlight.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/ComingA_logo.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/QH_Banner.swf (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/QH_mRemote.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/TVCrossover.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/TopicArrow.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/TopicArrow2.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/bullet1.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/bullet2.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/tocBullet.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/triangleBlk.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/quickhelp/triangleWht.gif (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/remote-bottom-half.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/remote-top-half.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/remote_sec.1b.jpg (100%) rename zefie_wtvp_minisrv/includes/ServiceVault/{wtv-guide/ROMCache => SharedROMCache}/topbanner.gif (100%) delete mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/BulletArrow.gif delete mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Spacer.gif delete mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/UsingWebTVBanner.gif delete mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpMastheadBlank.swf create mode 100644 zefie_wtvp_minisrv/includes/badWords.json create mode 100644 zefie_wtvp_minisrv/includes/reservedWords.json diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 137a810d..57e2f234 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -370,8 +370,13 @@ async function handleCGI(executable, cgi_file, socket, request_headers, vault, s env.SERVER_PORT = request_data.port; env.SERVER_ADDR = request_data.host; env.SERVER_NAME = request_data.host; - env.SERVER_SOFTWARE = "Node "+process.versions.node+" Express via " + z_title;; - env.SERVER_SIGNATURE = z_title; + if (minisrv_config.services[socket.service_name].hide_minisrv_version) { + env.SERVER_SOFTWARE = "NodeJS; minisrv"; + } else { + // Full version + env.SERVER_SOFTWARE = "NodeJS/"+process.version+"; " + z_cgiver; + } + env.SERVER_SIGNATURE = env.SERVER_SOFTWARE; env.ALL_RAW = request_headers.raw_headers; var raw_header_split = env.ALL_RAW.split("\r\n"); raw_header_split.forEach(function (header) { @@ -1563,13 +1568,28 @@ async function sendToClient(socket, headers_obj, data = null) { // remove x-powered-by header if client is WebTV var xpower = wtvshared.getCaseInsensitiveKey("x-powered-by", headers_obj); - if (!xpower) { + if (!xpower && socket.service_name) { // add X-Powered-By header if not WebTV and not already set xpower = 'X-Powered-By'; - if (!socket.ssid) headers_obj[xpower] = "NodeJS ("+process.version+") Express via " + z_title; + if (minisrv_config.services[socket.service_name].hide_minisrv_version) { + // Don't report version + if (!socket.ssid) headers_obj[xpower] = "NodeJS; minisrv"; + } else { + // Full version + if (!socket.ssid) headers_obj[xpower] = "NodeJS/"+process.version+"; " + z_cgiver; + } } else { // delete if webtv if (socket.ssid) delete headers_obj[xpower]; + else { + if (minisrv_config.services[socket.service_name].hide_minisrv_version) { + // Don't report version + if (!socket.ssid) headers_obj[xpower] = headers_obj[xpower] + "; NodeJS; minisrv"; + } else { + // Full version + if (!socket.ssid) headers_obj[xpower] = headers_obj[xpower] + "; NodeJS/"+process.version+"; " + z_cgiver; + } + } } if (headers_obj[xpower]) headers_obj = wtvshared.moveObjectKey(xpower, -2, headers_obj, true) // move x-powered-by before Content-type @@ -2253,9 +2273,13 @@ function reloadConfig() { // SERVER START var git_commit = getGitRevision() var z_title = "zefie's wtv minisrv v" + require('./package.json').version; +var z_cgiver = "minisrv/" + require('./package.json').version; if (git_commit) z_title += " (git " + git_commit + ")"; console.log("**** Welcome to " + z_title + " ****"); -console.log("**** Detected nodejs v"+process.versions.node+" ***") +console.log("**** Detected nodejs v" + process.versions.node + " ****") +var application_root = wtvshared.getAbsolutePath('', __dirname) +console.log("**** Application Root Path:", application_root, "****") + minisrv_config = wtvshared.getMiniSrvConfig(); // snatches minisrv_config const wtvmime = new WTVMime(minisrv_config); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/AboutWebTVBanner.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/AboutWebTVBanner.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/AboutWebTVBanner.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/AboutWebTVBanner.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Back.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Back.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Back.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Back.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/BigAlpha.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/BigAlpha.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/BigAlpha.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/BigAlpha.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/CodeSet.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/CodeSet.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/CodeSet.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/CodeSet.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/ContinueButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/ContinueButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/ContinueButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/ContinueButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Cursor.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Cursor.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Cursor.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Cursor.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/DoneButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/DoneButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/DoneButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/DoneButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowButtons.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowButtons.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowButtons.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowButtons.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowButtonsCenter.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowButtonsCenter.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowButtonsCenter.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowButtonsCenter.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/BackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/BackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/BackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/BackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/DownArrowButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/DownArrowButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/DownArrowButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/DownArrowButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/EchoStarRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/EchoStarRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/EchoStarRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/EchoStarRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/HomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/HomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/HomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/HomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/InfoGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/InfoGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/InfoGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/InfoGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ListingsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ListingsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ListingsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ListingsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/MuteGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/MuteGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/MuteGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/MuteGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/NumbersGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/NumbersGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/NumbersGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/NumbersGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/OptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/OptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/OptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/OptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/PipGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/PipGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/PipGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/PipGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/PowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/PowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/PowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/PowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/RecallGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/RecallGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/RecallGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/RecallGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/RecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/RecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/RecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/RecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/TVVIDSwitch.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/TVVIDSwitch.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/TVVIDSwitch.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/TVVIDSwitch.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/ViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/ViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/VolChGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/VolChGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EchoStar/VolChGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EchoStar/VolChGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EmptyMailbox.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EmptyMailbox.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/EmptyMailbox.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/EmptyMailbox.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Favorites.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Favorites.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Favorites.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Favorites.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/GuideBanner.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/GuideBanner.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/GuideBanner.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/GuideBanner.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/HelpDoneButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/HelpDoneButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/HelpDoneButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/HelpDoneButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/HelpEmailButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/HelpEmailButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/HelpEmailButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/HelpEmailButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Home.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Home.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Home.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Home.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/LittleRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/LittleRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/LittleRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/LittleRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Mitsubishi/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Mitsubishi/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Mitsubishi/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Mitsubishi/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiBackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiBackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiBackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiBackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiHomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiHomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiHomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiHomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiNumbersGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiNumbersGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiNumbersGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiNumbersGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiOptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiOptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiOptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiOptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiPowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiPowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiPowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiPowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiRecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiRecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiRecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiRecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiVolChGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiVolChGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/MitsubishiVolChGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/MitsubishiVolChGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Nothing.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Nothing.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Nothing.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Nothing.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Numbers.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Numbers.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Numbers.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Numbers.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Options.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Options.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Options.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Options.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/OptionsButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/OptionsButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/OptionsButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/OptionsButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/BackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/BackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/BackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/BackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/CenterGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/CenterGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/CenterGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/CenterGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ChannelGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ChannelGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ChannelGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ChannelGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ExploreGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ExploreGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ExploreGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ExploreGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/FavoritesGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/FavoritesGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/FavoritesGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/FavoritesGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/HomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/HomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/HomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/HomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/MailGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/MailGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/MailGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/MailGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/MuteGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/MuteGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/MuteGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/MuteGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/NumbersGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/NumbersGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/NumbersGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/NumbersGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/OptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/OptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/OptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/OptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/PhilipsPlusRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/PhilipsPlusRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/PhilipsPlusRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/PhilipsPlusRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/PowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/PowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/PowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/PowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/RecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/RecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/RecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/RecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ReloadGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ReloadGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ReloadGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ReloadGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/TVGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/TVGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/TVGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/TVGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/TVVideoGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/TVVideoGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/TVVideoGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/TVVideoGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/ViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/ViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/VolChGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/VolChGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus-Remote/VolChGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus-Remote/VolChGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips-Plus/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips-Plus/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Philips/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Philips/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsBackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsBackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsBackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsBackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsCenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsCenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsCenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsCenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsFavoritesGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsFavoritesGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsFavoritesGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsFavoritesGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsHomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsHomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsHomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsHomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsOptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsOptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsOptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsOptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsPowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsPowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsPowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsPowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsRecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsRecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsRecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsRecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsSearchGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsSearchGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsSearchGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsSearchGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsTVWebGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsTVWebGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/PhilipsTVWebGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/PhilipsTVWebGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Recent.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Recent.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Recent.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Recent.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Rule.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Rule.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Rule.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Rule.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/RuleLeftEnd.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/RuleLeftEnd.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/RuleLeftEnd.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/RuleLeftEnd.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SampleGreeting.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SampleGreeting.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SampleGreeting.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SampleGreeting.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Samsung/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Samsung/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Samsung/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Samsung/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungBackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungBackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungBackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungBackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungHomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungHomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungHomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungHomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungNumbersGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungNumbersGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungNumbersGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungNumbersGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungOptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungOptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungOptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungOptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungPowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungPowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungPowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungPowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungRecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungRecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungRecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungRecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungRemote.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungRemote.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungRemote.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungRemote.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungVolChGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungVolChGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SamsungVolChGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SamsungVolChGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Scroll.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Scroll.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Scroll.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Scroll.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Searching.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Searching.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Searching.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Searching.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Signature.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Signature.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Signature.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Signature.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SmallAlpha.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SmallAlpha.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SmallAlpha.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SmallAlpha.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony-Plus/SonyPlusRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony-Plus/SonyPlusRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony-Plus/SonyPlusRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony-Plus/SonyPlusRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony-Plus/SonyPlusViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony-Plus/SonyPlusViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony-Plus/SonyPlusViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony-Plus/SonyPlusViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Sony/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Sony/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyArrowsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyArrowsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyArrowsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyArrowsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyBackGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyBackGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyBackGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyBackGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyCodeSetGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyCodeSetGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyCodeSetGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyCodeSetGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyHomeGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyHomeGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyHomeGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyHomeGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyNumbersGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyNumbersGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyNumbersGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyNumbersGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyOptionsGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyOptionsGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyOptionsGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyOptionsGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyPowerGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyPowerGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyPowerGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyPowerGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyRecentGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyRecentGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyRecentGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyRecentGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyScrollGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyScrollGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyScrollGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyScrollGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyViewGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyViewGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyViewGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyViewGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyVolChGlow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyVolChGlow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/SonyVolChGlow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/SonyVolChGlow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Steps.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Steps.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Steps.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Steps.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/VolCh.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/VolCh.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/VolCh.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/VolCh.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Wallet1.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Wallet1.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Wallet1.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Wallet1.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Wallet2.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Wallet2.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/Wallet2.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/Wallet2.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/WebTV/CenterButton.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/WebTV/CenterButton.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/WebTV/CenterButton.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/WebTV/CenterButton.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/YellowPixel.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/YellowPixel.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/YellowPixel.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/YellowPixel.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/YourAccountBanner.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/YourAccountBanner.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/YourAccountBanner.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/YourAccountBanner.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/btn.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/btn.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/btn.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/btn.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/cbot.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/cbot.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/cbot.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/cbot.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/cfront.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/cfront.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/cfront.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/cfront.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/contro.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/contro.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/contro.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/contro.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/account.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/account.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/account.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/account.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-account.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-account.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-account.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-account.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-settings.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-settings.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-settings.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-settings.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome-center.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome-center.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome-center.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome-center.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome-links.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome-links.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome-links.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome-links.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/classic-webhome.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/classic-webhome.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/grungeTourBg.swf b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/grungeTourBg.swf similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/grungeTourBg.swf rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/grungeTourBg.swf diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/help.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/help.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/help.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/help.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/news.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/news.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/news.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/news.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/page-builder.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/page-builder.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/page-builder.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/page-builder.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search-text.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search-text.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search-text.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search-text.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search-things.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search-things.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search-things.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search-things.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/search.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/search.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/settings.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/settings.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/settings.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/settings.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/shopping.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/shopping.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/shopping.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/shopping.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/test.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/test.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/test.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/test.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome-center.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome-center.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome-center.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome-center.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome-links.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome-links.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome-links.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome-links.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/grungeIntro/webhome.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/grungeIntro/webhome.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main-metered.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main-metered.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main-metered.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main-metered.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main-msn.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main-msn.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main-msn.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main-msn.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/account-main.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/account-main.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-detailed-period-msn.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-detailed-period-msn.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-detailed-period-msn.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-detailed-period-msn.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-detailed-period.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-detailed-period.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-detailed-period.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-detailed-period.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-main-msn.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-main-msn.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-main-msn.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-main-msn.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-main.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-main.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-main.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-main.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-user-msn.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-user-msn.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-user-msn.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-user-msn.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-user.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-user.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/metered-user.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/metered-user.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/user-info.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/user-info.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/user-info.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/user-info.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/webtv-users.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/webtv-users.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/account/webtv-users.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/account/webtv-users.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowDL.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowDL.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowDL.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowDL.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowDR.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowDR.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowDR.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowDR.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowUL.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowUL.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowUL.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowUL.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowUR.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowUR.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/arrowUR.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/arrowUR.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/audio-video.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/audio-video.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/audio-video.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/audio-video.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/audio-video2.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/audio-video2.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/audio-video2.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/audio-video2.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/coaxial.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/coaxial.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/coaxial.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/coaxial.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpBannerImage.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/helpBannerImage.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpBannerImage.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/helpBannerImage.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpMasthead.swf b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/helpMasthead.swf similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpMasthead.swf rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/helpMasthead.swf diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/less.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/less.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/less.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/less.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/less_dim.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/less_dim.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/less_dim.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/less_dim.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/microphone.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/microphone.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/microphone.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/microphone.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/more.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/more.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/more.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/more.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/more_dim.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/more_dim.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/more_dim.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/help/common/more_dim.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/helpMasthead.swf b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/helpMasthead.swf similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/helpMasthead.swf rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/helpMasthead.swf diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_delete.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_delete.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_delete.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_delete.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_forward.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_forward.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_forward.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_forward.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_reply.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_reply.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_reply.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_reply.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_save.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_save.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_save.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_save.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_send.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_send.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/mail_send.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/mail_send.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/marketplace.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/marketplace.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/marketplace.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/marketplace.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/network.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/network.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/network.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/network.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/power-highlight.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/power-highlight.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/power-highlight.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/power-highlight.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/ComingA_logo.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/ComingA_logo.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/ComingA_logo.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/ComingA_logo.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/QH_Banner.swf b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/QH_Banner.swf similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/QH_Banner.swf rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/QH_Banner.swf diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/QH_mRemote.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/QH_mRemote.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/QH_mRemote.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/QH_mRemote.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TVCrossover.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TVCrossover.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TVCrossover.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TVCrossover.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TopicArrow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TopicArrow.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TopicArrow.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TopicArrow.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TopicArrow2.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TopicArrow2.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/TopicArrow2.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/TopicArrow2.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/bullet1.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/bullet1.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/bullet1.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/bullet1.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/bullet2.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/bullet2.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/bullet2.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/bullet2.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/tocBullet.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/tocBullet.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/tocBullet.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/tocBullet.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/triangleBlk.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/triangleBlk.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/triangleBlk.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/triangleBlk.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/triangleWht.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/triangleWht.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/quickhelp/triangleWht.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/quickhelp/triangleWht.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote-bottom-half.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote-bottom-half.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote-bottom-half.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote-bottom-half.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote-top-half.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote-top-half.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote-top-half.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote-top-half.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote_sec.1b.jpg b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote_sec.1b.jpg similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/remote_sec.1b.jpg rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/remote_sec.1b.jpg diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/topbanner.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/topbanner.gif similarity index 100% rename from zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/topbanner.gif rename to zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/topbanner.gif diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/BulletArrow.gif b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/BulletArrow.gif deleted file mode 100644 index ae5eab663e11276b86a692e3bc06908e380cff0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmZ?wbhEHbWMklEIK;rfCn7E}=bBjWA$}7VNl8hGv1|}vKMh0sDrX~fz diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/UsingWebTVBanner.gif b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/UsingWebTVBanner.gif deleted file mode 100644 index 52dc1e6959b57535b648cc6b3958b41d33411c22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 zcmV+x2I=`nNk%w1VK4ys0KxzOAvh{6OgSb&F+62WN_<^YifJ`iLori6A^8LW000I6 zEC2ui05Aag000C2Xu90~FtQ-4y#@@-doEsB0ib9)WN@79w+U(+l0;Fwv3!xrP!|LP zY^96v76+d#7!VMP3_*!OB-99l<`WvMSb

w4=lx#AD3&cFv_M%A3&rMg{-?!N6vF z)eUEOdOv)HT}6Qa0da+mau*a42X~5$j(k`h8V-{Jc?N`+OB*v&lY*e4hNLDWou8qi znKC4>s+b#FEHt;HbtJd5f548ye+tCD$0*9n4@b^MQ_&AnD%X>`#{dK{0pH)O&dICP z$yVag#D~-i!0GKD?D5EtMF5)9I?xvU`}z|6(E=z9kHLco6Dl-F5CXYg5DRg57%}3+ ziWvD^%!vN+qLq&zLy8>vvEeh5txz@)*n*`)l_8{Dd^0Z~%w;6t#RGOgn>juM1bCA$ zsmV8=9Hf+k&;-vS17RYG0NF^~0Xzp{Edd0@Y96hPYU;Qepko@Lp+*`?qoI$^1!bUI z1;W7x6cu74lzki1E{8>YJpk@72oWev###i(`=CkU76Sq=XySJa7O4)J6vnV{;h?Jq zg&JJc4RZyKmr5={2MIMs$@N@Ege{Mx?b{`3yFBsjrh&3)R``ZmhX7I;MH`s@LrDPf z1y1Ok#YdpGtHNOWN3%^mIA9aO$|0MnNUk562!K}wHFnMHaJAVR_9V%irrD{!wj za{he(lNs>dcr1_>#U4haCqhrg1=!FX3W@;Veh6lUk3Gm)aa4VFG*uR3D71D1Wd$Ha z!4LR-Z~=G_fyj&+5xMx{1xfTGBQsj40al6(0CSlWD@KOJd?^VDhEYGk6~}yN{4pT| zOSW+w3m}$(!<2t4IR}=Ic%bDFCu|ae4_9niih49TU@g^832}MzC!WFZs3Mf?{bosOin=pRCjta2Xi9+m>71ot+*2Z;iE^3G zqhVRu=PrphpdAy^c|cKw3VeY>O1O}LVjHe@+QBQ80`<*I9Ke}MF>~J36sWbec2S*pFOK0qKO7hWPxuRv(CSWIQ9!b-sgD{$Yg1!o*tT(RZsD39_*Fa zo!EiW5KM@)#aS&4U^TNmomtd>t*pR$q*$#S))+9joMw-#Q;pUK1EHB{0Axki2O?9! zjiQU;vIY=cAl;xlQotK10l>ixf`(1?Y67@fTt*C3ZUKGx55_dOmD`Q}976~@p}-sV zb0cdmVZYqe(GxbLXLHAJ3=0Cz>a6!R#vSElG)Bv^$7gOYch!sz7QFl5`;e$t;N06g z1b=Xa92hT2dHe>h@6HU@F`SrbjELoKA*@}PP~3Mfn(`1#!uuM#k54A}7T3(t7)q^Q zu4}WSj(zs1J70vNp7(nX==Gn9gy{e*-8JSnfwrZ`D6LE2>W1S4Ok53q7=W3>G6O*x zfk!O2yM+g?pp%^R?t{Ox3;M1FtRmb?cq4oO$?~PYXmsKz^ST3&<^!-6crOyLb431_ z5|RzHZ553ggZS_U2%Hg5Ks&V8hbGfLeSi%)++c@$wlV>9L89O+TY#9s^pHfIu`pAF zNQZuGIJMujuO@Rt#CV2B#mS^GK6|@Z+_u)1*Bzn>;rWdsgvJ6NP(nadY)W~$C?32O zVgs;)93e;MK)5(!A|4o63GqchoU|!`m=vHSrJ=x1wk{7f9D!^~)sr)w;AdsZ6&F@` z!afFXg>UN4zU)`8zU`}0i;RgZDY?setw&Gzc%2l0nL@ekp;)$4O0hJ_%uM0|kbK0E zC#MMxMyxA?qf8MtT|=^Ma%6988s*7y6+#f2vz(r*~Aa?e#h4750Jm*QzdfM}z I`bz)+J7w>-$p8QV diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpMastheadBlank.swf b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-guide/ROMCache/help/common/helpMastheadBlank.swf deleted file mode 100644 index 3bb8bbca4ee8d90470d42901a91a3b92b26a14ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmZ<@4`!@pU|^_VV69+aU_QXWz{AMk%=G{N|NRUBKygN>O!GkoCLotV;LswrMQm*| z%e4=fDljoHz=^93$HR diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAccountInfo.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAccountInfo.js index ef31fad5..c7d3b1ee 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAccountInfo.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAccountInfo.js @@ -14,7 +14,7 @@ if (!request_headers.query.registering) { else if (request_headers.query.subscriber_username.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.min_username_length + " or more characters."); else if (request_headers.query.subscriber_username.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_username_length + " or less characters."); else if (!wtvr.checkUsernameSanity(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); - else if (!wtvr.checkUsernameAvailable(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username."); + else if (!wtvr.checkUsernameAvailable(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have selected is not available. Please select another username."); else if (!request_headers.query.subscriber_contact) errpage = wtvshared.doErrorPage(400, "Please enter your contact information."); else if (request_headers.query.subscriber_contact_method == "") errpage = wtvshared.doErrorPage(400, "Please select the type of contact information you provided."); @@ -47,7 +47,7 @@ correct an item, press Back.

`; main_data += ` - +
  NAME
${request_headers.query.subscriber_name}
@@ -71,7 +71,8 @@ correct an item, press Back.

`; `; if (isOldBuild) main_data += ''; - var form_data = ` + var form_data = ` + diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAgreement.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAgreement.js index e53fc3d0..95d546a0 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAgreement.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateAgreement.js @@ -33,18 +33,18 @@ AutoCaps selected> +AutoCaps selected value="${request_headers.query.subscriber_contact || ""}">

CONTACT INFO TYPE: `; var form_data = ` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateReviewAccountInfo.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateReviewAccountInfo.js index beebdb59..e517fb91 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateReviewAccountInfo.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-register/ValidateReviewAccountInfo.js @@ -14,115 +14,123 @@ if (!request_headers.query.registering || headers = errpage[0]; data = errpage[1]; } else { - var errpage = null; - const WTVRegister = require(classPath + "/WTVRegister.js") - var wtvr = new WTVRegister(minisrv_config, SessionStore); - if (!request_headers.query.subscriber_username) errpage = wtvshared.doErrorPage(400, "Please enter a username."); - else if (request_headers.query.subscriber_username.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.min_username_length + " or more characters."); - else if (request_headers.query.subscriber_username.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_username_length + " or less characters."); - else if (!wtvr.checkUsernameSanity(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); - else if (!wtvr.checkUsernameAvailable(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username."); - if (errpage) { + if (request_headers.query['Change']) { + var changeUrl = "wtv-register:/ValidateAgreement?registering=" + escape(request_headers.query.registering) + "&subscriber_name=" + escape(request_headers.query.subscriber_name); + changeUrl += "&subscriber_username=" + escape(request_headers.query.subscriber_username) + "&subscriber_contact=" + escape(request_headers.query.subscriber_contact) + "&subscriber_contact_method=" + escape(request_headers.query.subscriber_contact_method) + var errpage = wtvshared.doRedirect(changeUrl); headers = errpage[0]; data = errpage[1]; } else { - session_data.setSessionData("subscriber_name", request_headers.query.subscriber_name); - session_data.setSessionData("subscriber_username", request_headers.query.subscriber_username); - session_data.setSessionData("subscriber_contact", request_headers.query.subscriber_contact); - session_data.setSessionData("subscriber_contact_method", request_headers.query.subscriber_contact_method); - session_data.setSessionData("subscriber_userid", 0); - session_data.setSessionData("registered", true); - var mailstore_exists = session_data.mailstore.mailstoreExists(); - var mailbox_exists = false; - if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore(); - if (mailstore_exists) { - if (!session_data.mailstore.mailboxExists(0)) { - // mailbox does not yet exist, create it - mailbox_exists = session_data.mailstore.createMailbox(0); - } - if (mailbox_exists) { - // Just created Inbox for the first time, so create the welcome message - session_data.mailstore.createWelcomeMessage(); - } - } - if (!session_data.saveSessionData(true, true)) { - var errpage = wtvshared.doErrorPage(400); + var errpage = null; + const WTVRegister = require(classPath + "/WTVRegister.js") + var wtvr = new WTVRegister(minisrv_config, SessionStore); + if (!request_headers.query.subscriber_username) errpage = wtvshared.doErrorPage(400, "Please enter a username."); + else if (request_headers.query.subscriber_username.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.min_username_length + " or more characters."); + else if (request_headers.query.subscriber_username.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_username_length + " or less characters."); + else if (!wtvr.checkUsernameSanity(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); + else if (!wtvr.checkUsernameAvailable(request_headers.query.subscriber_username)) errpage = wtvshared.doErrorPage(400, "The username you have selected is not available. Please select another username."); + if (errpage) { headers = errpage[0]; data = errpage[1]; } else { + session_data.setSessionData("subscriber_name", request_headers.query.subscriber_name); + session_data.setSessionData("subscriber_username", request_headers.query.subscriber_username); + session_data.setSessionData("subscriber_contact", request_headers.query.subscriber_contact); + session_data.setSessionData("subscriber_contact_method", request_headers.query.subscriber_contact_method); + session_data.setSessionData("subscriber_userid", 0); + session_data.setSessionData("registered", true); + var mailstore_exists = session_data.mailstore.mailstoreExists(); + var mailbox_exists = false; + if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore(); + if (mailstore_exists) { + if (!session_data.mailstore.mailboxExists(0)) { + // mailbox does not yet exist, create it + mailbox_exists = session_data.mailstore.createMailbox(0); + } + if (mailbox_exists) { + // Just created Inbox for the first time, so create the welcome message + session_data.mailstore.createWelcomeMessage(); + } + } + if (!session_data.saveSessionData(true, true)) { + var errpage = wtvshared.doErrorPage(400); + headers = errpage[0]; + data = errpage[1]; + } else { - headers = `200 OK -Content-Type: text/html`; + headers = `200 OK + Content-Type: text/html`; - data = ` - - -Finished signing up - - - - - - - - - -
- - - -
- - - - - -You've finished signing up - -
- -
- - - - - - - -
-
-
 -Thank you for signing up for ${minisrv_config.config.service_name}. -

-You will now go -to your Web Home page. You can always -connect to the Internet by choosing -Web Home on your TV Home page. - -

 -
- -
 -
- - - - - - - - - -
- - -`; + data = ` + + + Finished signing up + + + + + + + + + +
+ + + +
+ + + + + + You've finished signing up + +
+ +
+ + + + + + + +
+
+
+ Thank you for signing up for ${minisrv_config.config.service_name}. +

+ You will now go + to your Web Home page. You can always + connect to the Internet by choosing + Web Home on your TV Home page. + +

+
+ +
+
+ + + + + + + + + +
+ + + `; + } } } -} +} \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js index fc1acdce..94e9611f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js @@ -63,8 +63,13 @@ User's Internet name -

+ +`; + if (request_headers.query.user_password) data += ``; + if (request_headers.query.user_password2) data += ``; + +data += `
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js index 88172df0..668c5018 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js @@ -4,11 +4,11 @@ var errpage = null; const wtvr = new WTVRegister(minisrv_config, SessionStore); if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account."); -else if (!request_headers.query.user_name) errpage = doErrorPage(400, "Please enter a username."); +else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username."); else if (request_headers.query.user_name.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.min_username_length + " or more characters."); else if (request_headers.query.user_name.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_username_length + " or less characters."); else if (!wtvr.checkUsernameSanity(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); -else if (!wtvr.checkUsernameAvailable(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username."); +else if (!wtvr.checkUsernameAvailable(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have selected is not available. Please select another username."); else if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`); @@ -67,12 +67,13 @@ noscroll> Optional password +
- + diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js index 947ddf46..6e800b3b 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js @@ -66,8 +66,17 @@ User's name
+`; + if (request_headers.query.display_name) { + data += ` + + + + ` + } +data += `

@@ -94,7 +103,7 @@ person's name.
Display name
- Change ${(user_id == session_data.user_id) ? 'your' : 'user'} password - + diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js index bedc3f12..f112a5e3 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js @@ -34,7 +34,7 @@ if (errpage) { } else { if (!request_headers.query.display_name) request_headers.query.display_name = request_headers.query.username; userSession = new WTVClientSessionData(minisrv_config, socket.ssid); - var freeUserId = session_data.findFreeUserSlot(session_data); + var freeUserId = session_data.findFreeUserSlot(); if (freeUserId) { userSession.user_id = freeUserId; userSession.setSessionData("subscriber_userid", freeUserId); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js index 8f1b3328..328f001e 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js @@ -92,16 +92,10 @@ action="/validate-add-user-done"
You are adding +user_name=${request_headers.query.user_name}& +display_name=${request_headers.query.display_name}& +user_password=${request_headers.query.user_password}& +user_password2=${request_headers.query.user_password2}"> ${request_headers.query.user_name}
 to your account. @@ -110,7 +104,7 @@ to your account.
Display Name: - { diff --git a/zefie_wtvp_minisrv/includes/classes/WTVRegister.js b/zefie_wtvp_minisrv/includes/classes/WTVRegister.js index c2ba4cad..51918979 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVRegister.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVRegister.js @@ -34,9 +34,19 @@ class WTVRegister { // returns the user's ssid, and user_id and userid in an array if true, false if not // check against reserved name list - if (this.minisrv_config.config.user_accounts.reserved_names) { - Object.keys(this.minisrv_config.config.user_accounts.reserved_names).forEach((k) => { - if (self.minisrv_config.config.user_accounts.reserved_names[k].toLowerCase() == username.toLowerCase()) return_val = true; + if (this.minisrv_config.config.user_accounts.reserved_names_files) { + var reserved_names = [] + this.minisrv_config.config.user_accounts.reserved_names_files.forEach(function (v) { + var data = self.fs.readFileSync(v); + var json = JSON.parse(data); + json.forEach(function (v) { + reserved_names.push(v); + }); + }); + + Object.keys(reserved_names).forEach((k) => { + var regex = new RegExp("^"+reserved_names[k]+"$", 'i'); + if (username.match(regex)) return_val = true; }) } diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js index 8a1e707d..2820cafa 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js @@ -494,8 +494,8 @@ class WTVShared { }; log(" *** Reading global configuration..."); - try { - var minisrv_config = this.parseJSON(this.fs.readFileSync(this.getAbsolutePath(".." + this.path.sep + "config.json", __dirname))); + try { + var minisrv_config = this.parseJSON(this.fs.readFileSync(this.getAbsolutePath("includes" + this.path.sep + "config.json", this.appdir))); } catch (e) { throw new Error("ERROR: Could not read config.json", e); } @@ -522,10 +522,10 @@ class WTVShared { debugFlags.quiet = minisrv_config.config.verbosity < 2; debugFlags.show_headers = minisrv_config.config.verbosity === 2 debugFlags.debug = minisrv_config.config.verbosity === 3; - log(` * Console Verbosity level ${minisrv_config.config.verbosity}`); + log(` *** Console Verbosity level ${minisrv_config.config.verbosity}`); } else { Object.assign(debugFlags, { debug: true, quiet: false, show_headers: true }); - log(" * Console Verbosity level 4 (debug verbosity)"); + log(" *** Console Verbosity level 4 (debug verbosity)"); } minisrv_config.config.debug_flags = debugFlags; @@ -832,17 +832,29 @@ class WTVShared { } /** - * Returns an absolute path + * Returns an absolute path with an trailing path seperator * @param {string} path * @param {string} directory Root directory */ getAbsolutePath(path = '', directory = '.') { - if (directory[0] == "/") { - return this.path.resolve(directory + this.path.sep + path); + if (directory[0] == "/" || directory.substr(1, 2) == ":" + this.path.sep) { + var newpath = this.path.resolve(directory + this.path.sep + path); + if (this.fs.existsSync(newpath)) { + this.fs.statSync(newpath, (err, stats) => { + if (err) { + console.log('Error checking path:', err); + } else { + if (stats.isDirectory()) { + newpath += this.path.sep + } + } + }); + } + return newpath; } try { // start with our absolute path (of app.js) - const appdir = this.path.resolve(__dirname + this.path.sep + '..' + this.path.sep + '..') + const appdir = this.path.resolve(__dirname + this.path.sep + '..' + this.path.sep + '..') + this.path.sep if (path == '' && directory == '.') { return appdir; @@ -862,8 +874,27 @@ class WTVShared { // If there's an error accessing the directory, log it or handle as needed console.error('Error resolving directory:', e); } + // determine if the final path is a directory, and add a final path.sep if so + var add_sep = false; + if (this.fs.existsSync(path)) { + this.fs.statSync(path, (err, stats) => { + if (err) { + console.log('Error checking path:', err); + } else { + if (stats.isDirectory()) { + add_sep = true + } + } + }); + } else { + // path doesn't exist, we have to guess if its a directory + var path_split = this.path.resolve(path).split(this.path.sep); + if (path_split[(path_split.length - 1)].indexOf('.') > -1) { + add_sep = true; + } + } // The path.resolve method will take care of normalizing slashes - return this.path.resolve(path); + return this.path.resolve(path) + ((add_sep) ? this.path.sep : ''); } @@ -974,6 +1005,15 @@ class WTVShared { } } + doRedirect(url) { + var headers = [] + headers['Status'] = "302 Moved"; + headers["Location"] = url; + headers["wtv-visit"] = url; + var data = '' + return [headers, data] + } + /** * Creates an error message and sends it to the client * @param {number} code HTTP Error Code @@ -1090,7 +1130,7 @@ class WTVShared { if (found) return; if (template) dep_vault_dir += self.path.sep + "templates"; - var search = self.getAbsolutePath(dep_vault_dir + self.path.sep + file); + var search = self.getAbsolutePath(file, dep_vault_dir); if (self.fs.existsSync(search)) { if (path_only) outdata = search; else outdata = self.fs.readFileSync(search); diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json index 0440259c..0d172b9d 100644 --- a/zefie_wtvp_minisrv/includes/config.json +++ b/zefie_wtvp_minisrv/includes/config.json @@ -20,6 +20,7 @@ ], "cgi_enabled": false, // Disable CGI by default "php_enabled": false, // Disable PHP by default + "php_binpath": "php-cgi", "SessionStore": "SessionStore", // Where we store account (session) data. Best left unchanged. "SharedROMCache": "SharedROMCache", // Shared ROMCache (wtv-service:/ROMCache/, where wtv-service is any configured service). Found under service vault. Best left unchanged. "enable_shared_romcache": true, // Disabling this will cause a lot of problems without manual intervention. Best left unchanged. @@ -54,14 +55,9 @@ "max_users_per_account": 6, // Max total users (including primary) per account "min_username_length": 5, // minimum username length "max_username_length": 18, // maximum username length - "reserved_names": [ - // reserved account names, users (nor admins) can register these - "AccountDisabled", - "Demo", - "abuse", - "support", - "registration", - "null" + "reserved_names_files": [ + "includes/badWords.json", + "includes/reservedWords.json" ] }, "pc_admin": { diff --git a/zefie_wtvp_minisrv/includes/reservedWords.json b/zefie_wtvp_minisrv/includes/reservedWords.json new file mode 100644 index 00000000..27994a45 --- /dev/null +++ b/zefie_wtvp_minisrv/includes/reservedWords.json @@ -0,0 +1,53 @@ +[ + "abuse", + "account", + "accounts", + "accountdisabled", + "activate", + "address", + "admin", + "administration", + "administrator", + "backup", + "contact", + "cgi", + "cgi-bin", + "demo", + "developer", + "developers", + "halen", + "maintenance", + "mod", + "moderation", + "moderator", + "operator", + "operators", + "owner", + "owners", + "hiden", + "hiden64", + "hostmaster", + "jarhead", + "nitrate", + "nitrate92", + "postmaster", + "redialed", + "register", + "registration", + "report", + "root", + "server", + "service", + "shared", + "staff", + "support", + "sysadmin", + "sysadministrator", + "system", + "null", + "username", + "webmaster", + "webtv", + "webtvredialed", + "xmp" +] \ No newline at end of file diff --git a/zefie_wtvp_minisrv/package-lock.json b/zefie_wtvp_minisrv/package-lock.json index 09411e16..744d9e48 100644 --- a/zefie_wtvp_minisrv/package-lock.json +++ b/zefie_wtvp_minisrv/package-lock.json @@ -1,12 +1,12 @@ { "name": "zefie_wtvp_minisrv", - "version": "0.9.56", + "version": "0.9.57", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "zefie_wtvp_minisrv", - "version": "0.9.56-pre", + "version": "0.9.57-pre", "license": "GPL3", "dependencies": { "adm-zip": "^0.5.12", diff --git a/zefie_wtvp_minisrv/package.json b/zefie_wtvp_minisrv/package.json index c7dfd47b..4c7dc145 100644 --- a/zefie_wtvp_minisrv/package.json +++ b/zefie_wtvp_minisrv/package.json @@ -1,6 +1,6 @@ { "name": "zefie_wtvp_minisrv", - "version": "0.9.56", + "version": "0.9.57", "description": "WebTV Service (WTVP) Emulation Server", "main": "app.js", "homepage": "https://github.com/zefie/zefie_wtvp_minisrv", diff --git a/zefie_wtvp_minisrv/user_config.pconly_example.json b/zefie_wtvp_minisrv/user_config.pconly_example.json index 6f715858..00433aa0 100644 --- a/zefie_wtvp_minisrv/user_config.pconly_example.json +++ b/zefie_wtvp_minisrv/user_config.pconly_example.json @@ -1,11 +1,5 @@ { - /* - STOP! STOP! STOP! - Do NOT edit this file. Instead make a file called "user_config.json" in the same folder as "app.js" - With that, you can override anything defined here. You can copy this config as a template, but should - only leave in things you are actually overriding, in case a future feature update changes any defaults. - */ - "services": { + "services": { // service definitions "wtv-head-waiter": {