summaryrefslogtreecommitdiff
authorandyq <andyq>2002-12-13 13:49:02 (UTC)
committer andyq <andyq>2002-12-13 13:49:02 (UTC)
commit8b1c25e608e7255199dc97ad8269ac66d40beede (patch) (side-by-side diff)
treef17e7e897e1f872e035c004af8479430c45bc640
parent9b65e55ce70837695b319ef7049674e9c3daba98 (diff)
downloadopie-8b1c25e608e7255199dc97ad8269ac66d40beede.zip
opie-8b1c25e608e7255199dc97ad8269ac66d40beede.tar.gz
opie-8b1c25e608e7255199dc97ad8269ac66d40beede.tar.bz2
Only enable the username and password if one of the proxies is enabled
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 3933a22..0159a79 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -205,71 +205,71 @@ void DataManager :: writeOutIpkgConf()
// Write out servers
vector<Server>::iterator it = serverList.begin();
while ( it != serverList.end() )
{
QString alias = it->getServerName();
// Don't write out local as its a dummy
if ( alias != LOCAL_SERVER && alias != LOCAL_IPKGS )
{
QString url = it->getServerUrl();;
if ( !it->isServerActive() )
out << "#";
out << "src " << alias << " " << url << endl;
}
it++;
}
out << endl;
// Write out destinations
vector<Destination>::iterator it2 = destList.begin();
while ( it2 != destList.end() )
{
out << "dest " << it2->getDestinationName() << " " << it2->getDestinationPath() << endl;
it2++;
}
out << endl;
out << "# Proxy Support" << endl;
if ( !httpProxyEnabled && httpProxy == "" )
out << "#option http_proxy http://proxy.tld:3128" << endl;
else
{
if ( !httpProxyEnabled )
out << "#";
out << "option http_proxy " << httpProxy << endl;
}
if ( !ftpProxyEnabled && ftpProxy == "" )
out << "#option ftp_proxy http://proxy.tld:3128" << endl;
else
{
if ( !ftpProxyEnabled )
out << "#";
out << "option ftp_proxy " << ftpProxy << endl;
}
- if ( proxyUsername == "" )
+ if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
out << "#option proxy_username <username>" << endl;
else
out << "option proxy_username " << proxyUsername << endl;
- if ( proxyPassword == "" )
+ if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
out << "#option proxy_password <password>" << endl << endl;
else
out << "option proxy_password " << proxyPassword << endl<< endl;
out << "# Offline mode (for use in constructing flash images offline)" << endl;
out << "#option offline_root target" << endl;
out.close();
}
void DataManager :: setAvailableCategories( QString section )
{
section = section.lower();
if ( availableCategories.find( "#" + section + "#" ) == -1 )
availableCategories += section + "#";
}