summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/main.cpp43
-rw-r--r--core/settings/security/multiauthconfig.cpp50
-rw-r--r--core/settings/security/multiauthconfig.h5
-rw-r--r--core/settings/security/security.pro8
4 files changed, 53 insertions, 53 deletions
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index 7f24490..5ba9869 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -1,44 +1,5 @@
1#include "multiauthconfig.h" 1#include "multiauthconfig.h"
2#include <opie2/oapplication.h>
3#include <opie2/odebug.h>
4 2
3#include <opie2/oapplicationfactory.h>
5 4
6 5OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MultiauthConfig> );
7int main(int argc, char **argv) {
8 Opie::Core::OApplication app(argc, argv, "MultiAuthentication Config");
9 // protect this dialog if option set
10 Config* pcfg = new Config("Security");
11 pcfg->setGroup( "Misc" );
12 bool protectConfigDialog = ! pcfg->readBoolEntry("noProtectConfig", true);
13 delete pcfg;
14 bool show = true;
15 if ( protectConfigDialog )
16 {
17 if (Opie::Security::Internal::runPlugins() != 0)
18 {
19 // authentication failed
20 show = false;
21 }
22 }
23 if ( show == true ){
24 MultiauthConfig dialog;
25 app.setMainWidget(&dialog);
26
27 if ( dialog.exec() == QDialog::Accepted ) {
28 // write the general, login and sync config
29 dialog.writeConfig();
30 // call writeConfig() on each plugin config widget
31 Opie::Security::MultiauthConfigWidget *confWidget;
32 for ( confWidget = dialog.configWidgetList.first(); confWidget != 0;
33 confWidget = dialog.configWidgetList.next() ) {
34 confWidget->writeConfig();
35 }
36 }
37 dialog.close();
38 app.quit();
39 return 0;
40 } else {
41 owarn << "authentication failed, not showing opie-security" << oendl;
42 return 1;
43 }
44}
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 93e73c3..535352a 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -116,7 +116,31 @@ void MultiauthGeneralConfig::checkBypass()
116 116
117
118
119
120
121
122
123
124
125
126
117/// Builds and displays the Opie multi-authentication configuration dialog 127/// Builds and displays the Opie multi-authentication configuration dialog
118MultiauthConfig::MultiauthConfig() : QDialog(0, 0, TRUE), 128static void test_and_start() {
119 m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0), 129 Config pcfg("Security");
120 m_generalConfig(0), m_loginWidget(0), m_syncWidget(0), 130 pcfg.setGroup( "Misc" );
121 m_nbSuccessReq(0), m_plugins_changed(false) 131 bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true);
132
133 if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) {
134 owarn << "authentication failed, not showing opie-security" << oendl;
135 exit( -1 );
136 }
137}
138
139
140
141MultiauthConfig::MultiauthConfig(QWidget* par, const char* w, WFlags f)
142 : QDialog(par, w, TRUE, f),
143 m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
144 m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
145 m_nbSuccessReq(0), m_plugins_changed(false)
122{ 146{
@@ -124,2 +148,4 @@ MultiauthConfig::MultiauthConfig() : QDialog(0, 0, TRUE),
124 */ 148 */
149 test_and_start();
150
125 setCaption( tr( "Security configuration" ) ); 151 setCaption( tr( "Security configuration" ) );
@@ -208,2 +234,18 @@ MultiauthConfig::~MultiauthConfig()
208 234
235void MultiauthConfig::accept() {
236 writeConfig();
237
238 MultiauthConfigWidget* confWidget = 0;
239 for ( confWidget = configWidgetList.first(); confWidget != 0;
240 confWidget = configWidgetList.next() )
241 confWidget->writeConfig();
242
243 QDialog::accept();
244}
245
246void MultiauthConfig::done( int r ) {
247 QDialog::done( r );
248 close();
249}
250
209/// moves up the selected plugin 251/// moves up the selected plugin
diff --git a/core/settings/security/multiauthconfig.h b/core/settings/security/multiauthconfig.h
index ffe920f..649815d 100644
--- a/core/settings/security/multiauthconfig.h
+++ b/core/settings/security/multiauthconfig.h
@@ -83,3 +83,4 @@ class MultiauthConfig : public QDialog
83public: 83public:
84 MultiauthConfig(); 84 static QString appName() { return QString::fromLatin1("security"); }
85 MultiauthConfig(QWidget *parent, const char* name, WFlags fl);
85 virtual ~MultiauthConfig(); 86 virtual ~MultiauthConfig();
@@ -89,2 +90,4 @@ public:
89protected slots: 90protected slots:
91 void accept();
92 void done(int r);
90 void pluginsChanged(); 93 void pluginsChanged();
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 5d2ae08..e9f4061 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,7 +1,4 @@
1CONFIG += qt warn_on 1CONFIG += qt warn_on quick-app
2
3HEADERS = multiauthconfig.h 2HEADERS = multiauthconfig.h
4
5SOURCES = multiauthconfig.cpp main.cpp 3SOURCES = multiauthconfig.cpp main.cpp
6
7 INTERFACES= loginbase.ui syncbase.ui 4 INTERFACES= loginbase.ui syncbase.ui
@@ -9,6 +6,3 @@ INTERFACES = loginbase.ui syncbase.ui
9INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
10
11LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 7LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
12
13DESTDIR = $(OPIEDIR)/bin
14TARGET = security 8TARGET = security