[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/kiosktool
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-09-13 14:35:02
Message-ID: 20040913143502.A78D21701 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

* Add group blacklist
* reread groups / users before adding group / user policy so that newly added
  groups / users appear directly


  M +29 -23    userManagement.cpp   1.6


--- kdeextragear-3/kiosktool/userManagement.cpp  #1.5:1.6
@@ -91,27 +91,4 @@ void UserManagementDialog::slotShowNotic
 void UserManagementDialog::init()
 {
-   KConfig *config = kapp->config();
-   config->setGroup("General");
-   int minUID = config->readNumEntry("FirstUIDShown", 500);
-
-   m_allUsers.clear();
-   setpwent();
-   for (struct passwd *user; (user = getpwent()); )
-   {
-       if ((user->pw_uid >= (uid_t) minUID) || (user->pw_uid == 0))
-           m_allUsers.append(QString::fromUtf8(user->pw_name));
-   }
-   endpwent();
-   m_allUsers.sort();
-
-   m_allGroups.clear();
-   setgrent();
-   for (struct group *grp; (grp = getgrent()); )
-   {
-       m_allGroups.append(QString::fromUtf8(grp->gr_name));
-   }
-   endgrent();
-   m_allGroups.sort();
-   
    m_allProfiles = KioskRun::self()->allProfiles();
    m_allProfiles.sort();
@@ -175,4 +152,19 @@ bool UserManagementDialog::save()
 void UserManagementDialog::slotAddGroup()
 {
+   KConfig *config = kapp->config();
+   config->setGroup("General");
+   QStringList groupBlacklist = config->readListEntry("GroupBlacklist");
+
+   m_allGroups.clear();
+   setgrent();
+   for (struct group *grp; (grp = getgrent()); )
+   {
+       QString group = QString::fromUtf8(grp->gr_name);
+       if (!groupBlacklist.contains(group))
+           m_allGroups.append(group);
+   }
+   endgrent();
+   m_allGroups.sort();
+
    KDialogBase dlg(this, "addGroup", true, i18n("Add Group Policy"),
       KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
@@ -232,4 +224,18 @@ void UserManagementDialog::slotDeleteGro
 void UserManagementDialog::slotAddUser()
 {
+   KConfig *config = kapp->config();
+   config->setGroup("General");
+   int minUID = config->readNumEntry("FirstUIDShown", 500);
+
+   m_allUsers.clear();
+   setpwent();
+   for (struct passwd *user; (user = getpwent()); )
+   {
+       if ((user->pw_uid >= (uid_t) minUID) || (user->pw_uid == 0))
+           m_allUsers.append(QString::fromUtf8(user->pw_name));
+   }
+   endpwent();
+   m_allUsers.sort();
+
    KDialogBase dlg(this, "addUser", true, i18n("Add User Policy"),
       KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );


[prev in list] [next in list] [prev in thread] [next in thread]