[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-581-g317ee11
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-581-g317ee11
|
From: GetAway <tux...@ne...> - 2015-05-29 17:42:36
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 317ee11f0c79e80b3727d4054b1cef2f6dc6b8a8 (commit)
from df4282c81b2e990852dd4de4ac83e1bca392184f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 317ee11f0c79e80b3727d4054b1cef2f6dc6b8a8
Author: GetAway <get...@t-...>
Date: Fri May 29 19:41:59 2015 +0200
settings: more char[] to string
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/gui/proxyserver_setup.cpp b/tuxbox/neutrino/src/gui/proxyserver_setup.cpp
index 6ce5a0e..1b2ef0a 100644
--- a/tuxbox/neutrino/src/gui/proxyserver_setup.cpp
+++ b/tuxbox/neutrino/src/gui/proxyserver_setup.cpp
@@ -79,13 +79,13 @@ int CProxySetup::showProxySetup()
mn->addIntroItems(menue_title != LOCALE_FLASHUPDATE_PROXYSERVER_SEP ? LOCALE_FLASHUPDATE_PROXYSERVER_SEP : NONEXISTANT_LOCALE);
- CStringInputSMS softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, g_settings.softupdate_proxyserver, 23, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+ CStringInputSMS softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 23, false, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
mn->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, &softUpdate_proxy, NULL, CRCInput::RC_red));
- CStringInputSMS softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, g_settings.softupdate_proxyusername, 23, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""\xA7$%&/()=?-. ");
+ CStringInputSMS softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 23, false, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""\xA7$%&/()=?-. ");
mn->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, &softUpdate_proxyuser, NULL, CRCInput::RC_green));
- CStringInputSMS softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, g_settings.softupdate_proxypassword, 20, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""\xA7$%&/()=?-. ");
+ CStringInputSMS softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 20, false, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""\xA7$%&/()=?-. ");
mn->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow));
int res = mn->exec(NULL, "");
diff --git a/tuxbox/neutrino/src/gui/software_update.cpp b/tuxbox/neutrino/src/gui/software_update.cpp
index 7733395..5bbe731 100755
--- a/tuxbox/neutrino/src/gui/software_update.cpp
+++ b/tuxbox/neutrino/src/gui/software_update.cpp
@@ -143,7 +143,7 @@ int CSoftwareUpdate::showSoftwareUpdateExpert()
#ifndef DISABLE_INTERNET_UPDATE
mtdexpert->addItem(GenericMenuSeparatorLine);
- CStringInputSMS softUpdate_url_file(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
+ CStringInputSMS softUpdate_url_file(LOCALE_FLASHUPDATE_URL_FILE, &g_settings.softupdate_url_file, 30, false, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
mtdexpert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, &softUpdate_url_file));
#endif /*DISABLE_INTERNET_UPDATE*/
diff --git a/tuxbox/neutrino/src/gui/update.cpp b/tuxbox/neutrino/src/gui/update.cpp
index 598384d..e911754 100644
--- a/tuxbox/neutrino/src/gui/update.cpp
+++ b/tuxbox/neutrino/src/gui/update.cpp
@@ -146,7 +146,7 @@ bool CFlashUpdate::selectHttpImage(void)
SelectionWidget.addItem(GenericMenuSeparator);
SelectionWidget.addItem(GenericMenuBack);
- std::ifstream urlFile(g_settings.softupdate_url_file);
+ std::ifstream urlFile(g_settings.softupdate_url_file.c_str());
unsigned int i = 0;
bool update_prefix_tried = false;
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index c3b64b5..7bbd4a4 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -661,11 +661,11 @@ int CNeutrinoApp::loadSetup()
#ifndef DISABLE_INTERNET_UPDATE
//Software-update
- g_settings.softupdate_mode = configfile.getInt32( "softupdate_mode", CFlashUpdate::UPDATEMODE_INTERNET );
- strcpy(g_settings.softupdate_url_file, configfile.getString("softupdate_url_file", "/etc/update.urls").c_str());
- strcpy(g_settings.softupdate_proxyserver, configfile.getString("softupdate_proxyserver", "" ).c_str());
- strcpy(g_settings.softupdate_proxyusername, configfile.getString("softupdate_proxyusername", "" ).c_str());
- strcpy(g_settings.softupdate_proxypassword, configfile.getString("softupdate_proxypassword", "" ).c_str());
+ g_settings.softupdate_mode = configfile.getInt32( "softupdate_mode", CFlashUpdate::UPDATEMODE_INTERNET );
+ g_settings.softupdate_url_file = configfile.getString("softupdate_url_file", "/etc/update.urls" );
+ g_settings.softupdate_proxyserver = configfile.getString("softupdate_proxyserver", "" );
+ g_settings.softupdate_proxyusername = configfile.getString("softupdate_proxyusername", "" );
+ g_settings.softupdate_proxypassword = configfile.getString("softupdate_proxypassword", "" );
#endif
// GUI font
g_settings.font_file = configfile.getString( "font_file", FONTDIR"/LiberationSans-Regular.ttf" );
diff --git a/tuxbox/neutrino/src/system/httptool.cpp b/tuxbox/neutrino/src/system/httptool.cpp
index 3a08c88..39e90ce 100644
--- a/tuxbox/neutrino/src/system/httptool.cpp
+++ b/tuxbox/neutrino/src/system/httptool.cpp
@@ -91,19 +91,18 @@ bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloa
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION,1);
//curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
- if(strcmp(g_settings.softupdate_proxyserver,"")!=0)
+ if(!g_settings.softupdate_proxyserver.empty())
{//use proxyserver
//printf("use proxyserver\n");
- curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver);
+ curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
- if(strcmp(g_settings.softupdate_proxyusername,"")!=0)
+ if(!g_settings.softupdate_proxyusername.empty())
{//use auth
//printf("use proxyauth\n");
- char tmp[200];
- strcpy(tmp, g_settings.softupdate_proxyusername);
- strcat(tmp, ":");
- strcat(tmp, g_settings.softupdate_proxypassword);
- curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp);
+ std::string tmp = g_settings.softupdate_proxyusername;
+ tmp += ":";
+ tmp += g_settings.softupdate_proxypassword;
+ curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp.c_str());
}
}
diff --git a/tuxbox/neutrino/src/system/settings.h b/tuxbox/neutrino/src/system/settings.h
index d45cffd..0261f65 100644
--- a/tuxbox/neutrino/src/system/settings.h
+++ b/tuxbox/neutrino/src/system/settings.h
@@ -353,10 +353,10 @@ struct {
#ifndef DISABLE_INTERNET_UPDATE
//Software-update
int softupdate_mode;
- char softupdate_url_file[31];
- char softupdate_proxyserver[31];
- char softupdate_proxyusername[31];
- char softupdate_proxypassword[31];
+ std::string softupdate_url_file;
+ std::string softupdate_proxyserver;
+ std::string softupdate_proxyusername;
+ std::string softupdate_proxypassword;
#endif
//BouquetHandling
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/proxyserver_setup.cpp | 6 +++---
tuxbox/neutrino/src/gui/software_update.cpp | 2 +-
tuxbox/neutrino/src/gui/update.cpp | 2 +-
tuxbox/neutrino/src/neutrino.cpp | 10 +++++-----
tuxbox/neutrino/src/system/httptool.cpp | 15 +++++++--------
tuxbox/neutrino/src/system/settings.h | 8 ++++----
6 files changed, 21 insertions(+), 22 deletions(-)
--
Tuxbox-GIT: apps
|
