Support for a skeleton homedirectory in /etc/skel.

1 files changed, 18 insertions, 2 deletions

diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index c43b391..42a9144 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -97,34 +97,34 @@ void UserDialog::setupTab1() {
         shellComboBox=new QComboBox(tabpage,"shell");
         shellComboBox->setEditable(true);
         shellComboBox->insertItem("/bin/sh");
         shellComboBox->insertItem("/bin/ash");
         shellComboBox->insertItem("/bin/false");
         
         // Primary Group
         QLabel *groupLabel=new QLabel(tabpage,"group");
         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);
+        //skelLabel->setDisabled(true);
+        //skelCheckBox->setDisabled(true);
         
         // Widget layout
         QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
         layout->addWidget(picturePushButton);
         layout->addSpacing(5);
         layout->addLayout(hlayout);
         QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
         QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
                 // First column, labels
                 vlayout1->addWidget(loginLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(uidLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(gecosLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(passwordLabel);
@@ -230,32 +230,48 @@ bool UserDialog::addUser(int uid, int gid) {
         QListViewItemIterator it( adduserDialog->groupsListView );
         for ( ; it.current(); ++it ) {
                 temp=(QCheckListItem*)it.current();
                 if (temp->isOn() )
                 accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text());
         }
         // Copy image to pics/users/
         if(!(adduserDialog->userImage.isNull())) {
                 QDir d;
                 if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
                         d.mkdir("/opt/QtPalmtop/pics/users");
                 }
                 QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
         //      adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
                 adduserDialog->userImage.save(filename,"PNG");
         }
+        
+        // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory?
+        accounts->findUser(adduserDialog->loginLineEdit->text());
+        if(adduserDialog->skelCheckBox->isChecked()) {
+                QString command_cp;
+                QString command_chown;
+                command_cp.sprintf("cp -a /etc/skel/* %s/",accounts->pw_dir.latin1());
+                system(command_cp);
+                
+                        command_cp.sprintf("cp -a /etc/skel/.[!.]* %s/",accounts->pw_dir.latin1());// Bug in busybox, ".*" includes parent directory, does this work as a workaround?
+                system(command_cp);
+                
+                command_chown.sprintf("chown -R %d:%d %s",accounts->pw_uid,accounts->pw_gid,accounts->pw_dir.latin1());
+                system(command_chown);
+        }
+        
         return true;
 }
 
 /**
  * Deletes the user account.
  *
  * @param username User to be deleted.
  *
  * @return <code>true</code> if the user was successfully deleted, otherwise <code>false</code>.
  *
  */
 bool UserDialog::delUser(const char *username) {
                 if((accounts->findUser(username))) {// Does that user exist?
                         if(!(accounts->delUser(username))) {// Delete the user.
                         QMessageBox::information(0,"Ooops!","Something went wrong\nUnable to delete user: "+QString(username)+".");
                 }