2 files changed, 23 insertions, 5 deletions

diff --git a/noncore/settings/usermanager/passwd.cpp b/noncore/settings/usermanager/passwd.cpp
index 0a2bfba..1e98778 100644
--- a/noncore/settings/usermanager/passwd.cpp
+++ b/noncore/settings/usermanager/passwd.cpp
@@ -91,65 +91,65 @@ bool Passwd::close() {
                         QTextStream ts_group(&group_file);
                         for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) {
                                 ts_group << (*it) + "\n";
                         }
                         returnvalue=true;
                         group_file.close();
                 }
                 passwd_file.close();
         }
         return returnvalue;
 }
 
 // Splits a "passwd" line into the components and stores them in the pw_* variables.
 void Passwd::splitPasswdEntry(QString &userString) {
         userdataStringList=QStringList::split(":",userString,true);
         QStringList::Iterator it=userdataStringList.begin();
         pw_name=(*it++);
         pw_passwd=(*it++);
         pw_uid=(*it++).toInt();
         pw_gid=(*it++).toInt();
         pw_gecos=(*it++);
         pw_dir=(*it++);
         pw_shell=(*it++);
 }
 
 // Splits a "group" line into the components and stores them in the gr_* variables.
 void Passwd::splitGroupEntry(QString &groupString) {
         groupdataStringList=QStringList::split(":",groupString,true);
         QStringList::Iterator it=groupdataStringList.begin();
         gr_name=(*it++);
         it++;
         gr_gid=(*it++).toInt();
-        gr_mem=QStringList::split(" ",(*it++));
+        gr_mem=QStringList::split(",",(*it++));
 }
 
 // Find a user in the passwdStringList. Return true if found and also fill the pw_* variables.
 bool Passwd::searchUser(QRegExp &userRegExp) {
         QStringList tempStringList(passwdStringList.grep(userRegExp));
         if((tempStringList.isEmpty())) {
                 return false;
         } else {
                 userString=(*(tempStringList.begin()));
                 splitPasswdEntry(userString);
         }
         return true;
 }
 
 // Find a user by login.
 bool Passwd::findUser(const char *username) {
         QRegExp userRegExp(QString("^%1\\:").arg(username));
         return searchUser(userRegExp);
 }
 
 // Find a user by uid.
 bool Passwd::findUser(int uid) {
         QRegExp userRegExp(QString(":%1\\:").arg(uid));
         return searchUser(userRegExp);
 }
 
 // Add a user to the passwdStringList, create home directory, and optionally create a group for the user.
 bool Passwd::addUser(QString pw_name, QString pw_passwd, int pw_uid, int pw_gid, QString pw_gecos,QString pw_dir, QString pw_shell, bool createGroup) {
         QString tempString;
         if((createGroup) && (!(findGroup(pw_gid)))) addGroup(pw_name,pw_gid);
         pw_passwd = crypt(pw_passwd, crypt_make_salt());
         tempString=pw_name+":"+pw_passwd+":"+QString::number(pw_uid)+":"+QString::number(pw_gid)+":"+pw_gecos+":"+pw_dir+":"+pw_shell;
@@ -210,88 +210,91 @@ bool Passwd::searchGroup(QRegExp &groupRegExp) {
                 groupString=(*(tempStringList.begin()));
                 splitGroupEntry(groupString);
         }
         return true;
 }
 
 // Find a group by groupname.
 bool Passwd::findGroup(const char *groupname) {
         QRegExp groupRegExp(QString("^%1\\:").arg(groupname));
         return searchGroup(groupRegExp);
 }
 
 // Find a group by gid.
 bool Passwd::findGroup(int gid) {
         QRegExp groupRegExp(QString(":%1\\:").arg(gid));
         return searchGroup(groupRegExp);
 }
 
 // Add a group to groupStringList
 bool Passwd::addGroup(QString gr_name, int gr_gid) {
         QString tempString;
         tempString=gr_name+":*:"+QString::number(gr_gid)+":";
         groupStringList.append(tempString);
         return 1;
 }
 
 // Update fields for a group in groupStringList, take info from the gr_* variables.
 bool Passwd::updateGroup(int gid) {
         QRegExp groupRegExp(QString(":%1\\:").arg(QString::number(gid)));
         for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) {
                 if(groupRegExp.find((*it),0)!=-1) {
                         *it=QString(gr_name+":*:"+QString::number(gr_gid)+":");
-                        for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end(); ++member) {
+                        for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end();) {
                                 *it+=*member;
-                                *it+=" ";
+                                ++member;
+                                if(member!=gr_mem.end()) *it+=",";
                         }
                         return true;
                 }
         }
         return false;
 }
 
 // Delete a group from groupStringList.
 bool Passwd::deleteGroup(QRegExp &groupRegExp) {
         for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) {
                 if(groupRegExp.find((*it),0)!=-1) {
                         groupStringList.remove(it);
                         return true;
                 }
         }
         return false;
 }
 
 // Delete a group by groupname.
 bool Passwd::delGroup(const char *groupname) {
         QRegExp groupRegExp(QString("^%1\\:").arg(groupname));
         return deleteGroup(groupRegExp);
 }
 
 // Delete a group by gid.
 bool Passwd::delGroup(int gid) {
         QRegExp groupRegExp(QString(":%1\\:").arg(gid));
         return deleteGroup(groupRegExp);
 }
 
 // Add a user as a member to a group in groupStringList.
 bool Passwd::addGroupMember(QString groupname, QString member) {
         if(!(findGroup(groupname))) return false;
-        gr_mem << member;
+        QRegExp memberRegExp(QString("^%1$").arg(member));
+        QStringList templist=gr_mem.grep(memberRegExp);
+        if(templist.isEmpty()) gr_mem << member;
         if(!(updateGroup(gr_gid))) return false;
         return true;
 }
 
 // Delete a user as a groupmember from a group in groupStringList.
 bool Passwd::delGroupMember(QString groupname, QString member) {
         if(!(findGroup(groupname))) return false;
         for(QStringList::Iterator it=gr_mem.begin(); it!=gr_mem.end(); ++it) {
                 if(*it==member) {
                         gr_mem.remove(it);
                         it=gr_mem.end();
                 }
         }
         if(!(updateGroup(gr_gid))) return false;
         return true;
 }
 
 // Global Object 
 Passwd *accounts;
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index c82cc9d..0d2122b 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -304,69 +304,84 @@ bool UserDialog::delUser(const char *username) {
  */
 bool UserDialog::editUser(const char *username) {
         int invalid_group=0;
         // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating edituserDialog's widgets here.
                 UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);// Create Dialog
         edituserDialog->setCaption(tr("Edit User"));
                 accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object.
                 if(!(accounts->findGroup(accounts->pw_gid))) {// Locate the user's primary group, and fill group variables in 'accounts' object.
                 invalid_group=1;
         }
         // Fill widgets with userinfo.
         edituserDialog->loginLineEdit->setText(accounts->pw_name);
         edituserDialog->uidLineEdit->setText(QString::number(accounts->pw_uid));
         edituserDialog->gecosLineEdit->setText(accounts->pw_gecos);
         // Set password to '........', we will later check if this still is the contents, if not, the password has been changed.
         edituserDialog->passwordLineEdit->setText("........");
         // If this user is not using /bin/sh,/bin/ash or /bin/false as shell, add that entry to the shell-combobox.
         if(accounts->pw_shell!="/bin/sh" && accounts->pw_shell!="/bin/ash" && accounts->pw_shell!="/bin/false") {
                 edituserDialog->shellComboBox->insertItem(accounts->pw_shell,0);
                 edituserDialog->shellComboBox->setCurrentItem(0);
         }
         // Select the primary group for this user.
         for(int i=0;i<edituserDialog->groupComboBox->count();++i) {
                 if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) {
                         edituserDialog->groupComboBox->setCurrentItem(i);
                         break;
                 }
         }
         if(invalid_group) {
                 edituserDialog->groupComboBox->insertItem("<Undefined group>",0);
                 edituserDialog->groupComboBox->setCurrentItem(0);
         }
+
         // Select the groups in the listview, to which the user belongs.
         QCheckListItem *temp;
-        QRegExp userRegExp(QString("[:\\s]%1\\s").arg(username));
+        // BAH!!! QRegExp in qt2 sucks... or maybe I do... can't figure out how to check for EITHER end of input ($) OR a comma, so here we do two different QRegExps instead.
+                QRegExp userRegExp(QString("[:,]%1$").arg(username));// The end of line variant.
                 QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
                 for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them.
+                qWarning(*it);
+                        QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
+                for ( ; lvit.current(); ++lvit ) {
+                        if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
+                                temp=(QCheckListItem*)lvit.current();
+                                        temp->setOn(true);// If we find a line with that groupname, select it.;
+                        }
+                }
+        }
+                userRegExp=QRegExp(QString("[:,]%1,").arg(username));// And the other one. (not end of line.)
+                tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
+                for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them.
+                qWarning(*it);
                         QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
                 for ( ; lvit.current(); ++lvit ) {
                         if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
                                 temp=(QCheckListItem*)lvit.current();
                                         temp->setOn(true);// If we find a line with that groupname, select it.;
                         }
                 }
         }
         
                 if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG!
         
                 accounts->findUser(username);// Fill user variables in 'acccounts' object.
         accounts->pw_name=edituserDialog->loginLineEdit->text();
         // Has the password been changed ? Make a new "crypt":ed password.
         if(edituserDialog->passwordLineEdit->text()!="........") accounts->pw_passwd=crypt(edituserDialog->passwordLineEdit->text(), accounts->crypt_make_salt());
         
         // Set all variables in accounts object, that will be used when calling 'updateUser()'
         accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt();
                 if(accounts->findGroup(edituserDialog->groupComboBox->currentText())) {// Fill all group variables in 'accounts' object.
                         accounts->pw_gid=accounts->gr_gid;// Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group.
         }
         accounts->pw_gecos=edituserDialog->gecosLineEdit->text();
         accounts->pw_shell=edituserDialog->shellComboBox->currentText();
         // Update userinfo, using the information stored in the user variables stored in the accounts object.
         accounts->updateUser(username);
         
         // Remove user from all groups he/she is a member of. (could be done in a better way I guess, this was simple though.)
         for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {
                 accounts->delGroupMember((*it).left((*it).find(":")),username);
         }
         
         // Add User to additional groups that he/she is a member of.