* "Copy /etc/skel" option is now only available when adding a user.

* Documented some more of the source code.

3 files changed, 51 insertions, 16 deletions

diff --git a/noncore/settings/usermanager/passwd.cpp b/noncore/settings/usermanager/passwd.cpp
index 5063661..0a2bfba 100644
--- a/noncore/settings/usermanager/passwd.cpp
+++ b/noncore/settings/usermanager/passwd.cpp
@@ -51,6 +51,7 @@ char *Passwd::crypt_make_salt() {
 	return result;
 }
 
+//  opens the files /etc/passwd & /etc/group and loads the contents into passwdStringList & groupStringList
 bool Passwd::open() {
 	int returnvalue=false;
 	
@@ -76,6 +77,7 @@ bool Passwd::open() {
 	return returnvalue;
 }
 
+// Writes back the contents of passwdStringList to /etc/passwd & groupStringList to /etc/group
 bool Passwd::close() {
 	int returnvalue=false;
 	QFile passwd_file("/etc/passwd");
@@ -98,6 +100,7 @@ bool Passwd::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();
@@ -110,6 +113,7 @@ void Passwd::splitPasswdEntry(QString &userString) {
 	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();
@@ -119,6 +123,7 @@ void Passwd::splitGroupEntry(QString &groupString) {
 	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())) {
@@ -130,16 +135,19 @@ bool Passwd::searchUser(QRegExp &userRegExp) {
 	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);
@@ -156,6 +164,7 @@ bool Passwd::addUser(QString pw_name, QString pw_passwd, int pw_uid, int pw_gid,
 	return 1;
 }
 
+// Update info for a user in passwdStringList, take info from the pw_* fields.
 bool Passwd::updateUser(QString login) {
 	QRegExp userRegExp(QString("^%1\\:").arg(login));
 	for(QStringList::Iterator it=passwdStringList.begin(); it!=passwdStringList.end(); ++it) {
@@ -167,6 +176,7 @@ bool Passwd::updateUser(QString login) {
 	return false;
 }
 
+// Delete a user from passwdStringList.
 bool Passwd::deleteUser(QRegExp &userRegExp, bool delGroup) {
 	for(QStringList::Iterator it=passwdStringList.begin(); it!=passwdStringList.end(); ++it) {
 		if(userRegExp.find((*it),0)!=-1) {
@@ -179,16 +189,19 @@ bool Passwd::deleteUser(QRegExp &userRegExp, bool delGroup) {
 	return false;
 }
 
+// Delete a user by login, and optionally also delete group.
 bool Passwd::delUser(const char *username, bool delGroup) {
 	QRegExp userRegExp(QString("^%1\\:").arg(username));
 	return deleteUser(userRegExp,delGroup);
 }
 
+// Delete a user by uid, and optionally also delete group.
 bool Passwd::delUser(int uid, bool delGroup) {
 	QRegExp userRegExp(QString(":%1\\:").arg(uid));
 	return deleteUser(userRegExp,delGroup);
 }
 
+// Locate a group in the groupStringList, fill out the gr_* variables and return "true" if found.
 bool Passwd::searchGroup(QRegExp &groupRegExp) {
 	QStringList tempStringList(groupStringList.grep(groupRegExp));
 	if((tempStringList.isEmpty())) {
@@ -200,16 +213,19 @@ bool Passwd::searchGroup(QRegExp &groupRegExp) {
 	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)+":";
@@ -217,6 +233,7 @@ bool Passwd::addGroup(QString gr_name, int gr_gid) {
 	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) {
@@ -232,6 +249,7 @@ bool Passwd::updateGroup(int gid) {
 	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) {
@@ -242,16 +260,19 @@ bool Passwd::deleteGroup(QRegExp &groupRegExp) {
 	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;
@@ -259,6 +280,7 @@ bool Passwd::addGroupMember(QString groupname, QString member) {
 	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) {
@@ -271,4 +293,5 @@ bool Passwd::delGroupMember(QString groupname, QString member) {
 	return true;
 }
 
+// Global Object 
 Passwd *accounts;
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 36bcf86..c82cc9d 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -32,7 +32,8 @@ using namespace Opie;
  * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
  *
  */
-UserDialog::UserDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
+UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
+	vm=viewmode;
 	QVBoxLayout *layout = new QVBoxLayout(this);
 	myTabWidget=new QTabWidget(this,"User Tab Widget");
 	layout->addWidget(myTabWidget);
@@ -109,13 +110,13 @@ void UserDialog::setupTab1() {
 	groupLabel->setText("Primary group: ");
 	groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
 
-	// Copy /etc/skel
-	QLabel *skelLabel=new QLabel(tabpage,"skel");
-	skelLabel->setText("Copy /etc/skel: ");
-	skelCheckBox=new QCheckBox(tabpage);
-	skelCheckBox->setChecked(true);
-//	skelLabel->setDisabled(true);
-//	skelCheckBox->setDisabled(true);
+	if(vm==VIEWMODE_NEW) {
+		// Copy /etc/skel
+		skelLabel=new QLabel(tabpage,"skel");
+		skelLabel->setText("Copy /etc/skel: ");
+		skelCheckBox=new QCheckBox(tabpage);
+		skelCheckBox->setChecked(true);
+	}
 	
 	// Widget layout
 	QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
@@ -136,8 +137,10 @@ void UserDialog::setupTab1() {
 		vlayout1->addWidget(shellLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(groupLabel);
-		vlayout1->addSpacing(5);
-		vlayout1->addWidget(skelLabel);
+		if(vm==VIEWMODE_NEW) {
+			vlayout1->addSpacing(5);
+			vlayout1->addWidget(skelLabel);
+		}
 		// Second column, data
 		vlayout2->addWidget(loginLineEdit);
 		vlayout2->addSpacing(5);
@@ -150,8 +153,10 @@ void UserDialog::setupTab1() {
 		vlayout2->addWidget(shellComboBox);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(groupComboBox);
-		vlayout2->addSpacing(5);
-		vlayout2->addWidget(skelCheckBox);
+		if(vm==VIEWMODE_NEW) {
+			vlayout2->addSpacing(5);
+			vlayout2->addWidget(skelCheckBox);
+		}
 	hlayout->addLayout(vlayout1);
 	hlayout->addLayout(vlayout2);
 	
@@ -196,7 +201,8 @@ bool UserDialog::addUser(int uid, int gid) {
 	QFile ozTest;
 	int oz=false;
 	if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
-	UserDialog *adduserDialog=new UserDialog();
+	// viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating adduserDialog's widgets here.
+	UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
 	adduserDialog->setCaption(tr("Add User"));
 	adduserDialog->userID=uid;	// Set next available UID as default uid.
 	adduserDialog->groupID=gid;	// Set next available GID as default gid.
@@ -298,7 +304,8 @@ bool UserDialog::delUser(const char *username) {
  */
 bool UserDialog::editUser(const char *username) {
 	int invalid_group=0;
-	UserDialog *edituserDialog=new UserDialog();	// Create Dialog
+	// 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.
diff --git a/noncore/settings/usermanager/userdialog.h b/noncore/settings/usermanager/userdialog.h
index 133b35d..b7b925d 100644
--- a/noncore/settings/usermanager/userdialog.h
+++ b/noncore/settings/usermanager/userdialog.h
@@ -42,7 +42,12 @@ private:
 	QImage userImage;
 	int groupID;
 	int userID;
-	
+	int vm;
+	enum VIEWMODE {
+		VIEWMODE_NEW,
+		VIEWMODE_EDIT
+	};
+		
 	void setupTab1(void);
 	void setupTab2(void);
 	void accept(void);
@@ -51,7 +56,7 @@ private slots:
 	void clickedPicture(void);
 
 public:
-	UserDialog( QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 );
+	UserDialog( int viewmode=VIEWMODE_NEW, QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 );
 	~UserDialog();
 	static bool addUser(int uid, int gid);
 	static bool editUser(const char *username);