1 files changed, 6 insertions, 1 deletions

diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 42a9144..36bcf86 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -1,289 +1,294 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "userdialog.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
 
 #include "passwd.h"
 
+#include <opie/odevice.h>
+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) {
         QVBoxLayout *layout = new QVBoxLayout(this);
         myTabWidget=new QTabWidget(this,"User Tab Widget");
         layout->addWidget(myTabWidget);
         setupTab1();
         setupTab2();
 
         accounts->groupStringList.sort();
         // And also fill the listview & the combobox with all available groups.
         for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) {
                 accounts->splitGroupEntry(*it);
                 new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
                 groupComboBox->insertItem(accounts->gr_name);
         }
         showMaximized();
 }
 
 /**
  * Empty destructor.
  *
  */
 UserDialog::~UserDialog() {
 }
 
 /**
  *  Creates the first tab, all userinfo is here.
  *
  */
 void UserDialog::setupTab1() {
         QPixmap mypixmap;
         QWidget *tabpage = new QWidget(myTabWidget,"page1");
         QVBoxLayout *layout = new QVBoxLayout(tabpage);
         layout->setMargin(5);
 
         // Picture
         picturePushButton = new QPushButton(tabpage,"Label");
         picturePushButton->setMinimumSize(48,48);
         picturePushButton->setMaximumSize(48,48);
                 picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon.
                 connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector.
         
         // Login
         QLabel *loginLabel=new QLabel(tabpage,"Login: ");
         loginLabel->setText("Login: ");
         loginLineEdit=new QLineEdit(tabpage,"Login: ");
 
         // UID
         QLabel *uidLabel=new QLabel(tabpage,"uid: ");
         uidLabel->setText("UserID: ");
         uidLineEdit=new QLineEdit(tabpage,"uid: ");
         uidLineEdit->setEnabled(false);
 
         // Username (gecos)
         QLabel *gecosLabel=new QLabel(tabpage,"gecos");
         gecosLabel->setText("Username: ");
         gecosLineEdit=new QLineEdit(tabpage,"gecos");
 
         // Password
         QLabel *passwordLabel=new QLabel(tabpage,"password");
         passwordLabel->setText("Password: ");
         passwordLineEdit=new QLineEdit(tabpage,"password");
         passwordLineEdit->setEchoMode(QLineEdit::Password);
 
         // Shell
         QLabel *shellLabel=new QLabel(tabpage,"shell");
         shellLabel->setText("Shell: ");
         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);
         
         // 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);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(shellLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(groupLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(skelLabel);
                 // Second column, data
                 vlayout2->addWidget(loginLineEdit);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(uidLineEdit);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(gecosLineEdit);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(passwordLineEdit);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(shellComboBox);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(groupComboBox);
                 vlayout2->addSpacing(5);
                 vlayout2->addWidget(skelCheckBox);
         hlayout->addLayout(vlayout1);
         hlayout->addLayout(vlayout2);
         
         myTabWidget->addTab(tabpage,"User Info");
 }
 
 /**
  *  Creates the second tab containing additional groups for the user.
  *
  */
 void UserDialog::setupTab2() {
         QWidget *tabpage = new QWidget(myTabWidget,"page2");
         QVBoxLayout *layout = new QVBoxLayout(tabpage);
         layout->setMargin(5);
 
         // Additional groups
         groupsListView=new QListView(tabpage,"groups");
         groupsListView->addColumn("Additional groups");
         groupsListView->setColumnWidthMode(0,QListView::Maximum);
         groupsListView->setMultiSelection(false);
         groupsListView->setAllColumnsShowFocus(false);
         
         layout->addSpacing(5);
                 // Grouplist
                 layout->addWidget(groupsListView);
         
         myTabWidget->addTab(tabpage,"User Groups");
 }
 
 /**
  * Static function that creates the userinfo dialog.
  * The user will be prompted to add a user. 
  *
  * @param uid This is a suggested available UID.
  * @param gid This is a suggested available GID.
  *
  * @return <code>true</code> if the user was successfully added, otherwise <code>false</code>.
  *
  */
 bool UserDialog::addUser(int uid, int gid) {
         QCheckListItem *temp;
         QFile ozTest;
-        int oz=ozTest.exists("/etc/oz_version");
+        int oz=false;
+        if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
         UserDialog *adduserDialog=new UserDialog();
         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.
         // Insert default group into groupComboBox
         adduserDialog->groupComboBox->insertItem("<create new group>",0);
         adduserDialog->uidLineEdit->setText(QString::number(uid));
         // If we're running on OZ, add new users to some default groups.
         if(oz) {
                 QListViewItemIterator iter( adduserDialog->groupsListView );
                 for ( ; iter.current(); ++iter ) {
                         temp=(QCheckListItem*)iter.current();
                         if (temp->text()=="video") temp->setOn(true);
                         if (temp->text()=="audio") temp->setOn(true);
                         if (temp->text()=="time") temp->setOn(true);
                         if (temp->text()=="power") temp->setOn(true);
                         if (temp->text()=="input") temp->setOn(true);
                         if (temp->text()=="sharp") temp->setOn(true);
                         if (temp->text()=="tty") temp->setOn(true);
                 }
         }
         // Show the dialog! 
         if(!(adduserDialog->exec())) return false;
         if((adduserDialog->groupComboBox->currentItem()!=0)) {
                 accounts->findGroup(adduserDialog->groupComboBox->currentText());
                 adduserDialog->groupID=accounts->gr_gid;
                 qWarning(QString::number(accounts->gr_gid));
         }
         if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(), 
                                                         adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(), 
                                                         QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) {
                 QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user.");
                 return false;
         }
     
         // Add User to additional groups.
         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)+".");
                 }
         } else {
                 QMessageBox::information(0,"Invalid Username","That username ("+QString(username)+")does not exist.");
                 return false;
         }
         return true;
 }
 
 /**
  * This displays a confirmation dialog wether a user should be deleted or not.
  *  (And also deletes the account)
  *
  * @param username User to be deleted.