Only enable the username and password if one of the proxies is enabled

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
@@ -157,119 +157,119 @@ void DataManager :: loadServers()
                     proxyPassword = val;
             }
         }
     }
     fclose( fp );
 
     reloadServerData( );
 }
 
 void DataManager :: reloadServerData( )
 {
         vector<Server>::iterator it = serverList.begin();
     for ( it = serverList.begin() ; it != serverList.end() ; ++it )
     {
             // Now we've read the config file in we need to read the servers
             // The local server is a special case. This holds the contents of the
             // status files the number of which depends on how many destinations
             // we've set up
             // The other servers files hold the contents of the server package list
             if ( it->getServerName() == LOCAL_SERVER )
                 it->readStatusFile( destList );
             else if ( it->getServerName() == LOCAL_IPKGS )
             it->readLocalIpks( &( *getServer( LOCAL_SERVER ) ) );
             else
             it->readPackageFile( &( *getServer( LOCAL_SERVER ) ) );     
         }
 }
 
 void DataManager :: writeOutIpkgConf()
 {
     QString ipkg_conf = IPKG_CONF;
     ofstream out( ipkg_conf );
 
     out << "# Written by AQPkg" << endl;
     out << "# Must have one or more source entries of the form:" << endl;
     out << "#" << endl;
     out << "#   src <src-name> <source-url>" << endl;
     out << "#" << endl;
     out << "# and one or more destination entries of the form:" << endl;
     out << "#" << endl;
     out << "#   dest <dest-name> <target-path>" << endl;
     out << "#" << endl;
     out << "# where <src-name> and <dest-names> are identifiers that" << endl;
     out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl;
     out << "# URL that points to a directory containing a Familiar" << endl;
     out << "# Packages file, and <target-path> should be a directory" << endl;
     out << "# that exists on the target system." << endl << endl;
     
     // 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 + "#";
 }