summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/security/multiauthconfig.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 45d691b..7a5f7b9 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -182,405 +182,405 @@ static void test_and_start() {
m_pluginListView->addColumn("PluginList");
m_pluginListView->header()->hide();
m_pluginListView->setSorting(-1);
QWhatsThis::add(m_pluginListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in" ));
QVBox * pluginListVB = new QVBox(pluginListHB);
new ToolButton( pluginListVB, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) );
new ToolButton( pluginListVB, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
m_mainTW->addTab( m_pluginListWidget, "pass", tr( "plugins" ) );
connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) );
// general Opie multi-authentication configuration tab
m_generalConfig = new MultiauthGeneralConfig(this, m_mainTW);
m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") );
}
// login settings page
m_loginWidget = new LoginBase(m_mainTW, "login config widget");
m_mainTW->addTab(m_loginWidget, "security/users", tr( "Login") );
// sync settings page
m_syncWidget = new SyncBase( m_mainTW, "sync config widget" );
m_mainTW->addTab(m_syncWidget, "security/sync", tr( "Sync") );
// read the "Security" Config file and update our UI
readConfig();
if (m_pluginsInstalled)
{
/* loads plugins configuration widgets in mainTW tabs and in pluginListView
*/
loadPlugins();
for ( int i = pluginList.count() - 1; i >= 0; i-- ) {
MultiauthPlugin plugin = pluginList[i];
// load the config widgets in the tabs
// (configWidget will return 0l if there is no configuration GUI)
MultiauthConfigWidget* widget = plugin.pluginObject->configWidget(m_mainTW);
if ( widget != 0l ) {
odebug << "plugin " << plugin.name << " has a configuration widget" << oendl;
configWidgetList.append(widget);
m_mainTW->addTab( widget, plugin.pluginObject->pixmapNameConfig(),
plugin.pluginObject->pluginName() );
}
// set the order/activate tab
QPixmap icon = Resource::loadPixmap( plugin.pluginObject->pixmapNameWidget() );
QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox );
if ( !icon.isNull() ) {
item->setPixmap( 0, icon );
}
if ( m_excludePlugins.find( plugin.name ) == m_excludePlugins.end() ) {
item->setOn( TRUE );
}
m_plugins[plugin.name] = item;
}
// set the first tab as default.
m_mainTW->setCurrentTab(m_pluginListWidget);
// put the number of plugins as the max number of req. auth.
m_generalConfig->m_nbSuccessMin->setMaxValue( pluginList.count() );
}
else
{
/* we don't have any installed plugin there. Let's tell
* that to the user in a third tab, using the m_pluginListWidget widget
*/
m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget (no plugins warning)");
QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
pluginListLayout->setSpacing(11);
pluginListLayout->setMargin(11);
pluginListLayout->setAlignment( Qt::AlignTop );
QVGroupBox *warningBox = new QVGroupBox(tr("Important notice"), m_pluginListWidget, "noPlugins warning box");
pluginListLayout->addWidget(warningBox);
QLabel * warningText = new QLabel( "<p>" + tr("To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one <em>opie-multiauth-*</em> package! Once you have done that, you will be able to configure your PDA protection here.") + "</p>", warningBox );
m_mainTW->addTab(m_pluginListWidget, "security/Security", tr( "Locking") );
// set the first tab as default.
m_mainTW->setCurrentTab(m_loginWidget);
}
showMaximized();
}
/// nothing to do
MultiauthConfig::~MultiauthConfig()
{
}
/// saves the general and plugin(s) configurations
void MultiauthConfig::writeConfigs() {
- writeConfig();
-
MultiauthConfigWidget* confWidget = 0;
for ( confWidget = configWidgetList.first(); confWidget != 0;
confWidget = configWidgetList.next() )
confWidget->writeConfig();
+
+ writeConfig();
}
/// on QDialog::accept, we save all the configurations and exit the QDialog normally
void MultiauthConfig::accept() {
writeConfigs();
QDialog::accept();
}
void MultiauthConfig::done( int r ) {
QDialog::done( r );
close();
}
/// moves up the selected plugin
void MultiauthConfig::moveSelectedUp()
{
QListViewItem *item = m_pluginListView->selectedItem();
if ( item && item->itemAbove() ) {
item->itemAbove()->moveItem( item );
}
}
/// moves down the selected plugin
void MultiauthConfig::moveSelectedDown()
{
QListViewItem *item = m_pluginListView->selectedItem();
if ( item && item->itemBelow() ) {
item->moveItem( item->itemBelow() );
}
}
/// reads the <code>Security.conf</code> Config file, and updates parts of the user interface
void MultiauthConfig::readConfig()
{
// pointer, so we release this Config when we want
Config* pcfg = new Config("Security");
if (m_pluginsInstalled)
{
pcfg->setGroup( "Misc" );
m_generalConfig->m_onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) );
m_generalConfig->m_onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) );
m_generalConfig->m_nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) );
m_generalConfig->m_noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) );
m_generalConfig->m_explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) );
pcfg->setGroup( "Plugins" );
m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' );
m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' );
}
/* Login and Sync stuff */
pcfg->setGroup("Sync");
int auth_peer = pcfg->readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
int auth_peer_bits = pcfg->readNumEntry("auth_peer_bits",24);
pcfg->setGroup("SyncMode");
int mode = pcfg->readNumEntry("Mode",2); // Default to Sharp
switch( mode ) {
case 0x01:
m_syncWidget->syncModeCombo->setCurrentItem( 0 );
break;
case 0x02:
default:
m_syncWidget->syncModeCombo->setCurrentItem( 1 );
break;
case 0x04:
m_syncWidget->syncModeCombo->setCurrentItem( 2 );
break;
}
/*
cfg.setGroup("Remote");
if ( telnetAvailable() )
telnet->setChecked(cfg.readEntry("allow_telnet"));
else
telnet->hide();
if ( sshAvailable() )
ssh->setChecked(cfg.readEntry("allow_ssh"));
else
ssh->hide();
*/
// release the Config handler
delete pcfg;
// indeed, selectNet will open the config file...
selectNet(auth_peer,auth_peer_bits,TRUE);
connect( m_syncWidget->syncnet, SIGNAL(textChanged(const QString&)),
this, SLOT(setSyncNet(const QString&)));
QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
Config loginCfg(configFile,Config::File);
loginCfg.setGroup("General");
autoLoginName=loginCfg.readEntry("AutoLogin","");
if (autoLoginName.stripWhiteSpace().isEmpty()) {
autoLogin=false;
} else {
autoLogin=true;
}
connect(m_loginWidget->autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
connect(m_loginWidget->userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
connect(m_syncWidget->restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults()));
connect(m_syncWidget->deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry()));
loadUsers();
updateGUI();
}
void MultiauthConfig::writeConfig()
{
- Config* pcfg = new Config("Security");
+ Config pcfg("Security");
if (m_pluginsInstalled)
{
- pcfg->setGroup( "Plugins" );
+ pcfg.setGroup( "Plugins" );
QStringList exclude;
QStringList include;
QStringList allPlugins;
QListViewItemIterator list_it( m_pluginListView );
// this makes sure the names get saved in the order selected
for ( ; list_it.current(); ++list_it ) {
QMap <QString, QCheckListItem *>::Iterator it;
for ( it = m_plugins.begin(); it != m_plugins. end (); ++it ) {
if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
exclude << it.key();
} else if ( list_it.current() == (*it) && (*it)-> isOn () ){
include << it.key();
}
if ( list_it.current() == (*it) ) {
allPlugins << it.key();
}
}
}
- pcfg->writeEntry( "ExcludePlugins", exclude, ',' );
- pcfg->writeEntry( "IncludePlugins", include, ',' );
- pcfg->writeEntry( "AllPlugins", allPlugins, ',' );
+ pcfg.writeEntry( "ExcludePlugins", exclude, ',' );
+ pcfg.writeEntry( "IncludePlugins", include, ',' );
+ pcfg.writeEntry( "AllPlugins", allPlugins, ',' );
- pcfg->setGroup( "Misc" );
- pcfg->writeEntry( "onStart", m_generalConfig->m_onStart->isChecked() );
- pcfg->writeEntry( "onResume", m_generalConfig->m_onResume->isChecked() );
- pcfg->writeEntry( "nbSuccessMin", m_generalConfig->m_nbSuccessMin->text() );
- pcfg->writeEntry( "noProtectConfig", m_generalConfig->m_noProtectConfig->isChecked() );
- pcfg->writeEntry( "explanScreens", m_generalConfig->m_explanScreens->isChecked() );
+ pcfg.setGroup( "Misc" );
+ pcfg.writeEntry( "onStart", m_generalConfig->m_onStart->isChecked() );
+ pcfg.writeEntry( "onResume", m_generalConfig->m_onResume->isChecked() );
+ pcfg.writeEntry( "nbSuccessMin", m_generalConfig->m_nbSuccessMin->text() );
+ pcfg.writeEntry( "noProtectConfig", m_generalConfig->m_noProtectConfig->isChecked() );
+ pcfg.writeEntry( "explanScreens", m_generalConfig->m_explanScreens->isChecked() );
}
/* Login and Sync stuff */
- pcfg->setGroup("Sync");
+ pcfg.setGroup("Sync");
int auth_peer=0;
int auth_peer_bits;
QString sn = m_syncWidget->syncnet->currentText();
parseNet(sn,auth_peer,auth_peer_bits);
//this is the *selected* (active) net range
- pcfg->writeEntry("auth_peer",auth_peer);
- pcfg->writeEntry("auth_peer_bits",auth_peer_bits);
+ pcfg.writeEntry("auth_peer",auth_peer);
+ pcfg.writeEntry("auth_peer_bits",auth_peer_bits);
//write back all other net ranges in *cleartext*
for (int i=0; i<10; i++) {
QString target;
target.sprintf("net%d", i);
if ( i < m_syncWidget->syncnet->count() )
- pcfg->writeEntry(target, m_syncWidget->syncnet->text(i));
+ pcfg.writeEntry(target, m_syncWidget->syncnet->text(i));
else // no more entry in the syncnet list -> we clear the line
- pcfg->writeEntry(target, "");
+ pcfg.writeEntry(target, "");
}
#ifdef ODP
#error "Use 0,1,2 and use Launcher"
#endif
/* keep the old code so we don't use currentItem directly */
int value = 0x02;
switch( m_syncWidget->syncModeCombo->currentItem() ) {
case 0:
value = 0x01;
break;
case 1:
value = 0x02;
break;
case 2:
value = 0x04;
break;
}
- pcfg->setGroup("SyncMode");
- pcfg->writeEntry( "Mode", value );
+ pcfg.setGroup("SyncMode");
+ pcfg.writeEntry( "Mode", value );
/*
- pcfg->setGroup("Remote");
+ pcfg.setGroup("Remote");
if ( telnetAvailable() )
- pcfg->writeEntry("allow_telnet",telnet->isChecked());
+ pcfg.writeEntry("allow_telnet",telnet->isChecked());
if ( sshAvailable() )
- pcfg->writeEntry("allow_ssh",ssh->isChecked());
+ pcfg.writeEntry("allow_ssh",ssh->isChecked());
// ### write ssh/telnet sys config files
*/
//release the Config handler
- delete pcfg;
+ pcfg.write();
QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
Config loginCfg(configFile,Config::File);
loginCfg.setGroup("General");
if (autoLogin) {
loginCfg.writeEntry("AutoLogin",autoLoginName);
} else {
loginCfg.removeEntry("AutoLogin");
}
}
/// slot used to record the fact plugins order has been modified
void MultiauthConfig::pluginsChanged() {
m_plugins_changed = true;
}
/// loads each multiauth plugin
void MultiauthConfig::loadPlugins() {
QString path = QPEApplication::qpeDir() + "plugins/security";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
QStringList::Iterator it;
// temporary list used to sort plugins
QMap<QString, MultiauthPlugin> sortList;
for ( it = list.begin(); it != list.end(); ++it ) {
QInterfacePtr<MultiauthPluginInterface> iface;
QLibrary *lib = new QLibrary( path + "/" + *it );
QString libPath(path + "/" + *it);
if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
MultiauthPlugin plugin;
plugin.library = lib;
plugin.iface = iface;
plugin.name = QString(*it);
// find out if plugins should be launched
if ( m_excludePlugins.grep( *it ).isEmpty() ) {
plugin.active = true;
} else {
plugin.active = false;
}
plugin.pluginObject = plugin.iface->plugin();
// "prebuffer" it in one more list, to get the sorting done
sortList.insert( plugin.name, plugin );
// on first start the list is off course empty
if ( m_allPlugins.isEmpty() ) {
pluginList.append( plugin );
}
// if plugin is not yet in the list, add it to the layout too
else if ( !m_allPlugins.contains( plugin.name ) ) {
pluginList.append( plugin );
}
} else {
delete lib;
}
} // end for
// put m_allPlugins tempPlugin objects into pluginList
if ( !m_allPlugins.isEmpty() ) {
MultiauthPlugin tempPlugin;
QStringList::Iterator stringit;
for( stringit = m_allPlugins.begin(); stringit != m_allPlugins.end(); ++stringit ) {
tempPlugin = ( sortList.find( *stringit ) ).data();
if ( !( (tempPlugin.name).isEmpty() ) ) {
pluginList.append( tempPlugin );
}
}
}
}
void MultiauthConfig::deleteListEntry()
{
m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem());
}
void MultiauthConfig::restoreDefaults()
{
QMessageBox unrecbox(
tr("Attention"),
"<p>" + tr("All user-defined net ranges will be lost.") + "</p>",
QMessageBox::Warning,
QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
0, QString::null, TRUE, WStyle_StaysOnTop);
unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));