summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-11-22 20:51:13 (UTC)
committer benmeyer <benmeyer>2002-11-22 20:51:13 (UTC)
commit6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4 (patch) (side-by-side diff)
tree7e82db5619848bdb53382931fbb5b9a05030f3c0
parent0dc2fdfc84bfd9d1d0021968ffc7406bdad54a40 (diff)
downloadopie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.zip
opie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.tar.gz
opie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.tar.bz2
In theory open and restricted networks should be set now.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp9
2 files changed, 12 insertions, 6 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 488911b..44c721a 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -143,55 +143,58 @@ void WLANImp::changeAndSaveSettingFile(){
bool output = true;
for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n';
stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n';
stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
- stream << "\tKEY=";
+ stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
- if(authOpen->isChecked()) stream << " open";
- stream << "\n";
+ if(authOpen->isChecked())
+ stream << " open";
+ else
+ stream << " restricted";
+ stream << "\n\"";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
if(output)
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
{
QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
return;
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 488911b..44c721a 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -143,55 +143,58 @@ void WLANImp::changeAndSaveSettingFile(){
bool output = true;
for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n';
stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n';
stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
- stream << "\tKEY=";
+ stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
- if(authOpen->isChecked()) stream << " open";
- stream << "\n";
+ if(authOpen->isChecked())
+ stream << " open";
+ else
+ stream << " restricted";
+ stream << "\n\"";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
if(output)
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
{
QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
return;