mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

yweb 2.8.0.7 Dont show phantom bouquets

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@781 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: a3f16be1b5
Author: yjogol <yjogol2@online.de>
Date: 2010-09-17 (Fri, 17 Sep 2010)
This commit is contained in:
yjogol
2010-09-17 17:08:24 +00:00
parent d32cd6adcb
commit c696eabb7d
3 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -239,8 +239,10 @@ std::string CNeutrinoYParser::func_get_bouquets_as_templatelist(CyhookHandler *
ySplitString(para,"~",ytemplate, do_show_hidden); ySplitString(para,"~",ytemplate, do_show_hidden);
//ytemplate += "\n"; //FIXME add newline to printf //ytemplate += "\n"; //FIXME add newline to printf
int mode = NeutrinoAPI->Zapit->getMode();
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) { for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) {
if(!g_bouquetManager->Bouquets[i]->bHidden || do_show_hidden == "true") { ZapitChannelList * channels = mode == CZapitClient::MODE_RADIO ? &g_bouquetManager->Bouquets[i]->radioChannels : &g_bouquetManager->Bouquets[i]->tvChannels;
if(!channels->empty() && (!g_bouquetManager->Bouquets[i]->bHidden || do_show_hidden == "true")) {
yresult += string_printf(ytemplate.c_str(), i + 1, g_bouquetManager->Bouquets[i]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : g_bouquetManager->Bouquets[i]->Name.c_str()); yresult += string_printf(ytemplate.c_str(), i + 1, g_bouquetManager->Bouquets[i]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : g_bouquetManager->Bouquets[i]->Name.c_str());
yresult += "\r\n"; yresult += "\r\n";
} }
@@ -964,35 +966,38 @@ std::string CNeutrinoYParser::func_bouquet_editor_main(CyhookHandler *hh, std::
selected = atoi(hh->ParamList["selected"].c_str()); selected = atoi(hh->ParamList["selected"].c_str());
int bouquetSize = (int) g_bouquetManager->Bouquets.size(); int bouquetSize = (int) g_bouquetManager->Bouquets.size();
int mode = NeutrinoAPI->Zapit->getMode();
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) { for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) {
ZapitChannelList * channels = mode == CZapitClient::MODE_RADIO ? &g_bouquetManager->Bouquets[i]->radioChannels : &g_bouquetManager->Bouquets[i]->tvChannels;
if(!channels->empty()){
CZapitBouquet * bouquet = g_bouquetManager->Bouquets[i];
CZapitBouquet * bouquet = g_bouquetManager->Bouquets[i]; char classname = ((i & 1) == 0) ? 'a' : 'b';
classname = (selected == (int) i + 1)?'c':classname;
char classname = ((i & 1) == 0) ? 'a' : 'b'; std::string akt = (selected == (int) (i + 1)) ? "<a name=\"akt\"></a>" : "";
classname = (selected == (int) i + 1)?'c':classname; // lock/unlock
std::string lock_action = (bouquet->bLocked) ? "unlock" : "lock";
std::string akt = (selected == (int) (i + 1)) ? "<a name=\"akt\"></a>" : ""; std::string lock_img = (bouquet->bLocked) ? "lock" : "unlock";
// lock/unlock std::string lock_alt = (bouquet->bLocked) ? "unlock" : "lock";
std::string lock_action = (bouquet->bLocked) ? "unlock" : "lock"; // hide/show
std::string lock_img = (bouquet->bLocked) ? "lock" : "unlock"; std::string hidden_action= (bouquet->bHidden) ? "show" : "hide";
std::string lock_alt = (bouquet->bLocked) ? "unlock" : "lock"; std::string hidden_img = (bouquet->bHidden) ? "hidden" : "visible";
// hide/show std::string hidden_alt = (bouquet->bHidden) ? "hide" : "show";
std::string hidden_action= (bouquet->bHidden) ? "show" : "hide"; // move down
std::string hidden_img = (bouquet->bHidden) ? "hidden" : "visible"; std::string down_show = (i + 1 < bouquetSize) ? "visible" : "hidden";
std::string hidden_alt = (bouquet->bHidden) ? "hide" : "show"; //move up
// move down std::string up_show = (i > 0) ? "visible" : "hidden";
std::string down_show = (i + 1 < bouquetSize) ? "visible" : "hidden"; // build from template
//move up yresult += string_printf(para.c_str(), classname, akt.c_str(),
std::string up_show = (i > 0) ? "visible" : "hidden"; i + 1, lock_action.c_str(), lock_img.c_str(), lock_alt.c_str(), //lock
// build from template i + 1, hidden_action.c_str(), hidden_img.c_str(), hidden_alt.c_str(), //hhidden
yresult += string_printf(para.c_str(), classname, akt.c_str(), i + 1, bouquet->Name.c_str(), bouquet->Name.c_str(), //link
i + 1, lock_action.c_str(), lock_img.c_str(), lock_alt.c_str(), //lock i + 1, bouquet->Name.c_str(), //rename
i + 1, hidden_action.c_str(), hidden_img.c_str(), hidden_alt.c_str(), //hhidden i + 1, bouquet->Name.c_str(), //delete
i + 1, bouquet->Name.c_str(), bouquet->Name.c_str(), //link down_show.c_str(), i + 1, //down arrow
i + 1, bouquet->Name.c_str(), //rename up_show.c_str(), i + 1); //up arrow
i + 1, bouquet->Name.c_str(), //delete }
down_show.c_str(), i + 1, //down arrow
up_show.c_str(), i + 1); //up arrow
} }
return yresult; return yresult;
} }

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,5 +1,5 @@
version=2.8.0.6 version=2.8.0.7
date=05.09.2010 date=17.09.2010
type=Release type=Release
info=Port Coolstream info=Port Coolstream

2
src/nhttpd/yconfig.h
View File

@@ -26,7 +26,7 @@
// General central Definitions <configure!> // General central Definitions <configure!>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#define HTTPD_VERSION "3.3.3" // Webserver version (can be overloaded) #define HTTPD_VERSION "3.3.3" // Webserver version (can be overloaded)
#define YHTTPD_VERSION "1.3.1" // Webserver version (Version of yhttpd-core!) #define YHTTPD_VERSION "1.3.2" // Webserver version (Version of yhttpd-core!)
#define IADDR_LOCAL "127.0.0.1" // local IP #define IADDR_LOCAL "127.0.0.1" // local IP
#define HTTPD_NAME "yhttpd" // Webserver name (can be overloaded) #define HTTPD_NAME "yhttpd" // Webserver name (can be overloaded)
#define YHTTPD_NAME "yhttpd_core" // Webserver name (Name of yhttpd-core!) #define YHTTPD_NAME "yhttpd_core" // Webserver name (Name of yhttpd-core!)