[yast-commit] r53470 - in /trunk/ftp-server/src: FtpServer.ycp wid_functions.ycp

Author: juhliarik Date: Thu Nov 20 12:35:21 2008 New Revision: 53470 URL: http://svn.opensuse.org/viewcvs/yast?rev=53470&view=rev Log: updated using of yast module Users Modified: trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/wid_functions.ycp Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev=53470&r1=53469&r2=53470&view=diff ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Thu Nov 20 12:35:21 2008 @@ -475,15 +475,15 @@ //Popup::Message("if ((vsftpd_edit) && (EDIT_SETTINGS"); Users::SelectUserByName (EDIT_SETTINGS["GuestUser"]:nil); userinfo = Users::GetCurrentUser (); - string guest_home_dir = (string) userinfo["homedirectory"]:nil; + string guest_home_dir = (string) userinfo["homeDirectory"]:nil; if ((guest_home_dir != "") && (guest_home_dir != nil) && (EDIT_SETTINGS["FtpDirLocal"]:nil == "")) EDIT_SETTINGS["FtpDirLocal"] = guest_home_dir; } Users::SelectUserByName (EDIT_SETTINGS["FTPUser"]:nil); userinfo = Users::GetCurrentUser (); - anon_homedir = (string) userinfo["homedirectory"]:nil; - anon_uid = (integer) userinfo["uidnumber"]:nil; + anon_homedir = (string) userinfo["homeDirectory"]:nil; + anon_uid = (integer) userinfo["uidNumber"]:nil; //y2milestone("-------------User info-------------------"); //y2milestone("Users :CurrentUser %1", userinfo); //y2milestone("---------------------------------------------"); @@ -655,7 +655,7 @@ if (result) { if ((EDIT_SETTINGS["FtpDirAnon"]:nil != anon_homedir) && (anon_homedir != "") && (anon_homedir != nil)) { - string error = Users::EditUser($["homedirectory":EDIT_SETTINGS["FtpDirAnon"]:nil]); + string error = Users::EditUser($["homeDirectory":EDIT_SETTINGS["FtpDirAnon"]:nil]); if ((error != nil) && (error != "")) { result= false; Popup::Error(error); Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp?rev=53470&r1=53469&r2=53470&view=diff ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Thu Nov 20 12:35:21 2008 @@ -685,7 +685,7 @@ //checking correct homedir for anonymous user if ((AnonHomeDir != "") && (Mode::normal())) { if (AnonHomeDir != FtpServer::anon_homedir) { - string error = Users::EditUser($["homedirectory":AnonHomeDir]); + string error = Users::EditUser($["homeDirectory":AnonHomeDir]); if ((error != nil) && (error != "")) { Popup::Error(error); UI::SetFocus(`id("FtpDirAnon")); @@ -693,7 +693,7 @@ } integer uid = FtpServer::anon_uid; boolean failed = false; - map ui_map = $[]; + map ui_map = $[]; map error_map = $[]; do { error_map = Users::CheckHomeUI (uid, AnonHomeDir, ui_map); @@ -701,7 +701,7 @@ if (!Popup::YesNo (error_map ["question"]:"")) failed = true; else - ui_map[ error_map["question_id"]:"" ] = 1; + ui_map[ error_map["question_id"]:"" ] = AnonHomeDir; } } while (error_map != $[] && !failed); } //end of if (AnonHomeDir != FtpServer::anon_homedir) { @@ -840,7 +840,7 @@ //checking correct homedir for anonymous user if ((AnonHomeDir != "") && (Mode::normal())) { if (AnonHomeDir != FtpServer::anon_homedir) { - string error = Users::EditUser($["homedirectory":AnonHomeDir]); + string error = Users::EditUser($["homeDirectory":AnonHomeDir]); if ((error != nil) && (error != "")) { Popup::Error(error); UI::SetFocus(`id("FtpDirAnon")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org