2 files changed, 51 insertions, 0 deletions

diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index ff11e49..3c73d7b 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -1,17 +1,18 @@
 #include "multiauthconfig.h"
 
 #include <opie2/odebug.h>
 
 #include <qgroupbox.h>
+#include <qvgroupbox.h>
 #include <qpe/resource.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 #include <qtoolbutton.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
@@ -139,28 +140,42 @@ static void test_and_start() {
 
 
 MultiauthConfig::MultiauthConfig(QWidget* par, const char* w,  WFlags f)
     : QDialog(par, w, TRUE, f),
       m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
       m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
       m_nbSuccessReq(0), m_plugins_changed(false)
 {
     /* Initializes the global configuration window
      */
     test_and_start();
 
+    /* Checks (and memorizes) if any authentication plugins are
+     * installed on the system
+     */
+    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QDir dir( path, "lib*.so" );
+    QStringList list = dir.entryList();
+    
+    m_pluginsInstalled = ! list.isEmpty();
+    if (m_pluginsInstalled == false)
+        owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl;
+
     setCaption( tr( "Security configuration" ) );
     QVBoxLayout *layout = new QVBoxLayout( this );
     m_mainTW = new Opie::Ui::OTabWidget( this );
     layout->addWidget(m_mainTW);
+
+    if (m_pluginsInstalled)
+    {
     m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget");
     QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
     pluginListLayout->setSpacing(6);
     pluginListLayout->setMargin(11);
     QLabel * pluginListTitle = new QLabel( tr( "Load which plugins in what order:" ), m_pluginListWidget );
     pluginListLayout->addWidget(pluginListTitle);
     QHBox * pluginListHB = new QHBox(m_pluginListWidget);
     pluginListLayout->addWidget(pluginListHB);
 
     m_pluginListView = new QListView(pluginListHB);
     m_pluginListView->addColumn("PluginList");
     m_pluginListView->header()->hide();
@@ -169,35 +184,39 @@ MultiauthConfig::MultiauthConfig(QWidget* par, const char* w,  WFlags f)
 
     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(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 ) {
@@ -214,24 +233,44 @@ MultiauthConfig::MultiauthConfig(QWidget* par, const char* w,  WFlags f)
         }
         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->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()
 {
 }
 
 void MultiauthConfig::accept() {
     writeConfig();
 
@@ -262,35 +301,39 @@ 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->onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) );
     m_generalConfig->onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) );
     m_generalConfig->nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) );
     m_generalConfig->noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) );
     m_generalConfig->explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) );
     m_generalConfig->allowBypass->setChecked( pcfg->readBoolEntry( "allowBypass", false ) );
 
     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;
@@ -342,24 +385,27 @@ void MultiauthConfig::readConfig()
     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");
+
+    if (m_pluginsInstalled)
+    {
     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 () ) {
@@ -374,42 +420,46 @@ void MultiauthConfig::writeConfig()
     }
     pcfg->writeEntry( "ExcludePlugins", exclude, ',' );
     pcfg->writeEntry( "IncludePlugins", include, ',' );
     pcfg->writeEntry( "AllPlugins",  allPlugins, ',' );
 
     pcfg->setGroup( "Misc" );
     pcfg->writeEntry( "onStart",  m_generalConfig->onStart->isChecked() );
     pcfg->writeEntry( "onResume",  m_generalConfig->onResume->isChecked() );
     pcfg->writeEntry( "nbSuccessMin",  m_generalConfig->nbSuccessMin->text() );
     pcfg->writeEntry( "noProtectConfig",  m_generalConfig->noProtectConfig->isChecked() );
     pcfg->writeEntry( "explanScreens",  m_generalConfig->explanScreens->isChecked() );
     pcfg->writeEntry( "allowBypass",  m_generalConfig->allowBypass->isChecked() );
+    }
 
     /* Login and Sync stuff */
 
     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);
 
     //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));
+        else // no more entry in the syncnet list -> we clear the line
+            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:
diff --git a/core/settings/security/multiauthconfig.h b/core/settings/security/multiauthconfig.h
index 649815d..5287083 100644
--- a/core/settings/security/multiauthconfig.h
+++ b/core/settings/security/multiauthconfig.h
@@ -112,24 +112,25 @@ private:
     QMap<QString,QCheckListItem*> m_plugins;
     /// plugin list page
     QWidget *m_pluginListWidget;
     /// misc config page
     MultiauthGeneralConfig *m_generalConfig;
     /// login (root / ...) choice page
     LoginBase *m_loginWidget;
     /// synchronization settings page
     SyncBase *m_syncWidget;
 
     int m_nbSuccessReq;
     bool m_plugins_changed;
+    bool m_pluginsInstalled;
     
     void readConfig();
     void loadPlugins();
 
     // Login and Sync stuff
     void loadUsers();
     bool telnetAvailable() const;
     bool sshAvailable() const;
     void updateGUI();
 
     static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits);
     void selectNet(int auth_peer,int auth_peer_bits,bool update);